diff --git a/Client/Assets/Bundles/Configs/LocalizationTable.asset b/Client/Assets/Bundles/Configs/LocalizationTable.asset
index ca18b6b..cfe4462 100644
--- a/Client/Assets/Bundles/Configs/LocalizationTable.asset
+++ b/Client/Assets/Bundles/Configs/LocalizationTable.asset
@@ -17,7 +17,7 @@ MonoBehaviour:
- EntryId: 74156087
SectionId: 80328242
Key: Input.actiondsad.movedsa
- Value:
+ Value: move ru
- EntryId: 94373125
SectionId: 80328242
Key: Input.action.usedas
@@ -51,7 +51,7 @@ MonoBehaviour:
- EntryId: 74156087
SectionId: 80328242
Key: Input.actiondsad.movedsa
- Value:
+ Value: Move
- EntryId: 94373125
SectionId: 80328242
Key: Input.action.usedas
@@ -85,11 +85,11 @@ MonoBehaviour:
- EntryId: 74156087
SectionId: 80328242
Key: Input.actiondsad.movedsa
- Value:
+ Value: move jp
- EntryId: 94373125
SectionId: 80328242
Key: Input.action.usedas
- Value:
+ Value: USE FUCK U JP
- EntryId: 41381430
SectionId: 80328242
Key: Input.action.jumpdsad
diff --git a/Client/Assets/Default.wlt b/Client/Assets/Default.wlt
deleted file mode 100644
index 1e3541b..0000000
--- a/Client/Assets/Default.wlt
+++ /dev/null
@@ -1,1433 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &1
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_PixelRect:
- serializedVersion: 2
- x: 1920
- y: 48
- width: 1920
- height: 997
- m_ShowMode: 4
- m_Title: Console
- m_RootView: {fileID: 4}
- m_MinSize: {x: 875, y: 300}
- m_MaxSize: {x: 10000, y: 10000}
- m_Maximized: 1
---- !u!114 &2
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: GameView
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 321
- width: 787
- height: 626
- m_MinSize: {x: 51, y: 71}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 14}
- m_Panes:
- - {fileID: 14}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &3
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 8}
- - {fileID: 2}
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 787
- height: 947
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 8096, y: 16192}
- vertical: 1
- controlID: 295
- draggingID: 0
---- !u!114 &4
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 5}
- - {fileID: 7}
- - {fileID: 6}
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 1920
- height: 997
- m_MinSize: {x: 875, y: 300}
- m_MaxSize: {x: 10000, y: 10000}
- m_UseTopView: 1
- m_TopViewHeight: 30
- m_UseBottomView: 1
- m_BottomViewHeight: 20
---- !u!114 &5
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 1920
- height: 30
- m_MinSize: {x: 0, y: 0}
- m_MaxSize: {x: 0, y: 0}
- m_LastLoadedLayoutName:
---- !u!114 &6
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 977
- width: 1920
- height: 20
- m_MinSize: {x: 0, y: 0}
- m_MaxSize: {x: 0, y: 0}
---- !u!114 &7
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 3}
- - {fileID: 9}
- - {fileID: 12}
- - {fileID: 13}
- m_Position:
- serializedVersion: 2
- x: 0
- y: 30
- width: 1920
- height: 947
- m_MinSize: {x: 400, y: 100}
- m_MaxSize: {x: 32384, y: 16192}
- vertical: 0
- controlID: 345
- draggingID: 0
---- !u!114 &8
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: SceneView
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 787
- height: 321
- m_MinSize: {x: 201, y: 221}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 16}
- m_Panes:
- - {fileID: 15}
- - {fileID: 16}
- m_Selected: 1
- m_LastSelected: 0
---- !u!114 &9
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 10}
- - {fileID: 11}
- m_Position:
- serializedVersion: 2
- x: 787
- y: 0
- width: 342
- height: 947
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 8096, y: 16192}
- vertical: 1
- controlID: 346
- draggingID: 0
---- !u!114 &10
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: SceneHierarchyWindow
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 342
- height: 354
- m_MinSize: {x: 202, y: 221}
- m_MaxSize: {x: 4002, y: 4021}
- m_ActualView: {fileID: 17}
- m_Panes:
- - {fileID: 17}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &11
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: ConsoleWindow
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 354
- width: 342
- height: 593
- m_MinSize: {x: 102, y: 121}
- m_MaxSize: {x: 4002, y: 4021}
- m_ActualView: {fileID: 18}
- m_Panes:
- - {fileID: 18}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &12
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: ProjectBrowser
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 1129
- y: 0
- width: 180
- height: 947
- m_MinSize: {x: 232, y: 271}
- m_MaxSize: {x: 10002, y: 10021}
- m_ActualView: {fileID: 19}
- m_Panes:
- - {fileID: 19}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &13
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: InspectorWindow
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 1309
- y: 0
- width: 611
- height: 947
- m_MinSize: {x: 276, y: 71}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 20}
- m_Panes:
- - {fileID: 20}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &14
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 50, y: 50}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Game
- m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 1920
- y: 399
- width: 786
- height: 605
- m_SerializedDataModeController:
- m_DataMode: 0
- m_PreferredDataMode: 0
- m_SupportedDataModes:
- isAutomatic: 1
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_OverlaysVisible: 1
- m_SerializedViewNames: []
- m_SerializedViewValues: []
- m_PlayModeViewName: GameView
- m_ShowGizmos: 0
- m_TargetDisplay: 0
- m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
- m_TargetSize: {x: 1920, y: 1080}
- m_TextureFilterMode: 0
- m_TextureHideFlags: 61
- m_RenderIMGUI: 1
- m_EnterPlayModeBehavior: 0
- m_UseMipMap: 0
- m_VSyncEnabled: 0
- m_Gizmos: 0
- m_Stats: 0
- m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000
- m_ZoomArea:
- m_HRangeLocked: 0
- m_VRangeLocked: 0
- hZoomLockedByDefault: 0
- vZoomLockedByDefault: 0
- m_HBaseRangeMin: -960
- m_HBaseRangeMax: 960
- m_VBaseRangeMin: -540
- m_VBaseRangeMax: 540
- m_HAllowExceedBaseRangeMin: 1
- m_HAllowExceedBaseRangeMax: 1
- m_VAllowExceedBaseRangeMin: 1
- m_VAllowExceedBaseRangeMax: 1
- m_ScaleWithWindow: 0
- m_HSlider: 0
- m_VSlider: 0
- m_IgnoreScrollWheelUntilClicked: 0
- m_EnableMouseInput: 1
- m_EnableSliderZoomHorizontal: 0
- m_EnableSliderZoomVertical: 0
- m_UniformScale: 1
- m_UpDirection: 1
- m_DrawArea:
- serializedVersion: 2
- x: 0
- y: 21
- width: 786
- height: 584
- m_Scale: {x: 0.409375, y: 0.409375}
- m_Translation: {x: 393, y: 292}
- m_MarginLeft: 0
- m_MarginRight: 0
- m_MarginTop: 0
- m_MarginBottom: 0
- m_LastShownAreaInsideMargins:
- serializedVersion: 2
- x: -960
- y: -713.2824
- width: 1920
- height: 1426.5648
- m_MinimalGUI: 1
- m_defaultScale: 0.409375
- m_LastWindowPixelSize: {x: 786, y: 605}
- m_ClearInEditMode: 1
- m_NoCameraWarning: 1
- m_LowResolutionForAspectRatios: 01000000000000000000
- m_XRRenderMode: 0
- m_RenderTexture: {fileID: 0}
---- !u!114 &15
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Animator
- m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 0
- y: 79
- width: 365
- height: 915
- m_SerializedDataModeController:
- m_DataMode: 0
- m_PreferredDataMode: 0
- m_SupportedDataModes:
- isAutomatic: 1
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_OverlaysVisible: 1
- m_ViewTransforms:
- m_KeySerializationHelper:
- - {fileID: 528180310289601023, guid: 75db14477f59de44b96f358d16e02e73, type: 2}
- m_ValueSerializationHelper:
- - e00: 1
- e01: 0
- e02: 0
- e03: 0
- e10: 0
- e11: 1
- e12: 0
- e13: 0
- e20: 0
- e21: 0
- e22: 1
- e23: 0
- e30: 0
- e31: 0
- e32: 0
- e33: 1
- m_PreviewAnimator: {fileID: 0}
- m_AnimatorController: {fileID: 9100000, guid: 75db14477f59de44b96f358d16e02e73, type: 2}
- m_BreadCrumbs:
- - m_Target: {fileID: 528180310289601023, guid: 75db14477f59de44b96f358d16e02e73, type: 2}
- m_ScrollPosition: {x: 0, y: 0}
- stateMachineGraph: {fileID: 0}
- stateMachineGraphGUI: {fileID: 0}
- blendTreeGraph: {fileID: 0}
- blendTreeGraphGUI: {fileID: 0}
- m_AutoLiveLink: 1
- m_MiniTool: 0
- m_LockTracker:
- m_IsLocked: 0
- m_CurrentEditor: 1
- m_LayerEditor:
- m_SelectedLayerIndex: 0
---- !u!114 &16
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Scene
- m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 1920
- y: 78
- width: 786
- height: 300
- m_SerializedDataModeController:
- m_DataMode: 0
- m_PreferredDataMode: 0
- m_SupportedDataModes:
- isAutomatic: 1
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData:
- - dockPosition: 0
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: -174, y: -26}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 3
- id: Tool Settings
- index: 0
- layout: 1
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 0
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: -179, y: 25}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 1
- id: unity-grid-and-snap-toolbar
- index: 1
- layout: 1
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 0, y: 25}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: unity-scene-view-toolbar
- index: 0
- layout: 1
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 1
- id: unity-search-toolbar
- index: 1
- layout: 1
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 0
- containerId: overlay-toolbar__bottom
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 0, y: 135}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: unity-transform-toolbar
- index: 0
- layout: 2
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 0
- containerId: overlay-container--left
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 0, y: 197}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: unity-component-tools
- index: 1
- layout: 2
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 0
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 24, y: -131}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 2
- id: Orientation
- index: 0
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Light Settings
- index: 0
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: -117}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 2
- id: Scene View/Camera
- index: 1
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Cloth Constraints
- index: 1
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Cloth Collisions
- index: 2
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Navmesh Display
- index: 4
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Agent Display
- index: 5
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Obstacle Display
- index: 6
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Occlusion Culling
- index: 3
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Physics Debugger
- index: 4
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Scene Visibility
- index: 5
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Particles
- index: 6
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Tilemap
- index: 11
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/Tilemap Palette Helper
- index: 12
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 24, y: 0}
- snapCorner: 0
- id: Scene View/Open Tile Palette
- index: 3
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 24, y: 0}
- snapCorner: 0
- id: Scene View/Tilemap Focus
- index: 4
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: -45, y: -54}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 2
- id: AINavigationOverlay
- index: 7
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 48, y: 48}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: APV Overlay
- index: 8
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 48, y: 48}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Scene View/TrailRenderer
- index: 7
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 0, y: 25}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: UnityEditor.SceneViewCameraOverlay
- index: 9
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 48, y: 48}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: UnityEditor.SceneViewCameraOverlay (0)
- index: 11
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 0
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 24, y: 0}
- snapCorner: 0
- id: Brush Attributes
- index: 2
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-toolbar__top
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: 24, y: 25}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: unity-scene-view-camera-mode-toolbar
- index: 1
- layout: 1
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 0
- containerId: overlay-toolbar__left
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 24, y: 0}
- snapCorner: 0
- id: Terrain Tools
- index: 0
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 0
- containerId: overlay-toolbar__left
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 24, y: 0}
- snapCorner: 0
- id: Brush Masks
- index: 1
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--left
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 24, y: 0}
- snapCorner: 0
- id: Scene View/Lighting Visualization Colors
- index: 0
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 0
- containerId: overlay-toolbar__bottom
- floating: 0
- collapsed: 0
- displayed: 1
- snapOffset: {x: -327, y: -56}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 3
- id: Overlays/OverlayMenu
- index: 1
- layout: 1
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 24, y: 0}
- snapCorner: 0
- id: Scene View/Tile Palette Clipboard
- index: 0
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 24, y: 0}
- snapCorner: 0
- id: Scene View/Tile Palette Brush Pick
- index: 2
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 24, y: 0}
- snapCorner: 0
- id: SceneView/CamerasOverlay
- index: 8
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 24, y: 0}
- snapCorner: 0
- id: Scene View/PBR Validation Settings
- index: 9
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: 24, y: 0}
- snapCorner: 0
- id: unity-spline-inspector
- index: 14
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 48, y: 48}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: Align
- index: 9
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- - dockPosition: 1
- containerId: overlay-container--right
- floating: 0
- collapsed: 0
- displayed: 0
- snapOffset: {x: 48, y: 48}
- snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
- id: QuickBar
- index: 10
- layout: 4
- size: {x: 0, y: 0}
- sizeOverriden: 0
- m_OverlaysVisible: 1
- m_WindowGUID: f6827acf47ff6e841a7f3bef03f3908f
- m_Gizmos: 1
- m_OverrideSceneCullingMask: 6917529027641081856
- m_SceneIsLit: 0
- m_SceneLighting: 1
- m_2DMode: 0
- m_isRotationLocked: 0
- m_PlayAudio: 0
- m_AudioPlay: 0
- m_Position:
- m_Target: {x: 1011.2399, y: 1019.22235, z: 138.7248}
- speed: 2
- m_Value: {x: 1011.2399, y: 1019.22235, z: 138.7248}
- m_RenderMode: 0
- m_CameraMode:
- drawMode: 0
- name: Shaded
- section: Shading Mode
- m_ValidateTrueMetals: 0
- m_DoValidateTrueMetals: 0
- m_SceneViewState:
- m_AlwaysRefresh: 0
- showFog: 1
- showSkybox: 0
- showFlares: 1
- showImageEffects: 1
- showParticleSystems: 1
- showVisualEffectGraphs: 1
- m_FxEnabled: 1
- m_Grid:
- xGrid:
- m_Fade:
- m_Target: 0
- speed: 2
- m_Value: 0
- m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
- m_Pivot: {x: 0, y: 0, z: 0}
- m_Size: {x: 0, y: 0}
- yGrid:
- m_Fade:
- m_Target: 1
- speed: 2
- m_Value: 1
- m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
- m_Pivot: {x: 0, y: 0, z: 0}
- m_Size: {x: 1, y: 1}
- zGrid:
- m_Fade:
- m_Target: 0
- speed: 2
- m_Value: 0
- m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
- m_Pivot: {x: 0, y: 0, z: 0}
- m_Size: {x: 1, y: 1}
- m_ShowGrid: 1
- m_GridAxis: 1
- m_gridOpacity: 0.5
- m_Rotation:
- m_Target: {x: -0.15143965, y: 0.84849906, z: -0.3640621, w: -0.3529519}
- speed: 2
- m_Value: {x: -0.15143959, y: 0.84849876, z: -0.36406198, w: -0.3529518}
- m_Size:
- m_Target: 1.0327514
- speed: 2
- m_Value: 1.0327514
- m_Ortho:
- m_Target: 0
- speed: 2
- m_Value: 0
- m_CameraSettings:
- m_Speed: 2
- m_SpeedNormalized: 1
- m_SpeedMin: 0.01
- m_SpeedMax: 2
- m_EasingEnabled: 1
- m_EasingDuration: 0.4
- m_AccelerationEnabled: 1
- m_FieldOfViewHorizontalOrVertical: 60
- m_NearClip: 0.03
- m_FarClip: 10000
- m_DynamicClip: 1
- m_OcclusionCulling: 0
- m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
- m_LastSceneViewOrtho: 0
- m_ReplacementShader: {fileID: 0}
- m_ReplacementString:
- m_SceneVisActive: 1
- m_LastLockedObject: {fileID: 0}
- m_ViewIsLockedToObject: 0
---- !u!114 &17
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Hierarchy
- m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 2707
- y: 78
- width: 340
- height: 333
- m_SerializedDataModeController:
- m_DataMode: 0
- m_PreferredDataMode: 0
- m_SupportedDataModes:
- isAutomatic: 1
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_OverlaysVisible: 1
- m_SceneHierarchy:
- m_TreeViewState:
- scrollPos: {x: 0, y: 0}
- m_SelectedIDs:
- m_LastClickedID: 0
- m_ExpandedIDs: d6ccffff04ceffff0cf4ffff14f4ffff16f4ffff04fbfffff4720000
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 10}
- m_SearchString:
- m_ExpandedScenes: []
- m_CurrenRootInstanceID: 0
- m_LockTracker:
- m_IsLocked: 0
- m_CurrentSortingName: TransformSorting
- m_WindowGUID: 85728a346145f5041b41bc3ce2f945c6
---- !u!114 &18
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Console
- m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 2707
- y: 432
- width: 340
- height: 572
- m_SerializedDataModeController:
- m_DataMode: 0
- m_PreferredDataMode: 0
- m_SupportedDataModes:
- isAutomatic: 1
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_OverlaysVisible: 1
---- !u!114 &19
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 230, y: 250}
- m_MaxSize: {x: 10000, y: 10000}
- m_TitleContent:
- m_Text: Project
- m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 3049
- y: 78
- width: 178
- height: 926
- m_SerializedDataModeController:
- m_DataMode: 0
- m_PreferredDataMode: 0
- m_SupportedDataModes:
- isAutomatic: 1
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_OverlaysVisible: 1
- m_SearchFilter:
- m_NameFilter:
- m_ClassNames: []
- m_AssetLabels: []
- m_AssetBundleNames: []
- m_ReferencingInstanceIDs:
- m_SceneHandles:
- m_ShowAllHits: 0
- m_SkipHidden: 0
- m_SearchArea: 1
- m_Folders: []
- m_Globs: []
- m_OriginalText:
- m_ImportLogFlags: 0
- m_FilterByTypeIntersection: 0
- m_ViewMode: 0
- m_StartGridSize: 96
- m_LastFolders: []
- m_LastFoldersGridSize: 16
- m_LastProjectPath: G:\UnityProject\Aliciza\Client
- m_LockTracker:
- m_IsLocked: 0
- m_FolderTreeState:
- scrollPos: {x: 0, y: 0}
- m_SelectedIDs: e48c0000
- m_LastClickedID: 36068
- m_ExpandedIDs: ffffffff00000000e46d0000e66d0000e86d0000ea6d0000ec6d0000ee6d0000f06d0000f26d0000f46d0000f66d0000f86d0000fa6d0000fc6d0000fe6d0000006e0000026e0000046e0000066e0000086e00000a6e00000c6e00000e6e0000106e0000126e0000146e0000166e0000186e00001a6e00001c6e00001e6e0000206e0000226e0000246e0000266e0000286e00002a6e00002c6e00002e6e0000306e0000326e0000346e0000366e0000386e00003a6e00003c6e00003e6e0000406e0000426e0000446e0000466e0000486e00004a6e00004c6e00004e6e0000506e0000526e0000546e0000566e0000586e00005a6e00005c6e00005e6e0000606e0000626e0000646e0000666e0000686e00006a6e00006c6e00006e6e0000706e0000726e0000746e0000766e0000786e00007a6e00007c6e00007e6e0000806e0000826e0000846e0000866e0000886e00008a6e00008c6e00008e6e0000906e0000926e0000946e0000966e0000986e00009a6e00009c6e00009e6e0000a06e0000a26e0000a46e0000a66e0000a86e0000aa6e0000ac6e0000ae6e0000b06e0000b26e0000b46e0000b66e0000b86e0000ba6e0000bc6e0000be6e0000c06e0000c26e0000c46e0000c66e0000c86e0000ca6e0000cc6e0000ce6e0000d06e0000d26e0000d46e0000d66e0000d86e0000da6e0000dc6e0000de6e0000e06e0000e26e0000e46e0000e66e0000e86e0000ea6e0000ec6e0000ee6e0000f06e0000f26e0000f46e0000f66e0000f86e0000fa6e0000fc6e0000fe6e0000006f0000026f0000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000186f00001a6f00001c6f00001e6f0000206f0000226f0000246f0000266f0000286f00002a6f00002c6f00002e6f0000306f0000326f0000346f0000366f0000386f00003a6f00003c6f00003e6f0000406f0000426f0000446f0000466f0000486f00004a6f00004c6f00004e6f0000506f0000526f0000546f0000566f0000586f00005a6f00005c6f00005e6f0000606f0000626f0000646f0000666f0000686f00006a6f00006c6f00006e6f0000706f0000726f0000746f0000766f0000786f00007a6f00007c6f00007e6f0000806f0000826f0000846f0000886f00008e6f0000906f0000926f0000966f0000986f00009a6f00009c6f00009e6f0000a06f0000a26f0000a46f0000ee710000f6710000027200000a7200001272000042720000
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 0}
- m_SearchString:
- m_CreateAssetUtility:
- m_EndAction: {fileID: 0}
- m_InstanceID: 0
- m_Path:
- m_Icon: {fileID: 0}
- m_ResourceFile:
- m_AssetTreeState:
- scrollPos: {x: 0, y: 0}
- m_SelectedIDs:
- m_LastClickedID: 0
- m_ExpandedIDs: ffffffff00000000e46d0000e66d0000e86d0000ea6d0000ec6d0000ee6d0000f06d0000f26d0000f46d0000f66d0000f86d0000fa6d0000fc6d0000fe6d0000006e0000026e0000046e0000066e0000086e00000a6e00000c6e00000e6e0000106e0000126e0000146e0000166e0000186e00001a6e00001c6e00001e6e0000206e0000226e0000246e0000266e0000286e00002a6e00002c6e00002e6e0000306e0000326e0000346e0000366e0000386e00003a6e00003c6e00003e6e0000406e0000426e0000446e0000466e0000486e00004a6e00004c6e00004e6e0000506e0000526e0000546e0000566e0000586e00005a6e00005c6e00005e6e0000606e0000626e0000646e0000666e0000686e00006a6e00006c6e00006e6e0000706e0000726e0000746e0000766e0000786e00007a6e00007c6e00007e6e0000806e0000826e0000846e0000866e0000886e00008a6e00008c6e00008e6e0000906e0000926e0000946e0000966e0000986e00009a6e00009c6e00009e6e0000a06e0000a26e0000a46e0000a66e0000a86e0000aa6e0000ac6e0000ae6e0000b06e0000b26e0000b46e0000b66e0000b86e0000ba6e0000bc6e0000be6e0000c06e0000c26e0000c46e0000c66e0000c86e0000ca6e0000cc6e0000ce6e0000d06e0000d26e0000d46e0000d66e0000d86e0000da6e0000dc6e0000de6e0000e06e0000e26e0000e46e0000e66e0000e86e0000ea6e0000ec6e0000ee6e0000f06e0000f26e0000f46e0000f66e0000f86e0000fa6e0000fc6e0000fe6e0000006f0000026f0000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000186f00001a6f00001c6f00001e6f0000206f0000226f0000246f0000266f0000286f00002a6f00002c6f00002e6f0000306f0000326f0000346f0000366f0000386f00003a6f00003c6f00003e6f0000406f0000426f0000446f0000466f0000486f00004a6f00004c6f00004e6f0000506f0000526f0000546f0000566f0000586f00005a6f00005c6f00005e6f0000606f0000626f0000646f0000666f0000686f00006a6f00006c6f00006e6f0000706f0000726f0000746f0000766f0000786f00007a6f00007c6f00007e6f0000806f0000826f0000846f0000886f00008e6f0000906f0000926f0000966f0000986f00009a6f00009c6f00009e6f0000a06f0000a26f0000a46f0000ee710000f6710000027200000a7200001272000042720000
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 12}
- m_SearchString:
- m_CreateAssetUtility:
- m_EndAction: {fileID: 0}
- m_InstanceID: 0
- m_Path:
- m_Icon: {fileID: 0}
- m_ResourceFile:
- m_ListAreaState:
- m_SelectedInstanceIDs:
- m_LastClickedInstanceID: 0
- m_HadKeyboardFocusLastEvent: 0
- m_ExpandedInstanceIDs: 0c750000f2d60000
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 13}
- m_CreateAssetUtility:
- m_EndAction: {fileID: 0}
- m_InstanceID: 0
- m_Path:
- m_Icon: {fileID: 0}
- m_ResourceFile:
- m_NewAssetIndexInList: -1
- m_ScrollPosition: {x: 0, y: 0}
- m_GridSize: 96
- m_SkipHiddenPackages: 0
- m_DirectoriesAreaWidth: 115
---- !u!114 &20
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 275, y: 50}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Inspector
- m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 3229
- y: 78
- width: 610
- height: 926
- m_SerializedDataModeController:
- m_DataMode: 0
- m_PreferredDataMode: 0
- m_SupportedDataModes:
- isAutomatic: 1
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_OverlaysVisible: 1
- m_ObjectsLockedBeforeSerialization: []
- m_InstanceIDsLockedBeforeSerialization:
- m_PreviewResizer:
- m_CachedPref: 561
- m_ControlHash: 1412526313
- m_PrefName: Preview_InspectorPreview
- m_LastInspectedObjectInstanceID: -1
- m_LastVerticalScrollValue: 0
- m_GlobalObjectId:
- m_InspectorMode: 0
- m_LockTracker:
- m_IsLocked: 0
- m_PreviewWindow: {fileID: 0}
diff --git a/Client/Assets/EmojiOne_12.asset b/Client/Assets/EmojiOne_12.asset
new file mode 100644
index 0000000..627a7c4
--- /dev/null
+++ b/Client/Assets/EmojiOne_12.asset
@@ -0,0 +1,216 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!213 &21300000
+Sprite:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: EmojiOne_12
+ m_Rect:
+ serializedVersion: 2
+ x: 4
+ y: 4
+ width: 120
+ height: 120
+ m_Offset: {x: 0, y: 0}
+ m_Border: {x: 0, y: 0, z: 0, w: 0}
+ m_PixelsToUnits: 100
+ m_Pivot: {x: 0.5, y: 0.5}
+ m_Extrude: 1
+ m_IsPolygon: 0
+ m_AtlasName:
+ m_PackingTag:
+ m_RenderDataKey:
+ dffef66376be4fa480fb02b19edbe903: 21300022
+ m_AtlasTags: []
+ m_SpriteAtlas: {fileID: 0}
+ m_RD:
+ serializedVersion: 3
+ texture: {fileID: 2800000, guid: dffef66376be4fa480fb02b19edbe903, type: 3}
+ alphaTexture: {fileID: 0}
+ secondaryTextures: []
+ m_SubMeshes:
+ - serializedVersion: 2
+ firstByte: 0
+ indexCount: 6
+ topology: 0
+ baseVertex: 0
+ firstVertex: 0
+ vertexCount: 4
+ localAABB:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_IndexBuffer: 030000000100020001000000
+ m_VertexData:
+ serializedVersion: 3
+ m_VertexCount: 4
+ m_Channels:
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 3
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 1
+ offset: 0
+ format: 0
+ dimension: 2
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ m_DataSize: 80
+ _typelessdata: 9a9919bf9a99193f000000009a99193f9a9919bf000000009a99193f9a99193f000000009a9919bf9a9919bf00000000f0ffff3b0000783e0000783ef0ffff3b0000783e0000783ef0ffff3bf0ffff3b
+ m_Bindpose: []
+ textureRect:
+ serializedVersion: 2
+ x: 4
+ y: 4
+ width: 120
+ height: 120
+ textureRectOffset: {x: 0, y: 0}
+ atlasRectOffset: {x: -1, y: -1}
+ settingsRaw: 64
+ uvTransform: {x: 100, y: 64, z: 100, w: 64}
+ downscaleMultiplier: 1
+ m_AtlasRD:
+ serializedVersion: 3
+ texture: {fileID: 2800000, guid: dffef66376be4fa480fb02b19edbe903, type: 3}
+ alphaTexture: {fileID: 0}
+ secondaryTextures: []
+ m_SubMeshes:
+ - serializedVersion: 2
+ firstByte: 0
+ indexCount: 6
+ topology: 0
+ baseVertex: 0
+ firstVertex: 0
+ vertexCount: 4
+ localAABB:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_IndexBuffer: 030000000100020001000000
+ m_VertexData:
+ serializedVersion: 3
+ m_VertexCount: 4
+ m_Channels:
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 3
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 1
+ offset: 0
+ format: 0
+ dimension: 2
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ m_DataSize: 80
+ _typelessdata: 9a9919bf9a99193f000000009a99193f9a9919bf000000009a99193f9a99193f000000009a9919bf9a9919bf00000000f0ffff3b0000783e0000783ef0ffff3b0000783e0000783ef0ffff3bf0ffff3b
+ m_Bindpose: []
+ textureRect:
+ serializedVersion: 2
+ x: 4
+ y: 4
+ width: 120
+ height: 120
+ textureRectOffset: {x: 0, y: 0}
+ atlasRectOffset: {x: -1, y: -1}
+ settingsRaw: 64
+ uvTransform: {x: 100, y: 64, z: 100, w: 64}
+ downscaleMultiplier: 1
+ m_PhysicsShape:
+ - - {x: -0.59999996, y: 0.59999996}
+ - {x: -0.59999996, y: -0.59999996}
+ - {x: 0.59999996, y: -0.59999996}
+ - {x: 0.59999996, y: 0.59999996}
+ m_Bones: []
+ m_SpriteID: 412349a150598d14da4d7140df5c0286
diff --git a/Client/Assets/Default.wlt.meta b/Client/Assets/EmojiOne_12.asset.meta
similarity index 52%
rename from Client/Assets/Default.wlt.meta
rename to Client/Assets/EmojiOne_12.asset.meta
index 100e4e3..3362253 100644
--- a/Client/Assets/Default.wlt.meta
+++ b/Client/Assets/EmojiOne_12.asset.meta
@@ -1,7 +1,8 @@
fileFormatVersion: 2
-guid: 002e269efc288864b9fe6b6c51d15935
-DefaultImporter:
+guid: 068091d572066f043aa79b9beace61ea
+NativeFormatImporter:
externalObjects: {}
+ mainObjectFileID: 21300000
userData:
assetBundleName:
assetBundleVariant:
diff --git a/Client/Assets/GamepadTest.unity b/Client/Assets/GamepadTest.unity
index 6326191..403204a 100644
--- a/Client/Assets/GamepadTest.unity
+++ b/Client/Assets/GamepadTest.unity
@@ -808,6 +808,142 @@ 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
@@ -1381,6 +1517,11 @@ RectTransform:
- {fileID: 1466314556}
- {fileID: 2043214059}
- {fileID: 1240218065}
+ - {fileID: 1461120293}
+ - {fileID: 1268519739}
+ - {fileID: 953234183}
+ - {fileID: 1108824070}
+ - {fileID: 344668136}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -2568,6 +2709,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
actions: {fileID: -944628639613478452, guid: 916c72588b6bc6e48a022e8c82e6438f, type: 3}
+ inputGlyphDatabase: {fileID: 11400000, guid: 6ae7129e9026e8348b9d222e9d0d6f68, type: 2}
fileName: input_bindings.json
debugMode: 1
--- !u!1 &734992815
@@ -3397,6 +3539,54 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 933311483}
m_CullTransparentMesh: 1
+--- !u!1 &953234182
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 953234183}
+ - component: {fileID: 953234184}
+ m_Layer: 5
+ m_Name: GameObject (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &953234183
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953234182}
+ 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 &953234184
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953234182}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f7d3bd4152cc45d18982984253cfb298, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &983400299
GameObject:
m_ObjectHideFlags: 0
@@ -3602,7 +3792,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6bacb75074f6f194a8047ae2fd93d01e, type: 3}
m_Name:
m_EditorClassIdentifier:
- database: {fileID: 11400000, guid: 6ae7129e9026e8348b9d222e9d0d6f68, type: 2}
audioSource: {fileID: 1036822060}
hotButtons:
- {fileID: 0}
@@ -3831,6 +4020,54 @@ 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
@@ -4264,6 +4501,54 @@ 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
@@ -4790,6 +5075,54 @@ 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}
@@ -5523,7 +5856,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2393741488666459665, guid: 5a0830a080d75784b9f03b1659413301, type: 3}
propertyPath: m_SizeDelta.x
- value: 92.01
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2393741488666459665, guid: 5a0830a080d75784b9f03b1659413301, type: 3}
propertyPath: m_SizeDelta.y
@@ -5531,7 +5864,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2393741488666459665, guid: 5a0830a080d75784b9f03b1659413301, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 86.005005
+ value: 40
objectReference: {fileID: 0}
- target: {fileID: 2393741488666459665, guid: 5a0830a080d75784b9f03b1659413301, type: 3}
propertyPath: m_AnchoredPosition.y
diff --git a/Client/Assets/InputGlyph/GlyphService.cs b/Client/Assets/InputGlyph/GlyphService.cs
index 12d598a..47ff68f 100644
--- a/Client/Assets/InputGlyph/GlyphService.cs
+++ b/Client/Assets/InputGlyph/GlyphService.cs
@@ -12,57 +12,67 @@ public static class GlyphService
///
public static InputGlyphDatabase Database { get; set; }
- public static string GetBindingDisplay(InputAction action, InputGlyphDatabase db = null)
+ public static string GetBindingControlPath(InputAction action, InputDeviceWatcher.InputDeviceCategory? deviceOverride = null)
{
if (action == null) return string.Empty;
- var control = GetBindingControl(action);
- return control != null ? control.displayName : string.Empty;
+ var binding = GetBindingControl(action, deviceOverride);
+ return binding.hasOverrides ? binding.effectivePath : binding.path;
}
- public static string GetBindingControlPath(InputAction action, InputDeviceWatcher.InputDeviceCategory? deviceOverride = null, InputGlyphDatabase db = null)
+ public static bool TryGetTMPTagForActionPath(InputActionReference reference, InputDeviceWatcher.InputDeviceCategory device, out string tag, out string displayFallback, InputGlyphDatabase db = null)
{
- if (action == null) return string.Empty;
- var control = GetBindingControl(action, deviceOverride);
- return control != null ? $"{(control.device?.displayName ?? "Unknown")}/{control.displayName}" : string.Empty;
+ string path = GetBindingControlPath(reference, device);
+ return TryGetTMPTagForActionPath(path, device, out tag, out displayFallback, db);
}
- ///
- /// 根据当前设备类别（或传入的 deviceOverride）尝试在 action.controls 中找到匹配的 control。
- /// 匹配策略：检查 control.device.displayName 是否包含类别提示词（忽略大小写）。
- /// 如果没有匹配项则返回第一个 control（作为最后的退路），或 null。
- ///
- public static InputControl GetBindingControl(InputAction action, InputDeviceWatcher.InputDeviceCategory? deviceOverride = null)
+ public static bool TryGetUISpriteForActionPath(InputActionReference reference, InputDeviceWatcher.InputDeviceCategory device, out Sprite sprite, InputGlyphDatabase db = null)
{
- if (action == null) return null;
+ string path = GetBindingControlPath(reference, device);
+ return TryGetUISpriteForActionPath(path, device, out sprite, db);
+ }
+
+ public static bool TryGetTMPTagForActionPath(string controlPath, InputDeviceWatcher.InputDeviceCategory device, out string tag, out string displayFallback, InputGlyphDatabase db = null)
+ {
+ tag = null;
+ displayFallback = null;
+ db = db ?? Database;
+
+ displayFallback = GetDisplayNameFromControlPath(controlPath);
+
+ var sprite = db.FindSprite(controlPath, device) ?? db.FindSprite(controlPath, InputDeviceWatcher.InputDeviceCategory.Keyboard);
+
+ var spriteName = sprite == null ? string.Empty : sprite.name;
+ tag = $"";
+ return true;
+ }
+
+ public static bool TryGetUISpriteForActionPath(string controlPath, InputDeviceWatcher.InputDeviceCategory device, out Sprite sprite, InputGlyphDatabase db = null)
+ {
+ sprite = null;
+ db = db ?? Database;
+ if (string.IsNullOrEmpty(controlPath) || db == null) return false;
+ sprite = db.FindSprite(controlPath, device) ?? db.FindSprite(controlPath, InputDeviceWatcher.InputDeviceCategory.Keyboard);
+ return sprite != null;
+ }
+
+
+ static InputBinding GetBindingControl(InputAction action, InputDeviceWatcher.InputDeviceCategory? deviceOverride = null)
+ {
+ if (action == null) return default;
var curCategory = deviceOverride ?? InputDeviceWatcher.CurrentCategory;
var hints = GetDeviceHintsForCategory(curCategory);
- // 首先找匹配 hints 的 control
- foreach (var control in action.controls)
+ foreach (var binding in action.bindings)
{
- var deviceName = control.device?.displayName ?? string.Empty;
+ var deviceName = binding.path ?? string.Empty;
if (hints.Any(h => deviceName.IndexOf(h, StringComparison.OrdinalIgnoreCase) >= 0))
{
- return control;
+ return binding;
}
}
- // 如果没有匹配，尝试返回第一个 gamepad/keyboard 优先的 control（更健壮）
- if (action.controls.Count > 0)
- {
- // 优先返回 keyboard/mouse 类型（如果当前类别是 keyboard）
- if (curCategory == InputDeviceWatcher.InputDeviceCategory.Keyboard)
- {
- var k = action.controls.FirstOrDefault(c => (c.device?.displayName ?? "").IndexOf("Keyboard", StringComparison.OrdinalIgnoreCase) >= 0)
- ?? action.controls.First();
- return k;
- }
-
- return action.controls.First();
- }
-
- return null;
+ return default;
}
static string[] GetDeviceHintsForCategory(InputDeviceWatcher.InputDeviceCategory cat)
@@ -76,76 +86,17 @@ public static class GlyphService
case InputDeviceWatcher.InputDeviceCategory.PlayStation:
return new[] { "DualShock", "DualSense", "PlayStation", "Gamepad" };
default:
- return new[] { "Gamepad", "Joystick", "Keyboard", "Mouse" };
+ return new[] { "XInput", "Xbox", "Gamepad" };
}
}
- ///
- /// 尝试根据 controlPath 和设备获取 TMP sprite 标签；如果失败会返回 displayFallback（可直接显示的文字）。
- /// 逻辑：
- /// 1) 使用传入 db 或静态 Database；
- /// 2) 先在指定设备表中查找 entry，找不到则回退到 Keyboard 表；
- /// 3) 如果 table 或 tmpAsset 缺失 或 entry.Sprite 缺失，则用 displayFallback（从 controlPath 提取最后段或控制名）。
- ///
- public static bool TryGetTMPTagForActionPath(string controlPath, InputDeviceWatcher.InputDeviceCategory device, out string tag, out string displayFallback, InputGlyphDatabase db = null)
+
+ public static string GetDisplayNameFromInputAction(InputAction reference)
{
- tag = null;
- displayFallback = null;
- db = db ?? Database;
- if (string.IsNullOrEmpty(controlPath) || db == null)
- {
- displayFallback = GetDisplayNameFromControlPath(controlPath);
- return false;
- }
-
- var entry = db.FindEntryByControlPath(controlPath, device);
- if (entry == null)
- {
- // 设备缺失或没有 entry -> 回退 keyboard
- entry = db.FindEntryByControlPath(controlPath, InputDeviceWatcher.InputDeviceCategory.Keyboard);
- }
-
- if (entry == null)
- {
- displayFallback = GetDisplayNameFromControlPath(controlPath);
- return false;
- }
-
- // 查找对应表（优先目标设备，再 keyboard）
- var table = db.GetTable(device) ?? db.GetTable(InputDeviceWatcher.InputDeviceCategory.Keyboard);
- if (table == null || table.tmpAsset == null)
- {
- displayFallback = GetDisplayNameFromControlPath(controlPath);
- return false;
- }
-
- var sprite = entry.Sprite;
- if (sprite == null)
- {
- displayFallback = GetDisplayNameFromControlPath(controlPath);
- return false;
- }
-
- var spriteName = sprite.name;
- tag = $"";
- return true;
+ string controlPath=GetBindingControlPath(reference, InputDeviceWatcher.CurrentCategory);
+ return GetDisplayNameFromControlPath(controlPath);
}
-
- public static bool TryGetUISpriteForActionPath(string controlPath, InputDeviceWatcher.InputDeviceCategory device, out Sprite sprite, InputGlyphDatabase db = null)
- {
- sprite = null;
- db = db ?? Database;
- if (string.IsNullOrEmpty(controlPath) || db == null) return false;
-
- var entry = db.FindEntryByControlPath(controlPath, device) ?? db.FindEntryByControlPath(controlPath, InputDeviceWatcher.InputDeviceCategory.Keyboard);
- if (entry == null) return false;
- if (entry.Sprite == null) return false;
-
- sprite = entry.Sprite;
- return true;
- }
-
- static string GetDisplayNameFromControlPath(string controlPath)
+ public static string GetDisplayNameFromControlPath(string controlPath)
{
if (string.IsNullOrEmpty(controlPath)) return string.Empty;
var parts = controlPath.Split('/');
diff --git a/Client/Assets/InputGlyph/InputBindingManager.cs b/Client/Assets/InputGlyph/InputBindingManager.cs
index 193daa3..2c03374 100644
--- a/Client/Assets/InputGlyph/InputBindingManager.cs
+++ b/Client/Assets/InputGlyph/InputBindingManager.cs
@@ -1,4 +1,5 @@
// InputBindingManager.cs
+
using System;
using System.IO;
using System.Linq;
@@ -8,6 +9,7 @@ using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.InputSystem;
using System.Reactive.Subjects;
+using AlicizaX.InputGlyph;
using RxUnit = System.Reactive.Unit;
namespace InputRemapper
@@ -18,6 +20,9 @@ namespace InputRemapper
[Tooltip("InputActionAsset to manage")]
public InputActionAsset actions;
+
+ [SerializeField] private InputGlyphDatabase inputGlyphDatabase;
+
public string fileName = "input_bindings.json";
public bool debugMode = false;
@@ -52,6 +57,7 @@ namespace InputRemapper
private void Awake()
{
+ GlyphService.Database = inputGlyphDatabase;
if (actions == null)
{
Debug.LogError("InputBindingManager: InputActionAsset not assigned.");
@@ -60,7 +66,14 @@ namespace InputRemapper
BuildActionMap();
- try { defaultBindingsJson = actions.SaveBindingOverridesAsJson(); } catch { defaultBindingsJson = string.Empty; }
+ try
+ {
+ defaultBindingsJson = actions.SaveBindingOverridesAsJson();
+ }
+ catch
+ {
+ defaultBindingsJson = string.Empty;
+ }
if (File.Exists(SavePath))
{
@@ -74,7 +87,10 @@ namespace InputRemapper
if (debugMode) Debug.Log($"Loaded overrides from {SavePath}");
}
}
- catch (Exception ex) { Debug.LogError("Failed to load overrides: " + ex); }
+ catch (Exception ex)
+ {
+ Debug.LogError("Failed to load overrides: " + ex);
+ }
}
OnInputsInit.OnNext(RxUnit.Default);
@@ -181,7 +197,6 @@ namespace InputRemapper
}
}
- // Simple BindingPath (no glyph caching)
public sealed class BindingPath
{
public string bindingPath;
@@ -215,7 +230,9 @@ namespace InputRemapper
public RebindContext(InputAction action, int bindingIndex, string overridePath)
{
- this.action = action; this.bindingIndex = bindingIndex; this.overridePath = overridePath;
+ this.action = action;
+ this.bindingIndex = bindingIndex;
+ this.overridePath = overridePath;
}
public override bool Equals(object obj)
@@ -237,6 +254,7 @@ namespace InputRemapper
{
if (map.Value.actions.TryGetValue(actionName, out var a)) return a.action;
}
+
Debug.LogError($"[InputBindingManager] Could not find action '{actionName}'");
return null;
}
@@ -270,7 +288,9 @@ namespace InputRemapper
{
foreach (var ctx in Instance.preparedRebinds)
{
- if (string.IsNullOrEmpty(ctx.overridePath)) { }
+ if (string.IsNullOrEmpty(ctx.overridePath))
+ {
+ }
else if (ctx.overridePath == NULL_BINDING) ctx.action.RemoveBindingOverride(ctx.bindingIndex);
else ctx.action.ApplyBindingOverride(ctx.bindingIndex, ctx.overridePath);
@@ -365,10 +385,13 @@ namespace InputRemapper
{
if (ctx.overridePath == bindingPath && (ctx.action != currentAction || (ctx.action == currentAction && ctx.bindingIndex != currentIndex)))
{
- duplicate = ctx; return true;
+ duplicate = ctx;
+ return true;
}
}
- duplicate = null; return false;
+
+ duplicate = null;
+ return false;
}
private bool AnyBindingPath(string bindingPath, InputAction currentAction, int currentIndex, out (InputAction action, int bindingIndex) duplicate)
@@ -389,7 +412,9 @@ namespace InputRemapper
}
}
}
- duplicate = default; return false;
+
+ duplicate = default;
+ return false;
}
private void PrepareRebind(RebindContext context)
@@ -424,7 +449,11 @@ namespace InputRemapper
using (var sw = new StreamWriter(SavePath, false)) await sw.WriteAsync(json);
if (debugMode) Debug.Log($"Overrides saved to {SavePath}");
}
- catch (Exception ex) { Debug.LogError("Failed to save overrides: " + ex); throw; }
+ catch (Exception ex)
+ {
+ Debug.LogError("Failed to save overrides: " + ex);
+ throw;
+ }
}
public async Task ResetToDefaultAsync()
@@ -435,16 +464,19 @@ namespace InputRemapper
else
{
foreach (var map in actionMap)
- foreach (var a in map.Value.actions)
- for (int b = 0; b < a.Value.action.bindings.Count; b++)
- a.Value.action.RemoveBindingOverride(b);
+ foreach (var a in map.Value.actions)
+ for (int b = 0; b < a.Value.action.bindings.Count; b++)
+ a.Value.action.RemoveBindingOverride(b);
}
RefreshBindingPathsFromActions();
await WriteOverridesToDiskAsync();
if (debugMode) Debug.Log("Reset to default and saved.");
}
- catch (Exception ex) { Debug.LogError("Failed to reset defaults: " + ex); }
+ catch (Exception ex)
+ {
+ Debug.LogError("Failed to reset defaults: " + ex);
+ }
}
public static BindingPath GetBindingPath(string actionName, int bindingIndex = 0)
@@ -456,6 +488,7 @@ namespace InputRemapper
if (action.bindings.TryGetValue(bindingIndex, out var binding)) return binding.bindingPath;
}
}
+
return null;
}
diff --git a/Client/Assets/InputGlyph/InputGlyphDatabase.asset b/Client/Assets/InputGlyph/InputGlyphDatabase.asset
index a958b36..4d25801 100644
--- a/Client/Assets/InputGlyph/InputGlyphDatabase.asset
+++ b/Client/Assets/InputGlyph/InputGlyphDatabase.asset
@@ -13,7 +13,7 @@ MonoBehaviour:
m_Name: InputGlyphDatabase
m_EditorClassIdentifier:
tables:
- - deviceType: 0
+ - deviceName: Keyboard
tmpAsset: {fileID: 11400000, guid: d86f5dbf588185247a5fce74f7485d46, type: 2}
entries:
- Sprite: {fileID: 0, guid: ee9d4b20b6aa1cd4480ecac895444ce2, type: 3}
@@ -21,12 +21,12 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 689995e3-cee0-4801-8802-8c8889a822c8
+ m_Id: 8519cb45-6a61-40d2-aacf-15b0a59d4b33
m_Processors:
m_Interactions:
m_SingletonActionBindings:
- m_Name:
- m_Id: a4316528-f98c-4cc4-b22a-acceeb9a79a3
+ m_Id: f1f14d32-f049-4f91-bf38-921e96d7daf1
m_Path: /escape
m_Interactions:
m_Processors:
@@ -39,31 +39,23 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: d699fd8a-8a63-408e-973c-144ee67f55a4
+ m_Id: a60a52cb-730e-47a6-80c7-5c6c40549e6c
m_Processors:
m_Interactions:
- m_SingletonActionBindings:
- - m_Name:
- m_Id: baecbe01-dc49-4315-9dd0-2b8768df4859
- m_Path: /numpad0
- m_Interactions:
- m_Processors:
- m_Groups:
- m_Action: Action
- m_Flags: 0
+ m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 00a279610a576904d8b7747bda764561, type: 3}
action:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: ad168a86-1c41-4726-b461-1da17c0788cc
+ m_Id: 06558d43-5349-434c-8d21-5b19ad9d7956
m_Processors:
m_Interactions:
m_SingletonActionBindings:
- m_Name:
- m_Id: 8fdabc32-5501-4d6c-a592-a18159f1c298
- m_Path: /numpad1
+ m_Id: a05b5a99-fb2b-460d-8a1a-9406cbc24754
+ m_Path: /1
m_Interactions:
m_Processors:
m_Groups:
@@ -75,43 +67,27 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 0fe6c000-3aba-4738-957d-b58aca81be1c
+ m_Id: 736cb76d-521a-49ef-9c05-a16e9478abde
m_Processors:
m_Interactions:
- m_SingletonActionBindings:
- - m_Name:
- m_Id: 36b79a7c-a628-40f8-8505-1c0cba5882a4
- m_Path: /numpad2
- m_Interactions:
- m_Processors:
- m_Groups:
- m_Action: Action
- m_Flags: 0
+ m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 1f767599f0b4da849a883a94b13c5d26, type: 3}
action:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 5d24c195-93d5-4d96-badf-0f831daef286
+ m_Id: 67b24886-c0f0-4646-9fba-63726b8ad91b
m_Processors:
m_Interactions:
- m_SingletonActionBindings:
- - m_Name:
- m_Id: b2b7bd99-13d3-4e0b-ac23-4ea14a458ba5
- m_Path: /numpad3
- m_Interactions:
- m_Processors:
- m_Groups:
- m_Action: Action
- m_Flags: 0
+ m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 0b050c5af7071df4ea9dcbe567a40527, type: 3}
action:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 034d05fd-8e19-44d5-8ca0-9821d70d6aad
+ m_Id: a7c4ac0f-243c-4563-9185-2a1971ba5ac0
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -121,7 +97,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 45088cab-6a91-467d-9998-00c265591525
+ m_Id: 2dbf6f89-a694-4032-87b8-2dc5ef93b3aa
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -131,7 +107,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 61816d26-3e14-421a-abd9-bd81cb57215c
+ m_Id: ec9ba4d9-8143-4907-bf43-49c90c79a0ad
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -141,7 +117,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: ba919b95-d903-471d-aeb5-754791d28477
+ m_Id: 1c78a404-ed2c-4c93-b972-7d0b66b64e54
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -151,607 +127,607 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 09bd444b-0a43-450c-b815-41b9176a232c
+ m_Id: b4f71f74-f4fe-4c72-9fb3-56005f5a8f0a
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 0cd67a722f4433f4696d54b64cf33eda, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 3bb2a544-474f-40a3-93cc-6d04922c5859
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 08124c45d73404b4baa33fa4cae62b3b, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 3c0e25de-9265-43bf-aeb4-1bbe4c9c4a27
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 2e464bb705446da4d8113c9354e79dd1, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 3e61eb73-c880-4f8e-be24-76198f5671d9
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: a3a5936fde06a6d45b225f5f8101e038, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: dc78c5e8-57bc-488c-87b3-0ed988049966
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 32ed7ea8db14f9d4682e326f6fb1ebd1, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 9c8f04b1-3a95-4106-91c7-42697df765d0
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: fe40bc800bba6d844bb3e480912b9646, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: c1da3050-9031-469e-84a4-f820d50d9093
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: ea68d41eed1e02a45b541d735e752b89, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: f6f5c65d-f22d-41da-9f5b-dba4eee7a0d3
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: e0699458d4dda9a47b2138339a0c9e53, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 4d5db09d-514d-4f33-b5f0-e8e4c09cd6b6
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: e369674b2ee07fb42bb929da57903f59, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 2e9db04a-8412-42f2-bd3c-896a4b34ac20
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 88aef799a7ecfa54bb9c5c6483e40b6e, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 1372e7f5-269d-4f9e-b038-ee8b64ccc4aa
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 1752145a0bc9a0b42ba08c48a2159935, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 6e6787b5-a7d9-4239-a479-afc2367148d2
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: d1fa721a108c10a49963fbbe7431778d, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 9793389e-140e-4920-a03f-d4eb377568ce
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: c40b93c9ccadb9341bbd4a26c161bce8, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 9e7e18f0-0f86-41b4-9864-1983fce14e45
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: fd82ed20eba17834fba91513491325a8, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: d521b325-92ba-4493-a361-c2de34d2a48a
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: a48e478b5ee51994f8df9325ad4e6d9d, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 0da334b5-fcf3-495b-a8df-97e3d8871d79
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 46c805e2f6c702049abd0fb8a7051fb9, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 9d7e86c3-b167-416e-a750-9bf084112080
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: edaaa91819fbbe74e96e96619e211d6d, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: cbcaf50b-a3ad-46f9-b237-3b36785006ad
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 6c74b8ff99973eb409db928b7e1f4501, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 695bcc6a-a903-4be9-9726-43598aa46e23
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: b52a528b311152042a48b66dcf78fa1a, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: de13a2d5-754b-4e8b-a110-4e30393fb3d9
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 8e0b177891715464ca78715f5afe4615, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 5dd1f49a-a6f4-4ffe-aaef-82a230df8599
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 60479686140effd4eba2fcde8873ff82, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: c202a63e-d723-4709-8fe9-5d5d32094de5
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 636a70c3b3207fe4fb3e3084b2d54a01, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: d07b516d-2701-447b-bcb8-5c826085ecb7
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 5511a5af72ceda247b5bd6321aa4aecd, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: d862fcaa-5792-4014-97b9-f33ad40b5840
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: f56d35b43f323ab47a62f51a792fdc6a, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 370ce468-91f7-4c04-8a04-8ef82728c99c
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: e141629a77455de4bac3fa8e44b74ef9, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 2405d816-1625-44fe-a873-890e29388b21
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: e175a788ad6ae87488cc8f87735746a0, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 6783bf52-1cab-4d31-a008-696369f6492a
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 14d8ea194d801824da0146fe97551008, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: f0c070d0-d0a9-4258-bc9e-45668137fb99
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 65e2cd1ec1d70424ba708e401b8778b2, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 0f5c9b6c-7ade-4ac6-b893-5af8f110174a
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 5d4bd54b77ce8ac4eb3bbe89444bb1fa, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 123c5828-c570-4a35-accc-cff5b6d67a6f
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 2f8cc53fae7e9f846acf855f61a61e5e, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: bfd002d1-a580-409e-b3ee-2b29926d3445
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: b9cf725fe5785eb4c850b6bed6d8f1b1, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: cdfe1428-15e2-4155-9eff-df26b1259365
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: c0e951aa2d6ffc5419e0c2ba08c71e99, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 9b82a60b-f5f4-4e17-8658-39e3e8562daf
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: b5635980476387c4e9a51f41465236ed, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: ec0fdfd7-5a78-4be4-85ad-450d621bf096
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 64fcefa43cc529e4c93fba781fbc64f7, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 77cbf3d6-dd64-4fcc-b6ea-733a6997d4d1
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 67bd610ee6777b74f97eebc76442b46d, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 4f9f1634-0292-4bfa-8630-e159437d5543
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 2dff7a4bc4676334fac46a83b1d6908d, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 3d19857e-6637-440b-9591-e5ae0693e5ae
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 143e16377f5b84e4bb57f75eee6c27cb, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 3e7975c7-47a8-4703-80d5-55737379c016
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: af8808b4c5425a845bf163e050d17298, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 4770b1f5-600e-484d-b764-079c8cac446a
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 28f00eac8602fce4a96d40a2ad643fff, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 7a151e99-e6d3-411c-90aa-1359e25f4ccc
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 188df834d068b30418a115bf9b6660c7, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 213b8a58-8081-4223-9572-0a8018642daf
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 1fe4f63d22c95f940bb98334c5dfe3a5, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 4739c68c-63cd-4d4e-bdba-220423fcf565
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: deb8c51aee9529146a1f9c4680cf5a2d, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 89b39b51-1dc9-40fd-a379-82a1eb73fa8d
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 402e22f0bd1b2b445bf0525202b1e4ae, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: ed1bfe31-5f0b-4ff1-9093-01dcbbd10287
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 899f3af688b95e445af18f2843e0b2a9, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 73e16952-1d72-4da0-86ed-d865ae8e500b
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: cd32f6df6d0ba4542bcd03e9d708ffb7, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: e2527590-a8e9-46b3-bf6e-9fad2fc16bf2
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: bdfdb0cf2536f5b46afce16975f33949, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 136f8424-0ded-4a11-a484-13fc6c23355d
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 532ce68f0df85514e88e494387b075e2, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 3cca256b-b182-4d71-82b3-e24fbb3760ef
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 85cf315519ccb2245b78e40938499a76, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 6e26187c-a1ea-495f-9500-a677f90d7140
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 538c745b8d05eaf4888493082cfa52c3, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 8159b7ca-1a12-4e02-9bd7-1a59b2331ae1
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 3945c893258124c42a0e9010a8a0b7f4, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 5c62d853-5bf3-46b5-b1d0-83748926de0d
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 025201e7720928047b04938bf5407b00, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 9a878606-5e80-41e3-91ed-72546570169e
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 0cfb0924e07535b46a93708d4183000d, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 714bc031-3a9f-4451-84b5-88f5364c3f01
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 4f94ff96e80b66a4fb66b371e1985480, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 33919c54-de6a-420a-9c46-57d22a45953b
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 96d91a06dbc77ce48ba426b0114ef631, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 94818b88-5673-4012-9e65-378801a9a1c4
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: ddc9246cd3f6ece4da20087b07a3fb85, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 766130dc-7cf7-441d-bd55-ef55431ce741
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 7040ee99def64ca45a2ffceedcb83334, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 6e2003fb-7f22-4f9e-9c70-25c082e7ec3e
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: bbcea262b8b71244cb46a8db47e007ba, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 68d42ae2-0104-4ac3-b053-06ece52e5d63
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 89072fec5a7c0914a98057625c3cf801, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 1e3b0121-2c1f-4b58-906e-a696d706075b
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: f0658f9caf6a8244ab73bc2234bb6d63, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 733bb592-540c-41b5-8451-82bde4daa6a7
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 9c80498e54315144fae2e9f6fa11d883, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: dbb289a3-12e3-4ac5-9ae3-1c12a6d35a0d
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -958,99 +934,75 @@ MonoBehaviour:
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 10cbe978622a5f64ba8c313653472d56, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: d5499b18-f0f7-4d26-90cf-57fb9d7a8508
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 23e6e3782419f6147905ea08f21e16cd, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: f3cd8c73-929a-4db0-96ba-cc29feac0f3b
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: b39287b7f94274044a98fba8e68bef64, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 74c07747-df6d-4cda-9942-b5109591df4b
+ m_Id:
m_Processors:
m_Interactions:
- m_SingletonActionBindings:
- - m_Name:
- m_Id: d609003f-712e-4556-b8e3-e78809a99383
- m_Path: /v
- m_Interactions:
- m_Processors:
- m_Groups:
- m_Action: Action
- m_Flags: 0
+ m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: d73f488e774a3d84a87f593f8c887446, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 751e0e45-2b25-4327-ac32-711706725093
+ m_Id:
m_Processors:
m_Interactions:
- m_SingletonActionBindings:
- - m_Name:
- m_Id: d47c8496-182f-4974-b546-db94a83b2883
- m_Path: /w
- m_Interactions:
- m_Processors:
- m_Groups:
- m_Action: Action
- m_Flags: 0
+ m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: d0e8f3b0a3327da438d6a466ca7f61fd, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 6d263191-c34f-4098-9bdd-ec2e12fd9372
+ m_Id:
m_Processors:
m_Interactions:
- m_SingletonActionBindings:
- - m_Name:
- m_Id: 9ce65bca-b749-431b-a2d4-ce749ed4ecb7
- m_Path: /x
- m_Interactions:
- m_Processors:
- m_Groups:
- m_Action: Action
- m_Flags: 0
+ m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: b3e74cf01fc54914e85cb512772b64f6, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 35408ed3-adcf-4a59-aed9-a34d2eff5a69
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: c71671b11b882b147b6fda9225953ff6, type: 3}
action:
- m_Name: Action
+ m_Name:
m_Type: 0
m_ExpectedControlType:
- m_Id: 83507c6e-7344-4683-88f4-5a01adae2e5e
+ m_Id:
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- - deviceType: 1
+ - deviceName: Xbox
tmpAsset: {fileID: 11400000, guid: a9884dbd0c554f84e98b897e8d102224, type: 2}
entries:
- Sprite: {fileID: 8421626264597569168, guid: f0714a2ef632db7458e3bb7459d85e0f, type: 3}
@@ -1058,7 +1010,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 7531ffae-34f3-453f-9562-67e304cbdcb9
+ m_Id: 8a1f78d0-42a5-4e47-9b23-f7b66c001a2f
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1068,7 +1020,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 3af914f7-6616-4291-8eed-b5518d84e586
+ m_Id: 33f74ac9-582c-4657-b830-1d931dfcb431
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1078,12 +1030,22 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 9fcdcb21-7df6-4e03-a133-bdaf1308e12c
+ m_Id: 411dbae2-fcc5-4b1e-8ce0-232dbcfb4d52
+ m_Processors:
+ m_Interactions:
+ m_SingletonActionBindings: []
+ m_Flags: 0
+ - Sprite: {fileID: 21300000, guid: 2c5cd4172eda38348be2e80d2f54b6f5, type: 3}
+ action:
+ m_Name: Action
+ m_Type: 0
+ m_ExpectedControlType:
+ m_Id: c6e77f58-443b-41e9-b5e5-caa22dd3f1eb
m_Processors:
m_Interactions:
m_SingletonActionBindings:
- m_Name:
- m_Id: 3f1e1cfe-7368-4602-8a37-2fb4d102ff72
+ m_Id: 7006f360-644e-4fd8-bf90-78f6938a3b35
m_Path: /buttonEast
m_Interactions:
m_Processors:
@@ -1091,22 +1053,12 @@ MonoBehaviour:
m_Action: Action
m_Flags: 0
m_Flags: 0
- - Sprite: {fileID: 21300000, guid: 2c5cd4172eda38348be2e80d2f54b6f5, type: 3}
- action:
- m_Name: Action
- m_Type: 0
- m_ExpectedControlType:
- m_Id: b05ffe3d-2966-444d-aea2-280e64f067ba
- m_Processors:
- m_Interactions:
- m_SingletonActionBindings: []
- m_Flags: 0
- Sprite: {fileID: 21300000, guid: 55f3a9c5022385b4ca905566c221dec3, type: 3}
action:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 1dcf84af-b28d-4700-94ae-d6f72eba138a
+ m_Id: 890b1c70-0e58-45c6-a48b-0e79075714c2
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1116,7 +1068,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 935ff114-69de-40ec-a7e8-c2d80e5738a9
+ m_Id: e55a6fe2-6a7c-4ce7-b3b4-bc404b6864c3
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1126,7 +1078,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: ffeed659-3914-496c-adb2-79992a098dfe
+ m_Id: be6a2bf9-7170-4187-b32d-606cb3d52e8d
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1136,7 +1088,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 4e3fa6c0-1ece-4f7a-8e33-a02c2df0e356
+ m_Id: f2510e82-c08f-4b02-b431-005b82f496bb
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1146,25 +1098,17 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 17b4c207-420a-4407-9f9c-f7442a3ca84e
+ m_Id: 5e366201-4acc-487d-9871-e28c5f469a89
m_Processors:
m_Interactions:
- m_SingletonActionBindings:
- - m_Name:
- m_Id: 39402d9e-da1f-451e-a47f-aacf48d49927
- m_Path: /leftStick/up
- m_Interactions:
- m_Processors:
- m_Groups:
- m_Action: Action
- m_Flags: 0
+ m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: cbbccc79d82977243a56eadfa73b29bd, type: 3}
action:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 1799ef56-691d-490a-9f9f-51122bae7a94
+ m_Id: c3d85b08-648b-43a0-878f-59bab8260f2e
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1174,7 +1118,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: a3bc814a-e2ca-440e-b513-78096f1552cf
+ m_Id: 0454b8d4-83bb-49a1-875f-e37a13d9c64a
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1184,7 +1128,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: ce5db0c5-e960-402e-a0aa-74bf141944aa
+ m_Id: ff0b288a-95e0-44eb-867c-0b4a4485bdbe
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1194,25 +1138,17 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 63f6b96c-a6b1-40b6-ad75-4e93f75d26dd
+ m_Id: be292828-9ed6-43f3-be36-99f05dadd8a6
m_Processors:
m_Interactions:
- m_SingletonActionBindings:
- - m_Name:
- m_Id: cbe219ff-6d81-41ad-aab2-acce5b4fb2ae
- m_Path: /leftStick
- m_Interactions:
- m_Processors:
- m_Groups:
- m_Action: Action
- m_Flags: 0
+ m_SingletonActionBindings: []
m_Flags: 0
- Sprite: {fileID: 21300000, guid: 9c085631d8a5e444ca87695d7fa85ca9, type: 3}
action:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 6685f578-7872-4781-a732-211a00d1344b
+ m_Id: e9e9284a-205c-4fd8-b494-b748706c089c
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1222,7 +1158,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 2743e1b6-5949-442a-b24b-fee1f94cde2c
+ m_Id: 9b21976c-7aa4-4f95-800a-b13094ff980f
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1232,7 +1168,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 595188b6-7d65-435b-8d67-c9a41249d57f
+ m_Id: 3649ad97-e15c-422c-994b-566f563697d7
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1242,7 +1178,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 87e3e5b7-cebf-4751-882a-be2fb3a56f51
+ m_Id: 65a7b7b3-74d2-402d-9da0-26e28ec4357b
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1252,7 +1188,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: aa7f2ef2-cc5d-4548-a2d9-ec99a25c0f21
+ m_Id: 1dbf79fb-6367-4c5d-bbfe-bd7a90471070
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1262,7 +1198,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: cf72fb40-0025-4ee1-8380-0b56c95fd652
+ m_Id: 75e974f8-5b8e-41b8-989f-882632cf04f5
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1272,7 +1208,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: c12edd10-be5e-40d6-9036-f2953b6ae55c
+ m_Id: 1eac6ab8-c6c3-453f-9016-7c0f10ae66fd
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1282,7 +1218,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 706d5a3d-225e-49b5-8463-76825ac98ae0
+ m_Id: 30d7d609-85ae-4e1b-99f7-8222b3560022
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1292,7 +1228,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 12a66a53-45b6-4c9f-af83-32f0f7c6b010
+ m_Id: ae148d8d-5506-4412-a298-f9d07e3c71a5
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1302,7 +1238,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: b4f5f0f4-805c-41f9-aa40-ba660400f9bd
+ m_Id: 1e2800c7-500d-4bfb-b421-b8b8654aca73
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1312,7 +1248,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 2c3e921b-1d77-46ba-85cf-2acd2f77c955
+ m_Id: eb6450a3-cd9d-4a8a-987e-603a4730f6db
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1322,7 +1258,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: b9efe46c-067b-4fe8-9368-78b8b0852214
+ m_Id: 0ae785cb-0ffc-4b6f-9122-ae8509d5f5f4
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1332,7 +1268,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 11842326-9337-4e89-a09b-233942036729
+ m_Id: caae6ef7-5752-4f52-8345-0ec72584ff40
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1342,7 +1278,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: bfbc5bab-0a33-4b03-a67a-7993b83975fd
+ m_Id: 07e9ccf3-692f-4b0d-b1a4-35a246370ae1
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1352,7 +1288,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 22910186-c068-4b4a-b15c-2edb0d963f74
+ m_Id: 08e82f3a-6ff7-49e3-8240-5721c30cfe79
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1362,7 +1298,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: ca3d64aa-c460-4f14-9b56-ae29789c8b92
+ m_Id: 5dd9cc07-d9a2-436a-a159-f6f7bcf09b9c
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1372,7 +1308,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 4735a54d-1234-4def-a76b-32cc849cc595
+ m_Id: 376faf27-a107-49c8-9af1-cd3991be464c
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1382,7 +1318,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 5e7c2b27-d6bb-4ea0-91fe-5530c4c03c04
+ m_Id: 64f673a5-4338-4b9a-b1d3-a90b6d40d32b
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1392,7 +1328,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 68c20724-5a91-4770-aea5-77d8ee58ea81
+ m_Id: 4ecbaeab-8593-476a-9c17-7d5bd9edcda8
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1402,7 +1338,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: ac840306-6a9a-42c4-9108-a86b411dc6db
+ m_Id: 42a7ae34-7694-4f97-9f6b-1e6b173909ec
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1412,7 +1348,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: d5055ed4-1af9-4eae-bc0d-3c8f64afa1ef
+ m_Id: 2c9cd7f8-59ba-457d-ae75-5953cab2e6be
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1422,7 +1358,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 4ccc5072-66e8-4bf7-aae8-52397d5bc43a
+ m_Id: 71011b76-2b7d-4cac-8e11-d54d51922b69
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1432,7 +1368,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 2344b4be-c99b-44d5-8713-bb492772fe73
+ m_Id: ea2faf54-f96c-40ff-abb8-84f4d5f24b09
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1442,7 +1378,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: e4f7c5e5-7ade-46a1-9725-e042cc3048e1
+ m_Id: 7d30d6a7-abb5-4dc7-94c3-f4669357f26f
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1452,7 +1388,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: a27a58d6-8097-4897-af4f-cd04d97f9359
+ m_Id: 2a85741d-b8fd-4bb9-824d-4f27eb017412
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1462,7 +1398,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 3dd07f61-cf18-4ab9-9821-4e761f0be825
+ m_Id: 1d74303b-7c90-4923-b7ac-e0f7a68de987
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1472,7 +1408,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 58035cd5-7ad9-4cd2-b481-d3298ef2aab2
+ m_Id: 50294241-b4df-470d-bd8b-269de7aed116
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1482,7 +1418,7 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: e912bfd3-0e98-4366-a89d-f05a6446708f
+ m_Id: b0ac67a9-b9ca-4075-8d1f-4a9b2acaf878
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -1492,14 +1428,12 @@ MonoBehaviour:
m_Name: Action
m_Type: 0
m_ExpectedControlType:
- m_Id: 3c78fcf8-3a35-4985-8787-5c56a645f710
+ m_Id: 2d6d9a0d-3212-4016-8b0c-e1b8e61c212a
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
- - deviceType: 2
+ - deviceName: PlayStation
tmpAsset: {fileID: 0}
entries: []
- - deviceType: 3
- tmpAsset: {fileID: 11400000, guid: d86f5dbf588185247a5fce74f7485d46, type: 2}
- entries: []
+ placeholderSprite: {fileID: 21300000, guid: 068091d572066f043aa79b9beace61ea, type: 2}
diff --git a/Client/Assets/InputGlyph/InputGlyphDatabase.cs b/Client/Assets/InputGlyph/InputGlyphDatabase.cs
index b9d9827..397981a 100644
--- a/Client/Assets/InputGlyph/InputGlyphDatabase.cs
+++ b/Client/Assets/InputGlyph/InputGlyphDatabase.cs
@@ -16,7 +16,8 @@ namespace AlicizaX.InputGlyph
[Serializable]
public class DeviceGlyphTable
{
- public InputDeviceWatcher.InputDeviceCategory deviceType;
+ // 改为使用字符串名称来区分 table（会序列化）
+ public string deviceName;
public TMP_SpriteAsset tmpAsset;
public List entries = new List();
}
@@ -26,28 +27,69 @@ namespace AlicizaX.InputGlyph
{
public List tables = new List();
- public DeviceGlyphTable GetTable(InputDeviceWatcher.InputDeviceCategory device)
+ // 当 FindEntryByControlPath 传空 path 时返回的占位 sprite
+ public Sprite placeholderSprite;
+
+ // 按名字获取 table（name 精确匹配，不区分大小写）
+ public DeviceGlyphTable GetTable(string deviceName)
{
+ if (string.IsNullOrEmpty(deviceName)) return null;
if (tables == null) return null;
for (int i = 0; i < tables.Count; ++i)
- if (tables[i].deviceType == device)
- return tables[i];
+ {
+ var t = tables[i];
+ if (t == null) continue;
+ if (string.Equals(t.deviceName, deviceName, StringComparison.OrdinalIgnoreCase))
+ return t;
+ }
+
return null;
}
+ // 为兼容保留：接受枚举并映射为常用名称（Keyboard, Xbox, PlayStation）
+ public DeviceGlyphTable GetTable(InputDeviceWatcher.InputDeviceCategory device)
+ {
+ string name = "Other";
+ switch (device)
+ {
+ 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
+ }
+
+ return GetTable(name);
+ }
+
+ public Sprite FindSprite(string controlPath, InputDeviceWatcher.InputDeviceCategory device)
+ {
+ var entry = FindEntryByControlPath(controlPath, device);
+ if (string.IsNullOrEmpty(controlPath) || entry == null)
+ {
+ return placeholderSprite;
+ }
+
+ return entry.Sprite;
+ }
+
public GlyphEntry FindEntryByControlPath(string controlPath, InputDeviceWatcher.InputDeviceCategory device)
{
- if (string.IsNullOrEmpty(controlPath)) return null;
var t = GetTable(device);
if (t != null)
{
for (int i = 0; i < t.entries.Count; ++i)
{
var e = t.entries[i];
- if (e.action.controls.Count <= 0) continue;
-
- var matchPath = $"{e.action.controls[0].device.displayName}/{e.action.controls[0].displayName}";
- if (string.Equals(matchPath, controlPath, StringComparison.OrdinalIgnoreCase)) return e;
+ if (e == null) continue;
+ if (e.action == null) continue;
+ if (e.action.bindings.Count <= 0) continue;
+ foreach (var binding in e.action.bindings)
+ {
+ if (string.Equals(controlPath, binding.path, StringComparison.OrdinalIgnoreCase))
+ {
+ return e;
+ }
+ }
}
}
diff --git a/Client/Assets/InputGlyph/InputGlyphDatabaseEditor.cs b/Client/Assets/InputGlyph/InputGlyphDatabaseEditor.cs
index 5606285..90ea3f7 100644
--- a/Client/Assets/InputGlyph/InputGlyphDatabaseEditor.cs
+++ b/Client/Assets/InputGlyph/InputGlyphDatabaseEditor.cs
@@ -12,26 +12,45 @@ using TMPro;
public class InputGlyphDatabaseEditor : Editor
{
SerializedProperty tablesProp;
+ SerializedProperty placeholderSpriteProp;
InputGlyphDatabase db;
+ // 动态标签索引（范围：0 .. tablesCount 为各表，最后一个 index = tablesCount 为 Settings）
int tabIndex = 0;
- string[] tabNames = new string[] { "Keyboard", "Xbox", "PlayStation", "Other" };
- // Pagination
- const int itemsPerPage = 10; // 10 items per page as requested
- int currentPage = 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()
{
db = target as InputGlyphDatabase;
tablesProp = serializedObject.FindProperty("tables");
+ placeholderSpriteProp = serializedObject.FindProperty("placeholderSprite");
- // Ensure serialized list exists
if (tablesProp == null)
{
- // If the field name is different, user should fix it in their class or here.
Debug.LogError("Could not find serialized property 'tables' on InputGlyphDatabase. Check field name.");
+ return;
}
+
+ // 如果没有默认的 Keyboard/Xbox/PlayStation 三个表则确保创建（便于迁移）
+ EnsureDefaultTable("Keyboard");
+ EnsureDefaultTable("Xbox");
+ EnsureDefaultTable("PlayStation");
+
+ // 初始化 editor 状态列表，长度与 tablesProp 对应
+ SyncEditorListsWithTables();
}
public override void OnInspectorGUI()
@@ -39,163 +58,328 @@ public class InputGlyphDatabaseEditor : Editor
serializedObject.Update();
if (db == null || tablesProp == null) return;
- EditorGUILayout.Space();
- tabIndex = GUILayout.Toolbar(tabIndex, tabNames, GUILayout.Height(24));
- var curDevice = (InputDeviceWatcher.InputDeviceCategory)tabIndex;
+ // 顶部工具栏（与 Save 按钮风格一致），同时放置 Settings 按钮
+ EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+ GUILayout.Space(4);
- // Ensure all 4 tables exist (serialized-safe)
- EnsureTableFor(InputDeviceWatcher.InputDeviceCategory.Keyboard);
- EnsureTableFor(InputDeviceWatcher.InputDeviceCategory.Xbox);
- EnsureTableFor(InputDeviceWatcher.InputDeviceCategory.PlayStation);
-
- var tableProp = GetTablePropertyFor(curDevice);
- if (tableProp == null)
- {
- EditorGUILayout.HelpBox("Table not found (this should not happen).", MessageType.Warning);
- serializedObject.ApplyModifiedProperties();
- return;
- }
-
- EditorGUILayout.BeginVertical("box");
- EditorGUILayout.LabelField(curDevice.ToString(), EditorStyles.boldLabel);
-
- var tmpAssetProp = tableProp.FindPropertyRelative("tmpAsset");
- EditorGUILayout.PropertyField(tmpAssetProp, new GUIContent("TMP Sprite Asset"));
-
- EditorGUILayout.BeginHorizontal();
- if (GUILayout.Button("Parse TMP Asset"))
- {
- ParseTMPAssetIntoTableSerialized(tableProp);
- }
-
- if (GUILayout.Button("Clear"))
- {
- var entriesProp = tableProp.FindPropertyRelative("entries");
- entriesProp.arraySize = 0;
- serializedObject.ApplyModifiedProperties();
- EditorUtility.SetDirty(db);
- currentPage = 0;
- }
-
- EditorGUILayout.EndHorizontal();
-
- EditorGUILayout.Space();
-
- var entries = tableProp.FindPropertyRelative("entries");
- if (entries != null)
- {
- int total = entries.arraySize;
- int totalPages = Mathf.Max(1, (total + itemsPerPage - 1) / itemsPerPage);
- currentPage = Mathf.Clamp(currentPage, 0, totalPages - 1);
-
- // Pagination controls
- EditorGUILayout.BeginHorizontal();
- if (GUILayout.Button("<<", GUILayout.Width(40))) { currentPage = 0; }
- if (GUILayout.Button("<", GUILayout.Width(40))) { currentPage = Mathf.Max(0, currentPage - 1); }
-
- GUILayout.FlexibleSpace();
- EditorGUILayout.LabelField(string.Format("Page {0}/{1}", currentPage + 1, totalPages), GUILayout.Width(100));
- GUILayout.FlexibleSpace();
-
- if (GUILayout.Button(">", GUILayout.Width(40))) { currentPage = Mathf.Min(totalPages - 1, currentPage + 1); }
- if (GUILayout.Button(">>", GUILayout.Width(40))) { currentPage = totalPages - 1; }
- EditorGUILayout.EndHorizontal();
-
- EditorGUILayout.Space(4);
-
- int start = currentPage * itemsPerPage;
- int end = Mathf.Min(start + itemsPerPage, total);
-
- for (int i = start; i < end; ++i)
- {
- var eProp = entries.GetArrayElementAtIndex(i);
-
- if (eProp == null) continue;
-
- using (new EditorGUILayout.HorizontalScope("box"))
- {
- // Left column: sprite preview (fixed width)
- using (new EditorGUILayout.VerticalScope(GUILayout.Width(80)))
- {
- var spriteProp = eProp.FindPropertyRelative("Sprite");
- Sprite s = spriteProp.objectReferenceValue as Sprite;
- EditorGUILayout.LabelField(s != null ? s.name : "", EditorStyles.boldLabel);
-
- if (s != null)
- {
- Texture2D preview = AssetPreview.GetAssetPreview(s);
- if (preview == null) preview = AssetPreview.GetMiniThumbnail(s);
- if (preview != null)
- {
- GUILayout.Label(preview, GUILayout.Width(64), GUILayout.Height(64));
- }
- else
- {
- EditorGUILayout.PropertyField(spriteProp, GUIContent.none, GUILayout.Width(64), GUILayout.Height(64));
- }
- }
- else
- {
- EditorGUILayout.PropertyField(spriteProp, GUIContent.none, GUILayout.Width(64), GUILayout.Height(64));
- }
- }
-
- // Right column: path + action should take the remaining width
- EditorGUILayout.BeginVertical();
-
- var actionProp = eProp.FindPropertyRelative("action");
- EditorGUILayout.Space(2);
-
- EditorGUILayout.PropertyField(actionProp, GUIContent.none, GUILayout.ExpandWidth(true));
- // if (glyphEntry != null && glyphEntry.action != null)
- // {
- //
- // }
- EditorGUILayout.EndVertical();
- }
-
- EditorGUILayout.Space(6);
- }
- }
-
- EditorGUILayout.EndVertical();
-
- EditorGUILayout.Space();
- if (GUILayout.Button("Save Asset"))
+ if (GUILayout.Button("Save Asset", EditorStyles.toolbarButton))
{
serializedObject.ApplyModifiedProperties();
EditorUtility.SetDirty(db);
AssetDatabase.SaveAssets();
}
+ 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);
+ GUILayout.Label("Name:", GUILayout.Width(40));
+ newTableName = EditorGUILayout.TextField(newTableName);
+ if (GUILayout.Button("Add", EditorStyles.toolbarButton, GUILayout.Width(80)))
+ {
+ string trimmed = newTableName != null ? newTableName.Trim() : "";
+ if (string.IsNullOrEmpty(trimmed))
+ {
+ EditorUtility.DisplayDialog("Invalid Name", "Table name cannot be empty.", "OK");
+ }
+ else
+ {
+ // 唯一性检查（不区分大小写）
+ bool exists = false;
+ for (int i = 0; i < tablesProp.arraySize; ++i)
+ {
+ var t = tablesProp.GetArrayElementAtIndex(i);
+ var nameProp = t.FindPropertyRelative("deviceName");
+ if (nameProp != null && string.Equals(nameProp.stringValue, trimmed, StringComparison.OrdinalIgnoreCase))
+ {
+ exists = true; break;
+ }
+ }
+ if (exists)
+ {
+ EditorUtility.DisplayDialog("Duplicate", "A table with that name already exists.", "OK");
+ }
+ else
+ {
+ int newIndex = tablesProp.arraySize;
+ tablesProp.InsertArrayElementAtIndex(newIndex);
+ var newTable = tablesProp.GetArrayElementAtIndex(newIndex);
+ var nameProp = newTable.FindPropertyRelative("deviceName");
+ if (nameProp != null) nameProp.stringValue = trimmed;
+ var tmpAssetProp = newTable.FindPropertyRelative("tmpAsset");
+ if (tmpAssetProp != null) tmpAssetProp.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
+ }
+ }
+ }
+ if (GUILayout.Button("Cancel", EditorStyles.toolbarButton, GUILayout.Width(80)))
+ {
+ showAddField = false;
+ newTableName = "";
+ }
+
+ EditorGUILayout.EndHorizontal();
+ }
+
+ EditorGUILayout.Space(6);
+
+ // 绘制标签行（来自 tables 的 deviceName），但不再包含 Settings（Settings 已在上方 toolbar）
+ EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+ int tablesCount = tablesProp.arraySize;
+ for (int i = 0; i < tablesCount; ++i)
+ {
+ var t = tablesProp.GetArrayElementAtIndex(i);
+ 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"))
+ {
+ tablesProp.DeleteArrayElementAtIndex(i);
+ serializedObject.ApplyModifiedProperties();
+ EditorUtility.SetDirty(db);
+
+ // 调整 tabIndex 与 editor 状态
+ SyncEditorListsWithTables();
+ tabIndex = Mathf.Clamp(tabIndex, 0, Math.Max(0, tablesProp.arraySize - 1));
+ return; // 直接返回防止继续绘制已修改的 serializedObject
+ }
+ }
+ }
+
+ EditorGUILayout.EndHorizontal();
+
+ EditorGUILayout.Space(8);
+
+ // 绘制选中页内容（如果是 Settings 或某个 table）
+ EditorGUILayout.BeginVertical("box");
+ if (tabIndex == tablesProp.arraySize)
+ {
+ // Settings 页
+ EditorGUILayout.LabelField("Settings", EditorStyles.boldLabel);
+ EditorGUILayout.Space(4);
+ EditorGUILayout.PropertyField(placeholderSpriteProp, new GUIContent("Placeholder Sprite"));
+ Sprite placeholder = placeholderSpriteProp.objectReferenceValue as Sprite;
+ EditorGUILayout.Space(6);
+ EditorGUILayout.LabelField("Preview", EditorStyles.miniBoldLabel);
+ if (placeholder != null)
+ {
+ Texture2D preview = AssetPreview.GetAssetPreview(placeholder);
+ if (preview == null) preview = AssetPreview.GetMiniThumbnail(placeholder);
+ if (preview != null) GUILayout.Label(preview, GUILayout.Width(previewSize), GUILayout.Height(previewSize));
+ else EditorGUILayout.ObjectField(placeholder, typeof(Sprite), false, GUILayout.Width(previewSize), GUILayout.Height(previewSize));
+ }
+ else
+ {
+ EditorGUILayout.HelpBox("No placeholder sprite assigned. If FindEntryByControlPath receives an empty path, it will return null.", MessageType.Info);
+ }
+ }
+ else
+ {
+ // Table 页
+ if (tabIndex < 0 || tabIndex >= tablesProp.arraySize)
+ {
+ EditorGUILayout.HelpBox("Invalid table index.", MessageType.Error);
+ }
+ 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);
+ GUILayout.EndHorizontal();
+
+ EditorGUILayout.Space(6);
+
+ // 将 TMP Sprite Asset 的选择框 与 Parse / Clear 按钮 水平显示
+ 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("Clear", GUILayout.Width(80)))
+ {
+ var entriesProp = tableProp.FindPropertyRelative("entries");
+ if (entriesProp != null) entriesProp.arraySize = 0;
+ serializedObject.ApplyModifiedProperties();
+ EditorUtility.SetDirty(db);
+ currentPages[tabIndex] = 0;
+ }
+ EditorGUILayout.EndHorizontal();
+
+ EditorGUILayout.Space(6);
+
+ var entries = tableProp.FindPropertyRelative("entries");
+ 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)
+ {
+ var eProp = entries.GetArrayElementAtIndex(i);
+ if (eProp == null) continue;
+ var spriteProp = eProp.FindPropertyRelative("Sprite");
+ Sprite s = spriteProp.objectReferenceValue as Sprite;
+ string name = s != null ? s.name : "";
+ if (string.IsNullOrEmpty(query) || name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0)
+ {
+ matchedIndices.Add(i);
+ }
+ }
+
+ int matchedTotal = matchedIndices.Count;
+ 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); }
+
+ GUILayout.FlexibleSpace();
+ EditorGUILayout.LabelField(string.Format("Page {0}/{1}", currentPages[tabIndex] + 1, totalPages), GUILayout.Width(120));
+ GUILayout.FlexibleSpace();
+
+ if (GUILayout.Button(">", EditorStyles.miniButtonMid, GUILayout.Width(36))) { currentPages[tabIndex] = Mathf.Min(totalPages - 1, currentPages[tabIndex] + 1); }
+ if (GUILayout.Button(">>", EditorStyles.miniButtonRight, GUILayout.Width(36))) { currentPages[tabIndex] = totalPages - 1; }
+ EditorGUILayout.EndHorizontal();
+
+ EditorGUILayout.Space(4);
+
+ int start = currentPages[tabIndex] * itemsPerPage;
+ int end = Math.Min(start + itemsPerPage, matchedTotal);
+
+ for (int mi = start; mi < end; ++mi)
+ {
+ int i = matchedIndices[mi];
+ 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");
+ Sprite s = spriteProp.objectReferenceValue as Sprite;
+ EditorGUILayout.LabelField(s != null ? s.name : "", EditorStyles.boldLabel);
+
+ if (s != null)
+ {
+ Texture2D preview = AssetPreview.GetAssetPreview(s);
+ if (preview == null) preview = AssetPreview.GetMiniThumbnail(s);
+ if (preview != null)
+ {
+ GUILayout.Label(preview, GUILayout.Width(previewSize), GUILayout.Height(previewSize));
+ }
+ else
+ {
+ EditorGUILayout.PropertyField(spriteProp, GUIContent.none, GUILayout.Width(previewSize), GUILayout.Height(previewSize));
+ }
+ }
+ else
+ {
+ EditorGUILayout.PropertyField(spriteProp, GUIContent.none, GUILayout.Width(previewSize), GUILayout.Height(previewSize));
+ }
+ }
+
+ // 右列 action 字段
+ EditorGUILayout.BeginVertical();
+ var actionProp = eProp.FindPropertyRelative("action");
+ EditorGUILayout.Space(2);
+ EditorGUILayout.PropertyField(actionProp, GUIContent.none, GUILayout.ExpandWidth(true));
+ EditorGUILayout.EndVertical();
+ }
+
+ EditorGUILayout.Space(4);
+ }
+
+ if (matchedTotal == 0)
+ {
+ EditorGUILayout.HelpBox("No entries match the search.", MessageType.Info);
+ }
+ }
+ }
+ }
+
+ EditorGUILayout.EndVertical();
+
+ EditorGUILayout.Space(6);
+
serializedObject.ApplyModifiedProperties();
}
- // Ensure a table for the device exists. Uses serialized properties (adds element if necessary).
- void EnsureTableFor(InputDeviceWatcher.InputDeviceCategory device)
+ // Ensure table with name exists (用于初次迁移)
+ void EnsureDefaultTable(string name)
{
if (tablesProp == null) return;
-
- // Search existing entries
for (int i = 0; i < tablesProp.arraySize; ++i)
{
var t = tablesProp.GetArrayElementAtIndex(i);
- var devProp = t.FindPropertyRelative("deviceType");
- if (devProp != null && devProp.enumValueIndex == (int)device)
- return; // exists
+ var nameProp = t.FindPropertyRelative("deviceName");
+ if (nameProp != null && string.Equals(nameProp.stringValue, name, StringComparison.OrdinalIgnoreCase))
+ return;
}
- // Not found -> append new element
int idx = tablesProp.arraySize;
- tablesProp.InsertArrayElementAtIndex(idx); // Inserts a copy if exists, otherwise default
+ tablesProp.InsertArrayElementAtIndex(idx);
var newTable = tablesProp.GetArrayElementAtIndex(idx);
-
- var deviceTypeProp = newTable.FindPropertyRelative("deviceType");
- if (deviceTypeProp != null) deviceTypeProp.enumValueIndex = (int)device;
-
+ var deviceNameProp = newTable.FindPropertyRelative("deviceName");
+ if (deviceNameProp != null) deviceNameProp.stringValue = name;
var tmpAssetProp = newTable.FindPropertyRelative("tmpAsset");
if (tmpAssetProp != null) tmpAssetProp.objectReferenceValue = null;
-
var entriesProp = newTable.FindPropertyRelative("entries");
if (entriesProp != null) entriesProp.arraySize = 0;
@@ -203,22 +387,26 @@ public class InputGlyphDatabaseEditor : Editor
EditorUtility.SetDirty(db);
}
- // Return the SerializedProperty representing the DeviceGlyphTable that matches device
- SerializedProperty GetTablePropertyFor(InputDeviceWatcher.InputDeviceCategory device)
+ void SyncEditorListsWithTables()
{
- if (tablesProp == null) return null;
- for (int i = 0; i < tablesProp.arraySize; ++i)
- {
- var t = tablesProp.GetArrayElementAtIndex(i);
- var devProp = t.FindPropertyRelative("deviceType");
- if (devProp != null && devProp.enumValueIndex == (int)device)
- return t;
- }
+ int count = tablesProp != null ? tablesProp.arraySize : 0;
+ if (searchStrings == null) searchStrings = new List();
+ if (currentPages == null) currentPages = new List();
- return null;
+ while (searchStrings.Count < count) searchStrings.Add("");
+ while (currentPages.Count < count) currentPages.Add(0);
+
+ while (searchStrings.Count > count) searchStrings.RemoveAt(searchStrings.Count - 1);
+ while (currentPages.Count > count) currentPages.RemoveAt(currentPages.Count - 1);
}
- // Parse TMP Sprite Asset and populate entries (serialized)
+ void EnsureEditorListsLength()
+ {
+ if (tablesProp == null) return;
+ SyncEditorListsWithTables();
+ }
+
+ // Parse TMP Sprite Asset into table (保持你原有实现)
void ParseTMPAssetIntoTableSerialized(SerializedProperty tableProp)
{
if (tableProp == null) return;
@@ -249,20 +437,12 @@ public class InputGlyphDatabaseEditor : Editor
var glyph = ch.glyph as TMP_SpriteGlyph;
if (glyph != null && glyph.sprite != null) s = glyph.sprite;
}
- catch
- {
- }
+ catch { }
if (s == null && atlas != null)
{
- try
- {
- s = atlas.GetSprite(name);
- }
- catch
- {
- s = null;
- }
+ try { s = atlas.GetSprite(name); }
+ catch { s = null; }
if (s == null)
{
@@ -271,9 +451,7 @@ 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 { }
}
}
@@ -313,14 +491,10 @@ public class InputGlyphDatabaseEditor : Editor
}
}
- // Create new entry and assign fields
int newIndex = entriesProp.arraySize;
entriesProp.InsertArrayElementAtIndex(newIndex);
var entryProp = entriesProp.GetArrayElementAtIndex(newIndex);
-
var spriteProp = entryProp.FindPropertyRelative("Sprite");
-
-
if (spriteProp != null) spriteProp.objectReferenceValue = s;
}
@@ -351,9 +525,7 @@ public class InputGlyphDatabaseEditor : Editor
var val = p.GetValue(asset, null) as SpriteAtlas;
if (val != null) return val;
}
- catch
- {
- }
+ catch { }
}
}
diff --git a/Client/Assets/InputGlyph/InputGlyphImage.cs b/Client/Assets/InputGlyph/InputGlyphImage.cs
index c9f9f62..802e4ff 100644
--- a/Client/Assets/InputGlyph/InputGlyphImage.cs
+++ b/Client/Assets/InputGlyph/InputGlyphImage.cs
@@ -31,8 +31,7 @@ public class InputGlyphImage : MonoBehaviour
{
if (actionReference == null || actionReference.action == null || targetImage == null) return;
InputDeviceWatcher.InputDeviceCategory deviceCategory = InputDeviceWatcher.CurrentCategory;
- string path = GlyphService.GetBindingControlPath(actionReference);
- if (GlyphService.TryGetUISpriteForActionPath(path, deviceCategory, out Sprite sprite))
+ if (GlyphService.TryGetUISpriteForActionPath(actionReference, deviceCategory, out Sprite sprite))
{
targetImage.sprite = sprite;
}
diff --git a/Client/Assets/InputGlyph/TestRebindScript.cs b/Client/Assets/InputGlyph/TestRebindScript.cs
index 5ff9cb8..a24dfb7 100644
--- a/Client/Assets/InputGlyph/TestRebindScript.cs
+++ b/Client/Assets/InputGlyph/TestRebindScript.cs
@@ -1,4 +1,5 @@
// TestRebindScript.cs
+
using System;
using System.Threading.Tasks;
using TMPro;
@@ -9,23 +10,19 @@ using UnityEngine.UI;
public class TestRebindScript : MonoBehaviour
{
- [Header("UI")]
- public UXButton btn;
+ [Header("UI")] public UXButton btn;
public TextMeshProUGUI bindKeyText;
public Image targetImage;
[Tooltip("如果不使用 actionReference，则用 name 在全局 manager 查找")]
public string actionName = "movement";
- [Header("Optional composite part (WASD style)")]
- [Tooltip("如果需要绑定 composite 的某一部分（例如 Up/Down/Left/Right），填这个；留空表示绑定非 composite 或整体 binding")]
+ [Header("Optional composite part (WASD style)")] [Tooltip("如果需要绑定 composite 的某一部分（例如 Up/Down/Left/Right），填这个；留空表示绑定非 composite 或整体 binding")]
public string compositePartName = "";
- [Header("Behavior")]
- [Tooltip("如果 true，在 Prepare 后自动调用 ConfirmApply() 并保存；否则等待手动 ConfirmPrepared()/CancelPrepared()")]
+ [Header("Behavior")] [Tooltip("如果 true，在 Prepare 后自动调用 ConfirmApply() 并保存；否则等待手动 ConfirmPrepared()/CancelPrepared()")]
public bool autoConfirm = false;
- private int targetBindingIndex = -1;
private IDisposable prepareSub;
private IDisposable applySub;
private IDisposable rebindEndSub;
@@ -34,8 +31,6 @@ public class TestRebindScript : MonoBehaviour
{
if (btn != null) btn.onClick.AddListener(OnBtnClicked);
InputDeviceWatcher.OnDeviceChanged += OnDeviceChanged;
-
- ResolveBindingIndex();
UpdateBindingText();
if (InputBindingManager.Instance != null)
@@ -74,26 +69,13 @@ public class TestRebindScript : MonoBehaviour
return InputBindingManager.Action(actionName);
}
- private void ResolveBindingIndex()
- {
- var action = GetAction();
- if (action == null)
- {
- Debug.LogError($"TestRebindScript: Action not found ('{actionName}').");
- targetBindingIndex = -1;
- return;
- }
-
- // Ask manager to choose best index for keyboard and optional composite part
- targetBindingIndex = InputBindingManager.Instance.FindBestBindingIndexForKeyboard(action, string.IsNullOrEmpty(compositePartName) ? null : compositePartName);
- }
private bool IsTargetContext(InputRemapper.InputBindingManager.RebindContext ctx)
{
if (ctx == null || ctx.action == null) return false;
var action = GetAction();
if (action == null) return false;
- return ctx.action == action && ctx.bindingIndex == targetBindingIndex;
+ return ctx.action == action;
}
private void OnBtnClicked()
@@ -116,7 +98,11 @@ public class TestRebindScript : MonoBehaviour
if (task == null) return false;
return await task;
}
- catch (Exception ex) { Debug.LogError(ex); return false; }
+ catch (Exception ex)
+ {
+ Debug.LogError(ex);
+ return false;
+ }
}
public void CancelPrepared()
@@ -135,21 +121,11 @@ public class TestRebindScript : MonoBehaviour
return;
}
- // Ensure binding index is refreshed (action/bindings may change)
- if (targetBindingIndex < 0 || targetBindingIndex >= action.bindings.Count)
- ResolveBindingIndex();
- if (targetBindingIndex < 0)
- {
- bindKeyText.text = "";
- if (targetImage != null) targetImage.sprite = null;
- return;
- }
+ string disp = GlyphService.GetBindingControlPath(action, InputDeviceWatcher.CurrentCategory);
+ bindKeyText.text = GlyphService.GetDisplayNameFromInputAction(action);
- string disp = action.GetBindingDisplayString(targetBindingIndex);
- bindKeyText.text = string.IsNullOrEmpty(disp) ? "" : disp;
- // **Important**: use GlyphService with InputAction and device category (not manager-internal path)
try
{
var deviceCat = InputDeviceWatcher.CurrentCategory;
diff --git a/Client/Assets/PlayerControls.inputactions b/Client/Assets/PlayerControls.inputactions
index 90ca840..6474ebc 100644
--- a/Client/Assets/PlayerControls.inputactions
+++ b/Client/Assets/PlayerControls.inputactions
@@ -666,7 +666,18 @@
{
"name": "",
"id": "d1e2e650-d247-4fab-a06c-5a6fb5ccd2a5",
- "path": "*/{Cancel}",
+ "path": "/buttonEast",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Cancel",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "1a2a3800-59d9-452a-b7a7-e3968ddab191",
+ "path": "/escape",
"interactions": "",
"processors": "",
"groups": "",
diff --git a/Client/Assets/Test/GameLogic.dll.bytes b/Client/Assets/Test/GameLogic.dll.bytes
index 4e75d2b..6c09675 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 0338924..7789a13 100644
Binary files a/Client/Assets/Test/GameLogic.pdb.bytes and b/Client/Assets/Test/GameLogic.pdb.bytes differ
diff --git a/Client/Assets/TestAudioPlay.cs b/Client/Assets/TestAudioPlay.cs
index 5eca2af..7001aa9 100644
--- a/Client/Assets/TestAudioPlay.cs
+++ b/Client/Assets/TestAudioPlay.cs
@@ -9,11 +9,8 @@ using UnityEngine.UI;
public class TestAudioPlay : MonoBehaviour
{
- public InputGlyphDatabase database;
public AudioSource audioSource;
[SerializeField] private UXHotkeyButton[] hotButtons;
- Slider slider;
- private Selectable Selectable;
public class UXAuditoHelper : IUXAudioHelper
{
private AudioSource _audioSource;
@@ -51,7 +48,6 @@ public class TestAudioPlay : MonoBehaviour
private void Awake()
{
- GlyphService.Database = database;
UXComponentExtensionsHelper.SetAudioHelper(new UXAuditoHelper(audioSource));
BindHotKeys();
}
diff --git a/Client/Assets/TextMesh Pro/Sprites/EmojiOne.png.meta b/Client/Assets/TextMesh Pro/Sprites/EmojiOne.png.meta
index c9fa1a7..659ec6e 100644
--- a/Client/Assets/TextMesh Pro/Sprites/EmojiOne.png.meta
+++ b/Client/Assets/TextMesh Pro/Sprites/EmojiOne.png.meta
@@ -1,27 +1,57 @@
fileFormatVersion: 2
guid: dffef66376be4fa480fb02b19edbe903
TextureImporter:
- fileIDToRecycleName:
- 21300000: EmojiOne_0
- 21300002: EmojiOne_1
- 21300004: EmojiOne_2
- 21300006: EmojiOne_3
- 21300008: EmojiOne_4
- 21300010: EmojiOne_6
- 21300012: EmojiOne_7
- 21300014: EmojiOne_8
- 21300016: EmojiOne_9
- 21300018: EmojiOne_10
- 21300020: EmojiOne_11
- 21300022: EmojiOne_12
- 21300024: EmojiOne_13
- 21300026: EmojiOne_5
- 21300028: EmojiOne_14
+ internalIDToNameTable:
+ - first:
+ 213: 21300000
+ second: EmojiOne_0
+ - first:
+ 213: 21300002
+ second: EmojiOne_1
+ - first:
+ 213: 21300004
+ second: EmojiOne_2
+ - first:
+ 213: 21300006
+ second: EmojiOne_3
+ - first:
+ 213: 21300008
+ second: EmojiOne_4
+ - first:
+ 213: 21300010
+ second: EmojiOne_6
+ - first:
+ 213: 21300012
+ second: EmojiOne_7
+ - first:
+ 213: 21300014
+ second: EmojiOne_8
+ - first:
+ 213: 21300016
+ second: EmojiOne_9
+ - first:
+ 213: 21300018
+ second: EmojiOne_10
+ - first:
+ 213: 21300020
+ second: EmojiOne_11
+ - first:
+ 213: 21300022
+ second: EmojiOne_12
+ - first:
+ 213: 21300024
+ second: EmojiOne_13
+ - first:
+ 213: 21300026
+ second: EmojiOne_5
+ - first:
+ 213: 21300028
+ second: EmojiOne_14
externalObjects: {}
- serializedVersion: 5
+ serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -35,7 +65,12 @@ TextureImporter:
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
+ flipGreenChannel: 0
isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -44,9 +79,9 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -1
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
@@ -58,19 +93,26 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 1
+ swizzle: 50462976
+ cookieLightType: 1
platformSettings:
- - serializedVersion: 2
+ - serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 512
resizeAlgorithm: 0
@@ -80,8 +122,10 @@ TextureImporter:
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
+ ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
- - serializedVersion: 2
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 512
resizeAlgorithm: 0
@@ -91,8 +135,10 @@ TextureImporter:
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
+ ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
- - serializedVersion: 2
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 512
resizeAlgorithm: 0
@@ -102,8 +148,10 @@ TextureImporter:
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
+ ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
- - serializedVersion: 2
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
resizeAlgorithm: 0
@@ -113,7 +161,22 @@ TextureImporter:
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
+ ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 512
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
@@ -121,18 +184,19 @@ TextureImporter:
name: EmojiOne_0
rect:
serializedVersion: 2
- x: 0
- y: 384
- width: 128
- height: 128
+ x: 4
+ y: 388
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 4bcc36da2108f2c4ba3de5c921d25c3c
+ internalID: 21300000
vertices: []
indices:
edges: []
@@ -141,18 +205,19 @@ TextureImporter:
name: EmojiOne_1
rect:
serializedVersion: 2
- x: 128
- y: 384
- width: 128
- height: 128
+ x: 132
+ y: 388
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: e9eea8093eaeaee4d901c4553f572c22
+ internalID: 21300002
vertices: []
indices:
edges: []
@@ -161,18 +226,19 @@ TextureImporter:
name: EmojiOne_2
rect:
serializedVersion: 2
- x: 256
- y: 384
- width: 128
- height: 128
+ x: 260
+ y: 388
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 49451da35411dcc42a3692e39b0fde70
+ internalID: 21300004
vertices: []
indices:
edges: []
@@ -181,18 +247,19 @@ TextureImporter:
name: EmojiOne_3
rect:
serializedVersion: 2
- x: 384
- y: 384
- width: 128
- height: 128
+ x: 388
+ y: 388
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: f65709664b924904790c850a50ca82bc
+ internalID: 21300006
vertices: []
indices:
edges: []
@@ -201,18 +268,19 @@ TextureImporter:
name: EmojiOne_4
rect:
serializedVersion: 2
- x: 0
- y: 256
- width: 128
- height: 128
+ x: 4
+ y: 260
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 5b92c568a5ec9ad4b9ed90e271f1c9a8
+ internalID: 21300008
vertices: []
indices:
edges: []
@@ -221,18 +289,19 @@ TextureImporter:
name: EmojiOne_6
rect:
serializedVersion: 2
- x: 256
- y: 256
- width: 128
- height: 128
+ x: 260
+ y: 260
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: b10f2b48b7281594bb8a24a6511a35af
+ internalID: 21300010
vertices: []
indices:
edges: []
@@ -241,18 +310,19 @@ TextureImporter:
name: EmojiOne_7
rect:
serializedVersion: 2
- x: 384
- y: 256
- width: 128
- height: 128
+ x: 388
+ y: 260
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 10a600f9329dc2246a897e89f4d283cd
+ internalID: 21300012
vertices: []
indices:
edges: []
@@ -261,18 +331,19 @@ TextureImporter:
name: EmojiOne_8
rect:
serializedVersion: 2
- x: 0
- y: 128
- width: 128
- height: 128
+ x: 4
+ y: 132
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 66cffa363b90ab14787d8a5b90cf4502
+ internalID: 21300014
vertices: []
indices:
edges: []
@@ -281,18 +352,19 @@ TextureImporter:
name: EmojiOne_9
rect:
serializedVersion: 2
- x: 128
- y: 128
- width: 128
- height: 128
+ x: 132
+ y: 132
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 55cf3d409c9b89349b1e1bdc1cc224ad
+ internalID: 21300016
vertices: []
indices:
edges: []
@@ -301,18 +373,19 @@ TextureImporter:
name: EmojiOne_10
rect:
serializedVersion: 2
- x: 256
- y: 128
- width: 128
- height: 128
+ x: 260
+ y: 132
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 2a9e58eaf96feef42bcefa1cf257193f
+ internalID: 21300018
vertices: []
indices:
edges: []
@@ -321,18 +394,19 @@ TextureImporter:
name: EmojiOne_11
rect:
serializedVersion: 2
- x: 384
- y: 128
- width: 128
- height: 128
+ x: 388
+ y: 132
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 2489120affc155840ae6a7be2e93ce19
+ internalID: 21300020
vertices: []
indices:
edges: []
@@ -341,18 +415,19 @@ TextureImporter:
name: EmojiOne_12
rect:
serializedVersion: 2
- x: 0
- y: 0
- width: 128
- height: 128
+ x: 4
+ y: 4
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 412349a150598d14da4d7140df5c0286
+ internalID: 21300022
vertices: []
indices:
edges: []
@@ -361,18 +436,19 @@ TextureImporter:
name: EmojiOne_13
rect:
serializedVersion: 2
- x: 128
- y: 0
- width: 128
- height: 128
+ x: 132
+ y: 4
+ width: 120
+ height: 120
alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: a937464b42bb3634782dea34c6becb6c
+ internalID: 21300024
vertices: []
indices:
edges: []
@@ -381,10 +457,10 @@ TextureImporter:
name: EmojiOne_5
rect:
serializedVersion: 2
- x: 256
- y: 0
- width: 128
- height: 128
+ x: 132
+ y: 260
+ width: 120
+ height: 120
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -393,6 +469,7 @@ TextureImporter:
tessellationDetail: 0
bones: []
spriteID: b0f933b217682124dbfc5e6b89abe3d0
+ internalID: 21300026
vertices: []
indices:
edges: []
@@ -401,10 +478,10 @@ TextureImporter:
name: EmojiOne_14
rect:
serializedVersion: 2
- x: 128
- y: 256
- width: 128
- height: 128
+ x: 260
+ y: 4
+ width: 120
+ height: 120
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -413,6 +490,28 @@ TextureImporter:
tessellationDetail: 0
bones: []
spriteID: f7235c763afe4434e8bb666750a41096
+ internalID: 21300028
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: EmojiOne_15
+ rect:
+ serializedVersion: 2
+ x: 388
+ y: 4
+ width: 120
+ height: 120
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: a436e8e6563ab82468bdca71043fbfa4
+ internalID: -1093879911
vertices: []
indices:
edges: []
@@ -421,11 +520,31 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 3e32d8f5477abfc43b19066e8ad5032e
+ internalID: 0
vertices: []
indices:
edges: []
weights: []
- spritePackingTag:
+ secondaryTextures: []
+ nameFileIdTable:
+ EmojiOne_0: 21300000
+ EmojiOne_1: 21300002
+ EmojiOne_10: 21300018
+ EmojiOne_11: 21300020
+ EmojiOne_12: 21300022
+ EmojiOne_13: 21300024
+ EmojiOne_14: 21300028
+ EmojiOne_15: -1093879911
+ EmojiOne_2: 21300004
+ EmojiOne_3: 21300006
+ EmojiOne_4: 21300008
+ EmojiOne_5: 21300026
+ EmojiOne_6: 21300010
+ EmojiOne_7: 21300012
+ EmojiOne_8: 21300014
+ EmojiOne_9: 21300016
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
diff --git a/Client/Assets/input_bindings.json b/Client/Assets/input_bindings.json
index aa9b67d..01f53b0 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":"/v","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":"/2","interactions":"null","processors":"null"}]}
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.editor.extension b/Client/Packages/com.alicizax.unity.editor.extension
index da3a43a..57c49b1 160000
--- a/Client/Packages/com.alicizax.unity.editor.extension
+++ b/Client/Packages/com.alicizax.unity.editor.extension
@@ -1 +1 @@
-Subproject commit da3a43a2a647bf7c28cb247024f84ae0a28b54ff
+Subproject commit 57c49b1e2f59087abbfb6b2f64970dc558145a7a
diff --git a/Client/Packages/com.alicizax.unity.ui.extension b/Client/Packages/com.alicizax.unity.ui.extension
index d17eaaa..5084130 160000
--- a/Client/Packages/com.alicizax.unity.ui.extension
+++ b/Client/Packages/com.alicizax.unity.ui.extension
@@ -1 +1 @@
-Subproject commit d17eaaaa8b9fbdc64b1e1b1cf48c7b9d79957fb7
+Subproject commit 5084130abe0668f57385437cc92a68a542238fd0
diff --git a/Client/UserSettings/EditorUserSettings.asset b/Client/UserSettings/EditorUserSettings.asset
index ec3ac42..a42cbfa 100644
--- a/Client/UserSettings/EditorUserSettings.asset
+++ b/Client/UserSettings/EditorUserSettings.asset
@@ -30,10 +30,10 @@ EditorUserSettings:
value: 54010c54510c5a5f5a0a0973477b0a4414151a2b757925367a7e4a6ab1b66260
flags: 0
RecentlyUsedSceneGuid-7:
- value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d
+ value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668
flags: 0
RecentlyUsedSceneGuid-8:
- value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668
+ value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d
flags: 0
RecentlyUsedSceneGuid-9:
value: 015450045700505d0f0a5f2313260a444e164b2e757b76652c2d4d32bab0313a
diff --git a/Client/UserSettings/Layouts/default-2022.dwlt b/Client/UserSettings/Layouts/default-2022.dwlt
index 1281627..fc4d58e 100644
--- a/Client/UserSettings/Layouts/default-2022.dwlt
+++ b/Client/UserSettings/Layouts/default-2022.dwlt
@@ -19,12 +19,64 @@ MonoBehaviour:
width: 1920
height: 997
m_ShowMode: 4
- m_Title: Inspector
- m_RootView: {fileID: 2}
+ m_Title: Hierarchy
+ m_RootView: {fileID: 4}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
--- !u!114 &2
+MonoBehaviour:
+ m_ObjectHideFlags: 52
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name: GameView
+ m_EditorClassIdentifier:
+ m_Children: []
+ m_Position:
+ serializedVersion: 2
+ x: 0
+ y: 491
+ width: 612
+ height: 456
+ m_MinSize: {x: 50, y: 50}
+ m_MaxSize: {x: 4000, y: 4000}
+ m_ActualView: {fileID: 14}
+ m_Panes:
+ - {fileID: 14}
+ m_Selected: 0
+ m_LastSelected: 0
+--- !u!114 &3
+MonoBehaviour:
+ m_ObjectHideFlags: 52
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Children:
+ - {fileID: 8}
+ - {fileID: 2}
+ m_Position:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 612
+ height: 947
+ m_MinSize: {x: 100, y: 100}
+ m_MaxSize: {x: 8096, y: 16192}
+ vertical: 1
+ controlID: 17
+ draggingID: 0
+--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -37,9 +89,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 3}
- {fileID: 5}
- - {fileID: 4}
+ - {fileID: 7}
+ - {fileID: 6}
m_Position:
serializedVersion: 2
x: 0
@@ -52,7 +104,7 @@ MonoBehaviour:
m_TopViewHeight: 30
m_UseBottomView: 1
m_BottomViewHeight: 20
---- !u!114 &3
+--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -74,7 +126,7 @@ MonoBehaviour:
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
m_LastLoadedLayoutName:
---- !u!114 &4
+--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -95,7 +147,7 @@ MonoBehaviour:
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
---- !u!114 &5
+--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -108,7 +160,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 6}
+ - {fileID: 3}
- {fileID: 9}
- {fileID: 12}
- {fileID: 13}
@@ -121,35 +173,9 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 100}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
- controlID: 155
+ controlID: 144
draggingID: 0
---- !u!114 &6
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 7}
- - {fileID: 8}
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 468
- height: 947
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 8096, y: 16192}
- vertical: 1
- controlID: 25
- draggingID: 0
---- !u!114 &7
+--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -166,42 +192,16 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 468
- height: 363
- m_MinSize: {x: 201, y: 221}
- m_MaxSize: {x: 4001, y: 4021}
+ width: 612
+ height: 491
+ m_MinSize: {x: 200, y: 200}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 15}
- {fileID: 16}
m_Selected: 1
m_LastSelected: 0
---- !u!114 &8
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: GameView
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 363
- width: 468
- height: 584
- m_MinSize: {x: 51, y: 71}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 14}
- m_Panes:
- - {fileID: 14}
- m_Selected: 0
- m_LastSelected: 0
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -219,14 +219,14 @@ MonoBehaviour:
- {fileID: 11}
m_Position:
serializedVersion: 2
- x: 468
+ x: 612
y: 0
- width: 288
+ width: 333
height: 947
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
- controlID: 69
+ controlID: 49
draggingID: 0
--- !u!114 &10
MonoBehaviour:
@@ -245,8 +245,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 288
- height: 601
+ width: 333
+ height: 461
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 17}
@@ -270,9 +270,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
- y: 601
- width: 288
- height: 346
+ y: 461
+ width: 333
+ height: 486
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 18}
@@ -295,9 +295,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 756
+ x: 945
y: 0
- width: 183
+ width: 332
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: 939
+ x: 1277
y: 0
- width: 981
+ width: 643
height: 947
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
@@ -353,9 +353,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
- y: 436
- width: 467
- height: 563
+ y: 564
+ width: 611
+ height: 435
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -408,10 +408,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
- width: 467
- height: 542
- m_Scale: {x: 0.24322917, y: 0.24322918}
- m_Translation: {x: 233.5, y: 271}
+ width: 611
+ height: 414
+ m_Scale: {x: 0.31822917, y: 0.31822917}
+ m_Translation: {x: 305.5, y: 207}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
@@ -419,12 +419,12 @@ MonoBehaviour:
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -960
- y: -1114.1755
+ y: -650.4746
width: 1920
- height: 2228.351
+ height: 1300.9492
m_MinimalGUI: 1
- m_defaultScale: 0.24322917
- m_LastWindowPixelSize: {x: 467, y: 563}
+ m_defaultScale: 0.31822917
+ m_LastWindowPixelSize: {x: 611, y: 435}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -451,9 +451,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
- y: 73
- width: 518
- height: 926
+ y: 79
+ width: 365
+ height: 915
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -522,8 +522,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 73
- width: 467
- height: 342
+ width: 611
+ height: 470
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -538,8 +538,8 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
- snapOffset: {x: -179, y: -26}
- snapOffsetDelta: {x: 0, y: 0}
+ snapOffset: {x: -174, y: -26}
+ snapOffsetDelta: {x: -5, y: 0}
snapCorner: 3
id: Tool Settings
index: 0
@@ -616,9 +616,9 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
- snapOffset: {x: 24, y: 64}
+ snapOffset: {x: 24, y: -131}
snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 0
+ snapCorner: 2
id: Orientation
index: 0
layout: 4
@@ -867,7 +867,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
@@ -1064,9 +1064,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
- m_Target: {x: 1241.503, y: 212.77849, z: -0.5889411}
+ m_Target: {x: 1194.6714, y: 398.0959, z: -5.0133038}
speed: 2
- m_Value: {x: 1241.503, y: 212.77849, z: -0.5889411}
+ m_Value: {x: 1194.6714, y: 398.0959, z: -5.0133038}
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: 161.9702
+ m_Target: 694.8482
speed: 2
- m_Value: 161.9702
+ m_Value: 694.8482
m_Ortho:
m_Target: 1
speed: 2
@@ -1163,10 +1163,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 468
+ x: 612
y: 73
- width: 286
- height: 580
+ width: 331
+ height: 440
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -1182,7 +1182,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: b0faffff006e0000
+ m_ExpandedIDs: c8faffff286e0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1198,7 +1198,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 10}
+ m_ClientGUIView: {fileID: 8}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
@@ -1226,10 +1226,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 468
- y: 674
- width: 286
- height: 325
+ x: 612
+ y: 534
+ width: 331
+ height: 465
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -1260,9 +1260,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 756
+ x: 945
y: 73
- width: 181
+ width: 330
height: 926
m_SerializedDataModeController:
m_DataMode: 0
@@ -1283,9 +1283,9 @@ MonoBehaviour:
m_SceneHandles:
m_ShowAllHits: 0
m_SkipHidden: 0
- m_SearchArea: 0
+ m_SearchArea: 1
m_Folders:
- - Assets/InputGlyph
+ - Assets
m_Globs: []
m_OriginalText:
m_ImportLogFlags: 0
@@ -1301,7 +1301,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: e48c0000
m_LastClickedID: 36068
- m_ExpandedIDs: 00000000e86f0000987200004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000d6740000d8740000da740000dc740000de740000e0740000e2740000e4740000e6740000e8740000ea740000ec740000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000020750000227500002475000026750000287500002a7500002c7500002e75000030750000327500003475000036750000387500003a7500003c7500003e75000040750000427500004475000046750000487500004a7500004c7500004e75000050750000527500005475000056750000587500005a7500005c7500005e75000060750000627500006475000066750000687500006a7500006c7500006e75000070750000727500007475000076750000787500007a7500007c7500007e75000080750000827500008475000086750000887500008a7500008c7500008e75000090750000927500009475000096750000987500009a7500009c7500009e750000a0750000a2750000a4750000a6750000a8750000aa750000ac750000ae750000b0750000b2750000b4750000b6750000b8750000ba750000bc750000be750000c0750000c2750000c4750000c6750000c8750000ca750000cc750000ce750000d0750000d2750000d4750000d6750000d8750000da750000dc750000de750000e0750000e2750000e4750000e6750000e8750000ea750000ec750000ee750000f0750000f2750000f4750000f6750000f8750000fa750000fc750000fe75000000760000027600000476000006760000087600000a7600000c7600000e7600001076000012760000147600001676000018760000
+ m_ExpandedIDs: 0000000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e74000020740000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e74000040740000427400004474000046740000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000d6740000d8740000da740000dc740000de740000e0740000e2740000e4740000e6740000e8740000ea740000ec740000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000020750000227500002475000026750000287500002a7500002c7500002e75000030750000327500003475000036750000387500003a7500003c7500003e75000040750000427500004475000046750000487500004a7500004c7500004e75000050750000527500005475000056750000587500005a7500005c7500005e75000060750000627500006475000066750000687500006a7500006c7500006e75000070750000727500007475000076750000787500007a7500007c7500007e75000080750000827500008475000086750000887500008a7500008c7500008e75000090750000927500009475000096750000987500009a7500009c7500009e750000a0750000a2750000a4750000a6750000a8750000aa750000ac750000ae750000b0750000b2750000b4750000b6750000b8750000ba750000bc750000be750000c0750000c2750000c4750000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1329,21 +1329,21 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: ffffffff00000000e86f0000987200004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000d6740000d8740000da740000dc740000de740000e0740000e2740000e4740000e6740000e8740000ea740000ec740000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000020750000227500002475000026750000287500002a7500002c7500002e75000030750000327500003475000036750000387500003a7500003c7500003e75000040750000427500004475000046750000487500004a7500004c7500004e75000050750000527500005475000056750000587500005a7500005c7500005e75000060750000627500006475000066750000687500006a7500006c7500006e75000070750000727500007475000076750000787500007a7500007c7500007e75000080750000827500008475000086750000887500008a7500008c7500008e75000090750000927500009475000096750000987500009a7500009c7500009e750000a0750000a2750000a4750000a6750000a8750000aa750000ac750000ae750000b0750000b2750000b4750000b6750000b8750000ba750000bc750000be750000c0750000c2750000c4750000c6750000c8750000ca750000cc750000ce750000d0750000d2750000d4750000d6750000d8750000da750000dc750000de750000e0750000e2750000e4750000e6750000e8750000ea750000ec750000ee750000f0750000f2750000f4750000f6750000f8750000fa750000fc750000fe75000000760000027600000476000006760000087600000a7600000c7600000e7600001076000012760000147600001676000018760000
+ m_ExpandedIDs: ffffffff0000000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e74000020740000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e74000040740000427400004474000046740000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000d6740000d8740000da740000dc740000de740000e0740000e2740000e4740000e6740000e8740000ea740000ec740000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000020750000227500002475000026750000287500002a7500002c7500002e75000030750000327500003475000036750000387500003a7500003c7500003e75000040750000427500004475000046750000487500004a7500004c7500004e75000050750000527500005475000056750000587500005a7500005c7500005e75000060750000627500006475000066750000687500006a7500006c7500006e75000070750000727500007475000076750000787500007a7500007c7500007e75000080750000827500008475000086750000887500008a7500008c7500008e75000090750000927500009475000096750000987500009a7500009c7500009e750000a0750000a2750000a4750000a6750000a8750000aa750000ac750000ae750000b0750000b2750000b4750000b6750000b8750000ba750000bc750000be750000c0750000c2750000c4750000
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
+ m_Name: InputBindingManager
+ m_OriginalName: InputBindingManager
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
- m_UserData: 0
+ m_UserData: 10908
m_IsWaitingForDelay: 0
m_IsRenaming: 0
- m_OriginalEventType: 11
+ m_OriginalEventType: 0
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 12}
m_SearchString:
@@ -1405,9 +1405,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 939
+ x: 1277
y: 73
- width: 980
+ width: 642
height: 926
m_SerializedDataModeController:
m_DataMode: 0
@@ -1422,11 +1422,11 @@ MonoBehaviour:
m_ObjectsLockedBeforeSerialization: []
m_InstanceIDsLockedBeforeSerialization:
m_PreviewResizer:
- m_CachedPref: 151
+ m_CachedPref: 318
m_ControlHash: 1412526313
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
- m_LastVerticalScrollValue: 0
+ m_LastVerticalScrollValue: 459
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker: