Skip to content

Commit 6a15632

Browse files
committed
set version 2.6.5
1 parent 58f4c1a commit 6a15632

File tree

5 files changed

+17
-23
lines changed

5 files changed

+17
-23
lines changed

Assets/UnityWebSocket/Demo/DemoScene.unity

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
41+
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -54,15 +54,14 @@ LightmapSettings:
5454
m_EnableBakedLightmaps: 1
5555
m_EnableRealtimeLightmaps: 1
5656
m_LightmapEditorSettings:
57-
serializedVersion: 12
57+
serializedVersion: 10
5858
m_Resolution: 2
5959
m_BakeResolution: 40
6060
m_AtlasSize: 1024
6161
m_AO: 0
6262
m_AOMaxDistance: 1
6363
m_CompAOExponent: 1
6464
m_CompAOExponentDirect: 0
65-
m_ExtractAmbientOcclusion: 0
6665
m_Padding: 2
6766
m_LightmapParameters: {fileID: 0}
6867
m_LightmapsBakeMode: 1
@@ -77,26 +76,18 @@ LightmapSettings:
7776
m_PVRDirectSampleCount: 32
7877
m_PVRSampleCount: 500
7978
m_PVRBounces: 2
80-
m_PVREnvironmentSampleCount: 500
81-
m_PVREnvironmentReferencePointCount: 2048
82-
m_PVRFilteringMode: 2
83-
m_PVRDenoiserTypeDirect: 0
84-
m_PVRDenoiserTypeIndirect: 0
85-
m_PVRDenoiserTypeAO: 0
8679
m_PVRFilterTypeDirect: 0
8780
m_PVRFilterTypeIndirect: 0
8881
m_PVRFilterTypeAO: 0
89-
m_PVREnvironmentMIS: 0
82+
m_PVRFilteringMode: 2
9083
m_PVRCulling: 1
9184
m_PVRFilteringGaussRadiusDirect: 1
9285
m_PVRFilteringGaussRadiusIndirect: 5
9386
m_PVRFilteringGaussRadiusAO: 2
9487
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
9588
m_PVRFilteringAtrousPositionSigmaIndirect: 2
9689
m_PVRFilteringAtrousPositionSigmaAO: 1
97-
m_ExportTrainingData: 0
98-
m_TrainingDataDestination: TrainingData
99-
m_LightProbeSampleCountMultiplier: 4
90+
m_ShowResolutionOverlay: 1
10091
m_LightingDataAsset: {fileID: 0}
10192
m_UseShadowmask: 1
10293
--- !u!196 &4
@@ -165,8 +156,8 @@ MonoBehaviour:
165156
m_Name:
166157
m_EditorClassIdentifier:
167158
address: wss://echo.websocket.events
168-
sendText: Hello World!
169-
logMessage: 1
159+
subProtocols: soap|wamp
160+
sendText: Hello UnityWebSocket!
170161
--- !u!1 &902376145
171162
GameObject:
172163
m_ObjectHideFlags: 0
@@ -205,10 +196,9 @@ Camera:
205196
m_ClearFlags: 2
206197
m_BackGroundColor: {r: 0.3301887, g: 0.3301887, b: 0.3301887, a: 0}
207198
m_projectionMatrixMode: 1
208-
m_GateFitMode: 2
209-
m_FOVAxisMode: 0
210199
m_SensorSize: {x: 36, y: 24}
211200
m_LensShift: {x: 0, y: 0}
201+
m_GateFitMode: 2
212202
m_FocalLength: 50
213203
m_NormalizedViewPortRect:
214204
serializedVersion: 2

Assets/UnityWebSocket/Demo/UnityWebSocketDemo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using UnityEngine;
1+
using UnityEngine;
22

33
namespace UnityWebSocket.Demo
44
{
@@ -65,7 +65,7 @@ private void OnGUI()
6565
}
6666
GUILayout.EndHorizontal();
6767

68-
GUILayout.Label("Text: ");
68+
GUILayout.Label("Message: ");
6969
sendText = GUILayout.TextArea(sendText, GUILayout.MinHeight(50), width);
7070

7171
GUILayout.BeginHorizontal();
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace UnityWebSocket
1+
namespace UnityWebSocket
22
{
33
public static class Settings
44
{
@@ -7,6 +7,6 @@ public static class Settings
77
public const string QQ_GROUP_LINK = "https://qm.qq.com/cgi-bin/qm/qr?k=KcexYJ9aYwogFXbj2aN0XHH5b2G7ICmd";
88
public const string EMAIL = "[email protected]";
99
public const string AUHTOR = "psygames";
10-
public const string VERSION = "2.6.4";
10+
public const string VERSION = "2.6.5";
1111
}
1212
}

Assets/UnityWebSocket/Scripts/Runtime/Implementation/NoWebGL/WebSocket.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NET_LEGACY && (UNITY_EDITOR || !UNITY_WEBGL)
1+
#if !NET_LEGACY && (UNITY_EDITOR || !UNITY_WEBGL)
22
using System;
33
using System.Collections.Generic;
44
using System.Text;
@@ -81,6 +81,7 @@ public void ConnectAsync()
8181
foreach (var protocol in this.SubProtocols)
8282
{
8383
if (string.IsNullOrEmpty(protocol)) continue;
84+
Log($"Add Sub Protocol {protocol}");
8485
socket.Options.AddSubProtocol(protocol);
8586
}
8687
}

ProjectSettings/EditorBuildSettings.asset

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44
EditorBuildSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
7-
m_Scenes: []
7+
m_Scenes:
8+
- enabled: 1
9+
path: Assets/UnityWebSocket/Demo/DemoScene.unity
10+
guid: 65671216fb4e42d4f89ed6eeca36060d
811
m_configObjects: {}

0 commit comments

Comments
 (0)