사용되지 않는 클래스, 에셋 제거

Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset

@@ -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: 

Assets/_DDD/_ScriptAssets/So/GameFlowAssetsSo.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4fca93ffece40ff48973532398011d84
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_DDD/_ScriptAssets/So/RestaurantEnvironmentDataSo.asset

@@ -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: 

Assets/_DDD/_ScriptAssets/So/RestaurantEnvironmentDataSo.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f062ee4d41bc36e43ae3b6d4ad923904
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.cs

@@ -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<GameFlowState, List<string>> FlowItems = new();
-        public Dictionary<GameFlowState, List<AssetReference>> FlowAssets = new();
-    }
-}

Assets/_DDD/_Scripts/GameFlow/GameFlowAssetsSo.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 5a7982cc52e32e14c916a8144c5184b0

Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs

@@ -5,8 +5,7 @@ namespace DDD
 {
     public class RestaurantController : Singleton<RestaurantController>, IManager, IGameFlowHandler
     {
-        private RestaurantEnvironmentState _restaurantEnvironmentState;
+        public RestaurantEnvironmentStateSo RestaurantEnvironmentStateSo { get; private set; }
-        public RestaurantEnvironmentState RestaurantEnvironmentState => _restaurantEnvironmentState;
 
         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<RestaurantEnvironmentState>();
+            RestaurantEnvironmentStateSo = ScriptableObject.CreateInstance<RestaurantEnvironmentStateSo>();
         }
 
         private void GenerateDummyEnvironmentProps()
@@ -55,10 +54,8 @@ private void GenerateDummyEnvironmentProps()
                         Random.Range(-10f, 10f),
                         Random.Range(10f, 20f)
                     );
-                    RestaurantEnvironmentData randomPropData = new RestaurantEnvironmentData();
+                    var randomPropData = new RestaurantEnvironmentData(prop.Id, randomPos);
-                    randomPropData.Position = randomPos;
+                    RestaurantEnvironmentStateSo.RestaurantEnvironmentProps.Add(randomPropData);
-                    randomPropData.Id = prop.Id;
-                    _restaurantEnvironmentState.RestaurantEnvironmentProps.Add(randomPropData);
                 }
             }
         }

Assets/_DDD/_Scripts/RestaurantEnvironment/CreateEnvironmentSo.cs

@@ -10,7 +10,7 @@ public override async Task OnReadyNewFlow(GameFlowState newFlowState)
         {
             var baseRestaurantEnvironmentPrefab = await AssetManager.LoadAsset<GameObject>(CommonConstants.BaseRestaurantEnvironment);
 
-            var props = RestaurantController.Instance.RestaurantEnvironmentState.RestaurantEnvironmentProps;
+            var props = RestaurantController.Instance.RestaurantEnvironmentStateSo.RestaurantEnvironmentProps;
             foreach (var prop in props)
             {
                 var restaurantEnvironment = Instantiate(baseRestaurantEnvironmentPrefab).GetComponent<RestaurantEnvironment>();

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;
+        }
     }
 }

Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentDataSo.cs

@@ -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<string, List<RestaurantEnvironmentData>> RestaurantEnvironmentDatas = new();
-    }
-}

Assets/_DDD/_Scripts/RestaurantState/RestaurantEnvironmentDataSo.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 6d9bb690776b59d40a1cc2e7036d78bd

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<RestaurantEnvironmentData> RestaurantEnvironmentProps = new List<RestaurantEnvironmentData>();
         public List<RestaurantEnvironmentData> RestaurantEnvironmentObjects = new List<RestaurantEnvironmentData>();
     }