DO-46 [Fix] 착수 유효X 애니메이션 및 Ai 이름 자동 생성 수정
This commit is contained in:
parent
e1dd037dc7
commit
99c6379554
@ -1457,7 +1457,7 @@ GameObject:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &405965270916774547
|
--- !u!224 &405965270916774547
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1713,7 +1713,7 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: "\uD638\uB7AD\uC774"
|
m_text: tester
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
|
||||||
m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
|
m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
|
||||||
@ -1799,7 +1799,7 @@ GameObject:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &8172929902404983356
|
--- !u!224 &8172929902404983356
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -328,7 +328,7 @@ Camera:
|
|||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_ClearFlags: 1
|
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_projectionMatrixMode: 1
|
||||||
m_GateFitMode: 2
|
m_GateFitMode: 2
|
||||||
m_FOVAxisMode: 0
|
m_FOVAxisMode: 0
|
||||||
|
@ -7,6 +7,4 @@
|
|||||||
public const int WIN_COUNT = 5;
|
public const int WIN_COUNT = 5;
|
||||||
//무승부 확인을 위한 최소 착수 수
|
//무승부 확인을 위한 최소 착수 수
|
||||||
public const int MinCountForDrawCheck = 150;
|
public const int MinCountForDrawCheck = 150;
|
||||||
|
|
||||||
public string[] AI_NAMIES = { "이세돌", "신사동호랭이","진짜인간임","종로3가짱돌","마스터김춘배","62세황순자","고준일 강사님"};
|
|
||||||
}
|
}
|
@ -3,6 +3,7 @@ using System.Collections;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.SceneManagement;
|
using UnityEngine.SceneManagement;
|
||||||
|
using Random = UnityEngine.Random;
|
||||||
|
|
||||||
public abstract class BasePlayerState
|
public abstract class BasePlayerState
|
||||||
{
|
{
|
||||||
@ -233,11 +234,15 @@ public class GameLogic : MonoBehaviour
|
|||||||
// AI 난이도 설정(급수 설정)
|
// AI 난이도 설정(급수 설정)
|
||||||
OmokAI.Instance.SetRating(UserManager.Instance.Rating);
|
OmokAI.Instance.SetRating(UserManager.Instance.Rating);
|
||||||
|
|
||||||
//유저 이름 사진 초기화
|
//AI닉네임 랜덤생성
|
||||||
GameManager.Instance.InitPlayersName(UserManager.Instance.Nickname, "AIPlayer");
|
var aiName = RandomAINickname();
|
||||||
GameManager.Instance.InitProfileImages(UserManager.Instance.imageIndex, 1);
|
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);
|
SetState(firstPlayerState);
|
||||||
break;
|
break;
|
||||||
@ -250,6 +255,17 @@ public class GameLogic : MonoBehaviour
|
|||||||
break;
|
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()
|
public void CountStoneCounter()
|
||||||
{
|
{
|
||||||
|
@ -11,7 +11,7 @@ public class GameManager : Singleton<GameManager>
|
|||||||
private Enums.GameType _gameType;
|
private Enums.GameType _gameType;
|
||||||
private GameLogic _gameLogic;
|
private GameLogic _gameLogic;
|
||||||
private StoneController _stoneController;
|
private StoneController _stoneController;
|
||||||
private GameObject _omokBoardImage;
|
private GameObject _camera;
|
||||||
private GameUIController _gameUIController;
|
private GameUIController _gameUIController;
|
||||||
|
|
||||||
[SerializeField] private GameObject panelManagerPrefab;
|
[SerializeField] private GameObject panelManagerPrefab;
|
||||||
@ -46,10 +46,12 @@ public class GameManager : Singleton<GameManager>
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (_stoneController != null && _omokBoardImage != null)
|
if (_camera != null)
|
||||||
{
|
{
|
||||||
_stoneController.GetComponent<Transform>().DOShakePosition(0.5f, 0.5f);
|
_camera.transform.DOShakePosition(0.5f, 0.5f).OnComplete(() =>
|
||||||
_omokBoardImage.GetComponent<Transform>().DOShakePosition(0.5f, 0.5f);
|
{
|
||||||
|
_camera.transform.position = new Vector3(0,0,-10);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -73,7 +75,7 @@ public class GameManager : Singleton<GameManager>
|
|||||||
_stoneController = GameObject.FindObjectOfType<StoneController>();
|
_stoneController = GameObject.FindObjectOfType<StoneController>();
|
||||||
_stoneController.InitStones();
|
_stoneController.InitStones();
|
||||||
var fioTimer = FindObjectOfType<FioTimer>();
|
var fioTimer = FindObjectOfType<FioTimer>();
|
||||||
_omokBoardImage = GameObject.FindObjectOfType<SpriteRenderer>().gameObject;
|
_camera = GameObject.FindObjectOfType<Camera>().gameObject;
|
||||||
_gameUIController = GameObject.FindObjectOfType<GameUIController>();
|
_gameUIController = GameObject.FindObjectOfType<GameUIController>();
|
||||||
_gameLogic = new GameLogic(_stoneController, _gameType, fioTimer);
|
_gameLogic = new GameLogic(_stoneController, _gameType, fioTimer);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user