From 8fd305f1061bc19d91c34f83fdd93d4f85671764 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Wed, 9 Jul 2025 18:45:11 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EC=84=A4=EA=B3=84=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddressableAssetSettings.asset | 2 +- .../AssetGroups/GoogleSheetSprite_Group.asset | 7 +- .../Sprites/Items.spriteatlasv2.meta | 12 +- Assets/_DDD/_Scripts/AssetManagement.meta | 8 + .../_Scripts/AssetManagement/AssetManager.cs | 36 +++ .../AssetManagement/AssetManager.cs.meta | 2 + Assets/_DDD/_Scripts/CameraSystem.meta | 8 + .../CameraManager.cs | 0 .../CameraManager.cs.meta | 0 Assets/_DDD/_Scripts/GameCharacter.meta | 8 + .../_Scripts/GameCharacter/IGameCharacter.cs | 7 + .../GameCharacter/IGameCharacter.cs.meta | 2 + .../GameCharacter/IMovementConstraint.cs | 7 + .../GameCharacter/IMovementConstraint.cs.meta | 3 + Assets/_DDD/_Scripts/GameData.meta | 8 + Assets/_DDD/_Scripts/GameData/DataManager.cs | 21 ++ .../_Scripts/GameData/DataManager.cs.meta | 2 + .../_DDD/_Scripts/GameFlow/GameFlowManager.cs | 116 +++++++- .../_Scripts/GameFlow/GameFlowManager.prefab | 7 + .../_Scripts/GameFramework/SceneManager.cs | 4 +- .../Core/GoogleSheetManager.cs | 3 + Assets/_DDD/_Scripts/InputSystem.meta | 8 + .../InputManager.cs} | 15 +- .../InputManager.cs.meta} | 0 ...aracters.meta => RestaurantCharacter.meta} | 0 .../BaseRestaurantCharacter.prefab | 255 ++++++++++++++++++ .../BaseRestaurantCharacter.prefab.meta | 7 + .../Players.meta | 0 .../Players/RestaurantPlayer.meta | 0 .../Players/RestaurantPlayer/IStateMachine.cs | 0 .../RestaurantPlayer/IStateMachine.cs.meta | 0 .../RestaurantPlayer/PlayerStateMachine.cs | 0 .../PlayerStateMachine.cs.meta | 0 .../RestaurantPlayer/RestaurantPlayer.cs | 4 +- .../RestaurantPlayer/RestaurantPlayer.cs.meta | 0 .../RestaurantPlayer/RestaurantPlayerData.cs | 0 .../RestaurantPlayerData.cs.meta | 0 .../RestaurantPlayer/RestaurantPlayerView.cs | 0 .../RestaurantPlayerView.cs.meta | 0 .../Players/RestaurantPlayer/States.meta | 0 .../RestaurantPlayer/States/IdleState.cs | 0 .../RestaurantPlayer/States/IdleState.cs.meta | 0 .../RestaurantPlayer/States/WalkingState.cs | 0 .../States/WalkingState.cs.meta | 0 .../RestaurantCharacter.cs | 9 + .../RestaurantCharacter.cs.meta | 2 + .../RestaurantCharacterAnimation.cs | 9 + .../RestaurantCharacterAnimation.cs.meta | 2 + .../RestaurantCharacterMovement.cs | 9 + .../RestaurantCharacterMovement.cs.meta | 2 + .../RestaurantPlayer.prefab | 100 +++++++ .../RestaurantPlayer.prefab.meta | 7 + .../RestaurantPlayerCharacter.cs | 9 + .../RestaurantPlayerCharacter.cs.meta | 2 + .../RestaurantPlayerMovement.cs | 11 + .../RestaurantPlayerMovement.cs.meta | 2 + .../SpineController.cs | 0 .../SpineController.cs.meta | 0 58 files changed, 687 insertions(+), 29 deletions(-) create mode 100644 Assets/_DDD/_Scripts/AssetManagement.meta create mode 100644 Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs create mode 100644 Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs.meta create mode 100644 Assets/_DDD/_Scripts/CameraSystem.meta rename Assets/_DDD/_Scripts/{Controllers => CameraSystem}/CameraManager.cs (100%) rename Assets/_DDD/_Scripts/{Controllers => CameraSystem}/CameraManager.cs.meta (100%) create mode 100644 Assets/_DDD/_Scripts/GameCharacter.meta create mode 100644 Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs create mode 100644 Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs.meta create mode 100644 Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs create mode 100644 Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs.meta create mode 100644 Assets/_DDD/_Scripts/GameData.meta create mode 100644 Assets/_DDD/_Scripts/GameData/DataManager.cs create mode 100644 Assets/_DDD/_Scripts/GameData/DataManager.cs.meta create mode 100644 Assets/_DDD/_Scripts/InputSystem.meta rename Assets/_DDD/_Scripts/{Controllers/KeyManager.cs => InputSystem/InputManager.cs} (96%) rename Assets/_DDD/_Scripts/{Controllers/KeyManager.cs.meta => InputSystem/InputManager.cs.meta} (100%) rename Assets/_DDD/_Scripts/{Characters.meta => RestaurantCharacter.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab.meta rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players.meta (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer.meta (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/IStateMachine.cs (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/IStateMachine.cs.meta (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/PlayerStateMachine.cs (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/PlayerStateMachine.cs.meta (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/RestaurantPlayer.cs (95%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/RestaurantPlayer.cs.meta (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/RestaurantPlayerData.cs (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/RestaurantPlayerData.cs.meta (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/RestaurantPlayerView.cs (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/RestaurantPlayerView.cs.meta (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/States.meta (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/States/IdleState.cs (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/States/IdleState.cs.meta (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/States/WalkingState.cs (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/Players/RestaurantPlayer/States/WalkingState.cs.meta (100%) create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacter.cs create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacter.cs.meta create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs.meta create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterMovement.cs create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterMovement.cs.meta create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab.meta create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerCharacter.cs create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerCharacter.cs.meta create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs create mode 100644 Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs.meta rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/SpineController.cs (100%) rename Assets/_DDD/_Scripts/{Characters => RestaurantCharacter}/SpineController.cs.meta (100%) diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 6e2b11980..e316253d8 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 30e7f67fe9aaa7849a34c9b6e2bc53ae m_currentHash: serializedVersion: 2 - Hash: 00000000000000000000000000000000 + Hash: b999ffdad28e71d51bc1ab0c8e9efbfa m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 1 m_CatalogRequestsTimeout: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset index d862de724..baae61a73 100644 --- a/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset @@ -14,7 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_GroupName: GoogleSheetSprite_Group m_GUID: 30e7f67fe9aaa7849a34c9b6e2bc53ae - m_SerializeEntries: [] + m_SerializeEntries: + - m_GUID: e15933f76da90e742866563b5cd9e45f + m_Address: Gold + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: d12ffbb6f886d48418efb0b6d15ccb88, type: 2} m_SchemaSet: diff --git a/Assets/_DDD/Addressables/Sprites/Items.spriteatlasv2.meta b/Assets/_DDD/Addressables/Sprites/Items.spriteatlasv2.meta index e358cb1c2..2569b9f26 100644 --- a/Assets/_DDD/Addressables/Sprites/Items.spriteatlasv2.meta +++ b/Assets/_DDD/Addressables/Sprites/Items.spriteatlasv2.meta @@ -4,9 +4,9 @@ SpriteAtlasImporter: externalObjects: {} textureSettings: serializedVersion: 2 - anisoLevel: 1 - compressionQuality: 50 - maxTextureSize: 2048 + anisoLevel: 0 + compressionQuality: 0 + maxTextureSize: 0 textureCompression: 0 filterMode: 1 generateMipMaps: 0 @@ -17,10 +17,10 @@ SpriteAtlasImporter: packingSettings: serializedVersion: 2 padding: 4 - blockOffset: 1 + blockOffset: 0 allowAlphaSplitting: 0 - enableRotation: 1 - enableTightPacking: 1 + enableRotation: 0 + enableTightPacking: 0 enableAlphaDilation: 0 secondaryTextureSettings: {} variantMultiplier: 1 diff --git a/Assets/_DDD/_Scripts/AssetManagement.meta b/Assets/_DDD/_Scripts/AssetManagement.meta new file mode 100644 index 000000000..ca1f49750 --- /dev/null +++ b/Assets/_DDD/_Scripts/AssetManagement.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01a783bbf1998df4fa67164cfc433324 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs b/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs new file mode 100644 index 000000000..28f574a16 --- /dev/null +++ b/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs @@ -0,0 +1,36 @@ +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.AddressableAssets; +using UnityEngine.ResourceManagement.AsyncOperations; + +namespace DDD +{ + public class AssetManager : Singleton, IManager + { + public void Init() + { + + } + + public void PostInit() + { + + } + + // public AsyncOperationHandle LoadAsset(AssetReference assetRef) + // { + // + // var handle = assetRef.LoadAssetAsync(); + // } + // + // private void OnAssetLoaded(AsyncOperationHandle obj) + // { + // + // } + // + // public void ReleaseAsset() + // { + // TestRef.ReleaseAsset(); + // } + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs.meta b/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs.meta new file mode 100644 index 000000000..8775d0126 --- /dev/null +++ b/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 38667042b7dae844b813b6d15d63ec65 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/CameraSystem.meta b/Assets/_DDD/_Scripts/CameraSystem.meta new file mode 100644 index 000000000..fe295947d --- /dev/null +++ b/Assets/_DDD/_Scripts/CameraSystem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0abd16944f70d9c41ab64299ec5b98ff +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/Controllers/CameraManager.cs b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs similarity index 100% rename from Assets/_DDD/_Scripts/Controllers/CameraManager.cs rename to Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs diff --git a/Assets/_DDD/_Scripts/Controllers/CameraManager.cs.meta b/Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Controllers/CameraManager.cs.meta rename to Assets/_DDD/_Scripts/CameraSystem/CameraManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GameCharacter.meta b/Assets/_DDD/_Scripts/GameCharacter.meta new file mode 100644 index 000000000..c37170835 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameCharacter.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4cf45ebd41833374f85e75b759783eb3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs b/Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs new file mode 100644 index 000000000..d42c95d79 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs @@ -0,0 +1,7 @@ +namespace DDD +{ + public interface IGameCharacter + { + + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs.meta b/Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs.meta new file mode 100644 index 000000000..b3ee2503b --- /dev/null +++ b/Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8651d2cc54cb48840be40c41a055ad32 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs b/Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs new file mode 100644 index 000000000..6e290b4e9 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs @@ -0,0 +1,7 @@ +namespace DDD +{ + public interface IMovementConstraint + { + + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs.meta b/Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs.meta new file mode 100644 index 000000000..a92c0f3ac --- /dev/null +++ b/Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 86d2fc3f0d2f489e8552cdbb8fe7425d +timeCreated: 1752053109 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameData.meta b/Assets/_DDD/_Scripts/GameData.meta new file mode 100644 index 000000000..bc4651fea --- /dev/null +++ b/Assets/_DDD/_Scripts/GameData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 83806d7f5b542da4d8d30a863e9bdbbc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameData/DataManager.cs b/Assets/_DDD/_Scripts/GameData/DataManager.cs new file mode 100644 index 000000000..31033a0ac --- /dev/null +++ b/Assets/_DDD/_Scripts/GameData/DataManager.cs @@ -0,0 +1,21 @@ +using UnityEngine; + +namespace DDD +{ + public class DataManager : Singleton, IManager + { + public void Init() + { + + } + + public void PostInit() + { + + } + + // GetItemType(id) + // GetItemImage + // GetItemName + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameData/DataManager.cs.meta b/Assets/_DDD/_Scripts/GameData/DataManager.cs.meta new file mode 100644 index 000000000..81ae2cd64 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameData/DataManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 07beed0d64f351c4e9b01784eebf0498 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs index c49d5b45a..c45088431 100644 --- a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs @@ -1,6 +1,8 @@ using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.AddressableAssets; using UnityEngine.SceneManagement; namespace DDD @@ -18,17 +20,24 @@ public class GameFlowData : ScriptableObject { public GameFlowState CurrentGameState; } + + [CreateAssetMenu(fileName = "GameFlowAssets", menuName = "GameFlow/GameFlowAssets")] + public class GameFlowAssets : ScriptableObject + { + public Dictionary> FlowItems = new(); + public Dictionary> FlowAssets = new(); + } [CreateAssetMenu(fileName = "GameFlowSceneMapping", menuName = "GameFlow/GameFlowSceneMapping")] public class GameFlowSceneMapping : ScriptableObject { - public Dictionary FlowToSceneMapping = new Dictionary(); + public Dictionary FlowToSceneMapping = new(); } public class GameFlowManager : Singleton, IManager { private GameFlowData _gameFlowData = null; - + public GameFlowAssets GameFlowAssets = null; public GameFlowSceneMapping GameFlowSceneMapping; public void Init() @@ -38,19 +47,11 @@ public void Init() public void PostInit() { + SceneManager.Instance.OnSceneChanged += OnFlowSceneOpened; if (IsGameStarted() == false) { - Scene sceneToLoad; - bool isSceneFound = GameFlowSceneMapping.FlowToSceneMapping.TryGetValue(_gameFlowData.CurrentGameState, out sceneToLoad); - if (isSceneFound == false) - { - SceneManager.Instance.RequestSceneLoad(sceneToLoad); - } - else - { - Debug.Assert(false, "Scene not found!"); - } + ChangeFlow(GameFlowState.ReadyForRestaurant); } } @@ -64,5 +65,96 @@ protected override void Awake() private void Start() { } + + private bool CanChangeFlow(GameFlowState newFlowState) + { + return true; + } + + public void ChangeFlow(GameFlowState newFlowState) + { + StartCoroutine(ChangeFlowCoroutine(newFlowState)); + } + + private IEnumerator ChangeFlowCoroutine(GameFlowState newFlowState) + { + if (CanChangeFlow(newFlowState) == false) + { + Debug.LogError("Can't change flow"); + yield break; + } + + EndCurrentFlow(); + + + } + + public void EndCurrentFlow() + { + + } + + public IEnumerator ReadyNewFlow(GameFlowState newFlowState) + { + OpenFlowScene(newFlowState); + + // Ready Assets + if (GameFlowAssets.FlowItems.ContainsKey(newFlowState)) + { + List Items = GameFlowAssets.FlowItems[newFlowState]; + // Addressables.LoadAssetsAsync(Items, null); + // TODO : 여러 에셋 로드하고, 콜백 받을때까지 기다리기 + + // Wait + } + + if (GameFlowAssets.FlowAssets.ContainsKey(newFlowState)) + { + //List Assets = GameFlowAssets.FlowItems[newFlowState]; + // Addressables.LoadAssetsAsync(Assets, ) + // TODO : 여러 에셋 로드하고, 콜백 받을때까지 기다리기 + + // Wait + } + + // Ready Scene + GetFlowScene(newFlowState, out var flowScene); + yield return new WaitUntil(() => _currentScene == flowScene ); + + StartFlow(); + } + + public void OpenFlowScene(GameFlowState newFlowState) + { + if (GetFlowScene(newFlowState, out var sceneToLoad)) + { + SceneManager.Instance.RequestSceneLoad(sceneToLoad); + } + else + { + Debug.Assert(false, "Scene not found!"); + } + } + + private Scene _currentScene; + public void OnFlowSceneOpened(Scene newScene) + { + _currentScene = newScene; + } + + public bool GetFlowScene(GameFlowState flowState, out Scene scene) + { + if (GameFlowSceneMapping.FlowToSceneMapping.TryGetValue(flowState, out scene)) + { + return true; + } + + return false; + } + + public void StartFlow() + { + // Broadcast new flow started + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.prefab b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.prefab index 15c2b9429..9bcde9781 100644 --- a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.prefab +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.prefab @@ -45,3 +45,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 1 + GameFlowSceneMapping: {fileID: 0} + FlowAsset: + m_AssetGUID: e15933f76da90e742866563b5cd9e45f + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 1 diff --git a/Assets/_DDD/_Scripts/GameFramework/SceneManager.cs b/Assets/_DDD/_Scripts/GameFramework/SceneManager.cs index fcbde69b8..5bff1dc97 100644 --- a/Assets/_DDD/_Scripts/GameFramework/SceneManager.cs +++ b/Assets/_DDD/_Scripts/GameFramework/SceneManager.cs @@ -35,6 +35,8 @@ public class SceneDefinition : ScriptableObject public class SceneManager : Singleton, IManager { + public Action OnSceneChanged; + public void Init() { // Load Scene Data @@ -142,7 +144,7 @@ public async Task ChangeScene(SceneType sceneType) // 씬 로딩 후 초기화 작업 CameraManager.Instance.ChangeScene(sceneType); - KeyManager.Instance.ChangeScene(sceneType); + InputManager.Instance.ChangeScene(sceneType); CurrentSceneType = sceneType; diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetManager.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetManager.cs index 98f62c315..4c1e10568 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetManager.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetManager.cs @@ -9,6 +9,7 @@ using UnityEngine; using Newtonsoft.Json.Linq; using System.Linq; +using DDD; using JetBrains.Annotations; using Sirenix.OdinInspector; using UnityEditor; @@ -88,6 +89,8 @@ public static async Task LoadSo() where T : ScriptableObject [Button("데이터 최신화"), EnableIf(nameof(CanFetchData))] private async Task FetchGoogleSheet() { + + _availSheetArray = _availSheets.Split('/'); var prevLog = AssetDatabase.LoadAssetAtPath(ChangeLogAssetPath); diff --git a/Assets/_DDD/_Scripts/InputSystem.meta b/Assets/_DDD/_Scripts/InputSystem.meta new file mode 100644 index 000000000..86da76bf1 --- /dev/null +++ b/Assets/_DDD/_Scripts/InputSystem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aed2f49e843ad9a4a8dbbc13532b7183 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/Controllers/KeyManager.cs b/Assets/_DDD/_Scripts/InputSystem/InputManager.cs similarity index 96% rename from Assets/_DDD/_Scripts/Controllers/KeyManager.cs rename to Assets/_DDD/_Scripts/InputSystem/InputManager.cs index 2b2b8916a..b19f1cc9e 100644 --- a/Assets/_DDD/_Scripts/Controllers/KeyManager.cs +++ b/Assets/_DDD/_Scripts/InputSystem/InputManager.cs @@ -1,3 +1,4 @@ +using System; using UnityEngine; using UnityEngine.InputSystem; @@ -9,15 +10,17 @@ public enum InputActionMaps Ui = 1, Restaurant = 2, } - - public static class RestaurantActions + + [Flags] + public enum RestaurantActions { - public const string Move = "Move"; - public const string Dash = "Dash"; - public const string Interact = "Interact"; + None = 0, + Move = 1<<0, + Dash = 1<<1, + Interact = 1<<2 } - public class KeyManager : Singleton + public class InputManager : Singleton { private PlayerInput _currentPlayerInput; diff --git a/Assets/_DDD/_Scripts/Controllers/KeyManager.cs.meta b/Assets/_DDD/_Scripts/InputSystem/InputManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Controllers/KeyManager.cs.meta rename to Assets/_DDD/_Scripts/InputSystem/InputManager.cs.meta diff --git a/Assets/_DDD/_Scripts/Characters.meta b/Assets/_DDD/_Scripts/RestaurantCharacter.meta similarity index 100% rename from Assets/_DDD/_Scripts/Characters.meta rename to Assets/_DDD/_Scripts/RestaurantCharacter.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab b/Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab new file mode 100644 index 000000000..b28ee57a8 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab @@ -0,0 +1,255 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5259510642736920361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1761643478070701343} + - component: {fileID: 5176902543201676162} + - component: {fileID: 5246526151924390639} + - component: {fileID: 3365694194251356714} + - component: {fileID: 127430239903465757} + - component: {fileID: 3095965496140440094} + m_Layer: 0 + m_Name: BaseRestaurantCharacter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1761643478070701343 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5259510642736920361} + 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} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1111036208394089843} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &5176902543201676162 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5259510642736920361} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 116 + m_CollisionDetection: 1 +--- !u!136 &5246526151924390639 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5259510642736920361} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.2 + m_Height: 0.1 + m_Direction: 1 + m_Center: {x: 0, y: 0.1, z: 0} +--- !u!114 &3365694194251356714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5259510642736920361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 061fa444069fcd74c884c1b3379c41b8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &127430239903465757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5259510642736920361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38cb67223546879468e9c0655893e025, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3095965496140440094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5259510642736920361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e20368314a3139f4fb4b4e35af9fcf98, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6791841979869644848 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1111036208394089843} + - component: {fileID: 5817391387681993290} + - component: {fileID: 8683566178618629536} + - component: {fileID: 1741467189652270979} + m_Layer: 0 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1111036208394089843 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6791841979869644848} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1761643478070701343} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!33 &5817391387681993290 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6791841979869644848} + m_Mesh: {fileID: 0} +--- !u!23 &8683566178618629536 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6791841979869644848} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 288333d9c9df2d84cadf3b48d918ebdb, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &1741467189652270979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6791841979869644848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 0} + initialSkinName: Basic + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: + loop: 1 + timeScale: 1 diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab.meta new file mode 100644 index 000000000..6e7072d75 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/BaseRestaurantCharacter.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3db3fc62639929c4ba6031ca4ae6600c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/Characters/Players.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players.meta similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players.meta rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players.meta diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer.meta similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer.meta rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer.meta diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/IStateMachine.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/IStateMachine.cs similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/IStateMachine.cs rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/IStateMachine.cs diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/IStateMachine.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/IStateMachine.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/IStateMachine.cs.meta rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/IStateMachine.cs.meta diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/PlayerStateMachine.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/PlayerStateMachine.cs similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/PlayerStateMachine.cs rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/PlayerStateMachine.cs diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/PlayerStateMachine.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/PlayerStateMachine.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/PlayerStateMachine.cs.meta rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/PlayerStateMachine.cs.meta diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayer.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs similarity index 95% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayer.cs rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs index 5ed434731..040ffcb4f 100644 --- a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayer.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs @@ -42,8 +42,8 @@ private void Awake() private void Start() { - _moveAction = KeyManager.Instance.GetAction(InputActionMaps.Restaurant, RestaurantActions.Move); - _dashAction = KeyManager.Instance.GetAction(InputActionMaps.Restaurant, RestaurantActions.Dash); + _moveAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Move)); + _dashAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Dash)); _moveAction.performed += OnMove; _moveAction.canceled += OnMove; diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayer.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayer.cs.meta rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayer.cs.meta diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayerData.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayerData.cs rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayerData.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayerData.cs.meta rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerData.cs.meta diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayerView.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayerView.cs rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayerView.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/RestaurantPlayerView.cs.meta rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/RestaurantPlayerView.cs.meta diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/States.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States.meta similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/States.meta rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States.meta diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/States/IdleState.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/IdleState.cs similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/States/IdleState.cs rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/IdleState.cs diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/States/IdleState.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/IdleState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/States/IdleState.cs.meta rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/IdleState.cs.meta diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/States/WalkingState.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/WalkingState.cs similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/States/WalkingState.cs rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/WalkingState.cs diff --git a/Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/States/WalkingState.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/WalkingState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Characters/Players/RestaurantPlayer/States/WalkingState.cs.meta rename to Assets/_DDD/_Scripts/RestaurantCharacter/Players/RestaurantPlayer/States/WalkingState.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacter.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacter.cs new file mode 100644 index 000000000..137576147 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacter.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +namespace DDD +{ + public class RestaurantCharacter : MonoBehaviour, IGameCharacter + { + + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacter.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacter.cs.meta new file mode 100644 index 000000000..dd8f456fa --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacter.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 061fa444069fcd74c884c1b3379c41b8 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs new file mode 100644 index 000000000..30f1645b9 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +namespace DDD +{ + public class RestaurantCharacterAnimation : MonoBehaviour + { + + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs.meta new file mode 100644 index 000000000..86be7f531 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterAnimation.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e20368314a3139f4fb4b4e35af9fcf98 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterMovement.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterMovement.cs new file mode 100644 index 000000000..52c2b8e1e --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterMovement.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +namespace DDD +{ + public class RestaurantCharacterMovement : MonoBehaviour + { + + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterMovement.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterMovement.cs.meta new file mode 100644 index 000000000..1ab8c8675 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterMovement.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 38cb67223546879468e9c0655893e025 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab new file mode 100644 index 000000000..47085849c --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab @@ -0,0 +1,100 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3275709266858077019 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1741467189652270979, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 57e95ec929c09d64c9f85a40f849786a, type: 2} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Name + value: RestaurantPlayer + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 3365694194251356714, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + - {fileID: 127430239903465757, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + insertIndex: 3 + addedObject: {fileID: 4699468658517678862} + - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + insertIndex: 4 + addedObject: {fileID: 4956037093100801085} + m_SourcePrefab: {fileID: 100100000, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} +--- !u!1 &7316134055819320434 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + m_PrefabInstance: {fileID: 3275709266858077019} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4699468658517678862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7316134055819320434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d4266c194d3fd346be961b537c811f1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &4956037093100801085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7316134055819320434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a83ca1b1f17a934192ef91dd4f073b8, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab.meta new file mode 100644 index 000000000..632bfd2e0 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 29dcda970aef9584d9b157e766b8a278 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerCharacter.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerCharacter.cs new file mode 100644 index 000000000..851c03542 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerCharacter.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +namespace DDD +{ + public class RestaurantPlayerCharacter : RestaurantCharacter + { + + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerCharacter.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerCharacter.cs.meta new file mode 100644 index 000000000..8e93b59b8 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerCharacter.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2d4266c194d3fd346be961b537c811f1 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs new file mode 100644 index 000000000..9d4df4ba4 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +namespace DDD +{ + public class RestaurantPlayerMovement : RestaurantCharacterMovement + { + // TODO : TryMove // 인풋에 등록할 함수 + // TODO : CanMove // Check IMovementConstraint + // TODO : Move // 실제 트랜스레이션, 슬라이딩, 충돌 + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs.meta new file mode 100644 index 000000000..8425c814e --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerMovement.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0a83ca1b1f17a934192ef91dd4f073b8 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Characters/SpineController.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/SpineController.cs similarity index 100% rename from Assets/_DDD/_Scripts/Characters/SpineController.cs rename to Assets/_DDD/_Scripts/RestaurantCharacter/SpineController.cs diff --git a/Assets/_DDD/_Scripts/Characters/SpineController.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/SpineController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Characters/SpineController.cs.meta rename to Assets/_DDD/_Scripts/RestaurantCharacter/SpineController.cs.meta