Water baddie fix

-Fixed water baddie having tree in his caracter.
GameDev · Oct 8, 2013 · 8816859 · 8816859
1 parent 11bd791
commit 8816859
Show file tree

Hide file tree

Showing 8 changed files with 782 additions and 2,039 deletions.
diff --git a/...s/Game Spirtes/Baddies/Water Baddie/Back/Parts/Flower_Baddie_0003_Layer-1-copy-4.png.meta b/...s/Game Spirtes/Baddies/Water Baddie/Back/Parts/Flower_Baddie_0003_Layer-1-copy-4.png.meta
diff --git a/Guardian of Silverkeep/Assets/Game Spirtes/Baddies/Water Baddie/Back/Parts/Materials.meta b/Guardian of Silverkeep/Assets/Game Spirtes/Baddies/Water Baddie/Back/Parts/Materials.meta
diff --git a/...e Spirtes/Baddies/Water Baddie/Back/Parts/Materials/Flower_Baddie_0003_Layer-1-copy-4.mat b/...e Spirtes/Baddies/Water Baddie/Back/Parts/Materials/Flower_Baddie_0003_Layer-1-copy-4.mat
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Flower_Baddie_0003_Layer-1-copy-4
+  m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 2800000, guid: b0ba75d08fe0fde428b83451a8a594f4, type: 3}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats: {}
+    m_Colors: {}
diff --git a/...rtes/Baddies/Water Baddie/Back/Parts/Materials/Flower_Baddie_0003_Layer-1-copy-4.mat.meta b/...rtes/Baddies/Water Baddie/Back/Parts/Materials/Flower_Baddie_0003_Layer-1-copy-4.mat.meta
diff --git a/...sets/Game Spirtes/Baddies/Water Baddie/Front/Parts/Materials/Flower_Baddie_0005_bot 1.mat b/...sets/Game Spirtes/Baddies/Water Baddie/Front/Parts/Materials/Flower_Baddie_0005_bot 1.mat
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Flower_Baddie_0005_bot 1
+  m_Shader: {fileID: 30, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 2800000, guid: b5832cfc1a28bad49a6a4c51b776563e, type: 3}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats: {}
+    m_Colors:
+      data:
+        first:
+          name: _Color
+        second: {r: 1, g: 1, b: 1, a: 1}
diff --git a/...Game Spirtes/Baddies/Water Baddie/Front/Parts/Materials/Flower_Baddie_0005_bot 1.mat.meta b/...Game Spirtes/Baddies/Water Baddie/Front/Parts/Materials/Flower_Baddie_0005_bot 1.mat.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
@@ -166,7 +166,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: -12.1633101, y: -.761309385, z: -14.8013258}
   m_LocalScale: {x: 1, y: 1, z: -1}
   m_Children:
   - {fileID: 400012}
@@ -309,7 +309,7 @@ Renderer:
   m_LightmapIndex: 255
   m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
   m_Materials:
-  - {fileID: 2100000, guid: 310c8e2149015e64c95ead8c81ab98b9, type: 2}
+  - {fileID: 2100000, guid: a5a6a0a32eb3cbc4eb08b50163c6d066, type: 2}
   m_SubsetIndices: 
   m_StaticBatchRoot: {fileID: 0}
   m_UseLightProbes: 1