Browse Source

updated terrain prefabs

master
JoshuaReason 5 years ago
parent
commit
419bfa9231
9 changed files with 77 additions and 2 deletions
  1. +1
    -1
      Assets/Animations/CharacterController.controller
  2. +13
    -0
      Assets/FBX/terrain_Prefabs/terr1.prefab
  3. +13
    -0
      Assets/FBX/terrain_Prefabs/terr2.prefab
  4. +13
    -0
      Assets/FBX/terrain_Prefabs/terr3.prefab
  5. +13
    -0
      Assets/FBX/terrain_Prefabs/terr4.prefab
  6. +0
    -1
      Assets/Scipts/PlayerControllers/Player.cs
  7. +8
    -0
      Assets/Shaders.meta
  8. +8
    -0
      Assets/WorldAssets.meta
  9. +8
    -0
      Assets/WorldAssets/Models.meta

+ 1
- 1
Assets/Animations/CharacterController.controller View File

@ -18,7 +18,7 @@ AnimatorController:
m_Type: 9 m_Type: 9
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0
m_DefaultBool: 1
m_Controller: {fileID: 0} m_Controller: {fileID: 0}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5

+ 13
- 0
Assets/FBX/terrain_Prefabs/terr1.prefab View File

@ -3462,6 +3462,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 4942003060844008} - component: {fileID: 4942003060844008}
- component: {fileID: 114636688854000904}
m_Layer: 0 m_Layer: 0
m_Name: terr1 m_Name: terr1
m_TagString: Untagged m_TagString: Untagged
@ -16106,6 +16107,18 @@ MeshCollider:
m_CookingOptions: 14 m_CookingOptions: 14
m_SkinWidth: 0.01 m_SkinWidth: 0.01
m_Mesh: {fileID: 4300000, guid: 99d0111f01c394540a69064c1a297091, type: 3} m_Mesh: {fileID: 4300000, guid: 99d0111f01c394540a69064c1a297091, type: 3}
--- !u!114 &114636688854000904
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1998568239351332}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2301390022f0d72478aae034e36cd8ff, type: 3}
m_Name:
m_EditorClassIdentifier:
LandMarkLocations: []
--- !u!136 &136483726204993768 --- !u!136 &136483726204993768
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

+ 13
- 0
Assets/FBX/terrain_Prefabs/terr2.prefab View File

@ -2631,6 +2631,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 4783433737088858} - component: {fileID: 4783433737088858}
- component: {fileID: 114744353604177634}
m_Layer: 0 m_Layer: 0
m_Name: terr2 m_Name: terr2
m_TagString: Untagged m_TagString: Untagged
@ -16313,6 +16314,18 @@ MeshCollider:
m_CookingOptions: 14 m_CookingOptions: 14
m_SkinWidth: 0.01 m_SkinWidth: 0.01
m_Mesh: {fileID: 4300000, guid: 99d0111f01c394540a69064c1a297091, type: 3} m_Mesh: {fileID: 4300000, guid: 99d0111f01c394540a69064c1a297091, type: 3}
--- !u!114 &114744353604177634
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1743310745419280}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2301390022f0d72478aae034e36cd8ff, type: 3}
m_Name:
m_EditorClassIdentifier:
LandMarkLocations: []
--- !u!136 &136868085561158672 --- !u!136 &136868085561158672
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

+ 13
- 0
Assets/FBX/terrain_Prefabs/terr3.prefab View File

@ -3258,6 +3258,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 4622920038269138} - component: {fileID: 4622920038269138}
- component: {fileID: 114695870893068766}
m_Layer: 0 m_Layer: 0
m_Name: terr3 m_Name: terr3
m_TagString: Untagged m_TagString: Untagged
@ -17345,6 +17346,18 @@ MeshCollider:
m_CookingOptions: 14 m_CookingOptions: 14
m_SkinWidth: 0.01 m_SkinWidth: 0.01
m_Mesh: {fileID: 4300000, guid: 99d0111f01c394540a69064c1a297091, type: 3} m_Mesh: {fileID: 4300000, guid: 99d0111f01c394540a69064c1a297091, type: 3}
--- !u!114 &114695870893068766
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1826403842147774}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2301390022f0d72478aae034e36cd8ff, type: 3}
m_Name:
m_EditorClassIdentifier:
LandMarkLocations: []
--- !u!136 &136093957553854336 --- !u!136 &136093957553854336
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

+ 13
- 0
Assets/FBX/terrain_Prefabs/terr4.prefab View File

@ -1394,6 +1394,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 4594271762715008} - component: {fileID: 4594271762715008}
- component: {fileID: 114688868122780174}
m_Layer: 0 m_Layer: 0
m_Name: terr4 m_Name: terr4
m_TagString: Untagged m_TagString: Untagged
@ -11532,6 +11533,18 @@ MeshCollider:
m_CookingOptions: 14 m_CookingOptions: 14
m_SkinWidth: 0.01 m_SkinWidth: 0.01
m_Mesh: {fileID: 4300000, guid: 42d10c28f3c5cc8489591fcbe44f04cb, type: 3} m_Mesh: {fileID: 4300000, guid: 42d10c28f3c5cc8489591fcbe44f04cb, type: 3}
--- !u!114 &114688868122780174
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1577805789422060}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2301390022f0d72478aae034e36cd8ff, type: 3}
m_Name:
m_EditorClassIdentifier:
LandMarkLocations: []
--- !u!136 &136068552619605964 --- !u!136 &136068552619605964
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

+ 0
- 1
Assets/Scipts/PlayerControllers/Player.cs View File

@ -58,7 +58,6 @@ public class Player : MonoBehaviour
foreach (GameObject dummie in dummies) foreach (GameObject dummie in dummies)
{ {
dummie.transform.rotation = playerModel.transform.rotation; dummie.transform.rotation = playerModel.transform.rotation;
Debug.Log(dummieAnims[count]);
dummieAnims[count].SetFloat("WalkSpeed", playerAnim.GetFloat("WalkSpeed")); dummieAnims[count].SetFloat("WalkSpeed", playerAnim.GetFloat("WalkSpeed"));
if (playerAnim.GetBool("PickUp")) if (playerAnim.GetBool("PickUp"))

+ 8
- 0
Assets/Shaders.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f87a054963b01dc4c8aa2e3ffedcca21
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 8
- 0
Assets/WorldAssets.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7da0e8d0a6415f944aa43dff57b38ae3
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 8
- 0
Assets/WorldAssets/Models.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c207356b78ec8e8499bb6047218dd104
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Loading…
Cancel
Save