Bugs: Removing the selected lobby data from the Join menu, so that when we return from a lobby, if we select Join again immediately, we don't just try to join the same lobby again. Changing "Ready." to "Ready" in the lobby UI. Making the error popup block raycasts fully, except for the Back button (for the case of the host disconnecting from the Lobby, since they would be popping up a 404 every 1.5s such that it would be difficult to click the button to leave the lobby).

3 年前 · e0abc931
--- a/Assets/Prefabs/UI/BackButtonBG.prefab
+++ b/Assets/Prefabs/UI/BackButtonBG.prefab
  serializedVersion: 6
  m_Component:
  - component: {fileID: 21306902101918852}
+  - component: {fileID: 892943604221978165}
+  - component: {fileID: 9211534540060107035}
  - component: {fileID: 3548897939371032169}
  - component: {fileID: 7262104930290195570}
  - component: {fileID: 8907220659739637781}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &892943604221978165
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5416637149047939654}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_SortingLayerID: 0
+  m_SortingOrder: 2
+  m_TargetDisplay: 0
 --- !u!222 &8554403787917887813
 CanvasRenderer:
  m_ObjectHideFlags: 0
  m_GameObject: {fileID: 5416637149047939654}
  m_CullTransparentMesh: 1
+--- !u!114 &9211534540060107035
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5416637149047939654}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!225 &3548897939371032169
 CanvasGroup:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/UI/GameCanvas.prefab
+++ b/Assets/Prefabs/UI/GameCanvas.prefab
  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: -12.499985}
-  m_SizeDelta: {x: -30, y: -75}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2637199316888954224
 GameObject:
      objectReference: {fileID: 0}
    - target: {fileID: 8624457953394683849, guid: 1ba83780824e3074a9e835b4d5811b49, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: -30
-      value: 0
+      value: -75
      objectReference: {fileID: 0}
    - target: {fileID: 8624457953394683849, guid: 1ba83780824e3074a9e835b4d5811b49, type: 3}
      propertyPath: m_LocalPosition.x
      objectReference: {fileID: 0}
    - target: {fileID: 8624457953394683849, guid: 1ba83780824e3074a9e835b4d5811b49, type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
-      value: -0
+      value: 0
-      value: -0
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8624457953394683849, guid: 1ba83780824e3074a9e835b4d5811b49, type: 3}
      propertyPath: m_AnchoredPosition.x
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -12.5
      objectReference: {fileID: 0}
    - target: {fileID: 8624457953394683849, guid: 1ba83780824e3074a9e835b4d5811b49, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 7322885418547999459, guid: 247f79ab5aefc6d40bcbdade4d9467b7, type: 3}
+      propertyPath: m_fontSize
+      value: 35.8
+      objectReference: {fileID: 0}
    - target: {fileID: 7511166192365473530, guid: 247f79ab5aefc6d40bcbdade4d9467b7, type: 3}
      propertyPath: m_AnchorMax.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 2828520451782533824, guid: 404728f5cffe43940b290121bd31f601, type: 3}
      propertyPath: m_Size
-      value: 1
+      value: 0.99999994
      objectReference: {fileID: 0}
    - target: {fileID: 2828520451782533824, guid: 404728f5cffe43940b290121bd31f601, type: 3}
      propertyPath: m_Value
      objectReference: {fileID: 0}
    - target: {fileID: 5836614391142406767, guid: 404728f5cffe43940b290121bd31f601, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: -30
-      value: 0
+      value: -75
      objectReference: {fileID: 0}
    - target: {fileID: 5836614391142406767, guid: 404728f5cffe43940b290121bd31f601, type: 3}
      propertyPath: m_LocalPosition.x
      objectReference: {fileID: 0}
    - target: {fileID: 5836614391142406767, guid: 404728f5cffe43940b290121bd31f601, type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
-      value: -0
+      value: 0
-      value: -0
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5836614391142406767, guid: 404728f5cffe43940b290121bd31f601, type: 3}
      propertyPath: m_AnchoredPosition.x
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -12.5
      objectReference: {fileID: 0}
    - target: {fileID: 5836614391142406767, guid: 404728f5cffe43940b290121bd31f601, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 7025505742805288892, guid: 404728f5cffe43940b290121bd31f601, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7025505742805288892, guid: 404728f5cffe43940b290121bd31f601, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7025505742805288892, guid: 404728f5cffe43940b290121bd31f601, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7025505742805288892, guid: 404728f5cffe43940b290121bd31f601, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7025505742805288892, guid: 404728f5cffe43940b290121bd31f601, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7025505742805288892, guid: 404728f5cffe43940b290121bd31f601, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 7071590578612216411, guid: 404728f5cffe43940b290121bd31f601, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8314627591180998490, guid: 404728f5cffe43940b290121bd31f601, type: 3}
      propertyPath: m_fontSize
-      value: 26.6
+      value: 21.65
      objectReference: {fileID: 0}
    - target: {fileID: 8437021287377131492, guid: 404728f5cffe43940b290121bd31f601, type: 3}
      propertyPath: m_AnchorMax.y
      objectReference: {fileID: 0}
    - target: {fileID: 8502326957445156609, guid: 404728f5cffe43940b290121bd31f601, type: 3}
      propertyPath: m_fontSize
-      value: 26.6
+      value: 21.65
      objectReference: {fileID: 0}
    - target: {fileID: 8636295960037856115, guid: 404728f5cffe43940b290121bd31f601, type: 3}
      propertyPath: m_AnchorMax.y
--- a/Assets/Prefabs/UI/PlayerInteractionPanel.prefab
+++ b/Assets/Prefabs/UI/PlayerInteractionPanel.prefab
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: Ready.
+  m_text: Ready
  m_isRightToLeft: 0
  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
--- a/Assets/Scenes/mainScene.unity
+++ b/Assets/Scenes/mainScene.unity
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2637199316291327119, guid: f1d618bdc6f1813449d428126e640aa5, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -12.499985
-      objectReference: {fileID: 0}
    - target: {fileID: 2707501774297567273, guid: f1d618bdc6f1813449d428126e640aa5, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
    - target: {fileID: 5880123119007547921, guid: f1d618bdc6f1813449d428126e640aa5, type: 3}
      propertyPath: m_AnchoredPosition.x
      value: -9.757019
+      objectReference: {fileID: 0}
+    - target: {fileID: 5991488785009139195, guid: f1d618bdc6f1813449d428126e640aa5, type: 3}
+      propertyPath: m_Size
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 5991488785009139195, guid: f1d618bdc6f1813449d428126e640aa5, type: 3}
      propertyPath: m_Value
--- a/Assets/Scripts/UI/JoinMenuUI.cs
+++ b/Assets/Scripts/UI/JoinMenuUI.cs
        public void OnJoinButtonPressed()
        {
            Locator.Get.Messenger.OnReceiveMessage(MessageType.JoinLobbyRequest, m_LocalLobbySelected);
+            m_LocalLobbySelected = default;
        }

        public void OnRefresh()
--- a/Assets/Scripts/Vivox/VivoxUserHandler.cs
+++ b/Assets/Scripts/Vivox/VivoxUserHandler.cs
            // In the future, remove FindVivoxId and pass the environment ID here instead.
            m_vivoxId = null;

-            // SetID might be called after we've received the IChannelSession for remote players, which would mean after OnParticipant Added. So, duplicate the VivoxID work here.
+            // SetID might be called after we've received the IChannelSession for remote players, which would mean after OnParticipantAdded. So, duplicate the VivoxID work here.
            if (m_channelSession != null)
            {
                foreach (var participant in m_channelSession.Participants)