Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense

Assets/Materials/DefaultMaterial.mat

@@ -117,8 +117,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 0
     m_Colors:
-    - _BaseColor: {r: 0.3803922, g: 0.38431376, b: 0.3921569, a: 1}
-    - _Color: {r: 0.38039213, g: 0.38431373, b: 0.39215687, a: 1}
+    - _BaseColor: {r: 0.3485819, g: 0.39803886, b: 0.4716981, a: 1}
+    - _Color: {r: 0.34858188, g: 0.3980388, b: 0.4716981, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []

Assets/Prefabs/Towers/BlackHole.prefab

@@ -61,7 +61,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: -1020301552483200737, guid: 81c113ab4fb3e22748b1f98217139f12, type: 3}
+  - {fileID: 2100000, guid: 00ebaf6bd8b3d884289d0e3119d2540f, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -145,7 +145,7 @@ MeshRenderer:
   m_RendererPriority: 0
   m_Materials:
   - {fileID: -6629797300637803691, guid: 81c113ab4fb3e22748b1f98217139f12, type: 3}
-  - {fileID: 6699446615349125189, guid: 81c113ab4fb3e22748b1f98217139f12, type: 3}
+  - {fileID: 2100000, guid: 00ebaf6bd8b3d884289d0e3119d2540f, type: 2}
   - {fileID: -6478536213147159724, guid: 81c113ab4fb3e22748b1f98217139f12, type: 3}
   m_StaticBatchInfo:
     firstSubMesh: 0

Assets/Prefabs/Towers/Gripper.prefab

@@ -145,7 +145,7 @@ MeshRenderer:
   m_RendererPriority: 0
   m_Materials:
   - {fileID: -6478536213147159724, guid: b6f90628eed2fe9e1bbb88db64de5c2a, type: 3}
-  - {fileID: -3522955778539423533, guid: b6f90628eed2fe9e1bbb88db64de5c2a, type: 3}
+  - {fileID: 2100000, guid: 9cfe68fa84d8a93408b2ce55a6238145, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -535,8 +535,8 @@ MeshRenderer:
   m_RendererPriority: 0
   m_Materials:
   - {fileID: -6629797300637803691, guid: b6f90628eed2fe9e1bbb88db64de5c2a, type: 3}
-  - {fileID: 4892006958994659731, guid: b6f90628eed2fe9e1bbb88db64de5c2a, type: 3}
-  - {fileID: -3522955778539423533, guid: b6f90628eed2fe9e1bbb88db64de5c2a, type: 3}
+  - {fileID: 2100000, guid: 9cfe68fa84d8a93408b2ce55a6238145, type: 2}
+  - {fileID: 2100000, guid: 9cfe68fa84d8a93408b2ce55a6238145, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

Assets/Prefabs/Towers/MrLazer.prefab

@@ -788,7 +788,7 @@ MeshRenderer:
   m_RendererPriority: 0
   m_Materials:
   - {fileID: -7198559261415225722, guid: 48ecac7381f19af3bab6fef54e6dbadc, type: 3}
-  - {fileID: -2813337366143557646, guid: 48ecac7381f19af3bab6fef54e6dbadc, type: 3}
+  - {fileID: 2100000, guid: 34f67e704433d2e41ad99e5ea7b15970, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -993,8 +993,8 @@ MeshRenderer:
   m_RendererPriority: 0
   m_Materials:
   - {fileID: -3846018093981099296, guid: 48ecac7381f19af3bab6fef54e6dbadc, type: 3}
-  - {fileID: 4874126678125670354, guid: 48ecac7381f19af3bab6fef54e6dbadc, type: 3}
-  - {fileID: -239009726367234950, guid: 48ecac7381f19af3bab6fef54e6dbadc, type: 3}
+  - {fileID: 2100000, guid: 34f67e704433d2e41ad99e5ea7b15970, type: 2}
+  - {fileID: 2100000, guid: 34f67e704433d2e41ad99e5ea7b15970, type: 2}
   - {fileID: -2813467912831258332, guid: 48ecac7381f19af3bab6fef54e6dbadc, type: 3}
   m_StaticBatchInfo:
     firstSubMesh: 0

Assets/Prefabs/Towers/Tesla.prefab

@@ -215,7 +215,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 3016479151454471876, guid: 72980d1326f21c0ffa34ea09162d1234, type: 3}
+  - {fileID: 2100000, guid: 4f667b9e151415f4dbd1d75777858335, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -332,7 +332,7 @@ MeshRenderer:
   m_Materials:
   - {fileID: 880774007180850119, guid: 72980d1326f21c0ffa34ea09162d1234, type: 3}
   - {fileID: -6629797300637803691, guid: 72980d1326f21c0ffa34ea09162d1234, type: 3}
-  - {fileID: 3016479151454471876, guid: 72980d1326f21c0ffa34ea09162d1234, type: 3}
+  - {fileID: 2100000, guid: 4f667b9e151415f4dbd1d75777858335, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -415,7 +415,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 3016479151454471876, guid: 72980d1326f21c0ffa34ea09162d1234, type: 3}
+  - {fileID: 2100000, guid: 4f667b9e151415f4dbd1d75777858335, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -498,7 +498,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 3016479151454471876, guid: 72980d1326f21c0ffa34ea09162d1234, type: 3}
+  - {fileID: 2100000, guid: 4f667b9e151415f4dbd1d75777858335, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

Assets/Prefabs/Towers/Turret.prefab

@@ -63,7 +63,7 @@ MeshRenderer:
   m_Materials:
   - {fileID: -6478536213147159724, guid: eb5e13df78999ef878da1db5c63224e2, type: 3}
   - {fileID: 4892006958994659731, guid: eb5e13df78999ef878da1db5c63224e2, type: 3}
-  - {fileID: 3243688835468109435, guid: eb5e13df78999ef878da1db5c63224e2, type: 3}
+  - {fileID: 2100000, guid: 453df639b86494041b3526d57bb2968c, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -572,7 +572,7 @@ MeshRenderer:
   m_RendererPriority: 0
   m_Materials:
   - {fileID: -6478536213147159724, guid: eb5e13df78999ef878da1db5c63224e2, type: 3}
-  - {fileID: 3243688835468109435, guid: eb5e13df78999ef878da1db5c63224e2, type: 3}
+  - {fileID: 2100000, guid: 453df639b86494041b3526d57bb2968c, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

Assets/Scenes/MainMenu.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+  m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -503,16 +503,101 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 2106751424727166590, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_Texture
+      value: 
+      objectReference: {fileID: 2800000, guid: 0b6e7ae63c5e9544aa7d8d1856b70499, type: 3}
     - target: {fileID: 3056065669230710374, guid: e83880d6526db0243a6f252cb0e828c8,
         type: 3}
       propertyPath: m_Name
       value: MainMenu
       objectReference: {fileID: 0}
+    - target: {fileID: 3327343849046281887, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3327343849046281887, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3327343849046281887, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3327343849046281887, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4477108964678118205, guid: e83880d6526db0243a6f252cb0e828c8,
         type: 3}
       propertyPath: m_Camera
       value: 
       objectReference: {fileID: 1541622504}
+    - target: {fileID: 5683376709369575367, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5683376709369575367, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5683376709369575367, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5683376709369575367, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6061339260787830218, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6061339260787830218, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6061339260787830218, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6061339260787830218, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7045148413652824342, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7045148413652824342, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7045148413652824342, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7045148413652824342, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7849779404840636332, guid: e83880d6526db0243a6f252cb0e828c8,
         type: 3}
       propertyPath: m_Pivot.x
@@ -613,6 +698,26 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8703782379942844586, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8703782379942844586, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8703782379942844586, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8703782379942844586, guid: e83880d6526db0243a6f252cb0e828c8,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []