diff --git a/Assets/Resources/Prefabs/Panels/Main Panel.prefab b/Assets/Resources/Prefabs/Panels/Main Panel.prefab index 834ee12..72c53db 100644 --- a/Assets/Resources/Prefabs/Panels/Main Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Main Panel.prefab @@ -1457,7 +1457,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &405965270916774547 RectTransform: m_ObjectHideFlags: 0 @@ -1713,7 +1713,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uD638\uB7AD\uC774" + m_text: tester m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} @@ -1799,7 +1799,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8172929902404983356 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 254abaa..466309f 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -328,7 +328,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.5372549, g: 0.654902, b: 0.5803922, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 diff --git a/Assets/Script/Common/Constants.cs b/Assets/Script/Common/Constants.cs index c8d7fe7..8fae832 100644 --- a/Assets/Script/Common/Constants.cs +++ b/Assets/Script/Common/Constants.cs @@ -7,6 +7,4 @@ public const int WIN_COUNT = 5; //무승부 확인을 위한 최소 착수 수 public const int MinCountForDrawCheck = 150; - - public string[] AI_NAMIES = { "이세돌", "신사동호랭이","진짜인간임","종로3가짱돌","마스터김춘배","62세황순자","고준일 강사님"}; } \ No newline at end of file diff --git a/Assets/Script/Game/GameLogic.cs b/Assets/Script/Game/GameLogic.cs index 36e120c..74d6c80 100644 --- a/Assets/Script/Game/GameLogic.cs +++ b/Assets/Script/Game/GameLogic.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; +using Random = UnityEngine.Random; public abstract class BasePlayerState { @@ -233,11 +234,15 @@ public class GameLogic : MonoBehaviour // AI 난이도 설정(급수 설정) OmokAI.Instance.SetRating(UserManager.Instance.Rating); - //유저 이름 사진 초기화 - GameManager.Instance.InitPlayersName(UserManager.Instance.Nickname, "AIPlayer"); - GameManager.Instance.InitProfileImages(UserManager.Instance.imageIndex, 1); + //AI닉네임 랜덤생성 + var aiName = RandomAINickname(); + var imageIndex = UnityEngine.Random.Range(0, 2); - ReplayManager.Instance.InitReplayData(UserManager.Instance.Nickname,"PlayerAI", UserManager.Instance.imageIndex, 1); + //유저 이름 사진 초기화 + GameManager.Instance.InitPlayersName(UserManager.Instance.Nickname, aiName); + GameManager.Instance.InitProfileImages(UserManager.Instance.imageIndex, imageIndex); + + ReplayManager.Instance.InitReplayData(UserManager.Instance.Nickname,aiName, UserManager.Instance.imageIndex, imageIndex); SetState(firstPlayerState); break; @@ -250,6 +255,17 @@ public class GameLogic : MonoBehaviour break; } } + + //AI닉네임 랜덤 생성 + private string RandomAINickname() + { + string[] AI_NAMIES = { "이세돌", "신사동호랭이","진짜인간임","종로3가짱돌","마스터김춘배","62세황순자","고준일 강사님"}; + + var index = UnityEngine.Random.Range(0, AI_NAMIES.Length); + + return AI_NAMIES[index]; + } + //돌 카운터 증가 함수 public void CountStoneCounter() { diff --git a/Assets/Script/Game/GameManager.cs b/Assets/Script/Game/GameManager.cs index e37aca3..8b09d03 100644 --- a/Assets/Script/Game/GameManager.cs +++ b/Assets/Script/Game/GameManager.cs @@ -11,7 +11,7 @@ public class GameManager : Singleton private Enums.GameType _gameType; private GameLogic _gameLogic; private StoneController _stoneController; - private GameObject _omokBoardImage; + private GameObject _camera; private GameUIController _gameUIController; [SerializeField] private GameObject panelManagerPrefab; @@ -46,10 +46,12 @@ public class GameManager : Singleton } else { - if (_stoneController != null && _omokBoardImage != null) + if (_camera != null) { - _stoneController.GetComponent().DOShakePosition(0.5f, 0.5f); - _omokBoardImage.GetComponent().DOShakePosition(0.5f, 0.5f); + _camera.transform.DOShakePosition(0.5f, 0.5f).OnComplete(() => + { + _camera.transform.position = new Vector3(0,0,-10); + }); } } } @@ -73,7 +75,7 @@ public class GameManager : Singleton _stoneController = GameObject.FindObjectOfType(); _stoneController.InitStones(); var fioTimer = FindObjectOfType(); - _omokBoardImage = GameObject.FindObjectOfType().gameObject; + _camera = GameObject.FindObjectOfType().gameObject; _gameUIController = GameObject.FindObjectOfType(); _gameLogic = new GameLogic(_stoneController, _gameType, fioTimer);