From 7ea03cf9423d450b0b4dbd81edf70c11de733bba Mon Sep 17 00:00:00 2001 From: JoshuaReason Date: Sat, 26 Jan 2019 23:02:18 +1100 Subject: [PATCH] Made clientScene work --- Assets/Scenes/MainScene.unity | 1404 +---------------- Assets/Scipts/HomeScreenManager.cs | 6 +- .../Multiplayer/Client/ClientLoginManager.cs | 10 + .../Scipts/Multiplayer/Server/LoginManager.cs | 2 +- 4 files changed, 63 insertions(+), 1359 deletions(-) diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 5d30200..22d4499 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -113,67 +113,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &20788387 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: 150 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: 149 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (15) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &20788388 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 20788387} ---- !u!1 &20788389 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 20788387} --- !u!1 &35195568 GameObject: m_ObjectHideFlags: 0 @@ -297,67 +236,6 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 35195568} m_CullTransparentMesh: 0 ---- !u!1001 &48891236 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: -150 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: -51 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (4) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &48891237 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 48891236} ---- !u!1 &48891238 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 48891236} --- !u!1 &73397751 GameObject: m_ObjectHideFlags: 0 @@ -427,99 +305,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!1001 &80095651 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: -50 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: 49 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (9) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &80095652 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 80095651} ---- !u!1 &80095653 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 80095651} ---- !u!1 &191822287 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 191822288} - m_Layer: 0 - m_Name: Unneeded - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &191822288 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 191822287} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 353.89233, y: 77.27744, z: -2.9375} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2005481975} - - {fileID: 700181637} - - {fileID: 1779215479} - - {fileID: 1195683501} - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &252633541 GameObject: m_ObjectHideFlags: 0 @@ -643,67 +428,6 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 252633541} m_CullTransparentMesh: 0 ---- !u!1001 &261548423 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: 150 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: -151 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (3) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &261548424 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 261548423} ---- !u!1 &261548425 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 261548423} --- !u!1 &264010774 GameObject: m_ObjectHideFlags: 0 @@ -1099,10 +823,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Tiles: - - {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - - {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - - {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - - {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} + - {fileID: 1564554960623202, guid: 716881502e2a84a409e16c13cd999db5, type: 2} + - {fileID: 1607766741274254, guid: 0720bfb7b9fefb14089a52006989ff22, type: 2} + - {fileID: 1015644583666204, guid: d87c84df9fc89d84791299f0b5c57e78, type: 2} Landmarks: - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} @@ -1114,24 +837,9 @@ MonoBehaviour: - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} - MapGrid: - - {fileID: 80095653} - - {fileID: 998748584} - - {fileID: 1525589193} - - {fileID: 1867518913} - WorldWrapGrid: - - {fileID: 597152929} - - {fileID: 762462614} - - {fileID: 1266121958} - - {fileID: 20788389} - - {fileID: 426260106} - - {fileID: 1273455716} - - {fileID: 48891238} - - {fileID: 1767675317} - - {fileID: 490765257} - - {fileID: 1330873966} - - {fileID: 1622461987} - - {fileID: 261548425} + TileSize: 100 + MapDimensions: {x: 3, y: 3} + Veggies: [] minX: -80 maxX: 80 minZ: -80 @@ -1277,185 +985,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &426260104 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: -150 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: 49 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (8) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &426260105 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 426260104} ---- !u!1 &426260106 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 426260104} ---- !u!1001 &490765255 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: -150 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: -151 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &490765256 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 490765255} ---- !u!1 &490765257 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 490765255} ---- !u!1001 &597152927 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: -150 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: 149 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (12) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &597152928 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 597152927} ---- !u!1 &597152929 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 597152927} --- !u!1 &638241847 GameObject: m_ObjectHideFlags: 0 @@ -1526,144 +1055,72 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 638241847} m_CullTransparentMesh: 0 ---- !u!1 &700181634 +--- !u!1 &732153807 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 700181637} - - component: {fileID: 700181636} - - component: {fileID: 700181635} + - component: {fileID: 732153809} + - component: {fileID: 732153808} m_Layer: 0 - m_Name: BotCam + m_Name: Directional Light m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!81 &700181635 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 700181634} - m_Enabled: 1 ---- !u!20 &700181636 -Camera: + m_IsActive: 1 +--- !u!108 &732153808 +Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 700181634} + m_GameObject: {fileID: 732153807} m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.9245283, g: 0.27710664, b: 0.030526895, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 1 - y: 1 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: 0 + serializedVersion: 8 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &700181637 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &732153809 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 700181634} - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 353.89233, y: 77.27744, z: -2.9375} + m_GameObject: {fileID: 732153807} + m_LocalRotation: {x: 0.3747805, y: -0.41884255, z: 0.19530953, w: 0.8037193} + m_LocalPosition: {x: 131.8803, y: 116.33305, z: -210.80919} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 191822288} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!1001 &762462612 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: -50 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: 149 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 13 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (13) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &762462613 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 762462612} ---- !u!1 &762462614 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 762462612} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 50.000004, y: -55.051003, z: 0} --- !u!1 &791470959 GameObject: m_ObjectHideFlags: 0 @@ -2210,67 +1667,6 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1001 &998748582 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: 49 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (10) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &998748583 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 998748582} ---- !u!1 &998748584 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 998748582} --- !u!1 &1001341747 GameObject: m_ObjectHideFlags: 0 @@ -2672,144 +2068,6 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1190802516} m_CullTransparentMesh: 0 ---- !u!1 &1195683498 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1195683501} - - component: {fileID: 1195683500} - - component: {fileID: 1195683499} - m_Layer: 0 - m_Name: RightCam - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!81 &1195683499 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1195683498} - m_Enabled: 1 ---- !u!20 &1195683500 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1195683498} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.9245283, g: 0.27710664, b: 0.030526895, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 1 - y: 1 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1195683501 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1195683498} - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 353.89233, y: 77.27744, z: -2.9375} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 191822288} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!1001 &1266121956 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: 149 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 14 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (14) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &1266121957 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1266121956} ---- !u!1 &1266121958 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1266121956} --- !u!1 &1266934408 GameObject: m_ObjectHideFlags: 0 @@ -2908,67 +2166,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!1001 &1273455714 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: 150 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: 49 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (11) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &1273455715 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1273455714} ---- !u!1 &1273455716 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1273455714} --- !u!1 &1293333579 GameObject: m_ObjectHideFlags: 0 @@ -3038,67 +2235,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!1001 &1330873964 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: -50 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: -151 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (1) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &1330873965 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1330873964} ---- !u!1 &1330873966 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1330873964} --- !u!1 &1465134982 GameObject: m_ObjectHideFlags: 0 @@ -3169,67 +2305,6 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1465134982} m_CullTransparentMesh: 0 ---- !u!1001 &1525589191 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: -50 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: -51 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (5) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &1525589192 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1525589191} ---- !u!1 &1525589193 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1525589191} --- !u!1 &1584314061 GameObject: m_ObjectHideFlags: 0 @@ -3305,249 +2380,6 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1584314061} m_CullTransparentMesh: 0 ---- !u!1001 &1622461985 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: -151 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (2) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &1622461986 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1622461985} ---- !u!1 &1622461987 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1622461985} ---- !u!1 &1671521402 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1671521403} - m_Layer: 0 - m_Name: Floors - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1671521403 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1671521402} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 490765256} - - {fileID: 1330873965} - - {fileID: 1622461986} - - {fileID: 261548424} - - {fileID: 48891237} - - {fileID: 1525589192} - - {fileID: 1867518912} - - {fileID: 1767675316} - - {fileID: 426260105} - - {fileID: 80095652} - - {fileID: 998748583} - - {fileID: 1273455715} - - {fileID: 597152928} - - {fileID: 762462613} - - {fileID: 1266121957} - - {fileID: 20788388} - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1767675315 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: 150 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: -51 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (7) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &1767675316 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1767675315} ---- !u!1 &1767675317 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1767675315} ---- !u!1 &1779215476 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1779215479} - - component: {fileID: 1779215478} - - component: {fileID: 1779215477} - m_Layer: 0 - m_Name: LeftCam - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!81 &1779215477 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1779215476} - m_Enabled: 1 ---- !u!20 &1779215478 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1779215476} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.9245283, g: 0.27710664, b: 0.030526895, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 1 - y: 1 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1779215479 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1779215476} - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 353.89233, y: 77.27744, z: -2.9375} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 191822288} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1791178145 GameObject: m_ObjectHideFlags: 0 @@ -3619,67 +2451,6 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1791178145} m_CullTransparentMesh: 0 ---- !u!1001 &1867518911 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1671521403} - m_Modifications: - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.x - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalPosition.z - value: -51 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - propertyPath: m_Name - value: dummyFloor (6) - objectReference: {fileID: 0} - - target: {fileID: 23443777714297938, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0911dcd519793448ad6aa371b3f574b, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &1867518912 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4200043227978498, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1867518911} ---- !u!1 &1867518913 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1078541982408044, guid: b0911dcd519793448ad6aa371b3f574b, - type: 2} - m_PrefabInternal: {fileID: 1867518911} --- !u!1 &1963101659 GameObject: m_ObjectHideFlags: 0 @@ -3764,7 +2535,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2000861315 GameObject: @@ -3840,83 +2611,6 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2000861315} m_CullTransparentMesh: 0 ---- !u!1 &2005481972 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2005481975} - - component: {fileID: 2005481974} - - component: {fileID: 2005481973} - m_Layer: 0 - m_Name: TopCam - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!81 &2005481973 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2005481972} - m_Enabled: 1 ---- !u!20 &2005481974 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2005481972} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.9245283, g: 0.27710664, b: 0.030526895, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 1 - y: 1 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &2005481975 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2005481972} - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -353.89233, y: -77.27744, z: 2.9375} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 191822288} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &2018855990 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scipts/HomeScreenManager.cs b/Assets/Scipts/HomeScreenManager.cs index 2d8f167..731b23c 100644 --- a/Assets/Scipts/HomeScreenManager.cs +++ b/Assets/Scipts/HomeScreenManager.cs @@ -30,7 +30,7 @@ public class HomeScreenManager : MonoBehaviour { bool Succeeded = int.TryParse(Port.text, out intVal); if (Succeeded) { - Destroy(ServerManager.Instance.gameObject); + //Destroy(ServerManager.Instance.gameObject); ClientManager.Instance.StartClient(IP.text, intVal); } PlayerPrefs.SetString("IP", IP.text); @@ -54,13 +54,13 @@ public class HomeScreenManager : MonoBehaviour { Server.SetActive(false); } - IP.text = "127.0.0.1"; + IP.text = IPGrabber.GetIP(ADDRESSFAM.IPv4); PlayerPrefs.SetString("PORT", Port.text); PlayerPrefs.SetString("NAME", Name.text); PlayerPrefs.SetString("IP", IP.text); - Connect(); + //Connect(); } public void ChangeName() diff --git a/Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs b/Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs index 884b8c2..26144e2 100644 --- a/Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs +++ b/Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs @@ -24,6 +24,7 @@ namespace Multiplayer ClientManager.Client.RegisterHandler(LoginMsgID.QueryName, OnRecieveID); ClientManager.Client.RegisterHandler(LoginMsgID.EnterLobby, StartLobby); ClientManager.Client.RegisterHandler(PlayerMsgID.GameStart, StartGame); + ClientManager.Client.RegisterHandler(LoginMsgID.Seed, SetSeed); } private void OnConnected(NetworkMessage msg) @@ -65,6 +66,15 @@ namespace Multiplayer { UnityEngine.SceneManagement.SceneManager.LoadScene(ClientManager.GameScene); } + + private void SetSeed(NetworkMessage msg) + { + longMsg longMsg; + if (!Utility.ReadMessage(msg, out longMsg)) + return; + + Random.InitState((int)longMsg.Long); + } } } \ No newline at end of file diff --git a/Assets/Scipts/Multiplayer/Server/LoginManager.cs b/Assets/Scipts/Multiplayer/Server/LoginManager.cs index c1e022f..f0f37e7 100644 --- a/Assets/Scipts/Multiplayer/Server/LoginManager.cs +++ b/Assets/Scipts/Multiplayer/Server/LoginManager.cs @@ -73,7 +73,7 @@ namespace Multiplayer { foreach (Player player in ServerManager.AllPlayers.Values) { - //player.Connection.Send(LoginMsgID.Seed, new longMsg(player.ID, ServerManager.Seed)); + player.Connection.Send(LoginMsgID.Seed, new longMsg(player.ID, ServerManager.Seed)); player.Connection.Send(PlayerMsgID.GameStart, new PlayerMsg(player.ID)); } }