diff --git a/Assets/AddressableAssetsData/AssetGroups/Group.asset b/Assets/AddressableAssetsData/AssetGroups/Group.asset index 554c31d1f..0253f124f 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Group.asset @@ -60,6 +60,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 99d3d87bd43df65488e757c43a308f36 + m_Address: RestaurantManagementUi_RestaurantUiActions_InputBindingSo + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: a60e7a432b7eb65419f3942f4f422fb4 m_Address: Voyage m_ReadOnly: 0 diff --git a/Assets/AddressableImportSettings.asset b/Assets/AddressableImportSettings.asset index f16888ae5..0ffaff0aa 100644 --- a/Assets/AddressableImportSettings.asset +++ b/Assets/AddressableImportSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: rulesEnabled: 1 allowGroupCreation: 1 rules: - - path: Assets/_DDD/_Addressables/(?[^/]+)/(?.*)\.spriteatlasv2 + - path: Assets/_DDD/_Addressables/.*/(?.*)\.spriteatlasv2 matchType: 1 groupName: groupTemplate: {fileID: 11400000, guid: f804fe78e7005554f9ba60273aade35b, type: 2} @@ -26,7 +26,7 @@ MonoBehaviour: LabelMode: 1 simplified: 0 addressReplacement: ${asset} - - path: Assets/_DDD/_Addressables/(?[^/]+)/(?.*)\.prefab + - path: Assets/_DDD/_Addressables/.*/(?.*)\.prefab matchType: 1 groupName: groupTemplate: {fileID: 11400000, guid: f804fe78e7005554f9ba60273aade35b, type: 2} @@ -37,7 +37,7 @@ MonoBehaviour: LabelMode: 1 simplified: 0 addressReplacement: ${asset} - - path: Assets/_DDD/_Addressables/(?[^/]+)/(?.*)\.png + - path: Assets/_DDD/_Addressables/.*/(?.*)\.png matchType: 1 groupName: groupTemplate: {fileID: 11400000, guid: f804fe78e7005554f9ba60273aade35b, type: 2} @@ -48,7 +48,7 @@ MonoBehaviour: LabelMode: 1 simplified: 0 addressReplacement: ${asset} - - path: Assets/_DDD/_Addressables/(?[^/]+)/(?.*)\.asset + - path: Assets/_DDD/_Addressables/.*/(?.*)\.asset matchType: 1 groupName: groupTemplate: {fileID: 11400000, guid: f804fe78e7005554f9ba60273aade35b, type: 2} @@ -58,7 +58,7 @@ MonoBehaviour: LabelMode: 1 simplified: 0 addressReplacement: ${asset} - - path: Assets/_DDD/_Addressables/(?[^/]+)/(?.*)\.unity + - path: Assets/_DDD/_Addressables/.*/(?.*)\.unity matchType: 1 groupName: groupTemplate: {fileID: 11400000, guid: f804fe78e7005554f9ba60273aade35b, type: 2} @@ -69,7 +69,7 @@ MonoBehaviour: LabelMode: 1 simplified: 0 addressReplacement: ${asset} - - path: Assets/_DDD/_Addressables/(?[^/]+)/(?.*)\.mat + - path: Assets/_DDD/_Addressables/.*/(?.*)\.mat matchType: 1 groupName: groupTemplate: {fileID: 11400000, guid: f804fe78e7005554f9ba60273aade35b, type: 2} diff --git a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab index 4c8f5bffb..7820d2b7f 100644 --- a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab @@ -71,11 +71,14 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} - insertIndex: 4 + insertIndex: -1 addedObject: {fileID: 4699468658517678862} - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} - insertIndex: 5 + insertIndex: -1 addedObject: {fileID: 4956037093100801085} + - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + insertIndex: -1 + addedObject: {fileID: 5643954521731085080} - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} insertIndex: -1 addedObject: {fileID: 1115647804376030753} @@ -109,6 +112,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a83ca1b1f17a934192ef91dd4f073b8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &5643954521731085080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7316134055819320434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d4e8820e36cdbec4fb86f9bc0e3fd638, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &1115647804376030753 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Addressables/So/InputBindingSo.meta b/Assets/_DDD/_Addressables/So/InputBindingSo.meta new file mode 100644 index 000000000..98e9b760d --- /dev/null +++ b/Assets/_DDD/_Addressables/So/InputBindingSo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9444758c8da7c284d9cfcc173371111d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/So/InputBindingSo/RestaurantManagementUi_RestaurantUiActions_InputBindingSo.asset b/Assets/_DDD/_Addressables/So/InputBindingSo/RestaurantManagementUi_RestaurantUiActions_InputBindingSo.asset new file mode 100644 index 000000000..cd0a0bf18 --- /dev/null +++ b/Assets/_DDD/_Addressables/So/InputBindingSo/RestaurantManagementUi_RestaurantUiActions_InputBindingSo.asset @@ -0,0 +1,16 @@ +%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: 826fdca033cc8c141b0f7e39161c2880, type: 3} + m_Name: RestaurantManagementUi_RestaurantUiActions_InputBindingSo + m_EditorClassIdentifier: + InputActionMaps: 3 + BindingActions: 31 diff --git a/Assets/_DDD/_Addressables/So/InputBindingSo/RestaurantManagementUi_RestaurantUiActions_InputBindingSo.asset.meta b/Assets/_DDD/_Addressables/So/InputBindingSo/RestaurantManagementUi_RestaurantUiActions_InputBindingSo.asset.meta new file mode 100644 index 000000000..1e1610d1f --- /dev/null +++ b/Assets/_DDD/_Addressables/So/InputBindingSo/RestaurantManagementUi_RestaurantUiActions_InputBindingSo.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99d3d87bd43df65488e757c43a308f36 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset b/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset index 2124bd948..92730963f 100644 --- a/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset +++ b/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset @@ -25,7 +25,41 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 8 SlidingThreshold: 0.5 + VelocityMinThreshold: 0.01 + BoxCastExtentScale: 0.95 + MinSlideFactorThreshold: 0.05 + InputLineSortingOrder: 10 + VelocityLineSortingOrder: 9 + InputLineWidth: 0.1 + VelocityLineWidth: 0.2 + InputLineLength: 1.5 + VelocityLineScale: 0.5 WalkingSfxName: DashSfxName: - MoveActionReference: {fileID: -1680190386980627800, guid: 052faaac586de48259a63d0c4782560b, type: 3} - DashActionReference: {fileID: -8150158440837788775, guid: 052faaac586de48259a63d0c4782560b, type: 3} + MoveAction: + m_Name: Move + m_Type: 0 + m_ExpectedControlType: + m_Id: 7ad3ada4-252c-48b4-919d-8f1742c567c9 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + DashAction: + m_Name: Dash + m_Type: 0 + m_ExpectedControlType: + m_Id: 3c8d671c-dda7-4ec6-8de6-4990e55337dc + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + OpenManagementUiAction: + m_Name: Open Management Ui + m_Type: 0 + m_ExpectedControlType: + m_Id: d0cc67e4-4fac-4cd7-83a6-6ab00cfaf0fc + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 diff --git a/Assets/_DDD/_ScriptAssets/DDD_InputSystem.inputactions b/Assets/_DDD/_ScriptAssets/DDD_InputSystem.inputactions index 791e9eee7..a23ad0533 100644 --- a/Assets/_DDD/_ScriptAssets/DDD_InputSystem.inputactions +++ b/Assets/_DDD/_ScriptAssets/DDD_InputSystem.inputactions @@ -40,6 +40,15 @@ "processors": "", "interactions": "Hold", "initialStateCheck": false + }, + { + "name": "OpenManagementUi", + "type": "Button", + "id": "6b4fe16c-33c6-4564-a553-9eaf437dd31e", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -273,6 +282,17 @@ "action": "Interact", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "a76b42b5-b7d2-4029-886b-383ae63d7519", + "path": "/f", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "OpenManagementUi", + "isComposite": false, + "isPartOfComposite": false } ] }, @@ -814,24 +834,6 @@ "interactions": "", "initialStateCheck": false }, - { - "name": "Interact1", - "type": "Button", - "id": "345ce67b-a186-4368-bd50-2384e93cf5ce", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Interact2", - "type": "Button", - "id": "7900b5b8-b140-4a58-9352-bbfea4704a1e", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, { "name": "PreviousTab", "type": "Button", @@ -849,6 +851,24 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Interact1", + "type": "Button", + "id": "345ce67b-a186-4368-bd50-2384e93cf5ce", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Interact2", + "type": "Button", + "id": "7900b5b8-b140-4a58-9352-bbfea4704a1e", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab index 27f6f5d6b..203da54ba 100644 --- a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab +++ b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab @@ -1,5 +1,80 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &149260379060592899 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8222575182711493210} + - component: {fileID: 6361407754040625878} + - component: {fileID: 8838485595005428255} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8222575182711493210 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149260379060592899} + 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: 1 + m_Children: [] + m_Father: {fileID: 2591997447588338500} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6361407754040625878 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149260379060592899} + m_CullTransparentMesh: 1 +--- !u!114 &8838485595005428255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149260379060592899} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &437696462836866067 GameObject: m_ObjectHideFlags: 0 @@ -10,7 +85,7 @@ GameObject: m_Component: - component: {fileID: 4347279445921954555} m_Layer: 5 - m_Name: PopupPanel + m_Name: PopupUis m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -27,7 +102,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 6555851050378238242} m_Father: {fileID: 5760169274063006291} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -71,6 +147,55 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3049036770990482859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6555851050378238242} + - component: {fileID: 895343445285308768} + m_Layer: 5 + m_Name: RestaurantManagementUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6555851050378238242 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3049036770990482859} + 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: 1 + m_Children: + - {fileID: 2591997447588338500} + m_Father: {fileID: 4347279445921954555} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &895343445285308768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3049036770990482859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 46c8396c996c804449b383960b44e812, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3727951609312695740 GameObject: m_ObjectHideFlags: 0 @@ -195,6 +320,42 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 828648aab79941544bf8ceb7b25b586c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &5806937802645739297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2591997447588338500} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2591997447588338500 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5806937802645739297} + 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: 1 + m_Children: + - {fileID: 8222575182711493210} + m_Father: {fileID: 6555851050378238242} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6379980813304592546 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Scripts/GameUi/BasePopupUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BasePopupUi.cs.meta new file mode 100644 index 000000000..d56187156 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/BasePopupUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e867c495ac99cdd44989c3a626fa95d7 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi.cs.meta new file mode 100644 index 000000000..49a314185 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 46c8396c996c804449b383960b44e812 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/InputSystem/UiInputBindingSo.cs.meta b/Assets/_DDD/_Scripts/InputSystem/BaseUiActionsInputBindingSo.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/InputSystem/UiInputBindingSo.cs.meta rename to Assets/_DDD/_Scripts/InputSystem/BaseUiActionsInputBindingSo.cs.meta diff --git a/Assets/_DDD/_Scripts/InputSystem/RestaurantActionsInputBindingSo.cs.meta b/Assets/_DDD/_Scripts/InputSystem/RestaurantActionsInputBindingSo.cs.meta new file mode 100644 index 000000000..b04a64457 --- /dev/null +++ b/Assets/_DDD/_Scripts/InputSystem/RestaurantActionsInputBindingSo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d64bf996d2122db4d856a87dfcd10d1a diff --git a/Assets/_DDD/_Scripts/InputSystem/RestaurantUiActionsInputBindingSo.cs.meta b/Assets/_DDD/_Scripts/InputSystem/RestaurantUiActionsInputBindingSo.cs.meta new file mode 100644 index 000000000..11a47ca0d --- /dev/null +++ b/Assets/_DDD/_Scripts/InputSystem/RestaurantUiActionsInputBindingSo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 826fdca033cc8c141b0f7e39161c2880 diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerInput.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerInput.cs.meta new file mode 100644 index 000000000..7c4956a8e --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerInput.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d4e8820e36cdbec4fb86f9bc0e3fd638 \ No newline at end of file