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

Finished Merge

Browse Source 
- Old NetworkManager delete in testscene (new one is "NetManager" and comes from the HomeScene via "DoNotDestroy-Object")

- set up lobbymanager, netmanager
This commit is contained in:
DerTyp187
2021-12-16 22:16:09 +01:00
parent 0beeed4540
commit 7faa5f9a76
6 changed files with 171 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
UserSettings/EditorUserSettings.asset
View File

@@ -6,25 +6,25 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedSceneGuid-0:
value: 500252525d020a0d0c5e0a73477a5e441515482c752b22622b794563e3e33560
flags: 0
RecentlyUsedSceneGuid-1:
value: 0550505607055f0a5f5f092340205e4443151c297b7f24362c7c4b60e6e6356a
flags: 0
RecentlyUsedSceneGuid-2:
RecentlyUsedSceneGuid-1:
value: 510150040406500e0b5c0f26497b0d44444f40297f7c76617f7d1e36bbe4623e
flags: 0
RecentlyUsedSceneGuid-3:
RecentlyUsedSceneGuid-2:
value: 5303575756005a0f0c0d5e7a487a0a44154e19727f7b7f67757b1936b4b73268
flags: 0
RecentlyUsedSceneGuid-4:
RecentlyUsedSceneGuid-3:
value: 5053560200055e0c5e0d0a2342735a44144e4d7e792a7764752f4a32e1b5313e
flags: 0
RecentlyUsedSceneGuid-4:
value: 500252525d020a0d0c5e0a73477a5e441515482c752b22622b794563e3e33560
flags: 0
RecentlyUsedSceneGuid-5:
value: 5509515f50510b0e0f570f74427a0e444e4e417e78787f337b2a4a35bab16039
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
RecentlyUsedSceneGuid-6:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
value: 5509515f50510b0e0f570f74427a0e444e4e417e78787f337b2a4a35bab16039
flags: 0
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d

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

@@ -14,10 +14,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: -5
y: 84
width: 1920
height: 989
x: 8
y: 51
width: 1904
height: 973
m_ShowMode: 4
m_Title: Game
m_RootView: {fileID: 2}
@@ -44,8 +44,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1920
height: 989
width: 1904
height: 973
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1
@@ -69,7 +69,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1920
width: 1904
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -90,8 +90,8 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 969
width: 1920
y: 953
width: 1904
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -109,17 +109,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 6}
- {fileID: 14}
- {fileID: 11}
m_Position:
serializedVersion: 2
x: 0
y: 30
width: 1920
height: 939
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
width: 1904
height: 923
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 107
controlID: 104
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -134,17 +134,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 7}
- {fileID: 11}
- {fileID: 10}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1574
height: 939
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
width: 1561
height: 923
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 108
controlID: 105
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -160,17 +160,16 @@ MonoBehaviour:
m_Children:
- {fileID: 8}
- {fileID: 9}
- {fileID: 10}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1574
height: 667
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 8096}
width: 1561
height: 656
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 109
controlID: 106
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -188,13 +187,13 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 172
height: 667
width: 272
height: 656
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 16}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 16}
- {fileID: 13}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &9
@@ -207,75 +206,25 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: SceneView
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 172
y: 0
width: 728
height: 667
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 17}
- {fileID: 18}
m_Selected: 1
m_LastSelected: 0
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: GameView
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 900
x: 272
y: 0
width: 674
height: 667
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 15}
width: 1289
height: 656
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 12}
m_Panes:
- {fileID: 14}
- {fileID: 15}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 12}
- {fileID: 13}
m_Position:
serializedVersion: 2
x: 0
y: 667
width: 1574
height: 272
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 118
--- !u!114 &12
m_Selected: 2
m_LastSelected: 1
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -291,43 +240,18 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 901
height: 272
y: 656
width: 1561
height: 267
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 19}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 19}
- {fileID: 16}
- {fileID: 17}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ConsoleWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 901
y: 0
width: 673
height: 272
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 20}
m_Panes:
- {fileID: 20}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &14
m_LastSelected: 1
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -342,18 +266,18 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1574
x: 1561
y: 0
width: 346
height: 939
width: 343
height: 923
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 21}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 21}
- {fileID: 18}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &15
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -373,10 +297,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 895
y: 114
width: 672
height: 646
x: 280
y: 81
width: 1287
height: 635
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -387,7 +311,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 672, y: 625}
m_TargetSize: {x: 1092, y: 614}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -396,16 +320,16 @@ MonoBehaviour:
m_VSyncEnabled: 1
m_Gizmos: 0
m_Stats: 0
m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000
m_ZoomArea:
m_HRangeLocked: 0
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -336
m_HBaseRangeMax: 336
m_VBaseRangeMin: -312.5
m_VBaseRangeMax: 312.5
m_HBaseRangeMin: -546
m_HBaseRangeMax: 546
m_VBaseRangeMin: -307
m_VBaseRangeMax: 307
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -423,29 +347,29 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 672
height: 625
width: 1287
height: 614
m_Scale: {x: 1, y: 1}
m_Translation: {x: 336, y: 312.5}
m_Translation: {x: 643.5, y: 307}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -336
y: -312.5
width: 672
height: 625
x: -643.5
y: -307
width: 1287
height: 614
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 672, y: 646}
m_LastWindowPixelSize: {x: 1287, y: 635}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
--- !u!114 &16
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -465,10 +389,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 19
width: 171
height: 646
x: 8
y: 81
width: 271
height: 635
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -476,9 +400,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 66480000
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 78dbffff42deffff
m_ExpandedIDs: 00b4ffff8eb4ffff96b7ffffe0b8ffff66baffffacc5ffff9ec7ffff22d3ffffb0d3ffffb4d6ffff0cd8ffff92d9ffff86e3ffffa8e5ffffecebffff38f9ffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -502,7 +426,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !u!114 &17
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -583,7 +507,7 @@ MonoBehaviour:
m_CurrentEditor: 0
m_LayerEditor:
m_SelectedLayerIndex: 0
--- !u!114 &18
--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -603,10 +527,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 167
y: 114
width: 726
height: 646
x: 172
y: 19
width: 1388
height: 635
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -892,14 +816,14 @@ MonoBehaviour:
m_FarClip: 10000
m_DynamicClip: 1
m_OcclusionCulling: 0
m_LastSceneViewRotation: {x: 0.11389863, y: -0.81114566, z: 0.16859324, w: 0.54827297}
m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
m_LastSceneViewOrtho: 0
m_ReplacementShader: {fileID: 0}
m_ReplacementString:
m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
--- !u!114 &19
--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -919,10 +843,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 19
width: 900
height: 251
x: 8
y: 737
width: 1560
height: 246
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -952,10 +876,10 @@ MonoBehaviour:
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 25}
m_SelectedIDs: 3a9f0000
m_LastClickedID: 40762
m_ExpandedIDs: 00000000209f0000229f000000ca9a3b
scrollPos: {x: 0, y: 110}
m_SelectedIDs: 34770000
m_LastClickedID: 30516
m_ExpandedIDs: 000000000a7700000c7700003277000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -971,7 +895,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 12}
m_ClientGUIView: {fileID: 10}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
@@ -983,7 +907,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000209f0000229f0000
m_ExpandedIDs: 000000000a7700000c770000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1027,7 +951,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 12}
m_ClientGUIView: {fileID: 10}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
@@ -1039,7 +963,7 @@ MonoBehaviour:
m_GridSize: 64
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207
--- !u!114 &20
--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1059,15 +983,15 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 902
y: 19
width: 671
height: 251
x: 8
y: 737
width: 1560
height: 246
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
--- !u!114 &21
--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1087,10 +1011,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1575
y: 19
width: 345
height: 918
x: 1569
y: 81
width: 342
height: 902
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default