Merge branch 'main' into pgd/20250528_3

Assets/Prefabs/AAA/Panel_Toolbar.prefab

@@ -109,9 +109,9 @@ RectTransform:
   - {fileID: 8104665296619322234}
   m_Father: {fileID: 5943585392409968592}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 20, y: -120}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &372220076957744083
@@ -315,9 +315,9 @@ RectTransform:
   - {fileID: 1221411173235421454}
   m_Father: {fileID: 5943585392409968592}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 20, y: -15}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4306639275348435013
@@ -515,9 +515,9 @@ RectTransform:
   - {fileID: 7116064978891767201}
   m_Father: {fileID: 5943585392409968592}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 20, y: -50}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6871961373113124591
@@ -835,9 +835,9 @@ RectTransform:
   - {fileID: 7423308712458507594}
   m_Father: {fileID: 5943585392409968592}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 20, y: -155}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2048663448120859478
@@ -937,7 +937,6 @@ GameObject:
   - component: {fileID: 3561055086465138131}
   - component: {fileID: 6000501831730302939}
   - component: {fileID: 5807680458856734206}
-  - component: {fileID: 8269507675293814561}
   - component: {fileID: 6982401354042474612}
   m_Layer: 5
   m_Name: Button_Grid
@@ -1004,19 +1003,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &8269507675293814561
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5235618325518106443}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f6bd4fe9748586f47af6460d15964110, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  tooltipText: "\uADF8\uB9AC\uB4DC \uC628\uC624"
 --- !u!114 &6982401354042474612
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1158,7 +1144,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &372614007875390604
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1166,7 +1152,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6865732664778449082}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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_ConstrainProportionsScale: 0
@@ -1273,9 +1259,9 @@ RectTransform:
   - {fileID: 2436569352694154024}
   m_Father: {fileID: 5943585392409968592}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 20, y: -85}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8091059214449928349

Assets/Scenes/pre-0.24.0.unity

@@ -885,7 +885,7 @@ MonoBehaviour:
         CanHaveMouseButtons: 0
   _settings:
     _canBeDisplayed: 1
-    _isExpanded: 0
+    _isExpanded: 1
     _isVisible: 1
     _cellSizeX: 1
     _cellSizeZ: 1
@@ -1275,43 +1275,43 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 290
       objectReference: {fileID: 0}
     - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -22
       objectReference: {fileID: 0}
     - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 290
       objectReference: {fileID: 0}
     - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -158
       objectReference: {fileID: 0}
     - target: {fileID: 643449707283617506, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1391,23 +1391,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 290
       objectReference: {fileID: 0}
     - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -90
       objectReference: {fileID: 0}
     - target: {fileID: 2641865167890791995, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1419,23 +1419,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 290
       objectReference: {fileID: 0}
     - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -22
       objectReference: {fileID: 0}
     - target: {fileID: 3407360332968577993, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1479,43 +1479,43 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 290
       objectReference: {fileID: 0}
     - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -158
       objectReference: {fileID: 0}
     - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 290
       objectReference: {fileID: 0}
     - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -56
       objectReference: {fileID: 0}
     - target: {fileID: 4551446790370479478, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1543,23 +1543,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 290
       objectReference: {fileID: 0}
     - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -22
       objectReference: {fileID: 0}
     - target: {fileID: 5387168277044041813, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1679,23 +1679,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 290
       objectReference: {fileID: 0}
     - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -124
       objectReference: {fileID: 0}
     - target: {fileID: 7049248817799997631, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.y
@@ -1747,83 +1747,83 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 290
       objectReference: {fileID: 0}
     - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -124
       objectReference: {fileID: 0}
     - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 290
       objectReference: {fileID: 0}
     - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -90
       objectReference: {fileID: 0}
     - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 290
       objectReference: {fileID: 0}
     - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -56
       objectReference: {fileID: 0}
     - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 290
       objectReference: {fileID: 0}
     - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -56
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4528,102 +4528,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3436268807860288270, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3436268807860288270, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3436268807860288270, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3436268807860288270, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4678595536376548550, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4678595536376548550, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4678595536376548550, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4678595536376548550, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6035057118420408689, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6035057118420408689, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6035057118420408689, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6035057118420408689, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 6865732664778449082, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
       propertyPath: m_Name
       value: Panel_Toolbar
       objectReference: {fileID: 0}
-    - target: {fileID: 6865732664778449082, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8269507675293814561, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8269507675293814561, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: tooltipText
-      value: "\uBC14\uB2E5\uC120 \uD65C\uC131\uD654 \uD1A0\uAE00"
-      objectReference: {fileID: 0}
-    - target: {fileID: 8596069817915449302, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8596069817915449302, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8596069817915449302, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8596069817915449302, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8934699204040479535, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8934699204040479535, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8934699204040479535, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8934699204040479535, guid: a1beeb762c585d645829350a5fa6025d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Scripts/Studio/Managers/FBXFileManager.cs

@@ -85,6 +85,7 @@ namespace Studio.AssetTool
 
         private IEnumerator LoadAssetFiles(List<string> filePaths, Action onComplete)
         {
+            List<CustomAssetData> loadedTargets = new();
             foreach (var file in filePaths)
             {
                 var assetName = Path.GetFileNameWithoutExtension(file);
@@ -104,7 +105,7 @@ namespace Studio.AssetTool
                 assetData.folderName = folderName;
 
                 assetData.LoadLocalFBX(file);
-                yield return new WaitUntil(() => (assetData.isLoadComplete && assetData.progress == 1) || assetData.isLoadError);
+                //yield return new WaitUntil(() => (assetData.isLoadComplete && assetData.progress == 1) || assetData.isLoadError);
 
                 assetData.OnLoadComplete();
 
@@ -112,7 +113,19 @@ namespace Studio.AssetTool
                 thumbnail = TextureUtil.MakeReadableTexture(thumbnail);
                 assetData.thumbnail = thumbnail;
 
-                OnLoadComplete(assetData);
+            }
+
+            while (loadedTargets.Count > 0)
+            {
+                foreach(var assetData in loadedTargets)
+                {
+                    if (assetData.isLoadComplete && assetData.progress == 1)
+                    {
+                        OnLoadComplete(assetData);
+                        loadedTargets.Remove(assetData);
+                    }
+                    yield return null;
+                }
             }
 
             onComplete?.Invoke(); // 한 폴더 끝나면 알림

Assets/Scripts/Studio/UI/Panel/Panel_Toolbar.cs

@@ -26,7 +26,6 @@ namespace Studio.UI
         public Toggle Button_Remove;
         public Toggle Button_Copy;
 
-        public event Action onClickGrid;
         public event Action onClickMove;
         public event Action onClickExpand;
         public event Action onClickRotate;
@@ -46,6 +45,7 @@ namespace Studio.UI
             Button_Rotate.onValueChanged.AddListener(OnClickRotate);
             Button_Remove.onValueChanged.AddListener(OnClickRemove);
             Button_Copy.onValueChanged.AddListener(OnClickCopy);
+            Button_Grid.isOn = true;
         }
 
         private void SetToggleChanged(Toggle toggle, bool isOn)
@@ -57,7 +57,7 @@ namespace Studio.UI
 
         private void OnClickGrid(bool isOn)
         {
-            onClickGrid?.Invoke();
+            RTSceneGrid.Get.Settings.IsVisible =isOn;
             SetToggleChanged(Button_Grid, isOn);
         }