diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Open.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_Open.prefab index 5491b63dc..5e7ebd1cf 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_Open.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_Open.prefab @@ -59,5 +59,27 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + insertIndex: -1 + addedObject: {fileID: 1277818069658415318} m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} +--- !u!1 &9211739394093953175 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + m_PrefabInstance: {fileID: 4777358697124966162} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1277818069658415318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9211739394093953175} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 201f9e6d7ca7404baa9945950292a392, type: 3} + m_Name: + m_EditorClassIdentifier: + _interactionType: 1 + _holdTime: 0 diff --git a/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset b/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset index 92730963f..c3381e2c0 100644 --- a/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset +++ b/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset @@ -28,6 +28,10 @@ MonoBehaviour: VelocityMinThreshold: 0.01 BoxCastExtentScale: 0.95 MinSlideFactorThreshold: 0.05 + InteractionRadius: 1 + InteractionLayerMask: + serializedVersion: 2 + m_Bits: 1 InputLineSortingOrder: 10 VelocityLineSortingOrder: 9 InputLineWidth: 0.1 @@ -39,26 +43,35 @@ MonoBehaviour: MoveAction: m_Name: Move m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 351f2ccd-1f9f-44bf-9bec-d62ac5c5f408 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 1 + DashAction: + m_Name: Dash + m_Type: 1 m_ExpectedControlType: - m_Id: 7ad3ada4-252c-48b4-919d-8f1742c567c9 + m_Id: f1e71b7e-271b-4382-876a-260ea451296a m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - DashAction: - m_Name: Dash - m_Type: 0 + InteractAction: + m_Name: Interact + m_Type: 1 m_ExpectedControlType: - m_Id: 3c8d671c-dda7-4ec6-8de6-4990e55337dc + m_Id: 852140f2-7766-474d-8707-702459ba45f3 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 OpenManagementUiAction: - m_Name: Open Management Ui - m_Type: 0 + m_Name: OpenManagementUi + m_Type: 1 m_ExpectedControlType: - m_Id: d0cc67e4-4fac-4cd7-83a6-6ab00cfaf0fc + m_Id: 6b4fe16c-33c6-4564-a553-9eaf437dd31e m_Processors: m_Interactions: m_SingletonActionBindings: [] diff --git a/Assets/_DDD/_ScriptAssets/DDD_InputSystem.inputactions b/Assets/_DDD/_ScriptAssets/DDD_InputSystem.inputactions index a23ad0533..ea1f0873a 100644 --- a/Assets/_DDD/_ScriptAssets/DDD_InputSystem.inputactions +++ b/Assets/_DDD/_ScriptAssets/DDD_InputSystem.inputactions @@ -38,7 +38,7 @@ "id": "852140f2-7766-474d-8707-702459ba45f3", "expectedControlType": "", "processors": "", - "interactions": "Hold", + "interactions": "", "initialStateCheck": false }, { diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab index 1ddc16380..57cf63261 100644 --- a/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab +++ b/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: 3365694194251356714} - component: {fileID: 127430239903465757} - component: {fileID: 3095965496140440094} + - component: {fileID: 7606279200344222219} m_Layer: 0 m_Name: BaseRestaurantCharacter m_TagString: Untagged @@ -121,6 +122,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e20368314a3139f4fb4b4e35af9fcf98, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &7606279200344222219 +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: c9a5f5b2cb6745238a931b4d52f5d57a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6791841979869644848 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/RestaurantEvents.cs.meta b/Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionEvents.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/RestaurantEvents.cs.meta rename to Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionEvents.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/RestaurantEventSolver.cs.meta b/Assets/_DDD/_Scripts/RestaurantEvent/RestaurantManagementUiEventSolver.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/RestaurantEventSolver.cs.meta rename to Assets/_DDD/_Scripts/RestaurantEvent/RestaurantManagementUiEventSolver.cs.meta