non-vr lobby, version fix

2022-06-29 14:45:17 +03:00
parent 5774be9822
commit 04baadfad1
1774 changed files with 573069 additions and 1533 deletions
@@ -0,0 +1,14 @@
+{
+    "name": "PhotonVoice.PUN.Editor",
+    "references": [
+        "PhotonVoice.PUN",
+        "PhotonVoice.Editor",
+        "PhotonVoice",
+        "PhotonRealtime",
+        "PhotonUnityNetworking"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": []
+}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bc45562f375e105438d27eded7d73e12
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,73 @@
+using System;
+
+namespace Photon.Voice.PUN.Editor
+{
+    using Unity.Editor;
+    using UnityEditor;
+    using UnityEngine;
+    using Pun;
+
+    [CustomEditor(typeof(PhotonVoiceNetwork))]
+    public class PhotonVoiceNetworkEditor : VoiceConnectionEditor
+    {
+        private SerializedProperty autoConnectAndJoinSp;
+        private SerializedProperty autoLeaveAndDisconnectSp;
+        private SerializedProperty usePunAppSettingsSp;
+        private SerializedProperty usePunAuthValuesSp;
+        private SerializedProperty workInOfflineModeSp;
+
+        protected override void OnEnable()
+        {
+            base.OnEnable();
+            this.autoConnectAndJoinSp = this.serializedObject.FindProperty("AutoConnectAndJoin");
+            this.autoLeaveAndDisconnectSp = this.serializedObject.FindProperty("AutoLeaveAndDisconnect");
+            this.usePunAppSettingsSp = this.serializedObject.FindProperty("usePunAppSettings");
+            this.usePunAuthValuesSp = this.serializedObject.FindProperty("usePunAuthValues");
+            this.workInOfflineModeSp = this.serializedObject.FindProperty("WorkInOfflineMode");
+        }
+
+        protected override void DisplayAppSettings()
+        {
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.PropertyField(this.usePunAppSettingsSp, new GUIContent("Use PUN's App Settings", "Use App Settings From PUN's PhotonServerSettings"));
+            if (GUILayout.Button("PhotonServerSettings", EditorStyles.miniButton, GUILayout.Width(120)))
+            {
+                Selection.objects = new Object[] { PhotonNetwork.PhotonServerSettings };
+                EditorGUIUtility.PingObject(PhotonNetwork.PhotonServerSettings);
+            }
+            EditorGUILayout.EndHorizontal();
+            if (!this.usePunAppSettingsSp.boolValue)
+            {
+                base.DisplayAppSettings();
+            }
+            EditorGUILayout.PropertyField(this.usePunAuthValuesSp, new GUIContent("Use PUN's Auth Values", "Use the same Authentication Values From PUN client"));
+        }
+
+        protected override void ShowHeader()
+        {
+            base.ShowHeader();
+            EditorGUI.BeginChangeCheck();
+            EditorGUILayout.PropertyField(this.autoConnectAndJoinSp, new GUIContent("Auto Connect And Join", "Auto connect voice client and join a voice room when PUN client is joined to a PUN room"));
+            EditorGUILayout.PropertyField(this.autoLeaveAndDisconnectSp, new GUIContent("Auto Leave And Disconnect", "Auto disconnect voice client when PUN client is not joined to a PUN room"));
+            EditorGUILayout.PropertyField(this.workInOfflineModeSp, new GUIContent("Work In Offline Mode", "Whether or not Photon Voice client should follow PUN client if the latter is in offline mode."));
+            if (EditorGUI.EndChangeCheck())
+            {
+                this.serializedObject.ApplyModifiedProperties();
+            }
+        }
+
+        protected override void ShowAssetVersions()
+        {
+            base.ShowAssetVersions();
+            string version = this.GetVersionString(this.punChangelogVersion).TrimStart('v');
+            if (!PhotonNetwork.PunVersion.Equals(version, StringComparison.OrdinalIgnoreCase))
+            {
+                EditorGUILayout.LabelField(string.Format("PUN2, Inside Voice: {0} != Imported Separately: {1}", version, PhotonNetwork.PunVersion));
+            }
+            else
+            {
+                EditorGUILayout.LabelField(string.Format("PUN2: {0}", version));
+            }
+        }
+    }
+}
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: fa70a22b498b27f41a0bb50f9a287764
+timeCreated: 1537357720
+licenseType: Store
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: