Revert "Multiplayer Beta (icosa-foundation#774)"

This reverts commit d5384b0.
AoZhui · Jan 8, 2025 · bed1b5f · bed1b5f
1 parent e97eb69
commit bed1b5f
Show file tree

Hide file tree

Showing 103 changed files with 1,669 additions and 16,478 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -352,7 +352,7 @@ jobs:
         with:
           token: ${{ env.PHOTON_PAT }}
           repository: icosa-mirror/photon-fusion
-          ref: Fusion_v2_Voice_2
+          ref: v1.1.8
           path: photon-fusion-mirror/
 
       - name: Copy photon files
@@ -449,11 +449,6 @@ jobs:
         run: |
           sed -e 's/androidUseCustomKeystore.*$/androidUseCustomKeystore: 1/' -i ProjectSettings/ProjectSettings.asset
 
-      - name: Add PHOTON_PAT specific define
-        if: ${{ env.PHOTON_PAT }}
-        run: |
-          echo -e "\n -define:MP_PHOTON \n -define:PHOTON_UNITY_NETWORKING \n-define:PUN_2_0_OR_NEWER \n-define:PUN_2_OR_NEWER \n-define:PUN_2_19_OR_NEWER \n-define:FUSION_WEAVER \n-define:FUSION2 \n-define:CROSS_PLATFORM_INPUT \n-define:MOBILE_INPUT \n-define:PHOTON_VOICE_DEFINED" | tee -a Assets/csc.rsp
-
       - name: Update build matrix specific defines in csc.rsp
         if: ${{ matrix.extra_defines }}
         run: |

diff --git a/.gitignore b/.gitignore
@@ -106,8 +106,6 @@ Packages/com.unity.xr.picoxr
 /Assets/Photon/**
 /Assets/Photon.meta
 !/Assets/Photon/Fusion/Resources/NetworkProjectConfig.fusion*
-!/Assets/Photon/Fusion/Resources/PhotonAppSettings.asset*
-!/Assets/Photon/Fusion/User/NetworkPrefabAssetCollection.asset*
 
 # Cache files
 *.cache
diff --git a/Assets/Editor/BuildTiltBrush.cs b/Assets/Editor/BuildTiltBrush.cs
@@ -1435,7 +1435,7 @@ static void ShowBrushExportTextures()
         using (var unused = new TempHookUpSingletons())
         {
             // Set consultUserConfig = false to keep user config from affecting the build output.
-            TiltBrushManifest manifest = App.Instance.ManifestFull;
+            TiltBrushManifest manifest = App.Instance.GetMergedManifest(forceExperimental: true);
 
             StringBuilder s = new StringBuilder();
             foreach (BrushDescriptor desc in manifest.UniqueBrushes())
@@ -1547,7 +1547,7 @@ public static void DoBuild(TiltBuildOptions tiltOptions)
             // to be run at build-time (ie when nobody has called Start(), Awake()).
             // TempHookupSingletons() has done just enough initialization to make it happy.
             // Also set consultUserConfig = false to keep user config from affecting the build output.
-            TiltBrushManifest manifest = App.Instance.ManifestFull;
+            TiltBrushManifest manifest = App.Instance.GetMergedManifest(forceExperimental: true);
 
             // Some sanity checks
             {

diff --git a/Assets/Editor/MultiplayerManagerEditor.cs b/Assets/Editor/MultiplayerManagerEditor.cs
diff --git a/Assets/Editor/MultiplayerManagerEditor.cs.meta b/Assets/Editor/MultiplayerManagerEditor.cs.meta
diff --git a/Assets/OculusMR/OculusMRController.cs b/Assets/OculusMR/OculusMRController.cs
@@ -57,19 +57,11 @@ public async void StartMRExperience(bool isHosting)
             {
                 await m_SpatialAnchorManager.CreateSpatialAnchor();
                 m_SpatialAnchorManager.SceneLocalizeToAnchor();
-                MultiplayerManager.m_Instance.JoinRoom(new RoomCreateData()
-                {
-                    roomName = "OculusMRRoom",
-                    maxPlayers = 12
-                });
+                MultiplayerManager.m_Instance.Connect();
             }
             else
             {
-                MultiplayerManager.m_Instance.JoinRoom(new RoomCreateData()
-                {
-                    roomName = "OculusMRRoom",
-                    maxPlayers = 12
-                });
+                MultiplayerManager.m_Instance.Connect();
             }
         }