Merge remote-tracking branch 'origin/base-world' into Inventory

This commit is contained in:
janis
2022-02-15 11:34:54 +01:00
386 changed files with 26228 additions and 623 deletions

View File

@@ -19,8 +19,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 30
width: 1536
height: 730.8
width: 1920
height: 939
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
@@ -33,22 +33,22 @@ MonoBehaviour:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 200, y: 200}
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Game
m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 289.6
y: 73.6
width: 882.80005
height: 411
x: 331
y: 73
width: 1033
height: 536
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -59,7 +59,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 1920, y: 1080}
m_TargetSize: {x: 1033, y: 515}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -68,16 +68,16 @@ MonoBehaviour:
m_VSyncEnabled: 0
m_Gizmos: 0
m_Stats: 0
m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000
m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
m_ZoomArea:
m_HRangeLocked: 0
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -768
m_HBaseRangeMax: 768
m_VBaseRangeMin: -432
m_VBaseRangeMax: 432
m_HBaseRangeMin: -516.5
m_HBaseRangeMax: 516.5
m_VBaseRangeMin: -257.5
m_VBaseRangeMax: 257.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -95,23 +95,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 882.80005
height: 390
m_Scale: {x: 0.4513889, y: 0.4513889}
m_Translation: {x: 441.40002, y: 195}
width: 1033
height: 515
m_Scale: {x: 1, y: 1}
m_Translation: {x: 516.5, y: 257.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -977.8708
y: -432
width: 1955.7416
height: 864
x: -516.5
y: -257.5
width: 1033
height: 515
m_MinimalGUI: 1
m_defaultScale: 0.4513889
m_LastWindowPixelSize: {x: 1103.5, y: 513.75}
m_defaultScale: 1
m_LastWindowPixelSize: {x: 1033, y: 536}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -136,8 +136,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1174.4
height: 730.8
width: 1366
height: 939
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
@@ -161,8 +161,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1174.4
height: 432
width: 1366
height: 557
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
@@ -184,8 +184,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 289.6
height: 432
width: 331
height: 557
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 6}
@@ -209,14 +209,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Hierarchy
m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 73.6
width: 288.6
height: 411
y: 73
width: 330
height: 536
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -224,23 +224,23 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: ca5e0000
m_LastClickedID: 24266
m_ExpandedIDs: beeeffffa4f3ffffa8f3ffff2cfbffff2efbffffc65e0000ca5e0000dc5e0000
m_SelectedIDs: a66a0000
m_LastClickedID: 27302
m_ExpandedIDs: 2efbffffce6a0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
m_OriginalName:
m_Name: InteractionText
m_OriginalName: InteractionText
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 0
m_UserData: 27302
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 11
m_OriginalEventType: 4
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 5}
m_SearchString:
@@ -265,11 +265,11 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 289.6
x: 331
y: 0
width: 884.80005
height: 432
m_MinSize: {x: 202, y: 221}
width: 1035
height: 557
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 2}
m_Panes:
@@ -293,14 +293,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Scene
m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 289.6
y: 73.6
width: 882.80005
height: 411
x: 331
y: 73
width: 1033
height: 536
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -311,7 +311,7 @@ MonoBehaviour:
collapsed: 0
displayed: 1
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: -100, y: -25.600006}
snapOffsetDelta: {x: -101, y: -26}
snapCorner: 3
id: Tool Settings
index: 0
@@ -524,9 +524,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 320.8325, y: 254.67792, z: -1.2795316}
m_Target: {x: 479.0747, y: 297.06244, z: -1.6418004}
speed: 2
m_Value: {x: 320.8325, y: 254.67792, z: -1.2795316}
m_Value: {x: 479.0747, y: 297.06244, z: -1.6418004}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -563,13 +563,13 @@ MonoBehaviour:
m_Size: {x: 1, y: 1}
zGrid:
m_Fade:
m_Target: 1
m_Target: 0
speed: 2
m_Value: 1
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_ShowGrid: 0
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
@@ -577,9 +577,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 168.00757
m_Target: 264.67877
speed: 2
m_Value: 168.00757
m_Value: 264.67877
m_Ortho:
m_Target: 1
speed: 2
@@ -614,23 +614,23 @@ 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: 0
y: 432
width: 1174.4
height: 298.8
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 11}
y: 557
width: 1366
height: 382
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 10}
m_Panes:
- {fileID: 10}
- {fileID: 11}
m_Selected: 1
m_LastSelected: 0
m_Selected: 0
m_LastSelected: 1
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -647,14 +647,14 @@ MonoBehaviour:
m_MaxSize: {x: 10000, y: 10000}
m_TitleContent:
m_Text: Project
m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 505.6
width: 1173.4
height: 277.8
y: 630
width: 1365
height: 361
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -676,18 +676,18 @@ MonoBehaviour:
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_StartGridSize: 74
m_LastFolders:
- Assets/Scripts
m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\juliu\Desktop\UnityProjects
m_LastFoldersGridSize: 74
m_LastProjectPath: M:\UnityProjects\2D-Top-Down
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: ca5f0000
m_LastClickedID: 24522
m_ExpandedIDs: 00000000585f000000ca9a3bffffff7f
m_SelectedIDs: ce700000
m_LastClickedID: 28878
m_ExpandedIDs: 00000000c26e000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -703,7 +703,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 9}
m_ClientGUIView: {fileID: 0}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
@@ -715,7 +715,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000585f000000ca9a3bffffff7f
m_ExpandedIDs: 00000000c26e0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -740,10 +740,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: 44780000
m_LastClickedInstanceID: 30788
m_SelectedInstanceIDs: a66a0000
m_LastClickedInstanceID: 27302
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c623000000000000
m_ExpandedInstanceIDs: c62300006a8e0000f25e000088610000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -768,7 +768,7 @@ MonoBehaviour:
m_ResourceFile:
m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64
m_GridSize: 74
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207
--- !u!114 &11
@@ -787,14 +787,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 505.6
width: 1173.4
height: 277.8
y: 630
width: 1365
height: 361
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -809,17 +809,17 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_Name: InspectorWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 1174.4
x: 1366
y: 0
width: 361.59998
height: 730.8
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
width: 554
height: 939
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
@@ -841,14 +841,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Inspector
m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1174.4
y: 73.6
width: 360.59998
height: 709.8
x: 1366
y: 73
width: 553
height: 918
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1 @@
{}