Merge main into environment
This commit is contained in:
@@ -19,7 +19,7 @@ MonoBehaviour:
|
||||
width: 2560
|
||||
height: 989
|
||||
m_ShowMode: 4
|
||||
m_Title: Scene
|
||||
m_Title: Game
|
||||
m_RootView: {fileID: 7}
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
@@ -39,12 +39,12 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 1183
|
||||
x: 1023
|
||||
y: 0
|
||||
width: 767
|
||||
width: 927
|
||||
height: 619
|
||||
m_MinSize: {x: 202, y: 226}
|
||||
m_MaxSize: {x: 4002, y: 4026}
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 18}
|
||||
m_Panes:
|
||||
- {fileID: 18}
|
||||
@@ -74,7 +74,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 400, y: 100}
|
||||
m_MaxSize: {x: 32384, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 5022
|
||||
controlID: 135
|
||||
draggingID: 0
|
||||
--- !u!114 &4
|
||||
MonoBehaviour:
|
||||
@@ -138,7 +138,7 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: ProjectBrowser
|
||||
m_Name: ConsoleWindow
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
@@ -147,14 +147,14 @@ MonoBehaviour:
|
||||
y: 619
|
||||
width: 1950
|
||||
height: 314
|
||||
m_MinSize: {x: 231, y: 276}
|
||||
m_MaxSize: {x: 10001, y: 10026}
|
||||
m_ActualView: {fileID: 14}
|
||||
m_MinSize: {x: 101, y: 126}
|
||||
m_MaxSize: {x: 4001, y: 4026}
|
||||
m_ActualView: {fileID: 19}
|
||||
m_Panes:
|
||||
- {fileID: 14}
|
||||
- {fileID: 19}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
m_Selected: 1
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &7
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -250,7 +250,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 300, y: 100}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 5023
|
||||
controlID: 50
|
||||
draggingID: 0
|
||||
--- !u!114 &11
|
||||
MonoBehaviour:
|
||||
@@ -277,7 +277,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 300, y: 50}
|
||||
m_MaxSize: {x: 24288, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 5024
|
||||
controlID: 51
|
||||
draggingID: 0
|
||||
--- !u!114 &12
|
||||
MonoBehaviour:
|
||||
@@ -296,7 +296,7 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 400
|
||||
y: 0
|
||||
width: 783
|
||||
width: 623
|
||||
height: 619
|
||||
m_MinSize: {x: 202, y: 226}
|
||||
m_MaxSize: {x: 4002, y: 4026}
|
||||
@@ -458,10 +458,10 @@ MonoBehaviour:
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 164}
|
||||
m_SelectedIDs: b2210100
|
||||
m_LastClickedID: 74162
|
||||
m_ExpandedIDs: 00000000f6b90000b4bc00009e21010000ca9a3b
|
||||
scrollPos: {x: 0, y: 180}
|
||||
m_SelectedIDs: 98e10000
|
||||
m_LastClickedID: 57752
|
||||
m_ExpandedIDs: 0000000030e1000032e1000092e1000000ca9a3b
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -490,7 +490,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 00000000f6b90000
|
||||
m_ExpandedIDs: 0000000030e1000032e10000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -516,9 +516,9 @@ MonoBehaviour:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_ListAreaState:
|
||||
m_SelectedInstanceIDs:
|
||||
m_LastClickedInstanceID: 0
|
||||
m_HadKeyboardFocusLastEvent: 1
|
||||
m_SelectedInstanceIDs: 30dc0000
|
||||
m_LastClickedInstanceID: 56368
|
||||
m_HadKeyboardFocusLastEvent: 0
|
||||
m_ExpandedInstanceIDs: c6230000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
@@ -636,9 +636,9 @@ MonoBehaviour:
|
||||
m_SceneHierarchy:
|
||||
m_TreeViewState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 4cf0ffff
|
||||
m_LastClickedID: -4020
|
||||
m_ExpandedIDs: 14fbffff
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 02eaffff
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -686,7 +686,7 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: -2160
|
||||
y: 79
|
||||
width: 781
|
||||
width: 621
|
||||
height: 593
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
@@ -993,7 +993,7 @@ MonoBehaviour:
|
||||
sizeOverridden: 0
|
||||
- dockPosition: 0
|
||||
containerId: overlay-toolbar__top
|
||||
displayed: 1
|
||||
displayed: 0
|
||||
id: Brush Attributes
|
||||
index: 3
|
||||
contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}'
|
||||
@@ -1007,7 +1007,7 @@ MonoBehaviour:
|
||||
sizeOverridden: 0
|
||||
- dockPosition: 0
|
||||
containerId: overlay-toolbar__left
|
||||
displayed: 1
|
||||
displayed: 0
|
||||
id: Terrain Tools
|
||||
index: 0
|
||||
contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}'
|
||||
@@ -1021,12 +1021,12 @@ MonoBehaviour:
|
||||
sizeOverridden: 0
|
||||
- dockPosition: 0
|
||||
containerId: overlay-toolbar__left
|
||||
displayed: 1
|
||||
displayed: 0
|
||||
id: Brush Masks
|
||||
index: 2
|
||||
contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}'
|
||||
floating: 0
|
||||
collapsed: 1
|
||||
collapsed: 0
|
||||
snapOffset: {x: 0, y: 0}
|
||||
snapOffsetDelta: {x: 0, y: 0}
|
||||
snapCorner: 0
|
||||
@@ -1147,12 +1147,12 @@ MonoBehaviour:
|
||||
sizeOverridden: 0
|
||||
- dockPosition: 0
|
||||
containerId: overlay-toolbar__left
|
||||
displayed: 1
|
||||
displayed: 0
|
||||
id: Brush Filters
|
||||
index: 1
|
||||
contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}'
|
||||
floating: 0
|
||||
collapsed: 1
|
||||
collapsed: 0
|
||||
snapOffset: {x: 0, y: 0}
|
||||
snapOffsetDelta: {x: 0, y: 0}
|
||||
snapCorner: 0
|
||||
@@ -1256,9 +1256,9 @@ MonoBehaviour:
|
||||
m_AudioPlay: 0
|
||||
m_DebugDrawModesUseInteractiveLightBakingData: 0
|
||||
m_Position:
|
||||
m_Target: {x: -10.283845, y: 120.45147, z: 1.333747}
|
||||
m_Target: {x: 0, y: 0, z: 0}
|
||||
speed: 2
|
||||
m_Value: {x: -10.283845, y: 120.45147, z: 1.333747}
|
||||
m_Value: {x: 0, y: 0, z: 0}
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
@@ -1304,13 +1304,13 @@ MonoBehaviour:
|
||||
m_GridAxis: 1
|
||||
m_gridOpacity: 0.5
|
||||
m_Rotation:
|
||||
m_Target: {x: 0.23853607, y: -0.22591367, z: 0.057147805, w: 0.9427841}
|
||||
m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
|
||||
speed: 2
|
||||
m_Value: {x: 0.23994468, y: -0.22582272, z: 0.05748537, w: 0.9424044}
|
||||
m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
|
||||
m_Size:
|
||||
m_Target: 1.4662604
|
||||
m_Target: 10
|
||||
speed: 2
|
||||
m_Value: 1.4662604
|
||||
m_Value: 10
|
||||
m_Ortho:
|
||||
m_Target: 0
|
||||
speed: 2
|
||||
@@ -1365,9 +1365,9 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Game\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: -1377
|
||||
x: -1537
|
||||
y: 79
|
||||
width: 765
|
||||
width: 925
|
||||
height: 593
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
@@ -1386,7 +1386,7 @@ MonoBehaviour:
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_TargetSize: {x: 765, y: 572}
|
||||
m_TargetSize: {x: 925, y: 572}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
@@ -1401,8 +1401,8 @@ MonoBehaviour:
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -382.5
|
||||
m_HBaseRangeMax: 382.5
|
||||
m_HBaseRangeMin: -462.5
|
||||
m_HBaseRangeMax: 462.5
|
||||
m_VBaseRangeMin: -286
|
||||
m_VBaseRangeMax: 286
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
@@ -1422,23 +1422,23 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 765
|
||||
width: 925
|
||||
height: 572
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Translation: {x: 382.5, y: 286}
|
||||
m_Translation: {x: 462.5, y: 286}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -382.5
|
||||
x: -462.5
|
||||
y: -286
|
||||
width: 765
|
||||
width: 925
|
||||
height: 572
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 1
|
||||
m_LastWindowPixelSize: {x: 765, y: 593}
|
||||
m_LastWindowPixelSize: {x: 925, y: 593}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
|
||||
Reference in New Issue
Block a user