머지 이후 오류 수정

Assets/_1Scene/GameScene.unity

@@ -14726,7 +14726,7 @@ Canvas:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 111418995}
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 3
   m_RenderMode: 1
   m_Camera: {fileID: 0}
@@ -269760,10 +269760,102 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 734688821}
     m_Modifications:
+    - target: {fileID: 263239521324137130, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 263239521324137130, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 263239521324137130, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 551283405669694696, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
       propertyPath: m_Name
       value: DispatchSelectedInfo
       objectReference: {fileID: 0}
+    - target: {fileID: 1458552627983841029, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1458552627983841029, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1458552627983841029, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1458552627983841029, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2368285003260897848, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2368285003260897848, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2368285003260897848, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2368285003260897848, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043650838446070542, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043650838446070542, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043650838446070542, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043650838446070542, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4374058022092412739, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4374058022092412739, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4374058022092412739, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4374058022092412739, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4398302923371793113, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4398302923371793113, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4398302923371793113, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4398302923371793113, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7067151551548467800, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -269848,6 +269940,22 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7380676717613011492, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7380676717613011492, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7380676717613011492, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7380676717613011492, guid: f1782c53c1236e3468e41b28042c98e3, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/_2_0Script/UI/DispatchView.cs

@@ -5,6 +5,8 @@ using UnityEngine.UI;
 public partial class DispatchView : View
 {
     [SerializeField] GameObject mapPanel;
+    [SerializeField] ExtendText levelFormatText;
+
     [SerializeField] DispatchSettingView settingView;
 
     [SerializeField] AreaUI[] areaUIs;
@@ -18,10 +20,19 @@ public partial class DispatchView : View
         viewState = ViewState.Shown;
 
         RefreshMap();
+
+        LocalizationText.OnLanguageChange += HandleLangChange;
+    }
+
+    private void HandleLangChange()
+    {
+        levelFormatText?.SetText(FormatString.StringFormat("[dispatch] Lv. {0}", DispatchDataGroup.Instance.DispatchData.DispatchLevel));
     }
 
     public override void Hide()
     {
+        LocalizationText.OnLanguageChange -= HandleLangChange;
+
         viewState = ViewState.Hidden;
         mapPanel?.SetActive(false);
 
@@ -38,7 +49,7 @@ public partial class DispatchView : View
         }
     }
 
-    public void RefreshMap()
+    private void RefreshMap()
     {
         for(int i = 0; i < areaUIs.Length; ++i)
         {

Assets/_4Image/UIpanel/img_dot_line.png.meta

@@ -37,15 +37,15 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
   spriteMode: 1
   spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100