Bugs: Fixing a couple harmless null refs that could result from quitting out of a lobby during Relay connection. Allowing the Back button to be visible during lobby countdown since quitting out at that point won't, like, *ruin* anything; this is actually to fix an issue where a client's Back button could disappear for an UpdateSlow between the point where they locally know they're in game and the lobby receives the actual data push from the host.

3 年前 · 8192c7a4
--- a/Assets/Prefabs/UI/BackButtonBG.prefab
+++ b/Assets/Prefabs/UI/BackButtonBG.prefab
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 17.9
+  m_fontSize: 16
  m_fontSizeBase: 24
  m_fontWeight: 400
  m_enableAutoSizing: 1
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
-  - {fileID: 2344342489728598789}
+  - {fileID: 8687266200334079465}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
    m_PersistentCalls:
      m_Calls: []
  ShowThisWhen: 2
--- !u!1 &6668424015570691350
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2344342489728598789}
-  - component: {fileID: 5813347457509296480}
-  - component: {fileID: 731239719284957053}
-  - component: {fileID: 8114326487105409297}
-  - component: {fileID: 5670435380500466409}
-  m_Layer: 5
-  m_Name: LobbyDataLayer
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &2344342489728598789
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6668424015570691350}
-  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: 8687266200334079465}
-  m_Father: {fileID: 21306902101918852}
-  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!222 &5813347457509296480
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6668424015570691350}
-  m_CullTransparentMesh: 1
--- !u!225 &731239719284957053
-CanvasGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6668424015570691350}
-  m_Enabled: 1
-  m_Alpha: 1
-  m_Interactable: 1
-  m_BlocksRaycasts: 1
-  m_IgnoreParentGroups: 0
--- !u!114 &8114326487105409297
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6668424015570691350}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f38cf340acfcd4c64a6968b7386ad570, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_onVisibilityChange:
-    m_PersistentCalls:
-      m_Calls: []
-  m_ShowThisWhen: 5
--- !u!114 &5670435380500466409
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6668424015570691350}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 70dfc2fde0a9ef04eaff29a138f0bf45, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  OnObservedUpdated:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 8114326487105409297}
-        m_TargetAssemblyTypeName: LobbyRooms.UI.LobbyStateVisibilityUI, LobbyRooms
-        m_MethodName: ObservedUpdated
-        m_Mode: 0
-        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!1 &9098499516663060533
 GameObject:
  m_ObjectHideFlags: 0
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 7723827565599166151}
-  m_Father: {fileID: 2344342489728598789}
+  m_Father: {fileID: 21306902101918852}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
--- a/Assets/Prefabs/UI/PlayerInteractionPanel.prefab
+++ b/Assets/Prefabs/UI/PlayerInteractionPanel.prefab
  serializedVersion: 6
  m_Component:
  - component: {fileID: 7303921398628037483}
-  - component: {fileID: 4155147274821193738}
-  - component: {fileID: 8388542991005336197}
  m_Layer: 5
  m_Name: CountDownUI
  m_TagString: Untagged
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4155147274821193738
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 580481917308754637}
-  m_CullTransparentMesh: 1
 --- !u!114 &4969504009400302254
 MonoBehaviour:
  m_ObjectHideFlags: 0
    m_PersistentCalls:
      m_Calls: []
  m_CountDownText: {fileID: 4467363028704636643}
--- !u!225 &8388542991005336197
-CanvasGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 580481917308754637}
-  m_Enabled: 1
-  m_Alpha: 0
-  m_Interactable: 0
-  m_BlocksRaycasts: 0
-  m_IgnoreParentGroups: 0
 --- !u!1 &609596107351326384
 GameObject:
  m_ObjectHideFlags: 0
  - component: {fileID: 1611213509401803489}
  - component: {fileID: 5811625806911023419}
  - component: {fileID: 5977596652360143959}
-  - component: {fileID: 2113442049023149911}
-  - component: {fileID: 4811792094336013573}
-  - component: {fileID: 435124129857761185}
  m_Layer: 5
  m_Name: CancelButton
  m_TagString: Untagged
  m_ChildScaleWidth: 0
  m_ChildScaleHeight: 0
  m_ReverseArrangement: 0
--- !u!114 &2113442049023149911
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 609596107351326384}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 70dfc2fde0a9ef04eaff29a138f0bf45, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  OnObservedUpdated:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 435124129857761185}
-        m_TargetAssemblyTypeName: LobbyRooms.UI.LobbyStateVisibilityUI, LobbyRooms
-        m_MethodName: ObservedUpdated
-        m_Mode: 0
-        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!225 &4811792094336013573
-CanvasGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 609596107351326384}
-  m_Enabled: 1
-  m_Alpha: 1
-  m_Interactable: 1
-  m_BlocksRaycasts: 1
-  m_IgnoreParentGroups: 0
--- !u!114 &435124129857761185
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 609596107351326384}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f38cf340acfcd4c64a6968b7386ad570, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_onVisibilityChange:
-    m_PersistentCalls:
-      m_Calls: []
-  m_ShowThisWhen: -1
 --- !u!1 &1032235666708655174
 GameObject:
  m_ObjectHideFlags: 0
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 18
+  m_fontSize: 72
  m_fontSizeBase: 24
  m_fontWeight: 400
  m_enableAutoSizing: 1
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 18
+  m_fontSize: 66.15
  m_fontSizeBase: 24
  m_fontWeight: 400
  m_enableAutoSizing: 1
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 14.9
+  m_fontSize: 23
  m_fontSizeBase: 36
  m_fontWeight: 400
  m_enableAutoSizing: 1
  m_Father: {fileID: 5026269005358103012}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 167.125, y: -27.5}
-  m_SizeDelta: {x: 50, y: 50}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5387756616337415243
 CanvasRenderer:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 22.35
+  m_fontSize: 72
  m_fontSizeBase: 24
  m_fontWeight: 400
  m_enableAutoSizing: 1
  m_Father: {fileID: 5026269005358103012}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 67.125, y: -27.5}
-  m_SizeDelta: {x: 50, y: 50}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8764544246360663793
 CanvasRenderer:
  m_Father: {fileID: 5026269005358103012}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 217.125, y: -27.5}
-  m_SizeDelta: {x: 50, y: 50}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4202478155384707071
 CanvasRenderer:
  m_Father: {fileID: 5026269005358103012}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 117.125, y: -27.5}
-  m_SizeDelta: {x: 50, y: 50}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4168724985671927024
 CanvasRenderer:
--- a/Assets/Scenes/mainScene.unity
+++ b/Assets/Scenes/mainScene.unity
  m_Script: {fileID: 11500000, guid: a03b37d5b8df06948b36dfbc430a1ea5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!114 &1886099429 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3845984648666374778, guid: f1d618bdc6f1813449d428126e640aa5, type: 3}
-  m_PrefabInstance: {fileID: 2637199315837045693}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 70dfc2fde0a9ef04eaff29a138f0bf45, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &1969944515 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 8619884486222418397, guid: f1d618bdc6f1813449d428126e640aa5, type: 3}
      objectReference: {fileID: 0}
    - target: {fileID: 4822032080772604407, guid: f1d618bdc6f1813449d428126e640aa5, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.17340319
+      value: 0.0000011920929
      objectReference: {fileID: 0}
    - target: {fileID: 4824240073023402834, guid: f1d618bdc6f1813449d428126e640aa5, type: 3}
      propertyPath: m_AnchorMax.y
  m_Script: {fileID: 11500000, guid: 51373dc3c6ac79b4f8e36ac7c4419205, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!114 &2637199315837045697 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3903006825828350709, guid: f1d618bdc6f1813449d428126e640aa5, type: 3}
-  m_PrefabInstance: {fileID: 2637199315837045693}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 70dfc2fde0a9ef04eaff29a138f0bf45, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &2637199315837045698 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 618971913928185130, guid: f1d618bdc6f1813449d428126e640aa5, type: 3}
      objectReference: {fileID: 0}
    - target: {fileID: 7716713811812636910, guid: f80fc24bab3dcda459a2669321e2e5a4, type: 3}
      propertyPath: m_LocalLobbyObservers.Array.size
-      value: 10
+      value: 8
      objectReference: {fileID: 0}
    - target: {fileID: 7716713811812636910, guid: f80fc24bab3dcda459a2669321e2e5a4, type: 3}
      propertyPath: m_vivoxUserHandlers.Array.data[0]
    - target: {fileID: 7716713811812636910, guid: f80fc24bab3dcda459a2669321e2e5a4, type: 3}
      propertyPath: m_LobbyDataObservers.Array.data[7]
      value: 
-      objectReference: {fileID: 1886099429}
+      objectReference: {fileID: 0}
    - target: {fileID: 7716713811812636910, guid: f80fc24bab3dcda459a2669321e2e5a4, type: 3}
      propertyPath: m_LobbyServiceObservers.Array.size
      value: 2
    - target: {fileID: 7716713811812636910, guid: f80fc24bab3dcda459a2669321e2e5a4, type: 3}
      propertyPath: m_LocalLobbyObservers.Array.data[0]
      value: 
-      objectReference: {fileID: 1886099429}
+      objectReference: {fileID: 1014339014}
-      objectReference: {fileID: 1014339014}
+      objectReference: {fileID: 1412109061}
-      objectReference: {fileID: 1412109061}
+      objectReference: {fileID: 297599733}
-      objectReference: {fileID: 297599733}
+      objectReference: {fileID: 2130620598}
-      objectReference: {fileID: 2637199315837045697}
+      objectReference: {fileID: 2074106027}
-      objectReference: {fileID: 2130620598}
+      objectReference: {fileID: 309485569}
-      objectReference: {fileID: 2074106027}
+      objectReference: {fileID: 2126854580}
-      objectReference: {fileID: 309485569}
+      objectReference: {fileID: 1511612118}
-      objectReference: {fileID: 2126854580}
+      objectReference: {fileID: 1511612118}
    - target: {fileID: 7716713811812636910, guid: f80fc24bab3dcda459a2669321e2e5a4, type: 3}
      propertyPath: m_LocalLobbyObservers.Array.data[9]
      value: 
--- a/Assets/Scripts/Relay/RelayUtpSetup.cs
+++ b/Assets/Scripts/Relay/RelayUtpSetup.cs

        private void CheckForComplete()
        {
-            if (m_joinState == (JoinState.Joined | JoinState.Bound))
+            if (m_joinState == (JoinState.Joined | JoinState.Bound) && this != null) // this will equal null (i.e. this component has been destroyed) if the host left the lobby during the Relay connection sequence.
            {
                m_isRelayConnected = true;
                RelayUtpHost host = gameObject.AddComponent<RelayUtpHost>();

        private void OnJoin(JoinAllocation joinAllocation)
        {
-            if (joinAllocation == null)
+            if (joinAllocation == null || this == null) // The returned JoinAllocation is null if allocation failed. this would be destroyed already if you quit the lobby while Relay is connecting.
                return;
            m_allocation = joinAllocation;
            BindToAllocation(joinAllocation.RelayServer.IpV4, joinAllocation.RelayServer.Port, joinAllocation.AllocationIdBytes, joinAllocation.ConnectionData, joinAllocation.HostConnectionData, joinAllocation.Key, 1);
                Debug.LogError("Client failed to connect to server");
                m_onJoinComplete(false, null);
            }
-            else
+            else if (this != null)
            {
                m_isRelayConnected = true;
                RelayUtpClient client = gameObject.AddComponent<RelayUtpClient>();