Merge branch 'work' of...

Merge branch 'work' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/explosive-temper into work # Conflicts: # Assets/_Game/Scenes/1.Tutorial.unity

Merge branch 'work' of...
Merge branch 'work' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/explosive-temper into work # Conflicts: # Assets/_Game/Scenes/1.Tutorial.unity
cb7faccd · Larrox · 22f6d156 · bd0e74f7 · cb7faccd · cb7faccd
Commit cb7faccd authored Mar 31, 2019 by Larrox
15 changed files
--- a/Assets/_Game/Scenes/1.Tutorial.unity
+++ b/Assets/_Game/Scenes/1.Tutorial.unity
@@ -3635,7 +3635,6 @@ Transform:
  - {fileID: 1737557630}
  - {fileID: 2010496558}
  - {fileID: 213186854}
-  - {fileID: 2093234189}
  m_Father: {fileID: 0}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5983,7 +5982,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 9414143b820e3794a8248155c9fbf1f2, type: 3}
--- !u!1001 &1094968811
+--- !u!1001 &1114258727
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
@@ -6003,7 +6002,7 @@ PrefabInstance:
    - target: {fileID: 6287815333259267955, guid: 6c938807bfd94194cb880d4ab8d9a449,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0.5
+      value: -0.52
      objectReference: {fileID: 0}
    - target: {fileID: 6287815333259267955, guid: 6c938807bfd94194cb880d4ab8d9a449,
        type: 3}
@@ -6373,7 +6372,7 @@ PrefabInstance:
    - target: {fileID: 4412409797423783346, guid: 655c31af15390a04b9e81f860a5652ad,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4412409797423783346, guid: 655c31af15390a04b9e81f860a5652ad,
        type: 3}
@@ -9531,21 +9530,6 @@ PrefabInstance:
      propertyPath: m_Name
      value: TextPopIn
      objectReference: {fileID: 0}
-    - target: {fileID: 327750272267994774, guid: 1db0825eb7bdfcc4ebf064694c28478a,
-        type: 3}
-      propertyPath: m_Color.r
-      value: 0.7075472
-      objectReference: {fileID: 0}
-    - target: {fileID: 327750272267994774, guid: 1db0825eb7bdfcc4ebf064694c28478a,
-        type: 3}
-      propertyPath: m_Color.g
-      value: 0.7075472
-      objectReference: {fileID: 0}
-    - target: {fileID: 327750272267994774, guid: 1db0825eb7bdfcc4ebf064694c28478a,
-        type: 3}
-      propertyPath: m_Color.b
-      value: 0.7075472
-      objectReference: {fileID: 0}
    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
        type: 3}
      propertyPath: m_LocalPosition.x
@@ -9651,26 +9635,6 @@ PrefabInstance:
      propertyPath: m_Pivot.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 327750272267994775, guid: 1db0825eb7bdfcc4ebf064694c28478a,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 327750272267994775, guid: 1db0825eb7bdfcc4ebf064694c28478a,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 327750272267994775, guid: 1db0825eb7bdfcc4ebf064694c28478a,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -80
-      objectReference: {fileID: 0}
-    - target: {fileID: 327750272267994775, guid: 1db0825eb7bdfcc4ebf064694c28478a,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 1db0825eb7bdfcc4ebf064694c28478a, type: 3}
 --- !u!224 &1850680914 stripped
@@ -11024,86 +10988,6 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 2090565691}
  m_PrefabAsset: {fileID: 0}
--- !u!1001 &2093234188
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 501578185}
-    m_Modifications:
-    - target: {fileID: 1192831185969137609, guid: 5df05c0633a5dd64c882e42408b75dac,
-        type: 3}
-      propertyPath: m_Name
-      value: WoodBlock (21)
-      objectReference: {fileID: 0}
-    - target: {fileID: 2538585548309394087, guid: 9414143b820e3794a8248155c9fbf1f2,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 127
-      objectReference: {fileID: 0}
-    - target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 31
-      objectReference: {fileID: 0}
-    - target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 132
-      objectReference: {fileID: 0}
-    - target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 9414143b820e3794a8248155c9fbf1f2, type: 3}
--- !u!4 &2093234189 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2538585548309394087, guid: 9414143b820e3794a8248155c9fbf1f2,
-    type: 3}
-  m_PrefabInstance: {fileID: 2093234188}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2097411722
 PrefabInstance:
  m_ObjectHideFlags: 0

--- a/Assets/_Game/Scenes/2.First Steps.unity
+++ b/Assets/_Game/Scenes/2.First Steps.unity
@@ -6406,6 +6406,58 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 807668921}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &809787120
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 809787121}
+  - component: {fileID: 809787122}
+  m_Layer: 0
+  m_Name: TutorialManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &809787121
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 809787120}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 2056369369}
+  - {fileID: 1193395369}
+  - {fileID: 1803052187}
+  m_Father: {fileID: 0}
+  m_RootOrder: 14
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &809787122
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 809787120}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0e28cb63cbb9d644da84ea58b0b7e165, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tutorialElements:
+  - {fileID: 1193395372}
+  - {fileID: 1803052190}
+  popInElement: {fileID: 2056369368}
+  showTimerAt: 0
+  showBombSelectionAt: 0
 --- !u!1001 &813942996
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -8439,6 +8491,88 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 9874d418cabc4164e9699ad9e104310c, type: 3}
+--- !u!1 &1193395368
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1193395369}
+  - component: {fileID: 1193395372}
+  - component: {fileID: 1193395371}
+  - component: {fileID: 1193395370}
+  m_Layer: 0
+  m_Name: MoveCamera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1193395369
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1193395368}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 809787121}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1193395370
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1193395368}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9ef58d1b30d0c68429bbd21a29c74ab4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  relevantGameObject: {fileID: 0}
+  relevantObject: 2
+  completionCondition: 0
+  comparisonValue: 0
+  inverted: 1
+--- !u!114 &1193395371
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1193395368}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9ef58d1b30d0c68429bbd21a29c74ab4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  relevantGameObject: {fileID: 0}
+  relevantObject: 2
+  completionCondition: 0
+  comparisonValue: 0
+  inverted: 0
+--- !u!114 &1193395372
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1193395368}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e0e1fdd98469cad41bd7be89a2a63b9d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  showCondition: {fileID: 1193395371}
+  completionCondition: {fileID: 1193395370}
+  text: You can pan around the level using WASD or the arrow keys
 --- !u!1001 &1193626248
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -13209,6 +13343,88 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 1697965429}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1803052186
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1803052187}
+  - component: {fileID: 1803052190}
+  - component: {fileID: 1803052189}
+  - component: {fileID: 1803052188}
+  m_Layer: 0
+  m_Name: HideUI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1803052187
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1803052186}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 809787121}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1803052188
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1803052186}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9ef58d1b30d0c68429bbd21a29c74ab4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  relevantGameObject: {fileID: 0}
+  relevantObject: 2
+  completionCondition: 0
+  comparisonValue: 0
+  inverted: 1
+--- !u!114 &1803052189
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1803052186}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9ef58d1b30d0c68429bbd21a29c74ab4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  relevantGameObject: {fileID: 0}
+  relevantObject: 2
+  completionCondition: 0
+  comparisonValue: 0
+  inverted: 0
+--- !u!114 &1803052190
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1803052186}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e0e1fdd98469cad41bd7be89a2a63b9d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  showCondition: {fileID: 1803052189}
+  completionCondition: {fileID: 1803052188}
+  text: Push tab to show/hide the UI
 --- !u!1001 &1815037737
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -14922,6 +15138,143 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 2054923975}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2056369367
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 809787121}
+    m_Modifications:
+    - target: {fileID: 327750271250087782, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_Name
+      value: TextPopIn
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1db0825eb7bdfcc4ebf064694c28478a, type: 3}
+--- !u!114 &2056369368 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 327750272267994774, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+    type: 3}
+  m_PrefabInstance: {fileID: 2056369367}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &2056369369 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 327750271250087778, guid: 1db0825eb7bdfcc4ebf064694c28478a,
+    type: 3}
+  m_PrefabInstance: {fileID: 2056369367}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &2062384515 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 877063140715249140, guid: a33a09bfed4b41149b6eafe0746710a5,

--- a/Assets/_Game/Scenes/GameStart.unity
+++ b/Assets/_Game/Scenes/GameStart.unity
@@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.18065293, g: 0.22615506, b: 0.30712184, a: 1}
+  m_IndirectSpecularColor: {r: 0.18065289, g: 0.22615503, b: 0.3071219, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:

--- a/Assets/_Game/Scripts/Audio/SoundPlayer.cs
+++ b/Assets/_Game/Scripts/Audio/SoundPlayer.cs
@@ -16,7 +16,7 @@ public class SoundPlayer : MonoBehaviour

    public void PlayExplosionSound(Global.Globals.BombType bombType)
    {
-        if (bombType == Global.Globals.BombType.BigBoi && explosionsBig != null)
+        if (bombType == Global.Globals.BombType.TNT && explosionsBig != null)
        {
            PlaySound(explosionsBig);
        }

--- a/Assets/_Game/Scripts/UI/LevelButton.cs
+++ b/Assets/_Game/Scripts/UI/LevelButton.cs
@@ -8,14 +8,19 @@ public class LevelButton : MyButton

 	public string levelName;
 	public bool isPreSelected = false;
-		
-    void Update()
+
+	public Color highlitedColor;
+
+	public Color normalColor;
+
+	void Update()
    {
        
    }

 	void Start()
 	{
+		SetColor(normalColor);
 		levelName = text.text;
 		if (isPreSelected)
 		{
@@ -23,4 +28,21 @@ public class LevelButton : MyButton
 		}
 		sampleButton.onClick.AddListener(() =>GameManager.Instance.HudController.SetSelctedLevelButton(this));
 	}
+	public void SetColor(Color color)
+	{
+		var colors = sampleButton.colors;
+		colors.normalColor = color;
+		colors.highlightedColor = color;
+		sampleButton.colors = colors;
+	}
+
+	public void SetHighlitedColor()
+	{
+		SetColor(highlitedColor);
+	}
+
+	public void SetNormalColor()
+	{
+		SetColor(normalColor);
+	}
 }
--- a/Assets/_Game/Scripts/UI/LevelSelection.cs
+++ b/Assets/_Game/Scripts/UI/LevelSelection.cs
@@ -17,6 +17,8 @@ public class LevelSelection : MonoBehaviour

 	public GameObject ButtonPrefab;
 	public Transform content;
+
+
 	
 	LevelButton selectedButton;

@@ -79,11 +81,12 @@ public class LevelSelection : MonoBehaviour
 	{
 		if (selectedButton != null)
 		{
-
-			selectedButton.ShowSelectionBorder(false);
+			selectedButton.SetNormalColor();
+			//selectedButton.ShowSelectionBorder(false);
 		}
 		selectedButton = levelButton;
-		selectedButton.ShowSelectionBorder(true);
+		selectedButton.SetHighlitedColor();
+		//selectedButton.ShowSelectionBorder(true);
 	}

 	public string GetSelectedLevelName()