diff --git a/.vscode/launch.json b/.vscode/launch.json index da60e25..6a1738a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,9 +2,15 @@ "version": "0.2.0", "configurations": [ { - "name": "Attach to Unity", + "name": "Attach to Unity Editor", "type": "vstuc", - "request": "attach" + "request": "attach" + }, + { + "name": "Attach to Unity Build", + "type": "vstuc", + "request": "attach", + "endPoint": "127.0.0.1:56493" } ] } \ No newline at end of file diff --git a/Assets/DefaultPrefabObjects.asset b/Assets/DefaultPrefabObjects.asset index 7d47a06..2412ab1 100644 --- a/Assets/DefaultPrefabObjects.asset +++ b/Assets/DefaultPrefabObjects.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultPrefabObjects m_EditorClassIdentifier: _prefabs: + - {fileID: 6141811525297683108, guid: abf4376f1c6f28241b1125c0eac87199, type: 3} - {fileID: 6527384552577148640, guid: 7b71eecaf6568a847b4b8415852f9e98, type: 3} - {fileID: 4320456058255827552, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3} - {fileID: 394654179909484550, guid: 9f3e27e33167d704e941e42ded557111, type: 3} diff --git a/Assets/FishNet/Demos/Prefabs/NetworkHudCanvas.prefab b/Assets/FishNet/Demos/Prefabs/NetworkHudCanvas.prefab index a0288e4..8eee31a 100644 --- a/Assets/FishNet/Demos/Prefabs/NetworkHudCanvas.prefab +++ b/Assets/FishNet/Demos/Prefabs/NetworkHudCanvas.prefab @@ -28,9 +28,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4393252311501663115} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -60,6 +60,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.25490198, g: 0.25490198, b: 0.25490198, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -104,11 +105,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4393252311652982283} - {fileID: 4393252311501663115} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -127,7 +128,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6d3606bfdac5a4743890fc1a5ecd8f24, type: 3} m_Name: m_EditorClassIdentifier: - AutoStart: 0 + _autoStartType: 0 _stoppedColor: {r: 0.25490198, g: 0.25490198, b: 0.25490198, a: 1} _changingColor: {r: 0.78431374, g: 0.6862745, b: 0, a: 1} _startedColor: {r: 0, g: 0.5882353, b: 0.64705884, a: 1} @@ -150,7 +151,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -176,6 +179,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &4393252310969058989 MonoBehaviour: m_ObjectHideFlags: 0 @@ -222,10 +226,10 @@ RectTransform: 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: - {fileID: 9139860296052841449} m_Father: {fileID: 4393252310969058990} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -255,6 +259,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -283,6 +288,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -313,6 +319,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 4393252310969058994} + m_TargetAssemblyTypeName: m_MethodName: OnClick_Client m_Mode: 1 m_Arguments: @@ -352,10 +359,10 @@ RectTransform: 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: - {fileID: 7233259200663826443} m_Father: {fileID: 4393252310969058990} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -385,6 +392,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -413,6 +421,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -443,6 +452,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 4393252310969058994} + m_TargetAssemblyTypeName: m_MethodName: OnClick_Server m_Mode: 1 m_Arguments: @@ -481,9 +491,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4393252311652982283} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -513,6 +523,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.25490198, g: 0.25490198, b: 0.25490198, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/Prefabs/Multiplayer/Client Instance.prefab b/Assets/Prefabs/Multiplayer/Client Instance.prefab new file mode 100644 index 0000000..ff0a466 --- /dev/null +++ b/Assets/Prefabs/Multiplayer/Client Instance.prefab @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3802985406936712805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 926952496977333823} + - component: {fileID: 171993714235241304} + - component: {fileID: 6141811525297683108} + m_Layer: 0 + m_Name: Client Instance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &926952496977333823 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3802985406936712805} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -51.775536, y: 0.6793438, z: -2.5173702} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &171993714235241304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3802985406936712805} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5eb53f3d7ef001049a14bc1408dc0092, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 0 + _addedNetworkObject: {fileID: 6141811525297683108} + _networkObjectCache: {fileID: 6141811525297683108} +--- !u!114 &6141811525297683108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3802985406936712805} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + _networkBehaviours: + - {fileID: 171993714235241304} + k__BackingField: {fileID: 0} + k__BackingField: [] + SerializedTransformProperties: + Position: {x: -51.775536, y: 0.6793438, z: -2.5173702} + Rotation: {x: 0, y: 0, z: 0, w: 1} + LocalScale: {x: 1, y: 1, z: 1} + _isNetworked: 1 + _isSpawnable: 1 + _isGlobal: 0 + _initializeOrder: 0 + _defaultDespawnType: 0 + NetworkObserver: {fileID: 0} + _enablePrediction: 0 + _predictionType: 0 + _graphicalObject: {fileID: 0} + _enableStateForwarding: 1 + _networkTransform: {fileID: 0} + _ownerInterpolation: 1 + _enableTeleport: 0 + _teleportThreshold: 1 + k__BackingField: 0 + k__BackingField: 0 + _scenePathHash: 1455445497 + k__BackingField: 0 + k__BackingField: 17698334116330632258 diff --git a/Assets/Prefabs/Multiplayer/Client Instance.prefab.meta b/Assets/Prefabs/Multiplayer/Client Instance.prefab.meta new file mode 100644 index 0000000..01ce7e6 --- /dev/null +++ b/Assets/Prefabs/Multiplayer/Client Instance.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: abf4376f1c6f28241b1125c0eac87199 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Multiplayer/NetworkManager.prefab b/Assets/Prefabs/Multiplayer/NetworkManager.prefab index fce3e55..cbb0e52 100644 --- a/Assets/Prefabs/Multiplayer/NetworkManager.prefab +++ b/Assets/Prefabs/Multiplayer/NetworkManager.prefab @@ -12,6 +12,16 @@ GameObject: - component: {fileID: 7443408887813606050} - component: {fileID: 934570884} - component: {fileID: 7443408887813606060} + - component: {fileID: 4427988724072666434} + - component: {fileID: 937364350749304634} + - component: {fileID: 4166310840977298591} + - component: {fileID: 6354181707884201360} + - component: {fileID: 4931936926189112829} + - component: {fileID: 5770411533141640352} + - component: {fileID: 2456202277866033903} + - component: {fileID: 4080293045635388376} + - component: {fileID: 1147000878988426880} + - component: {fileID: 6184982229728339744} m_Layer: 0 m_Name: NetworkManager m_TagString: Untagged @@ -26,13 +36,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7443408887813606051} + serializedVersion: 2 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: - {fileID: 4393252310584637084} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7443408887813606050 MonoBehaviour: @@ -46,12 +57,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d2c95dfde7d73b54dbbdc23155d35d36, type: 3} m_Name: m_EditorClassIdentifier: - _logging: {fileID: 0} - _spawnablePrefabs: {fileID: 11400000, guid: ec64eb18c93ab344892891f33edbf82a, type: 2} - _refreshDefaultPrefabs: 0 + _refreshDefaultPrefabs: 1 _runInBackground: 1 - _dontDestroyOnLoad: 1 + _dontDestroyOnLoad: 0 + _objectPool: {fileID: 0} _persistence: 0 + _logging: {fileID: 11400000, guid: 1b221f26a1118094c81531b27f6fad43, type: 2} + _spawnablePrefabs: {fileID: 11400000, guid: bb50798712a8fcd40b22abbc470201fb, type: 2} --- !u!114 &934570884 MonoBehaviour: m_ObjectHideFlags: 0 @@ -64,9 +76,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7d331f979d46e8e4a9fc90070c596d44, type: 3} m_Name: m_EditorClassIdentifier: - _defaultConditions: - - {fileID: 11400000, guid: 2033f54fd2794464bae08fa5a55c8996, type: 2} + _enableNetworkLod: 0 + _levelOfDetailDistances: [] + _updateHostVisibility: 1 + _maximumTimedObserversDuration: 10 + _defaultConditions: [] --- !u!114 &7443408887813606060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7443408887813606051} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 211a9f6ec51ddc14f908f5acc0cd0423, type: 3} + m_Name: + m_EditorClassIdentifier: + _playerPrefab: {fileID: 6141811525297683108, guid: abf4376f1c6f28241b1125c0eac87199, type: 3} + _addToDefaultScene: 1 + Spawns: [] +--- !u!114 &4427988724072666434 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -75,134 +105,283 @@ MonoBehaviour: m_GameObject: {fileID: 7443408887813606051} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 211a9f6ec51ddc14f908f5acc0cd0423, type: 3} + m_Script: {fileID: 11500000, guid: e08bb003fce297d4086cf8cba5aa459a, type: 3} m_Name: m_EditorClassIdentifier: - _playerPrefab: {fileID: 0} - _addToDefaultScene: 1 - Spawns: [] + _queuedInputs: 1 + _dropExcessiveReplicates: 1 + _maximumServerReplicates: 15 + _redundancyCount: 2 + _allowPredictedSpawning: 0 + _reservedObjectIds: 15 +--- !u!114 &937364350749304634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7443408887813606051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fdaae44044276a49a52229c1597e33b, type: 3} + m_Name: + m_EditorClassIdentifier: + _updateOrder: 0 + _timingType: 0 + _allowTickDropping: 0 + _maximumFrameTicks: 2 + _tickRate: 30 + _pingInterval: 1 + _physicsMode: 0 +--- !u!114 &4166310840977298591 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7443408887813606051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9b6b565cd9533c4ebc18003f0fc18a2, type: 3} + m_Name: + m_EditorClassIdentifier: + _color: {r: 1, g: 1, b: 1, a: 1} + _placement: 1 + _hideTickRate: 1 +--- !u!114 &6354181707884201360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7443408887813606051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 34e4a322dca349547989b14021da4e23, type: 3} + m_Name: + m_EditorClassIdentifier: + Transport: {fileID: 2456202277866033903} + _intermediateLayer: {fileID: 0} + _latencySimulator: + _enabled: 0 + _simulateHost: 1 + _latency: 0 + _outOfOrder: 0 + _packetLoss: 0 +--- !u!114 &4931936926189112829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7443408887813606051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f48f002b825cbd45a19bd96d90f9edb, type: 3} + m_Name: + m_EditorClassIdentifier: + _dontRoute: 0 + _unreliableMtu: 1023 + _ipv4BindAddress: + _enableIpv6: 1 + _ipv6BindAddress: + _port: 7770 + _maximumClients: 4095 + _clientAddress: localhost +--- !u!114 &5770411533141640352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7443408887813606051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 362dfd7e6009fb44c90beec3df0ad853, type: 3} + m_Name: + m_EditorClassIdentifier: + _useWss: 0 + _sslConfiguration: + Enabled: 0 + CertificatePath: + CertificatePassword: + SslProtocol: 0 + _mtu: 1023 + _port: 443 + _maximumClients: 2000 + _clientAddress: localhost +--- !u!114 &2456202277866033903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7443408887813606051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 314b449d3505bd24487ba69b61c2fda5, type: 3} + m_Name: + m_EditorClassIdentifier: + GlobalServerActions: 1 + _transports: + - {fileID: 4931936926189112829} + - {fileID: 5770411533141640352} +--- !u!114 &4080293045635388376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7443408887813606051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68828c85278210948b9d50a8db3aab74, type: 3} + m_Name: + m_EditorClassIdentifier: + _authenticator: {fileID: 0} + _remoteClientTimeout: 2 + _remoteClientTimeoutDuration: 60 + _syncTypeRate: 0.1 + SpawnPacking: + Position: 0 + Rotation: 2 + Scale: 2 + _changeFrameRate: 1 + _frameRate: 500 + _shareIds: 1 + _startOnHeadless: 1 +--- !u!114 &1147000878988426880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7443408887813606051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aca43cf6f20e77c4f8fcc078fd85081f, type: 3} + m_Name: + m_EditorClassIdentifier: + _remoteServerTimeout: 2 + _remoteServerTimeoutDuration: 60 + _changeFrameRate: 1 + _frameRate: 500 +--- !u!114 &6184982229728339744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7443408887813606051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebee11279046f334d88e559c5c2ff08e, type: 3} + m_Name: + m_EditorClassIdentifier: + lobbyNetworkPrefab: {fileID: 6527384552577148640, guid: 7b71eecaf6568a847b4b8415852f9e98, type: 3} --- !u!1001 &2130063410 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7443408887813606049} m_Modifications: - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4393252310969058995, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + - target: {fileID: 4393252310969058995, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} propertyPath: m_Name value: NetworkHudCanvas objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} --- !u!224 &4393252310584637084 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} + m_CorrespondingSourceObject: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} m_PrefabInstance: {fileID: 2130063410} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Multiplayer/SSOLobby.prefab b/Assets/Prefabs/Multiplayer/SSOLobby.prefab index e706215..b781708 100644 --- a/Assets/Prefabs/Multiplayer/SSOLobby.prefab +++ b/Assets/Prefabs/Multiplayer/SSOLobby.prefab @@ -49,7 +49,8 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 k__BackingField: {fileID: 0} - _networkBehaviours: [] + _networkBehaviours: + - {fileID: -5295043410836352606} k__BackingField: {fileID: 0} k__BackingField: [] SerializedTransformProperties: @@ -70,7 +71,7 @@ MonoBehaviour: _ownerInterpolation: 1 _enableTeleport: 0 _teleportThreshold: 1 - k__BackingField: 11 + k__BackingField: 12 k__BackingField: 0 _scenePathHash: 1455445497 k__BackingField: 0 @@ -102,3 +103,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5aee3998d0d63994e944a61ed8c59784, type: 3} m_Name: m_EditorClassIdentifier: + _componentIndexCache: 0 + _addedNetworkObject: {fileID: 6527384552577148640} + _networkObjectCache: {fileID: 6527384552577148640} + clientPrefab: {fileID: 6141811525297683108, guid: abf4376f1c6f28241b1125c0eac87199, type: 3} diff --git a/Assets/Prefabs/UI/Player Item.prefab b/Assets/Prefabs/UI/Player Item.prefab new file mode 100644 index 0000000..8e032bb --- /dev/null +++ b/Assets/Prefabs/UI/Player Item.prefab @@ -0,0 +1,257 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &965101957841962906 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2307997546785490004} + - component: {fileID: 8542124331883837710} + - component: {fileID: 4615906867004551015} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2307997546785490004 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965101957841962906} + 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: 4487778728931874858} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8542124331883837710 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965101957841962906} + m_CullTransparentMesh: 1 +--- !u!114 &4615906867004551015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965101957841962906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Player Name + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} + m_sharedMaterial: {fileID: -7766214204018960760, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 72 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6269466464471204554 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4487778728931874858} + - component: {fileID: 5992024379863759697} + - component: {fileID: 2833456142315467025} + - component: {fileID: 974065929055435231} + m_Layer: 5 + m_Name: Player Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4487778728931874858 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6269466464471204554} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0018000603} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2307997546785490004} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5992024379863759697 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6269466464471204554} + m_CullTransparentMesh: 1 +--- !u!114 &2833456142315467025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6269466464471204554} + 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.6862745, b: 0, a: 1} + 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: 21300000, guid: a8292d7c3170a7348accf3d85c0e7359, type: 3} + m_Type: 0 + 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 &974065929055435231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6269466464471204554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_PressedColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} + m_SelectedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_DisabledColor: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 0.11764706} + m_ColorMultiplier: 1 + m_FadeDuration: 0.05 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_PressedSprite: {fileID: 21300000, guid: e5a390d359542f845bd18b3970c5eff3, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 0 + m_TargetGraphic: {fileID: 2833456142315467025} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Prefabs/UI/Player Item.prefab.meta b/Assets/Prefabs/UI/Player Item.prefab.meta new file mode 100644 index 0000000..fb353e8 --- /dev/null +++ b/Assets/Prefabs/UI/Player Item.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 166dea4a96a843c4dbbacf764967cb42 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI/Room Item.prefab b/Assets/Prefabs/UI/Room Item.prefab new file mode 100644 index 0000000..7828e87 --- /dev/null +++ b/Assets/Prefabs/UI/Room Item.prefab @@ -0,0 +1,257 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &441483089998703986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 211753779370993020} + - component: {fileID: 4202016964752389999} + - component: {fileID: 877214380053287912} + - component: {fileID: 333219489926224623} + m_Layer: 5 + m_Name: Room Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &211753779370993020 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 441483089998703986} + 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: + - {fileID: 8681801365378766037} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4202016964752389999 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 441483089998703986} + m_CullTransparentMesh: 1 +--- !u!114 &877214380053287912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 441483089998703986} + 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.6862745, b: 0, a: 1} + 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: 21300000, guid: a8292d7c3170a7348accf3d85c0e7359, type: 3} + m_Type: 0 + 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 &333219489926224623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 441483089998703986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_PressedColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} + m_SelectedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_DisabledColor: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 0.11764706} + m_ColorMultiplier: 1 + m_FadeDuration: 0.05 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_PressedSprite: {fileID: 21300000, guid: e5a390d359542f845bd18b3970c5eff3, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &4532608931749753960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8681801365378766037} + - component: {fileID: 9185343577600448866} + - component: {fileID: 9022054896948753903} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8681801365378766037 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4532608931749753960} + 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: 211753779370993020} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9185343577600448866 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4532608931749753960} + m_CullTransparentMesh: 1 +--- !u!114 &9022054896948753903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4532608931749753960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Room Name + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} + m_sharedMaterial: {fileID: -7766214204018960760, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 72 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Prefabs/UI/Room Item.prefab.meta b/Assets/Prefabs/UI/Room Item.prefab.meta new file mode 100644 index 0000000..12cf381 --- /dev/null +++ b/Assets/Prefabs/UI/Room Item.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bebd38cf5fa32ba41926d43852f2e633 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/InGameUI.unity b/Assets/Scenes/InGameUI.unity index 31fe6aa..df67d14 100644 --- a/Assets/Scenes/InGameUI.unity +++ b/Assets/Scenes/InGameUI.unity @@ -239,9 +239,9 @@ MonoBehaviour: m_EditorClassIdentifier: boostCapacities: - {fileID: 1950397573} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: 723891192} + - {fileID: 1472618151} + - {fileID: 1501063438} joinPrompts: - {fileID: 886944251} - {fileID: 374405368} @@ -346,34 +346,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1178560132} m_Modifications: - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_text - value: No - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textAlignment - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.lineCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.pageCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.wordCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.characterCount - value: 0 - objectReference: {fileID: 0} - target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3} propertyPath: m_SizeDelta.y value: -12.6 @@ -534,6 +506,34 @@ PrefabInstance: propertyPath: m_Name value: No Button objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_text + value: No + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textAlignment + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1011,34 +1011,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1986215051} m_Modifications: - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_text - value: Yes - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textAlignment - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.lineCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.pageCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.wordCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.characterCount - value: 0 - objectReference: {fileID: 0} - target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3} propertyPath: m_SizeDelta.y value: -12.6 @@ -1191,6 +1163,34 @@ PrefabInstance: propertyPath: m_Name value: Yes Button objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_text + value: Yes + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textAlignment + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2062,6 +2062,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} m_PrefabInstance: {fileID: 723891190} m_PrefabAsset: {fileID: 0} +--- !u!114 &723891192 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5281775441835194232, guid: ece147409d177604bb59e8bbd21316da, type: 3} + m_PrefabInstance: {fileID: 723891190} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e3ef46bd7908ba4b8fd45a5572217b6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &754823974 GameObject: m_ObjectHideFlags: 0 @@ -2841,10 +2852,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2011926118} m_Modifications: - - target: {fileID: 5415181396576777827, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 0} - target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3} propertyPath: m_AnchoredPosition.y value: -4 @@ -3027,6 +3034,10 @@ PrefabInstance: propertyPath: m_Name value: Exit Button objectReference: {fileID: 0} + - target: {fileID: 5415181396576777827, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3056,34 +3067,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1986215051} m_Modifications: - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_text - value: No - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textAlignment - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.lineCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.pageCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.wordCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.characterCount - value: 0 - objectReference: {fileID: 0} - target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3} propertyPath: m_SizeDelta.y value: -12.6 @@ -3244,6 +3227,34 @@ PrefabInstance: propertyPath: m_Name value: No Button objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_text + value: No + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textAlignment + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3340,34 +3351,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1178560132} m_Modifications: - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_text - value: Yes - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textAlignment - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.lineCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.pageCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.wordCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.characterCount - value: 0 - objectReference: {fileID: 0} - target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3} propertyPath: m_SizeDelta.y value: -12.6 @@ -3516,6 +3499,34 @@ PrefabInstance: propertyPath: m_Name value: Yes Button objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_text + value: Yes + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textAlignment + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3798,6 +3809,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} m_PrefabInstance: {fileID: 1472618149} m_PrefabAsset: {fileID: 0} +--- !u!114 &1472618151 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5281775441835194232, guid: ece147409d177604bb59e8bbd21316da, type: 3} + m_PrefabInstance: {fileID: 1472618149} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e3ef46bd7908ba4b8fd45a5572217b6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1501063436 PrefabInstance: m_ObjectHideFlags: 0 @@ -3932,6 +3954,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} m_PrefabInstance: {fileID: 1501063436} m_PrefabAsset: {fileID: 0} +--- !u!114 &1501063438 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5281775441835194232, guid: ece147409d177604bb59e8bbd21316da, type: 3} + m_PrefabInstance: {fileID: 1501063436} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e3ef46bd7908ba4b8fd45a5572217b6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1686910807 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/OnlineArena.unity b/Assets/Scenes/OnlineArena.unity index 1049758..68a012c 100644 --- a/Assets/Scenes/OnlineArena.unity +++ b/Assets/Scenes/OnlineArena.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.16318765, g: 0.16640459, b: 0.19442183, a: 1} + m_IndirectSpecularColor: {r: 0.16326728, g: 0.16644119, b: 0.17437215, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -396,6 +396,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 20df0926ff00f0e4dab5fd8ea03a31d2, type: 3} m_Name: m_EditorClassIdentifier: + MaxAdditionalDistance: 30 + FarOutBias: 0.3 + MaxFollowDistance: 100 + FollowSpeed: 2 + TiltFactor: 1.5 + ZoomOutMargin: 142 + ZoomInMargin: 190 + MinZoomSpeed: 0.4 + MaxZoomSpeed: 0.5 --- !u!114 &963194230 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/OnlineLobby.unity b/Assets/Scenes/OnlineLobby.unity index 3b31643..b7e846f 100644 --- a/Assets/Scenes/OnlineLobby.unity +++ b/Assets/Scenes/OnlineLobby.unity @@ -123,6 +123,83 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &147441861 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 147441862} + - component: {fileID: 147441864} + - component: {fileID: 147441863} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &147441862 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147441861} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0018596649} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 273314533} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.005004883, y: 292.25} + m_SizeDelta: {x: 500, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &147441863 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147441861} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 1 +--- !u!114 &147441864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147441861} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 2 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 1 + m_ReverseArrangement: 0 --- !u!1 &154051395 GameObject: m_ObjectHideFlags: 0 @@ -153,7 +230,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1576031418} - {fileID: 1146012456} m_Father: {fileID: 610685465} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -225,6 +301,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5bc412a4b00206945ada9fb37d31501c, type: 3} m_Name: m_EditorClassIdentifier: + usernameLabel: {fileID: 1108067321} + roomNameLabel: {fileID: 717060405} + lobbyCanvas: {fileID: 698819976} + roomCanvas: {fileID: 610685468} + roomItemContainer: {fileID: 1646351311} + playerItemContainer: {fileID: 147441862} + roomItemPrefab: {fileID: 441483089998703986, guid: bebd38cf5fa32ba41926d43852f2e633, type: 3} + playerItemPrefab: {fileID: 6269466464471204554, guid: 166dea4a96a843c4dbbacf764967cb42, type: 3} --- !u!4 &221455202 Transform: m_ObjectHideFlags: 0 @@ -250,12 +334,24 @@ PrefabInstance: m_Modifications: - target: {fileID: 934570884, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} propertyPath: _defaultConditions.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310584637057, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 934570884, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: _defaultConditions.Array.data[0] + value: + objectReference: {fileID: 0} + - target: {fileID: 4393252309867130424, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_Navigation.m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393252310051871672, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_Navigation.m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393252310584637056, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: _serverIndicator + value: + objectReference: {fileID: 1159814493} - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -296,254 +392,113 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7443408887813606050, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: _logging - value: - objectReference: {fileID: 11400000, guid: 1b221f26a1118094c81531b27f6fad43, type: 2} - - target: {fileID: 7443408887813606050, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: _spawnablePrefabs - value: - objectReference: {fileID: 11400000, guid: bb50798712a8fcd40b22abbc470201fb, type: 2} - - target: {fileID: 7443408887813606050, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: _dontDestroyOnLoad - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606050, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: _refreshDefaultPrefabs - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} propertyPath: m_Name value: Network Manager objectReference: {fileID: 0} - - target: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_IsActive + - target: {fileID: 7443408887813606060, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 7443408887813606060, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + - target: {fileID: 7443408887813606060, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: Spawns.Array.size + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - insertIndex: -1 - addedObject: {fileID: 241643525} - - targetCorrespondingSourceObject: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - insertIndex: -1 - addedObject: {fileID: 241643524} - - targetCorrespondingSourceObject: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - insertIndex: -1 - addedObject: {fileID: 241643522} - - targetCorrespondingSourceObject: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - insertIndex: -1 - addedObject: {fileID: 241643526} - - targetCorrespondingSourceObject: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - insertIndex: -1 - addedObject: {fileID: 241643523} - - targetCorrespondingSourceObject: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - insertIndex: -1 - addedObject: {fileID: 241643528} - - targetCorrespondingSourceObject: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - insertIndex: -1 - addedObject: {fileID: 241643527} - - targetCorrespondingSourceObject: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - insertIndex: -1 - addedObject: {fileID: 241643533} - - targetCorrespondingSourceObject: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - insertIndex: -1 - addedObject: {fileID: 241643532} - - targetCorrespondingSourceObject: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - insertIndex: -1 - addedObject: {fileID: 241643534} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} ---- !u!1 &241643521 stripped +--- !u!1 &273314532 GameObject: - m_CorrespondingSourceObject: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - m_PrefabInstance: {fileID: 241643520} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!114 &241643522 + serializedVersion: 6 + m_Component: + - component: {fileID: 273314533} + - component: {fileID: 273314536} + - component: {fileID: 273314535} + - component: {fileID: 273314534} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &273314533 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 273314532} + 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: + - {fileID: 147441862} + m_Father: {fileID: 1938781688} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &273314534 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 241643521} + m_GameObject: {fileID: 273314532} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f9b6b565cd9533c4ebc18003f0fc18a2, type: 3} + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} m_Name: m_EditorClassIdentifier: - _color: {r: 1, g: 1, b: 1, a: 1} - _placement: 1 - _hideTickRate: 1 ---- !u!114 &241643523 + m_ShowMaskGraphic: 0 +--- !u!114 &273314535 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 241643521} + m_GameObject: {fileID: 273314532} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6f48f002b825cbd45a19bd96d90f9edb, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - _dontRoute: 0 - _unreliableMtu: 1023 - _ipv4BindAddress: - _enableIpv6: 1 - _ipv6BindAddress: - _port: 7770 - _maximumClients: 4095 - _clientAddress: localhost ---- !u!114 &241643524 -MonoBehaviour: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + 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!222 &273314536 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 241643521} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3fdaae44044276a49a52229c1597e33b, type: 3} - m_Name: - m_EditorClassIdentifier: - _updateOrder: 0 - _timingType: 0 - _allowTickDropping: 0 - _maximumFrameTicks: 2 - _tickRate: 30 - _pingInterval: 1 - _physicsMode: 0 ---- !u!114 &241643525 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 241643521} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e08bb003fce297d4086cf8cba5aa459a, type: 3} - m_Name: - m_EditorClassIdentifier: - _queuedInputs: 1 - _dropExcessiveReplicates: 1 - _maximumServerReplicates: 15 - _redundancyCount: 2 - _allowPredictedSpawning: 0 - _reservedObjectIds: 15 ---- !u!114 &241643526 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 241643521} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 34e4a322dca349547989b14021da4e23, type: 3} - m_Name: - m_EditorClassIdentifier: - Transport: {fileID: 241643527} - _intermediateLayer: {fileID: 0} - _latencySimulator: - _enabled: 0 - _simulateHost: 1 - _latency: 0 - _outOfOrder: 0 - _packetLoss: 0 ---- !u!114 &241643527 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 241643521} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 314b449d3505bd24487ba69b61c2fda5, type: 3} - m_Name: - m_EditorClassIdentifier: - GlobalServerActions: 1 - _transports: - - {fileID: 241643523} - - {fileID: 241643528} ---- !u!114 &241643528 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 241643521} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 362dfd7e6009fb44c90beec3df0ad853, type: 3} - m_Name: - m_EditorClassIdentifier: - _useWss: 0 - _sslConfiguration: - Enabled: 0 - CertificatePath: - CertificatePassword: - SslProtocol: 0 - _mtu: 1023 - _port: 443 - _maximumClients: 2000 - _clientAddress: localhost ---- !u!114 &241643532 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 241643521} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aca43cf6f20e77c4f8fcc078fd85081f, type: 3} - m_Name: - m_EditorClassIdentifier: - _remoteServerTimeout: 2 - _remoteServerTimeoutDuration: 60 - _changeFrameRate: 1 - _frameRate: 500 ---- !u!114 &241643533 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 241643521} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 68828c85278210948b9d50a8db3aab74, type: 3} - m_Name: - m_EditorClassIdentifier: - _authenticator: {fileID: 0} - _remoteClientTimeout: 2 - _remoteClientTimeoutDuration: 60 - _syncTypeRate: 0.1 - SpawnPacking: - Position: 0 - Rotation: 2 - Scale: 2 - _changeFrameRate: 1 - _frameRate: 500 - _shareIds: 1 - _startOnHeadless: 1 ---- !u!114 &241643534 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 241643521} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebee11279046f334d88e559c5c2ff08e, type: 3} - m_Name: - m_EditorClassIdentifier: - lobbyNetworkPrefab: {fileID: 6527384552577148640, guid: 7b71eecaf6568a847b4b8415852f9e98, type: 3} + m_GameObject: {fileID: 273314532} + m_CullTransparentMesh: 1 --- !u!1 &376776602 GameObject: m_ObjectHideFlags: 0 @@ -578,8 +533,8 @@ RectTransform: - {fileID: 573306518} m_Father: {fileID: 698819973} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.85, y: 0.1} - m_AnchorMax: {x: 0.85, y: 0.1} + m_AnchorMin: {x: 0.83, y: 0.1} + m_AnchorMax: {x: 0.83, y: 0.1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} @@ -596,37 +551,49 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 0 + m_Mode: 4 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} + m_SelectOnLeft: {fileID: 1499696674} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 2 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_HighlightedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_PressedColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} + m_SelectedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_DisabledColor: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 0.11764706} m_ColorMultiplier: 1 - m_FadeDuration: 0.1 + m_FadeDuration: 0.05 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_PressedSprite: {fileID: 21300000, guid: e5a390d359542f845bd18b3970c5eff3, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed - m_SelectedTrigger: Selected + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 376776605} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 221455201} + m_TargetAssemblyTypeName: LobbyManager, Assembly-CSharp + m_MethodName: OnCreateRoomClick + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 3 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &376776605 MonoBehaviour: m_ObjectHideFlags: 0 @@ -665,181 +632,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 376776602} m_CullTransparentMesh: 1 ---- !u!1 &483727349 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 483727350} - - component: {fileID: 483727353} - - component: {fileID: 483727352} - - component: {fileID: 483727351} - m_Layer: 5 - m_Name: Username Input - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &483727350 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 483727349} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00009536743} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 596949995} - m_Father: {fileID: 610685465} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.15, y: 0.9} - m_AnchorMax: {x: 0.15, y: 0.9} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 400, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &483727351 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 483727349} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 0 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 0 - m_TargetGraphic: {fileID: 483727352} - m_TextViewport: {fileID: 596949995} - m_TextComponent: {fileID: 1006722049} - m_Placeholder: {fileID: 1086964618} - m_VerticalScrollbar: {fileID: 0} - m_VerticalScrollbarEventHandler: {fileID: 0} - m_LayoutGroup: {fileID: 0} - m_ScrollSensitivity: 1 - m_ContentType: 0 - m_InputType: 0 - m_AsteriskChar: 42 - m_KeyboardType: 0 - m_LineType: 0 - m_HideMobileInput: 0 - m_HideSoftKeyboard: 0 - m_CharacterValidation: 0 - m_RegexValue: - m_GlobalPointSize: 60 - m_CharacterLimit: 0 - m_OnEndEdit: - m_PersistentCalls: - m_Calls: [] - m_OnSubmit: - m_PersistentCalls: - m_Calls: [] - m_OnSelect: - m_PersistentCalls: - m_Calls: [] - m_OnDeselect: - m_PersistentCalls: - m_Calls: [] - m_OnTextSelection: - m_PersistentCalls: - m_Calls: [] - m_OnEndTextSelection: - m_PersistentCalls: - m_Calls: [] - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_OnTouchScreenKeyboardStatusChanged: - m_PersistentCalls: - m_Calls: [] - m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_CustomCaretColor: 0 - m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} - m_Text: Username - m_CaretBlinkRate: 0.85 - m_CaretWidth: 1 - m_ReadOnly: 0 - m_RichText: 1 - m_GlobalFontAsset: {fileID: 11400000, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} - m_OnFocusSelectAll: 1 - m_ResetOnDeActivation: 1 - m_RestoreOriginalTextOnEscape: 1 - m_isRichTextEditingAllowed: 0 - m_LineLimit: 0 - m_InputValidator: {fileID: 0} ---- !u!114 &483727352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 483727349} - 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.6862745, b: 0, a: 1} - 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: 21300000, guid: a8292d7c3170a7348accf3d85c0e7359, type: 3} - m_Type: 0 - 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!222 &483727353 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 483727349} - m_CullTransparentMesh: 1 --- !u!1 &573306517 GameObject: m_ObjectHideFlags: 0 @@ -976,58 +768,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573306517} m_CullTransparentMesh: 1 ---- !u!1 &596949994 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 596949995} - - component: {fileID: 596949996} - m_Layer: 5 - m_Name: Text Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &596949995 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 596949994} - 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: - - {fileID: 1086964616} - - {fileID: 1006722048} - m_Father: {fileID: 483727350} - 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: -0.5} - m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &596949996 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 596949994} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: {x: -8, y: -5, z: -8, w: -5} - m_Softness: {x: 0, y: 0} --- !u!1 &610685464 GameObject: m_ObjectHideFlags: 0 @@ -1060,7 +800,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 717060404} - - {fileID: 483727350} + - {fileID: 1938781688} - {fileID: 1670094508} - {fileID: 154051396} m_Father: {fileID: 1237651455} @@ -1151,7 +891,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &698819973 RectTransform: m_ObjectHideFlags: 0 @@ -1165,9 +905,9 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1254307512} - - {fileID: 1108067320} - {fileID: 376776603} - {fileID: 1906078487} + - {fileID: 812346922} m_Father: {fileID: 1237651455} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1214,7 +954,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &698819976 Canvas: m_ObjectHideFlags: 0 @@ -1508,6 +1248,73 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 792684210} m_CullTransparentMesh: 1 +--- !u!1 &812346921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 812346922} + - component: {fileID: 812346923} + m_Layer: 5 + m_Name: Room Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &812346922 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812346921} + 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: + - {fileID: 1804640977} + m_Father: {fileID: 698819973} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -45, y: 20} + m_SizeDelta: {x: 500, y: -360} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &812346923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812346921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1646351311} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 1804640977} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &877388171 GameObject: m_ObjectHideFlags: 0 @@ -1565,7 +1372,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "Username\u200B" + m_text: "\u200B" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} m_sharedMaterial: {fileID: -7766214204018960760, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} @@ -1776,140 +1583,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 994778810} m_CullTransparentMesh: 1 ---- !u!1 &1006722047 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1006722048} - - component: {fileID: 1006722050} - - component: {fileID: 1006722049} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1006722048 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1006722047} - 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: 596949995} - 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: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1006722049 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1006722047} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "Username\u200B" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} - m_sharedMaterial: {fileID: -7766214204018960760, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 60 - m_fontSizeBase: 60 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 1 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1006722050 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1006722047} - m_CullTransparentMesh: 1 --- !u!1 &1063802634 GameObject: m_ObjectHideFlags: 0 @@ -2044,161 +1717,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1063802634} m_CullTransparentMesh: 1 ---- !u!1 &1086964615 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1086964616} - - component: {fileID: 1086964619} - - component: {fileID: 1086964618} - - component: {fileID: 1086964617} - m_Layer: 5 - m_Name: Placeholder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1086964616 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1086964615} - 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: 596949995} - 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: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1086964617 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1086964615} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &1086964618 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1086964615} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Enter text... - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} - m_sharedMaterial: {fileID: -7766214204018960760, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 2150773298 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 60 - m_fontSizeBase: 60 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 2 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 1 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1086964619 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1086964615} - m_CullTransparentMesh: 1 --- !u!1 &1108067319 GameObject: m_ObjectHideFlags: 0 @@ -2226,16 +1744,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1108067319} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00009536743} + m_LocalPosition: {x: 0, y: 0, z: -0.00021457672} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1352470066} - m_Father: {fileID: 698819973} + m_Father: {fileID: 1237651455} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.15, y: 0.9} m_AnchorMax: {x: 0.15, y: 0.9} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.000030517578} m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1108067321 @@ -2277,11 +1795,11 @@ MonoBehaviour: m_PressedTrigger: Pressed m_SelectedTrigger: Selected m_DisabledTrigger: Disabled - m_Interactable: 1 + m_Interactable: 0 m_TargetGraphic: {fileID: 1108067322} m_TextViewport: {fileID: 1352470066} m_TextComponent: {fileID: 877388173} - m_Placeholder: {fileID: 1239818258} + m_Placeholder: {fileID: 0} m_VerticalScrollbar: {fileID: 0} m_VerticalScrollbarEventHandler: {fileID: 0} m_LayoutGroup: {fileID: 0} @@ -2324,7 +1842,7 @@ MonoBehaviour: m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_CustomCaretColor: 0 m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} - m_Text: Username + m_Text: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -2426,37 +1944,49 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 0 + m_Mode: 4 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_SelectOnRight: {fileID: 1670094509} + m_Transition: 2 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_HighlightedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_PressedColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} + m_SelectedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_DisabledColor: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 0.11764706} m_ColorMultiplier: 1 - m_FadeDuration: 0.1 + m_FadeDuration: 0.05 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_PressedSprite: {fileID: 21300000, guid: e5a390d359542f845bd18b3970c5eff3, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed - m_SelectedTrigger: Selected + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1146012458} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 221455201} + m_TargetAssemblyTypeName: LobbyManager, Assembly-CSharp + m_MethodName: OnLeaveRoomClick + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 3 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1146012458 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2495,6 +2025,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1146012455} m_CullTransparentMesh: 1 +--- !u!114 &1159814493 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3965864434055344170, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + m_PrefabInstance: {fileID: 241643520} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1171547945 GameObject: m_ObjectHideFlags: 0 @@ -2663,10 +2204,10 @@ RectTransform: - {fileID: 1171547946} m_Father: {fileID: 1906078487} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 200, y: -264} + m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1187019822 MonoBehaviour: @@ -2681,45 +2222,45 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 0 + m_Mode: 4 m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} + m_SelectOnUp: {fileID: 1499696674} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_SelectOnRight: {fileID: 376776604} + m_Transition: 2 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_HighlightedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_PressedColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} + m_SelectedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_DisabledColor: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 0.11764706} m_ColorMultiplier: 1 - m_FadeDuration: 0.1 + m_FadeDuration: 0.05 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_PressedSprite: {fileID: 21300000, guid: e5a390d359542f845bd18b3970c5eff3, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed - m_SelectedTrigger: Selected + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1187019823} m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: SlimUI.ModernMenu.SlimUIMainMenu, Assembly-CSharp - m_MethodName: Position1 + - m_Target: {fileID: 221455201} + m_TargetAssemblyTypeName: LobbyManager, Assembly-CSharp + m_MethodName: OnLeaveLobbyClick m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 3 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -2775,7 +2316,7 @@ GameObject: - component: {fileID: 1237651453} - component: {fileID: 1237651452} m_Layer: 5 - m_Name: Lobby Canvas + m_Name: Lobby UI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2857,6 +2398,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1371119336} + - {fileID: 1108067320} - {fileID: 698819973} - {fileID: 610685465} m_Father: {fileID: 0} @@ -2866,161 +2408,6 @@ RectTransform: m_AnchoredPosition: {x: -38.09, y: -2.23} m_SizeDelta: {x: 1679, y: 944.5} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1239818255 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1239818256} - - component: {fileID: 1239818259} - - component: {fileID: 1239818258} - - component: {fileID: 1239818257} - m_Layer: 5 - m_Name: Placeholder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1239818256 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239818255} - 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: 1352470066} - 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: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1239818257 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239818255} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &1239818258 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239818255} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Enter text... - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} - m_sharedMaterial: {fileID: -7766214204018960760, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 2150773298 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 60 - m_fontSizeBase: 60 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 2 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 1 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1239818259 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239818255} - m_CullTransparentMesh: 1 --- !u!1 &1254307511 GameObject: m_ObjectHideFlags: 0 @@ -3184,7 +2571,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1239818256} - {fileID: 877388172} m_Father: {fileID: 1108067320} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3452,10 +2838,10 @@ RectTransform: - {fileID: 1439418891} m_Father: {fileID: 1906078487} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 200, y: -157} + m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1499696674 MonoBehaviour: @@ -3470,37 +2856,49 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 0 + m_Mode: 4 m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} + m_SelectOnUp: {fileID: 2056023513} + m_SelectOnDown: {fileID: 1187019822} m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_SelectOnRight: {fileID: 376776604} + m_Transition: 2 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_HighlightedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_PressedColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} + m_SelectedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_DisabledColor: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 0.11764706} m_ColorMultiplier: 1 - m_FadeDuration: 0.1 + m_FadeDuration: 0.05 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_PressedSprite: {fileID: 21300000, guid: e5a390d359542f845bd18b3970c5eff3, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed - m_SelectedTrigger: Selected + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1499696675} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: SlimUI.ModernMenu.SlimUIMainMenu, Assembly-CSharp + m_MethodName: Position3 + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 3 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1499696675 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3539,7 +2937,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1499696672} m_CullTransparentMesh: 1 ---- !u!1 &1576031417 +--- !u!1 &1646351310 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3547,255 +2945,75 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1576031418} - - component: {fileID: 1576031421} - - component: {fileID: 1576031420} - - component: {fileID: 1576031419} + - component: {fileID: 1646351311} + - component: {fileID: 1646351312} + - component: {fileID: 1646351313} m_Layer: 5 - m_Name: Find Room - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1576031418 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1576031417} - 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: - - {fileID: 1638348792} - m_Father: {fileID: 154051396} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 200, y: -50} - m_SizeDelta: {x: 400, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1576031419 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1576031417} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 0 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1576031420} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1576031420 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1576031417} - 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.6862745, b: 0, a: 1} - 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: 21300000, guid: a8292d7c3170a7348accf3d85c0e7359, type: 3} - m_Type: 0 - 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!222 &1576031421 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1576031417} - m_CullTransparentMesh: 1 ---- !u!1 &1638348791 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1638348792} - - component: {fileID: 1638348794} - - component: {fileID: 1638348793} - m_Layer: 5 - m_Name: Text (TMP) + m_Name: Content m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1638348792 +--- !u!224 &1646351311 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1638348791} + m_GameObject: {fileID: 1646351310} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.0018596649} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1576031418} + m_Father: {fileID: 1804640977} 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: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1638348793 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.005004883, y: 292.25} + m_SizeDelta: {x: 500, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1646351312 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1638348791} + m_GameObject: {fileID: 1646351310} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'Find Room - -' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} - m_sharedMaterial: {fileID: -7766214204018960760, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 60 - m_fontSizeBase: 60 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1638348794 -CanvasRenderer: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 2 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 1 + m_ReverseArrangement: 0 +--- !u!114 &1646351313 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1638348791} - m_CullTransparentMesh: 1 + m_GameObject: {fileID: 1646351310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 1 --- !u!1 &1670094507 GameObject: m_ObjectHideFlags: 0 @@ -3809,7 +3027,7 @@ GameObject: - component: {fileID: 1670094510} - component: {fileID: 1670094509} m_Layer: 5 - m_Name: Create Room + m_Name: Ready m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3830,8 +3048,8 @@ RectTransform: - {fileID: 994778811} m_Father: {fileID: 610685465} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.85, y: 0.1} - m_AnchorMax: {x: 0.85, y: 0.1} + m_AnchorMin: {x: 0.83, y: 0.1} + m_AnchorMax: {x: 0.83, y: 0.1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} @@ -3848,37 +3066,49 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 0 + m_Mode: 4 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} + m_SelectOnLeft: {fileID: 1146012457} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 2 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_HighlightedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_PressedColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} + m_SelectedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_DisabledColor: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 0.11764706} m_ColorMultiplier: 1 - m_FadeDuration: 0.1 + m_FadeDuration: 0.05 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_PressedSprite: {fileID: 21300000, guid: e5a390d359542f845bd18b3970c5eff3, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed - m_SelectedTrigger: Selected + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 1670094510} + m_TargetGraphic: {fileID: 2056023514} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: SlimUI.ModernMenu.SlimUIMainMenu, Assembly-CSharp + m_MethodName: Position3 + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 3 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1670094510 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3917,6 +3147,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1670094507} m_CullTransparentMesh: 1 +--- !u!1 &1804640976 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1804640977} + - component: {fileID: 1804640979} + - component: {fileID: 1804640978} + - component: {fileID: 1804640980} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1804640977 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1804640976} + 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: + - {fileID: 1646351311} + m_Father: {fileID: 812346922} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1804640978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1804640976} + 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: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + 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!222 &1804640979 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1804640976} + m_CullTransparentMesh: 1 +--- !u!114 &1804640980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1804640976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &1906078486 GameObject: m_ObjectHideFlags: 0 @@ -3991,6 +3311,73 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1906078486} m_CullTransparentMesh: 0 +--- !u!1 &1938781687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1938781688} + - component: {fileID: 1938781689} + m_Layer: 5 + m_Name: Player Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1938781688 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1938781687} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00009536743} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 273314533} + m_Father: {fileID: 610685465} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -45.000084, y: 19.999939} + m_SizeDelta: {x: 500, y: -360} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1938781689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1938781687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 147441862} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 273314533} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2056023511 GameObject: m_ObjectHideFlags: 0 @@ -4025,10 +3412,10 @@ RectTransform: - {fileID: 1063802635} m_Father: {fileID: 1906078487} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 200, y: -50} + m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2056023513 MonoBehaviour: @@ -4043,37 +3430,49 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 0 + m_Mode: 4 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} + m_SelectOnDown: {fileID: 1499696674} m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_SelectOnRight: {fileID: 376776604} + m_Transition: 2 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_HighlightedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_PressedColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} + m_SelectedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_DisabledColor: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 0.11764706} m_ColorMultiplier: 1 - m_FadeDuration: 0.1 + m_FadeDuration: 0.05 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_PressedSprite: {fileID: 21300000, guid: e5a390d359542f845bd18b3970c5eff3, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed - m_SelectedTrigger: Selected + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 2056023514} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: SlimUI.ModernMenu.SlimUIMainMenu, Assembly-CSharp + m_MethodName: Position3 + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 3 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &2056023514 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Multiplayer/ClientInstance.cs b/Assets/Scripts/Multiplayer/ClientInstance.cs new file mode 100644 index 0000000..19338c3 --- /dev/null +++ b/Assets/Scripts/Multiplayer/ClientInstance.cs @@ -0,0 +1,35 @@ +using FishNet.Object; +using FishNet.Object.Synchronizing; +using FishNet.Connection; +using FishNet; +using log4net; +using System.Reflection; + +public class ClientInstance : NetworkBehaviour +{ + private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + #region Sync + private readonly SyncVar username = new(); + #endregion + + #region Username + public string Username { get => username.Value; set => username.Value = value; } + + #endregion + #region Helper + public static ClientInstance ReturnClientInstance(NetworkConnection conn) + { + if (InstanceFinder.IsServerStarted && conn != null) + { + // Expects the client instance to be the very first object of that connection + NetworkObject nob = conn.FirstObject; + return (nob == null) ? null : nob.GetComponent(); + } + else + { + Log.Warn("Unable to find client instance"); + return null; + } + } + #endregion +} \ No newline at end of file diff --git a/Assets/Scripts/Multiplayer/ClientInstance.cs.meta b/Assets/Scripts/Multiplayer/ClientInstance.cs.meta new file mode 100644 index 0000000..cc8f6f3 --- /dev/null +++ b/Assets/Scripts/Multiplayer/ClientInstance.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5eb53f3d7ef001049a14bc1408dc0092 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Multiplayer/LobbyManager.cs b/Assets/Scripts/Multiplayer/LobbyManager.cs index 903c3b3..f57f0d1 100644 --- a/Assets/Scripts/Multiplayer/LobbyManager.cs +++ b/Assets/Scripts/Multiplayer/LobbyManager.cs @@ -1,20 +1,224 @@ +using System.Collections.Generic; +using System.Reflection; +using FishNet.Object; +using log4net; +using TMPro; using UnityEngine; +using UnityEngine.UI; public class LobbyManager : MonoBehaviour { + private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + #region Fields + [SerializeField] private TMP_InputField usernameLabel; + [SerializeField] private TextMeshProUGUI roomNameLabel; + [SerializeField] private Canvas lobbyCanvas; + [SerializeField] private Canvas roomCanvas; + [SerializeField] private Transform roomItemContainer; + [SerializeField] private Transform playerItemContainer; + [SerializeField] private GameObject roomItemPrefab; + [SerializeField] private GameObject playerItemPrefab; + private Dictionary playerRoomItems = new(); + private Dictionary roomItems = new(); + private Canvas previousCanvas; private SSOLobby lobby; #endregion #region Init + private void Awake() { Locator.RegisterService(this); + lobbyCanvas.gameObject.SetActive(false); + roomCanvas.gameObject.SetActive(false); } public void InitClient(SSOLobby lobby) { this.lobby = lobby; + lobby.SignIn(); + } + #endregion + + #region Events + private void SubscribeToRoomAndPlayerEvents(bool subscribe) + { + if (subscribe) + { + lobby.OnMemberJoined += OnMemberJoined; + lobby.OnMemberLeft += OnMemberLeft; + lobby.OnRoomCreated += OnRoomCreated; + lobby.OnRoomDeleted += OnRoomDeleted; + lobby.OnRoomStarted += OnRoomStarted; + } + else + { + lobby.OnMemberJoined -= OnMemberJoined; + lobby.OnMemberLeft -= OnMemberLeft; + lobby.OnRoomCreated -= OnRoomCreated; + lobby.OnRoomDeleted -= OnRoomDeleted; + lobby.OnRoomStarted -= OnRoomStarted; + } + } + + private void OnRoomStarted(Room room) + { + UpdateRoomUI(room.name); + } + + private void OnRoomDeleted(Room room) + { + RemoveRoomUI(room.name); + } + + private void OnRoomCreated(Room room) + { + AddRoomUI(room.name); + } + + private void OnMemberLeft(NetworkObject target) + { + string username = target.Owner.FirstObject.GetComponent().Username; + RemoveRoomPlayerUI(username); + } + + private void OnMemberJoined(NetworkObject target) + { + string username = target.Owner.FirstObject.GetComponent().Username; + AddRoomPlayerUI(username); + } + #endregion + + #region Navigation + + public void ChangeCanvas(Canvas canvas) + { + if (previousCanvas != null) + previousCanvas.gameObject.SetActive(false); + if (canvas == previousCanvas) + { + Log.Info("This canvas is already active"); + return; + } + canvas.gameObject.SetActive(true); + previousCanvas = canvas; + } + + public void EnterGame() + { + SubscribeToRoomAndPlayerEvents(false); + } + public void EnterLobby() + { + ChangeCanvas(lobbyCanvas); + } + + public void SignInSuccess(string username) + { + Log.Debug($"User: {username} just signed in with the server."); + usernameLabel.text = username; + SubscribeToRoomAndPlayerEvents(true); + EnterLobby(); + } + public void SignInFailed(string failedReason) + { + Log.Warn($"User wasn't signed in because: {failedReason}"); + } + + public void OnCreateRoom(Room r) + { + ChangeCanvas(roomCanvas); + roomNameLabel.text = r.name; + } + public void OnJoinRoom(Room r) + { + ChangeCanvas(roomCanvas); + roomNameLabel.text = r.name; + } + public void OnLeaveRoom() + { + ChangeCanvas(lobbyCanvas); + } + #endregion + + #region UI + // Room + public void AddRoomUI(string roomName) + { + if (roomItems.ContainsKey(roomName)) + return; + GameObject go = Instantiate(roomItemPrefab); + go.transform.SetParent(roomItemContainer, false); + go.GetComponentsInChildren()[0].text = roomName; + go.GetComponentInChildren