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

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

@@ -66,6 +66,9 @@ namespace TON
                 case SceneType.Lobby:
                     StartCoroutine(ChangeScene<LobbyScene>(onSceneChangeCompletedCallback));
                     break;
+                case SceneType.Shop:
+                    StartCoroutine(ChangeScene<ShopScene>(onSceneChangeCompletedCallback));
+                    break;
                 case SceneType.Stage:
                     StartCoroutine(ChangeScene<StageScene>(onSceneChangeCompletedCallback));
                     break;

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

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

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

@@ -19,6 +19,7 @@ namespace TON
             }
 
             UIManager.Show<ShopUI>(UIList.ShopUI);
+            UIManager.Show<OptionUI>(UIList.OptionUI);
         }
 
         public override IEnumerator OnEnd()
@@ -26,6 +27,7 @@ namespace TON
             yield return null;
 
             UIManager.Hide<ShopUI>(UIList.ShopUI);
+            UIManager.Hide<OptionUI>(UIList.OptionUI);
         }
     }
 }

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

@@ -133,6 +133,8 @@ namespace TON
         {
             // TODO: 상점 UI 추가
             // 상점은 Scene으로 전환하자.
+            
+            Main.Singleton.ChangeScene(SceneType.Shop);
         }
 
         public void OnClickRouletteButton()