Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame

Assets/Models/Materials/cabin-Walls.mat

@@ -73,5 +73,5 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.042359468, g: 0.3263754, b: 0.10359489, a: 1}
+    - _Color: {r: 0.0744927, g: 0.509434, b: 0.16510543, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Prefabs/Part_Shoot_Weapon.prefab

@@ -51,7 +51,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: -876546973899608171, guid: f7fb72950098ea84fbcb73709374e822, type: 3}
+  - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 0}
   m_StaticBatchInfo:
     firstSubMesh: 0

Assets/Scenes/Test-Haitem.unity

@@ -272,6 +272,90 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 6179705720582673448}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &957927410
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 2.886
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071067
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: a20f14621725df742ad2c1028ff4f453,
+        type: 3}
+      propertyPath: m_Name
+      value: lanterd
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a20f14621725df742ad2c1028ff4f453, type: 3}
 --- !u!1 &1129927357
 GameObject:
   m_ObjectHideFlags: 0
@@ -336,7 +420,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1272265849
 GameObject:
@@ -442,7 +526,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &3163490711718144037
 PrefabInstance:
@@ -575,16 +659,36 @@ PrefabInstance:
       propertyPath: m_StaticEditorFlags
       value: 4294967295
       objectReference: {fileID: 0}
+    - target: {fileID: 3027373087534301616, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 9ff6a660ccc528244bcbb8f19248c0b0, type: 2}
     - target: {fileID: 3101937433285568433, guid: 5322794fa1699704b8e50a14cef106b1,
         type: 3}
       propertyPath: m_StaticEditorFlags
       value: 4294967295
       objectReference: {fileID: 0}
+    - target: {fileID: 3224351627309651277, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 9ff6a660ccc528244bcbb8f19248c0b0, type: 2}
+    - target: {fileID: 3472180956605098153, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: be8371476730d1e47abc1c22cc9557df, type: 2}
     - target: {fileID: 3520679535757810344, guid: 5322794fa1699704b8e50a14cef106b1,
         type: 3}
       propertyPath: m_StaticEditorFlags
       value: 4294967295
       objectReference: {fileID: 0}
+    - target: {fileID: 3539797824841418103, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 20a5ddee6c19a1e4999bf143e6d9ef9e, type: 2}
     - target: {fileID: 3974723396677692687, guid: 5322794fa1699704b8e50a14cef106b1,
         type: 3}
       propertyPath: m_StaticEditorFlags
@@ -620,6 +724,11 @@ PrefabInstance:
       propertyPath: m_StaticEditorFlags
       value: 4294967295
       objectReference: {fileID: 0}
+    - target: {fileID: 5281188057666706421, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 9ff6a660ccc528244bcbb8f19248c0b0, type: 2}
     - target: {fileID: 5859379536716062794, guid: 5322794fa1699704b8e50a14cef106b1,
         type: 3}
       propertyPath: m_Name
@@ -730,6 +839,11 @@ PrefabInstance:
       propertyPath: m_StaticEditorFlags
       value: 4294967295
       objectReference: {fileID: 0}
+    - target: {fileID: 7944950672751888448, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 9ff6a660ccc528244bcbb8f19248c0b0, type: 2}
     - target: {fileID: 8192069020826056142, guid: 5322794fa1699704b8e50a14cef106b1,
         type: 3}
       propertyPath: m_StaticEditorFlags
@@ -740,6 +854,11 @@ PrefabInstance:
       propertyPath: m_StaticEditorFlags
       value: 4294967295
       objectReference: {fileID: 0}
+    - target: {fileID: 8991935592206550335, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 20a5ddee6c19a1e4999bf143e6d9ef9e, type: 2}
     - target: {fileID: 8993526177235387292, guid: 5322794fa1699704b8e50a14cef106b1,
         type: 3}
       propertyPath: m_StaticEditorFlags