Entry, Exit 마커 오브젝트 씬 배치, NPC Entry 위치 수정

2025-08-29 17:34:59 +09:00 · 2025-08-29 17:34:59 +09:00 · bc23cea88a
commit bc23cea88a
parent 36cfe1d923
5 changed files with 221 additions and 17 deletions
--- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity
+++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity
@ -1169,6 +1169,84 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3}
  m_PrefabInstance: {fileID: 254422935}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &258167323
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1274705225}
+    m_Modifications:
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 3.6498075
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.53
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.17
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9396927
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.3420201
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3761059052922690693, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_Color.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3761059052922690693, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_Color.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3761059052922690693, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_Color.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4103096974375017811, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_Name
+      value: ExitPointMarker
+      objectReference: {fileID: 0}
+    - target: {fileID: 7433508832753786351, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: _pointType
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+--- !u!4 &258167324 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+  m_PrefabInstance: {fileID: 258167323}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &258222979
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -5833,6 +5911,68 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 3d5223f30fdbde645a80188adc0cb577, type: 3}
  m_PrefabInstance: {fileID: 1284467807}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &929645616
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1274705225}
+    m_Modifications:
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 6.541485
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.53
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 24.356
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9396927
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.3420201
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4103096974375017811, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+      propertyPath: m_Name
+      value: EntryPointMarker
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+--- !u!4 &929645617 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3697702677815423220, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
+  m_PrefabInstance: {fileID: 929645616}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &931717435
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -8558,6 +8698,8 @@ Transform:
  - {fileID: 27095953}
  - {fileID: 2029954630}
  - {fileID: 1390875353}
+  - {fileID: 929645617}
+  - {fileID: 258167324}
  m_Father: {fileID: 1428769370}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1284467807
@ -8711,6 +8853,52 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3}
  m_PrefabInstance: {fileID: 1629500546}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1367038805
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1367038807}
+  - component: {fileID: 1367038806}
+  m_Layer: 0
+  m_Name: (Singleton)DDD.AssetManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1367038806
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1367038805}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 38667042b7dae844b813b6d15d63ec65, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _persistent: 0
+  _enableDebugLog: 0
+--- !u!4 &1367038807
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1367038805}
+  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: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1368937918
 GameObject:
  m_ObjectHideFlags: 0
@ -15527,3 +15715,4 @@ SceneRoots:
  - {fileID: 761682093}
  - {fileID: 549344125}
  - {fileID: 1775054121}
+  - {fileID: 1367038807}
--- a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RestaurantSpawnPointProvider.cs
+++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RestaurantSpawnPointProvider.cs
@ -0,0 +1,30 @@
+using DDD.Restaurant;
+using UnityEngine;
+
+namespace DDD
+{
+    public interface ISpawnPointProvider
+    {
+        void Initialize();
+        Vector3 GetSpawnPoint();
+    }
+    
+    public class RestaurantSpawnPointProvider : ISpawnPointProvider
+    {
+        private Vector3 _spawnPoint = new(5f, 0f, 4f);
+
+        public void Initialize()
+        {
+            var environmentState = RestaurantState.Instance?.EnvironmentState;
+            var pointProviders = environmentState.GetPointProviderByType(PointType.Entry);
+            foreach (var pointProvider in pointProviders)
+            {
+                if (!pointProvider.IsSupportsType(PointType.Entry)) continue;
+                _spawnPoint = pointProvider.GetPosition();
+                break;
+            }
+        }
+
+        public Vector3 GetSpawnPoint() => _spawnPoint;
+    }
+}
--- a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RestaurantSpawnPointProvider.cs.meta
+++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RestaurantSpawnPointProvider.cs.meta
--- a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnPointProvider.cs
+++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnPointProvider.cs
@ -1,16 +0,0 @@
-using UnityEngine;
-
-namespace DDD
-{
-    public interface ISpawnPointProvider
-    {
-        Vector3 GetSpawnPoint();
-    }
-    
-    public class SpawnPointProvider : ISpawnPointProvider
-    {
-        private Vector3 _spawnPoint = new(5f, 0f, 4f);
-
-        public Vector3 GetSpawnPoint() => _spawnPoint;
-    }
-}
--- a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs
+++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs
@ -35,7 +35,8 @@ public override Task InitializeController()

        public override Task InitializeState()
        {
-            _spawnPointProvider ??= new SpawnPointProvider();
+            _spawnPointProvider ??= new RestaurantSpawnPointProvider();
+            _spawnPointProvider.Initialize();
            _restaurantRunStateSo.InitializeSpawnPoint(_spawnPointProvider.GetSpawnPoint());
            return Task.CompletedTask;
        }