set version 2.6.5

psygames · May 19, 2022 · 6a15632 · 6a15632
1 parent 58f4c1a
commit 6a15632
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 23 deletions.
diff --git a/Assets/UnityWebSocket/Demo/DemoScene.unity b/Assets/UnityWebSocket/Demo/DemoScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -54,15 +54,14 @@ LightmapSettings:
     m_EnableBakedLightmaps: 1
     m_EnableRealtimeLightmaps: 1
   m_LightmapEditorSettings:
-    serializedVersion: 12
+    serializedVersion: 10
     m_Resolution: 2
     m_BakeResolution: 40
     m_AtlasSize: 1024
     m_AO: 0
     m_AOMaxDistance: 1
     m_CompAOExponent: 1
     m_CompAOExponentDirect: 0
-    m_ExtractAmbientOcclusion: 0
     m_Padding: 2
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
@@ -77,26 +76,18 @@ LightmapSettings:
     m_PVRDirectSampleCount: 32
     m_PVRSampleCount: 500
     m_PVRBounces: 2
-    m_PVREnvironmentSampleCount: 500
-    m_PVREnvironmentReferencePointCount: 2048
-    m_PVRFilteringMode: 2
-    m_PVRDenoiserTypeDirect: 0
-    m_PVRDenoiserTypeIndirect: 0
-    m_PVRDenoiserTypeAO: 0
     m_PVRFilterTypeDirect: 0
     m_PVRFilterTypeIndirect: 0
     m_PVRFilterTypeAO: 0
-    m_PVREnvironmentMIS: 0
+    m_PVRFilteringMode: 2
     m_PVRCulling: 1
     m_PVRFilteringGaussRadiusDirect: 1
     m_PVRFilteringGaussRadiusIndirect: 5
     m_PVRFilteringGaussRadiusAO: 2
     m_PVRFilteringAtrousPositionSigmaDirect: 0.5
     m_PVRFilteringAtrousPositionSigmaIndirect: 2
     m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ExportTrainingData: 0
-    m_TrainingDataDestination: TrainingData
-    m_LightProbeSampleCountMultiplier: 4
+    m_ShowResolutionOverlay: 1
   m_LightingDataAsset: {fileID: 0}
   m_UseShadowmask: 1
 --- !u!196 &4
@@ -165,8 +156,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   address: wss://echo.websocket.events
-  sendText: Hello World!
-  logMessage: 1
+  subProtocols: soap|wamp
+  sendText: Hello UnityWebSocket!
 --- !u!1 &902376145
 GameObject:
   m_ObjectHideFlags: 0
@@ -205,10 +196,9 @@ Camera:
   m_ClearFlags: 2
   m_BackGroundColor: {r: 0.3301887, g: 0.3301887, b: 0.3301887, a: 0}
   m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
+  m_GateFitMode: 2
   m_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2

diff --git a/Assets/UnityWebSocket/Demo/UnityWebSocketDemo.cs b/Assets/UnityWebSocket/Demo/UnityWebSocketDemo.cs
@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 
 namespace UnityWebSocket.Demo
 {
@@ -65,7 +65,7 @@ private void OnGUI()
             }
             GUILayout.EndHorizontal();
 
-            GUILayout.Label("Text: ");
+            GUILayout.Label("Message: ");
             sendText = GUILayout.TextArea(sendText, GUILayout.MinHeight(50), width);
 
             GUILayout.BeginHorizontal();

diff --git a/Assets/UnityWebSocket/Scripts/Runtime/Core/Settings.cs b/Assets/UnityWebSocket/Scripts/Runtime/Core/Settings.cs
@@ -1,4 +1,4 @@
-namespace UnityWebSocket
+namespace UnityWebSocket
 {
     public static class Settings
     {
@@ -7,6 +7,6 @@ public static class Settings
         public const string QQ_GROUP_LINK = "https://qm.qq.com/cgi-bin/qm/qr?k=KcexYJ9aYwogFXbj2aN0XHH5b2G7ICmd";
         public const string EMAIL = "[email protected]";
         public const string AUHTOR = "psygames";
-        public const string VERSION = "2.6.4";
+        public const string VERSION = "2.6.5";
     }
 }
diff --git a/Assets/UnityWebSocket/Scripts/Runtime/Implementation/NoWebGL/WebSocket.cs b/Assets/UnityWebSocket/Scripts/Runtime/Implementation/NoWebGL/WebSocket.cs
@@ -1,4 +1,4 @@
-#if !NET_LEGACY && (UNITY_EDITOR || !UNITY_WEBGL)
+#if !NET_LEGACY && (UNITY_EDITOR || !UNITY_WEBGL)
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -81,6 +81,7 @@ public void ConnectAsync()
                 foreach (var protocol in this.SubProtocols)
                 {
                     if (string.IsNullOrEmpty(protocol)) continue;
+                    Log($"Add Sub Protocol {protocol}");
                     socket.Options.AddSubProtocol(protocol);
                 }
             }

diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
@@ -4,5 +4,8 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/UnityWebSocket/Demo/DemoScene.unity
+    guid: 65671216fb4e42d4f89ed6eeca36060d
   m_configObjects: {}