DO-32 [FIX] Merge

Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll.meta

@@ -16,6 +16,24 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 0
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        AndroidSharedLibraryType: Executable
+        CPU: ARMv7
   - first:
       Any: 
     second:
@@ -26,7 +44,33 @@ PluginImporter:
     second:
       enabled: 1
       settings:
+        CPU: ARM64
         DefaultValueInitialized: true
+        OS: OSX
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   - first:
       Windows Store Apps: WindowsStoreApps
     second:

Assets/KJM/KJMprefabs/Confirm Panel.prefab

@@ -67,8 +67,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: messege text
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
+  m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -201,7 +201,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2122f6b13f8bb394f9c0196cc035d366, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c06da2c324d0fee43b8b1998cf9fcd09, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -332,17 +332,17 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Button
+  m_text: "\uD655\uC778"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
+  m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+    rgba: 4278190080
+  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -573,7 +573,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ba45364f20357c644bb9e133d15fb595, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e89f6694961e7574b98368e14934a8b1, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/KJM/KJMprefabs/Gibo Panel.prefab

@@ -34,7 +34,7 @@ RectTransform:
   - {fileID: 2975548486623559342}
   m_Father: {fileID: 5764005834517827360}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0.04}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -17, y: 0}
@@ -394,7 +394,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ba45364f20357c644bb9e133d15fb595, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e89f6694961e7574b98368e14934a8b1, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -438,7 +438,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -392, y: 0}
+  m_AnchoredPosition: {x: -392, y: -56.893047}
   m_SizeDelta: {x: 784, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &7384686566427463252
@@ -541,7 +541,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/KJM/KJMprefabs/Ranking Panel.prefab

@@ -271,7 +271,7 @@ RectTransform:
   - {fileID: 1763863758802443458}
   m_Father: {fileID: 6370669554926347559}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0.04}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -17, y: 0}
@@ -387,7 +387,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -501,7 +501,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ba45364f20357c644bb9e133d15fb595, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e89f6694961e7574b98368e14934a8b1, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -545,7 +545,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -392, y: 0}
+  m_AnchoredPosition: {x: -392, y: -2.9951172}
   m_SizeDelta: {x: 784, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &5526954107552917871

Assets/KJM/KJMprefabs/ScrollItem/GiboScrollItem.prefab

@@ -65,10 +65,10 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Name
+  m_text: "\uC774\uB984"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
+  m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -201,8 +201,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 00:00:00
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
+  m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -491,3 +491,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 446a80ba82242004eb31339c44f8ac3b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  profileSprites:
+  - {fileID: 21300000, guid: edeacd6d8f6ab0d42bbdf4ada3c61a27, type: 3}
+  - {fileID: 21300000, guid: 2f801858eeb5f4540a432b60aca3d57a, type: 3}

Assets/KJM/KJMprefabs/ScrollItem/RankingScrollItem.prefab

@@ -65,10 +65,10 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: name
+  m_text: "\uC774\uB984"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
+  m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -199,10 +199,10 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: winRate
+  m_text: "\uC2B9\uB960"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
+  m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -491,3 +491,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e2c72577a3d9f7b479c7bac6a8f65048, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  profileSprites:
+  - {fileID: 21300000, guid: 2d325c545f7c9144cb37a45e93e5ddb9, type: 3}
+  - {fileID: 21300000, guid: 59492a1d9c2719641bd0d4d53988c9b4, type: 3}

Assets/KJM/KJMprefabs/ScrollItem/ShopScrollItem.prefab

@@ -67,8 +67,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 6COIN
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
+  m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -199,10 +199,10 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Price
+  m_text: "1000\uC6D0"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
+  m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -491,3 +491,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4d28917ad20c19e428cbf98ba5609e69, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  profileSprites:
+  - {fileID: 21300000, guid: 307bff9630735f342852f28b1cd5d300, type: 3}

Assets/KJM/KJMprefabs/Setting Panel.prefab

@@ -279,7 +279,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -40, y: 0}
+  m_AnchoredPosition: {x: -60, y: 0}
   m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1905972316426387529
@@ -310,10 +310,10 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: BGM
+  m_text: "\uBC30\uACBD\uC74C\uC545"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
+  m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -759,7 +759,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ba45364f20357c644bb9e133d15fb595, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e89f6694961e7574b98368e14934a8b1, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -829,14 +829,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   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: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1151,7 +1151,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1202,7 +1202,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -40, y: 0}
+  m_AnchoredPosition: {x: -60, y: 0}
   m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &526052223184635652
@@ -1233,10 +1233,10 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: SFX
+  m_text: "\uD6A8\uACFC\uC74C"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
+  m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []

Assets/KJM/KJMprefabs/Shop Panel.prefab

@@ -67,7 +67,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ba45364f20357c644bb9e133d15fb595, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e89f6694961e7574b98368e14934a8b1, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -269,7 +269,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -350,7 +350,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -392, y: 0}
+  m_AnchoredPosition: {x: -392, y: -56.72364}
   m_SizeDelta: {x: 784, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &2389273839879143832
@@ -427,7 +427,7 @@ RectTransform:
   - {fileID: 5472220730853624384}
   m_Father: {fileID: 8094483691635570935}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0.04}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -17, y: 0}

Assets/KJM/Sprites.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ee5f076b5be7ae648a45dbc47235ecd7
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/KJM/UI/Canvas.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 502f8b696dbf4d34b9f8cf73c92eb871
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/KJM/UI/GameManager.prefab

@@ -1,55 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &3333826112655416783
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 259651450925461204}
-  - component: {fileID: 9120269285994385312}
-  m_Layer: 0
-  m_Name: GameManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &259651450925461204
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3333826112655416783}
-  serializedVersion: 2
-  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
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &9120269285994385312
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3333826112655416783}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6dbc92c41f18a5640b01bba5eba07b13, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  confirmPanel: {fileID: 8145365568262946399, guid: 76f1fe6b5243faf4f9b8caee7312d336, type: 3}
-  settingsPanel: {fileID: 2861881646994438329, guid: ea820246b5075c54d9f614291ca41c5d, type: 3}
-  rankingPanel: {fileID: 154459105952450598, guid: bf4bb18aa323fe748b3eb1d537503596, type: 3}
-  shopPanel: {fileID: 8190964574954487140, guid: eb257b0a685b2254f860f294ce8cba54, type: 3}
-  giboPanel: {fileID: 3090474328172188941, guid: c63914e01332f8d479ada92325335e41, type: 3}
-  profileSprites:
-  - {fileID: 21300000, guid: 2122f6b13f8bb394f9c0196cc035d366, type: 3}
-  - {fileID: 21300000, guid: 18ae4aac85f6d444b9ffb2ac80f27c45, type: 3}
-  canvas: {fileID: 0}

Assets/KJM/UI/GameManager.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: cecd201912b5f074283ce16fbcfe78cf
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Prefabs/Main Panel.prefab

@@ -1068,7 +1068,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "16\uAE09"
+  m_text: "18\uAE09"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
   m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
@@ -1409,7 +1409,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &405965270916774547
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1653,7 +1653,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\uD14C\uC2A4\uD2B801"
+  m_text: "\uD638\uB7AD\uC774"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
   m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
@@ -1739,7 +1739,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8172929902404983356
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Resources/PanelSound.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 70f1a691b6819ac4496d6c8a2a1d4d53
+guid: 1eaec47e7c15f6140abdc559ed32c514
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Script/Common/ScrollItem.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 11db7090357e1d14e871019acc399f96
+guid: 46d3e8ea7b5f9b643a6ba4a9df11840e
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Script/Game/GameManager.cs

@@ -9,6 +9,12 @@ public class GameManager : Singleton<GameManager>
     [SerializeField] private GameObject mainPanel;
     [SerializeField] private GameObject signinPanel;
     [SerializeField] private GameObject signupPanel;
+    [SerializeField] private GameObject settingsPanel;
+    [SerializeField] private GameObject confirmPanel;
+    [SerializeField] private GameObject rankingPanel;
+    [SerializeField] private GameObject shopPanel;
+    [SerializeField] private GameObject giboPanel;
+    
     [SerializeField] private Canvas canvas;
     private UserManager _userManager;  // UserManager 인스턴스 관리
     private CoinsPanelController _coinsPanel;
@@ -16,6 +22,7 @@ public class GameManager : Singleton<GameManager>
     private Enums.GameType _gameType;
     private GameLogic _gameLogic;
     private StoneController _stoneController;
+    private Canvas _canvas;
 
     public Sprite[] profileSprites; //패널에서 사용할 테스트 배열
     
@@ -55,7 +62,6 @@ public class GameManager : Singleton<GameManager>
             UpdateMainPanelUI(OpenMainPanel);
             // ScoreData.SetScore(userInfo.score);
             // OpenConfirmPanel(userInfo.nickname + "님 로그인 성공하였습니다.", () => { });
-
         }, () =>
         {
             Debug.Log("자동 로그인 실패");
@@ -130,5 +136,52 @@ public class GameManager : Singleton<GameManager>
             _stoneController.InitStones();
             _gameLogic = new GameLogic(_stoneController, _gameType);
         }
+        _canvas = GameObject.Find("Canvas").GetComponent<Canvas>();
+    }
+    
+    public void OpenConfirmPanel(string message, ConfirmPanelController.OnConfirmButtonClick onConfirmButtonClick)
+    {
+        if (_canvas != null)
+        {
+            var confirmPanelObject = Instantiate(confirmPanel, _canvas.transform);
+            confirmPanelObject.GetComponent<ConfirmPanelController>()
+                .Show(message, onConfirmButtonClick);
+        }
+    }
+    
+    public void OpenSettingsPanel()
+    {
+        if (_canvas != null)
+        {
+            var settingsPanelObject = Instantiate(settingsPanel, _canvas.transform);
+            settingsPanelObject.GetComponent<PanelController>().Show();
+        }
+    }
+    
+    public void OpenRankingPanel(List<RankingItem> rankingItems)
+    {
+        if (_canvas != null)
+        {
+            var settingsPanelObject = Instantiate(rankingPanel, _canvas.transform);
+            settingsPanelObject.GetComponent<RankingPanelController>().Show(rankingItems);
+        }
+    }
+    
+    public void OpenShopPanel(List<ShopItem> shopItems)
+    {
+        if (_canvas != null)
+        {
+            var settingsPanelObject = Instantiate(shopPanel, _canvas.transform);
+            settingsPanelObject.GetComponent<ShopPanelController>().Show(shopItems);
+        }
+    }
+    
+    public void OpenGiboPanel(List<GiboItem> giboItems)
+    {
+        if (_canvas != null)
+        {
+            var settingsPanelObject = Instantiate(giboPanel, _canvas.transform);
+            settingsPanelObject.GetComponent<GiboPanelController>().Show(giboItems);
+        }
     }
 }

Assets/Script/UI/PanelChildController/GiboItemController.cs

@@ -7,6 +7,7 @@ using UnityEngine.UI;
 public class GiboItemController : MonoBehaviour
 {
    GiboItem _giboItem;
+   public Sprite[] profileSprites;
    public void Init(GiboItem giboItem)
    {
       _giboItem = giboItem;
@@ -14,7 +15,7 @@ public class GiboItemController : MonoBehaviour
       var itemImage = GetComponentsInChildren<Image>()[1];
       var itemText = GetComponentsInChildren<TextMeshProUGUI>();
             
-      itemImage.sprite = GameManager.Instance.profileSprites[this._giboItem.WinLoseSpriteIndex];
+      itemImage.sprite = profileSprites[this._giboItem.WinLoseSpriteIndex];
       itemText[0].text = this._giboItem.Date;
       itemText[1].text = this._giboItem.Name;
    }

Assets/Script/UI/PanelChildController/RankingItemController.cs

@@ -7,13 +7,15 @@ using UnityEngine.UI;
 public class RankingItemController : MonoBehaviour
 {
    RankingItem _rankingItem;
+   public Sprite[] profileSprites;
+
    public void Init(RankingItem rankingItem)
    {
       _rankingItem = rankingItem;
       var itemImage = GetComponentsInChildren<Image>()[1];
       var itemText = GetComponentsInChildren<TextMeshProUGUI>();
             
-      itemImage.sprite = GameManager.Instance.profileSprites[this._rankingItem.ProfileSpriteIndex];
+      itemImage.sprite = profileSprites[this._rankingItem.ProfileSpriteIndex];
       itemText[0].text = this._rankingItem.Name;
       itemText[1].text = this._rankingItem.WinRate.ToString();
    }

Assets/Script/UI/PanelChildController/ShopItemController.cs

@@ -7,13 +7,15 @@ using UnityEngine.UI;
 public class ShopItemController : MonoBehaviour
 {
     ShopItem _shopItem;
+    public Sprite[] profileSprites;
+
     public void Init(ShopItem shopItem)
     {
         _shopItem = shopItem;
         var itemImage = GetComponentsInChildren<Image>()[1];
         var itemText = GetComponentsInChildren<TextMeshProUGUI>();
             
-        itemImage.sprite = GameManager.Instance.profileSprites[this._shopItem.ItemSpriteIndex];
+        itemImage.sprite = profileSprites[this._shopItem.ItemSpriteIndex];
         itemText[0].text = this._shopItem.Name;
         itemText[1].text = this._shopItem.Price;
     }

Assets/Script/UI/PanelController.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c4322b555c1ef964ab2abfc9014cafdd
+guid: b8e1d8d1b0838c540b399f53f3bc1307
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Script/UI/PanelController/TestPanelController.cs

@@ -0,0 +1,144 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Random = UnityEngine.Random;
+
+/// <summary>
+/// 패널 생성 테스트 코드
+/// 버튼을 누르면 팝업 생성
+/// 상점, 랭크, 기보 패널은 각 데이터타입 리스트를 전달해야함
+/// </summary>
+public class TestPanelController : MonoBehaviour
+{
+    //게임매니저 없이 동작하도록 작성한 테스트 코드  
+    [SerializeField] private GameObject settingsPanel;
+    [SerializeField] private GameObject confirmPanel;
+    [SerializeField] private GameObject rankingPanel;
+    [SerializeField] private GameObject shopPanel;
+    [SerializeField] private GameObject giboPanel;
+    public Canvas _canvas;
+    public void OpenConfirmPanel(string message, ConfirmPanelController.OnConfirmButtonClick onConfirmButtonClick)
+    {
+        if (_canvas != null)
+        {
+            var confirmPanelObject = Instantiate(confirmPanel, _canvas.transform);
+            confirmPanelObject.GetComponent<ConfirmPanelController>()
+                .Show(message, onConfirmButtonClick);
+        }
+    }
+    
+    public void OpenSettingsPanel()
+    {
+        if (_canvas != null)
+        {
+            var settingsPanelObject = Instantiate(settingsPanel, _canvas.transform);
+            settingsPanelObject.GetComponent<PanelController>().Show();
+        }
+    }
+    
+    public void OpenRankingPanel(List<RankingItem> rankingItems)
+    {
+        if (_canvas != null)
+        {
+            var settingsPanelObject = Instantiate(rankingPanel, _canvas.transform);
+            settingsPanelObject.GetComponent<RankingPanelController>().Show(rankingItems);
+        }
+    }
+    
+    public void OpenShopPanel(List<ShopItem> shopItems)
+    {
+        if (_canvas != null)
+        {
+            var settingsPanelObject = Instantiate(shopPanel, _canvas.transform);
+            settingsPanelObject.GetComponent<ShopPanelController>().Show(shopItems);
+        }
+    }
+    
+    public void OpenGiboPanel(List<GiboItem> giboItems)
+    {
+        if (_canvas != null)
+        {
+            var settingsPanelObject = Instantiate(giboPanel, _canvas.transform);
+            settingsPanelObject.GetComponent<GiboPanelController>().Show(giboItems);
+        }
+    }
+    
+    
+    
+    //확인 패널 생성
+    public void OnConfirmPanelClick()
+    {
+        OpenConfirmPanel("확인 패널 입니다.", () =>
+        {
+                Debug.Log("확인 버튼을 누르셨습니다.");
+        });
+        return;
+    }
+    
+    //세팅 패널 생성
+    public void OnSettingPanelClick()
+    {
+        OpenSettingsPanel();
+    }
+    
+    //랭킹 패널 생성
+    public void OnRankingPanelClick()
+    {
+        
+        List<RankingItem> rankingItems = new List<RankingItem>();       //테스트 데이터 리스트 생성
+        for (int i = 0; i < 30; i++)
+        {
+            RankingItem rankingItem = new RankingItem
+            {
+                ProfileSpriteIndex = Random.Range(0, 2),
+                Name = i.ToString(),
+                WinRate = Random.Range(0f, 1f)
+            };
+            rankingItems.Add(rankingItem);
+        }
+        
+        OpenRankingPanel(rankingItems);
+    }
+    
+    //상점 패널 생성
+    public void OnShopPanelClick()
+    {
+        
+        List<ShopItem> shopItems = new List<ShopItem>();       //테스트 데이터 리스트 생성
+        for (int i = 0; i < 30; i++)
+        {
+            ShopItem shopItem = new ShopItem
+            {
+                ItemSpriteIndex = Random.Range(0, 1),
+                Name = "코인"+i+"개",
+                Price = (i * 1000)+ "원"
+            };
+            shopItems.Add(shopItem);
+        }
+        
+        OpenShopPanel(shopItems);
+    }
+    
+    //기보 패널 생성
+    public void OnGiboPanelClick()
+    {
+        
+        List<GiboItem> giboItems = new List<GiboItem>();       //테스트 데이터 리스트 생성
+        for (int i = 0; i < 30; i++)
+        {
+            GiboItem giboItem = new GiboItem
+            {
+                WinLoseSpriteIndex = Random.Range(0, 2),
+                Date = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"),
+                Name = i.ToString(),
+            };
+            
+            giboItems.Add(giboItem);
+        }
+        
+        OpenGiboPanel(giboItems);
+    }
+
+   
+}

Assets/Script/UI/PanelController/TestPanelController.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 03aef985a8b802a409630fdcab7be09b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Panel UI.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a716234a0e4752148a60610ac1cc1185
+guid: 7c99272a201642c409c7be3ed96dfa61
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Sprites/Panel UI/panel2-bg.png.meta

@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: e89f6694961e7574b98368e14934a8b1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 34, y: 45, z: 35, w: 35}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: