diff --git a/Client/Assets/Bundles/Configs/LocalizationTable.asset b/Client/Assets/Bundles/Configs/LocalizationTable.asset index cfe4462..0fc6a6d 100644 --- a/Client/Assets/Bundles/Configs/LocalizationTable.asset +++ b/Client/Assets/Bundles/Configs/LocalizationTable.asset @@ -34,6 +34,10 @@ MonoBehaviour: SectionId: 52383087 Key: Tips.net.error Value: ddddd + - EntryId: 60204351 + SectionId: 55223838 + Key: Shortcut.jump + Value: --- !u!114 &-7214673748730851758 MonoBehaviour: m_ObjectHideFlags: 0 @@ -68,6 +72,10 @@ MonoBehaviour: SectionId: 52383087 Key: Tips.net.error Value: aaaaa + - EntryId: 60204351 + SectionId: 55223838 + Key: Shortcut.jump + Value: Use {0} Jump --- !u!114 &-6251636620881476750 MonoBehaviour: m_ObjectHideFlags: 0 @@ -102,6 +110,10 @@ MonoBehaviour: SectionId: 52383087 Key: Tips.net.error Value: cccccc + - EntryId: 60204351 + SectionId: 55223838 + Key: Shortcut.jump + Value: --- !u!114 &-708586311158497320 MonoBehaviour: m_ObjectHideFlags: 0 @@ -136,6 +148,10 @@ MonoBehaviour: SectionId: 52383087 Key: Tips.net.error Value: "\u7F51\u7EDC\u9519\u8BEF" + - EntryId: 60204351 + SectionId: 55223838 + Key: Shortcut.jump + Value: "\u4F7F\u7528 {0} \u8DF3\u8DC3" --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -162,18 +178,24 @@ MonoBehaviour: - Id: 41381430 Key: action.jumpdsad IsGen: 0 - - Id: 77602120 - SectionName: UI - SectionSheet: - - Id: 91916311 - Key: Touch.smoth - IsGen: 0 - Id: 52383087 SectionName: Tips SectionSheet: - Id: 11809898 Key: net.error IsGen: 1 + - Id: 77602120 + SectionName: UI + SectionSheet: + - Id: 91916311 + Key: Touch.smoth + IsGen: 0 + - Id: 55223838 + SectionName: Shortcut + SectionSheet: + - Id: 60204351 + Key: jump + IsGen: 0 Languages: - {fileID: -708586311158497320} - {fileID: -7214673748730851758} diff --git a/Client/Assets/GamepadTest.unity b/Client/Assets/GamepadTest.unity index 403204a..87a4275 100644 --- a/Client/Assets/GamepadTest.unity +++ b/Client/Assets/GamepadTest.unity @@ -759,6 +759,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 0 m_OnClick: m_PersistentCalls: @@ -808,142 +809,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 215982991} m_CullTransparentMesh: 1 ---- !u!1 &344668135 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 344668136} - - component: {fileID: 344668138} - - component: {fileID: 344668137} - m_Layer: 5 - m_Name: UXTextMeshPro - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &344668136 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 344668135} - 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: 501104430} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &344668137 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 344668135} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd17b8b605f2ba540bac156b5cf5ac77, 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_text: USE FUCK U - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7cdd102360e32234383f8e3f40da47a9, type: 2} - m_sharedMaterial: {fileID: -1232377485662373643, guid: 7cdd102360e32234383f8e3f40da47a9, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} - m_localizationID: 94373125 - m_localizationKey: Input.action.usedas ---- !u!222 &344668138 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 344668135} - m_CullTransparentMesh: 1 --- !u!1 &346489238 GameObject: m_ObjectHideFlags: 0 @@ -1201,6 +1066,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 1 m_OnClick: m_PersistentCalls: @@ -1506,6 +1372,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 61637216} + - {fileID: 1277424800} - {fileID: 1174001930} - {fileID: 215982992} - {fileID: 799219939} @@ -1517,11 +1384,7 @@ RectTransform: - {fileID: 1466314556} - {fileID: 2043214059} - {fileID: 1240218065} - - {fileID: 1461120293} - - {fileID: 1268519739} - - {fileID: 953234183} - - {fileID: 1108824070} - - {fileID: 344668136} + - {fileID: 2043299036} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1934,7 +1797,8 @@ MonoBehaviour: m_PressedTrigger: Pressed m_SelectedTrigger: Selected m_DisabledTrigger: Disabled - m_SelectionState: 0 + m_SelectionState: 3 + _animator: {fileID: 0} m_Mode: 1 m_OnClick: m_PersistentCalls: @@ -3098,6 +2962,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 0 m_OnClick: m_PersistentCalls: @@ -3478,6 +3343,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 1 m_OnClick: m_PersistentCalls: @@ -3539,7 +3405,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 933311483} m_CullTransparentMesh: 1 ---- !u!1 &953234182 +--- !u!1 &967845620 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3547,46 +3413,132 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 953234183} - - component: {fileID: 953234184} + - component: {fileID: 967845621} + - component: {fileID: 967845623} + - component: {fileID: 967845622} m_Layer: 5 - m_Name: GameObject (2) + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &953234183 +--- !u!224 &967845621 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 953234182} + m_GameObject: {fileID: 967845620} 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: 501104430} + m_Father: {fileID: 1277424800} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &953234184 +--- !u!114 &967845622 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 953234182} + m_GameObject: {fileID: 967845620} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7d3bd4152cc45d18982984253cfb298, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: test + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &967845623 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967845620} + m_CullTransparentMesh: 1 --- !u!1 &983400299 GameObject: m_ObjectHideFlags: 0 @@ -3796,6 +3748,7 @@ MonoBehaviour: hotButtons: - {fileID: 0} - {fileID: 0} + selectable: {fileID: 0} --- !u!4 &1036822062 Transform: m_ObjectHideFlags: 0 @@ -4020,54 +3973,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1091182236} m_CullTransparentMesh: 1 ---- !u!1 &1108824069 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1108824070} - - component: {fileID: 1108824071} - m_Layer: 5 - m_Name: GameObject (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1108824070 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1108824069} - 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: 501104430} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1108824071 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1108824069} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7d3bd4152cc45d18982984253cfb298, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1174001929 GameObject: m_ObjectHideFlags: 0 @@ -4150,10 +4055,23 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 0 m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1277424797} + m_TargetAssemblyTypeName: UXButton, AlicizaX.UI.Extension + m_MethodName: Focus + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_ChildTransitions: [] m_UXGroup: {fileID: 0} hoverAudioClip: {fileID: 8300000, guid: d7cfd9f6afac6a24794f9a95c6aebcbb, type: 3} @@ -4359,6 +4277,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 0 m_OnClick: m_PersistentCalls: @@ -4452,6 +4371,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 0 m_OnClick: m_PersistentCalls: @@ -4501,54 +4421,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1261491487} m_CullTransparentMesh: 1 ---- !u!1 &1268519738 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1268519739} - - component: {fileID: 1268519740} - m_Layer: 5 - m_Name: GameObject (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1268519739 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1268519738} - 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: 501104430} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1268519740 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1268519738} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7d3bd4152cc45d18982984253cfb298, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1276959926 GameObject: m_ObjectHideFlags: 0 @@ -4683,6 +4555,138 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1276959926} m_CullTransparentMesh: 1 +--- !u!1 &1277424796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1277424800} + - component: {fileID: 1277424799} + - component: {fileID: 1277424798} + - component: {fileID: 1277424797} + m_Layer: 5 + m_Name: test + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1277424797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1277424796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7e92b092d584bb39e5239463f064cbe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Interactable: 1 + m_MainTransition: + targetGraphic: {fileID: 1277424798} + transition: 1 + colors: + m_NormalColor: {r: 1, g: 0.06666667, b: 0, a: 1} + m_HighlightedColor: {r: 0.072053194, g: 1, b: 0, a: 1} + m_PressedColor: {r: 1, g: 0.89133024, b: 0, a: 1} + m_SelectedColor: {r: 0.9637351, g: 0, b: 1, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + spriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + animationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_SelectionState: 0 + _animator: {fileID: 0} + m_Mode: 0 + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_ChildTransitions: [] + m_UXGroup: {fileID: 0} + hoverAudioClip: {fileID: 8300000, guid: d7cfd9f6afac6a24794f9a95c6aebcbb, type: 3} + clickAudioClip: {fileID: 8300000, guid: b399b083c59f6d240bcad9b7dc52b7d3, type: 3} + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1277424798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1277424796} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &1277424799 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1277424796} + m_CullTransparentMesh: 1 +--- !u!224 &1277424800 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1277424796} + 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: + - {fileID: 967845621} + m_Father: {fileID: 501104430} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 319, y: 191} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1278391762 GameObject: m_ObjectHideFlags: 0 @@ -4766,6 +4770,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 1 m_OnClick: m_PersistentCalls: @@ -5075,54 +5080,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1302014481} m_CullTransparentMesh: 1 ---- !u!1 &1461120292 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1461120293} - - component: {fileID: 1461120294} - m_Layer: 5 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1461120293 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1461120292} - 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: 501104430} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1461120294 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1461120292} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7d3bd4152cc45d18982984253cfb298, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1466314555 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2393741490227731184, guid: 5a0830a080d75784b9f03b1659413301, type: 3} @@ -5468,6 +5425,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 1 m_OnClick: m_PersistentCalls: @@ -5633,6 +5591,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 1 m_OnClick: m_PersistentCalls: @@ -5756,6 +5715,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 1 m_OnClick: m_PersistentCalls: @@ -6000,7 +5960,7 @@ PrefabInstance: objectReference: {fileID: 2394657966078626245, guid: 916c72588b6bc6e48a022e8c82e6438f, type: 3} - target: {fileID: 5638284224930950439, guid: 5a0830a080d75784b9f03b1659413301, type: 3} propertyPath: m_text - value: "\u6309\u4F4F\u8DF3\u8DC3" + value: objectReference: {fileID: 0} - target: {fileID: 5638284224930950439, guid: 5a0830a080d75784b9f03b1659413301, type: 3} propertyPath: m_fontAsset @@ -6473,6 +6433,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 0 m_OnClick: m_PersistentCalls: @@ -6504,7 +6465,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: actionReference: {fileID: 2394657966078626245, guid: 916c72588b6bc6e48a022e8c82e6438f, type: 3} + targetImage: {fileID: 0} hideIfMissing: 1 + hideTargetObject: {fileID: 0} --- !u!1 &1879857123 GameObject: m_ObjectHideFlags: 0 @@ -6588,6 +6551,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 1 m_OnClick: m_PersistentCalls: @@ -7037,6 +7001,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_Mode: 0 m_OnClick: m_PersistentCalls: @@ -7132,6 +7097,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_SelectionState: 0 + _animator: {fileID: 0} m_FillRect: {fileID: 182446648} m_HandleRect: {fileID: 533245761} m_Direction: 0 @@ -7144,6 +7110,142 @@ MonoBehaviour: m_Calls: [] m_SmoothMovement: 1 m_SmoothSpeed: 1 +--- !u!1 &2043299035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2043299036} + - component: {fileID: 2043299038} + - component: {fileID: 2043299037} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2043299036 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2043299035} + 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: 501104430} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -20.7297, y: 78.9} + m_SizeDelta: {x: 340.5406, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2043299037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2043299035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'EmptydEmpty + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 7cdd102360e32234383f8e3f40da47a9, type: 2} + m_sharedMaterial: {fileID: -1232377485662373643, guid: 7cdd102360e32234383f8e3f40da47a9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 28 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2043299038 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2043299035} + m_CullTransparentMesh: 1 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Client/Assets/InputGlyph/GlyphService.cs b/Client/Assets/InputGlyph/GlyphService.cs index 47ff68f..056a72c 100644 --- a/Client/Assets/InputGlyph/GlyphService.cs +++ b/Client/Assets/InputGlyph/GlyphService.cs @@ -10,7 +10,21 @@ public static class GlyphService /// 可选的全局数据库引用。你可以通过场景内的启动组件在 Awake 时赋值， /// 或者在调用每个方法时传入 InputGlyphDatabase 参数（见方法签名）。 /// - public static InputGlyphDatabase Database { get; set; } + public static InputGlyphDatabase Database + { + get + { + if (_database == null) + { + _database = Resources.Load("InputGlyphDatabase"); + } + + return _database; + } + } + + private static InputGlyphDatabase _database; + public static string GetBindingControlPath(InputAction action, InputDeviceWatcher.InputDeviceCategory? deviceOverride = null) { @@ -93,9 +107,10 @@ public static class GlyphService public static string GetDisplayNameFromInputAction(InputAction reference) { - string controlPath=GetBindingControlPath(reference, InputDeviceWatcher.CurrentCategory); + string controlPath = GetBindingControlPath(reference, InputDeviceWatcher.CurrentCategory); return GetDisplayNameFromControlPath(controlPath); } + public static string GetDisplayNameFromControlPath(string controlPath) { if (string.IsNullOrEmpty(controlPath)) return string.Empty; diff --git a/Client/Assets/InputGlyph/InputBindingManager.cs b/Client/Assets/InputGlyph/InputBindingManager.cs index 2c03374..5dd84c7 100644 --- a/Client/Assets/InputGlyph/InputBindingManager.cs +++ b/Client/Assets/InputGlyph/InputBindingManager.cs @@ -57,7 +57,6 @@ namespace InputRemapper private void Awake() { - GlyphService.Database = inputGlyphDatabase; if (actions == null) { Debug.LogError("InputBindingManager: InputActionAsset not assigned."); diff --git a/Client/Assets/InputGlyph/InputGlyphDatabase.cs b/Client/Assets/InputGlyph/InputGlyphDatabase.cs index 397981a..4c5a8d8 100644 --- a/Client/Assets/InputGlyph/InputGlyphDatabase.cs +++ b/Client/Assets/InputGlyph/InputGlyphDatabase.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using TMPro; using UnityEngine; using UnityEngine.InputSystem; +using UnityEngine.U2D; namespace AlicizaX.InputGlyph { @@ -16,9 +17,19 @@ namespace AlicizaX.InputGlyph [Serializable] public class DeviceGlyphTable { - // 改为使用字符串名称来区分 table（会序列化） + // Table 名称（序列化） public string deviceName; + + // 支持三种来源： + // 1) TMP Sprite Asset（TextMeshPro sprite asset） public TMP_SpriteAsset tmpAsset; + + // 2) Unity SpriteAtlas（可选） + public SpriteAtlas spriteAtlas; + + // 3) Texture2D（Sprite Mode = Multiple），在 Sprite Editor 切好的切片 + public Texture2D spriteSheetTexture; + public List entries = new List(); } @@ -30,7 +41,6 @@ namespace AlicizaX.InputGlyph // 当 FindEntryByControlPath 传空 path 时返回的占位 sprite public Sprite placeholderSprite; - // 按名字获取 table（name 精确匹配，不区分大小写） public DeviceGlyphTable GetTable(string deviceName) { if (string.IsNullOrEmpty(deviceName)) return null; @@ -42,11 +52,10 @@ namespace AlicizaX.InputGlyph if (string.Equals(t.deviceName, deviceName, StringComparison.OrdinalIgnoreCase)) return t; } - return null; } - // 为兼容保留：接受枚举并映射为常用名称（Keyboard, Xbox, PlayStation） + // 兼容枚举版本（示例） public DeviceGlyphTable GetTable(InputDeviceWatcher.InputDeviceCategory device) { string name = "Other"; @@ -55,9 +64,8 @@ namespace AlicizaX.InputGlyph case InputDeviceWatcher.InputDeviceCategory.Keyboard: name = "Keyboard"; break; case InputDeviceWatcher.InputDeviceCategory.Xbox: name = "Xbox"; break; case InputDeviceWatcher.InputDeviceCategory.PlayStation: name = "PlayStation"; break; - default: name = "Xbox"; break; // 与原逻辑相同：Other -> Xbox + default: name = "Xbox"; break; } - return GetTable(name); } @@ -68,7 +76,6 @@ namespace AlicizaX.InputGlyph { return placeholderSprite; } - return entry.Sprite; } @@ -92,7 +99,6 @@ namespace AlicizaX.InputGlyph } } } - return null; } } diff --git a/Client/Assets/InputGlyph/InputGlyphDatabaseEditor.cs b/Client/Assets/InputGlyph/InputGlyphDatabaseEditor.cs index 90ea3f7..9baa8b0 100644 --- a/Client/Assets/InputGlyph/InputGlyphDatabaseEditor.cs +++ b/Client/Assets/InputGlyph/InputGlyphDatabaseEditor.cs @@ -15,21 +15,14 @@ public class InputGlyphDatabaseEditor : Editor SerializedProperty placeholderSpriteProp; InputGlyphDatabase db; - // 动态标签索引（范围：0 .. tablesCount 为各表，最后一个 index = tablesCount 为 Settings） int tabIndex = 0; - - // 添加表时使用的临时 UI 状态 bool showAddField = false; string newTableName = ""; - // 每个表的搜索字符串与分页状态（editor 内存，不序列化） List searchStrings = new List(); List currentPages = new List(); - // 常量 const int itemsPerPage = 10; - - // 缩小后的预览尺寸 const int previewSize = 52; void OnEnable() @@ -44,12 +37,10 @@ public class InputGlyphDatabaseEditor : Editor return; } - // 如果没有默认的 Keyboard/Xbox/PlayStation 三个表则确保创建（便于迁移） EnsureDefaultTable("Keyboard"); EnsureDefaultTable("Xbox"); EnsureDefaultTable("PlayStation"); - // 初始化 editor 状态列表，长度与 tablesProp 对应 SyncEditorListsWithTables(); } @@ -58,7 +49,6 @@ public class InputGlyphDatabaseEditor : Editor serializedObject.Update(); if (db == null || tablesProp == null) return; - // 顶部工具栏（与 Save 按钮风格一致），同时放置 Settings 按钮 EditorGUILayout.BeginHorizontal(EditorStyles.toolbar); GUILayout.Space(4); @@ -71,25 +61,21 @@ public class InputGlyphDatabaseEditor : Editor GUILayout.FlexibleSpace(); - // + 按钮：切换显示新增输入区域 if (GUILayout.Button(showAddField ? "Cancel +" : "+ Add Table", EditorStyles.toolbarButton, GUILayout.Width(110))) { showAddField = !showAddField; newTableName = ""; } - // Settings 按钮也放在这个 toolbar 上（风格保持一致） int settingsIndex = tablesProp != null ? tablesProp.arraySize : 0; bool settingsSelected = (tabIndex == settingsIndex); if (GUILayout.Toggle(settingsSelected, "Settings", EditorStyles.toolbarButton, GUILayout.Width(90)) != settingsSelected) { - // 切换到 settings 页面或从 settings 切回第一个 table（如果取消） tabIndex = (tabIndex == settingsIndex) ? 0 : settingsIndex; } EditorGUILayout.EndHorizontal(); - // 如果正在新增，展示一个横向输入框（下方，同 toolbar 风格） if (showAddField) { EditorGUILayout.BeginHorizontal(EditorStyles.toolbar); @@ -104,7 +90,6 @@ public class InputGlyphDatabaseEditor : Editor } else { - // 唯一性检查（不区分大小写） bool exists = false; for (int i = 0; i < tablesProp.arraySize; ++i) { @@ -128,17 +113,20 @@ public class InputGlyphDatabaseEditor : Editor if (nameProp != null) nameProp.stringValue = trimmed; var tmpAssetProp = newTable.FindPropertyRelative("tmpAsset"); if (tmpAssetProp != null) tmpAssetProp.objectReferenceValue = null; + var atlasProp = newTable.FindPropertyRelative("spriteAtlas"); + if (atlasProp != null) atlasProp.objectReferenceValue = null; + var sheetProp = newTable.FindPropertyRelative("spriteSheetTexture"); + if (sheetProp != null) sheetProp.objectReferenceValue = null; var entriesProp = newTable.FindPropertyRelative("entries"); if (entriesProp != null) entriesProp.arraySize = 0; serializedObject.ApplyModifiedProperties(); EditorUtility.SetDirty(db); - // 重新 sync editor lists SyncEditorListsWithTables(); showAddField = false; - tabIndex = tablesProp.arraySize - 1; // 选择新建的 tab + tabIndex = tablesProp.arraySize - 1; } } } @@ -153,7 +141,6 @@ public class InputGlyphDatabaseEditor : Editor EditorGUILayout.Space(6); - // 绘制标签行（来自 tables 的 deviceName），但不再包含 Settings（Settings 已在上方 toolbar） EditorGUILayout.BeginHorizontal(EditorStyles.toolbar); int tablesCount = tablesProp.arraySize; for (int i = 0; i < tablesCount; ++i) @@ -162,16 +149,13 @@ public class InputGlyphDatabaseEditor : Editor var nameProp = t.FindPropertyRelative("deviceName"); string name = nameProp != null ? nameProp.stringValue : ("Table " + i); bool selected = (tabIndex == i); - // 采用 toolbarButton 风格的 toggle if (GUILayout.Toggle(selected, name, EditorStyles.toolbarButton, GUILayout.MinWidth(60))) { tabIndex = i; } - // 每个表右侧加一个小删除按钮（Settings 不在这里） if (GUILayout.Button("×", EditorStyles.toolbarButton, GUILayout.Width(22))) { - // 二次确认 if (EditorUtility.DisplayDialog("Delete Table?", $"Delete table '{name}' and all its entries? This cannot be undone.", "Delete", "Cancel")) { @@ -179,10 +163,9 @@ public class InputGlyphDatabaseEditor : Editor serializedObject.ApplyModifiedProperties(); EditorUtility.SetDirty(db); - // 调整 tabIndex 与 editor 状态 SyncEditorListsWithTables(); tabIndex = Mathf.Clamp(tabIndex, 0, Math.Max(0, tablesProp.arraySize - 1)); - return; // 直接返回防止继续绘制已修改的 serializedObject + return; } } } @@ -191,11 +174,10 @@ public class InputGlyphDatabaseEditor : Editor EditorGUILayout.Space(8); - // 绘制选中页内容（如果是 Settings 或某个 table） EditorGUILayout.BeginVertical("box"); if (tabIndex == tablesProp.arraySize) { - // Settings 页 + // Settings EditorGUILayout.LabelField("Settings", EditorStyles.boldLabel); EditorGUILayout.Space(4); EditorGUILayout.PropertyField(placeholderSpriteProp, new GUIContent("Placeholder Sprite")); @@ -216,7 +198,6 @@ public class InputGlyphDatabaseEditor : Editor } else { - // Table 页 if (tabIndex < 0 || tabIndex >= tablesProp.arraySize) { EditorGUILayout.HelpBox("Invalid table index.", MessageType.Error); @@ -224,15 +205,9 @@ public class InputGlyphDatabaseEditor : Editor else { var tableProp = tablesProp.GetArrayElementAtIndex(tabIndex); - // 去掉顶部显示 table 名称的 label - // var nameProp = tableProp.FindPropertyRelative("deviceName"); - // string tableName = nameProp != null ? nameProp.stringValue : $"Table {tabIndex}"; - // EditorGUILayout.LabelField(tableName, EditorStyles.boldLabel); - // Ensure editor lists 长度一致 EnsureEditorListsLength(); - // 搜索框：尽量使用 EditorStyles.toolbarSearchField（去掉左侧标题和 clear 按钮） GUILayout.BeginHorizontal(); GUIStyle searchStyle = EditorStyles.toolbarSearchField ?? EditorStyles.textField; searchStrings[tabIndex] = GUILayout.TextField(searchStrings[tabIndex] ?? "", searchStyle); @@ -240,16 +215,78 @@ public class InputGlyphDatabaseEditor : Editor EditorGUILayout.Space(6); - // 将 TMP Sprite Asset 的选择框 与 Parse / Clear 按钮 水平显示 + // TMP Asset row var tmpAssetProp = tableProp.FindPropertyRelative("tmpAsset"); EditorGUILayout.BeginHorizontal(); GUILayout.Label("TMP Sprite Asset", GUILayout.Width(140)); EditorGUILayout.PropertyField(tmpAssetProp, GUIContent.none, GUILayout.ExpandWidth(true)); - if (GUILayout.Button("Parse TMP Asset", GUILayout.Width(120))) ParseTMPAssetIntoTableSerialized(tableProp); + if (GUILayout.Button("Parse TMP Asset", GUILayout.Width(120))) + { + ParseTMPAssetIntoTableSerialized(tableProp); + } if (GUILayout.Button("Clear", GUILayout.Width(80))) { var entriesProp = tableProp.FindPropertyRelative("entries"); if (entriesProp != null) entriesProp.arraySize = 0; + var nameProp = tableProp.FindPropertyRelative("deviceName"); + if (nameProp != null && db != null) + { + var deviceName = nameProp.stringValue; + var table = db.GetTable(deviceName); + if (table != null) table.entries.Clear(); + } + serializedObject.ApplyModifiedProperties(); + EditorUtility.SetDirty(db); + currentPages[tabIndex] = 0; + } + EditorGUILayout.EndHorizontal(); + + // SpriteAtlas row + var atlasProp = tableProp.FindPropertyRelative("spriteAtlas"); + EditorGUILayout.BeginHorizontal(); + GUILayout.Label("Sprite Atlas", GUILayout.Width(140)); + EditorGUILayout.PropertyField(atlasProp, GUIContent.none, GUILayout.ExpandWidth(true)); + if (GUILayout.Button("Parse Sprite Atlas", GUILayout.Width(120))) + { + ParseSpriteAtlasIntoTableSerialized(tableProp); + } + if (GUILayout.Button("Clear", GUILayout.Width(80))) + { + var entriesProp = tableProp.FindPropertyRelative("entries"); + if (entriesProp != null) entriesProp.arraySize = 0; + var nameProp = tableProp.FindPropertyRelative("deviceName"); + if (nameProp != null && db != null) + { + var deviceName = nameProp.stringValue; + var table = db.GetTable(deviceName); + if (table != null) table.entries.Clear(); + } + serializedObject.ApplyModifiedProperties(); + EditorUtility.SetDirty(db); + currentPages[tabIndex] = 0; + } + EditorGUILayout.EndHorizontal(); + + // SpriteSheet (Texture2D with Multiple) row + var sheetProp = tableProp.FindPropertyRelative("spriteSheetTexture"); + EditorGUILayout.BeginHorizontal(); + GUILayout.Label("Sprite Sheet (Texture2D)", GUILayout.Width(140)); + EditorGUILayout.PropertyField(sheetProp, GUIContent.none, GUILayout.ExpandWidth(true)); + if (GUILayout.Button("Parse Sprite Sheet", GUILayout.Width(120))) + { + ParseSpriteSheetIntoTableSerialized(tableProp); + } + if (GUILayout.Button("Clear", GUILayout.Width(80))) + { + var entriesProp = tableProp.FindPropertyRelative("entries"); + if (entriesProp != null) entriesProp.arraySize = 0; + var nameProp = tableProp.FindPropertyRelative("deviceName"); + if (nameProp != null && db != null) + { + var deviceName = nameProp.stringValue; + var table = db.GetTable(deviceName); + if (table != null) table.entries.Clear(); + } serializedObject.ApplyModifiedProperties(); EditorUtility.SetDirty(db); currentPages[tabIndex] = 0; @@ -262,7 +299,6 @@ public class InputGlyphDatabaseEditor : Editor if (entries != null) { int total = entries.arraySize; - // collect matched indices by searching sprite.name List matchedIndices = new List(); string query = (searchStrings[tabIndex] ?? "").Trim(); for (int i = 0; i < total; ++i) @@ -282,7 +318,6 @@ public class InputGlyphDatabaseEditor : Editor int totalPages = Mathf.Max(1, (matchedTotal + itemsPerPage - 1) / itemsPerPage); currentPages[tabIndex] = Mathf.Clamp(currentPages[tabIndex], 0, totalPages - 1); - // pagination controls (toolbar 风格) EditorGUILayout.BeginHorizontal(); if (GUILayout.Button("<<", EditorStyles.miniButtonLeft, GUILayout.Width(36))) { currentPages[tabIndex] = 0; } if (GUILayout.Button("<", EditorStyles.miniButtonMid, GUILayout.Width(36))) { currentPages[tabIndex] = Mathf.Max(0, currentPages[tabIndex] - 1); } @@ -306,10 +341,8 @@ public class InputGlyphDatabaseEditor : Editor var eProp = entries.GetArrayElementAtIndex(i); if (eProp == null) continue; - // 使用稍小的间距并减小 preview 大小 using (new EditorGUILayout.HorizontalScope("box")) { - // 左列 sprite 预览（固定宽） using (new EditorGUILayout.VerticalScope(GUILayout.Width(80))) { var spriteProp = eProp.FindPropertyRelative("Sprite"); @@ -335,7 +368,6 @@ public class InputGlyphDatabaseEditor : Editor } } - // 右列 action 字段 EditorGUILayout.BeginVertical(); var actionProp = eProp.FindPropertyRelative("action"); EditorGUILayout.Space(2); @@ -361,7 +393,6 @@ public class InputGlyphDatabaseEditor : Editor serializedObject.ApplyModifiedProperties(); } - // Ensure table with name exists (用于初次迁移) void EnsureDefaultTable(string name) { if (tablesProp == null) return; @@ -380,6 +411,10 @@ public class InputGlyphDatabaseEditor : Editor if (deviceNameProp != null) deviceNameProp.stringValue = name; var tmpAssetProp = newTable.FindPropertyRelative("tmpAsset"); if (tmpAssetProp != null) tmpAssetProp.objectReferenceValue = null; + var atlasProp = newTable.FindPropertyRelative("spriteAtlas"); + if (atlasProp != null) atlasProp.objectReferenceValue = null; + var sheetProp = newTable.FindPropertyRelative("spriteSheetTexture"); + if (sheetProp != null) sheetProp.objectReferenceValue = null; var entriesProp = newTable.FindPropertyRelative("entries"); if (entriesProp != null) entriesProp.arraySize = 0; @@ -406,44 +441,70 @@ public class InputGlyphDatabaseEditor : Editor SyncEditorListsWithTables(); } - // Parse TMP Sprite Asset into table (保持你原有实现) + // ----- Parse TMP SpriteAsset（增强版） ----- void ParseTMPAssetIntoTableSerialized(SerializedProperty tableProp) { if (tableProp == null) return; var tmpAssetProp = tableProp.FindPropertyRelative("tmpAsset"); var asset = tmpAssetProp.objectReferenceValue as TMP_SpriteAsset; - if (asset == null) return; + if (asset == null) + { + Debug.LogWarning("[InputGlyphDatabase] TMP Sprite Asset is null for table."); + return; + } - var entriesProp = tableProp.FindPropertyRelative("entries"); - if (entriesProp == null) return; + var nameProp = tableProp.FindPropertyRelative("deviceName"); + string deviceName = nameProp != null ? nameProp.stringValue : ""; - entriesProp.arraySize = 0; + int tableIndex = MapSerializedTableToRuntimeIndex(deviceName); + if (tableIndex < 0) + { + Debug.LogError($"[InputGlyphDatabase] Could not map serialized table '{deviceName}' to runtime db.tables."); + return; + } + + var tableObj = db.tables[tableIndex]; + tableObj.entries.Clear(); var chars = asset.spriteCharacterTable; SpriteAtlas atlas = GetSpriteAtlasFromTMP(asset); string assetPath = AssetDatabase.GetAssetPath(asset); - string assetFolder = Path.GetDirectoryName(assetPath); + string assetFolder = !string.IsNullOrEmpty(assetPath) ? Path.GetDirectoryName(assetPath) : null; + int foundCount = 0; for (int i = 0; i < chars.Count; ++i) { var ch = chars[i]; if (ch == null) continue; - var name = ch.name; - if (string.IsNullOrEmpty(name)) continue; + string name = ch.name; + if (string.IsNullOrEmpty(name)) name = $"glyph_{i}"; Sprite s = null; + + // 1) 尝试从 glyph / TMP_SpriteGlyph 中取 sprite try { var glyph = ch.glyph as TMP_SpriteGlyph; - if (glyph != null && glyph.sprite != null) s = glyph.sprite; + if (glyph != null) + { + var possible = typeof(TMP_SpriteGlyph).GetProperty("sprite", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); + if (possible != null) + { + s = possible.GetValue(glyph, null) as Sprite; + } + else + { + var f = typeof(TMP_SpriteGlyph).GetField("sprite", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); + if (f != null) s = f.GetValue(glyph) as Sprite; + } + } } - catch { } + catch { s = null; } + // 2) atlas 查找 if (s == null && atlas != null) { - try { s = atlas.GetSprite(name); } - catch { s = null; } - + try { s = atlas.GetSprite(name); } catch { s = null; } if (s == null) { try @@ -451,56 +512,255 @@ public class InputGlyphDatabaseEditor : Editor var m = typeof(SpriteAtlas).GetMethod("GetSprite", new Type[] { typeof(string) }); if (m != null) s = m.Invoke(atlas, new object[] { name }) as Sprite; } - catch { } + catch { s = null; } } } - if (s == null) + // 3) asset folder scope 查找 + if (s == null && !string.IsNullOrEmpty(assetFolder)) { - string[] scoped = AssetDatabase.FindAssets(name + " t:Sprite", new[] { assetFolder }); - if (scoped != null && scoped.Length > 0) + try { - foreach (var g in scoped) + string[] scoped = AssetDatabase.FindAssets($"\"{name}\" t:Sprite", new[] { assetFolder }); + if (scoped != null && scoped.Length > 0) { - var p = AssetDatabase.GUIDToAssetPath(g); - var sp = AssetDatabase.LoadAssetAtPath(p); - if (sp != null && sp.name == name) + foreach (var g in scoped) { - s = sp; - break; + var p = AssetDatabase.GUIDToAssetPath(g); + var sp = AssetDatabase.LoadAssetAtPath(p); + if (sp != null && sp.name == name) + { + s = sp; break; + } } } } + catch { s = null; } } + // 4) 全项目查找 if (s == null) { - string[] all = AssetDatabase.FindAssets(name + " t:Sprite"); - if (all != null && all.Length > 0) + try { - foreach (var g in all) + string[] all = AssetDatabase.FindAssets($"{name} t:Sprite"); + if (all != null && all.Length > 0) { - var p = AssetDatabase.GUIDToAssetPath(g); - var sp = AssetDatabase.LoadAssetAtPath(p); - if (sp != null && sp.name == name) + foreach (var g in all) { - s = sp; - break; + var p = AssetDatabase.GUIDToAssetPath(g); + var sp = AssetDatabase.LoadAssetAtPath(p); + if (sp != null && sp.name == name) + { + s = sp; break; + } } } } + catch { s = null; } } - int newIndex = entriesProp.arraySize; - entriesProp.InsertArrayElementAtIndex(newIndex); - var entryProp = entriesProp.GetArrayElementAtIndex(newIndex); - var spriteProp = entryProp.FindPropertyRelative("Sprite"); - if (spriteProp != null) spriteProp.objectReferenceValue = s; + // 5) LoadAllAssetsAtPath (TMP asset 本身) 作为最后手段 + if (s == null && !string.IsNullOrEmpty(assetPath)) + { + try + { + var allAssets = AssetDatabase.LoadAllAssetsAtPath(assetPath); + if (allAssets != null) + { + foreach (var obj in allAssets) + { + if (obj is Sprite sp && sp.name == name) + { + s = sp; break; + } + } + } + } + catch { s = null; } + } + + GlyphEntry entry = new GlyphEntry(); + entry.Sprite = s; + entry.action = null; + tableObj.entries.Add(entry); + + if (s != null) foundCount++; + else Debug.LogWarning($"[InputGlyphDatabase] Failed to resolve sprite '{name}' for TMP asset '{asset.name}' (table '{deviceName}')."); } - serializedObject.ApplyModifiedProperties(); + // 按名字逐字符排序（不区分大小写） + tableObj.entries.Sort((a, b) => CompareSpriteNames(a?.Sprite?.name, b?.Sprite?.name)); + EditorUtility.SetDirty(db); + serializedObject.Update(); + serializedObject.ApplyModifiedProperties(); AssetDatabase.SaveAssets(); + + Debug.Log($"[InputGlyphDatabase] Parsed TMP '{asset.name}' into table '{deviceName}'. chars={chars.Count}, resolvedSprites={foundCount}"); + } + + // ----- Parse SpriteAtlas（Unity SpriteAtlas） ----- + void ParseSpriteAtlasIntoTableSerialized(SerializedProperty tableProp) + { + if (tableProp == null) return; + var atlasProp = tableProp.FindPropertyRelative("spriteAtlas"); + var atlas = atlasProp != null ? atlasProp.objectReferenceValue as SpriteAtlas : null; + if (atlas == null) + { + Debug.LogWarning("[InputGlyphDatabase] SpriteAtlas is null for table."); + return; + } + + var nameProp = tableProp.FindPropertyRelative("deviceName"); + string deviceName = nameProp != null ? nameProp.stringValue : ""; + + int tableIndex = MapSerializedTableToRuntimeIndex(deviceName); + if (tableIndex < 0) + { + Debug.LogError($"[InputGlyphDatabase] Could not map serialized table '{deviceName}' to runtime db.tables."); + return; + } + + var tableObj = db.tables[tableIndex]; + tableObj.entries.Clear(); + + string[] guids = AssetDatabase.FindAssets("t:Sprite"); + int added = 0; + try + { + for (int gi = 0; gi < guids.Length; ++gi) + { + var guid = guids[gi]; + var path = AssetDatabase.GUIDToAssetPath(guid); + var sp = AssetDatabase.LoadAssetAtPath(path); + if (sp == null) continue; + bool belongs = false; + try + { + var got = atlas.GetSprite(sp.name); + if (got != null) belongs = true; + } + catch + { + try + { + var m = typeof(SpriteAtlas).GetMethod("GetSprite", new Type[] { typeof(string) }); + if (m != null) + { + var got2 = m.Invoke(atlas, new object[] { sp.name }) as Sprite; + if (got2 != null) belongs = true; + } + } + catch { } + } + + if (belongs) + { + GlyphEntry e = new GlyphEntry(); + e.Sprite = sp; + e.action = null; + tableObj.entries.Add(e); + added++; + } + } + } + catch (Exception ex) + { + Debug.LogError("[InputGlyphDatabase] Exception while scanning sprites for atlas: " + ex); + } + + // 按名字逐字符排序（不区分大小写） + tableObj.entries.Sort((a, b) => CompareSpriteNames(a?.Sprite?.name, b?.Sprite?.name)); + + EditorUtility.SetDirty(db); + serializedObject.Update(); + serializedObject.ApplyModifiedProperties(); + AssetDatabase.SaveAssets(); + + Debug.Log($"[InputGlyphDatabase] Parsed SpriteAtlas '{atlas.name}' into table '{deviceName}'. foundSprites={added}"); + } + + // ----- Parse Sprite Sheet (Texture2D with Multiple) ----- + void ParseSpriteSheetIntoTableSerialized(SerializedProperty tableProp) + { + if (tableProp == null) return; + + var sheetProp = tableProp.FindPropertyRelative("spriteSheetTexture"); + var tex = sheetProp != null ? sheetProp.objectReferenceValue as Texture2D : null; + if (tex == null) + { + Debug.LogWarning("[InputGlyphDatabase] spriteSheetTexture is null for table."); + return; + } + + var nameProp = tableProp.FindPropertyRelative("deviceName"); + string deviceName = nameProp != null ? nameProp.stringValue : ""; + + int tableIndex = MapSerializedTableToRuntimeIndex(deviceName); + if (tableIndex < 0) + { + Debug.LogError($"[InputGlyphDatabase] Could not map serialized table '{deviceName}' to runtime db.tables."); + return; + } + + var tableObj = db.tables[tableIndex]; + tableObj.entries.Clear(); + + string path = AssetDatabase.GetAssetPath(tex); + if (string.IsNullOrEmpty(path)) + { + Debug.LogWarning("[InputGlyphDatabase] Could not get asset path for texture."); + return; + } + + var assets = AssetDatabase.LoadAllAssetsAtPath(path); + if (assets == null || assets.Length == 0) + { + Debug.LogWarning("[InputGlyphDatabase] No sub-assets found at path: " + path); + return; + } + + List sprites = new List(); + foreach (var a in assets) + { + if (a is Sprite sp) + { + sprites.Add(sp); + } + } + + // 之前按视觉位置排序，改为先按名字逐字符排序（不区分大小写） + sprites.Sort((a, b) => CompareSpriteNames(a?.name, b?.name)); + + foreach (var sp in sprites) + { + GlyphEntry e = new GlyphEntry(); + e.Sprite = sp; + e.action = null; + tableObj.entries.Add(e); + } + + // 额外在 runtime list 里也用相同排序（上面已经排序过 sprites） + tableObj.entries.Sort((a, b) => CompareSpriteNames(a?.Sprite?.name, b?.Sprite?.name)); + + EditorUtility.SetDirty(db); + serializedObject.Update(); + serializedObject.ApplyModifiedProperties(); + AssetDatabase.SaveAssets(); + + Debug.Log($"[InputGlyphDatabase] Parsed sprite sheet '{tex.name}' into table '{deviceName}'. foundSprites={sprites.Count}"); + } + + int MapSerializedTableToRuntimeIndex(string deviceName) + { + if (db == null || db.tables == null) return -1; + for (int ti = 0; ti < db.tables.Count; ++ti) + { + if (string.Equals(db.tables[ti].deviceName, deviceName, StringComparison.OrdinalIgnoreCase)) + return ti; + } + return -1; } SpriteAtlas GetSpriteAtlasFromTMP(TMP_SpriteAsset asset) @@ -531,4 +791,25 @@ public class InputGlyphDatabaseEditor : Editor return null; } + + int CompareSpriteNames(string a, string b) + { + // normalize null/empty + bool aEmpty = string.IsNullOrEmpty(a); + bool bEmpty = string.IsNullOrEmpty(b); + if (aEmpty && bEmpty) return 0; + if (aEmpty) return -1; + if (bEmpty) return 1; + + int la = a.Length; + int lb = b.Length; + int n = Math.Min(la, lb); + for (int i = 0; i < n; ++i) + { + char ca = char.ToUpperInvariant(a[i]); + char cb = char.ToUpperInvariant(b[i]); + if (ca != cb) return ca - cb; + } + return la - lb; + } } diff --git a/Client/Assets/InputGlyph/InputGlyphImage.cs b/Client/Assets/InputGlyph/InputGlyphImage.cs index 802e4ff..fbf38da 100644 --- a/Client/Assets/InputGlyph/InputGlyphImage.cs +++ b/Client/Assets/InputGlyph/InputGlyphImage.cs @@ -7,8 +7,9 @@ using AlicizaX.InputGlyph; public class InputGlyphImage : MonoBehaviour { [SerializeField] private InputActionReference actionReference; - private Image targetImage; - [SerializeField] private bool hideIfMissing = true; + [SerializeField] private Image targetImage; + [SerializeField] private bool hideIfMissing = false; + [SerializeField] private GameObject hideTargetObject; void OnEnable() { @@ -35,5 +36,7 @@ public class InputGlyphImage : MonoBehaviour { targetImage.sprite = sprite; } + + if (hideTargetObject) hideTargetObject.SetActive(sprite != null && !hideIfMissing); } } diff --git a/Client/Assets/InputGlyph/InputGlyphText.cs b/Client/Assets/InputGlyph/InputGlyphText.cs index e019233..672192d 100644 --- a/Client/Assets/InputGlyph/InputGlyphText.cs +++ b/Client/Assets/InputGlyph/InputGlyphText.cs @@ -11,10 +11,12 @@ public class InputGlyphText : MonoBehaviour { [SerializeField] private InputActionReference actionReference; private TMP_Text textField; + private string _oldText; void OnEnable() { if (textField == null) textField = GetComponent(); InputDeviceWatcher.OnDeviceChanged += OnDeviceChanged; + _oldText=textField.text; UpdatePrompt(); } @@ -23,11 +25,6 @@ public class InputGlyphText : MonoBehaviour InputDeviceWatcher.OnDeviceChanged -= OnDeviceChanged; } - void OnBindingChanged(InputAction action, int idx) - { - if (actionReference == null || actionReference.action == null) return; - if (action == actionReference.action) UpdatePrompt(); - } void OnDeviceChanged(InputDeviceWatcher.InputDeviceCategory cat) { @@ -37,18 +34,13 @@ public class InputGlyphText : MonoBehaviour void UpdatePrompt() { if (actionReference == null || actionReference.action == null || textField == null) return; - var action = actionReference.action; - - string path = GlyphService.GetBindingControlPath(action); var device = InputDeviceWatcher.CurrentCategory; - string displayFallback = string.Empty; - string oldText = textField.text; - if (GlyphService.TryGetTMPTagForActionPath(path, device, out string tag, out displayFallback)) + if (GlyphService.TryGetTMPTagForActionPath(actionReference, device, out string tag, out string displayFallback)) { - textField.text = Utility.Text.Format(oldText, tag); + textField.text = Utility.Text.Format(_oldText, tag); return; } - textField.text = Utility.Text.Format(oldText, displayFallback);; + textField.text = Utility.Text.Format(_oldText, displayFallback);; } } diff --git a/Client/Assets/PlayerControls.inputactions b/Client/Assets/PlayerControls.inputactions index 6474ebc..84b75a7 100644 --- a/Client/Assets/PlayerControls.inputactions +++ b/Client/Assets/PlayerControls.inputactions @@ -27,7 +27,7 @@ "name": "input.action.jump", "type": "Button", "id": "2f17f526-e679-4e4e-89df-4cfbdf2d3173", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": false @@ -237,6 +237,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "27468e38-365f-41a2-b2ec-404728ffea17", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": "", + "action": "input.action.jump", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "0f1d5935-2d96-4825-a6e5-6ef2cb11eb35", diff --git a/Client/Assets/InputGlyph/InputGlyphDatabase.asset b/Client/Assets/Resources/InputGlyphDatabase.asset similarity index 69% rename from Client/Assets/InputGlyph/InputGlyphDatabase.asset rename to Client/Assets/Resources/InputGlyphDatabase.asset index 4d25801..3bddf04 100644 --- a/Client/Assets/InputGlyph/InputGlyphDatabase.asset +++ b/Client/Assets/Resources/InputGlyphDatabase.asset @@ -15,995 +15,983 @@ MonoBehaviour: tables: - deviceName: Keyboard tmpAsset: {fileID: 11400000, guid: d86f5dbf588185247a5fce74f7485d46, type: 2} + spriteAtlas: {fileID: 0} + spriteSheetTexture: {fileID: 2800000, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} entries: - Sprite: {fileID: 0, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: Action m_Type: 0 m_ExpectedControlType: - m_Id: 8519cb45-6a61-40d2-aacf-15b0a59d4b33 + m_Id: f8429c00-dd41-45a9-9519-d064fe8cd5bb m_Processors: m_Interactions: - m_SingletonActionBindings: - - m_Name: - m_Id: f1f14d32-f049-4f91-bf38-921e96d7daf1 - m_Path: /escape - m_Interactions: - m_Processors: - m_Groups: - m_Action: Action - m_Flags: 0 + m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 8c08305fd7cc8844084abd008c6acb55, type: 3} + - Sprite: {fileID: -6103025470317098299, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: Action m_Type: 0 m_ExpectedControlType: - m_Id: a60a52cb-730e-47a6-80c7-5c6c40549e6c + m_Id: 6d30219b-6036-4517-9b26-37adea5d8bfc m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 00a279610a576904d8b7747bda764561, type: 3} + - Sprite: {fileID: -1894318288776737020, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: Action m_Type: 0 m_ExpectedControlType: - m_Id: 06558d43-5349-434c-8d21-5b19ad9d7956 + m_Id: f683058c-25f8-4a67-94af-2e4bbf209e25 m_Processors: m_Interactions: - m_SingletonActionBindings: - - m_Name: - m_Id: a05b5a99-fb2b-460d-8a1a-9406cbc24754 - m_Path: /1 - m_Interactions: - m_Processors: - m_Groups: - m_Action: Action - m_Flags: 0 + m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 6b0e1a9c87283e1459e8ba33cc992a07, type: 3} + - Sprite: {fileID: -4125358157997302610, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: Action m_Type: 0 m_ExpectedControlType: - m_Id: 736cb76d-521a-49ef-9c05-a16e9478abde + m_Id: c4461e16-a082-4edb-88be-f473e10dfc26 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 1f767599f0b4da849a883a94b13c5d26, type: 3} + - Sprite: {fileID: 8815889646254486885, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: Action m_Type: 0 m_ExpectedControlType: - m_Id: 67b24886-c0f0-4646-9fba-63726b8ad91b + m_Id: 9a8d9ff3-3c4b-472a-994a-fbd55d7c3933 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 0b050c5af7071df4ea9dcbe567a40527, type: 3} + - Sprite: {fileID: 4982162338036604692, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: Action m_Type: 0 m_ExpectedControlType: - m_Id: a7c4ac0f-243c-4563-9185-2a1971ba5ac0 + m_Id: 7a87c4d8-7b83-469d-82f6-b6dae00bdaf3 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 3e2c448a5b9e94d4b8014e39fffe75d8, type: 3} + - Sprite: {fileID: -6349638717394037051, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: Action m_Type: 0 m_ExpectedControlType: - m_Id: 2dbf6f89-a694-4032-87b8-2dc5ef93b3aa + m_Id: 1691ae3c-5963-498f-ac78-cf40b1a1cc4b m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: abe3f54f2b12e254a8d7985aa535603b, type: 3} + - Sprite: {fileID: 1993140119048961647, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: Action m_Type: 0 m_ExpectedControlType: - m_Id: ec9ba4d9-8143-4907-bf43-49c90c79a0ad + m_Id: 952b45de-a7ba-4bd4-a658-078b6a6f0a7f m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 63acc86307e60f843bd6eba3eb4b2501, type: 3} + - Sprite: {fileID: -7409993662859506228, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: Action m_Type: 0 m_ExpectedControlType: - m_Id: 1c78a404-ed2c-4c93-b972-7d0b66b64e54 + m_Id: dc340f7e-a4e1-4d2f-bfef-c60817d3cc8f m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 6148c5adbdbdf9b478853d13f09807b9, type: 3} + - Sprite: {fileID: -5038798112086674293, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: Action m_Type: 0 m_ExpectedControlType: - m_Id: b4f71f74-f4fe-4c72-9fb3-56005f5a8f0a + m_Id: 80cadce9-3070-443d-a692-98eb01eb77cf m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 0cd67a722f4433f4696d54b64cf33eda, type: 3} + - Sprite: {fileID: -5252638434365453946, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: fbbb25ea-fccb-4bb4-a3c2-197091b6acf3 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 08124c45d73404b4baa33fa4cae62b3b, type: 3} + - Sprite: {fileID: -1552031837262678155, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 427aa3ff-78a0-46ff-857a-7f9ac7fafb70 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 2e464bb705446da4d8113c9354e79dd1, type: 3} + - Sprite: {fileID: -7988690052275950316, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: ed7799c3-19c7-4e3a-85b6-7cb3a631ad47 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: a3a5936fde06a6d45b225f5f8101e038, type: 3} + - Sprite: {fileID: 3453119822039690332, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 39941383-4b41-4802-bba1-6ca051f4e8e3 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 32ed7ea8db14f9d4682e326f6fb1ebd1, type: 3} + - Sprite: {fileID: 3282977614451094548, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 82687f5d-1f8c-416f-a728-4048b00008cf m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: fe40bc800bba6d844bb3e480912b9646, type: 3} + - Sprite: {fileID: 3781074794569436817, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: d6d38c7e-c2e8-481e-8715-6ab9c7a76603 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: ea68d41eed1e02a45b541d735e752b89, type: 3} + - Sprite: {fileID: 3326213814002771222, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 21c69a16-0d15-4801-a8d0-28957a926162 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: e0699458d4dda9a47b2138339a0c9e53, type: 3} + - Sprite: {fileID: -940968515722000910, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 739c279a-f1a3-40a4-8a2f-1d030c9aac37 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: e369674b2ee07fb42bb929da57903f59, type: 3} + - Sprite: {fileID: 5015737945891690034, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 5208e27b-ae9e-4d9f-86cc-c99de9ba3deb m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 88aef799a7ecfa54bb9c5c6483e40b6e, type: 3} + - Sprite: {fileID: 7685141576294536802, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: a801a2c4-3bf6-4e4c-a956-b26c62b91702 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 1752145a0bc9a0b42ba08c48a2159935, type: 3} + - Sprite: {fileID: -8147376892732389076, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: d10c6a3e-11d0-4945-b07d-d3d66b8c6c80 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: d1fa721a108c10a49963fbbe7431778d, type: 3} + - Sprite: {fileID: -3613568544968683993, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 02be59ef-1838-4cf7-8197-b921216cc89d m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: c40b93c9ccadb9341bbd4a26c161bce8, type: 3} + - Sprite: {fileID: -3806349678510961793, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 67cb71c6-976b-4561-97af-bb55a35f5bf1 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: fd82ed20eba17834fba91513491325a8, type: 3} + - Sprite: {fileID: 5850358654729675453, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 2cc733c9-8300-4f5c-8b61-5bc8c5b90323 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: a48e478b5ee51994f8df9325ad4e6d9d, type: 3} + - Sprite: {fileID: 1890788588085146081, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: a919ad24-39f8-4e99-8dfd-531c03abc283 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 46c805e2f6c702049abd0fb8a7051fb9, type: 3} + - Sprite: {fileID: 2227186791626358174, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 6ef9666c-33b5-4c13-9455-c3225c3ab9dc m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: edaaa91819fbbe74e96e96619e211d6d, type: 3} + - Sprite: {fileID: 7021733636536899455, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: fb143d06-256c-498d-aa03-2e2b841a93c9 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 6c74b8ff99973eb409db928b7e1f4501, type: 3} + - Sprite: {fileID: 8211963686130083595, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 4ea2f57a-bcd4-4e37-84c0-afa05b125989 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: b52a528b311152042a48b66dcf78fa1a, type: 3} + - Sprite: {fileID: -243008433763540850, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 38f7c18e-0457-40b7-a3ac-279c631565a6 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 8e0b177891715464ca78715f5afe4615, type: 3} + - Sprite: {fileID: 4572067941273041312, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 2608956e-2f62-4483-a3e9-791c558abc04 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 60479686140effd4eba2fcde8873ff82, type: 3} + - Sprite: {fileID: 8733362857220489420, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 44588517-a914-4632-a0a2-8504a3aa24ff m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 636a70c3b3207fe4fb3e3084b2d54a01, type: 3} + - Sprite: {fileID: -8168964972420484108, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 64153bc1-d475-495e-a980-dcf5251800e2 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 5511a5af72ceda247b5bd6321aa4aecd, type: 3} + - Sprite: {fileID: -4600887704869956550, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 9f4ce1fb-e82e-42de-bba6-dc8d564f28eb m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: f56d35b43f323ab47a62f51a792fdc6a, type: 3} + - Sprite: {fileID: 1418866429749748409, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 04d18f3d-854f-463d-b905-45abfa733ad3 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: e141629a77455de4bac3fa8e44b74ef9, type: 3} + - Sprite: {fileID: -2423632614752191271, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: fa7651da-d3f7-4f14-8bfb-62352fd16122 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: e175a788ad6ae87488cc8f87735746a0, type: 3} + - Sprite: {fileID: -6286075311281069389, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 59eb2fe4-7d36-41d4-beb3-977be28af6fb m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 14d8ea194d801824da0146fe97551008, type: 3} + - Sprite: {fileID: 1946199131294821651, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 315a9094-9b48-4f58-a9ce-294331b08f1b m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 65e2cd1ec1d70424ba708e401b8778b2, type: 3} + - Sprite: {fileID: -4849593729383983082, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: a03a0105-1ed8-4c90-81a1-bbc43c2b078e m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 5d4bd54b77ce8ac4eb3bbe89444bb1fa, type: 3} + - Sprite: {fileID: -1540631211355592915, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 4d22f411-89bf-4a84-8217-99c37d36b154 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 2f8cc53fae7e9f846acf855f61a61e5e, type: 3} + - Sprite: {fileID: -1724540154228886581, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 68a642d9-6f7b-40a2-b028-8f5bc67b3314 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: b9cf725fe5785eb4c850b6bed6d8f1b1, type: 3} + - Sprite: {fileID: -1688099482103777226, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: df9b48db-798e-4e2a-9c67-13624d79bc85 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: c0e951aa2d6ffc5419e0c2ba08c71e99, type: 3} + - Sprite: {fileID: 4289638059599559288, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 3ec1fd0c-db92-427d-913c-066ecca4f1fb m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: b5635980476387c4e9a51f41465236ed, type: 3} + - Sprite: {fileID: 3260877994843498159, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 252e52c9-0c2a-48fc-ad36-3bbe6c10626e m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 64fcefa43cc529e4c93fba781fbc64f7, type: 3} + - Sprite: {fileID: -5055150730055686619, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: d36c04cc-048b-4c63-b300-896eaaefa335 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 67bd610ee6777b74f97eebc76442b46d, type: 3} + - Sprite: {fileID: -7423091826055272361, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 11e0d953-651f-421f-9386-b08d340d8389 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 2dff7a4bc4676334fac46a83b1d6908d, type: 3} + - Sprite: {fileID: 1408476583003500622, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 50819050-d111-4a3e-ad1a-24e09714d0de m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 143e16377f5b84e4bb57f75eee6c27cb, type: 3} + - Sprite: {fileID: -3245388128186262310, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: b6fa3760-fc7b-4801-8a61-501a20bb91c1 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: af8808b4c5425a845bf163e050d17298, type: 3} + - Sprite: {fileID: 6300735568127624760, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: da4ee3a0-94e8-4301-91bc-4a2e30ef79bf m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 28f00eac8602fce4a96d40a2ad643fff, type: 3} + - Sprite: {fileID: 1005043649261305459, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 2c4c91e6-cf1a-4819-9736-9fb43d87ab61 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 188df834d068b30418a115bf9b6660c7, type: 3} + - Sprite: {fileID: 4397431003484981164, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 70518eaa-314d-47ba-99d2-c95c801da8f7 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 1fe4f63d22c95f940bb98334c5dfe3a5, type: 3} + - Sprite: {fileID: 7785790158542973949, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 18ad27a7-145a-4426-9292-23bf75d30efb m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: deb8c51aee9529146a1f9c4680cf5a2d, type: 3} + - Sprite: {fileID: -5148155579564201808, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: deaf2c5b-0d32-4ff1-9ef2-8ff80d1be9dc m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 402e22f0bd1b2b445bf0525202b1e4ae, type: 3} + - Sprite: {fileID: -8340172066337684173, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 1d08da93-31e7-402b-a41d-78124b8543b2 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 899f3af688b95e445af18f2843e0b2a9, type: 3} + - Sprite: {fileID: -2707852856757763206, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 8d0ee6a3-2e0d-4b2d-8c11-b9cc35cbc1ec m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: cd32f6df6d0ba4542bcd03e9d708ffb7, type: 3} + - Sprite: {fileID: 1259676508021392508, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: d153b214-6662-461d-9ef3-af63940c2494 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: bdfdb0cf2536f5b46afce16975f33949, type: 3} + - Sprite: {fileID: -803452113265647978, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: b6dcbc58-d60e-4de1-982f-19936e5f3cd6 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 532ce68f0df85514e88e494387b075e2, type: 3} + - Sprite: {fileID: -1725858179750408531, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 9146f315-634c-4c03-9993-f14206fc8908 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 85cf315519ccb2245b78e40938499a76, type: 3} + - Sprite: {fileID: -3562251091148262432, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 9da2d989-abd3-4c30-abde-596a58618a17 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 538c745b8d05eaf4888493082cfa52c3, type: 3} + - Sprite: {fileID: -5883195819689609617, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 4bb22705-0179-4557-8881-c62de7aaf957 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 3945c893258124c42a0e9010a8a0b7f4, type: 3} + - Sprite: {fileID: -2346717024709984653, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: d7d3cac8-4563-40ea-b25a-f9c367fa707a m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 025201e7720928047b04938bf5407b00, type: 3} + - Sprite: {fileID: -8152806456115927920, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: c9dab210-20f3-4178-9de0-f84f85d29512 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 0cfb0924e07535b46a93708d4183000d, type: 3} + - Sprite: {fileID: -7747372578934045808, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 16bdb24c-7a48-41a6-b83f-4866ed871143 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 4f94ff96e80b66a4fb66b371e1985480, type: 3} + - Sprite: {fileID: 237453664686000120, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 4516f16c-7992-414b-8e7c-1b090e3bbaa8 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 96d91a06dbc77ce48ba426b0114ef631, type: 3} + - Sprite: {fileID: -3076640214335346964, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 6eebb892-f375-4864-9d01-c9c978c482a8 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: ddc9246cd3f6ece4da20087b07a3fb85, type: 3} + - Sprite: {fileID: -6165539294478340508, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 447c7f69-8113-49a8-a0e0-1d7ad2884959 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 7040ee99def64ca45a2ffceedcb83334, type: 3} + - Sprite: {fileID: -4728460813401991150, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: bbaf1ef0-0862-498c-bc18-0b902d78b11d m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: bbcea262b8b71244cb46a8db47e007ba, type: 3} + - Sprite: {fileID: -5920751242284279910, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 4c22c64d-b6cb-4ded-a453-0bee5bfd81ef m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 89072fec5a7c0914a98057625c3cf801, type: 3} + - Sprite: {fileID: 7543982715064466426, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 70ffb1ad-9b0e-4a35-881c-a3a5574481c0 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: f0658f9caf6a8244ab73bc2234bb6d63, type: 3} + - Sprite: {fileID: -4357973132383039164, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 14ab65be-9b4a-4ad3-b825-eee3a07e616f m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 9c80498e54315144fae2e9f6fa11d883, type: 3} + - Sprite: {fileID: 1852163616308888124, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: c49d887e-c2b3-446d-b93f-53e5a6629445 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 81e35baece0228146954d172545b45df, type: 3} + - Sprite: {fileID: -5045139669396230095, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 2b08cc2e-ddbb-482d-a133-a5d04d81ad88 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: b8129c07508ae074d9ddcf9f1576f4f8, type: 3} + - Sprite: {fileID: -7641477947424135773, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 3f853299-2b49-4662-a820-91a0517a5f2a m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 41396b1baa3a3f6419338dded1ef9587, type: 3} + - Sprite: {fileID: -7632082443613559514, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 8ec14aa1-781c-499e-8ebd-3f015a035a6c m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 9ed21b5bae718234d9b6af476e345bbf, type: 3} + - Sprite: {fileID: 2620409463438620656, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 44c6ea72-8f9a-40f0-98af-2455a280362b m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: e216964e9f2ea68439ec0b5c55e9c3c4, type: 3} + - Sprite: {fileID: -7133663086045420217, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: cf127633-8f60-4cd9-955c-b895fe18c0bc m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 6a5184b7e713aab49be432db2aeeb6a7, type: 3} + - Sprite: {fileID: 6241698899090949914, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 5f9a30cd-c1dd-4625-bd64-34fb08e83370 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 0e2ac74417352ff4198baa05909f1b2c, type: 3} + - Sprite: {fileID: 3792861582492766326, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: b8f67d0d-d4fe-4ffe-a547-a0210d9f08b3 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: f379ecb55c40d6e418f4297429527407, type: 3} + - Sprite: {fileID: 7606045661036572616, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 2418ba19-1c84-49ec-9a74-387f721b63ea m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: be49ed69cc9f94b47a8745492d9ee893, type: 3} + - Sprite: {fileID: 3062540833232939739, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: df077b40-d96c-4c39-ba09-39d3a967b2c2 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 416c05fb76d47c94aae3611365de6306, type: 3} + - Sprite: {fileID: 7533862936971068212, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 464ad705-e42b-4044-9908-c5c310cd74f6 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 07b5adecc14a45745bfe48acaa68e4cb, type: 3} + - Sprite: {fileID: -6585211946306954148, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 0c6b4851-2afe-4f2b-adfe-b2f376d8ff0e m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 533d2b5e4e39f744ca36cb1a6f11d279, type: 3} + - Sprite: {fileID: -2398765882654651850, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: f03f7155-ba13-4bb8-aef9-319216f96b6a m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 5772f8c8b0e4b504b8065a8312552f4e, type: 3} + - Sprite: {fileID: 2365828378302915982, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 739c0d93-6789-4ace-b042-bb68a741987e m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: edb2f13f384ff5549890572f4f834b1a, type: 3} + - Sprite: {fileID: 7435475401950483793, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 9abb5ca3-0dd1-4e25-bcf9-04f806a469f2 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 225c0c5d666a85f4f9788148d0c5aa93, type: 3} + - Sprite: {fileID: 4913324366637885556, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 854c6d8c-533a-44f9-8b7d-7ccf61cbb7c3 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 7d96ae13f5208ff498bdc46670a15445, type: 3} + - Sprite: {fileID: -3092534607235510836, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 894425ba-00d5-4f86-933e-e1bbabda825a m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: c404be2658027ec449da826ba55262fb, type: 3} + - Sprite: {fileID: 1465985920519867197, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 9f2af38c-0d40-4b0a-93cf-cbaacfa42deb m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 6df41eef464793c4787b297b43c34882, type: 3} + - Sprite: {fileID: 6613286634353403105, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 182ddabe-ad1d-4d0c-a72f-e2d944dca8dd m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 10c53cc99e7c9a74caee7afee9073050, type: 3} + - Sprite: {fileID: 2244820473674714362, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: fd3963dc-3f68-45b7-986c-e11c93959977 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 56ad0d209966a8b40a0e8e9e744d5fd0, type: 3} + - Sprite: {fileID: 2197138694343749788, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: de5ab63b-122b-4b4e-8dd2-78884bfeeeac m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 10cbe978622a5f64ba8c313653472d56, type: 3} + - Sprite: {fileID: 9155610896962561264, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 0a2220a9-b6d8-45f3-961e-75512b562d2e m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: 23e6e3782419f6147905ea08f21e16cd, type: 3} + - Sprite: {fileID: -3727358053071319600, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 1b04794f-bc56-4f54-a940-63325bf0d309 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: b39287b7f94274044a98fba8e68bef64, type: 3} + - Sprite: {fileID: -8483149878708795065, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 65912182-3fe8-4501-b3c4-7858635105dc m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: d73f488e774a3d84a87f593f8c887446, type: 3} + - Sprite: {fileID: -8259510014756246925, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 997b55c9-c000-44e0-b837-9abd04e56c39 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: d0e8f3b0a3327da438d6a466ca7f61fd, type: 3} + - Sprite: {fileID: -6033704061743319718, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 6b28edfc-d711-4311-a8e0-332cecafd386 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: b3e74cf01fc54914e85cb512772b64f6, type: 3} + - Sprite: {fileID: -7068532346209044110, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 23ed9fe7-a598-438b-84bb-2c5792960def m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - - Sprite: {fileID: 21300000, guid: c71671b11b882b147b6fda9225953ff6, type: 3} + - Sprite: {fileID: 8302936139875022427, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3} action: m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 03e5603b-2d6d-418e-8514-21fdeb31c6d0 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - deviceName: Xbox tmpAsset: {fileID: 11400000, guid: a9884dbd0c554f84e98b897e8d102224, type: 2} + spriteAtlas: {fileID: 0} + spriteSheetTexture: {fileID: 0} entries: - Sprite: {fileID: 8421626264597569168, guid: f0714a2ef632db7458e3bb7459d85e0f, type: 3} action: @@ -1013,7 +1001,15 @@ MonoBehaviour: m_Id: 8a1f78d0-42a5-4e47-9b23-f7b66c001a2f m_Processors: m_Interactions: - m_SingletonActionBindings: [] + m_SingletonActionBindings: + - m_Name: + m_Id: 871d874c-a52c-427a-8087-ff7ef17888c3 + m_Path: /buttonSouth + m_Interactions: + m_Processors: + m_Groups: + m_Action: Action + m_Flags: 0 m_Flags: 0 - Sprite: {fileID: 21300000, guid: c810d82273f7a554494314d52b369127, type: 3} action: @@ -1023,7 +1019,15 @@ MonoBehaviour: m_Id: 33f74ac9-582c-4657-b830-1d931dfcb431 m_Processors: m_Interactions: - m_SingletonActionBindings: [] + m_SingletonActionBindings: + - m_Name: + m_Id: 2570e500-16b3-4827-b5cf-ed8a6e447c1b + m_Path: + m_Interactions: + m_Processors: + m_Groups: + m_Action: Action + m_Flags: 0 m_Flags: 0 - Sprite: {fileID: 21300000, guid: 29b418cb321b0fb4889b24bc1ab45a4c, type: 3} action: @@ -1061,7 +1065,15 @@ MonoBehaviour: m_Id: 890b1c70-0e58-45c6-a48b-0e79075714c2 m_Processors: m_Interactions: - m_SingletonActionBindings: [] + m_SingletonActionBindings: + - m_Name: + m_Id: 19c705ea-6495-4e0c-b995-f56ac8d79484 + m_Path: /leftShoulder + m_Interactions: + m_Processors: + m_Groups: + m_Action: Action + m_Flags: 0 m_Flags: 0 - Sprite: {fileID: 21300000, guid: 548433e51309304498e241e382d58d04, type: 3} action: @@ -1435,5 +1447,7 @@ MonoBehaviour: m_Flags: 0 - deviceName: PlayStation tmpAsset: {fileID: 0} + spriteAtlas: {fileID: 0} + spriteSheetTexture: {fileID: 0} entries: [] placeholderSprite: {fileID: 21300000, guid: 068091d572066f043aa79b9beace61ea, type: 2} diff --git a/Client/Assets/InputGlyph/InputGlyphDatabase.asset.meta b/Client/Assets/Resources/InputGlyphDatabase.asset.meta similarity index 100% rename from Client/Assets/InputGlyph/InputGlyphDatabase.asset.meta rename to Client/Assets/Resources/InputGlyphDatabase.asset.meta diff --git a/Client/Assets/Test/GameBase.dll.bytes b/Client/Assets/Test/GameBase.dll.bytes index 71524f2..0b5014a 100644 Binary files a/Client/Assets/Test/GameBase.dll.bytes and b/Client/Assets/Test/GameBase.dll.bytes differ diff --git a/Client/Assets/Test/GameBase.pdb.bytes b/Client/Assets/Test/GameBase.pdb.bytes index 11d3df3..a5cc329 100644 Binary files a/Client/Assets/Test/GameBase.pdb.bytes and b/Client/Assets/Test/GameBase.pdb.bytes differ diff --git a/Client/Assets/Test/GameLib.dll.bytes b/Client/Assets/Test/GameLib.dll.bytes index 3685417..cfaf577 100644 Binary files a/Client/Assets/Test/GameLib.dll.bytes and b/Client/Assets/Test/GameLib.dll.bytes differ diff --git a/Client/Assets/Test/GameLib.pdb.bytes b/Client/Assets/Test/GameLib.pdb.bytes index 6c7ad79..ba1b0e7 100644 Binary files a/Client/Assets/Test/GameLib.pdb.bytes and b/Client/Assets/Test/GameLib.pdb.bytes differ diff --git a/Client/Assets/Test/GameLogic.dll.bytes b/Client/Assets/Test/GameLogic.dll.bytes index 6c09675..f076d48 100644 Binary files a/Client/Assets/Test/GameLogic.dll.bytes and b/Client/Assets/Test/GameLogic.dll.bytes differ diff --git a/Client/Assets/Test/GameLogic.pdb.bytes b/Client/Assets/Test/GameLogic.pdb.bytes index 7789a13..37ebc11 100644 Binary files a/Client/Assets/Test/GameLogic.pdb.bytes and b/Client/Assets/Test/GameLogic.pdb.bytes differ diff --git a/Client/Assets/Test/GameProto.dll.bytes b/Client/Assets/Test/GameProto.dll.bytes index 174dfe1..ed34360 100644 Binary files a/Client/Assets/Test/GameProto.dll.bytes and b/Client/Assets/Test/GameProto.dll.bytes differ diff --git a/Client/Assets/Test/GameProto.pdb.bytes b/Client/Assets/Test/GameProto.pdb.bytes index 3b58092..7233774 100644 Binary files a/Client/Assets/Test/GameProto.pdb.bytes and b/Client/Assets/Test/GameProto.pdb.bytes differ diff --git a/Client/Assets/TestAudioPlay.cs b/Client/Assets/TestAudioPlay.cs index 7001aa9..bbdc441 100644 --- a/Client/Assets/TestAudioPlay.cs +++ b/Client/Assets/TestAudioPlay.cs @@ -11,6 +11,14 @@ public class TestAudioPlay : MonoBehaviour { public AudioSource audioSource; [SerializeField] private UXHotkeyButton[] hotButtons; + + public UXButton btn; + + public void TestFocus() + { + btn.Focus(); + } + public class UXAuditoHelper : IUXAudioHelper { private AudioSource _audioSource; diff --git a/Client/Assets/input_bindings.json b/Client/Assets/input_bindings.json index 01f53b0..30b1438 100644 --- a/Client/Assets/input_bindings.json +++ b/Client/Assets/input_bindings.json @@ -1 +1 @@ -{"bindings":[{"action":"input.map.player/input.action.movement","id":"15d59094-85d1-408d-b565-724532c15263","path":"/2","interactions":"null","processors":"null"}]} \ No newline at end of file +{"bindings":[{"action":"input.map.player/input.action.movement","id":"15d59094-85d1-408d-b565-724532c15263","path":"/upArrow","interactions":"null","processors":"null"}]} \ No newline at end of file diff --git a/Client/Packages/packages-lock.json b/Client/Packages/packages-lock.json index 61ecd59..105c679 100644 --- a/Client/Packages/packages-lock.json +++ b/Client/Packages/packages-lock.json @@ -62,12 +62,6 @@ "com.unity.modules.unitywebrequestassetbundle": "1.0.0" } }, - "com.alicizax.unity.ui.extension": { - "version": "file:com.alicizax.unity.ui.extension", - "depth": 0, - "source": "embedded", - "dependencies": {} - }, "com.alicizax.uxtool": { "version": "file:com.alicizax.uxtool", "depth": 0, diff --git a/Client/UserSettings/EditorUserSettings.asset b/Client/UserSettings/EditorUserSettings.asset index a42cbfa..ec3ac42 100644 --- a/Client/UserSettings/EditorUserSettings.asset +++ b/Client/UserSettings/EditorUserSettings.asset @@ -30,10 +30,10 @@ EditorUserSettings: value: 54010c54510c5a5f5a0a0973477b0a4414151a2b757925367a7e4a6ab1b66260 flags: 0 RecentlyUsedSceneGuid-7: - value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668 + value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d flags: 0 RecentlyUsedSceneGuid-8: - value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d + value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668 flags: 0 RecentlyUsedSceneGuid-9: value: 015450045700505d0f0a5f2313260a444e164b2e757b76652c2d4d32bab0313a diff --git a/Client/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/Client/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index e567a42..71cb2d7 100644 --- a/Client/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/Client/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -49,9 +49,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 466 - width: 788 - height: 533 + y: 161 + width: 707 + height: 838 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -95,7 +95,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -104,23 +104,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 788 - height: 512 - m_Scale: {x: 0.41041666, y: 0.41041666} - m_Translation: {x: 394, y: 256} + width: 707 + height: 817 + m_Scale: {x: 0.36822918, y: 0.36822915} + m_Translation: {x: 353.49997, y: 408.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -960 - y: -623.75635 - width: 1920 - height: 1247.5127 + x: -959.9999 + y: -1109.3635 + width: 1919.9999 + height: 2218.727 m_MinimalGUI: 1 - m_defaultScale: 0.41041666 - m_LastWindowPixelSize: {x: 788, y: 533} + m_defaultScale: 0.36822918 + m_LastWindowPixelSize: {x: 707, y: 838} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -145,7 +145,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 789 + width: 708 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} @@ -162,23 +162,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimatorControllerTool + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 789 - height: 393 - m_MinSize: {x: 101, y: 121} + width: 708 + height: 88 + m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 5} + m_ActualView: {fileID: 6} m_Panes: - {fileID: 5} - {fileID: 6} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -200,9 +200,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 788 - height: 372 + y: 79 + width: 365 + height: 915 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -271,8 +271,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 520 - height: 342 + width: 707 + height: 67 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -287,7 +287,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -179, y: -26} + snapOffset: {x: -174, y: -26} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings @@ -313,9 +313,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 25} + snapOffset: {x: 0, y: -42} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 2 id: unity-scene-view-toolbar index: 0 layout: 1 @@ -339,7 +339,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 135} + snapOffset: {x: 0, y: 41} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar @@ -365,7 +365,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 24, y: 64} + snapOffset: {x: 24, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Orientation @@ -616,7 +616,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay - index: 10 + index: 9 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -813,9 +813,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1204.4852, y: 251.26892, z: -1.0785128} + m_Target: {x: 1061.5972, y: 683.41235, z: 6.893609} speed: 2 - m_Value: {x: 1204.4852, y: 251.26892, z: -1.0785128} + m_Value: {x: 1061.5972, y: 683.41235, z: 6.893609} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -865,9 +865,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 210.92734 + m_Target: 412.0922 speed: 2 - m_Value: 210.92734 + m_Value: 412.0922 m_Ortho: m_Target: 1 speed: 2 @@ -908,9 +908,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 393 - width: 789 - height: 554 + y: 88 + width: 708 + height: 859 m_MinSize: {x: 51, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} @@ -935,14 +935,14 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 789 + x: 708 y: 0 - width: 217 + width: 493 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 49 + controlID: 1814 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -961,8 +961,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 217 - height: 583 + width: 493 + height: 461 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 10} @@ -990,10 +990,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 789 + x: 708 y: 73 - width: 215 - height: 562 + width: 491 + height: 440 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1007,9 +1007,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 8cfaffff - m_LastClickedID: -1396 - m_ExpandedIDs: c8fafffffa6d0000166f0000 + m_SelectedIDs: ac6e0000 + m_LastClickedID: 28332 + m_ExpandedIDs: 18fbffff28fbffffb46d0000ac6e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1049,9 +1049,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 583 - width: 217 - height: 364 + y: 461 + width: 493 + height: 486 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 12} @@ -1079,10 +1079,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 789 - y: 656 - width: 215 - height: 343 + x: 708 + y: 534 + width: 491 + height: 465 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1108,9 +1108,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1006 + x: 1201 y: 0 - width: 341 + width: 100 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -1139,9 +1139,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1007 + x: 1202 y: 19 - width: 339 + width: 98 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1162,9 +1162,9 @@ MonoBehaviour: m_SceneHandles: m_ShowAllHits: 0 m_SkipHidden: 0 - m_SearchArea: 0 + m_SearchArea: 1 m_Folders: - - Assets/InputGlyph + - Assets/Resources m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1180,7 +1180,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: e48c0000 m_LastClickedID: 36068 - m_ExpandedIDs: 00000000e26f000092720000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000d6740000d8740000da740000dc740000de740000e0740000e2740000e4740000e6740000e8740000ea740000ec740000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000020750000227500002475000026750000287500002a7500002c7500002e75000030750000327500003475000036750000387500003a7500003c7500003e75000040750000427500004475000046750000487500004a7500004c7500004e75000050750000527500005475000056750000587500005a7500005c7500005e75000060750000627500006475000066750000687500006a7500006c7500006e75000070750000727500007475000076750000787500007a7500007c7500007e75000080750000827500008475000086750000887500008a7500008c7500008e75000090750000927500009475000096750000987500009a7500009c7500009e750000a0750000a2750000a4750000a6750000a8750000aa750000ac750000ae750000b0750000b2750000b4750000b6750000b8750000ba750000bc750000be750000c0750000c2750000c4750000c6750000c8750000ca750000cc750000ce750000d0750000d2750000d4750000d6750000d8750000da750000dc750000de750000e0750000e2750000e4750000e6750000e8750000ea750000ec750000ee750000f0750000f2750000f4750000f6750000f8750000fa750000fc750000fe75000000760000027600000476000006760000087600000a7600000c7600000e7600001076000012760000 + m_ExpandedIDs: ffffffff00000000da720000dc720000de720000e0720000e2720000e4720000e6720000e8720000ea720000ec720000ee720000f0720000f2720000f4720000f6720000f8720000fa720000fc720000fe72000000730000027300000473000006730000087300000a7300000c7300000e73000010730000127300001473000016730000187300001a7300001c7300001e73000020730000227300002473000026730000287300002a7300002c7300002e73000030730000327300003473000036730000387300003a7300003c7300003e73000040730000427300004473000046730000487300004a7300004c7300004e73000050730000527300005473000056730000587300005a7300005c7300005e73000060730000627300006473000066730000687300006a7300006c7300006e73000070730000727300007473000076730000787300007a7300007c7300007e73000080730000827300008473000086730000887300008a7300008c7300008e73000090730000927300009473000096730000987300009a7300009c7300009e730000a0730000a2730000a4730000a6730000a8730000aa730000ac730000ae730000b0730000b2730000b4730000b6730000b8730000ba730000bc730000be730000c0730000c2730000c4730000c6730000c8730000ca730000cc730000ce730000d0730000d2730000d4730000d6730000d8730000da730000dc730000de730000e0730000e2730000e4730000e6730000e8730000ea730000ec730000ee730000f0730000f2730000f4730000f6730000f8730000fa730000fc730000fe73000000740000027400000474000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e74000020740000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e74000040740000427400004474000046740000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1206,23 +1206,23 @@ MonoBehaviour: m_ResourceFile: m_AssetTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 8cfaffff + m_SelectedIDs: ac6e0000 m_LastClickedID: 0 - m_ExpandedIDs: ffffffff0000000092720000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000d6740000d8740000da740000dc740000de740000e0740000e2740000e4740000e6740000e8740000ea740000ec740000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000020750000227500002475000026750000287500002a7500002c7500002e75000030750000327500003475000036750000387500003a7500003c7500003e75000040750000427500004475000046750000487500004a7500004c7500004e75000050750000527500005475000056750000587500005a7500005c7500005e75000060750000627500006475000066750000687500006a7500006c7500006e75000070750000727500007475000076750000787500007a7500007c7500007e75000080750000827500008475000086750000887500008a7500008c7500008e75000090750000927500009475000096750000987500009a7500009c7500009e750000a0750000a2750000a4750000a6750000a8750000aa750000ac750000ae750000b0750000b2750000b4750000b6750000b8750000ba750000bc750000be750000c0750000c2750000c4750000c6750000c8750000ca750000cc750000ce750000d0750000d2750000d4750000d6750000d8750000da750000dc750000de750000e0750000e2750000e4750000e6750000e8750000ea750000ec750000ee750000f0750000f2750000f4750000f6750000f8750000fc750000027600000476000006760000087600000a7600000c7600000e7600001076000012760000 + m_ExpandedIDs: ffffffff00000000da720000dc720000de720000e0720000e2720000e4720000e6720000e8720000ea720000ec720000ee720000f0720000f2720000f4720000f6720000f8720000fa720000fc720000fe72000000730000027300000473000006730000087300000a7300000c7300000e73000010730000127300001473000016730000187300001a7300001c7300001e73000020730000227300002473000026730000287300002a7300002c7300002e73000030730000327300003473000036730000387300003a7300003c7300003e73000040730000427300004473000046730000487300004a7300004c7300004e73000050730000527300005473000056730000587300005a7300005c7300005e73000060730000627300006473000066730000687300006a7300006c7300006e73000070730000727300007473000076730000787300007a7300007c7300007e73000080730000827300008473000086730000887300008a7300008c7300008e73000090730000927300009473000096730000987300009a7300009c7300009e730000a0730000a2730000a4730000a6730000a8730000aa730000ac730000ae730000b0730000b2730000b4730000b6730000b8730000ba730000bc730000be730000c0730000c2730000c4730000c6730000c8730000ca730000cc730000ce730000d0730000d2730000d4730000d6730000d8730000da730000dc730000de730000e0730000e2730000e4730000e6730000e8730000ea730000ec730000ee730000f0730000f2730000f4730000f6730000f8730000fa730000fc730000fe73000000740000027400000474000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e74000020740000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e74000040740000427400004474000046740000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: keyboard - m_OriginalName: keyboard + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 27866 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 13} m_SearchString: @@ -1233,8 +1233,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 8cfaffff - m_LastClickedInstanceID: -1396 + m_SelectedInstanceIDs: ac6e0000 + m_LastClickedInstanceID: 28332 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: 0c750000f2d60000 m_RenameOverlay: @@ -1279,12 +1279,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1347 + x: 1301 y: 0 - width: 573 + width: 619 height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -1310,9 +1310,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1348 + x: 1302 y: 19 - width: 572 + width: 618 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1327,7 +1327,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 151 + m_CachedPref: 219 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 diff --git a/Client/UserSettings/Layouts/default-2022.dwlt b/Client/UserSettings/Layouts/default-2022.dwlt index fc4d58e..48098f4 100644 --- a/Client/UserSettings/Layouts/default-2022.dwlt +++ b/Client/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Console m_RootView: {fileID: 4} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -41,10 +41,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 491 - width: 612 + width: 459 height: 456 - m_MinSize: {x: 50, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 51, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -69,12 +69,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 612 + width: 459 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 17 + controlID: 25 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -173,7 +173,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 144 + controlID: 151 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,10 +192,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 612 + width: 459 height: 491 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 15} @@ -219,14 +219,14 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 612 + x: 459 y: 0 - width: 333 + width: 399 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 49 + controlID: 67 draggingID: 0 --- !u!114 &10 MonoBehaviour: @@ -245,7 +245,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 333 + width: 399 height: 461 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -271,7 +271,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 461 - width: 333 + width: 399 height: 486 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} @@ -295,9 +295,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 945 + x: 858 y: 0 - width: 332 + width: 218 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -321,9 +321,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1277 + x: 1076 y: 0 - width: 643 + width: 844 height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -354,7 +354,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 564 - width: 611 + width: 458 height: 435 m_SerializedDataModeController: m_DataMode: 0 @@ -408,10 +408,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 611 + width: 458 height: 414 - m_Scale: {x: 0.31822917, y: 0.31822917} - m_Translation: {x: 305.5, y: 207} + m_Scale: {x: 0.23854166, y: 0.23854166} + m_Translation: {x: 229, y: 207} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -419,12 +419,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -960 - y: -650.4746 + y: -867.77295 width: 1920 - height: 1300.9492 + height: 1735.5459 m_MinimalGUI: 1 - m_defaultScale: 0.31822917 - m_LastWindowPixelSize: {x: 611, y: 435} + m_defaultScale: 0.23854166 + m_LastWindowPixelSize: {x: 458, y: 435} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -522,7 +522,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 611 + width: 458 height: 470 m_SerializedDataModeController: m_DataMode: 0 @@ -539,7 +539,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: -174, y: -26} - snapOffsetDelta: {x: -5, y: 0} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings index: 0 @@ -1064,9 +1064,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1194.6714, y: 398.0959, z: -5.0133038} + m_Target: {x: 810.88666, y: 458.4978, z: -2.0873559} speed: 2 - m_Value: {x: 1194.6714, y: 398.0959, z: -5.0133038} + m_Value: {x: 810.88666, y: 458.4978, z: -2.0873559} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1116,9 +1116,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 694.8482 + m_Target: 480.68115 speed: 2 - m_Value: 694.8482 + m_Value: 480.68115 m_Ortho: m_Target: 1 speed: 2 @@ -1163,9 +1163,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 612 + x: 459 y: 73 - width: 331 + width: 397 height: 440 m_SerializedDataModeController: m_DataMode: 0 @@ -1182,7 +1182,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c8faffff286e0000 + m_ExpandedIDs: ccf7fffffef8ffff06f9ffff08f9ffffb8ffffff8a71000046720000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1198,7 +1198,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 10} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1226,9 +1226,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 612 + x: 459 y: 534 - width: 331 + width: 397 height: 465 m_SerializedDataModeController: m_DataMode: 0 @@ -1260,9 +1260,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 945 + x: 858 y: 73 - width: 330 + width: 216 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1301,7 +1301,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: e48c0000 m_LastClickedID: 36068 - m_ExpandedIDs: 0000000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e74000020740000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e74000040740000427400004474000046740000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000d6740000d8740000da740000dc740000de740000e0740000e2740000e4740000e6740000e8740000ea740000ec740000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000020750000227500002475000026750000287500002a7500002c7500002e75000030750000327500003475000036750000387500003a7500003c7500003e75000040750000427500004475000046750000487500004a7500004c7500004e75000050750000527500005475000056750000587500005a7500005c7500005e75000060750000627500006475000066750000687500006a7500006c7500006e75000070750000727500007475000076750000787500007a7500007c7500007e75000080750000827500008475000086750000887500008a7500008c7500008e75000090750000927500009475000096750000987500009a7500009c7500009e750000a0750000a2750000a4750000a6750000a8750000aa750000ac750000ae750000b0750000b2750000b4750000b6750000b8750000ba750000bc750000be750000c0750000c2750000c4750000 + m_ExpandedIDs: 00000000ae6d0000b06d0000b26d0000b46d0000b66d0000b86d0000ba6d0000bc6d0000be6d0000c06d0000c26d0000c46d0000c66d0000c86d0000ca6d0000cc6d0000ce6d0000d06d0000d26d0000d46d0000d66d0000d86d0000da6d0000dc6d0000de6d0000e06d0000e26d0000e46d0000e66d0000e86d0000ea6d0000ec6d0000ee6d0000f06d0000f26d0000f46d0000f66d0000f86d0000fa6d0000fc6d0000fe6d0000006e0000026e0000046e0000066e0000086e00000a6e00000c6e00000e6e0000106e0000126e0000146e0000166e0000186e00001a6e00001c6e00001e6e0000206e0000226e0000246e0000266e0000286e00002a6e00002c6e00002e6e0000306e0000326e0000346e0000366e0000386e00003a6e00003c6e00003e6e0000406e0000426e0000446e0000466e0000486e00004a6e00004c6e00004e6e0000506e0000526e0000546e0000566e0000586e00005a6e00005c6e00005e6e0000606e0000626e0000646e0000666e0000686e00006a6e00006c6e00006e6e0000706e0000726e0000746e0000766e0000786e00007a6e00007c6e00007e6e0000806e0000826e0000846e0000866e0000886e00008a6e00008c6e00008e6e0000906e0000926e0000946e0000966e0000986e00009a6e00009c6e00009e6e0000a06e0000a26e0000a46e0000a66e0000a86e0000aa6e0000ac6e0000ae6e0000b06e0000b26e0000b46e0000b66e0000b86e0000ba6e0000bc6e0000be6e0000c06e0000c26e0000c46e0000c66e0000c86e0000ca6e0000cc6e0000ce6e0000d06e0000d26e0000d46e0000d66e0000d86e0000da6e0000dc6e0000de6e0000e06e0000e26e0000e46e0000e66e0000e86e0000ea6e0000ec6e0000ee6e0000f06e0000f26e0000f46e0000f66e0000f86e0000fa6e0000fc6e0000fe6e0000006f0000026f0000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000186f00001a6f00001c6f00001e6f0000206f0000226f0000246f0000266f0000286f00002a6f00002c6f00002e6f0000306f0000326f0000346f0000366f0000386f00003a6f00003c6f00003e6f0000406f0000426f0000446f0000466f0000486f00004a6f00004c6f00004e6f0000506f0000526f0000546f0000566f0000586f00005a6f00005c6f00005e6f0000606f0000626f0000646f0000666f0000686f00006a6f00006c6f00006e6f0000706f0000726f0000746f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1329,21 +1329,21 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff0000000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e74000020740000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e74000040740000427400004474000046740000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000d6740000d8740000da740000dc740000de740000e0740000e2740000e4740000e6740000e8740000ea740000ec740000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000020750000227500002475000026750000287500002a7500002c7500002e75000030750000327500003475000036750000387500003a7500003c7500003e75000040750000427500004475000046750000487500004a7500004c7500004e75000050750000527500005475000056750000587500005a7500005c7500005e75000060750000627500006475000066750000687500006a7500006c7500006e75000070750000727500007475000076750000787500007a7500007c7500007e75000080750000827500008475000086750000887500008a7500008c7500008e75000090750000927500009475000096750000987500009a7500009c7500009e750000a0750000a2750000a4750000a6750000a8750000aa750000ac750000ae750000b0750000b2750000b4750000b6750000b8750000ba750000bc750000be750000c0750000c2750000c4750000 + m_ExpandedIDs: ffffffff00000000ae6d0000b06d0000b26d0000b46d0000b66d0000b86d0000ba6d0000bc6d0000be6d0000c06d0000c26d0000c46d0000c66d0000c86d0000ca6d0000cc6d0000ce6d0000d06d0000d26d0000d46d0000d66d0000d86d0000da6d0000dc6d0000de6d0000e06d0000e26d0000e46d0000e66d0000e86d0000ea6d0000ec6d0000ee6d0000f06d0000f26d0000f46d0000f66d0000f86d0000fa6d0000fc6d0000fe6d0000006e0000026e0000046e0000066e0000086e00000a6e00000c6e00000e6e0000106e0000126e0000146e0000166e0000186e00001a6e00001c6e00001e6e0000206e0000226e0000246e0000266e0000286e00002a6e00002c6e00002e6e0000306e0000326e0000346e0000366e0000386e00003a6e00003c6e00003e6e0000406e0000426e0000446e0000466e0000486e00004a6e00004c6e00004e6e0000506e0000526e0000546e0000566e0000586e00005a6e00005c6e00005e6e0000606e0000626e0000646e0000666e0000686e00006a6e00006c6e00006e6e0000706e0000726e0000746e0000766e0000786e00007a6e00007c6e00007e6e0000806e0000826e0000846e0000866e0000886e00008a6e00008c6e00008e6e0000906e0000926e0000946e0000966e0000986e00009a6e00009c6e00009e6e0000a06e0000a26e0000a46e0000a66e0000a86e0000aa6e0000ac6e0000ae6e0000b06e0000b26e0000b46e0000b66e0000b86e0000ba6e0000bc6e0000be6e0000c06e0000c26e0000c46e0000c66e0000c86e0000ca6e0000cc6e0000ce6e0000d06e0000d26e0000d46e0000d66e0000d86e0000da6e0000dc6e0000de6e0000e06e0000e26e0000e46e0000e66e0000e86e0000ea6e0000ec6e0000ee6e0000f06e0000f26e0000f46e0000f66e0000f86e0000fa6e0000fc6e0000fe6e0000006f0000026f0000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000186f00001a6f00001c6f00001e6f0000206f0000226f0000246f0000266f0000286f00002a6f00002c6f00002e6f0000306f0000326f0000346f0000366f0000386f00003a6f00003c6f00003e6f0000406f0000426f0000446f0000466f0000486f00004a6f00004c6f00004e6f0000506f0000526f0000546f0000566f0000586f00005a6f00005c6f00005e6f0000606f0000626f0000646f0000666f0000686f00006a6f00006c6f00006e6f0000706f0000726f0000746f0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: InputBindingManager - m_OriginalName: InputBindingManager + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 10908 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 12} m_SearchString: @@ -1405,9 +1405,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1277 + x: 1076 y: 73 - width: 642 + width: 843 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1422,11 +1422,11 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 318 + m_CachedPref: 167 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 459 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: