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

Assets/Prefabs/Part_Shoot_Weapon.prefab

@@ -51,7 +51,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2}
   - {fileID: 0}
   m_StaticBatchInfo:
     firstSubMesh: 0

Assets/Prefabs/Part_Shoot_Weapon_3.prefab

@@ -51,7 +51,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2}
   - {fileID: 0}
   m_StaticBatchInfo:
     firstSubMesh: 0
@@ -286,7 +286,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 1, g: 1, b: 1, a: 1}
+      maxColor: {r: 0.7264151, g: 0.7264151, b: 0.7264151, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}

Assets/Prefabs/Weapon_3.prefab

@@ -286,6 +286,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3983516630253985952}
     m_Modifications:
+    - target: {fileID: -6054058774237248251, guid: cbc33a01620116b4297cb35d378f0242,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2}
     - target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -356,6 +361,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 0.08
       objectReference: {fileID: 0}
+    - target: {fileID: -2397996973257786244, guid: cbc33a01620116b4297cb35d378f0242,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2}
     - target: {fileID: -927199367670048503, guid: cbc33a01620116b4297cb35d378f0242,
         type: 3}
       propertyPath: m_Name