Merge conflict patch and map texture update

Assets/Scenes/MiniGame-Kabely.unity

@@ -369,31 +369,17 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-<<<<<<< HEAD
-  - component: {fileID: 425617997}
-  - component: {fileID: 425617996}
-  - component: {fileID: 425617995}
-  - component: {fileID: 425617994}
-  - component: {fileID: 425617993}
-  - component: {fileID: 425617998}
-  m_Layer: 0
-  m_Name: canvas
-=======
   - component: {fileID: 431492667}
   - component: {fileID: 431492669}
   - component: {fileID: 431492668}
   - component: {fileID: 431492670}
   m_Layer: 5
   m_Name: L4
->>>>>>> origin/main
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
-<<<<<<< HEAD
---- !u!114 &425617993
-=======
 --- !u!224 &431492667
 RectTransform:
   m_ObjectHideFlags: 0
@@ -414,37 +400,27 @@ RectTransform:
   m_SizeDelta: {x: 55, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &431492668
->>>>>>> origin/main
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-<<<<<<< HEAD
-  m_GameObject: {fileID: 425617991}
-=======
   m_GameObject: {fileID: 431492666}
->>>>>>> origin/main
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
-<<<<<<< HEAD
-  m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-=======
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 1, b: 0, a: 1}
->>>>>>> origin/main
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 0}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -501,58 +477,11 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-<<<<<<< HEAD
-  m_TargetGraphic: {fileID: 425617993}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!224 &425617997
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 425617991}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!114 &425617998
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 425617991}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d3fa58532362d2547ab6cd0ab17d7bde, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::CableMiniGame
-  cables:
-  - colorName: 
-    sourceButton: {fileID: 0}
-    targetButton: {fileID: 0}
-    cableImage: {fileID: 0}
-  previousSceneName: 
-  wrongAttemptColor: {r: 1, g: 1, b: 1, a: 1}
-  blinkDuration: 0.2
---- !u!1 &1645776851
-=======
   m_TargetGraphic: {fileID: 431492668}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
 --- !u!1 &442827363
->>>>>>> origin/main
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}