Merge branch 'master' of https://github.com/marcinzelent/ngj2019

2 files changed, 27 insertions, 7 deletions

diff --git a/nGJ2019/Assets/Prefabs/Dragon.prefab b/nGJ2019/Assets/Prefabs/Dragon.prefab
index 7163a3e..1ddf9d3 100644
--- a/nGJ2019/Assets/Prefabs/Dragon.prefab
+++ b/nGJ2019/Assets/Prefabs/Dragon.prefab
@@ -252,6 +252,26 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 0.27564865
       objectReference: {fileID: 0}
+    - target: {fileID: -3776077622187685775, guid: 89a9598fd81fa654db8c1fe9e3842481,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 74ee3c10b63fcc140bed436c051aec5c, type: 2}
+    - target: {fileID: 5444894743097917619, guid: 89a9598fd81fa654db8c1fe9e3842481,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: dd5f3c7936bddc04aafe0220f7b19503, type: 2}
+    - target: {fileID: -2174884462299768658, guid: 89a9598fd81fa654db8c1fe9e3842481,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: dd5f3c7936bddc04aafe0220f7b19503, type: 2}
+    - target: {fileID: -1389157037694621049, guid: 89a9598fd81fa654db8c1fe9e3842481,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: dd5f3c7936bddc04aafe0220f7b19503, type: 2}
     - target: {fileID: 8962655216809570878, guid: 89a9598fd81fa654db8c1fe9e3842481,
         type: 3}
       propertyPath: m_LocalScale.x
diff --git a/nGJ2019/Assets/Prefabs/health_crystal.prefab b/nGJ2019/Assets/Prefabs/health_crystal.prefab
index 8b52814..2bbae32 100644
--- a/nGJ2019/Assets/Prefabs/health_crystal.prefab
+++ b/nGJ2019/Assets/Prefabs/health_crystal.prefab
@@ -25,7 +25,7 @@ Transform:
   m_GameObject: {fileID: 6136547117420934535}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 1.1396179, y: -0.6755286, z: 2.9882812}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.53254, y: 1.53254, z: 1.53254}
   m_Children:
   - {fileID: 7434249188869609042}
   m_Father: {fileID: 0}
@@ -61,22 +61,22 @@ PrefabInstance:
     - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.7071068
+      value: -0.49991274
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: 0.50008726
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0.49991274
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.7071067
+      value: 0.50008726
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025,
         type: 3}
@@ -86,12 +86,12 @@ PrefabInstance:
     - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+      value: -89.98
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: 90
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025,
         type: 3}