Merge branch 'dev' of https://github.com/2aurore/Gameton-06 into dev

Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs

@@ -17,7 +17,7 @@ namespace TON
         RankingUI,      // 랭킹 UI
         IngameUI,       // 인게임 표시 UI
         OptionUI, // 화면 우측 상단 골드, 인벤토리, 옵션 버튼 UI
-
+        ShopUI, // 상점
         PANEL_END,
 
 

Gameton-06/Assets/Gameton/Scripts/Scenes/ShopScene.cs

@@ -0,0 +1,31 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace TON
+{
+    public class ShopScene : SceneBase
+    {
+        public override IEnumerator OnStart()
+        {
+            // Title 씬을 비동기로 로드한다.
+            AsyncOperation asyncLoad = SceneManager.LoadSceneAsync("Shop", LoadSceneMode.Single);
+
+            // 로드가 완료될 때 까지 yield return null 을 하면서 기다린다
+            while (!asyncLoad.isDone)
+            {
+                yield return null;
+            }
+
+            UIManager.Show<ShopUI>(UIList.ShopUI);
+        }
+
+        public override IEnumerator OnEnd()
+        {
+            yield return null;
+
+            UIManager.Hide<ShopUI>(UIList.ShopUI);
+        }
+    }
+}

Gameton-06/Assets/Gameton/Scripts/Scenes/ShopScene.cs.meta

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

Gameton-06/Assets/Gameton/Scripts/UI/ShopUI.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace TON
+{
+    public class ShopUI : UIBase
+    {
+        // Start is called before the first frame update
+        void Start()
+        {
+        
+        }
+
+        // Update is called once per frame
+        void Update()
+        {
+        
+        }
+    }
+}

Gameton-06/Assets/Gameton/Scripts/UI/ShopUI.cs.meta

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