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

fixed merge

Browse Source
This commit is contained in:
juliuse98
2021-11-04 08:45:48 +01:00
parent 6ba99d7ead
commit 2868c0e89e
9 changed files with 267 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
UserSettings/Layouts/default-2021.dwlt
View File

@@ -14,16 +14,16 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 0
y: 43.2
width: 1536
x: 0.8
y: 50.4
width: 889.60004
height: 772.8
m_ShowMode: 4
m_Title: Scene
m_Title: Game
m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
m_Maximized: 0
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -43,12 +43,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 30
width: 1536
width: 889.60004
height: 722.8
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 23
controlID: 98
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -64,9 +64,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1172
x: 678.4
y: 0
width: 364
width: 211.20001
height: 722.8
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
@@ -92,7 +92,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 290.4
width: 168
height: 429.6
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
@@ -111,23 +111,23 @@ 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:
serializedVersion: 2
x: 0
y: 429.6
width: 1172
width: 678.4
height: 293.19998
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 12}
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 12}
- {fileID: 17}
m_Selected: 0
m_LastSelected: 1
m_Selected: 1
m_LastSelected: 0
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -148,7 +148,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1536
width: 889.60004
height: 772.8
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -173,7 +173,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1536
width: 889.60004
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -195,7 +195,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 752.8
width: 1536
width: 889.60004
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -218,12 +218,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1172
width: 678.4
height: 722.8
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 71
controlID: 99
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -243,12 +243,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1172
width: 678.4
height: 429.6
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 72
controlID: 100
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -264,9 +264,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 290.4
x: 168
y: 0
width: 881.6
width: 510.40002
height: 429.6
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
@@ -297,9 +297,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 503.2
width: 1171
height: 272.19998
y: 508
width: 1170.2
height: 275.4
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -317,22 +317,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Scenes
- Assets/Prefabs
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Scenes
- Assets/Prefabs
m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\Janis\Unity Projects\defrain
m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 67.80002}
m_SelectedIDs: ae5b0000
m_LastClickedID: 23470
m_ExpandedIDs: 000000009a5b0000a85b0000b05b000000ca9a3bffffff7f
scrollPos: {x: 0, y: 21}
m_SelectedIDs: ae920000
m_LastClickedID: 37550
m_ExpandedIDs: 000000009e920000a0920000b292000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -360,7 +360,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000009a5b0000
m_ExpandedIDs: 000000009e920000a0920000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -436,9 +436,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1172
y: 73.6
width: 363
x: 679.2
y: 80.8
width: 210.20001
height: 701.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -477,9 +477,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 73.6
width: 289.4
x: 0.8
y: 80.8
width: 167
height: 408.6
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -488,9 +488,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: ce9a0000
m_LastClickedID: 39630
m_ExpandedIDs: ea74ffff9875ffffd875ffff2278ffff4a78fffff082ffff5883ffff3086ffff7c86ffff3e87ffff5887fffff88cffffb88effff58aaffffa4aaffff84acffff9eacffff4ab3ffff46b5ffff92b5ffffd6b7fffff0b7ffff66bbffff90c0ffffdedeffff1ae3ffff82e3ffffb4e5ffff06fbffff8a5a0000065b0000ba6b0000386c0000947a0000207b0000bc7f000048800000e686000072870000cc8a0000588b0000f28d0000708e0000509a0000ce9a0000
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 2e85ffff7e85ffffd487fffff087ffffe293ffff3694ffff8c96ffffa896ffff3ea0ffff98a8ffffb8c3ffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -534,9 +534,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 290.4
y: 73.6
width: 879.6
x: 168.8
y: 80.8
width: 508.40002
height: 408.6
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -591,7 +591,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
snapOffset: {x: 0, y: 0}
snapOffset: {x: 0, y: 24.8}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: unity-transform-toolbar
@@ -624,7 +624,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffset: {x: 0, y: 24.8}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Camera
@@ -734,14 +734,14 @@ MonoBehaviour:
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1
m_SceneLighting: 1
m_2DMode: 1
m_2DMode: 0
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 418.23352, y: 172.2487, z: 3.0638342}
m_Target: {x: -6.850004, y: -2.4662097, z: 34.642265}
speed: 2
m_Value: {x: 418.86877, y: 170.9868, z: 2.981596}
m_Value: {x: -6.850004, y: -2.4662097, z: 34.642265}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -770,17 +770,17 @@ MonoBehaviour:
m_Size: {x: 0, y: 0}
yGrid:
m_Fade:
m_Target: 0
m_Target: 1
speed: 2
m_Value: 0
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: 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}
@@ -788,13 +788,13 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: 0, y: 0, z: 0, w: 1}
m_Target: {x: 0.03279638, y: -0.9367419, z: 0.091338895, w: 0.33631974}
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Value: {x: 0.032796137, y: -0.936735, z: 0.09133822, w: 0.33631727}
m_Size:
m_Target: 174.52747
m_Target: 4.925797
speed: 2
m_Value: 182.75127
m_Value: 4.925797
m_Ortho:
m_Target: 1
speed: 2
@@ -839,9 +839,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 290.4
y: 73.6
width: 879.6
x: 168.8
y: 80.8
width: 508.40002
height: 408.6
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -853,7 +853,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 879.6, y: 387.6}
m_TargetSize: {x: 508.40002, y: 387.6}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -868,8 +868,8 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -351.84
m_HBaseRangeMax: 351.84
m_HBaseRangeMin: -203.36002
m_HBaseRangeMax: 203.36002
m_VBaseRangeMin: -155.04001
m_VBaseRangeMax: 155.04001
m_HAllowExceedBaseRangeMin: 1
@@ -880,7 +880,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1
m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@@ -889,23 +889,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 879.6
width: 508.40002
height: 387.6
m_Scale: {x: 1, y: 1}
m_Translation: {x: 439.8, y: 193.8}
m_Translation: {x: 254.20001, y: 193.8}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -439.8
x: -254.20001
y: -193.8
width: 879.6
width: 508.40002
height: 387.6
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 1099.5, y: 510.75}
m_LastWindowPixelSize: {x: 635.5, y: 510.75}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -931,9 +931,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 503.2
width: 1171
x: 0.8
y: 510.4
width: 677.4
height: 272.19998
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: