diff --git a/Assets/_DDD/_Scripts/GameData/DataManager.cs b/Assets/_DDD/_Scripts/GameData/DataManager.cs index f91d28bb3..56bf9541f 100644 --- a/Assets/_DDD/_Scripts/GameData/DataManager.cs +++ b/Assets/_DDD/_Scripts/GameData/DataManager.cs @@ -17,7 +17,7 @@ public async void PostInit() { try { - ItemDataSo = await AssetManager.LoadAsset("ItemDataSo"); + ItemDataSo = await AssetManager.LoadAsset(DataConstants.ItemDataSo); } catch (Exception e) { diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs index d1f62385d..e1ee7e7bc 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/CreateRestaurantPlayer.cs @@ -12,10 +12,10 @@ private async void Start() { try { - var playerPrefab = await AssetManager.LoadAsset("RestaurantPlayer"); + var playerPrefab = await AssetManager.LoadAsset(CommonConstants.RestaurantPlayer); var player = Instantiate(playerPrefab, _spawnPosition, playerPrefab.transform.rotation); - player.name = "RestaurantPlayer"; - CameraManager.Instance.GetCameraGameObject("RestaurantBaseCamera").SetFollowAndLookAtTarget(player.transform); + player.name = CommonConstants.RestaurantPlayer; + CameraManager.Instance.GetCameraGameObject(CameraType.RestaurantBaseCamera).SetFollowAndLookAtTarget(player.transform); } catch (Exception e) { diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs index d51695151..65b5f341f 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs @@ -24,14 +24,14 @@ private void Awake() { _rigidbody = GetComponent(); _animation = GetComponent(); - _visualLook = transform.Find("VisualLook"); + _visualLook = transform.Find(CommonConstants.VisualLook); } private async void Start() { try { - _playerData = await AssetManager.LoadAsset("RestaurantPlayerDataSo"); + _playerData = await AssetManager.LoadAsset(DataConstants.RestaurantPlayerDataSo); _playerData.MoveActionReference.action.performed += OnMove; _playerData.MoveActionReference.action.canceled += OnMove; @@ -107,7 +107,7 @@ private void Move() SetCurrentDirection(_inputDirection); _isMoving = _inputDirection != Vector3.zero; - string animationName = _isMoving ? "RunFast" : "Idle"; + string animationName = _isMoving ? RestaurantPlayerAnimation.Walk : RestaurantPlayerAnimation.Idle; _animation.PlayAnimation(animationName, true); Vector3 finalVelocity = _inputDirection * _playerData.MoveSpeed; @@ -134,7 +134,7 @@ private IEnumerator DashCoroutine() _isDashing = true; _isDashCooldown = true; - _animation.PlayAnimationDuration("Dash", false, _playerData.DashTime); + _animation.PlayAnimationDuration(RestaurantPlayerAnimation.Dash, false, _playerData.DashTime); Vector3 dashVelocity = _currentDirection.normalized * _playerData.DashSpeed; _rigidbody.linearVelocity = dashVelocity; diff --git a/Assets/_DDD/_Scripts/Utilities/Constants.cs b/Assets/_DDD/_Scripts/Utilities/Constants.cs new file mode 100644 index 000000000..4a8cbeaae --- /dev/null +++ b/Assets/_DDD/_Scripts/Utilities/Constants.cs @@ -0,0 +1,21 @@ +namespace DDD +{ + public static class CommonConstants + { + public const string VisualLook = "VisualLook"; + public const string RestaurantPlayer = "RestaurantPlayer"; + } + + public static class DataConstants + { + public const string ItemDataSo = "ItemDataSo"; + public const string RestaurantPlayerDataSo = "RestaurantPlayerDataSo"; + } + + public static class RestaurantPlayerAnimation + { + public const string Idle = "Idle"; + public const string Walk = "RunFast"; + public const string Dash = "Dash"; + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Utilities/Constants.cs.meta b/Assets/_DDD/_Scripts/Utilities/Constants.cs.meta new file mode 100644 index 000000000..26446f490 --- /dev/null +++ b/Assets/_DDD/_Scripts/Utilities/Constants.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6e8cf38ab843c9e40a94a26ba7102dc4 \ No newline at end of file