From 946eb8e36ffb277cb53e57d02a61551cd8229bea Mon Sep 17 00:00:00 2001 From: Tianzhu Zhang Date: Tue, 8 Oct 2013 14:55:16 -0400 Subject: [PATCH] before tree/water baddie fix push --- .../Prefab Flipped/water_baddie_front.prefab | 86 ++----------------- .../Assets/Prefab/BigJoyStone.prefab | 75 +++++++++++++++- .../Assets/Prefab/JoyStone.prefab | 71 ++++++++++++++- .../Materials/Materials/joystone 2.mat | 2 +- .../Materials/Materials/joystone 3.mat | 2 +- .../Texture/Materials/Materials/joystone.mat | 4 +- .../Assets/Texture/Materials/Thumbs.db.meta | 4 + 7 files changed, 156 insertions(+), 88 deletions(-) create mode 100644 Guardian of Silverkeep/Assets/Texture/Materials/Thumbs.db.meta diff --git a/Guardian of Silverkeep/Assets/Prefab Flipped/water_baddie_front.prefab b/Guardian of Silverkeep/Assets/Prefab Flipped/water_baddie_front.prefab index 29d56af..bbcf543 100644 --- a/Guardian of Silverkeep/Assets/Prefab Flipped/water_baddie_front.prefab +++ b/Guardian of Silverkeep/Assets/Prefab Flipped/water_baddie_front.prefab @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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} @@ -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: @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/Guardian of Silverkeep/Assets/Prefab/BigJoyStone.prefab b/Guardian of Silverkeep/Assets/Prefab/BigJoyStone.prefab index f3827ca..5e13df5 100644 --- a/Guardian of Silverkeep/Assets/Prefab/BigJoyStone.prefab +++ b/Guardian of Silverkeep/Assets/Prefab/BigJoyStone.prefab @@ -13,6 +13,7 @@ GameObject: - 23: {fileID: 2300000} - 114: {fileID: 11400000} - 54: {fileID: 5400000} + - 114: {fileID: 11400002} m_Layer: 0 m_Name: BigJoyStone m_TagString: Coin @@ -20,6 +21,23 @@ GameObject: 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 @@ -27,10 +45,22 @@ Transform: 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 @@ -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 @@ -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 @@ -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 diff --git a/Guardian of Silverkeep/Assets/Prefab/JoyStone.prefab b/Guardian of Silverkeep/Assets/Prefab/JoyStone.prefab index 9fc89d8..933185e 100644 --- a/Guardian of Silverkeep/Assets/Prefab/JoyStone.prefab +++ b/Guardian of Silverkeep/Assets/Prefab/JoyStone.prefab @@ -13,6 +13,7 @@ GameObject: - 23: {fileID: 2300000} - 114: {fileID: 11400000} - 54: {fileID: 5400000} + - 114: {fileID: 11400002} m_Layer: 0 m_Name: JoyStone m_TagString: Coin @@ -20,6 +21,23 @@ GameObject: 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: JstoneSmall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &400000 Transform: m_ObjectHideFlags: 1 @@ -29,8 +47,20 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - 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: .0500000007, y: .0500000007, z: .0500000007} + m_Children: [] + m_Father: {fileID: 400000} --- !u!23 &2300000 Renderer: m_ObjectHideFlags: 1 @@ -49,13 +79,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: a4d0b4a308d4140cca1724386212e7a1, 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: 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 @@ -86,6 +141,18 @@ MonoBehaviour: moneySuckRange: 5 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 diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 2.mat b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 2.mat index 99e63a6..bca7f5c 100644 --- a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 2.mat +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 2.mat @@ -7,7 +7,7 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: joystone 2 - m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 30, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: [] m_SavedProperties: serializedVersion: 2 diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 3.mat b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 3.mat index 19d08e1..1b730be 100644 --- a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 3.mat +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 3.mat @@ -7,7 +7,7 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: joystone 3 - m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 30, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: [] m_SavedProperties: serializedVersion: 2 diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone.mat b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone.mat index 428af26..c81d399 100644 --- a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone.mat +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone.mat @@ -7,7 +7,7 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: joystone - m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 30, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: [] m_SavedProperties: serializedVersion: 2 @@ -16,7 +16,7 @@ Material: first: name: _MainTex second: - m_Texture: {fileID: 2800000, guid: 7e53829d09be4594eafd649733610e44, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: {} diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Thumbs.db.meta b/Guardian of Silverkeep/Assets/Texture/Materials/Thumbs.db.meta new file mode 100644 index 0000000..abe9cf3 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Thumbs.db.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 972efccb1bfc24c8b9e2ed1c6fbb5453 +DefaultImporter: + userData: