Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
I finally found the function I need to call child correctly, facing a… 
…nimation calls stage 1 complete, no more jumpy baddies.
  • Loading branch information
Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
1 parent 4c9fc1c commit 20ec19f
Show file tree
Hide file tree
Showing 5 changed files with 248 additions and 769 deletions.
2 changes: 1 addition & 1 deletion ...Assets/Game Spirtes/Baddies/Water Baddie/Front/Parts/Materials/Flower_Baddie_0005_bot.mat
View file
Expand Up @@ -16,7 +16,7 @@ Material:
first:
name: _MainTex
second:
m_Texture: {fileID: 2800000, guid: 6e65e0c6ddfa9264aad17bb34c94d4e8, type: 3}
m_Texture: {fileID: 2800000, guid: b5832cfc1a28bad49a6a4c51b776563e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats: {}
Expand Down
14 changes: 0 additions & 14 deletions Guardian of Silverkeep/Assets/Prefab Flipped/water_baddie_front.prefab
View file
Expand Up @@ -115,7 +115,6 @@ GameObject:
m_Component:
- 4: {fileID: 400012}
- 33: {fileID: 3300010}
- 64: {fileID: 6400010}
- 23: {fileID: 2300010}
m_Layer: 0
m_Name: bottom
Expand Down Expand Up @@ -422,19 +421,6 @@ MeshCollider:
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400010
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100012}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!111 &11100000
Animation:
m_ObjectHideFlags: 1
Expand Down
111 changes: 6 additions & 105 deletions Guardian of Silverkeep/Assets/Prefab/Enemy_StandardWeak.prefab
View file
Expand Up @@ -45,7 +45,6 @@ GameObject:
m_Component:
- 4: {fileID: 400004}
- 33: {fileID: 3300002}
- 64: {fileID: 6400000}
- 23: {fileID: 2300000}
m_Layer: 0
m_Name: bottom
Expand Down Expand Up @@ -79,7 +78,6 @@ GameObject:
m_Component:
- 4: {fileID: 400008}
- 33: {fileID: 3300004}
- 64: {fileID: 6400002}
- 23: {fileID: 2300002}
m_Layer: 0
m_Name: eye
Expand All @@ -97,7 +95,6 @@ GameObject:
m_Component:
- 4: {fileID: 400010}
- 33: {fileID: 3300006}
- 64: {fileID: 6400004}
- 23: {fileID: 2300004}
m_Layer: 0
m_Name: eye
Expand All @@ -115,7 +112,6 @@ GameObject:
m_Component:
- 4: {fileID: 400012}
- 33: {fileID: 3300008}
- 64: {fileID: 6400006}
- 23: {fileID: 2300006}
m_Layer: 0
m_Name: mid
Expand All @@ -133,7 +129,6 @@ GameObject:
m_Component:
- 4: {fileID: 400014}
- 33: {fileID: 3300010}
- 64: {fileID: 6400008}
- 23: {fileID: 2300008}
m_Layer: 0
m_Name: head
Expand All @@ -151,7 +146,6 @@ GameObject:
m_Component:
- 4: {fileID: 400016}
- 33: {fileID: 3300012}
- 64: {fileID: 6400010}
- 23: {fileID: 2300010}
m_Layer: 0
m_Name: top
Expand Down Expand Up @@ -320,7 +314,6 @@ GameObject:
m_Component:
- 4: {fileID: 400036}
- 33: {fileID: 3300028}
- 64: {fileID: 6400022}
- 23: {fileID: 2300028}
m_Layer: 0
m_Name: top
Expand Down Expand Up @@ -1124,7 +1117,7 @@ MeshFilter:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
m_Mesh: {fileID: 0}
--- !u!33 &3300002
MeshFilter:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -1280,97 +1273,6 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &6400000
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100004}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400002
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100008}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400004
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100010}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400006
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100012}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400008
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100014}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400010
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100016}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400022
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100036}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!65 &6500000
BoxCollider:
m_ObjectHideFlags: 1
Expand All @@ -1381,7 +1283,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Size: {x: 1.29999995, y: 1.29999995, z: 1.29999995}
m_Center: {x: 0, y: 0, z: 0}
--- !u!111 &11100000
Animation:
Expand Down Expand Up @@ -1472,11 +1374,10 @@ MonoBehaviour:
enemyHealth: 1
enemyDamage: 1
JoyStone: {fileID: 100000, guid: 23391462cfee64eb8a24c23eb3616ff5, type: 2}
testChild001: {fileID: 100030}
water_baddie_front: {fileID: 0}
water_baddie_back: {fileID: 0}
water_baddie_left: {fileID: 0}
water_baddie_right: {fileID: 0}
childFront: water_baddie_front
childBack: water_baddie_back
childLeft: water_baddie_left
childRight: water_baddie_right
--- !u!114 &11400002
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down

0 comments on commit 20ec19f

Please sign in to comment.