diff --git a/Assets/Prefabs/Game/PlayerHUD.prefab b/Assets/Prefabs/Game/PlayerHUD.prefab index 125ea0a..32e5e4f 100644 --- a/Assets/Prefabs/Game/PlayerHUD.prefab +++ b/Assets/Prefabs/Game/PlayerHUD.prefab @@ -199,7 +199,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 540bda985e7e4b549a804ff06b069af1, type: 3} m_Name: m_EditorClassIdentifier: - raceTimer: 360 + raceTimer: 10 countdown_text: {fileID: 8450380190165699611} RunnerHUD: {fileID: 8140722858805320406} KingHUD: {fileID: 3634947091672077549} diff --git a/Assets/Scenes/PostGameWL.unity b/Assets/Scenes/PostGame.unity similarity index 77% rename from Assets/Scenes/PostGameWL.unity rename to Assets/Scenes/PostGame.unity index 13c2da2..fb72852 100644 --- a/Assets/Scenes/PostGameWL.unity +++ b/Assets/Scenes/PostGame.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3731193, g: 0.38073996, b: 0.35872698, a: 1} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -123,139 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &64726317 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 64726318} - - component: {fileID: 64726321} - - component: {fileID: 64726320} - - component: {fileID: 64726319} - m_Layer: 5 - m_Name: ReturnToLobbyButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &64726318 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 64726317} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 958683566} - m_Father: {fileID: 2036818936} - m_RootOrder: 1 - 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, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &64726319 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 64726317} - 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: 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: 64726320} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2036818937} - m_TargetAssemblyTypeName: PostGameUI, Assembly-CSharp - m_MethodName: OnReturnToLobbyClicked - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &64726320 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 64726317} - 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: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &64726321 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 64726317} - m_CullTransparentMesh: 1 --- !u!1 &223072783 GameObject: m_ObjectHideFlags: 0 @@ -456,7 +323,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 482208056} m_CullTransparentMesh: 1 ---- !u!1 &958683565 +--- !u!1 &1246267346 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -464,77 +331,132 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 958683566} - - component: {fileID: 958683568} - - component: {fileID: 958683567} + - component: {fileID: 1246267349} + - component: {fileID: 1246267348} + - component: {fileID: 1246267347} m_Layer: 5 - m_Name: Text + m_Name: ReturnCountdown m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &958683566 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958683565} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.15, y: 0.15, z: 1} - m_Children: [] - m_Father: {fileID: 64726318} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &958683567 +--- !u!114 &1246267347 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958683565} + m_GameObject: {fileID: 1246267346} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 100 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 100 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: Return to Lobby ---- !u!222 &958683568 + m_text: Returning to the lobby in <> seconds... + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 36 + m_fontSizeBase: 36 + 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 &1246267348 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958683565} + m_GameObject: {fileID: 1246267346} m_CullTransparentMesh: 1 +--- !u!224 &1246267349 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246267346} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2036818936} + m_RootOrder: 1 + 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, y: -400} + m_SizeDelta: {x: 800, y: 50} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1675589813 GameObject: m_ObjectHideFlags: 0 @@ -631,6 +553,7 @@ GameObject: - component: {fileID: 2036818934} - component: {fileID: 2036818933} - component: {fileID: 2036818937} + - component: {fileID: 2036818938} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -711,7 +634,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 482208057} - - {fileID: 64726318} + - {fileID: 1246267349} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -732,3 +655,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 258b674d96ccd344892a66bc9058af51, type: 3} m_Name: m_EditorClassIdentifier: + ReturnToLobbyText: {fileID: 1246267347} + ReturnToLobbyTimer: 10 +--- !u!114 &2036818938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2036818932} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkInstanceId: 0 + PrefabHash: 10862023707299065449 + PrefabHashGenerator: Canvas + AlwaysReplicateAsRoot: 0 + DontDestroyWithOwner: 0 diff --git a/Assets/Scenes/PostGameWL.unity.meta b/Assets/Scenes/PostGame.unity.meta similarity index 100% rename from Assets/Scenes/PostGameWL.unity.meta rename to Assets/Scenes/PostGame.unity.meta diff --git a/Assets/Scenes/Preloader.unity b/Assets/Scenes/Preloader.unity index 44dfed5..f9ffa29 100644 --- a/Assets/Scenes/Preloader.unity +++ b/Assets/Scenes/Preloader.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3731193, g: 0.38073996, b: 0.35872698, a: 1} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -279,7 +279,7 @@ MonoBehaviour: - TitleScene - Lobby - Game-Mountain - - PostGameWL + - PostGame AllowRuntimeSceneChanges: 0 NetworkPrefabs: - Prefab: {fileID: 7188906082087890184, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} diff --git a/Assets/Scripts/Game/PlayerHUD.cs b/Assets/Scripts/Game/PlayerHUD.cs index 1e337f5..ee98629 100644 --- a/Assets/Scripts/Game/PlayerHUD.cs +++ b/Assets/Scripts/Game/PlayerHUD.cs @@ -1,4 +1,6 @@ using MLAPI; +using MLAPI.Messaging; +using MLAPI.SceneManagement; using System.Collections; using System.Collections.Generic; using TMPro; @@ -37,7 +39,7 @@ public class PlayerHUD : NetworkBehaviour } IEnumerator RaceTimeCountdown() { - for (int i = raceTimer; i > 0; i--) { + for (int i = raceTimer; i >= 0; i--) { int minutes = i / 60; int seconds = i % 60; @@ -50,8 +52,12 @@ public class PlayerHUD : NetworkBehaviour // Only have the host call the server RPC to it is only done once if (IsHost) { - //TODO: WRITE WIN/LOSS CONDITIONAL - //TODO: Call server RPC for win loss stuff + EndRoundServerRPC(); } } + + [ServerRpc] + private void EndRoundServerRPC() { + NetworkSceneManager.SwitchScene("PostGame"); + } } diff --git a/Assets/Scripts/Network/Game/GameHandler.cs b/Assets/Scripts/Network/Game/GameHandler.cs index 821cbc1..d97e8f1 100644 --- a/Assets/Scripts/Network/Game/GameHandler.cs +++ b/Assets/Scripts/Network/Game/GameHandler.cs @@ -92,6 +92,6 @@ public class GameHandler : NetworkBehaviour private void SpawnPlayerHUDServerRpc(ServerRpcParams serverRpcParams = default) { _playerHUD = Instantiate(playerHUD, Vector3.zero, Quaternion.identity).gameObject; - _playerHUD.GetComponent().Spawn(); + _playerHUD.GetComponent().Spawn(null, true); } } diff --git a/Assets/Scripts/Network/Game/SpawnManager.cs b/Assets/Scripts/Network/Game/SpawnManager.cs index b80fe37..f088565 100644 --- a/Assets/Scripts/Network/Game/SpawnManager.cs +++ b/Assets/Scripts/Network/Game/SpawnManager.cs @@ -18,6 +18,8 @@ public class SpawnManager : NetworkBehaviour { // Spawn in the players on load void Start() { + runnersSpawned = 0; + InitSpawnPoints(); if (IsHost) { @@ -27,11 +29,11 @@ public class SpawnManager : NetworkBehaviour { if (playerData.IsKing) { // Spawn as king _king = Instantiate(kingPrefab, kingSpawnPoint, Quaternion.identity).gameObject; - _king.GetComponent().SpawnAsPlayerObject(NetworkManager.Singleton.LocalClientId); + _king.GetComponent().SpawnAsPlayerObject(NetworkManager.Singleton.LocalClientId, null, true); } else { // Spawn as player _runner = Instantiate(runnerPrefab, runnersSpawnPoints[runnersSpawned], Quaternion.identity).gameObject; - _runner.GetComponent().SpawnAsPlayerObject(NetworkManager.Singleton.LocalClientId); + _runner.GetComponent().SpawnAsPlayerObject(NetworkManager.Singleton.LocalClientId, null, true); // Increment runners runnersSpawned++; diff --git a/Assets/Scripts/UI/Lobby/LobbyUI.cs b/Assets/Scripts/UI/Lobby/LobbyUI.cs index 81441cb..44182ed 100644 --- a/Assets/Scripts/UI/Lobby/LobbyUI.cs +++ b/Assets/Scripts/UI/Lobby/LobbyUI.cs @@ -46,6 +46,28 @@ public class LobbyUI : NetworkBehaviour { // Get/Set the ip of the host StartCoroutine(GetIPAddress()); } + + // Reset the variables for IsReady and IsKing + if (IsHost) { + for (int i = 0; i < lobbyPlayers.Count; i++) { + // Update the lobby player cards states + lobbyPlayers[i] = new LobbyPlayerState( + lobbyPlayers[i].ClientId, + lobbyPlayers[i].PlayerName, + false, + false + ); + + // Update the server's player data as well + if (ServerGameNetPortal.Instance.clientIdToGuid.TryGetValue(lobbyPlayers[i].ClientId, out string clientGuid)) { + ServerGameNetPortal.Instance.clientData[clientGuid] = new PlayerData( + ServerGameNetPortal.Instance.clientData[clientGuid].PlayerName, + ServerGameNetPortal.Instance.clientData[clientGuid].ClientId, + false + ); + } + } + } } private void OnDestroy() diff --git a/Assets/Scripts/UI/PostGame/PostGameUI.cs b/Assets/Scripts/UI/PostGame/PostGameUI.cs index fd433c4..d12f677 100644 --- a/Assets/Scripts/UI/PostGame/PostGameUI.cs +++ b/Assets/Scripts/UI/PostGame/PostGameUI.cs @@ -1,23 +1,36 @@ using MLAPI; +using MLAPI.Messaging; +using TMPro; using System.Collections; using System.Collections.Generic; using UnityEngine; -public class PostGameUI : NetworkBehaviour -{ - // Start is called before the first frame update - void Start() - { - +public class PostGameUI : NetworkBehaviour { + + [SerializeField] private TMP_Text ReturnToLobbyText; + [SerializeField] private int ReturnToLobbyTimer; + + void Start() { + ReturnToLobbyText.text = "Returning to the lobby in " + ReturnToLobbyTimer + " seconds..."; + StartCoroutine(BeginCountdown()); + + //todo: do logic to determine and update who won the round } - // Update is called once per frame - void Update() - { - + IEnumerator BeginCountdown() { + for (int i = ReturnToLobbyTimer; i >= 0; i--) { + ReturnToLobbyText.text = "Returning to the lobby in " + i + " seconds..."; + yield return new WaitForSecondsRealtime(1f); + } + + // Have the host return everyone to the lobby + if (IsHost) { + ReturnToLobbyServerRPC(); + } } - public void OnReturnToLobbyClicked() { - //TODO: Do it here + [ServerRpc] + private void ReturnToLobbyServerRPC() { + ServerGameNetPortal.Instance.EndRound(); } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 5eb6f77..cc38895 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -18,6 +18,6 @@ EditorBuildSettings: path: Assets/Scenes/Game-Mountain.unity guid: f6e50dc4cb4a9b2449937a34f68b7e26 - enabled: 1 - path: Assets/Scenes/PostGameWL.unity + path: Assets/Scenes/PostGame.unity guid: f4ce64377389f094f87c07cfa7f940f4 m_configObjects: {} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 94c8255..84696eb 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,17 +12,17 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b180b6505263035233d1221fbd33134e7e422e0e8347129370bfb25 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b180b6505263035233d1221fbd33134e7e422e0e8347129370bfb25 - flags: 0 - RecentlyUsedScenePath-3: value: 224247031146467c0c03096f3d2c4a1e02161124623d28393930 flags: 0 - RecentlyUsedScenePath-4: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7b151b180b6505263035233d1221fbd33134e7e422e0e8347129370bfb25 flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c7b151b180b650d262f3d192c0e27d1e33136e7a923e7ee2e26 flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c6f1f05033f2b212d111c633c133af6f9 + flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 @@ -30,10 +30,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c6f1f05033f2b212d111c633c133af6f9 + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 UnityRemoteCompression: value: 337f73