Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Melee Attack animation added(bear claw thingy)
  • Loading branch information
Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
1 parent 20ec19f commit 4ea2bc4
Show file tree
Hide file tree
Showing 3 changed files with 319 additions and 18 deletions.
90 changes: 88 additions & 2 deletions Guardian of Silverkeep/Assets/Prefab/Hero_Attack_01.prefab
Expand Up @@ -13,13 +13,32 @@ GameObject:
- 23: {fileID: 2300000}
- 54: {fileID: 5400000}
- 114: {fileID: 11400000}
- 114: {fileID: 11400002}
m_Layer: 0
m_Name: Hero_Attack_01
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &100002
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 400002}
- 33: {fileID: 3300002}
- 23: {fileID: 2300002}
- 111: {fileID: 11100000}
m_Layer: 0
m_Name: polar bear arm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &400000
Transform:
m_ObjectHideFlags: 1
Expand All @@ -29,8 +48,20 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_Children: []
m_Children:
- {fileID: 400002}
m_Father: {fileID: 0}
--- !u!4 &400002
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106709}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: .127640486, y: .127640486, z: .127640486}
m_Children: []
m_Father: {fileID: 400000}
--- !u!23 &2300000
Renderer:
m_ObjectHideFlags: 1
Expand All @@ -49,13 +80,38 @@ Renderer:
m_UseLightProbes: 0
m_LightProbeAnchor: {fileID: 0}
m_ScaleInLightmap: 1
--- !u!23 &2300002
Renderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 2100000, guid: 75c8987774589e94d84679f60ead9a5c, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_LightProbeAnchor: {fileID: 0}
m_ScaleInLightmap: 1
--- !u!33 &3300000
MeshFilter:
m_ObjectHideFlags: 1
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
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!54 &5400000
Rigidbody:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -83,6 +139,24 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!111 &11100000
Animation:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Enabled: 1
serializedVersion: 3
m_Animation: {fileID: 7400000, guid: e22c45ff57f43544889bc99cd4aba735, type: 2}
m_Animations:
- {fileID: 7400000, guid: e22c45ff57f43544889bc99cd4aba735, type: 2}
m_WrapMode: 0
m_PlayAutomatically: 0
m_AnimatePhysics: 0
m_CullingType: 0
m_UserAABB:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 1
Expand All @@ -94,6 +168,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c02910df57bb64e4a9db1fcc20be8ba3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &11400002
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2d94b001577fb4600bea455d6b7e5d34, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Camera: {fileID: 0}
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
Expand Down
14 changes: 0 additions & 14 deletions Guardian of Silverkeep/Assets/Prefab/polar bear arm.prefab
Expand Up @@ -9,7 +9,6 @@ GameObject:
m_Component:
- 4: {fileID: 400000}
- 33: {fileID: 3300000}
- 64: {fileID: 6400000}
- 23: {fileID: 2300000}
- 111: {fileID: 11100000}
m_Layer: 0
Expand Down Expand Up @@ -55,19 +54,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400000
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
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

0 comments on commit 4ea2bc4

Please sign in to comment.