Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
before tree/water baddie fix push
  • Loading branch information
Tianzhu Zhang authored and Tianzhu Zhang committed Oct 8, 2013
1 parent 7763342 commit 946eb8e
Show file tree
Hide file tree
Showing 7 changed files with 156 additions and 88 deletions.
86 changes: 8 additions & 78 deletions Guardian of Silverkeep/Assets/Prefab Flipped/water_baddie_front.prefab
View file
Expand Up @@ -9,7 +9,6 @@ GameObject:
m_Component:
- 4: {fileID: 400000}
- 33: {fileID: 3300000}
- 64: {fileID: 6400000}
- 23: {fileID: 2300000}
m_Layer: 0
m_Name: top
Expand All @@ -27,7 +26,6 @@ GameObject:
m_Component:
- 4: {fileID: 400002}
- 33: {fileID: 3300002}
- 64: {fileID: 6400002}
- 23: {fileID: 2300002}
m_Layer: 0
m_Name: eye
Expand All @@ -45,7 +43,6 @@ GameObject:
m_Component:
- 4: {fileID: 400004}
- 33: {fileID: 3300004}
- 64: {fileID: 6400004}
- 23: {fileID: 2300004}
m_Layer: 0
m_Name: mid
Expand Down Expand Up @@ -79,7 +76,6 @@ GameObject:
m_Component:
- 4: {fileID: 400008}
- 33: {fileID: 3300006}
- 64: {fileID: 6400006}
- 23: {fileID: 2300006}
m_Layer: 0
m_Name: head
Expand All @@ -97,7 +93,6 @@ GameObject:
m_Component:
- 4: {fileID: 400010}
- 33: {fileID: 3300008}
- 64: {fileID: 6400008}
- 23: {fileID: 2300008}
m_Layer: 0
m_Name: eye
Expand Down Expand Up @@ -142,8 +137,8 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.50507081, y: .0534139425, z: -.852867424}
m_LocalScale: {x: .187802225, y: .220974565, z: .220981121}
m_LocalPosition: {x: 1.79169297, y: .0534139425, z: -1.03562975}
m_LocalScale: {x: .220974386, y: .220974386, z: .220974386}
m_Children: []
m_Father: {fileID: 400008}
--- !u!4 &400004
Expand All @@ -165,7 +160,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.8101809, y: -1.32673454, z: 2.27555537}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: -1}
m_Children:
- {fileID: 400012}
Expand All @@ -180,8 +175,8 @@ Transform:
m_LocalPosition: {x: -.178604543, y: .0695821121, z: 1.94631112}
m_LocalScale: {x: .643785, y: 1.09414256, z: .998380661}
m_Children:
- {fileID: 400010}
- {fileID: 400002}
- {fileID: 400010}
m_Father: {fileID: 400000}
--- !u!4 &400010
Transform:
Expand All @@ -190,8 +185,8 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100010}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.79169297, y: .0534139425, z: -1.03562975}
m_LocalScale: {x: .220974386, y: .220974386, z: .220974386}
m_LocalPosition: {x: -1.50507081, y: .0534139425, z: -.852867424}
m_LocalScale: {x: .187802225, y: .220974565, z: .220981121}
m_Children: []
m_Father: {fileID: 400008}
--- !u!4 &400012
Expand Down Expand Up @@ -236,7 +231,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 2100000, guid: b523556d514513e4b9b39165dfbc4b78, type: 2}
- {fileID: 2100000, guid: 994de2bd37d93a54dad9d06f32c1da9c, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 1
Expand Down Expand Up @@ -290,7 +285,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 2100000, guid: 994de2bd37d93a54dad9d06f32c1da9c, type: 2}
- {fileID: 2100000, guid: b523556d514513e4b9b39165dfbc4b78, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 1
Expand Down Expand Up @@ -356,71 +351,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100012}
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!64 &6400002
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
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: 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 &6400006
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 &6400008
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!111 &11100000
Animation:
m_ObjectHideFlags: 1
Expand Down
75 changes: 71 additions & 4 deletions Guardian of Silverkeep/Assets/Prefab/BigJoyStone.prefab
View file
Expand Up @@ -13,24 +13,54 @@ GameObject:
- 23: {fileID: 2300000}
- 114: {fileID: 11400000}
- 54: {fileID: 5400000}
- 114: {fileID: 11400002}
m_Layer: 0
m_Name: BigJoyStone
m_TagString: Coin
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}
m_Layer: 0
m_Name: Plane
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &400000
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5, y: 0, z: 5}
m_LocalScale: {x: 1, y: 1, z: 1}
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: 2, y: 2, z: 2}
m_LocalScale: {x: .100000001, y: .100000001, z: .100000001}
m_Children: []
m_Father: {fileID: 0}
m_Father: {fileID: 400000}
--- !u!23 &2300000
Renderer:
m_ObjectHideFlags: 1
Expand All @@ -43,7 +73,25 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 2100000, guid: e549879a9f6b046d384432ea1c338e23, type: 2}
- {fileID: 2100000, guid: f0118b99558594f249e363d388a51b0c, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
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: f5bedc519bd734f3998b6ac9fa1e91a1, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
Expand All @@ -55,7 +103,14 @@ MeshFilter:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Mesh: {fileID: 10207, 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 @@ -86,6 +141,18 @@ MonoBehaviour:
moneySuckRange: 3
jstoneMovingSpeed: 5
hero: {fileID: 0}
--- !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!135 &13500000
SphereCollider:
m_ObjectHideFlags: 1
Expand Down

0 comments on commit 946eb8e

Please sign in to comment.