janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 12:52:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge FIX

Browse Source
This commit is contained in:
juliuse98
2021-11-12 11:14:06 +01:00
parent dd44099bab
commit 1b0d941f07
6 changed files with 103 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
UserSettings/Layouts/CurrentMaximizeLayout.dwlt
View File

@@ -45,10 +45,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 711.2
x: 709.60004
y: 73.6
width: 457.99994
height: 451
width: 459.59998
height: 451.8
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: 457.99994, y: 430}
m_TargetSize: {x: 459.59998, y: 430.8}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -74,10 +74,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -183.19998
m_HBaseRangeMax: 183.19998
m_VBaseRangeMin: -172
m_VBaseRangeMax: 172
m_HBaseRangeMin: -183.84
m_HBaseRangeMax: 183.84
m_VBaseRangeMin: -172.31999
m_VBaseRangeMax: 172.31999
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -95,23 +95,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 457.99994
height: 430
width: 459.59998
height: 430.8
m_Scale: {x: 1, y: 1}
m_Translation: {x: 228.99997, y: 215}
m_Translation: {x: 229.79999, y: 215.4}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -228.99997
y: -215
width: 457.99994
height: 430
x: -229.79999
y: -215.4
width: 459.59998
height: 430.8
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 572.49994, y: 563.75}
m_LastWindowPixelSize: {x: 574.5, y: 564.75}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -163,7 +163,7 @@ MonoBehaviour:
x: 0
y: 0
width: 1171.2
height: 472
height: 472.8
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 8096}
vertical: 0
@@ -185,10 +185,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 296
height: 472
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
width: 293.6
height: 472.8
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 6}
m_Panes:
- {fileID: 6}
@@ -216,8 +216,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 73.6
width: 295
height: 451
width: 292.6
height: 451.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -227,7 +227,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 2afbffff
m_ExpandedIDs: deecfeff30edfeff98effeff20fafeff72fafeffdafcfeff4c06ffffa606ffff0e09ffff6613ffffb813ffff2016ffffd81effff2a1fffff9221ffff442effff962efffffe30ffff7038ffffc238ffff2a3bffff3441ffff8841fffff043ffffc258ffff1459ffff7c5bffff6a62ffffc462ffff2c65ffffd86fffff2a70ffff9272ffff6680ffffb880ffff2083ffff408affff928afffffa8cffffb893ffff0a94ffff7296ffff3499ffff8699ffffee9bffff269effff789effffe0a0ffffa2abffffaaabffffb0abffffdcabffff50eeffff2afbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -266,10 +266,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 296
x: 293.6
y: 0
width: 415.2
height: 472
width: 415.99997
height: 472.8
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 9}
@@ -362,10 +362,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 296
x: 293.6
y: 73.6
width: 413.2
height: 451
width: 413.99997
height: 451.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -430,9 +430,9 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
snapOffset: {x: 67.5, y: 86}
snapOffset: {x: -171.7, y: 86}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
snapCorner: 1
id: Orientation
index: 0
layout: 4
@@ -673,10 +673,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 711.2
x: 709.6
y: 0
width: 459.99994
height: 472
width: 461.59998
height: 472.8
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 2}
@@ -700,9 +700,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 472
y: 472.8
width: 1171.2
height: 258.8
height: 258
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 13}
@@ -731,10 +731,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1536
y: 684
width: 1463
height: 315
x: 0
y: 546.4
width: 1170.2
height: 237
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -752,22 +752,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Scenes
- Assets/Prefabs/Player
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Scenes
- Assets/Prefabs/Player
m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 120}
m_SelectedIDs: d8640000
m_LastClickedID: 25816
m_ExpandedIDs: 000000000a6300000c6300000e630000
scrollPos: {x: 0, y: 167}
m_SelectedIDs: 16650000
m_LastClickedID: 25878
m_ExpandedIDs: 000000000a6300000c6300000e630000dc640000e064000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -872,9 +872,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 545.60004
y: 546.4
width: 1170.2
height: 237.79999
height: 237
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default