From 8fd305f1061bc19d91c34f83fdd93d4f85671764 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Wed, 9 Jul 2025 18:45:11 +0900 Subject: [PATCH 1/2] =?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 From 32cf8177e87568e6c3ed1a0438551137a02e17a6 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Thu, 10 Jul 2025 14:48:44 +0900 Subject: [PATCH 2/2] =?UTF-8?q?DDD-33=20=EC=97=90=EC=85=8B=20=EB=A7=A4?= =?UTF-8?q?=EB=8B=88=EC=A0=80=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddressableAssetSettings.asset | 2 +- .../AssetGroups/GoogleSheetSo_Group.asset | 14 +--- .../Persistance/GoogleSheetManager.prefab | 2 +- Assets/_DDD/_Scenes/01.Restaurant.unity | 20 ++++- Assets/_DDD/_Scenes/Entry.unity | 4 +- .../_Scripts/AssetManagement/AssetManager.cs | 40 +++++----- Assets/_DDD/_Scripts/GameData/DataManager.cs | 24 +++++- .../_DDD/_Scripts/GameData/DataManager.prefab | 47 +++++++++++ .../_Scripts/GameData/DataManager.prefab.meta | 7 ++ .../_Scripts/GameFlow/GameFlowAssetsSo.asset | 14 ++++ .../GameFlowAssetsSo.asset.meta} | 2 +- .../_DDD/_Scripts/GameFlow/GameFlowManager.cs | 34 ++++---- .../GameFlow/GameFlowSceneMappingSo.asset | 14 ++++ .../GameFlowSceneMappingSo.asset.meta} | 2 +- .../_Scripts/GameFramework/GameManager.cs | 21 ++--- ...nition.asset => ManagerDefinitionSo.asset} | 7 +- .../ManagerDefinitionSo.asset.meta} | 2 +- ...leSheets.meta => GenerateGoogleSheet.meta} | 0 .../AutoCreated.meta | 0 .../AutoCreated/BackUps.meta | 0 .../2025-07-04 16-17-14 by 남태건.json | 0 .../2025-07-04 16-17-14 by 남태건.json.meta | 0 .../2025-07-04 16-18-02 by 남태건.json | 0 .../2025-07-04 16-18-02 by 남태건.json.meta | 0 .../2025-07-10 14-06-48 by 남태건.json | 77 +++++++++++++++++++ .../2025-07-10 14-06-48 by 남태건.json.meta | 7 ++ .../AutoCreated/Classes.meta | 0 .../AutoCreated/Classes/FoodData.cs} | 2 +- .../AutoCreated/Classes/FoodData.cs.meta | 2 + .../AutoCreated/Classes/FoodDataSo.cs | 12 +++ .../AutoCreated/Classes/FoodDataSo.cs.meta | 2 + .../AutoCreated/Classes/ItemData.cs} | 14 +--- .../AutoCreated/Classes/ItemData.cs.meta | 2 + .../AutoCreated/Classes/ItemDataSo.cs | 12 +++ .../AutoCreated/Classes/ItemDataSo.cs.meta | 2 + .../AutoCreated/EnumTypes.cs | 6 +- .../AutoCreated/EnumTypes.cs.meta | 0 .../AutoCreated/GoogleSheetJson.json | 51 ++---------- .../AutoCreated/GoogleSheetJson.json.meta | 0 .../AutoCreated/Logs.meta | 0 .../Logs/GoogleSheetChangeLog.asset | 28 +++++++ .../Logs/GoogleSheetChangeLog.asset.meta | 0 .../AutoCreated/So.meta | 0 .../AutoCreated/So/FoodDataSo.asset} | 10 +-- .../AutoCreated/So/FoodDataSo.asset.meta} | 2 +- .../AutoCreated/So/ItemDataSo.asset} | 15 +--- .../AutoCreated/So/ItemDataSo.asset.meta | 8 ++ .../Core.meta | 0 .../Core/GoogleSheetAddressableAutoSetup.cs | 0 .../GoogleSheetAddressableAutoSetup.cs.meta | 0 .../Core/GoogleSheetChangeLog.cs | 0 .../Core/GoogleSheetChangeLog.cs.meta | 0 .../Core/GoogleSheetDiff.cs | 0 .../Core/GoogleSheetDiff.cs.meta | 0 .../Core/GoogleSheetDiffHelper.cs | 0 .../Core/GoogleSheetDiffHelper.cs.meta | 0 .../Core/GoogleSheetDiffViewer.cs | 0 .../Core/GoogleSheetDiffViewer.cs.meta | 0 .../Core/GoogleSheetFetchHelper.cs | 0 .../Core/GoogleSheetFetchHelper.cs.meta | 0 .../Core/GoogleSheetManager.cs | 0 .../Core/GoogleSheetManager.cs.meta | 0 .../Core/GoogleSheetPostProcessor.cs | 0 .../Core/GoogleSheetPostProcessor.cs.meta | 0 .../AutoCreated/Classes/Food.cs.meta | 2 - .../AutoCreated/Classes/FoodSo.cs | 12 --- .../AutoCreated/Classes/FoodSo.cs.meta | 2 - .../AutoCreated/Classes/Item.cs.meta | 2 - .../AutoCreated/Classes/ItemSo.cs | 12 --- .../AutoCreated/Classes/ItemSo.cs.meta | 2 - .../AutoCreated/Classes/Monster.cs | 23 ------ .../AutoCreated/Classes/Monster.cs.meta | 2 - .../AutoCreated/Classes/MonsterSo.cs | 12 --- .../AutoCreated/Classes/MonsterSo.cs.meta | 2 - .../AutoCreated/So/MonsterSo.asset | 27 ------- 75 files changed, 358 insertions(+), 248 deletions(-) create mode 100644 Assets/_DDD/_Scripts/GameData/DataManager.prefab create mode 100644 Assets/_DDD/_Scripts/GameData/DataManager.prefab.meta create mode 100644 Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset rename Assets/_DDD/_Scripts/{GenerateGoogleSheets/AutoCreated/So/FoodSo.asset.meta => GameFlow/GameFlowAssetsSo.asset.meta} (79%) create mode 100644 Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.asset rename Assets/_DDD/_Scripts/{GameFramework/ManagerDefinition.asset.meta => GameFlow/GameFlowSceneMappingSo.asset.meta} (79%) rename Assets/_DDD/_Scripts/GameFramework/{ManagerDefinition.asset => ManagerDefinitionSo.asset} (82%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets/AutoCreated/So/ItemSo.asset.meta => GameFramework/ManagerDefinitionSo.asset.meta} (79%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets.meta => GenerateGoogleSheet.meta} (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/BackUps.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json.meta (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-10 14-06-48 by 남태건.json create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-10 14-06-48 by 남태건.json.meta rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/Classes.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets/AutoCreated/Classes/Food.cs => GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs} (97%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs.meta create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs.meta rename Assets/_DDD/_Scripts/{GenerateGoogleSheets/AutoCreated/Classes/Item.cs => GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs} (50%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs.meta create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs.meta rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/EnumTypes.cs (85%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/EnumTypes.cs.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/GoogleSheetJson.json (64%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/GoogleSheetJson.json.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/Logs.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/Logs/GoogleSheetChangeLog.asset (74%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/Logs/GoogleSheetChangeLog.asset.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/AutoCreated/So.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets/AutoCreated/So/FoodSo.asset => GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset} (76%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset.meta => GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset.meta} (79%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets/AutoCreated/So/ItemSo.asset => GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset} (56%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset.meta rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetAddressableAutoSetup.cs (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetAddressableAutoSetup.cs.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetChangeLog.cs (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetChangeLog.cs.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetDiff.cs (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetDiff.cs.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetDiffHelper.cs (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetDiffHelper.cs.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetDiffViewer.cs (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetDiffViewer.cs.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetFetchHelper.cs (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetFetchHelper.cs.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetManager.cs (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetManager.cs.meta (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetPostProcessor.cs (100%) rename Assets/_DDD/_Scripts/{GenerateGoogleSheets => GenerateGoogleSheet}/Core/GoogleSheetPostProcessor.cs.meta (100%) delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs.meta delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/FoodSo.cs delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/FoodSo.cs.meta delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs.meta delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/ItemSo.cs delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/ItemSo.cs.meta delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs.meta delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/MonsterSo.cs delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/MonsterSo.cs.meta delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index e316253d8..6e2b11980 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 30e7f67fe9aaa7849a34c9b6e2bc53ae m_currentHash: serializedVersion: 2 - Hash: b999ffdad28e71d51bc1ab0c8e9efbfa + Hash: 00000000000000000000000000000000 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 1 m_CatalogRequestsTimeout: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset index aea7353f8..b4a621b42 100644 --- a/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset @@ -15,20 +15,14 @@ MonoBehaviour: m_GroupName: GoogleSheetSo_Group m_GUID: 7fe0c33d351391a45a0ea3c93ecef42e m_SerializeEntries: - - m_GUID: 3dee12c6902e0644fab1d0e2693857a8 - m_Address: ItemSo + - m_GUID: 8261ff435a6e2484086e02e556c0ba93 + m_Address: FoodDataSo m_ReadOnly: 0 m_SerializedLabels: - GoogleSheetSo FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: b7e176e1cb8d76941af3b6344a4e1401 - m_Address: FoodSo - m_ReadOnly: 0 - m_SerializedLabels: - - GoogleSheetSo - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: f38617ba14522db4d87bb7e10c280a2d - m_Address: MonsterSo + - m_GUID: c2be393a39588b647bacdd69f47f677d + m_Address: ItemDataSo m_ReadOnly: 0 m_SerializedLabels: - GoogleSheetSo diff --git a/Assets/_DDD/Persistance/GoogleSheetManager.prefab b/Assets/_DDD/Persistance/GoogleSheetManager.prefab index df96c237b..6c624b2a3 100644 --- a/Assets/_DDD/Persistance/GoogleSheetManager.prefab +++ b/Assets/_DDD/Persistance/GoogleSheetManager.prefab @@ -48,7 +48,7 @@ MonoBehaviour: _isAccessGoogleSheet: 1 _googleSheetUrl: https://script.google.com/macros/s/AKfycbw8TRSl_OuY2S-RX0yvOJi1SqNqoflG0R3pWxk9GC9u_wvGQeuABZc0VH7YJ5lMrAl4/exec _namespace: DDD - _availSheets: Food/Monster/Item + _availSheets: FoodData/ItemData _generateFolderPath: /_DDD/_Scripts/GenerateGoogleSheet/AutoCreated _currentVersion: "1 - 2025-07-04 16:18:02 by \uB0A8\uD0DC\uAC74" _restoreIndex: 0 diff --git a/Assets/_DDD/_Scenes/01.Restaurant.unity b/Assets/_DDD/_Scenes/01.Restaurant.unity index 092af4928..6dab4c05b 100644 --- a/Assets/_DDD/_Scenes/01.Restaurant.unity +++ b/Assets/_DDD/_Scenes/01.Restaurant.unity @@ -4692,6 +4692,18 @@ PrefabInstance: propertyPath: m_Name value: GoogleSheetManager objectReference: {fileID: 0} + - target: {fileID: 6289760680591803305, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} + propertyPath: _editorName + value: + objectReference: {fileID: 0} + - target: {fileID: 6289760680591803305, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} + propertyPath: _currentVersion + value: "2 - 2025-07-10 14:06:48 by \uB0A8\uD0DC\uAC74" + objectReference: {fileID: 0} + - target: {fileID: 6289760680591803305, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} + propertyPath: _refreshTrigger + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -19573,7 +19585,7 @@ SpriteRenderer: m_Size: {x: 6.84, y: 4.86} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1555910286334263882 @@ -30976,7 +30988,7 @@ SpriteRenderer: m_Size: {x: 8, y: 3} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!210 &2810339226026076516 @@ -43140,7 +43152,7 @@ SpriteRenderer: m_Size: {x: 14.44, y: 8.6} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!210 &4335431399105516519 @@ -47226,7 +47238,7 @@ SpriteRenderer: m_Size: {x: 28.7, y: 5.6} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &4774839203087077672 diff --git a/Assets/_DDD/_Scenes/Entry.unity b/Assets/_DDD/_Scenes/Entry.unity index 6748f5e29..e18bcc90b 100644 --- a/Assets/_DDD/_Scenes/Entry.unity +++ b/Assets/_DDD/_Scenes/Entry.unity @@ -149,7 +149,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 1 - _managerDefinition: {fileID: 11400000, guid: a98ebd2611b2e4e80a867f57fdc91fc9, type: 2} + _managerDefinitionSo: {fileID: 11400000, guid: d8346bac7a0fdab419cca3193df2ca34, type: 2} --- !u!4 &1415192492 Transform: m_ObjectHideFlags: 0 @@ -159,7 +159,7 @@ Transform: m_GameObject: {fileID: 1415192490} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 721.5473, y: 0, z: 201.61682} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs b/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs index 28f574a16..8ec60d46d 100644 --- a/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs +++ b/Assets/_DDD/_Scripts/AssetManagement/AssetManager.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System; using UnityEngine; using UnityEngine.AddressableAssets; using UnityEngine.ResourceManagement.AsyncOperations; @@ -12,25 +12,27 @@ public void Init() } - public void PostInit() + public async void PostInit() { - + try + { + await Addressables.InitializeAsync().Task; + } + catch (Exception e) + { + Debug.Assert(false, "Addressables initialization failed"); + } + } + + public static async Awaitable LoadAsset(string key) where T : UnityEngine.Object + { + var handle = Addressables.LoadAssetAsync(key); + await handle.Task; + if (handle.Status == AsyncOperationStatus.Succeeded) + return handle.Result; + + Debug.LogError($"Addressable load failed : {key}"); + return null; } - - // 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/GameData/DataManager.cs b/Assets/_DDD/_Scripts/GameData/DataManager.cs index 31033a0ac..f91d28bb3 100644 --- a/Assets/_DDD/_Scripts/GameData/DataManager.cs +++ b/Assets/_DDD/_Scripts/GameData/DataManager.cs @@ -1,21 +1,39 @@ +using System; +using System.Linq; using UnityEngine; namespace DDD { public class DataManager : Singleton, IManager { + public ItemDataSo ItemDataSo { get; private set; } + public void Init() { } - public void PostInit() + public async void PostInit() { - + try + { + ItemDataSo = await AssetManager.LoadAsset("ItemDataSo"); + } + catch (Exception e) + { + Debug.LogError($"So bind failed\n{e.Message}"); + } } - + + // TODO : So가 늘어나는 경우 관리 방법 변경 필요성이 있음 // GetItemType(id) // GetItemImage // GetItemName + + public ItemType GetItemType(string key) + { + ItemData itemData = ItemDataSo.ItemDataList.FirstOrDefault(item => item.Id == key); + return itemData?.ItemType ?? ItemType.None; + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameData/DataManager.prefab b/Assets/_DDD/_Scripts/GameData/DataManager.prefab new file mode 100644 index 000000000..cae0f9505 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameData/DataManager.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4251080669997520799 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9003561875116500446} + - component: {fileID: 4889131746858770208} + m_Layer: 0 + m_Name: DataManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9003561875116500446 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4251080669997520799} + 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: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4889131746858770208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4251080669997520799} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07beed0d64f351c4e9b01784eebf0498, type: 3} + m_Name: + m_EditorClassIdentifier: + _persistent: 1 diff --git a/Assets/_DDD/_Scripts/GameData/DataManager.prefab.meta b/Assets/_DDD/_Scripts/GameData/DataManager.prefab.meta new file mode 100644 index 000000000..79cea5d0c --- /dev/null +++ b/Assets/_DDD/_Scripts/GameData/DataManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d90fdb17f0162334daadc6fc93e9a0e3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset b/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset new file mode 100644 index 000000000..02bf00b2d --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 0} + m_Name: GameFlowAssetsSo + m_EditorClassIdentifier: Assembly-CSharp:DDD:GameFlowAssetsSo diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset.meta b/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset.meta similarity index 79% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset.meta rename to Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset.meta index cf6525ddf..5f0467a7f 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset.meta +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b7e176e1cb8d76941af3b6344a4e1401 +guid: 4fca93ffece40ff48973532398011d84 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs index c45088431..bc690f1b5 100644 --- a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs @@ -1,9 +1,11 @@ using System; using System.Collections; using System.Collections.Generic; +using Sirenix.OdinInspector; using UnityEngine; using UnityEngine.AddressableAssets; using UnityEngine.SceneManagement; +using UnityEngine.Serialization; namespace DDD { @@ -16,33 +18,37 @@ public enum GameFlowState SettlementRestaurant = 3, } - public class GameFlowData : ScriptableObject + public class GameFlowDataSo : ScriptableObject { public GameFlowState CurrentGameState; } - [CreateAssetMenu(fileName = "GameFlowAssets", menuName = "GameFlow/GameFlowAssets")] - public class GameFlowAssets : ScriptableObject + [CreateAssetMenu(fileName = "GameFlowAssetsSo", menuName = "GameFlow/GameFlowAssetsSo")] + public class GameFlowAssetsSo : ScriptableObject { + [ShowInInspector] public Dictionary> FlowItems = new(); + + [ShowInInspector] public Dictionary> FlowAssets = new(); } - [CreateAssetMenu(fileName = "GameFlowSceneMapping", menuName = "GameFlow/GameFlowSceneMapping")] - public class GameFlowSceneMapping : ScriptableObject + [CreateAssetMenu(fileName = "GameFlowSceneMappingSo", menuName = "GameFlow/GameFlowSceneMappingSo")] + public class GameFlowSceneMappingSo : ScriptableObject { + [ShowInInspector] public Dictionary FlowToSceneMapping = new(); } public class GameFlowManager : Singleton, IManager { - private GameFlowData _gameFlowData = null; - public GameFlowAssets GameFlowAssets = null; - public GameFlowSceneMapping GameFlowSceneMapping; + private GameFlowDataSo _gameFlowDataSo; + public GameFlowAssetsSo GameFlowAssetsSo; + public GameFlowSceneMappingSo GameFlowSceneMappingSo; public void Init() { - _gameFlowData = new GameFlowData(); + _gameFlowDataSo = ScriptableObject.CreateInstance(); } public void PostInit() @@ -55,7 +61,7 @@ public void PostInit() } } - public bool IsGameStarted() => _gameFlowData.CurrentGameState != GameFlowState.None; + public bool IsGameStarted() => _gameFlowDataSo.CurrentGameState != GameFlowState.None; protected override void Awake() { @@ -99,16 +105,16 @@ public IEnumerator ReadyNewFlow(GameFlowState newFlowState) OpenFlowScene(newFlowState); // Ready Assets - if (GameFlowAssets.FlowItems.ContainsKey(newFlowState)) + if (GameFlowAssetsSo.FlowItems.ContainsKey(newFlowState)) { - List Items = GameFlowAssets.FlowItems[newFlowState]; + List Items = GameFlowAssetsSo.FlowItems[newFlowState]; // Addressables.LoadAssetsAsync(Items, null); // TODO : 여러 에셋 로드하고, 콜백 받을때까지 기다리기 // Wait } - if (GameFlowAssets.FlowAssets.ContainsKey(newFlowState)) + if (GameFlowAssetsSo.FlowAssets.ContainsKey(newFlowState)) { //List Assets = GameFlowAssets.FlowItems[newFlowState]; // Addressables.LoadAssetsAsync(Assets, ) @@ -144,7 +150,7 @@ public void OnFlowSceneOpened(Scene newScene) public bool GetFlowScene(GameFlowState flowState, out Scene scene) { - if (GameFlowSceneMapping.FlowToSceneMapping.TryGetValue(flowState, out scene)) + if (GameFlowSceneMappingSo.FlowToSceneMapping.TryGetValue(flowState, out scene)) { return true; } diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.asset b/Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.asset new file mode 100644 index 000000000..062101be3 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.asset @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 0} + m_Name: GameFlowSceneMappingSo + m_EditorClassIdentifier: Assembly-CSharp:DDD:GameFlowSceneMappingSo diff --git a/Assets/_DDD/_Scripts/GameFramework/ManagerDefinition.asset.meta b/Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.asset.meta similarity index 79% rename from Assets/_DDD/_Scripts/GameFramework/ManagerDefinition.asset.meta rename to Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.asset.meta index 9ce57e22f..f6f5aba6a 100644 --- a/Assets/_DDD/_Scripts/GameFramework/ManagerDefinition.asset.meta +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a98ebd2611b2e4e80a867f57fdc91fc9 +guid: 11d1c2609268ac14fa627958ee097fac NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/_DDD/_Scripts/GameFramework/GameManager.cs b/Assets/_DDD/_Scripts/GameFramework/GameManager.cs index f01ac230d..a31f9d18b 100644 --- a/Assets/_DDD/_Scripts/GameFramework/GameManager.cs +++ b/Assets/_DDD/_Scripts/GameFramework/GameManager.cs @@ -1,21 +1,20 @@ -using System; using System.Collections.Generic; -using Unity.VisualScripting; using UnityEngine; -using Object = UnityEngine.Object; namespace DDD { - [CreateAssetMenu(fileName = "ManagerDefinition", menuName = "GameFramework/ManagerDefinition")] - public class ManagerDefinition : ScriptableObject + [CreateAssetMenu(fileName = "ManagerDefinitionSo", menuName = "GameFramework/ManagerDefinitionSo")] + public class ManagerDefinitionSo : ScriptableObject { public List ManagerClasses; } public class GameManager : Singleton { - public ManagerDefinition _managerDefinition; - public List _ManagerInstances; + [SerializeField] + private ManagerDefinitionSo _managerDefinitionSo; + + private List _managerInstances; protected override void OnAwake() { @@ -24,16 +23,18 @@ protected override void OnAwake() // Entry Scene에서 뭘 해야할까? // 매니저 초기화 - foreach (var managerObject in _managerDefinition.ManagerClasses) + _managerInstances = new List(_managerDefinitionSo.ManagerClasses.Count); + + foreach (var managerObject in _managerDefinitionSo.ManagerClasses) { var managerInstance = Instantiate(managerObject); - _ManagerInstances.Add(managerInstance); + _managerInstances.Add(managerInstance); if (managerInstance is IManager manager) { manager.Init(); } } - foreach (var managerInstance in _ManagerInstances) + foreach (var managerInstance in _managerInstances) { if (managerInstance is IManager manager) { diff --git a/Assets/_DDD/_Scripts/GameFramework/ManagerDefinition.asset b/Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset similarity index 82% rename from Assets/_DDD/_Scripts/GameFramework/ManagerDefinition.asset rename to Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset index e241f5f74..88f57768c 100644 --- a/Assets/_DDD/_Scripts/GameFramework/ManagerDefinition.asset +++ b/Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset @@ -10,8 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 0} - m_Name: ManagerDefinition - m_EditorClassIdentifier: Assembly-CSharp:DDD:ManagerDefinition + m_Name: ManagerDefinitionSo + m_EditorClassIdentifier: Assembly-CSharp:DDD:ManagerDefinitionSo ManagerClasses: - - {fileID: 6471498998539637564, guid: fa2ad62c75b1549f09597e47ed5f7cfb, type: 3} - {fileID: 7665229218737596710, guid: 71b177c2a18314c588da30429451666a, type: 3} + - {fileID: 6471498998539637564, guid: fa2ad62c75b1549f09597e47ed5f7cfb, type: 3} + - {fileID: 4889131746858770208, guid: d90fdb17f0162334daadc6fc93e9a0e3, type: 3} diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset.meta b/Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset.meta similarity index 79% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset.meta rename to Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset.meta index aaaed86b9..5a1afd285 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset.meta +++ b/Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3dee12c6902e0644fab1d0e2693857a8 +guid: d8346bac7a0fdab419cca3193df2ca34 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/BackUps.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/BackUps.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-10 14-06-48 by 남태건.json b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-10 14-06-48 by 남태건.json new file mode 100644 index 000000000..56f3b9172 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-10 14-06-48 by 남태건.json @@ -0,0 +1,77 @@ +{ + "$개요": [ + { + "": "시트 생성" + } + ], + "FoodData": [ + { + "Id:string": "식별ID", + "Name:string": "이름", + "Cookware_Enum": "요리도구", + "Ingredient1:string": "재료1", + "Ingredient2:string": "재료2", + "Taste1:Taste_Enum": "맛1", + "Taste2:Taste_Enum": "맛2", + "Sprite:Sprite": "Addressable 이미지 이름" + }, + { + "Id:string": "Food001", + "Name:string": "햇빛수프", + "Cookware_Enum": "Pot", + "Ingredient1:string": "극락쌀", + "Ingredient2:string": "햇빛당근", + "Taste1:Taste_Enum": "Bitter", + "Taste2:Taste_Enum": "Sweet", + "Sprite:Sprite": "Gold" + }, + { + "Id:string": "Food002", + "Name:string": "B", + "Cookware_Enum": "FryingPan", + "Ingredient1:string": 1, + "Ingredient2:string": 1, + "Taste1:Taste_Enum": "Spicy", + "Taste2:Taste_Enum": "Bitter", + "Sprite:Sprite": "" + }, + { + "Id:string": "Food003", + "Name:string": "C", + "Cookware_Enum": "Pot", + "Ingredient1:string": 2, + "Ingredient2:string": 2, + "Taste1:Taste_Enum": "Fresh", + "Taste2:Taste_Enum": "None", + "Sprite:Sprite": "" + }, + { + "Id:string": "Food004", + "Name:string": "D", + "Cookware_Enum": "Plating", + "Ingredient1:string": 3, + "Ingredient2:string": 3, + "Taste1:Taste_Enum": " ", + "Taste2:Taste_Enum": "Salty", + "Sprite:Sprite": "Gold" + } + ], + "ItemData": [ + { + "Id": "식별번호", + "ItemType_Enum": "아이템타입" + }, + { + "Id": "Item001", + "ItemType_Enum": "Food" + }, + { + "Id": "Item002", + "ItemType_Enum": "Prop" + }, + { + "Id": "Item003", + "ItemType_Enum": "Interactable" + } + ] +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-10 14-06-48 by 남태건.json.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-10 14-06-48 by 남태건.json.meta new file mode 100644 index 000000000..b2bf4e9e2 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-10 14-06-48 by 남태건.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5a1f5fa4ff4feee4e91087c012fd82bf +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs similarity index 97% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs index 10c021718..e2247b084 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs @@ -5,7 +5,7 @@ namespace DDD { [Serializable] - public class Food + public class FoodData { /// 식별ID [Tooltip("식별ID")] diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs.meta new file mode 100644 index 000000000..a4277ee9a --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 75468224b7088a34b861c056d4528fec \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs new file mode 100644 index 000000000..f588bad56 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs @@ -0,0 +1,12 @@ +// File: FoodDataSo.cs +using System.Collections.Generic; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "FoodDataSo", menuName = "GoogleSheet/FoodDataSo")] + public class FoodDataSo : ScriptableObject + { + public List FoodDataList; + } +} diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs.meta new file mode 100644 index 000000000..877129a65 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 23d26ce5ffaf3e44bb79a4d77ead320d \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs similarity index 50% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs index e57cf720c..36d445ca5 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs @@ -5,27 +5,15 @@ namespace DDD { [Serializable] - public class Item + public class ItemData { /// 식별번호 [Tooltip("식별번호")] public string Id; - /// 이름 - [Tooltip("이름")] - public string Name; - /// 아이템타입 [Tooltip("아이템타입")] public ItemType ItemType; - /// 셀크기X - [Tooltip("셀크기X")] - public int CellSizeX; - - /// 셀크기Y - [Tooltip("셀크기Y")] - public int CellSizeY; - } } diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs.meta new file mode 100644 index 000000000..fc869e26b --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b45493673e890264c89efa652ddd00da \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs new file mode 100644 index 000000000..c6f4ba811 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs @@ -0,0 +1,12 @@ +// File: ItemDataSo.cs +using System.Collections.Generic; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "ItemDataSo", menuName = "GoogleSheet/ItemDataSo")] + public class ItemDataSo : ScriptableObject + { + public List ItemDataList; + } +} diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs.meta new file mode 100644 index 000000000..dfbb28934 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a9a45b736c555724bbc4b3a46116b356 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/EnumTypes.cs similarity index 85% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/EnumTypes.cs index a225552b4..549f2c9d3 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/EnumTypes.cs @@ -26,9 +26,9 @@ public enum Taste public enum ItemType { None = 0, - Floor = 1, - Furniture = 2, - WallMount = 3, + Food = 1, + Prop = 2, + Interactable = 3, } } diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/EnumTypes.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/EnumTypes.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json similarity index 64% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json index 336e92adc..56f3b9172 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json @@ -4,7 +4,7 @@ "": "시트 생성" } ], - "Food": [ + "FoodData": [ { "Id:string": "식별ID", "Name:string": "이름", @@ -56,61 +56,22 @@ "Sprite:Sprite": "Gold" } ], - "Monster": [ + "ItemData": [ { "Id": "식별번호", - "Name": "이름", - "T1": "테스트1" - }, - { - "Id": "Test001", - "Name": "A", - "T1": 1 - }, - { - "Id": "Test002", - "Name": "B", - "T1": 2 - }, - { - "Id": "Test003", - "Name": "C", - "T1": 3 - }, - { - "Id": "Test004", - "Name": "D", - "T1": 4 - } - ], - "Item": [ - { - "Id": "식별번호", - "Name": "이름", - "ItemType_Enum": "아이템타입", - "CellSizeX:int": "셀크기X", - "CellSizeY:int": "셀크기Y" + "ItemType_Enum": "아이템타입" }, { "Id": "Item001", - "Name": "나무장판", - "ItemType_Enum": "Floor", - "CellSizeX:int": 1, - "CellSizeY:int": 1 + "ItemType_Enum": "Food" }, { "Id": "Item002", - "Name": "테이블", - "ItemType_Enum": "Furniture", - "CellSizeX:int": 2, - "CellSizeY:int": 2 + "ItemType_Enum": "Prop" }, { "Id": "Item003", - "Name": "전등", - "ItemType_Enum": "WallMount", - "CellSizeX:int": "", - "CellSizeY:int": "" + "ItemType_Enum": "Interactable" } ] } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Logs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Logs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset similarity index 74% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset index c8a0a5df1..cb8528867 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset @@ -91,4 +91,32 @@ MonoBehaviour: 2\n },\n {\n \"Id\": \"Item003\",\n \"Name\": \"\uC804\uB4F1\",\n \"ItemType_Enum\": \"WallMount\",\n \"CellSizeX:int\": \"\",\n \"CellSizeY:int\": \"\"\n }\n ]\n}" + - Editor: "\uB0A8\uD0DC\uAC74" + Timestamp: 2025-07-10 14:06:48 + JsonSnapshot: "{\n \"$\uAC1C\uC694\": [\n {\n \"\": \"\uC2DC\uD2B8 \uC0DD\uC131\"\n + }\n ],\n \"FoodData\": [\n {\n \"Id:string\": \"\uC2DD\uBCC4ID\",\n + \"Name:string\": \"\uC774\uB984\",\n \"Cookware_Enum\": \"\uC694\uB9AC\uB3C4\uAD6C\",\n + \"Ingredient1:string\": \"\uC7AC\uB8CC1\",\n \"Ingredient2:string\": \"\uC7AC\uB8CC2\",\n + \"Taste1:Taste_Enum\": \"\uB9DB1\",\n \"Taste2:Taste_Enum\": \"\uB9DB2\",\n + \"Sprite:Sprite\": \"Addressable \uC774\uBBF8\uC9C0 \uC774\uB984\"\n },\n + {\n \"Id:string\": \"Food001\",\n \"Name:string\": \"\uD587\uBE5B\uC218\uD504\",\n + \"Cookware_Enum\": \"Pot\",\n \"Ingredient1:string\": \"\uADF9\uB77D\uC300\",\n + \"Ingredient2:string\": \"\uD587\uBE5B\uB2F9\uADFC\",\n \"Taste1:Taste_Enum\": + \"Bitter\",\n \"Taste2:Taste_Enum\": \"Sweet\",\n \"Sprite:Sprite\": + \"Gold\"\n },\n {\n \"Id:string\": \"Food002\",\n \"Name:string\": + \"B\",\n \"Cookware_Enum\": \"FryingPan\",\n \"Ingredient1:string\": + 1,\n \"Ingredient2:string\": 1,\n \"Taste1:Taste_Enum\": \"Spicy\",\n + \"Taste2:Taste_Enum\": \"Bitter\",\n \"Sprite:Sprite\": \"\"\n },\n + {\n \"Id:string\": \"Food003\",\n \"Name:string\": \"C\",\n + \"Cookware_Enum\": \"Pot\",\n \"Ingredient1:string\": 2,\n \"Ingredient2:string\": + 2,\n \"Taste1:Taste_Enum\": \"Fresh\",\n \"Taste2:Taste_Enum\": \"None\",\n + \"Sprite:Sprite\": \"\"\n },\n {\n \"Id:string\": \"Food004\",\n + \"Name:string\": \"D\",\n \"Cookware_Enum\": \"Plating\",\n \"Ingredient1:string\": + 3,\n \"Ingredient2:string\": 3,\n \"Taste1:Taste_Enum\": \" \",\n + \"Taste2:Taste_Enum\": \"Salty\",\n \"Sprite:Sprite\": \"Gold\"\n }\n + ],\n \"ItemData\": [\n {\n \"Id\": \"\uC2DD\uBCC4\uBC88\uD638\",\n + \"ItemType_Enum\": \"\uC544\uC774\uD15C\uD0C0\uC785\"\n },\n {\n + \"Id\": \"Item001\",\n \"ItemType_Enum\": \"Food\"\n },\n {\n + \"Id\": \"Item002\",\n \"ItemType_Enum\": \"Prop\"\n },\n {\n + \"Id\": \"Item003\",\n \"ItemType_Enum\": \"Interactable\"\n }\n ]\n}" MaxLogs: 100 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset similarity index 76% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset index 32f85a3a4..60eeaf19c 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset @@ -9,10 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 68f7086db4e68fc4d913633d06d803f0, type: 3} - m_Name: FoodSo + m_Script: {fileID: 11500000, guid: 23d26ce5ffaf3e44bb79a4d77ead320d, type: 3} + m_Name: FoodDataSo m_EditorClassIdentifier: - FoodList: + FoodDataList: - Id: Food001 Name: "\uD587\uBE5B\uC218\uD504" Cookware: 1 @@ -20,7 +20,7 @@ MonoBehaviour: Ingredient2: "\uD587\uBE5B\uB2F9\uADFC" Taste1: 1 Taste2: 2 - Sprite: {fileID: 21300000, guid: e15933f76da90e742866563b5cd9e45f, type: 3} + Sprite: {fileID: 0} - Id: Food002 Name: B Cookware: 2 @@ -44,4 +44,4 @@ MonoBehaviour: Ingredient2: 3 Taste1: 5 Taste2: 6 - Sprite: {fileID: 21300000, guid: e15933f76da90e742866563b5cd9e45f, type: 3} + Sprite: {fileID: 0} diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset.meta similarity index 79% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset.meta index 6262d8c16..4e1120e56 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset.meta +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f38617ba14522db4d87bb7e10c280a2d +guid: 8261ff435a6e2484086e02e556c0ba93 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset similarity index 56% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset index dff4d1af5..31ab338d8 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset @@ -9,22 +9,13 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7b5deaa05a95b394fb6f6fd6a450e445, type: 3} - m_Name: ItemSo + m_Script: {fileID: 11500000, guid: a9a45b736c555724bbc4b3a46116b356, type: 3} + m_Name: ItemDataSo m_EditorClassIdentifier: - ItemList: + ItemDataList: - Id: Item001 - Name: "\uB098\uBB34\uC7A5\uD310" ItemType: 1 - CellSizeX: 1 - CellSizeY: 1 - Id: Item002 - Name: "\uD14C\uC774\uBE14" ItemType: 2 - CellSizeX: 2 - CellSizeY: 2 - Id: Item003 - Name: "\uC804\uB4F1" ItemType: 3 - CellSizeX: 0 - CellSizeY: 0 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset.meta new file mode 100644 index 000000000..e4be0a58a --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c2be393a39588b647bacdd69f47f677d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetAddressableAutoSetup.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetAddressableAutoSetup.cs similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetAddressableAutoSetup.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetAddressableAutoSetup.cs diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetAddressableAutoSetup.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetAddressableAutoSetup.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetAddressableAutoSetup.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetAddressableAutoSetup.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetChangeLog.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetChangeLog.cs similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetChangeLog.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetChangeLog.cs diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetChangeLog.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetChangeLog.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetChangeLog.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetChangeLog.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetDiff.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetDiff.cs similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetDiff.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetDiff.cs diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetDiff.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetDiff.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetDiff.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetDiff.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetDiffHelper.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetDiffHelper.cs similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetDiffHelper.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetDiffHelper.cs diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetDiffHelper.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetDiffHelper.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetDiffHelper.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetDiffHelper.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetDiffViewer.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetDiffViewer.cs similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetDiffViewer.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetDiffViewer.cs diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetDiffViewer.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetDiffViewer.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetDiffViewer.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetDiffViewer.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetFetchHelper.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetFetchHelper.cs similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetFetchHelper.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetFetchHelper.cs diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetFetchHelper.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetFetchHelper.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetFetchHelper.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetFetchHelper.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetManager.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetManager.cs similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetManager.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetManager.cs diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetManager.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetManager.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetPostProcessor.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetPostProcessor.cs similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetPostProcessor.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetPostProcessor.cs diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetPostProcessor.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetPostProcessor.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheets/Core/GoogleSheetPostProcessor.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetPostProcessor.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs.meta deleted file mode 100644 index 8c464bc08..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 07d32adeac9e96e4ca9cc90de1b3fa4b \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/FoodSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/FoodSo.cs deleted file mode 100644 index 50d32c85a..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/FoodSo.cs +++ /dev/null @@ -1,12 +0,0 @@ -// File: FoodSo.cs -using System.Collections.Generic; -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "FoodSo", menuName = "GoogleSheet/FoodSo")] - public class FoodSo : ScriptableObject - { - public List FoodList; - } -} diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/FoodSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/FoodSo.cs.meta deleted file mode 100644 index 8e5d3b047..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/FoodSo.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 68f7086db4e68fc4d913633d06d803f0 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs.meta deleted file mode 100644 index 5f911c956..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: ae55dc0aec9727b4a8cfbb29172ad176 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/ItemSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/ItemSo.cs deleted file mode 100644 index a91f92ead..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/ItemSo.cs +++ /dev/null @@ -1,12 +0,0 @@ -// File: ItemSo.cs -using System.Collections.Generic; -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "ItemSo", menuName = "GoogleSheet/ItemSo")] - public class ItemSo : ScriptableObject - { - public List ItemList; - } -} diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/ItemSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/ItemSo.cs.meta deleted file mode 100644 index 2ebc04e5e..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/ItemSo.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 7b5deaa05a95b394fb6f6fd6a450e445 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs deleted file mode 100644 index 5f7113aea..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs +++ /dev/null @@ -1,23 +0,0 @@ -// -using System; -using UnityEngine; - -namespace DDD -{ - [Serializable] - public class Monster - { - /// 식별번호 - [Tooltip("식별번호")] - public string Id; - - /// 이름 - [Tooltip("이름")] - public string Name; - - /// 테스트1 - [Tooltip("테스트1")] - public int T1; - - } -} diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs.meta deleted file mode 100644 index e8721a154..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 0b53849f7f9a9ad4f85656f3563afb61 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/MonsterSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/MonsterSo.cs deleted file mode 100644 index e183d9c16..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/MonsterSo.cs +++ /dev/null @@ -1,12 +0,0 @@ -// File: MonsterSo.cs -using System.Collections.Generic; -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "MonsterSo", menuName = "GoogleSheet/MonsterSo")] - public class MonsterSo : ScriptableObject - { - public List MonsterList; - } -} diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/MonsterSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/MonsterSo.cs.meta deleted file mode 100644 index c823d96d3..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/Classes/MonsterSo.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 7e1500a3fc388674fa8ef2759d5d1c95 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset deleted file mode 100644 index 9ac3266fe..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset +++ /dev/null @@ -1,27 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7e1500a3fc388674fa8ef2759d5d1c95, type: 3} - m_Name: MonsterSo - m_EditorClassIdentifier: - MonsterList: - - Id: Test001 - Name: A - T1: 1 - - Id: Test002 - Name: B - T1: 2 - - Id: Test003 - Name: C - T1: 3 - - Id: Test004 - Name: D - T1: 4