From 1960538ec82c5f01bec14279b98b5dc6b0d0fe47 Mon Sep 17 00:00:00 2001 From: villaingames Date: Sat, 21 Oct 2023 18:40:11 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC=20?= =?UTF-8?q?=EB=B0=8F=20Speed=20=ED=85=8C=EC=9D=B4=EB=B8=94=EA=B0=92=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Addressable/AddressableManager.cs | 4 +++ Assets/Scripts/Etc/Constants.cs | 2 -- Assets/Scripts/Manage/TableManager.cs | 1 + Assets/Scripts/Manage/UIManager.cs | 13 ++++---- .../Stage/Controller/PlayerController.cs | 3 +- Assets/Scripts/Stage/Controller/PlayerMove.cs | 4 +-- .../Stage/Controller/PropController.cs | 1 + Assets/Scripts/Stage/Manage/StageManager.cs | 32 +++++++++++-------- .../Scripts/UI/Loading/UIPanelLoadingIntro.cs | 2 ++ Assets/Scripts/UI/Stage/UIPanelStageResult.cs | 3 +- 10 files changed, 37 insertions(+), 28 deletions(-) diff --git a/Assets/Scripts/Addressable/AddressableManager.cs b/Assets/Scripts/Addressable/AddressableManager.cs index 41b6db2..5a83e16 100644 --- a/Assets/Scripts/Addressable/AddressableManager.cs +++ b/Assets/Scripts/Addressable/AddressableManager.cs @@ -23,11 +23,13 @@ public class AddressableManager : UnitySingleton { var handle = Addressables.LoadAssetAsync(name); + //우선은 동기식으로. 추후 필요시 비동기 추가 var result = handle.WaitForCompletion(); Addressables.Release(handle); return result; } + #region ObjectPool public GameObject Spawn(string name, Transform parent = null) { if(!_objectPoolDict.ContainsKey(name)) @@ -125,4 +127,6 @@ public class AddressableManager : UnitySingleton { Destroy(obj); } + + #endregion ObjectPool } diff --git a/Assets/Scripts/Etc/Constants.cs b/Assets/Scripts/Etc/Constants.cs index 3dba967..1b50e1f 100644 --- a/Assets/Scripts/Etc/Constants.cs +++ b/Assets/Scripts/Etc/Constants.cs @@ -10,7 +10,5 @@ public static class Constants //TODO : 마우스 감도 조절 등에 변경 가능한지 확인 필요 public static readonly float CAM_TURN_SPEED = 40; - //TODO : 캐릭터 데이터 완료되면 데이터 값으로 사용해야함 - public static readonly float MOVE_SPEED = 3; public static readonly float JUMP_FORCE = 3f; } diff --git a/Assets/Scripts/Manage/TableManager.cs b/Assets/Scripts/Manage/TableManager.cs index e5ce5cd..bad88b4 100644 --- a/Assets/Scripts/Manage/TableManager.cs +++ b/Assets/Scripts/Manage/TableManager.cs @@ -27,6 +27,7 @@ public class TableManager : UnitySingleton #endregion LoadAssets //테이블별로 테이블 가져오는 함수를 계속 추가해 줘야하는 단점... + //전부 메모리에 올려두고 사용하는게 나을지 고민 필요 #region Prop public JPropInfoData GetPropInfoById(int id) { diff --git a/Assets/Scripts/Manage/UIManager.cs b/Assets/Scripts/Manage/UIManager.cs index 1a5ebb4..61c4769 100644 --- a/Assets/Scripts/Manage/UIManager.cs +++ b/Assets/Scripts/Manage/UIManager.cs @@ -113,6 +113,7 @@ public class UIManager : UnitySingleton return uiBase; } + #region Close UI public void CloseUI(UIBase ui) { switch(ui.UI_ROOT_TYPE) @@ -143,13 +144,7 @@ public class UIManager : UnitySingleton Destroy(_loadingUI.gameObject); _loadingUI = null; } - private IEnumerator DelayCloseLoading() - { - yield return new WaitForSeconds(0.5f); - _loadingUI.CloseAction(); - Destroy(_loadingUI.gameObject); - _loadingUI = null; - } + public void ReleaseUI() { @@ -167,6 +162,9 @@ public class UIManager : UnitySingleton _systemUIList = new(); } + #region Close UI + + #region Utils public Camera GetUICam() { var uiCam = _uiCanvas.worldCamera; @@ -179,4 +177,5 @@ public class UIManager : UnitySingleton var uiCam = _uiCanvas.worldCamera; uiCam.GetUniversalAdditionalCameraData().renderType = CameraRenderType.Base; } + #endregion Utils } diff --git a/Assets/Scripts/Stage/Controller/PlayerController.cs b/Assets/Scripts/Stage/Controller/PlayerController.cs index 7a7166f..e1e97ea 100644 --- a/Assets/Scripts/Stage/Controller/PlayerController.cs +++ b/Assets/Scripts/Stage/Controller/PlayerController.cs @@ -37,7 +37,6 @@ public class PlayerController : MonoBehaviour _currentTeam = E_TEAM.Red; } - // Update is called once per frame private void Update() { if(IsBlock) @@ -51,7 +50,7 @@ public class PlayerController : MonoBehaviour var _moveHorizontal = Input.GetAxis("Horizontal"); var _moveVertical = Input.GetAxis("Vertical"); - _playerMove.Move(_moveHorizontal, _moveVertical); + _playerMove.Move(_moveHorizontal, _moveVertical, _tableData.SPEED); if(Input.GetKeyDown(KeyCode.Space)) { diff --git a/Assets/Scripts/Stage/Controller/PlayerMove.cs b/Assets/Scripts/Stage/Controller/PlayerMove.cs index fd02a2a..c63801d 100644 --- a/Assets/Scripts/Stage/Controller/PlayerMove.cs +++ b/Assets/Scripts/Stage/Controller/PlayerMove.cs @@ -17,7 +17,7 @@ public class PlayerMove : MonoBehaviour } } - public void Move(float horizontal, float vertical) + public void Move(float horizontal, float vertical, float speed) { var dir = (_playerObj.transform.forward * vertical) + (_playerObj.transform.right * horizontal); _moveDir.x = dir.x; @@ -26,7 +26,7 @@ public class PlayerMove : MonoBehaviour { _moveDir.y += Physics.gravity.y * Time.deltaTime; } - _characterController.Move(_moveDir * Constants.MOVE_SPEED * Time.deltaTime); + _characterController.Move(_moveDir * speed * Time.deltaTime); } public void Rotate(float rotate) diff --git a/Assets/Scripts/Stage/Controller/PropController.cs b/Assets/Scripts/Stage/Controller/PropController.cs index c9f1522..282b6a7 100644 --- a/Assets/Scripts/Stage/Controller/PropController.cs +++ b/Assets/Scripts/Stage/Controller/PropController.cs @@ -40,6 +40,7 @@ public class PropController : MonoBehaviour private void InitData(JPropInfoData data) { _trailFx.SetActive(false); + //TODO : 생성 시 FX 추가해야함 //_spawnFx.SetActive(true); _rigidBody = GetComponent(); diff --git a/Assets/Scripts/Stage/Manage/StageManager.cs b/Assets/Scripts/Stage/Manage/StageManager.cs index 0f6cd45..afb6a42 100644 --- a/Assets/Scripts/Stage/Manage/StageManager.cs +++ b/Assets/Scripts/Stage/Manage/StageManager.cs @@ -21,6 +21,7 @@ public class StageManager : UnitySingletonOnce public bool IsSpawnable { get { return _state <= E_STAGE_STATE.Playing; } } + #region Initialize public void Init(PlayerInfo player, E_STAGE_TYPE type) { _currentStageType = type; @@ -45,11 +46,27 @@ public class StageManager : UnitySingletonOnce } } + #endregion Initialize + + #region Play Control public void StartGame() { _state = E_STAGE_STATE.Playing; StartCoroutine(PlayTimer()); } + public void GameOver() + { + _state = E_STAGE_STATE.End; + _currentPlayer.Block(); + var ui = UIManager.Instance.OpenUI(E_UI_TYPE.UIPanelStageResult) as UIPanelStageResult; + ui.SetData(_gotPropDict); + } + + public void GameEnd() + { + _currentPlayer.GameOver(); + } + #endregion Play Control public void UpdateScore(E_TEAM team, JPropInfoData prop) { @@ -90,25 +107,12 @@ public class StageManager : UnitySingletonOnce } } - //낙하했을 때 + //플레이어 낙하했을 때 public void PlayerFall(PlayerController player) { _spawnController.RespawnPlayer(player); } - public void GameOver() - { - _state = E_STAGE_STATE.End; - _currentPlayer.Block(); - var ui = UIManager.Instance.OpenUI(E_UI_TYPE.UIPanelStageResult) as UIPanelStageResult; - ui.SetData(_gotPropDict); - } - - public void GameEnd() - { - _currentPlayer.GameOver(); - } - #region Timer private IEnumerator PlayTimer() { diff --git a/Assets/Scripts/UI/Loading/UIPanelLoadingIntro.cs b/Assets/Scripts/UI/Loading/UIPanelLoadingIntro.cs index 811a6e3..c18a772 100644 --- a/Assets/Scripts/UI/Loading/UIPanelLoadingIntro.cs +++ b/Assets/Scripts/UI/Loading/UIPanelLoadingIntro.cs @@ -21,6 +21,8 @@ public class UIPanelLoadingIntro : UIBase { EventBus.Instance.Unsubscribe(OnUpdateLoadingGauge); } + + //게이지에 넣을게 미확실.. private void OnUpdateLoadingGauge(EventUpdateTableLadingProgress e) { _loadingSlider.value = e.Progress; diff --git a/Assets/Scripts/UI/Stage/UIPanelStageResult.cs b/Assets/Scripts/UI/Stage/UIPanelStageResult.cs index b507099..05b2348 100644 --- a/Assets/Scripts/UI/Stage/UIPanelStageResult.cs +++ b/Assets/Scripts/UI/Stage/UIPanelStageResult.cs @@ -38,7 +38,8 @@ public class UIPanelStageResult : UIBase } _totalPointText.SetText(totalPoint.ToString()); - //먹은 코인, 보석 표기해야함 + + //TODO 먹은 코인, 보석 표기해야함 //획득 리스트에 맞게 생성 //AddressableManager.Instance.Spawn("RewardItem", _rewardRoot) }