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 branch 'game-manager'

Browse Source
This commit is contained in:
juliuse98
2021-11-04 08:23:17 +01:00
parent 6c1b72cc12 8967b780dd
commit 6ba99d7ead
12 changed files with 712 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
UserSettings/EditorUserSettings.asset
View File

@@ -5,6 +5,12 @@ EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedSceneGuid-0:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
RecentlyUsedSceneGuid-1:
value: 510150040406500e0b5c0f26497b0d44444f40297f7c76617f7d1e36bbe4623e
flags: 0
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
@@ -25,9 +31,13 @@ EditorUserSettings:
m_VCDebugCmd: 0
m_VCDebugOut: 0
m_SemanticMergeMode: 2
m_DesiredImportWorkerCount: 2
m_StandbyImportWorkerCount: 2
m_IdleImportWorkerShutdownDelay: 60000
m_VCShowFailedCheckout: 1
m_VCOverwriteFailedCheckoutAssets: 1
m_VCProjectOverlayIcons: 1
m_VCHierarchyOverlayIcons: 1
m_VCOtherOverlayIcons: 1
m_VCAllowAsyncUpdate: 1
m_ArtifactGarbageCollection: 1

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

@@ -14,16 +14,16 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 322.4
y: 93.6
width: 1206.4
height: 715.2
x: 0
y: 43.2
width: 1536
height: 772.8
m_ShowMode: 4
m_Title:
m_Title: Scene
m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 0
m_Maximized: 1
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -43,12 +43,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 30
width: 1206
height: 665
width: 1536
height: 722.8
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 17
controlID: 23
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -64,12 +64,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 921
x: 1172
y: 0
width: 285
height: 665
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
width: 364
height: 722.8
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
@@ -92,10 +92,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 228
height: 394
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
width: 290.4
height: 429.6
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
@@ -117,9 +117,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 394
width: 921
height: 271
y: 429.6
width: 1172
height: 293.19998
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 12}
@@ -148,8 +148,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1206
height: 715
width: 1536
height: 772.8
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1
@@ -173,7 +173,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1206
width: 1536
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -194,8 +194,8 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 695
width: 1206
y: 752.8
width: 1536
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: 921
height: 665
width: 1172
height: 722.8
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 45
controlID: 71
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -243,12 +243,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 921
height: 394
width: 1172
height: 429.6
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 46
controlID: 72
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -259,15 +259,15 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_Name: SceneView
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 228
x: 290.4
y: 0
width: 693
height: 394
width: 881.6
height: 429.6
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 15}
@@ -292,14 +292,14 @@ MonoBehaviour:
m_MaxSize: {x: 10000, y: 10000}
m_TitleContent:
m_Text: Project
m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 322.4
y: 517.60004
width: 920
height: 250
x: 0
y: 503.2
width: 1171
height: 272.19998
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -317,22 +317,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets
- Assets/Scenes
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets
- Assets/Scenes
m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\Janis\Unity Projects\defrain
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 0a5c0000
m_LastClickedID: 23562
m_ExpandedIDs: 000000000a5c000000ca9a3bffffff7f
scrollPos: {x: 0, y: 67.80002}
m_SelectedIDs: ae5b0000
m_LastClickedID: 23470
m_ExpandedIDs: 000000009a5b0000a85b0000b05b000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -360,7 +360,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000000a5c0000
m_ExpandedIDs: 000000009a5b0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -387,7 +387,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -436,10 +436,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1243.2001
y: 124
width: 283
height: 644
x: 1172
y: 73.6
width: 363
height: 701.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -473,14 +473,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Hierarchy
m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 322.4
y: 124
width: 227
height: 373
x: 0
y: 73.6
width: 289.4
height: 408.6
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -488,9 +488,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00fbffff
m_SelectedIDs: ce9a0000
m_LastClickedID: 39630
m_ExpandedIDs: ea74ffff9875ffffd875ffff2278ffff4a78fffff082ffff5883ffff3086ffff7c86ffff3e87ffff5887fffff88cffffb88effff58aaffffa4aaffff84acffff9eacffff4ab3ffff46b5ffff92b5ffffd6b7fffff0b7ffff66bbffff90c0ffffdedeffff1ae3ffff82e3ffffb4e5ffff06fbffff8a5a0000065b0000ba6b0000386c0000947a0000207b0000bc7f000048800000e686000072870000cc8a0000588b0000f28d0000708e0000509a0000ce9a0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -506,7 +506,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 0}
m_ClientGUIView: {fileID: 4}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
@@ -530,14 +530,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Scene
m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 550.4
y: 124
width: 691
height: 373
x: 290.4
y: 73.6
width: 879.6
height: 408.6
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -547,8 +547,8 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: -98.39996, y: -25.600006}
snapOffset: {x: -98.400024, y: -25.600006}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 3
id: Tool Settings
index: 0
@@ -569,7 +569,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-scene-view-toolbar
@@ -734,14 +734,14 @@ MonoBehaviour:
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1
m_SceneLighting: 1
m_2DMode: 0
m_2DMode: 1
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 0, y: 0, z: 0}
m_Target: {x: 418.23352, y: 172.2487, z: 3.0638342}
speed: 2
m_Value: {x: 0, y: 0, z: 0}
m_Value: {x: 418.86877, y: 170.9868, z: 2.981596}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -769,6 +769,14 @@ MonoBehaviour:
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 0, y: 0}
yGrid:
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}
zGrid:
m_Fade:
m_Target: 1
speed: 2
@@ -776,29 +784,21 @@ MonoBehaviour:
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: 0, y: 0}
m_ShowGrid: 1
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
m_Target: {x: 0, y: 0, z: 0, w: 1}
speed: 2
m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 10
m_Target: 174.52747
speed: 2
m_Value: 16.228529
m_Value: 182.75127
m_Ortho:
m_Target: 0
m_Target: 1
speed: 2
m_Value: 0
m_Value: 1
m_CameraSettings:
m_Speed: 1
m_SpeedNormalized: 0.5
@@ -812,7 +812,7 @@ MonoBehaviour:
m_FarClip: 10000
m_DynamicClip: 1
m_OcclusionCulling: 0
m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
m_LastSceneViewOrtho: 0
m_ReplacementShader: {fileID: 0}
m_ReplacementString:
@@ -835,14 +835,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Game
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 507
y: 94
width: 1532
height: 790
x: 290.4
y: 73.6
width: 879.6
height: 408.6
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -853,10 +853,10 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 1532, y: 769}
m_TargetSize: {x: 879.6, y: 387.6}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 0
m_RenderIMGUI: 1
m_EnterPlayModeBehavior: 0
m_UseMipMap: 0
m_VSyncEnabled: 0
@@ -868,10 +868,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -766
m_HBaseRangeMax: 766
m_VBaseRangeMin: -395
m_VBaseRangeMax: 395
m_HBaseRangeMin: -351.84
m_HBaseRangeMax: 351.84
m_VBaseRangeMin: -155.04001
m_VBaseRangeMax: 155.04001
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -888,24 +888,24 @@ MonoBehaviour:
m_DrawArea:
serializedVersion: 2
x: 0
y: 0
width: 1532
height: 790
y: 21
width: 879.6
height: 387.6
m_Scale: {x: 1, y: 1}
m_Translation: {x: 766, y: 395}
m_Translation: {x: 439.8, y: 193.8}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -766
y: -395
width: 1532
height: 790
x: -439.8
y: -193.8
width: 879.6
height: 387.6
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 1532, y: 790}
m_LastWindowPixelSize: {x: 1099.5, y: 510.75}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -927,14 +927,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 2249
y: 726.5
width: 920
height: 250
x: 0
y: 503.2
width: 1171
height: 272.19998
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default