From 95219e730ef1009fb471f4c1afe082061093eda7 Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Fri, 26 Nov 2021 16:02:03 +0100 Subject: [PATCH] odku --- Assets/Prefabs/NetManager.prefab | 87 +++++ Assets/Prefabs/NetManager.prefab.meta | 7 + Assets/Prefabs/Player/LobbyPlayer.prefab | 96 +++++ Assets/Prefabs/Player/LobbyPlayer.prefab.meta | 7 + Assets/Scenes/HomeScene.unity | 142 +++---- Assets/Scenes/Lobby.unity | 296 +++++++++++---- Assets/Scripts/HomeMenu/Lobby.meta | 8 + Assets/Scripts/HomeMenu/Lobby/Lobby.cs | 9 + Assets/Scripts/HomeMenu/Lobby/Lobby.cs.meta | 11 + Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs | 12 + .../HomeMenu/Lobby/LobbyPlayer.cs.meta | 11 + Assets/Scripts/HomeMenu/Lobby/goopz3fi.4p3~ | 9 + Assets/Scripts/HomeMenu/MenuStartClient.cs | 1 - ProjectSettings/EditorBuildSettings.asset | 6 + UserSettings/EditorUserSettings.asset | 6 + UserSettings/Layouts/default-2021.dwlt | 358 ++++++------------ 16 files changed, 679 insertions(+), 387 deletions(-) create mode 100644 Assets/Prefabs/NetManager.prefab create mode 100644 Assets/Prefabs/NetManager.prefab.meta create mode 100644 Assets/Prefabs/Player/LobbyPlayer.prefab create mode 100644 Assets/Prefabs/Player/LobbyPlayer.prefab.meta create mode 100644 Assets/Scripts/HomeMenu/Lobby.meta create mode 100644 Assets/Scripts/HomeMenu/Lobby/Lobby.cs create mode 100644 Assets/Scripts/HomeMenu/Lobby/Lobby.cs.meta create mode 100644 Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs create mode 100644 Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs.meta create mode 100644 Assets/Scripts/HomeMenu/Lobby/goopz3fi.4p3~ diff --git a/Assets/Prefabs/NetManager.prefab b/Assets/Prefabs/NetManager.prefab new file mode 100644 index 0000000..2891e9a --- /dev/null +++ b/Assets/Prefabs/NetManager.prefab @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2504770964117222970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2504770964117222917} + - component: {fileID: 2504770964117222916} + - component: {fileID: 2504770964117222971} + m_Layer: 0 + m_Name: NetManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2504770964117222917 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2504770964117222970} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 354.46393, y: 179.54048, z: -5.4055643} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2504770964117222916 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2504770964117222970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 145706024aa7ca34b9312d85f68fc209, type: 3} + m_Name: + m_EditorClassIdentifier: + dontDestroyOnLoad: 1 + PersistNetworkManagerToOfflineScene: 0 + runInBackground: 1 + autoStartServerBuild: 1 + serverTickRate: 30 + offlineScene: Assets/Scenes/HomeScene.unity + onlineScene: Assets/Scenes/Lobby.unity + transport: {fileID: 2504770964117222971} + networkAddress: localhost + maxConnections: 100 + authenticator: {fileID: 0} + playerPrefab: {fileID: 5433024255890593569, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + autoCreatePlayer: 1 + playerSpawnMethod: 0 + spawnPrefabs: [] +--- !u!114 &2504770964117222971 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2504770964117222970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3} + m_Name: + m_EditorClassIdentifier: + Port: 7777 + DualMode: 1 + NoDelay: 1 + Interval: 10 + Timeout: 10000 + FastResend: 2 + CongestionWindow: 0 + SendWindowSize: 4096 + ReceiveWindowSize: 4096 + NonAlloc: 1 + debugLog: 0 + statisticsGUI: 0 + statisticsLog: 0 diff --git a/Assets/Prefabs/NetManager.prefab.meta b/Assets/Prefabs/NetManager.prefab.meta new file mode 100644 index 0000000..615f533 --- /dev/null +++ b/Assets/Prefabs/NetManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0f6d9d1e97686d34d9872b5028512de5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player/LobbyPlayer.prefab b/Assets/Prefabs/Player/LobbyPlayer.prefab new file mode 100644 index 0000000..9a01c08 --- /dev/null +++ b/Assets/Prefabs/Player/LobbyPlayer.prefab @@ -0,0 +1,96 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5433024255890593569 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 721738633423542023} + - component: {fileID: 8445863620830884911} + - component: {fileID: 2783342664697629268} + - component: {fileID: 5144927127391288211} + m_Layer: 5 + m_Name: LobbyPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &721738633423542023 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5433024255890593569} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 135} + m_SizeDelta: {x: 0, y: -281.3138} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8445863620830884911 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5433024255890593569} + m_CullTransparentMesh: 1 +--- !u!114 &2783342664697629268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5433024255890593569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 0.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5144927127391288211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5433024255890593569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Name: + m_EditorClassIdentifier: + sceneId: 0 + serverOnly: 0 + visible: 0 + m_AssetId: fc0476cecf5ea1047aeb1f4981bfc16f + hasSpawned: 0 diff --git a/Assets/Prefabs/Player/LobbyPlayer.prefab.meta b/Assets/Prefabs/Player/LobbyPlayer.prefab.meta new file mode 100644 index 0000000..c127946 --- /dev/null +++ b/Assets/Prefabs/Player/LobbyPlayer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fc0476cecf5ea1047aeb1f4981bfc16f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/HomeScene.unity b/Assets/Scenes/HomeScene.unity index c7bbb6e..cdaab10 100644 --- a/Assets/Scenes/HomeScene.unity +++ b/Assets/Scenes/HomeScene.unity @@ -2169,91 +2169,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} m_PrefabInstance: {fileID: 1018124453} m_PrefabAsset: {fileID: 0} ---- !u!1 &1773379358 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1773379361} - - component: {fileID: 1773379360} - - component: {fileID: 1773379359} - m_Layer: 0 - m_Name: MenuManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1773379359 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1773379358} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3} - m_Name: - m_EditorClassIdentifier: - Port: 7777 - DualMode: 1 - NoDelay: 1 - Interval: 10 - Timeout: 10000 - FastResend: 2 - CongestionWindow: 0 - SendWindowSize: 4096 - ReceiveWindowSize: 4096 - NonAlloc: 1 - debugLog: 0 - statisticsGUI: 0 - statisticsLog: 0 ---- !u!114 &1773379360 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1773379358} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 145706024aa7ca34b9312d85f68fc209, type: 3} - m_Name: - m_EditorClassIdentifier: - dontDestroyOnLoad: 1 - PersistNetworkManagerToOfflineScene: 0 - runInBackground: 1 - autoStartServerBuild: 1 - serverTickRate: 30 - offlineScene: Assets/Scenes/HomeScene.unity - onlineScene: Assets/Scenes/Lobby.unity - transport: {fileID: 1773379359} - networkAddress: localhost - maxConnections: 100 - authenticator: {fileID: 0} - playerPrefab: {fileID: 0} - autoCreatePlayer: 1 - playerSpawnMethod: 0 - spawnPrefabs: [] ---- !u!4 &1773379361 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1773379358} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 354.46393, y: 179.54048, z: -5.4055643} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!224 &1785160360 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8580211107013450537, guid: 39cebc5bdea8db94c8b7d687886df440, type: 3} @@ -3239,3 +3154,60 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 39cebc5bdea8db94c8b7d687886df440, type: 3} +--- !u!1001 &2504770963688188196 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: m_LocalPosition.x + value: 354.46393 + objectReference: {fileID: 0} + - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: m_LocalPosition.y + value: 179.54048 + objectReference: {fileID: 0} + - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: m_LocalPosition.z + value: -5.4055643 + objectReference: {fileID: 0} + - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2504770964117222970, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: m_Name + value: NetManager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index 9e82565..88125ea 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -123,6 +123,37 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &187489511 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 187489512} + m_Layer: 0 + m_Name: --- UI --- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &187489512 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 187489511} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 420.84024, y: 148.20094, z: -1.8287547} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &239442094 GameObject: m_ObjectHideFlags: 0 @@ -199,13 +230,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 239442094} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &338048061 GameObject: @@ -299,7 +330,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &345522005 GameObject: @@ -501,7 +532,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &506194852 GameObject: @@ -532,7 +563,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3849186633239573056} m_Father: {fileID: 1335086799} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -860,6 +892,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1335086798} m_CullTransparentMesh: 1 +--- !u!1 &1386257534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1386257535} + m_Layer: 0 + m_Name: --- Systems --- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1386257535 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1386257534} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 420.84024, y: 148.20094, z: -1.8287547} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1511280962 GameObject: m_ObjectHideFlags: 0 @@ -954,7 +1017,7 @@ RectTransform: m_Children: - {fileID: 1335086799} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1094,7 +1157,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a973691757099224ca132b32daabf67c, type: 3} ---- !u!1 &1892663800 +--- !u!1 &1824447698 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1102,83 +1165,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1892663801} - - component: {fileID: 1892663803} - - component: {fileID: 1892663802} + - component: {fileID: 1824447699} m_Layer: 0 - m_Name: LobbyManager + m_Name: --- GameObjects --- m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1892663801 +--- !u!4 &1824447699 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1892663800} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 368.97278, y: 206.56982, z: -0.170928} + m_GameObject: {fileID: 1824447698} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 420.84024, y: 148.20094, z: -1.8287547} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1892663802 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1892663800} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3} - m_Name: - m_EditorClassIdentifier: - Port: 7777 - DualMode: 1 - NoDelay: 1 - Interval: 10 - Timeout: 10000 - FastResend: 2 - CongestionWindow: 0 - SendWindowSize: 4096 - ReceiveWindowSize: 4096 - NonAlloc: 1 - debugLog: 0 - statisticsGUI: 0 - statisticsLog: 0 ---- !u!114 &1892663803 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1892663800} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 98a01f1cdf5ae8d44a3d338de2d6be36, type: 3} - m_Name: - m_EditorClassIdentifier: - dontDestroyOnLoad: 1 - PersistNetworkManagerToOfflineScene: 0 - runInBackground: 1 - autoStartServerBuild: 1 - serverTickRate: 30 - offlineScene: - onlineScene: - transport: {fileID: 1892663802} - networkAddress: localhost - maxConnections: 100 - authenticator: {fileID: 0} - playerPrefab: {fileID: 0} - autoCreatePlayer: 1 - playerSpawnMethod: 0 - spawnPrefabs: [] --- !u!1 &1907881003 GameObject: m_ObjectHideFlags: 0 @@ -1255,3 +1264,154 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1907881003} m_CullTransparentMesh: 1 +--- !u!1 &1990995212 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1990995213} + - component: {fileID: 1990995214} + m_Layer: 0 + m_Name: LobbyManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1990995213 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1990995212} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1990995214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1990995212} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6183dbb3c561ed44803ffda1c859dc9, type: 3} + m_Name: + m_EditorClassIdentifier: + LobbyPlayers: [] +--- !u!1001 &3849186633239573055 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 506194853} + m_Modifications: + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_SizeDelta.y + value: -281.3138 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_AnchoredPosition.y + value: 135 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5144927127391288211, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: sceneId + value: 2772255242 + objectReference: {fileID: 0} + - target: {fileID: 5433024255890593569, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + propertyPath: m_Name + value: LobbyPlayer + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} +--- !u!224 &3849186633239573056 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + m_PrefabInstance: {fileID: 3849186633239573055} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/HomeMenu/Lobby.meta b/Assets/Scripts/HomeMenu/Lobby.meta new file mode 100644 index 0000000..8ece244 --- /dev/null +++ b/Assets/Scripts/HomeMenu/Lobby.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a89988743206dad48b795c77ff2b011d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/HomeMenu/Lobby/Lobby.cs b/Assets/Scripts/HomeMenu/Lobby/Lobby.cs new file mode 100644 index 0000000..f47c28d --- /dev/null +++ b/Assets/Scripts/HomeMenu/Lobby/Lobby.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Lobby : MonoBehaviour +{ + [SerializeField] + public List LobbyPlayers = new List(); +} diff --git a/Assets/Scripts/HomeMenu/Lobby/Lobby.cs.meta b/Assets/Scripts/HomeMenu/Lobby/Lobby.cs.meta new file mode 100644 index 0000000..31efb96 --- /dev/null +++ b/Assets/Scripts/HomeMenu/Lobby/Lobby.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b6183dbb3c561ed44803ffda1c859dc9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs b/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs new file mode 100644 index 0000000..6cd1f2d --- /dev/null +++ b/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs @@ -0,0 +1,12 @@ +using Mirror; +using UnityEngine; + +public class LobbyPlayer : NetworkBehaviour +{ + private Lobby lobby = this.gameobject.getComponent(); + public override void OnStartClient() + { + + } + +} diff --git a/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs.meta b/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs.meta new file mode 100644 index 0000000..0291002 --- /dev/null +++ b/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6947f097045a71a499212176b7475daf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/HomeMenu/Lobby/goopz3fi.4p3~ b/Assets/Scripts/HomeMenu/Lobby/goopz3fi.4p3~ new file mode 100644 index 0000000..f47c28d --- /dev/null +++ b/Assets/Scripts/HomeMenu/Lobby/goopz3fi.4p3~ @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Lobby : MonoBehaviour +{ + [SerializeField] + public List LobbyPlayers = new List(); +} diff --git a/Assets/Scripts/HomeMenu/MenuStartClient.cs b/Assets/Scripts/HomeMenu/MenuStartClient.cs index 57f4a24..b8e6659 100644 --- a/Assets/Scripts/HomeMenu/MenuStartClient.cs +++ b/Assets/Scripts/HomeMenu/MenuStartClient.cs @@ -1,6 +1,5 @@ using Mirror; using UnityEngine; -using UnityEngine.UI; using TMPro; public class MenuStartClient : MonoBehaviour diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 6655d79..b35555d 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,7 +8,13 @@ EditorBuildSettings: - enabled: 0 path: Assets/Scenes/TestOfflineScene.unity guid: 20dba395f2cd9824288c340124ce9d6f + - enabled: 1 + path: Assets/Scenes/HomeScene.unity + guid: 68e95db5b9c629148994409c6c7f814a - enabled: 1 path: Assets/Scenes/TestScene.unity guid: 9fc0d4010bbf28b4594072e72b8655ab + - enabled: 1 + path: Assets/Scenes/Lobby.unity + guid: 33f487c6a0f179a4cb0f9cd2f080aca8 m_configObjects: {} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index c598b6d..a393a45 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -14,6 +14,12 @@ EditorUserSettings: RecentlyUsedSceneGuid-2: value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 + RecentlyUsedSceneGuid-3: + value: 5509515f50510b0e0f570f74427a0e444e4e417e78787f337b2a4a35bab16039 + flags: 0 + RecentlyUsedSceneGuid-4: + value: 500252525d020a0d0c5e0a73477a5e441515482c752b22622b794563e3e33560 + flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index a81a122..ebcf01b 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 573.60004 - y: 38.4 - width: 1521.6 - height: 780.8 + x: 0 + y: 43.2 + width: 1536 + height: 772.8 m_ShowMode: 4 - m_Title: Game + m_Title: Project m_RootView: {fileID: 2} 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 @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1521.6 - height: 780.8 + width: 1536 + height: 772.8 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: 1521.6 + width: 1536 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: 760.8 - width: 1521.6 + y: 752.8 + width: 1536 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: 12} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1521.6 - height: 730.8 - m_MinSize: {x: 400, y: 200} - m_MaxSize: {x: 32384, y: 16192} + width: 1536 + height: 722.8 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 112 + controlID: 70 --- !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: 1119.2 - height: 730.8 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} + width: 1222.4 + height: 722.8 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 113 + controlID: 71 --- !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: 1119.2 - height: 438.4 - m_MinSize: {x: 300, y: 100} - m_MaxSize: {x: 24288, y: 8096} + width: 1222.4 + height: 433.6 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 114 + controlID: 72 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,13 +187,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 324.8 - height: 438.4 + width: 294.4 + height: 433.6 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 14} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -205,52 +204,26 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 324.8 + x: 294.4 y: 0 - width: 317.60004 - height: 438.4 + width: 928 + height: 433.6 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 15} - - {fileID: 16} - 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: 642.4 - y: 0 - width: 476.79993 - height: 438.4 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} + - {fileID: 14} + - {fileID: 12} m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &11 + m_LastSelected: 1 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -266,18 +239,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 438.4 - width: 1119.2 - height: 292.4 + y: 433.6 + width: 1222.4 + height: 289.19998 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 17} - - {fileID: 18} + - {fileID: 15} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &12 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -292,18 +265,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1119.2 + x: 1222.4 y: 0 - width: 402.40002 - height: 730.8 + width: 313.59998 + height: 722.8 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 19} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -323,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 649.60004 - y: 80.8 - width: 474.79993 - height: 417.4 + x: 294.4 + y: 73.6 + width: 926 + height: 412.6 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -337,7 +310,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 474.79993, y: 396.4} + m_TargetSize: {x: 696, y: 391.6} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -346,16 +319,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: -189.91997 - m_HBaseRangeMax: 189.91997 - m_VBaseRangeMin: -158.56 - m_VBaseRangeMax: 158.56 + m_HBaseRangeMin: -278.4 + m_HBaseRangeMax: 278.4 + m_VBaseRangeMin: -156.64 + m_VBaseRangeMax: 156.64 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -364,7 +337,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 @@ -373,29 +346,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 474.79993 - height: 396.4 + width: 926 + height: 391.6 m_Scale: {x: 1, y: 1} - m_Translation: {x: 237.39996, y: 198.2} + m_Translation: {x: 463, y: 195.8} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -237.39996 - y: -198.2 - width: 474.79993 - height: 396.4 + x: -463 + y: -195.8 + width: 926 + height: 391.6 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 593.4999, y: 521.75} + m_LastWindowPixelSize: {x: 1157.5, y: 515.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &14 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -415,10 +388,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 7.2000003 - y: 80.8 - width: 323.8 - height: 417.4 + x: 0 + y: 73.6 + width: 293.4 + height: 412.6 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -426,9 +399,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 5ef0ffff + m_SelectedIDs: f49e0000 m_LastClickedID: 0 - m_ExpandedIDs: 2afbffff + m_ExpandedIDs: 78acffff14adffff1cafffffd8b0ffff30b3ffff7cb3ffffb6b5ffff0cb8ffff9cb9ffff56bdffffa0c3ffff40c8ffff44caffff22ceffffe8d0ffffbad1ffff60dfffffcadfffffb8e2ffff0ef4ffff9cf7fffff4ffffff3c7500005c7500006c7500005a8c0000708c0000788c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -452,88 +425,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 -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: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 328.80002 - y: 73.6 - width: 318 - height: 418 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} - - {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2} - m_ValueSerializationHelper: - - e00: 0.70260465 - e01: 0 - e02: 0 - e03: -189.3735 - e10: 0 - e11: 0.70260465 - e12: 0 - e13: 63.08463 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.6782804 - e01: 0 - e02: 0 - e03: -240.35721 - e10: 0 - e11: 0.6782804 - e12: 0 - e13: 92.776474 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: bcfd120671431f84097ebc1045370f76, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 0 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &16 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -553,10 +445,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 332 - y: 80.8 - width: 315.60004 - height: 417.4 + x: 294.4 + y: 73.6 + width: 926 + height: 412.6 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -621,7 +513,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -112.000015, y: 86} + snapOffset: {x: -112, y: 86} snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: Orientation @@ -762,16 +654,16 @@ MonoBehaviour: m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 0 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 0 + 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: 11.616212, y: 1.3419256, z: 4.6519175} + m_Target: {x: 420.84024, y: 148.20094, z: -1.8287547} speed: 2 - m_Value: {x: 11.616212, y: 1.3419256, z: 4.6519175} + m_Value: {x: 420.84024, y: 148.20094, z: -1.8287547} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -800,17 +692,17 @@ MonoBehaviour: m_Size: {x: 1, y: 1} yGrid: 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} zGrid: 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} @@ -818,17 +710,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.20971945, y: 0.7315626, z: -0.25770992, w: -0.5953333} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.20971923, y: 0.73156184, z: -0.25770965, w: -0.5953326} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 0.93468356 + m_Target: 219.93727 speed: 2 - m_Value: 0.93468356 + m_Value: 219.93727 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 @@ -842,14 +734,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: -0.20971945, y: 0.7315626, z: -0.25770992, w: -0.5953333} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &17 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -869,10 +761,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 7.2000003 - y: 519.2 - width: 1118.2 - height: 271.4 + x: 0 + y: 507.2 + width: 1221.4 + height: 268.19998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -890,22 +782,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Weapons + - Assets/Scripts/HomeMenu/Lobby m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts/Weapons + - Assets/Scripts/HomeMenu/Lobby m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter + m_LastProjectPath: C:\Users\Janis\Unity Projects\defrain m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 191} - m_SelectedIDs: ce660000 - m_LastClickedID: 26318 - m_ExpandedIDs: 00000000d6640000d8640000da640000f0640000f464000000ca9a3bffffff7f + scrollPos: {x: 0, y: 199.80002} + m_SelectedIDs: 049f0000 + m_LastClickedID: 40708 + m_ExpandedIDs: 00000000cc640000ce640000d0640000d2640000e2640000686a0000ca72000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -921,7 +813,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 10} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -933,7 +825,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000d6640000d8640000da640000 + m_ExpandedIDs: 00000000cc640000ce640000d0640000d2640000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -977,7 +869,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -989,7 +881,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &18 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1010,14 +902,14 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 512 - width: 1128.6 - height: 271.4 + y: 507.2 + width: 1221.4 + height: 268.19998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &19 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1037,10 +929,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1126.4 - y: 80.8 - width: 401.40002 - height: 709.8 + x: 1222.4 + y: 73.6 + width: 312.59998 + height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default