Merge branch 'main' into DO-4-AI-Controller

Assets/GameUIController.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class GameUIController : MonoBehaviour
+{
+    public void OnClickConfirmButton()
+    {
+        GameManager.Instance.OnClickConfirmButton();
+    }
+
+    public void OnClickRetryButton()
+    {
+        GameManager.Instance.RetryGame();
+    }
+}

Assets/GameUIController.cs.meta

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

Assets/JAY/Main-Jay.unity

@@ -186,13 +186,14 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &271965289
+--- !u!4 &271965289
-RectTransform:
+Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 271965288}
+  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}
@@ -200,11 +201,6 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 0}
   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: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &271965290
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -580,8 +576,8 @@ RectTransform:
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
-  - {fileID: 271965289}
   - {fileID: 333752983}
+  - {fileID: 271965289}
   - {fileID: 1867732347}
   - {fileID: 740636831}
   - {fileID: 81838205}

Assets/KJM/ShopTest/MainPanelButtonController.cs

@@ -34,4 +34,9 @@ public class MainPanelButtonController : MonoBehaviour
  
         GameManager.Instance.panelManager.OpenShopPanel(shopItems);
     }
+
+    public void OpenReplayPanelClick()
+    {
+        GameManager.Instance.panelManager.OpenReplayPanel();
+    }
 }

Assets/LYC/Prefabs/Retry Button.prefab

@@ -1,269 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &4527645627922892802
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6675599954136940932}
-  - component: {fileID: 999587919958738827}
-  - component: {fileID: 3838441490010372991}
-  - component: {fileID: 5432505654977179684}
-  m_Layer: 5
-  m_Name: Retry Button
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6675599954136940932
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4527645627922892802}
-  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:
-  - {fileID: 662537649981192553}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -50, y: -100}
-  m_SizeDelta: {x: 228, y: 125.899994}
-  m_Pivot: {x: 1, y: 1}
---- !u!222 &999587919958738827
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4527645627922892802}
-  m_CullTransparentMesh: 1
---- !u!114 &3838441490010372991
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4527645627922892802}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  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: 21300000, guid: 2b713a3fc08a07045823477e97022e09, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &5432505654977179684
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4527645627922892802}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 3838441490010372991}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
-        m_MethodName: RetryGame
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
---- !u!1 &6877030451239157200
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 662537649981192553}
-  - component: {fileID: 2462059473707687523}
-  - component: {fileID: 9042688505538446270}
-  m_Layer: 5
-  m_Name: Text (TMP)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &662537649981192553
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6877030451239157200}
-  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: 6675599954136940932}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2462059473707687523
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6877030451239157200}
-  m_CullTransparentMesh: 1
---- !u!114 &9042688505538446270
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6877030451239157200}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: Retry
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4281479730
-  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 40
-  m_fontSizeBase: 40
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 1
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

Assets/LYC/Prefabs/[Canvas] Game UI.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 67fa853934a50654381442493bf1bb7b
+guid: b1a31da84076a534cae7cb20a7913a93
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Resources/Prefabs/Panels/Main Panel.prefab

@@ -1282,7 +1282,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 5553341337845712589}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 8890768496808647529}
+        m_TargetAssemblyTypeName: MainPanelButtonController, Assembly-CSharp
+        m_MethodName: OpenReplayPanelClick
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &4348816988605791720
 GameObject:
   m_ObjectHideFlags: 0

Assets/Script/Game/GameManager.cs

@@ -56,7 +56,7 @@ public class GameManager : Singleton<GameManager>
         }
     }
     
-    private void ChangeToGameScene(Enums.GameType gameType)
+    public void ChangeToGameScene(Enums.GameType gameType)
     {
         _gameType = gameType;
         SceneManager.LoadScene("Game");
@@ -66,6 +66,10 @@ public class GameManager : Singleton<GameManager>
     {
         if (scene.name == "Game")
         {
+            if (_gameType == Enums.GameType.Replay)
+            {
+                //TODO: 리플레이를 위한 초기화
+            }
             _stoneController = GameObject.FindObjectOfType<StoneController>();
             _stoneController.InitStones();
             var fioTimer = FindObjectOfType<FioTimer>();

Assets/Script/Main/MainPanelController.cs

@@ -71,4 +71,10 @@ public class MainPanelController : MonoBehaviour
             });
         });
     }
+    
+    //대국 시작 버튼 클릭
+    public void OnClickGameStart()
+    {
+        GameManager.Instance.ChangeToGameScene(Enums.GameType.SinglePlay);
+    }
 }

Assets/Script/Main/MainPanelManager.cs

@@ -61,7 +61,6 @@ public class MainPanelManager : MonoBehaviour
     /// </summary>
     public void UpdateMainPanelUI(Action success = null)
     {
-        Debug.Log("로그인 후 Udpateawfsefasefsefasdfefsefsefsefsef");
         mainPanelController.UpdateUserInfo();
 
         success?.Invoke();

Assets/Script/Main/SigninPanelController.cs

@@ -55,6 +55,7 @@ public class SigninPanelController : MonoBehaviour
         
         NetworkManager.Instance.Signin(signinData, (signinResult) =>
         {
+            mainPanel = gameObject.GetComponent<MainPanelManager>();
             Destroy(gameObject);
             
             // 유저 정보 저장

Assets/Script/UI/PanelController/PanelManager.cs

@@ -19,6 +19,7 @@ public class PanelManager : MonoBehaviour
     
     private void Awake()
     {
+        SetCanvas();
         // Prefabs 폴더에서 모든 패널 프리팹 로드
         GameObject[] prefabs = Resources.LoadAll<GameObject>("Prefabs/Panels");
 
@@ -29,11 +30,9 @@ public class PanelManager : MonoBehaviour
 
         Debug.Log($"총 {panelPrefabs.Count}개의 패널이 로드됨.");
     }
-    
+
-    void Start()
+    private void SetCanvas()
     {
-        PanelManager panelManager = FindObjectOfType<PanelManager>();
-        
         if (_canvas == null)
         {
             _canvas = GameObject.Find("Canvas").GetComponent<Canvas>();
@@ -72,10 +71,8 @@ public class PanelManager : MonoBehaviour
 
     public void OpenLoadingPanel(bool rotateImage = false, bool animatedText = false, bool flipImage = false)
     {
-        Debug.Log("loadingPanelObject 실행?");
         if (_canvas != null)
         {
-            Debug.Log("CANVSALKDFJLSKDFJAOIJVASDLKFJLSIDF?");
             var loadingPanelObject = GetPanel("Loading Panel");
             
         

ProjectSettings/EditorBuildSettings.asset

@@ -7,11 +7,14 @@ EditorBuildSettings:
   m_Scenes:
   - enabled: 1
     path: Assets/Scenes/Main.unity
-    guid: 2cda990e2423bbf4892e6590ba056729
+    guid: 1b05f144a4d89914c99aabb6dd23c8dc
   - enabled: 1
     path: Assets/Scenes/Game.unity
     guid: 90d8e06582d54504c8033aab27b15564
   - enabled: 1
-    path: Assets/Scenes/Replay.unity
+    path: Assets/JAY/Main-Jay.unity
-    guid: 393dbf55b04641847ae9b882a54856af
+    guid: aa6a3e598ecaa6e4aa2ad0f1d81bea93
+  - enabled: 1
+    path: Assets/LYC/GameCopyLYC.unity
+    guid: c7eedd59cc78a7648a2168fd25540b88
   m_configObjects: {}