Merge branch 'dev-main' into dev-hazim

Assets/Scenes/BossRoom.unity

@@ -8896,7 +8896,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.39434478
+      value: 0.3943448
       objectReference: {fileID: 0}
     - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3}
       propertyPath: m_LocalRotation.y
@@ -8936,11 +8936,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1676734516695783279, guid: 0193228de87741d40a42e561901c9083, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.3097298
+      value: 0.30972984
       objectReference: {fileID: 0}
     - target: {fileID: 1676734516695783279, guid: 0193228de87741d40a42e561901c9083, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.14506969
+      value: -0.1450697
       objectReference: {fileID: 0}
     - target: {fileID: 1676734516724634599, guid: 0193228de87741d40a42e561901c9083, type: 3}
       propertyPath: m_LocalPosition.z
@@ -9161,15 +9161,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.3943448
+      value: 0.39434484
       objectReference: {fileID: 0}
     - target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.31044647
+      value: 0.3104465
       objectReference: {fileID: 0}
     - target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.14352977
+      value: -0.1435298
       objectReference: {fileID: 0}
     - target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -71519,7 +71519,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!23 &2112298836704220321
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -125422,6 +125422,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 5277713031461887262}
     m_Modifications:
+    - target: {fileID: 287261183292069580, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
+      propertyPath: m_Text
+      value: F
+      objectReference: {fileID: 0}
     - target: {fileID: 1201613408548134179, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
       propertyPath: m_TooltipText
       value: btn2
@@ -125430,6 +125434,10 @@ PrefabInstance:
       propertyPath: m_TooltipPopup
       value: 
       objectReference: {fileID: 4768801497889015876}
+    - target: {fileID: 3142593226391990718, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
+      propertyPath: m_Text
+      value: Q
+      objectReference: {fileID: 0}
     - target: {fileID: 3705079063758597179, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
       propertyPath: m_TooltipText
       value: btn1
@@ -125446,6 +125454,14 @@ PrefabInstance:
       propertyPath: m_TooltipPopup
       value: 
       objectReference: {fileID: 4768801497889015876}
+    - target: {fileID: 6370150910881601849, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
+      propertyPath: m_Text
+      value: E
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063044584293457162, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
+      propertyPath: m_Text
+      value: R
+      objectReference: {fileID: 0}
     - target: {fileID: 8541408498845648049, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
       propertyPath: m_TooltipText
       value: Open/close the Emote panel
@@ -125454,6 +125470,10 @@ PrefabInstance:
       propertyPath: m_TooltipPopup
       value: 
       objectReference: {fileID: 4768801497889015876}
+    - target: {fileID: 9059929380136398060, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
+      propertyPath: m_Text
+      value: DashNCrash
+      objectReference: {fileID: 0}
     - target: {fileID: 9059929380243764539, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -125478,6 +125498,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9059929380362573695, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
+      propertyPath: m_Text
+      value: FreezeThrow
+      objectReference: {fileID: 0}
     - target: {fileID: 9059929380544550687, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -125502,6 +125526,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9059929380831878974, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
+      propertyPath: m_Text
+      value: SWAP
+      objectReference: {fileID: 0}
     - target: {fileID: 9059929381413149715, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -125646,6 +125674,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9059929381991440442, guid: 334e483163a0ba54bb764e318223c9ba, type: 3}
+      propertyPath: m_Text
+      value: Vector Wall
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -142338,7 +142370,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2885098433089441387, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3858202051709696623, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target