From 689a4fe09531e4532b56b475e8f415b23230ff4c Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 21 Jul 2025 13:20:31 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=ED=81=B4=EB=9E=98=EC=8A=A4,=20=EC=97=90?= =?UTF-8?q?=EC=85=8B=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_ScriptAssets/So/GameFlowAssetsSo.asset | 65 ------------------- .../So/GameFlowAssetsSo.asset.meta | 8 --- .../So/RestaurantEnvironmentDataSo.asset | 43 ------------ .../So/RestaurantEnvironmentDataSo.asset.meta | 8 --- .../_Scripts/GameFlow/GameFlowAssetsSo.cs | 15 ----- .../GameFlow/GameFlowAssetsSo.cs.meta | 2 - .../RestaurantController.cs | 11 ++-- .../CreateEnvironmentSo.cs | 2 +- .../RestaurantEnvironmentData.cs | 6 ++ .../RestaurantEnvironmentDataSo.cs | 12 ---- .../RestaurantEnvironmentDataSo.cs.meta | 2 - ...ate.cs => RestaurantEnvironmentStateSo.cs} | 3 +- ...a => RestaurantEnvironmentStateSo.cs.meta} | 0 13 files changed, 12 insertions(+), 165 deletions(-) delete mode 100644 Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset delete mode 100644 Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset.meta delete mode 100644 Assets/_DDD/_ScriptAssets/So/RestaurantEnvironmentDataSo.asset delete mode 100644 Assets/_DDD/_ScriptAssets/So/RestaurantEnvironmentDataSo.asset.meta delete mode 100644 Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.cs delete mode 100644 Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.cs.meta delete mode 100644 Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentDataSo.cs delete mode 100644 Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentDataSo.cs.meta rename Assets/_DDD/_Scripts/RestaurantState/{RestaurantEnvironmentState.cs => RestaurantEnvironmentStateSo.cs} (81%) rename Assets/_DDD/_Scripts/RestaurantState/{RestaurantEnvironmentState.cs.meta => RestaurantEnvironmentStateSo.cs.meta} (100%) diff --git a/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset b/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset deleted file mode 100644 index e68c2d6c5..000000000 --- a/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset +++ /dev/null @@ -1,65 +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: 5a7982cc52e32e14c916a8144c5184b0, type: 3} - m_Name: GameFlowAssetsSo - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: - - Name: FlowItems - Entry: 7 - Data: 0|System.Collections.Generic.Dictionary`2[[DDD.GameFlowState, Assembly-CSharp],[System.Collections.Generic.List`1[[System.String, - mscorlib]], mscorlib]], mscorlib - - Name: comparer - Entry: 7 - Data: 1|System.Collections.Generic.EnumEqualityComparer`1[[DDD.GameFlowState, - Assembly-CSharp]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: FlowAssets - Entry: 7 - Data: 2|System.Collections.Generic.Dictionary`2[[DDD.GameFlowState, Assembly-CSharp],[System.Collections.Generic.List`1[[UnityEngine.AddressableAssets.AssetReference, - Unity.Addressables]], mscorlib]], mscorlib - - Name: comparer - Entry: 9 - Data: 1 - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: diff --git a/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset.meta b/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset.meta deleted file mode 100644 index 5f0467a7f..000000000 --- a/Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4fca93ffece40ff48973532398011d84 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/So/RestaurantEnvironmentDataSo.asset b/Assets/_DDD/_ScriptAssets/So/RestaurantEnvironmentDataSo.asset deleted file mode 100644 index ed6b51ef3..000000000 --- a/Assets/_DDD/_ScriptAssets/So/RestaurantEnvironmentDataSo.asset +++ /dev/null @@ -1,43 +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: 6d9bb690776b59d40a1cc2e7036d78bd, type: 3} - m_Name: RestaurantEnvironmentDataSo - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: - - Name: RestaurantEnvironmentDatas - Entry: 7 - Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.List`1[[DDD.RestaurantEnvironmentData, - Assembly-CSharp]], mscorlib]], mscorlib - - Name: comparer - Entry: 7 - Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, - mscorlib]], mscorlib - - Name: - Entry: 8 - Data: - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: diff --git a/Assets/_DDD/_ScriptAssets/So/RestaurantEnvironmentDataSo.asset.meta b/Assets/_DDD/_ScriptAssets/So/RestaurantEnvironmentDataSo.asset.meta deleted file mode 100644 index 2bb389226..000000000 --- a/Assets/_DDD/_ScriptAssets/So/RestaurantEnvironmentDataSo.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f062ee4d41bc36e43ae3b6d4ad923904 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.cs b/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.cs deleted file mode 100644 index de3d5f0be..000000000 --- a/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; -using Sirenix.OdinInspector; -using UnityEngine; -using UnityEngine.AddressableAssets; - -namespace DDD -{ - // Dictionary를 인스펙터창에서 저장하려면 Odin의 SerializedScriptableObject을 상속받아야 함 - [CreateAssetMenu(fileName = "GameFlowAssetsSo", menuName = "GameFlow/GameFlowAssetsSo")] - public class GameFlowAssetsSo : SerializedScriptableObject - { - public Dictionary> FlowItems = new(); - public Dictionary> FlowAssets = new(); - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.cs.meta b/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.cs.meta deleted file mode 100644 index 82fd67885..000000000 --- a/Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 5a7982cc52e32e14c916a8144c5184b0 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs b/Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs index 0d2feb139..67b2afa99 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs +++ b/Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs @@ -5,8 +5,7 @@ namespace DDD { public class RestaurantController : Singleton, IManager, IGameFlowHandler { - private RestaurantEnvironmentState _restaurantEnvironmentState; - public RestaurantEnvironmentState RestaurantEnvironmentState => _restaurantEnvironmentState; + public RestaurantEnvironmentStateSo RestaurantEnvironmentStateSo { get; private set; } private const string CreateRestaurantPlayerSo = "CreateRestaurantPlayerSo"; private const string CreateEnvironmentSo = "CreateEnvironmentSo"; @@ -35,7 +34,7 @@ private void RegisterFlowHandler() private void LoadOrCreateRestaurantState() { // TODO : Load states from saved files. if none, create them. - _restaurantEnvironmentState = ScriptableObject.CreateInstance(); + RestaurantEnvironmentStateSo = ScriptableObject.CreateInstance(); } private void GenerateDummyEnvironmentProps() @@ -55,10 +54,8 @@ private void GenerateDummyEnvironmentProps() Random.Range(-10f, 10f), Random.Range(10f, 20f) ); - RestaurantEnvironmentData randomPropData = new RestaurantEnvironmentData(); - randomPropData.Position = randomPos; - randomPropData.Id = prop.Id; - _restaurantEnvironmentState.RestaurantEnvironmentProps.Add(randomPropData); + var randomPropData = new RestaurantEnvironmentData(prop.Id, randomPos); + RestaurantEnvironmentStateSo.RestaurantEnvironmentProps.Add(randomPropData); } } } diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/CreateEnvironmentSo.cs b/Assets/_DDD/_Scripts/RestaurantEnvironment/CreateEnvironmentSo.cs index 7be7ac65c..adffd304a 100644 --- a/Assets/_DDD/_Scripts/RestaurantEnvironment/CreateEnvironmentSo.cs +++ b/Assets/_DDD/_Scripts/RestaurantEnvironment/CreateEnvironmentSo.cs @@ -10,7 +10,7 @@ public override async Task OnReadyNewFlow(GameFlowState newFlowState) { var baseRestaurantEnvironmentPrefab = await AssetManager.LoadAsset(CommonConstants.BaseRestaurantEnvironment); - var props = RestaurantController.Instance.RestaurantEnvironmentState.RestaurantEnvironmentProps; + var props = RestaurantController.Instance.RestaurantEnvironmentStateSo.RestaurantEnvironmentProps; foreach (var prop in props) { var restaurantEnvironment = Instantiate(baseRestaurantEnvironmentPrefab).GetComponent(); diff --git a/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentData.cs b/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentData.cs index 11f13505b..63733252e 100644 --- a/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentData.cs +++ b/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentData.cs @@ -8,5 +8,11 @@ public class RestaurantEnvironmentData { public string Id; public Vector2 Position; + + public RestaurantEnvironmentData(string id, Vector2 position) + { + Id = id; + Position = position; + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentDataSo.cs b/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentDataSo.cs deleted file mode 100644 index f15957f13..000000000 --- a/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentDataSo.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections.Generic; -using Sirenix.OdinInspector; -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "RestaurantEnvironmentDataSo", menuName = "RestaurantEnvironment/RestaurantEnvironmentDataSo")] - public class RestaurantEnvironmentDataSo : SerializedScriptableObject - { - public Dictionary> RestaurantEnvironmentDatas = new(); - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentDataSo.cs.meta b/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentDataSo.cs.meta deleted file mode 100644 index 6f91fd479..000000000 --- a/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentDataSo.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 6d9bb690776b59d40a1cc2e7036d78bd \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentState.cs b/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentStateSo.cs similarity index 81% rename from Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentState.cs rename to Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentStateSo.cs index e8e53c3d3..c2a913043 100644 --- a/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentState.cs +++ b/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentStateSo.cs @@ -4,9 +4,8 @@ namespace DDD { // [CreateAssetMenu(fileName = "FILENAME", menuName = "MENUNAME", order = 0)] - public class RestaurantEnvironmentState : ScriptableObject + public class RestaurantEnvironmentStateSo : ScriptableObject { - // TODO : Public??? public List RestaurantEnvironmentProps = new List(); public List RestaurantEnvironmentObjects = new List(); } diff --git a/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentState.cs.meta b/Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentStateSo.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentState.cs.meta rename to Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentStateSo.cs.meta