2199 lines
54 KiB
Plaintext
2199 lines
54 KiB
Plaintext
%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: 1
|
|
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
m_Children:
|
|
- {fileID: 3}
|
|
- {fileID: 21}
|
|
m_Position:
|
|
serializedVersion: 2
|
|
x: 0
|
|
y: 30
|
|
width: 2560
|
|
height: 1347
|
|
m_MinSize: {x: 400, y: 100}
|
|
m_MaxSize: {x: 32384, y: 16192}
|
|
vertical: 0
|
|
<<<<<<< Updated upstream
|
|
controlID: 56
|
|
=======
|
|
controlID: 180
|
|
>>>>>>> Stashed changes
|
|
draggingID: 0
|
|
--- !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: 12015, guid: 0000000000000000e000000000000000, type: 0}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
m_MinSize: {x: 100, y: 100}
|
|
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
|
|
<<<<<<< Updated upstream
|
|
x: 1323
|
|
y: 73
|
|
width: 751
|
|
height: 674
|
|
=======
|
|
x: 768
|
|
y: 73
|
|
width: 1383
|
|
height: 709
|
|
>>>>>>> Stashed changes
|
|
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:
|
|
- UnityEditor.DeviceSimulation.SimulatorWindow
|
|
m_SerializedViewValues:
|
|
<<<<<<< Updated upstream
|
|
- D:\Unity\UnityProjects\Buyu_Script\Library\PlayModeViewStates\581cdfc6fe496c34d96bcd15dcbc02ec
|
|
m_PlayModeViewName: Device Simulator
|
|
m_ShowGizmos: 0
|
|
m_TargetDisplay: 0
|
|
m_ClearColor: {r: 0, g: 0, b: 0, a: 1}
|
|
m_TargetSize: {x: 2340, y: 1080}
|
|
=======
|
|
- E:\UnityProject\5_24BuYu\Library\PlayModeViewStates\de2d86dcef8c8db4da23f8fa968d70c6
|
|
m_PlayModeViewName: GameView
|
|
m_ShowGizmos: 0
|
|
m_TargetDisplay: 0
|
|
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
|
m_TargetSize: {x: 1624, y: 750}
|
|
>>>>>>> Stashed changes
|
|
m_TextureFilterMode: 0
|
|
m_TextureHideFlags: 61
|
|
m_RenderIMGUI: 1
|
|
m_EnterPlayModeBehavior: 0
|
|
m_UseMipMap: 0
|
|
<<<<<<< Updated upstream
|
|
m_SimulatorState:
|
|
controlPanelVisible: 0
|
|
controlPanelWidth: 0
|
|
controlPanelFoldoutKeys:
|
|
- UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
|
|
controlPanelFoldoutValues: 00
|
|
pluginNames:
|
|
- UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
|
|
- UnityEngine.InputSystem.Editor.InputSystemPlugin
|
|
pluginStates:
|
|
- '{}'
|
|
- '{}'
|
|
scale: 30
|
|
fitToScreenEnabled: 1
|
|
rotationDegree: 270
|
|
highlightSafeAreaEnabled: 0
|
|
friendlyName: Google Pixel 5
|
|
screenIndex: 0
|
|
networkReachability: 1
|
|
systemLanguage: 10
|
|
=======
|
|
m_VSyncEnabled: 0
|
|
m_Gizmos: 0
|
|
m_Stats: 0
|
|
m_SelectedSizes: 0e000000000000000000000011000000000000000000000000000000000000000000000000000000
|
|
m_ZoomArea:
|
|
m_HRangeLocked: 0
|
|
m_VRangeLocked: 0
|
|
hZoomLockedByDefault: 0
|
|
vZoomLockedByDefault: 0
|
|
m_HBaseRangeMin: -812
|
|
m_HBaseRangeMax: 812
|
|
m_VBaseRangeMin: -375
|
|
m_VBaseRangeMax: 375
|
|
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: 0
|
|
m_EnableSliderZoomHorizontal: 0
|
|
m_EnableSliderZoomVertical: 0
|
|
m_UniformScale: 1
|
|
m_UpDirection: 1
|
|
m_DrawArea:
|
|
serializedVersion: 2
|
|
x: 0
|
|
y: 21
|
|
width: 1383
|
|
height: 688
|
|
m_Scale: {x: 0.851601, y: 0.851601}
|
|
m_Translation: {x: 691.5, y: 344}
|
|
m_MarginLeft: 0
|
|
m_MarginRight: 0
|
|
m_MarginTop: 0
|
|
m_MarginBottom: 0
|
|
m_LastShownAreaInsideMargins:
|
|
serializedVersion: 2
|
|
x: -812
|
|
y: -403.94504
|
|
width: 1624
|
|
height: 807.8901
|
|
m_MinimalGUI: 1
|
|
m_defaultScale: 0.851601
|
|
m_LastWindowPixelSize: {x: 1383, y: 709}
|
|
m_ClearInEditMode: 1
|
|
m_NoCameraWarning: 1
|
|
m_LowResolutionForAspectRatios: 01000001000000000000
|
|
m_XRRenderMode: 0
|
|
m_RenderTexture: {fileID: 0}
|
|
m_showToolbar: 1
|
|
>>>>>>> Stashed changes
|
|
--- !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: 1
|
|
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
m_Children:
|
|
- {fileID: 4}
|
|
- {fileID: 11}
|
|
m_Position:
|
|
serializedVersion: 2
|
|
x: 0
|
|
y: 0
|
|
<<<<<<< Updated upstream
|
|
width: 2076
|
|
=======
|
|
width: 2153
|
|
>>>>>>> Stashed changes
|
|
height: 1347
|
|
m_MinSize: {x: 300, y: 100}
|
|
m_MaxSize: {x: 24288, y: 16192}
|
|
vertical: 1
|
|
<<<<<<< Updated upstream
|
|
controlID: 57
|
|
=======
|
|
controlID: 181
|
|
>>>>>>> Stashed changes
|
|
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: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
m_Children:
|
|
- {fileID: 5}
|
|
- {fileID: 7}
|
|
- {fileID: 10}
|
|
m_Position:
|
|
serializedVersion: 2
|
|
x: 0
|
|
y: 0
|
|
<<<<<<< Updated upstream
|
|
width: 2076
|
|
height: 695
|
|
m_MinSize: {x: 300, y: 50}
|
|
m_MaxSize: {x: 24288, y: 8096}
|
|
vertical: 0
|
|
controlID: 58
|
|
=======
|
|
width: 2153
|
|
height: 730
|
|
m_MinSize: {x: 300, y: 50}
|
|
m_MaxSize: {x: 24288, y: 8096}
|
|
vertical: 0
|
|
controlID: 182
|
|
>>>>>>> Stashed changes
|
|
draggingID: 0
|
|
--- !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: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
|
m_Name: SceneHierarchyWindow
|
|
m_EditorClassIdentifier:
|
|
m_Children: []
|
|
m_Position:
|
|
serializedVersion: 2
|
|
x: 0
|
|
y: 0
|
|
<<<<<<< Updated upstream
|
|
width: 465
|
|
height: 695
|
|
m_MinSize: {x: 201, y: 221}
|
|
m_MaxSize: {x: 4001, y: 4021}
|
|
=======
|
|
width: 668
|
|
height: 730
|
|
m_MinSize: {x: 200, y: 200}
|
|
m_MaxSize: {x: 4000, y: 4000}
|
|
>>>>>>> Stashed changes
|
|
m_ActualView: {fileID: 6}
|
|
m_Panes:
|
|
- {fileID: 6}
|
|
m_Selected: 0
|
|
m_LastSelected: 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: 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: 0
|
|
y: 73
|
|
<<<<<<< Updated upstream
|
|
width: 464
|
|
height: 674
|
|
=======
|
|
width: 667
|
|
height: 709
|
|
>>>>>>> Stashed changes
|
|
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}
|
|
<<<<<<< Updated upstream
|
|
m_SelectedIDs: 46efffff
|
|
m_LastClickedID: -4282
|
|
m_ExpandedIDs: a4e5ffff7eecffff46efffff56f1ffff0cfbffff68c10000
|
|
=======
|
|
m_SelectedIDs: 80e20000
|
|
m_LastClickedID: 0
|
|
m_ExpandedIDs: 7af2ffff
|
|
>>>>>>> Stashed changes
|
|
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: 5}
|
|
m_SearchString:
|
|
m_ExpandedScenes: []
|
|
m_CurrenRootInstanceID: 0
|
|
m_LockTracker:
|
|
m_IsLocked: 0
|
|
m_CurrentSortingName: TransformSorting
|
|
m_WindowGUID: 4c969a2b90040154d917609493e03593
|
|
--- !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: 0
|
|
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
|
m_Name: SceneView
|
|
m_EditorClassIdentifier:
|
|
m_Children: []
|
|
m_Position:
|
|
serializedVersion: 2
|
|
<<<<<<< Updated upstream
|
|
x: 465
|
|
y: 0
|
|
width: 858
|
|
height: 695
|
|
m_MinSize: {x: 202, y: 221}
|
|
m_MaxSize: {x: 4002, y: 4021}
|
|
=======
|
|
x: 668
|
|
y: 0
|
|
width: 100
|
|
height: 730
|
|
m_MinSize: {x: 200, y: 200}
|
|
m_MaxSize: {x: 4000, y: 4000}
|
|
>>>>>>> Stashed changes
|
|
m_ActualView: {fileID: 9}
|
|
m_Panes:
|
|
- {fileID: 8}
|
|
- {fileID: 9}
|
|
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: 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
|
|
<<<<<<< Updated upstream
|
|
x: 465
|
|
y: 73
|
|
width: 942
|
|
height: 590
|
|
=======
|
|
x: 2958
|
|
y: 73
|
|
width: 716
|
|
height: 372
|
|
>>>>>>> Stashed changes
|
|
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: 1107838362175207629, guid: 21d0cb33d50717d4f80d20d2cbf76f7d, type: 2}
|
|
- {fileID: -636203780384027068, guid: 22b58d64e6ea9a74f92f6b7a0e5ef70b, type: 2}
|
|
- {fileID: 1107599295331701163, guid: ecbe945a0a4c53c41bb947387a2bafa6, type: 2}
|
|
- {fileID: 1107709254077376921, guid: 918d4fef7030da04fb05730e9d1bb2b0, type: 2}
|
|
- {fileID: 1107709254077376921, guid: e0e82f1a4270fcc42a5e02c099176fa3, type: 2}
|
|
- {fileID: -6228214779110207407, guid: 74a28b7d187dc2e438b18cc5bd5b92f0, type: 2}
|
|
m_ValueSerializationHelper:
|
|
- e00: 0.45927763
|
|
e01: 0
|
|
e02: 0
|
|
e03: 133.60138
|
|
e10: 0
|
|
e11: 0.45927763
|
|
e12: 0
|
|
e13: 311.85666
|
|
e20: 0
|
|
e21: 0
|
|
e22: 1
|
|
e23: 0
|
|
e30: 0
|
|
e31: 0
|
|
e32: 0
|
|
e33: 1
|
|
- e00: 0.7191987
|
|
e01: 0
|
|
e02: 0
|
|
e03: 28.076721
|
|
e10: 0
|
|
e11: 0.7191987
|
|
e12: 0
|
|
e13: 120.94187
|
|
e20: 0
|
|
e21: 0
|
|
e22: 1
|
|
e23: 0
|
|
e30: 0
|
|
e31: 0
|
|
e32: 0
|
|
e33: 1
|
|
- 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
|
|
- e00: 0.24878177
|
|
e01: 0
|
|
e02: 0
|
|
e03: 126.7139
|
|
e10: 0
|
|
e11: 0.24878177
|
|
e12: 0
|
|
e13: 193.82259
|
|
e20: 0
|
|
e21: 0
|
|
e22: 1
|
|
e23: 0
|
|
e30: 0
|
|
e31: 0
|
|
e32: 0
|
|
e33: 1
|
|
- e00: 0.88775307
|
|
e01: 0
|
|
e02: 0
|
|
e03: 44.34408
|
|
e10: 0
|
|
e11: 0.88775307
|
|
e12: 0
|
|
e13: 259.48044
|
|
e20: 0
|
|
e21: 0
|
|
e22: 1
|
|
e23: 0
|
|
e30: 0
|
|
e31: 0
|
|
e32: 0
|
|
e33: 1
|
|
- 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: 74a28b7d187dc2e438b18cc5bd5b92f0,
|
|
type: 2}
|
|
m_BreadCrumbs:
|
|
- m_Target: {fileID: -6228214779110207407, guid: 74a28b7d187dc2e438b18cc5bd5b92f0,
|
|
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: 0
|
|
m_LayerEditor:
|
|
m_SelectedLayerIndex: 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: 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
|
|
<<<<<<< Updated upstream
|
|
x: 465
|
|
y: 73
|
|
width: 856
|
|
height: 674
|
|
=======
|
|
x: 668
|
|
y: 73
|
|
width: 98
|
|
height: 709
|
|
>>>>>>> Stashed changes
|
|
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: 0, y: -26}
|
|
snapOffsetDelta: {x: 0, y: 0}
|
|
snapCorner: 2
|
|
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: -299, y: 25}
|
|
<<<<<<< Updated upstream
|
|
snapOffsetDelta: {x: 0, y: 0}
|
|
=======
|
|
snapOffsetDelta: {x: 201, y: 0}
|
|
>>>>>>> Stashed changes
|
|
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-container--left
|
|
floating: 0
|
|
collapsed: 0
|
|
displayed: 1
|
|
snapOffset: {x: 0, y: 25}
|
|
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--right
|
|
floating: 0
|
|
collapsed: 0
|
|
displayed: 1
|
|
snapOffset: {x: -111, y: 26}
|
|
snapOffsetDelta: {x: 0, y: 0}
|
|
snapCorner: 1
|
|
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: 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/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: 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/Cloth Collisions
|
|
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/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: 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/Physics Debugger
|
|
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/Scene Visibility
|
|
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: -231, y: -197}
|
|
<<<<<<< Updated upstream
|
|
snapOffsetDelta: {x: 0, y: 0}
|
|
=======
|
|
snapOffsetDelta: {x: 133, y: 0}
|
|
>>>>>>> Stashed changes
|
|
snapCorner: 3
|
|
id: Scene View/Particles
|
|
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: AINavigationOverlay
|
|
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: Scene View/TrailRenderer
|
|
index: 10
|
|
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/Open Tile Palette
|
|
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: 48, y: 48}
|
|
snapOffsetDelta: {x: 0, y: 0}
|
|
snapCorner: 0
|
|
id: Scene View/Tilemap Focus
|
|
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: 48, y: 48}
|
|
snapOffsetDelta: {x: 0, y: 0}
|
|
snapCorner: 0
|
|
id: Scene View/Path
|
|
index: 11
|
|
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: 10}
|
|
snapOffsetDelta: {x: 0, y: 0}
|
|
snapCorner: 0
|
|
id: UnityEditor.SceneViewCameraOverlay
|
|
index: 12
|
|
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: 13
|
|
layout: 4
|
|
size: {x: 0, y: 0}
|
|
sizeOverriden: 0
|
|
m_OverlaysVisible: 1
|
|
m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
|
|
<<<<<<< Updated upstream
|
|
m_Gizmos: 0
|
|
=======
|
|
m_Gizmos: 1
|
|
>>>>>>> Stashed changes
|
|
m_OverrideSceneCullingMask: 6917529027641081856
|
|
m_SceneIsLit: 0
|
|
m_SceneLighting: 1
|
|
m_2DMode: 0
|
|
<<<<<<< Updated upstream
|
|
m_isRotationLocked: 0
|
|
m_PlayAudio: 0
|
|
m_AudioPlay: 0
|
|
m_Position:
|
|
m_Target: {x: -37.89288, y: -20.422186, z: 187.96222}
|
|
speed: 2
|
|
m_Value: {x: -37.892887, y: -20.422186, z: 187.96222}
|
|
=======
|
|
m_isRotationLocked: 1
|
|
m_PlayAudio: 0
|
|
m_AudioPlay: 0
|
|
m_Position:
|
|
m_Target: {x: 5.488319, y: 4.714727, z: 55.443623}
|
|
speed: 2
|
|
m_Value: {x: 5.488319, y: 4.714727, z: 55.443623}
|
|
>>>>>>> Stashed changes
|
|
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: 1
|
|
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: 0
|
|
m_GridAxis: 1
|
|
m_gridOpacity: 0.5
|
|
m_Rotation:
|
|
<<<<<<< Updated upstream
|
|
m_Target: {x: -0.20664823, y: 0.32390124, z: -0.072652265, w: -0.9205168}
|
|
speed: 2
|
|
m_Value: {x: -0.20673166, y: 0.32248062, z: -0.07233335, w: -0.92088884}
|
|
m_Size:
|
|
m_Target: 38.83254
|
|
speed: 2
|
|
m_Value: 38.83254
|
|
=======
|
|
m_Target: {x: 0.1285996, y: 0.2211512, z: -0.029432513, w: 0.9662797}
|
|
speed: 2
|
|
m_Value: {x: 0.12859906, y: 0.22115028, z: -0.02943239, w: 0.96627563}
|
|
m_Size:
|
|
m_Target: 66.0695
|
|
speed: 2
|
|
m_Value: 66.0695
|
|
>>>>>>> Stashed changes
|
|
m_Ortho:
|
|
m_Target: 0
|
|
speed: 2
|
|
m_Value: 0
|
|
m_CameraSettings:
|
|
m_Speed: 1.9000491
|
|
m_SpeedNormalized: 0.9499996
|
|
m_SpeedMin: 0.001
|
|
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
|
|
<<<<<<< Updated upstream
|
|
m_LastSceneViewRotation: {x: 0.15078953, y: 0.1571077, z: -0.024197912, w: 0.97576267}
|
|
=======
|
|
m_LastSceneViewRotation: {x: 0.045295198, y: 0.0018074726, z: -0.00008029741, w: 0.99898016}
|
|
>>>>>>> Stashed changes
|
|
m_LastSceneViewOrtho: 0
|
|
m_ReplacementShader: {fileID: 0}
|
|
m_ReplacementString:
|
|
m_SceneVisActive: 1
|
|
m_LastLockedObject: {fileID: 0}
|
|
m_ViewIsLockedToObject: 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: GameView
|
|
m_EditorClassIdentifier:
|
|
m_Children: []
|
|
m_Position:
|
|
serializedVersion: 2
|
|
<<<<<<< Updated upstream
|
|
x: 1323
|
|
y: 0
|
|
width: 753
|
|
height: 695
|
|
m_MinSize: {x: 202, y: 221}
|
|
=======
|
|
x: 768
|
|
y: 0
|
|
width: 1385
|
|
height: 730
|
|
m_MinSize: {x: 102, y: 121}
|
|
>>>>>>> Stashed changes
|
|
m_MaxSize: {x: 4002, y: 4021}
|
|
m_ActualView: {fileID: 2}
|
|
m_Panes:
|
|
- {fileID: 2}
|
|
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: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
m_Children:
|
|
- {fileID: 12}
|
|
- {fileID: 17}
|
|
- {fileID: 19}
|
|
m_Position:
|
|
serializedVersion: 2
|
|
x: 0
|
|
<<<<<<< Updated upstream
|
|
y: 695
|
|
width: 2076
|
|
height: 652
|
|
m_MinSize: {x: 300, y: 50}
|
|
m_MaxSize: {x: 24288, y: 8096}
|
|
vertical: 0
|
|
controlID: 64
|
|
=======
|
|
y: 730
|
|
width: 2153
|
|
height: 617
|
|
m_MinSize: {x: 300, y: 50}
|
|
m_MaxSize: {x: 24288, y: 8096}
|
|
vertical: 0
|
|
controlID: 206
|
|
>>>>>>> Stashed changes
|
|
draggingID: 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: 1
|
|
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
|
m_Name: ConsoleWindow
|
|
m_EditorClassIdentifier:
|
|
m_Children: []
|
|
m_Position:
|
|
serializedVersion: 2
|
|
x: 0
|
|
y: 0
|
|
<<<<<<< Updated upstream
|
|
width: 341
|
|
height: 652
|
|
=======
|
|
width: 587
|
|
height: 617
|
|
>>>>>>> Stashed changes
|
|
m_MinSize: {x: 101, y: 121}
|
|
m_MaxSize: {x: 4001, y: 4021}
|
|
m_ActualView: {fileID: 13}
|
|
m_Panes:
|
|
- {fileID: 13}
|
|
- {fileID: 14}
|
|
- {fileID: 15}
|
|
- {fileID: 16}
|
|
m_Selected: 0
|
|
m_LastSelected: 2
|
|
--- !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: 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: 0
|
|
<<<<<<< Updated upstream
|
|
y: 768
|
|
width: 340
|
|
height: 631
|
|
=======
|
|
y: 803
|
|
width: 586
|
|
height: 596
|
|
>>>>>>> Stashed changes
|
|
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 &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: 11500000, guid: 6629f1bb292b749a18b5fff7994c8b19, type: 3}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
m_MinSize: {x: 600, y: 350}
|
|
m_MaxSize: {x: 4000, y: 4000}
|
|
m_TitleContent:
|
|
m_Text: Unity Version Control
|
|
m_Image: {fileID: 0}
|
|
m_Tooltip:
|
|
m_Pos:
|
|
serializedVersion: 2
|
|
<<<<<<< Updated upstream
|
|
x: 0
|
|
y: 627
|
|
width: 985
|
|
height: 772
|
|
=======
|
|
x: 2560
|
|
y: 586
|
|
width: 654
|
|
height: 413
|
|
>>>>>>> Stashed changes
|
|
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
|
|
mForceToReOpen: 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: 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
|
|
<<<<<<< Updated upstream
|
|
x: 0
|
|
y: 731
|
|
width: 394
|
|
height: 668
|
|
=======
|
|
x: 2560
|
|
y: 586
|
|
width: 654
|
|
height: 413
|
|
>>>>>>> Stashed changes
|
|
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:
|
|
- "Assets/UIResources/Home/\u80CC\u5305"
|
|
m_Globs: []
|
|
m_OriginalText:
|
|
m_ImportLogFlags: 0
|
|
m_FilterByTypeIntersection: 0
|
|
m_ViewMode: 0
|
|
m_StartGridSize: 16
|
|
m_LastFolders: []
|
|
m_LastFoldersGridSize: 96
|
|
m_LastProjectPath: D:\Unity\UnityProjects\Buyu_Script
|
|
m_LockTracker:
|
|
m_IsLocked: 1
|
|
m_FolderTreeState:
|
|
scrollPos: {x: 0, y: 523}
|
|
m_SelectedIDs: 30b90200
|
|
m_LastClickedID: 178480
|
|
<<<<<<< Updated upstream
|
|
m_ExpandedIDs: 000000005c0c01005e0c0100600c0100620c0100640c0100660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c0100
|
|
=======
|
|
m_ExpandedIDs: 00000000b05d0100b25d0100b45d0100b65d0100b85d0100ba5d0100bc5d0100be5d0100c05d0100c25d0100c45d0100c65d0100c85d0100ca5d0100cc5d0100ce5d0100d05d0100d25d0100d45d0100d65d0100d85d0100da5d0100dc5d0100de5d0100e05d0100
|
|
>>>>>>> Stashed changes
|
|
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:
|
|
<<<<<<< Updated upstream
|
|
scrollPos: {x: 0, y: 0}
|
|
m_SelectedIDs: 5ecb0000
|
|
m_LastClickedID: 0
|
|
m_ExpandedIDs: 000000005c0c01005e0c0100600c0100620c0100640c0100660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c0100
|
|
=======
|
|
scrollPos: {x: 0, y: 3508}
|
|
m_SelectedIDs:
|
|
m_LastClickedID: 0
|
|
m_ExpandedIDs: 00000000b05d0100b25d0100b45d0100b65d0100b85d0100ba5d0100bc5d0100be5d0100c05d0100c25d0100c45d0100c65d0100c85d0100ca5d0100cc5d0100ce5d0100d05d0100d25d0100d45d0100d65d0100d85d0100da5d0100dc5d0100de5d0100e05d0100
|
|
>>>>>>> Stashed changes
|
|
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:
|
|
<<<<<<< Updated upstream
|
|
m_SelectedInstanceIDs: 5ecb0000
|
|
m_LastClickedInstanceID: 52062
|
|
=======
|
|
m_SelectedInstanceIDs:
|
|
m_LastClickedInstanceID: 0
|
|
>>>>>>> Stashed changes
|
|
m_HadKeyboardFocusLastEvent: 0
|
|
m_ExpandedInstanceIDs: c6230000467d0000c67e00009874000024c5fdff647400009274000016a500003aa500002ed3020028d3020078e003007e76000088760000247a0000e67e0000487b0000
|
|
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_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: 16
|
|
m_SkipHiddenPackages: 0
|
|
m_DirectoriesAreaWidth: 207
|
|
--- !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: 12373, guid: 0000000000000000e000000000000000, type: 0}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
m_MinSize: {x: 100, y: 100}
|
|
m_MaxSize: {x: 4000, y: 4000}
|
|
m_TitleContent:
|
|
m_Text: Audio Mixer
|
|
m_Image: {fileID: 2344599766593239149, guid: 0000000000000000d000000000000000,
|
|
type: 0}
|
|
m_Tooltip:
|
|
m_Pos:
|
|
serializedVersion: 2
|
|
x: 0
|
|
y: 904
|
|
width: 612
|
|
height: 455
|
|
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_MixersTreeState:
|
|
scrollPos: {x: 0, y: 0}
|
|
m_SelectedIDs:
|
|
m_LastClickedID: -662676
|
|
m_ExpandedIDs: 12eb343c
|
|
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:
|
|
m_CreateAssetUtility:
|
|
m_EndAction: {fileID: 0}
|
|
m_InstanceID: 0
|
|
m_Path:
|
|
m_Icon: {fileID: 0}
|
|
m_ResourceFile:
|
|
m_LayoutStripsOnTop:
|
|
m_VerticalSplitter:
|
|
ID: 0
|
|
splitterInitialOffset: 0
|
|
currentActiveSplitter: -1
|
|
realSizes:
|
|
- 65
|
|
- 35
|
|
relativeSizes:
|
|
- 0.65
|
|
- 0.35000002
|
|
minSizes:
|
|
- 85
|
|
- 105
|
|
maxSizes:
|
|
- 0
|
|
- 0
|
|
lastTotalSize: 0
|
|
splitSize: 6
|
|
xOffset: 0
|
|
m_Version: 1
|
|
oldRealSizes:
|
|
oldMinSizes:
|
|
oldMaxSizes:
|
|
oldSplitSize: 0
|
|
m_HorizontalSplitter:
|
|
ID: 0
|
|
splitterInitialOffset: 0
|
|
currentActiveSplitter: -1
|
|
realSizes:
|
|
- 60
|
|
- 60
|
|
- 60
|
|
- 60
|
|
relativeSizes:
|
|
- 0.25
|
|
- 0.25
|
|
- 0.25
|
|
- 0.25
|
|
minSizes:
|
|
- 85
|
|
- 85
|
|
- 85
|
|
- 85
|
|
maxSizes:
|
|
- 0
|
|
- 0
|
|
- 0
|
|
- 0
|
|
lastTotalSize: 0
|
|
splitSize: 6
|
|
xOffset: 0
|
|
m_Version: 1
|
|
oldRealSizes:
|
|
oldMinSizes:
|
|
oldMaxSizes:
|
|
oldSplitSize: 0
|
|
m_LayoutStripsOnRight:
|
|
m_VerticalSplitter:
|
|
ID: 0
|
|
splitterInitialOffset: 0
|
|
currentActiveSplitter: -1
|
|
realSizes:
|
|
- 60
|
|
- 60
|
|
- 60
|
|
- 60
|
|
relativeSizes:
|
|
- 0.25
|
|
- 0.25
|
|
- 0.25
|
|
- 0.25
|
|
minSizes:
|
|
- 100
|
|
- 85
|
|
- 85
|
|
- 85
|
|
maxSizes:
|
|
- 0
|
|
- 0
|
|
- 0
|
|
- 0
|
|
lastTotalSize: 0
|
|
splitSize: 6
|
|
xOffset: 0
|
|
m_Version: 1
|
|
oldRealSizes:
|
|
oldMinSizes:
|
|
oldMaxSizes:
|
|
oldSplitSize: 0
|
|
m_HorizontalSplitter:
|
|
ID: 307
|
|
splitterInitialOffset: 0
|
|
currentActiveSplitter: -1
|
|
realSizes:
|
|
- 184
|
|
- 428
|
|
relativeSizes:
|
|
- 0.3
|
|
- 0.7
|
|
minSizes:
|
|
- 160
|
|
- 160
|
|
maxSizes:
|
|
- 0
|
|
- 0
|
|
lastTotalSize: 612
|
|
splitSize: 6
|
|
xOffset: 0
|
|
m_Version: 1
|
|
oldRealSizes:
|
|
oldMinSizes:
|
|
oldMaxSizes:
|
|
oldSplitSize: 0
|
|
m_SectionOrder: 00000000030000000100000002000000
|
|
m_LayoutMode: 1
|
|
m_SortGroupsAlphabetically: 0
|
|
m_ShowReferencedBuses: 1
|
|
m_ShowBusConnections: 0
|
|
m_ShowBusConnectionsOfSelection: 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: 0
|
|
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
|
m_Name: ProjectBrowser
|
|
m_EditorClassIdentifier:
|
|
m_Children: []
|
|
m_Position:
|
|
serializedVersion: 2
|
|
<<<<<<< Updated upstream
|
|
x: 341
|
|
y: 0
|
|
width: 769
|
|
height: 652
|
|
=======
|
|
x: 587
|
|
y: 0
|
|
width: 1068
|
|
height: 617
|
|
>>>>>>> Stashed changes
|
|
m_MinSize: {x: 232, y: 271}
|
|
m_MaxSize: {x: 10002, y: 10021}
|
|
m_ActualView: {fileID: 18}
|
|
m_Panes:
|
|
- {fileID: 18}
|
|
m_Selected: 0
|
|
m_LastSelected: 0
|
|
--- !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: 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
|
|
<<<<<<< Updated upstream
|
|
x: 341
|
|
y: 768
|
|
width: 767
|
|
height: 631
|
|
=======
|
|
x: 587
|
|
y: 803
|
|
width: 1066
|
|
height: 596
|
|
>>>>>>> Stashed changes
|
|
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:
|
|
<<<<<<< Updated upstream
|
|
- Assets/MyGame/aa/Game/HHWK/Boss/YuXI
|
|
=======
|
|
- Assets
|
|
>>>>>>> Stashed changes
|
|
m_Globs: []
|
|
m_OriginalText:
|
|
m_ImportLogFlags: 0
|
|
m_FilterByTypeIntersection: 0
|
|
m_ViewMode: 1
|
|
m_StartGridSize: 96
|
|
m_LastFolders:
|
|
<<<<<<< Updated upstream
|
|
- Assets/MyGame/aa/Game/HHWK/Boss/YuXI
|
|
=======
|
|
- Assets
|
|
>>>>>>> Stashed changes
|
|
m_LastFoldersGridSize: 96
|
|
m_LastProjectPath: D:\Unity\UnityProjects\Buyu_Script
|
|
m_LockTracker:
|
|
m_IsLocked: 1
|
|
m_FolderTreeState:
|
|
<<<<<<< Updated upstream
|
|
scrollPos: {x: 0, y: 445}
|
|
m_SelectedIDs: a00f0100
|
|
m_LastClickedID: 69536
|
|
m_ExpandedIDs: 000000005c0c01005e0c0100600c0100620c0100640c0100660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c0100
|
|
=======
|
|
scrollPos: {x: 0, y: 31}
|
|
m_SelectedIDs: b05d0100
|
|
m_LastClickedID: 89520
|
|
m_ExpandedIDs: 00000000b05d0100b25d0100b45d0100b65d0100b85d0100ba5d0100bc5d0100be5d0100c05d0100c25d0100c45d0100c65d0100c85d0100ca5d0100cc5d0100ce5d0100d05d0100d25d0100d45d0100d65d0100d85d0100da5d0100dc5d0100de5d0100e05d0100
|
|
>>>>>>> Stashed changes
|
|
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: 17}
|
|
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
|
|
<<<<<<< Updated upstream
|
|
m_ExpandedIDs: 000000005c0c01005e0c0100600c0100620c0100640c0100660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c0100
|
|
=======
|
|
m_ExpandedIDs: 00000000b05d0100b25d0100b45d0100b65d0100b85d0100ba5d0100bc5d0100be5d0100c05d0100c25d0100c45d0100c65d0100c85d0100ca5d0100cc5d0100ce5d0100d05d0100d25d0100d45d0100d65d0100d85d0100da5d0100dc5d0100de5d0100e05d0100
|
|
>>>>>>> Stashed changes
|
|
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_ListAreaState:
|
|
<<<<<<< Updated upstream
|
|
m_SelectedInstanceIDs: 46efffff
|
|
m_LastClickedInstanceID: -4282
|
|
m_HadKeyboardFocusLastEvent: 1
|
|
=======
|
|
m_SelectedInstanceIDs: 80e20000
|
|
m_LastClickedInstanceID: 57984
|
|
m_HadKeyboardFocusLastEvent: 0
|
|
>>>>>>> Stashed changes
|
|
m_ExpandedInstanceIDs: 4675000052970000469700008696000074960000987e0000c8630100c4ec0000e2ef0000dcef0000beef000098da00009cda000020a30000c6a200000eab000036c10000
|
|
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: 17}
|
|
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
|
|
<<<<<<< Updated upstream
|
|
m_DirectoriesAreaWidth: 254
|
|
=======
|
|
m_DirectoriesAreaWidth: 76
|
|
>>>>>>> Stashed changes
|
|
--- !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: 0
|
|
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
|
m_Name: ProjectBrowser
|
|
m_EditorClassIdentifier:
|
|
m_Children: []
|
|
m_Position:
|
|
serializedVersion: 2
|
|
<<<<<<< Updated upstream
|
|
x: 1110
|
|
y: 0
|
|
width: 966
|
|
height: 652
|
|
=======
|
|
x: 1655
|
|
y: 0
|
|
width: 498
|
|
height: 617
|
|
>>>>>>> Stashed changes
|
|
m_MinSize: {x: 232, y: 271}
|
|
m_MaxSize: {x: 10002, y: 10021}
|
|
m_ActualView: {fileID: 20}
|
|
m_Panes:
|
|
- {fileID: 20}
|
|
m_Selected: 0
|
|
m_LastSelected: 0
|
|
--- !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: 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
|
|
<<<<<<< Updated upstream
|
|
x: 1110
|
|
y: 768
|
|
width: 964
|
|
height: 631
|
|
=======
|
|
x: 1655
|
|
y: 803
|
|
width: 496
|
|
height: 596
|
|
>>>>>>> Stashed changes
|
|
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:
|
|
<<<<<<< Updated upstream
|
|
- Assets/Art/HHWK/res/model/wukong
|
|
=======
|
|
- Assets
|
|
>>>>>>> Stashed changes
|
|
m_Globs: []
|
|
m_OriginalText:
|
|
m_ImportLogFlags: 0
|
|
m_FilterByTypeIntersection: 0
|
|
m_ViewMode: 1
|
|
m_StartGridSize: 16
|
|
m_LastFolders:
|
|
<<<<<<< Updated upstream
|
|
- Assets/Art/HHWK/res/model/wukong
|
|
m_LastFoldersGridSize: 16
|
|
=======
|
|
- Assets
|
|
m_LastFoldersGridSize: 96
|
|
>>>>>>> Stashed changes
|
|
m_LastProjectPath: D:\Unity\UnityProjects\Buyu_Script
|
|
m_LockTracker:
|
|
m_IsLocked: 0
|
|
m_FolderTreeState:
|
|
<<<<<<< Updated upstream
|
|
scrollPos: {x: 0, y: 429}
|
|
m_SelectedIDs: 0acf0100
|
|
m_LastClickedID: 118538
|
|
m_ExpandedIDs: 000000005c0c01005e0c0100600c0100620c0100640c0100660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c0100780f0100f60f0100fe0f0100
|
|
=======
|
|
scrollPos: {x: 0, y: 31}
|
|
m_SelectedIDs: b05d0100
|
|
m_LastClickedID: 89520
|
|
m_ExpandedIDs: 00000000b05d0100b25d0100b45d0100b65d0100b85d0100ba5d0100bc5d0100be5d0100c05d0100c25d0100c45d0100c65d0100c85d0100ca5d0100cc5d0100ce5d0100d05d0100d25d0100d45d0100d65d0100d85d0100da5d0100dc5d0100de5d0100e05d0100
|
|
>>>>>>> Stashed changes
|
|
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: 19}
|
|
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
|
|
<<<<<<< Updated upstream
|
|
m_ExpandedIDs: 000000005c0c01005e0c0100600c0100620c0100640c0100660c0100680c01006a0c01006c0c01006e0c0100700c0100720c0100740c0100760c0100780c01007a0c01007c0c01007e0c0100800c0100820c0100840c0100860c0100880c01008a0c0100
|
|
=======
|
|
m_ExpandedIDs: 00000000b05d0100b25d0100b45d0100b65d0100b85d0100ba5d0100bc5d0100be5d0100c05d0100c25d0100c45d0100c65d0100c85d0100ca5d0100cc5d0100ce5d0100d05d0100d25d0100d45d0100d65d0100d85d0100da5d0100dc5d0100de5d0100e05d0100
|
|
>>>>>>> Stashed changes
|
|
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_ListAreaState:
|
|
<<<<<<< Updated upstream
|
|
m_SelectedInstanceIDs: 46efffff
|
|
m_LastClickedInstanceID: -4282
|
|
m_HadKeyboardFocusLastEvent: 0
|
|
m_ExpandedInstanceIDs: c0b000000eab00006ce3f5ff98250100ce220100663101008a21010016d0000072d000003eca000046ca00007c74020082740200e026020028950200
|
|
=======
|
|
m_SelectedInstanceIDs: 80e20000
|
|
m_LastClickedInstanceID: 57984
|
|
m_HadKeyboardFocusLastEvent: 0
|
|
m_ExpandedInstanceIDs: c0b000000eab00006ce3f5ff98250100ce220100663101008a21010016d0000072d000003eca000046ca00007c74020082740200
|
|
>>>>>>> Stashed changes
|
|
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: 19}
|
|
m_CreateAssetUtility:
|
|
m_EndAction: {fileID: 0}
|
|
m_InstanceID: 0
|
|
m_Path:
|
|
m_Icon: {fileID: 0}
|
|
m_ResourceFile:
|
|
m_NewAssetIndexInList: -1
|
|
<<<<<<< Updated upstream
|
|
m_ScrollPosition: {x: 0, y: 0}
|
|
m_GridSize: 16
|
|
=======
|
|
m_ScrollPosition: {x: 0, y: 1472}
|
|
m_GridSize: 96
|
|
>>>>>>> Stashed changes
|
|
m_SkipHiddenPackages: 0
|
|
m_DirectoriesAreaWidth: 195
|
|
--- !u!114 &21
|
|
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
|
|
<<<<<<< Updated upstream
|
|
x: 2076
|
|
y: 0
|
|
width: 484
|
|
height: 1347
|
|
m_MinSize: {x: 276, y: 71}
|
|
m_MaxSize: {x: 4001, y: 4021}
|
|
m_ActualView: {fileID: 22}
|
|
=======
|
|
x: 2153
|
|
y: 0
|
|
width: 407
|
|
height: 1347
|
|
m_MinSize: {x: 275, y: 100}
|
|
m_MaxSize: {x: 4000, y: 4000}
|
|
m_ActualView: {fileID: 23}
|
|
>>>>>>> Stashed changes
|
|
m_Panes:
|
|
- {fileID: 22}
|
|
- {fileID: 23}
|
|
m_Selected: 0
|
|
m_LastSelected: 1
|
|
--- !u!114 &22
|
|
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: 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
|
|
<<<<<<< Updated upstream
|
|
x: 2076
|
|
y: 73
|
|
width: 483
|
|
=======
|
|
x: 3911
|
|
y: 73
|
|
width: 568
|
|
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: 368
|
|
m_ControlHash: -371814159
|
|
m_PrefName: Preview_InspectorPreview
|
|
m_LastInspectedObjectInstanceID: 57984
|
|
m_LastVerticalScrollValue: 0
|
|
m_GlobalObjectId:
|
|
m_InspectorMode: 0
|
|
m_LockTracker:
|
|
m_IsLocked: 0
|
|
m_PreviewWindow: {fileID: 0}
|
|
--- !u!114 &23
|
|
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: 100}
|
|
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: 2153
|
|
y: 73
|
|
width: 406
|
|
>>>>>>> Stashed changes
|
|
height: 1326
|
|
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:
|
|
<<<<<<< Updated upstream
|
|
m_CachedPref: 368
|
|
m_ControlHash: -371814159
|
|
=======
|
|
m_CachedPref: -379
|
|
m_ControlHash: 1412526313
|
|
>>>>>>> Stashed changes
|
|
m_PrefName: Preview_InspectorPreview
|
|
m_LastInspectedObjectInstanceID: -1
|
|
m_LastVerticalScrollValue: 0
|
|
m_GlobalObjectId:
|
|
m_InspectorMode: 0
|
|
m_LockTracker:
|
|
m_IsLocked: 0
|
|
m_PreviewWindow: {fileID: 0}
|
|
--- !u!114 &23
|
|
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: 12079, guid: 0000000000000000e000000000000000, type: 0}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
m_MinSize: {x: 390, y: 390}
|
|
m_MaxSize: {x: 4000, y: 4000}
|
|
m_TitleContent:
|
|
m_Text: Lighting
|
|
m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000,
|
|
type: 0}
|
|
m_Tooltip:
|
|
m_Pos:
|
|
serializedVersion: 2
|
|
x: 2076
|
|
y: 73
|
|
width: 483
|
|
height: 1326
|
|
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
|