Merge branch 'main' into pgd/20250528_3

This commit is contained in:
geondo55
2025-05-28 20:25:38 +09:00
4 changed files with 95 additions and 188 deletions

View File

@@ -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