From 77681bf6c9d4fa3e526f58f9ca042d9c12751ac6 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Wed, 13 Aug 2025 12:56:52 +0900 Subject: [PATCH] Remove ignored files from the repository --- .../Tiles/Wall/Sources/RestaurantTile02.png | 0 .../TestGeometry/Mat_TestGeometry.mat | 4 ++- .../_Addressables/Prefabs/CustomerNpc.prefab | 34 +++++++++++++++++-- .../OnlyAtlas/RestaurantManagementUi.meta | 0 .../RestaurantManagementUi/CheckLine.png | 0 .../RestaurantManagementUi/CheckLine.png.meta | 0 .../CookwareDetailPanel.png | 0 .../CookwareDetailPanel.png.meta | 0 .../IngredientDetailPanel.png | 0 .../IngredientDetailPanel.png.meta | 0 .../RecipeDetailPanel.png | 0 .../RecipeDetailPanel.png.meta | 0 .../Npc/Customer/CustomerCharacter.cs | 4 ++- .../Customer/CustomerFactory.cs | 5 ++- .../Customer/RestaurantCustomerStateSo.cs | 3 +- 15 files changed, 41 insertions(+), 9 deletions(-) mode change 100755 => 100644 Assets/_DDD/Restaurant/Environments/Tiles/Wall/Sources/RestaurantTile02.png delete mode 100644 Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi.meta delete mode 100644 Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CheckLine.png delete mode 100644 Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CheckLine.png.meta delete mode 100644 Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png delete mode 100644 Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta delete mode 100644 Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png delete mode 100644 Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png.meta delete mode 100644 Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png delete mode 100644 Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png.meta diff --git a/Assets/_DDD/Restaurant/Environments/Tiles/Wall/Sources/RestaurantTile02.png b/Assets/_DDD/Restaurant/Environments/Tiles/Wall/Sources/RestaurantTile02.png old mode 100755 new mode 100644 diff --git a/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Mat_TestGeometry.mat b/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Mat_TestGeometry.mat index b8c647f39..0c1f1802f 100644 --- a/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Mat_TestGeometry.mat +++ b/Assets/_DDD/_Addressables/Environments/Geometry/TestGeometry/Mat_TestGeometry.mat @@ -34,7 +34,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 1 - _AlphaToMask: 1 + - _ApplyGI: 1 - _Blend: 0 - _BlendModePreserveSpecular: 0 - _BumpScale: 1 @@ -89,6 +90,7 @@ Material: - _DstBlend: 0 - _EMISSION: 0 - _EnvironmentReflections: 1 + - _GlobalIlluminationIntensity: 1 - _METALLICSPECGLOSSMAP: 1 - _Metallic: 0 - _NORMALMAP: 1 diff --git a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab index fc4907885..5518e5368 100644 --- a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab @@ -48,6 +48,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3983248675539552489, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + propertyPath: initialSkinName + value: Casper + objectReference: {fileID: 0} + - target: {fileID: 3983248675539552489, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} - target: {fileID: 6826437533270866908, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: externalBehavior value: @@ -68,8 +76,30 @@ PrefabInstance: propertyPath: m_Name value: CustomerNpc objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 133104368464330048, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + insertIndex: -1 + addedObject: {fileID: 6054843938321605399} m_SourcePrefab: {fileID: 100100000, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} +--- !u!1 &4266090516809920735 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + m_PrefabInstance: {fileID: 6675463944788402332} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6054843938321605399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266090516809920735} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b242c4f65b2734841840c89dfab1500b, type: 3} + m_Name: + m_EditorClassIdentifier: + _interactionType: 0 diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi.meta deleted file mode 100644 index e69de29bb..000000000 diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CheckLine.png b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CheckLine.png deleted file mode 100644 index e69de29bb..000000000 diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CheckLine.png.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CheckLine.png.meta deleted file mode 100644 index e69de29bb..000000000 diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png deleted file mode 100644 index e69de29bb..000000000 diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta deleted file mode 100644 index e69de29bb..000000000 diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png deleted file mode 100644 index e69de29bb..000000000 diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png.meta deleted file mode 100644 index e69de29bb..000000000 diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png deleted file mode 100644 index e69de29bb..000000000 diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png.meta deleted file mode 100644 index e69de29bb..000000000 diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs index 549e1cd4c..f2ad75873 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs @@ -6,11 +6,13 @@ public class CustomerCharacter : RestaurantNpcCharacter, ICustomerInitializer { private CustomerData _customerData; - public void Initialize(string customerDataId, CustomerData customerData) + public void Initialize(CustomerData customerData) { _customerData = customerData; // TODO : 손님 생성 로직 추가 + _spineController.SetSkin(_customerData.SpineSkinKey); + _behaviorTree.EnableBehavior(); } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantState/Customer/CustomerFactory.cs b/Assets/_DDD/_Scripts/RestaurantState/Customer/CustomerFactory.cs index 418dfa049..9c826efb0 100644 --- a/Assets/_DDD/_Scripts/RestaurantState/Customer/CustomerFactory.cs +++ b/Assets/_DDD/_Scripts/RestaurantState/Customer/CustomerFactory.cs @@ -10,12 +10,11 @@ public interface ICustomerFactory public interface ICustomerInitializer { - void Initialize(string customerDataId, CustomerData customerData); + void Initialize(CustomerData customerData); } public struct CustomerSpawnArgs { - public string CustomerDataId; public CustomerData CustomerData; public Vector3 Position; public Quaternion Rotation; @@ -37,7 +36,7 @@ public async Task CreateAsync(CustomerSpawnArgs args) if (newCustomer.TryGetComponent(out ICustomerInitializer initializer)) { - initializer.Initialize(args.CustomerDataId, args.CustomerData); + initializer.Initialize(args.CustomerData); } return newCustomer; } diff --git a/Assets/_DDD/_Scripts/RestaurantState/Customer/RestaurantCustomerStateSo.cs b/Assets/_DDD/_Scripts/RestaurantState/Customer/RestaurantCustomerStateSo.cs index 5c641f8d1..a0dd7ef93 100644 --- a/Assets/_DDD/_Scripts/RestaurantState/Customer/RestaurantCustomerStateSo.cs +++ b/Assets/_DDD/_Scripts/RestaurantState/Customer/RestaurantCustomerStateSo.cs @@ -18,7 +18,7 @@ public class RestaurantCustomerStateSo : ScriptableObject, IGameFlowHandler [SerializeField] private Vector3 _spawnPoint = new(5f, 0f, 4f); [Title("디버그")] - [SerializeField] private SpawnSchedule _spawnSchedule; + [ReadOnly, SerializeField] private SpawnSchedule _spawnSchedule; private GameStateSo _gameStateSo; private LevelDataSo _levelDataSo; @@ -112,7 +112,6 @@ SpawnSchedule MakeSchedule() => scheduleBuilder.Build(new SpawnScheduleBuildArgs _ = _iCustomerFactory.CreateAsync(new CustomerSpawnArgs { - CustomerDataId = customerId, CustomerData = customerData, Position = _spawnPoint, Rotation = rotation,