Finished Merge

- 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

View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -383,6 +383,7 @@ GameObject:
m_Component:
- component: {fileID: 338048063}
- component: {fileID: 338048062}
- component: {fileID: 338048064}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
@@ -467,6 +468,26 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &338048064
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 338048061}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 1
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
--- !u!1 &345522005
GameObject:
m_ObjectHideFlags: 0
@@ -2365,7 +2386,7 @@ PrefabInstance:
- target: {fileID: 7129514368576730103, guid: af2b86e6ca1c8404a857e6bfa4294f3c, type: 3}
propertyPath: GamePlayerPrefab
value:
objectReference: {fileID: 6272346181302961293, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3}
objectReference: {fileID: 6272346181302961293, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: af2b86e6ca1c8404a857e6bfa4294f3c, type: 3}
--- !u!1001 &7946605864942981377