diff --git a/.gitignore b/.gitignore index f883553e1..a65105956 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ docs node_modules .config/.vitepress/dist .config/.vitepress/cache +Demo/API_V2/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset diff --git a/Demo/API_V2/Assets/API/APISO.asset b/Demo/API_V2/Assets/API/APISO.asset index 3384a191f..30bbaaddf 100644 --- a/Demo/API_V2/Assets/API/APISO.asset +++ b/Demo/API_V2/Assets/API/APISO.asset @@ -34,4 +34,5 @@ MonoBehaviour: - {fileID: 11400000, guid: 948907759756641618ba1b031955ec2b, type: 2} - {fileID: 11400000, guid: 14a1a853f10124ee2b276992e2d40448, type: 2} - {fileID: 11400000, guid: 1aa518b2f8ca04c6e81821bcb9a3cc49, type: 2} + - {fileID: 11400000, guid: 89339dab17a614cbf8abc8469d67cb72, type: 2} - {fileID: 11400000, guid: 27654a238f98e4f7e8756e4caed418e1, type: 2} diff --git a/Demo/API_V2/Assets/API/Network/NetworkSO.asset b/Demo/API_V2/Assets/API/Network/NetworkSO.asset index 8a32de9d4..39a3e24ba 100644 --- a/Demo/API_V2/Assets/API/Network/NetworkSO.asset +++ b/Demo/API_V2/Assets/API/Network/NetworkSO.asset @@ -18,4 +18,5 @@ MonoBehaviour: - {fileID: 11400000, guid: 8fb54c5918d454eea90d5147f2c316ea, type: 2} - {fileID: 11400000, guid: 1e0539509d074443f92d17035efbe40f, type: 2} - {fileID: 11400000, guid: cdc97aef7249c4216ac09d2321ce8e83, type: 2} + - {fileID: 11400000, guid: 529e27dae48c91748a3fc5f65603e605, type: 2} - {fileID: 11400000, guid: 8bae636d6ff994bbfba56ae723a63862, type: 2} diff --git a/Demo/API_V2/Assets/API/Network/TCPSocket/TCPSocket.cs b/Demo/API_V2/Assets/API/Network/TCPSocket/TCPSocket.cs index 5fe556eca..edb568f59 100644 --- a/Demo/API_V2/Assets/API/Network/TCPSocket/TCPSocket.cs +++ b/Demo/API_V2/Assets/API/Network/TCPSocket/TCPSocket.cs @@ -3,9 +3,11 @@ using LitJson; using UnityEngine; using WeChatWASM; + public class TCPSocket : Details { private WXTCPSocket _tcpSocket; + private bool _connected = false; // 数据 @@ -18,10 +20,9 @@ public class TCPSocket : Details private byte[] _bufferData3 = new byte[8]; private void Start() { - GameManager.Instance.detailsController.BindExtraButtonAction(0, connect); + GameManager.Instance.detailsController.BindExtraButtonAction(0, connect); GameManager.Instance.detailsController.BindExtraButtonAction(1, write); - GameManager.Instance.detailsController.BindExtraButtonAction(2, writeBuffer); - GameManager.Instance.detailsController.BindExtraButtonAction(3, close); + GameManager.Instance.detailsController.BindExtraButtonAction(2, close); } // 测试 API @@ -30,6 +31,7 @@ protected override void TestAPI(string[] args) if(_tcpSocket == null) { _tcpSocket = WX.CreateTCPSocket(); + Debug.Log("tcpSocket: " + JsonUtility.ToJson(_tcpSocket)); _tcpSocket.OnMessage((res) => { @@ -49,7 +51,7 @@ protected override void TestAPI(string[] args) }); } else { - Debug.Log("tcp实例已初始化"); + Debug.LogError("tcp实例已初始化"); } } @@ -58,12 +60,12 @@ private void close() { if(_tcpSocket != null && _connected) { - Debug.Log("close test start"); _tcpSocket.Close(); _connected = false; + _tcpSocket = null; } else { - Debug.Log("关闭失败:tcp实例未初始化或未连接"); + Debug.LogError("关闭失败:tcp实例未初始化或未连接"); } } @@ -71,7 +73,6 @@ private void close() private void connect() { if (_tcpSocket != null && !_connected) { - Debug.Log("connect test start"); _tcpSocket.Connect(new TCPSocketConnectOption() { address = "www.oooceanworld.com", @@ -80,39 +81,32 @@ private void connect() { _connected = true; } else { - Debug.Log("连接失败:tcp实例未初始化或已连接"); + Debug.LogError("连接失败:tcp实例未初始化或已连接"); } } private void write() { if (_tcpSocket != null && _connected) { - Debug.Log("write string test start:"); - Debug.Log("test 1: " + _stringData1); - _tcpSocket.Write(_stringData1); - Debug.Log("test 2: " + _stringData2); - _tcpSocket.Write(_stringData2); + if (options[0] == "String") + { + Debug.Log("test 1: " + _stringData1); + _tcpSocket.Write(_stringData1); + Debug.Log("test 2: " + _stringData2); + _tcpSocket.Write(_stringData2); + } + else + { + Debug.Log("test 1: " + _bufferData1); + _tcpSocket.Write(_bufferData1); + Debug.Log("test 2: " + _bufferData2); + _tcpSocket.Write(_bufferData2); + Debug.Log("test 3: " + _bufferData3); + _tcpSocket.Write(_bufferData3); + } } else { - Debug.Log("发送失败:tcp实例未初始化或未连接"); - } - - } - - private void writeBuffer() { - if (_tcpSocket != null && _connected) - { - Debug.Log("write buffer test start:"); - Debug.Log("test 1: " + _bufferData1); - _tcpSocket.Write(_bufferData1); - Debug.Log("test 2: " + _bufferData2); - _tcpSocket.Write(_bufferData2); - Debug.Log("test 3: " + _bufferData3); - _tcpSocket.Write(_bufferData3); - } - else - { - Debug.Log("发送失败:tcp实例未初始化或未连接"); + Debug.LogError("发送失败:tcp实例未初始化或未连接"); } } } diff --git a/Demo/API_V2/Assets/API/Network/TCPSocket/TCPSocketSO.asset b/Demo/API_V2/Assets/API/Network/TCPSocket/TCPSocketSO.asset index b81d7082f..be32c26da 100644 --- a/Demo/API_V2/Assets/API/Network/TCPSocket/TCPSocketSO.asset +++ b/Demo/API_V2/Assets/API/Network/TCPSocket/TCPSocketSO.asset @@ -15,12 +15,15 @@ MonoBehaviour: entryScriptTypeName: TCPSocket entryName: "TCP\u901A\u4FE1" entryAPI: "TCP \u901A\u4FE1\u76F8\u5173api" - entryDescription: "\u9700\u8981\u586B\u5165ip\u548Cport" - optionList: [] + entryDescription: "\u9700\u8981\u5148\u521B\u5EFA\u5B9E\u4F8B\u5E76\u5EFA\u7ACB\u8FDE\u63A5\u624D\u80FD\u53D1\u9001\u4FE1\u606F" + optionList: + - optionName: "\u53D1\u9001\u4FE1\u606F\u7C7B\u578B" + availableOptions: + - String + - Buffer initialButtonText: "\u521B\u5EFAtcp\u5B9E\u4F8B" extraButtonList: - buttonText: "\u8FDE\u63A5" - - buttonText: "\u53D1\u9001String" - - buttonText: "\u53D1\u9001Buffer" + - buttonText: "\u53D1\u9001" - buttonText: "\u5173\u95ED" initialResultList: [] diff --git a/Demo/API_V2/Assets/API/Network/UDPSocket/UDPSocket.cs b/Demo/API_V2/Assets/API/Network/UDPSocket/UDPSocket.cs index f128ab87e..230feb816 100644 --- a/Demo/API_V2/Assets/API/Network/UDPSocket/UDPSocket.cs +++ b/Demo/API_V2/Assets/API/Network/UDPSocket/UDPSocket.cs @@ -6,46 +6,130 @@ public class UDPSocket : Details { private WXUDPSocket _udpSocket; + private bool _connected = false; + + // 数据 + private string _stringData = "hello, how are you"; + private byte[] _bufferData = { 66, 117, 102, 102, 101, 114, 32, 68, 97, 116, 97, 32 }; private void Start() { GameManager.Instance.detailsController.BindExtraButtonAction(0, connect); - GameManager.Instance.detailsController.BindExtraButtonAction(1, close); + GameManager.Instance.detailsController.BindExtraButtonAction(1, write); + GameManager.Instance.detailsController.BindExtraButtonAction(2, send); + GameManager.Instance.detailsController.BindExtraButtonAction(3, close); } // 测试 API protected override void TestAPI(string[] args) { - _udpSocket = WX.CreateUDPSocket(); - var port = _udpSocket.Bind(); + if(_udpSocket == null) + { + _udpSocket = WX.CreateUDPSocket(); + var port = _udpSocket.Bind(); - Debug.Log("udpSocket: " + JsonUtility.ToJson(_udpSocket)); + Debug.Log("udpSocket: " + JsonUtility.ToJson(_udpSocket)); - _udpSocket.OnListening((res) => { - Debug.Log("onListening: " + JsonUtility.ToJson(res)); - }); + _udpSocket.OnListening((res) => { + Debug.Log("onListening: " + JsonUtility.ToJson(res)); + }); - _udpSocket.OnError((res) => { - Debug.Log("onError: " + JsonUtility.ToJson(res)); - }); + _udpSocket.OnError((res) => { + Debug.Log("onError: " + JsonUtility.ToJson(res)); + }); - _udpSocket.OnClose((res) => { - Debug.Log("onClose: " + JsonUtility.ToJson(res)); - }); + _udpSocket.OnClose((res) => { + Debug.Log("onClose: " + JsonUtility.ToJson(res)); + }); - _udpSocket.OnMessage((res) => { - Debug.Log("onMessage: " + JsonUtility.ToJson(res)); - }); + _udpSocket.OnMessage((res) => { + Debug.Log("onMessage: " + JsonUtility.ToJson(res)); + }); + } + else + { + Debug.LogError("udp实例已初始化"); + } } private void connect() { - _udpSocket.Connect(new UDPSocketConnectOption() { - address = "192.168.193.2", - port = 8848 - }); + if (_udpSocket != null && !_connected) + { + _udpSocket.Connect(new UDPSocketConnectOption() + { + address = "www.oooceanworld.com", + port = 8101 + }); + _connected = true; + } else + { + Debug.LogError("连接失败:udp实例未初始化或已连接"); + } + } + + private void write() + { + if (_udpSocket != null && _connected) + { + Debug.LogError("接口有bug暂未修复 当前为placeholder"); + /* + UDPSocketWriteOption option = new UDPSocketWriteOption() + { + address = "www.oooceanworld.com", + port = 8101 + }; + if (options[0] == "String") + { + option.message = _stringData; + } + else + { + option.message = _bufferData; + } + _udpSocket.Write(option); + */ + } + else + { + Debug.LogError("write失败:udp实例未初始化或未连接"); + } + } + + private void send() + { + if (_udpSocket != null) + { + UDPSocketSendOption option = new UDPSocketSendOption() + { + address = "www.oooceanworld.com", + port = 8101 + }; + if (options[0] == "String") + { + option.message = _stringData; + } + else + { + option.message = _bufferData; + } + _udpSocket.Send(option); + Debug.Log("Message: " + option.message); + } + else + { + Debug.LogError("send失败:udp实例未初始化"); + } } private void close() { - _udpSocket.Close(); + if (_udpSocket != null && _connected) + { + _udpSocket.Close(); + _connected = false; + _udpSocket = null; + } else + { + Debug.LogError("关闭失败:udp实例未初始化或未连接"); + } } } diff --git a/Demo/API_V2/Assets/API/Network/UDPSocket/UDPSocketSO.asset b/Demo/API_V2/Assets/API/Network/UDPSocket/UDPSocketSO.asset index 150b2f3cf..6eaae1c26 100644 --- a/Demo/API_V2/Assets/API/Network/UDPSocket/UDPSocketSO.asset +++ b/Demo/API_V2/Assets/API/Network/UDPSocket/UDPSocketSO.asset @@ -15,10 +15,18 @@ MonoBehaviour: entryScriptTypeName: UDPSocket entryName: "UDP\u901A\u4FE1" entryAPI: "UDP \u901A\u4FE1\u76F8\u5173api" - entryDescription: "\u9700\u8981\u586B\u5165ip\u548Cport" - optionList: [] + entryDescription: "write\u7528\u6CD5\u4E0E send \u65B9\u6CD5\u76F8\u540C\uFF0C\u5982\u679C\u6CA1\u6709\u9884\u5148\u8C03\u7528 + connect \u5219\u4E0E send \u65E0\u5DEE\u5F02\uFF08\u6CE8\u610F\u5373\u4F7F\u8C03\u7528\u4E86 + connect \u4E5F\u9700\u8981\u5728\u672C\u63A5\u53E3\u586B\u5165\u5730\u5740\u548C\u7AEF\u53E3\u53C2\u6570\uFF09" + optionList: + - optionName: "\u53D1\u9001\u4FE1\u606F\u7C7B\u578B" + availableOptions: + - String + - Buffer initialButtonText: "\u521B\u5EFAudp\u5B9E\u4F8B" extraButtonList: - buttonText: "\u8FDE\u63A5" + - buttonText: Write + - buttonText: Send - buttonText: "\u5173\u95ED" initialResultList: [] diff --git a/Demo/API_V2/Assets/API/Network/UnityWebRequest.meta b/Demo/API_V2/Assets/API/Network/UnityWebRequest.meta new file mode 100644 index 000000000..43278e724 --- /dev/null +++ b/Demo/API_V2/Assets/API/Network/UnityWebRequest.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f2dcc1d5d8882f4b949e65e8274019b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/API_V2/Assets/API/Network/UnityWebRequest/WebRequest SO.asset b/Demo/API_V2/Assets/API/Network/UnityWebRequest/WebRequest SO.asset new file mode 100644 index 000000000..647121fca --- /dev/null +++ b/Demo/API_V2/Assets/API/Network/UnityWebRequest/WebRequest SO.asset @@ -0,0 +1,24 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3} + m_Name: WebRequest SO + m_EditorClassIdentifier: + entryScriptTypeName: WebRequest + entryName: "HTTP \u901A\u4FE1" + entryAPI: UnityWebRequest + entryDescription: + optionList: [] + initialButtonText: Put + extraButtonList: + - buttonText: Post + - buttonText: Get + initialResultList: [] diff --git a/Demo/API_V2/Assets/API/Network/UnityWebRequest/WebRequest SO.asset.meta b/Demo/API_V2/Assets/API/Network/UnityWebRequest/WebRequest SO.asset.meta new file mode 100644 index 000000000..35c44f05c --- /dev/null +++ b/Demo/API_V2/Assets/API/Network/UnityWebRequest/WebRequest SO.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 529e27dae48c91748a3fc5f65603e605 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/API_V2/Assets/API/Network/UnityWebRequest/WebRequest.cs b/Demo/API_V2/Assets/API/Network/UnityWebRequest/WebRequest.cs new file mode 100644 index 000000000..8a867f002 --- /dev/null +++ b/Demo/API_V2/Assets/API/Network/UnityWebRequest/WebRequest.cs @@ -0,0 +1,89 @@ +using System; +using System.Collections.Generic; +using LitJson; +using UnityEngine; +using UnityEngine.Networking; +using System.Collections; +using WeChatWASM; + +public class WebRequest : Details +{ + // Start is called before the first frame update + void Start() + { + GameManager.Instance.detailsController.BindExtraButtonAction(0, testPost); + GameManager.Instance.detailsController.BindExtraButtonAction(1, testGet); + } + + // 测试API + protected override void TestAPI(string[] args) + { + testPut(); + } + + private void testGet() + { + StartCoroutine(Get()); + } + + private void testPost() + { + StartCoroutine(Post()); + } + + private void testPut() + { + StartCoroutine(Put()); + } + + IEnumerator Get() + { + UnityWebRequest webRequest = UnityWebRequest.Get("https://postman-echo.com/get"); + + yield return webRequest.SendWebRequest(); + + if (webRequest.isHttpError || webRequest.isNetworkError) + Debug.Log(webRequest.error); + else + { + Debug.Log("get complete: " + webRequest.downloadHandler.text); + } + + } + + IEnumerator Post() + { + WWWForm form = new WWWForm(); + //键值对 + form.AddField("key", "value"); + form.AddField("name", "mafanwei"); + form.AddField("blog", "qwe25878"); + + UnityWebRequest webRequest = UnityWebRequest.Post("https://postman-echo.com/post", form); + + yield return webRequest.SendWebRequest(); + + if (webRequest.isHttpError || webRequest.isNetworkError) + Debug.Log(webRequest.error); + else + { + Debug.Log("post complete: " + webRequest.downloadHandler.text); + } + } + + IEnumerator Put() + { + byte[] myData = System.Text.Encoding.UTF8.GetBytes("This is some test data"); + UnityWebRequest www = UnityWebRequest.Put("https://postman-echo.com/put", myData); + yield return www.SendWebRequest(); + + if (www.result != UnityWebRequest.Result.Success) + { + Debug.Log(www.error); + } + else + { + Debug.Log("Put complete: " + www.downloadHandler.text); + } + } +} diff --git a/Demo/API_V2/Assets/API/Network/UnityWebRequest/WebRequest.cs.meta b/Demo/API_V2/Assets/API/Network/UnityWebRequest/WebRequest.cs.meta new file mode 100644 index 000000000..609b101af --- /dev/null +++ b/Demo/API_V2/Assets/API/Network/UnityWebRequest/WebRequest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 74461f57c4198054ca844a14ca61c9a5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/API_V2/Assets/API/Network/UnityWebSocket.meta b/Demo/API_V2/Assets/API/UnityWebSocket.meta similarity index 100% rename from Demo/API_V2/Assets/API/Network/UnityWebSocket.meta rename to Demo/API_V2/Assets/API/UnityWebSocket.meta diff --git a/Demo/API_V2/Assets/API/Network/UnityWebSocket/UnityWebSocket.cs b/Demo/API_V2/Assets/API/UnityWebSocket/UnityWebSocket.cs similarity index 100% rename from Demo/API_V2/Assets/API/Network/UnityWebSocket/UnityWebSocket.cs rename to Demo/API_V2/Assets/API/UnityWebSocket/UnityWebSocket.cs diff --git a/Demo/API_V2/Assets/API/Network/UnityWebSocket/UnityWebSocket.cs.meta b/Demo/API_V2/Assets/API/UnityWebSocket/UnityWebSocket.cs.meta similarity index 100% rename from Demo/API_V2/Assets/API/Network/UnityWebSocket/UnityWebSocket.cs.meta rename to Demo/API_V2/Assets/API/UnityWebSocket/UnityWebSocket.cs.meta diff --git a/Demo/API_V2/Assets/API/Network/UnityWebSocket/WebSocketSO.asset b/Demo/API_V2/Assets/API/UnityWebSocket/UnityWebSocketSO.asset similarity index 94% rename from Demo/API_V2/Assets/API/Network/UnityWebSocket/WebSocketSO.asset rename to Demo/API_V2/Assets/API/UnityWebSocket/UnityWebSocketSO.asset index 22391a606..033fec28f 100644 --- a/Demo/API_V2/Assets/API/Network/UnityWebSocket/WebSocketSO.asset +++ b/Demo/API_V2/Assets/API/UnityWebSocket/UnityWebSocketSO.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 77d040911b51640ea8a6e857528c3a0d, type: 3} - m_Name: WebSocketSO + m_Name: UnityWebSocketSO m_EditorClassIdentifier: abilityName: WebSocket abilitySprite: {fileID: 0} diff --git a/Demo/API_V2/Assets/API/Network/UnityWebSocket/WebSocketSO.asset.meta b/Demo/API_V2/Assets/API/UnityWebSocket/UnityWebSocketSO.asset.meta similarity index 100% rename from Demo/API_V2/Assets/API/Network/UnityWebSocket/WebSocketSO.asset.meta rename to Demo/API_V2/Assets/API/UnityWebSocket/UnityWebSocketSO.asset.meta diff --git a/Demo/API_V2/Assets/Scenes/PlayerPrefsScene.unity b/Demo/API_V2/Assets/Scenes/PlayerPrefsScene.unity index ab27e0754..f90aa417b 100644 --- a/Demo/API_V2/Assets/Scenes/PlayerPrefsScene.unity +++ b/Demo/API_V2/Assets/Scenes/PlayerPrefsScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311932, g: 0.38073996, b: 0.3587271, a: 1} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -105,7 +105,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +118,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -165,7 +165,6 @@ RectTransform: - {fileID: 1762191145} - {fileID: 1553820868} m_Father: {fileID: 1377911773} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -254,7 +253,6 @@ RectTransform: - {fileID: 505356602} - {fileID: 2055780001} m_Father: {fileID: 287533383} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -353,7 +351,6 @@ RectTransform: m_Children: - {fileID: 1377911773} m_Father: {fileID: 287533383} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -480,7 +477,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 19015508} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -577,7 +573,6 @@ RectTransform: - {fileID: 34478918} - {fileID: 88306112} m_Father: {fileID: 1396553310} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -642,12 +637,11 @@ RectTransform: m_Children: - {fileID: 548615013} m_Father: {fileID: 19015508} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 539.86505, y: -178} - m_SizeDelta: {x: 1020, y: 160} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &309197567 MonoBehaviour: @@ -687,7 +681,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 1 + m_IgnoreLayout: 0 m_MinWidth: -1 m_MinHeight: 160 m_PreferredWidth: -1 @@ -727,7 +721,6 @@ RectTransform: - {fileID: 1400629637} - {fileID: 1668469603} m_Father: {fileID: 19015508} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -786,7 +779,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 19015508} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -883,7 +875,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 34478918} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -977,7 +968,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 309197566} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1089,7 +1079,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 19015508} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1262,19 +1251,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 587693936} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 113.82237, y: 444.7848, z: -0.5173562} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &763119797 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1762191145} m_Modifications: - target: {fileID: 8396944020726690284, guid: c913bcba93a277649acf924959bfbce8, @@ -1423,6 +1413,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c913bcba93a277649acf924959bfbce8, type: 3} --- !u!224 &763119798 stripped RectTransform: @@ -1461,7 +1454,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2055780001} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1537,7 +1529,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1396553310} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1622,9 +1613,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1658,13 +1657,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1159140099} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1242671060 GameObject: @@ -1698,7 +1697,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 19015508} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1796,7 +1794,6 @@ RectTransform: m_Children: - {fileID: 19015508} m_Father: {fileID: 88306112} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1945,6 +1942,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1963,7 +1961,6 @@ RectTransform: - {fileID: 980365817} - {fileID: 287533383} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2002,7 +1999,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 321225463} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2123,13 +2119,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1448331931} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1553820867 GameObject: @@ -2162,7 +2158,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 19015508} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2246,7 +2241,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 321225463} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2323,7 +2317,6 @@ RectTransform: m_Children: - {fileID: 763119798} m_Father: {fileID: 19015508} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2408,7 +2401,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 19015508} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2507,7 +2499,6 @@ RectTransform: m_Children: - {fileID: 796889229} m_Father: {fileID: 34478918} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -2608,3 +2599,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2055780000} m_CullTransparentMesh: 0 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1159140102} + - {fileID: 587693938} + - {fileID: 1396553310} + - {fileID: 1448331934} diff --git a/Demo/API_V2/Assets/Scenes/WebSocketScene.unity b/Demo/API_V2/Assets/Scenes/UnityWebSocketScene.unity similarity index 100% rename from Demo/API_V2/Assets/Scenes/WebSocketScene.unity rename to Demo/API_V2/Assets/Scenes/UnityWebSocketScene.unity diff --git a/Demo/API_V2/Assets/Scenes/WebSocketScene.unity.meta b/Demo/API_V2/Assets/Scenes/UnityWebSocketScene.unity.meta similarity index 100% rename from Demo/API_V2/Assets/Scenes/WebSocketScene.unity.meta rename to Demo/API_V2/Assets/Scenes/UnityWebSocketScene.unity.meta diff --git a/Demo/API_V2/Assets/Scenes/WebSocketSceneSettings.lighting b/Demo/API_V2/Assets/Scenes/UnityWebSocketSceneSettings.lighting similarity index 97% rename from Demo/API_V2/Assets/Scenes/WebSocketSceneSettings.lighting rename to Demo/API_V2/Assets/Scenes/UnityWebSocketSceneSettings.lighting index 064f44db4..32730a8de 100644 --- a/Demo/API_V2/Assets/Scenes/WebSocketSceneSettings.lighting +++ b/Demo/API_V2/Assets/Scenes/UnityWebSocketSceneSettings.lighting @@ -6,7 +6,7 @@ LightingSettings: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: WebSocketSceneSettings + m_Name: UnityWebSocketSceneSettings serializedVersion: 4 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 diff --git a/Demo/API_V2/Assets/Scenes/WebSocketSceneSettings.lighting.meta b/Demo/API_V2/Assets/Scenes/UnityWebSocketSceneSettings.lighting.meta similarity index 100% rename from Demo/API_V2/Assets/Scenes/WebSocketSceneSettings.lighting.meta rename to Demo/API_V2/Assets/Scenes/UnityWebSocketSceneSettings.lighting.meta diff --git a/Demo/API_V2/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset b/Demo/API_V2/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset index d5dd41244..e1005bc74 100644 --- a/Demo/API_V2/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset +++ b/Demo/API_V2/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset @@ -13,13 +13,13 @@ MonoBehaviour: m_Name: MiniGameConfig m_EditorClassIdentifier: ProjectConf: - projectName: GameClubDemo + projectName: NetworkDemo Appid: wxb7d4485dbc1233ca - CDN: - assetLoadType: 1 + CDN: http://127.0.0.1:8080 + assetLoadType: 0 compressDataPackage: 0 VideoUrl: - DST: C:/Users/xiaoyuejin/Desktop/finaltest + DST: C:/Users/xiaoyuejin/Desktop/Network StreamCDN: bundleHashLength: 32 bundlePathIdentifier: StreamingAssets;