diff --git a/Assets/Scenes/GaneScene.unity b/Assets/Scenes/GaneScene.unity index 885fd63..6206808 100644 --- a/Assets/Scenes/GaneScene.unity +++ b/Assets/Scenes/GaneScene.unity @@ -526,6 +526,50 @@ MonoBehaviour: m_AmplitudeGain: 0.25 m_FrequencyGain: 0.5 mNoiseOffsets: {x: 0, y: 0, z: 0} +--- !u!1 &721208333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 721208335} + - component: {fileID: 721208334} + m_Layer: 0 + m_Name: GameInput + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &721208334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 721208333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 413070e64894f014a8dbfe751be0534c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &721208335 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 721208333} + 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: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -621,6 +665,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: moveSpeed: 7 + gameInput: {fileID: 721208334} --- !u!1001 &1075657335 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index 3e95240..e44b6d8 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,6 +5,7 @@ "com.unity.collab-proxy": "2.0.0", "com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.vscode": "1.2.5", + "com.unity.inputsystem": "1.5.0", "com.unity.render-pipelines.universal": "14.0.6", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 8cd2194..4c0e5f7 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -55,6 +55,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.inputsystem": { + "version": "1.5.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.mathematics": { "version": "1.2.6", "depth": 1, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3dfa7a2..a691e39 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -886,7 +886,7 @@ PlayerSettings: hmiLogStartupTiming: 0 hmiCpuConfiguration: apiCompatibilityLevel: 6 - activeInputHandler: 0 + activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 0bd502f..45b317f 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -1,6 +1,30 @@ %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: 799 + y: 717 + width: 994 + height: 509 + m_ShowMode: 0 + m_Title: Project Settings + m_RootView: {fileID: 4} + m_MinSize: {x: 310, y: 221} + m_MaxSize: {x: 4000, y: 4021} + m_Maximized: 0 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -19,12 +43,62 @@ MonoBehaviour: width: 2560 height: 1349 m_ShowMode: 4 - m_Title: Scene - m_RootView: {fileID: 7} + m_Title: Game + m_RootView: {fileID: 10} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &2 +--- !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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectSettingsWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 994 + height: 509 + m_MinSize: {x: 310, y: 221} + m_MaxSize: {x: 4000, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 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: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 994 + height: 509 + m_MinSize: {x: 310, y: 221} + m_MaxSize: {x: 4000, y: 4021} + vertical: 0 + controlID: 8152 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -41,16 +115,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 431 + width: 403 height: 327 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 15} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &3 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -63,19 +137,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 2} - - {fileID: 6} + - {fileID: 5} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 972 - width: 1955 + width: 1829 height: 327 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 28 ---- !u!114 &4 + controlID: 97 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -88,8 +162,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 5} + - {fileID: 13} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 @@ -100,7 +174,7 @@ MonoBehaviour: m_MaxSize: {x: 24288, y: 16192} vertical: 0 controlID: 85 ---- !u!114 &5 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -115,19 +189,19 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1955 + x: 1829 y: 0 - width: 605 + width: 731 height: 1299 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 14} - - {fileID: 12} + - {fileID: 20} + - {fileID: 18} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &6 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -137,24 +211,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 431 + x: 403 y: 0 - width: 1524 + width: 1426 height: 327 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 18} + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 13} - - {fileID: 18} - m_Selected: 1 - m_LastSelected: 0 ---- !u!114 &7 + - {fileID: 19} + - {fileID: 24} + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 2 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -167,9 +242,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - - {fileID: 4} - - {fileID: 9} + - {fileID: 11} + - {fileID: 7} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 @@ -182,7 +257,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &8 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -204,7 +279,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &9 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -225,7 +300,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &10 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -238,19 +313,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 11} - - {fileID: 3} + - {fileID: 14} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1955 + width: 1829 height: 1299 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 18 ---- !u!114 &11 + controlID: 96 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -260,24 +335,198 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1955 + width: 1829 height: 972 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 23} m_Panes: - - {fileID: 16} + - {fileID: 22} + - {fileID: 23} - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &12 + m_Selected: 1 + m_LastSelected: 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: 13854, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 310, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Project Settings + m_Image: {fileID: -5712115415447495865, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 799 + y: 717 + width: 994 + height: 488 + 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_PosLeft: {x: 0, y: 0} + m_PosRight: {x: 0, y: 1080} + m_Scope: 1 + m_SplitterFlex: 0.2 + m_SearchText: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 4dcf9b58 + m_LastClickedID: 1486606157 + m_ExpandedIDs: 53336be200000000 + 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: 0} + m_SearchString: +--- !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: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 403 + y: 1045 + width: 1424 + height: 306 + 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_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -223972 +--- !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: 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: 73 + width: 1828 + height: 951 + 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: 3341265433047602877, guid: 68eaadb9ce37beb4dada3e6649f7ae47, type: 2} + m_ValueSerializationHelper: + - e00: 1.3573047 + e01: 0 + e02: 0 + e03: -49.053776 + e10: 0 + e11: 1.3573047 + e12: 0 + e13: 270.7419 + 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: 68eaadb9ce37beb4dada3e6649f7ae47, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 3341265433047602877, guid: 68eaadb9ce37beb4dada3e6649f7ae47, + 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 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -310,6 +559,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_OverlaysVisible: 1 progressMessageClearTime: -1 notificationClearTime: -1 timeSinceLastRotation: -1 @@ -1135,13 +1385,13 @@ MonoBehaviour: workTreeStatus: 3 changedFilesText: 10 changed files lastCurrentBranchChangedEvent: - updatedTimeString: 2023-02-26T00:54:49.895+11:00 + updatedTimeString: 2023-02-26T01:55:17.391+11:00 cacheType: 1 lastStatusEntriesChangedEvent: - updatedTimeString: 2023-02-26T00:58:49.149+11:00 + updatedTimeString: 2023-02-26T02:27:25.681+11:00 cacheType: 6 lastLocksChangedEvent: - updatedTimeString: 2023-02-26T00:54:52.161+11:00 + updatedTimeString: 0001-01-01T00:00:00.000+00:00 cacheType: 7 historyView: currentLogHasUpdate: 0 @@ -2094,7 +2344,7 @@ MonoBehaviour: appManagerProgressValue: 1 appManagerProgressMessage: primaryConnectionUsername: ---- !u!114 &13 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2115,9 +2365,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 431 + x: 403 y: 1045 - width: 1522 + width: 1424 height: 306 m_SerializedDataModeController: m_DataMode: 0 @@ -2128,6 +2378,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_OverlaysVisible: 1 m_SearchFilter: m_NameFilter: m_ClassNames: [] @@ -2154,10 +2405,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 6} - m_SelectedIDs: d8720000 - m_LastClickedID: 29400 - m_ExpandedIDs: 00000000ca690000 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 2c760000 + m_LastClickedID: 30252 + m_ExpandedIDs: 00000000aa740000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2185,7 +2436,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000ca690000 + m_ExpandedIDs: 00000000aa740000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2210,8 +2461,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: e2720000 - m_LastClickedInstanceID: 29410 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000ea050000 m_RenameOverlay: @@ -2229,7 +2480,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 6} + m_ClientGUIView: {fileID: 9} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -2241,7 +2492,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 1 m_DirectoriesAreaWidth: 207 ---- !u!114 &14 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2262,9 +2513,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1955 + x: 1829 y: 73 - width: 604 + width: 730 height: 1278 m_SerializedDataModeController: m_DataMode: 0 @@ -2275,6 +2526,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_OverlaysVisible: 1 m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: @@ -2288,7 +2540,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &15 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2311,7 +2563,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 1045 - width: 430 + width: 402 height: 306 m_SerializedDataModeController: m_DataMode: 0 @@ -2322,12 +2574,13 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_OverlaysVisible: 1 m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 0e86fcff m_LastClickedID: 0 - m_ExpandedIDs: 2afbffff + m_ExpandedIDs: dcf5ffff82f8ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2343,7 +2596,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 2} + m_ClientGUIView: {fileID: 5} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -2351,7 +2604,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &16 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2374,7 +2627,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 1954 + width: 1828 height: 951 m_SerializedDataModeController: m_DataMode: 0 @@ -2671,6 +2924,20 @@ MonoBehaviour: 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: Cinemachine Tool Settings + index: 10 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + m_OverlaysVisible: 1 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 @@ -2681,9 +2948,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.1741042, y: -0.5512781, z: -3.3519135} + m_Target: {x: 10.086331, y: 14.986178, z: -18.901642} speed: 2 - m_Value: {x: 0.1741042, y: -0.5512781, z: -3.3519135} + m_Value: {x: 10.086331, y: 14.986178, z: -18.901642} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -2729,13 +2996,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.00047832032, y: 0.96084386, z: -0.27713785, w: 0.0017358339} + m_Target: {x: -0.1875949, y: 0.22237433, z: -0.04362941, w: -0.9557607} speed: 2 - m_Value: {x: 0.00006261219, y: 0.9608312, z: -0.27713418, w: 0.00029456225} + m_Value: {x: -0.18759263, y: 0.22237164, z: -0.043628883, w: -0.9557491} m_Size: - m_Target: 5.40242 + m_Target: 5.887631 speed: 2 - m_Value: 5.16978 + m_Value: 5.887631 m_Ortho: m_Target: 0 speed: 2 @@ -2760,7 +3027,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &17 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2783,7 +3050,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 1954 + width: 1828 height: 951 m_SerializedDataModeController: m_DataMode: 0 @@ -2794,6 +3061,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_OverlaysVisible: 1 m_SerializedViewNames: [] m_SerializedViewValues: [] m_PlayModeViewName: GameView @@ -2808,7 +3076,7 @@ MonoBehaviour: m_UseMipMap: 0 m_VSyncEnabled: 1 m_Gizmos: 0 - m_Stats: 1 + m_Stats: 0 m_SelectedSizes: 05000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 @@ -2827,7 +3095,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -2836,29 +3104,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1954 + width: 1828 height: 930 m_Scale: {x: 0.6458333, y: 0.6458333} - m_Translation: {x: 977.00006, y: 465} + m_Translation: {x: 914, y: 465} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1512.7743 + x: -1415.2258 y: -720 - width: 3025.5486 + width: 2830.4517 height: 1440 m_MinimalGUI: 1 m_defaultScale: 0.6458333 - m_LastWindowPixelSize: {x: 1954, y: 951} + m_LastWindowPixelSize: {x: 1828, y: 951} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &18 +--- !u!114 &24 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2892,3 +3160,4 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_OverlaysVisible: 1