dragon bones with ears and eye

4 files changed, 51 insertions, 120 deletions

diff --git a/nGJ2019/Assets/Models/dragon_bones.FBX b/nGJ2019/Assets/Models/dragon_bones.FBX
deleted file mode 100644
index 16dfda9..0000000
--- a/nGJ2019/Assets/Models/dragon_bones.FBX
+++ /dev/null
diff --git a/nGJ2019/Assets/Models/dragon_bones_final.FBX b/nGJ2019/Assets/Models/dragon_bones_final.FBX
new file mode 100644
index 0000000..7e7f4ea
--- /dev/null
+++ b/nGJ2019/Assets/Models/dragon_bones_final.FBX
diff --git a/nGJ2019/Assets/Models/dragon_bones.FBX.meta b/nGJ2019/Assets/Models/dragon_bones_final.FBX.meta
index eae88ee..747d990 100644
--- a/nGJ2019/Assets/Models/dragon_bones.FBX.meta
+++ b/nGJ2019/Assets/Models/dragon_bones_final.FBX.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 450075a02616d0d43b5ca9ede22b8d7c
+guid: 7778eab16f3bf82458dd13e5bf684aec
 ModelImporter:
   serializedVersion: 25
   internalIDToNameTable:
diff --git a/nGJ2019/Assets/Scenes/Mian_sandbox.unity b/nGJ2019/Assets/Scenes/Mian_sandbox.unity
index 3ee0acd..ab5cd1d 100644
--- a/nGJ2019/Assets/Scenes/Mian_sandbox.unity
+++ b/nGJ2019/Assets/Scenes/Mian_sandbox.unity
@@ -170,7 +170,7 @@ PrefabInstance:
     - target: {fileID: -4216859302048453862, guid: fbb1d264bae087340a30a49b9b9e0148,
         type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: fbb1d264bae087340a30a49b9b9e0148,
         type: 3}
@@ -189,144 +189,144 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fbb1d264bae087340a30a49b9b9e0148, type: 3}
---- !u!1001 &226516156
+--- !u!1001 &248066052
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: aaed754ac84d08040a5accdbf4099353,
+    - target: {fileID: -927199367670048503, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_Name
-      value: dragon_3
+      value: obstacle_rock_top (1)
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: aaed754ac84d08040a5accdbf4099353,
+    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 3.8780136
+      value: 8.09
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: aaed754ac84d08040a5accdbf4099353,
+    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 2.0572062
+      value: 2.63
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: aaed754ac84d08040a5accdbf4099353,
+    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: aaed754ac84d08040a5accdbf4099353,
+    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: aaed754ac84d08040a5accdbf4099353,
+    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.7225638
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: aaed754ac84d08040a5accdbf4099353,
+    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: aaed754ac84d08040a5accdbf4099353,
+    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.69130427
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: aaed754ac84d08040a5accdbf4099353,
+    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 4
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: aaed754ac84d08040a5accdbf4099353,
+    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: aaed754ac84d08040a5accdbf4099353,
+    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 92.533005
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: aaed754ac84d08040a5accdbf4099353,
+    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: aaed754ac84d08040a5accdbf4099353, type: 3}
---- !u!1001 &248066052
+  m_SourcePrefab: {fileID: 100100000, guid: 416fae093739c55499f7dcb7d4f7f2c9, type: 3}
+--- !u!1001 &583309623
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: 416fae093739c55499f7dcb7d4f7f2c9,
+    - target: {fileID: -927199367670048503, guid: 450075a02616d0d43b5ca9ede22b8d7c,
         type: 3}
       propertyPath: m_Name
-      value: obstacle_rock_top (1)
+      value: dragon_bones
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 8.09
+      value: -12.675362
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 2.63
+      value: 5.911568
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
         type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: 0.67247695
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.7401181
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
         type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: 84.517006
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 416fae093739c55499f7dcb7d4f7f2c9, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 450075a02616d0d43b5ca9ede22b8d7c, type: 3}
 --- !u!1001 &694316132
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -377,7 +377,7 @@ PrefabInstance:
     - target: {fileID: -4216859302048453862, guid: fbb1d264bae087340a30a49b9b9e0148,
         type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: fbb1d264bae087340a30a49b9b9e0148,
         type: 3}
@@ -479,75 +479,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1597041709
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: -927199367670048503, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_Name
-      value: dragon
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.55
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.870657
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.16
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7559996
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.6545721
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 98.226006
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: e1be0eb310d9e9f4f831374a5baf7718, type: 3}
 --- !u!1 &1636020288
 GameObject:
   m_ObjectHideFlags: 0
@@ -625,7 +556,7 @@ Transform:
   m_LocalScale: {x: 2.19, y: 1.73, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &2114980576
 PrefabInstance:
@@ -677,7 +608,7 @@ PrefabInstance:
     - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 416fae093739c55499f7dcb7d4f7f2c9,
         type: 3}