From bb34625ceb3ab9a8a185328b0cdfc248ef858924 Mon Sep 17 00:00:00 2001 From: M1Pro Date: Wed, 3 Apr 2024 19:42:18 +0800 Subject: [PATCH] Auto-publish WXSDK. --- CHANGELOG.md | 7 +++++++ Editor/WXPluginVersion.cs | 2 +- Editor/wx-editor.dll | Bin 203776 -> 203776 bytes Runtime/Plugins/wx-runtime-editor.dll | Bin 273920 -> 273920 bytes Runtime/Plugins/wx-runtime.dll | Bin 274944 -> 274944 bytes Runtime/wechat-default/unity-namespace.js | 12 ++++++++++++ .../unity-sdk/TCPSocket/index.js | 4 ++-- .../unity-sdk/UDPSocket/index.js | 4 ++-- Runtime/wechat-default/unity-sdk/utils.js | 2 +- package.json | 2 +- 10 files changed, 26 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f00cc36..5c23daaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ Removed - 删除功能/接口 Fixed - 修复问题 Others - 其他 --> +## 2024-3-28 【重要更新】 +包含重要bugfix、特性支持 +### Feature +### Fixed +* 重要：修复UDP接口处理buffer +* 重要：修复unity-namespace.js部分环境变量丢失问题 + ## 2024-3-28 【普通更新】 * 普通：优化对团结版的导出支持 ### Fixed diff --git a/Editor/WXPluginVersion.cs b/Editor/WXPluginVersion.cs index 76f239b8..0f4029f5 100644 --- a/Editor/WXPluginVersion.cs +++ b/Editor/WXPluginVersion.cs @@ -2,7 +2,7 @@ { public class WXPluginVersion { - public static string pluginVersion = "202403291954"; // 这一行不要改他，导出的时候会自动替换 + public static string pluginVersion = "202404031940"; // 这一行不要改他，导出的时候会自动替换 } public class WXPluginConf diff --git a/Editor/wx-editor.dll b/Editor/wx-editor.dll index 1637f97226505f3744621363361b6a4f87782f9c..ef62da01d54eb7d18e97fba28f13b90c819b5e52 100644 GIT binary patch delta 4119 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 ZJwDL>%x{Ng*~6mr*zWBPXPFNq006SDXU6~l delta 367 zcmZp;BhYY1U_uA8_Zqgw?$&O`t=&xeY{G^NKYh3u3<7v%*cdYMmKC!x%$|OhjcGIc zexL*!L;3V}b|zV2e})UJYz)`LK|)&tL8@Y>Z)ayRWmKE~mYpe>v39y62a_ga%Jysy zrt?g)Rt&*RtPIN-zB4j12r#sPc`F%ygLx~qhjTMAOY<`_Bu`^ysNvYjAV^k znX2MuYVKrcX=0@7WMpiqYvO9)tZQLmXs+vMW^U+WXl!I;W@$P7T G1I%Co@)gbi diff --git a/Runtime/wechat-default/unity-namespace.js b/Runtime/wechat-default/unity-namespace.js index 55ecc614..705dcfd8 100644 --- a/Runtime/wechat-default/unity-namespace.js +++ b/Runtime/wechat-default/unity-namespace.js @@ -127,6 +127,18 @@ function bindGloblException() { // 上报初始信息 function printSystemInfo(systemInfo) { GameGlobal.systemInfoCached = systemInfo; + const { version, SDKVersion, platform, renderer, system } = systemInfo; + unityNamespace.version = version; + unityNamespace.SDKVersion = SDKVersion; + unityNamespace.platform = platform; + unityNamespace.renderer = renderer; + unityNamespace.system = system; + unityNamespace.isPc = platform === 'windows' || platform === 'mac'; + unityNamespace.isDevtools = platform === 'devtools'; + unityNamespace.isMobile = !unityNamespace.isPc && !unityNamespace.isDevtools; + unityNamespace.isH5Renderer = unityNamespace.isMobile && unityNamespace.renderer === 'h5'; + unityNamespace.isIOS = platform === 'ios'; + unityNamespace.isAndroid = platform === 'android'; const bootinfo = { renderer: systemInfo.renderer || '', isH5Plus: GameGlobal.isIOSHighPerformanceModePlus || false, diff --git a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js index baaab2ed..47c41f47 100644 --- a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js +++ b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js @@ -141,12 +141,12 @@ function WX_TCPSocketOnMessage(id, needInfo) { if (needInfo) { const localInfoPtr = convertInfoToPointer(res.localInfo); const remoteInfoPtr = convertInfoToPointer(res.remoteInfo); - GameGlobal.Module.dynCall_viiiii(wxTCPSocketOnMessageCallback, idPtr, messagePtr, res.message.byteLength, localInfoPtr, remoteInfoPtr); + GameGlobal.Module.dynCall_viiiii(wxTCPSocketOnMessageCallback, idPtr, messagePtr, res.message.length || res.message.byteLength, localInfoPtr, remoteInfoPtr); GameGlobal.Module._free(localInfoPtr); GameGlobal.Module._free(remoteInfoPtr); } else { - GameGlobal.Module.dynCall_viiiii(wxTCPSocketOnMessageCallback, idPtr, messagePtr, res.message.byteLength, 0, 0); + GameGlobal.Module.dynCall_viiiii(wxTCPSocketOnMessageCallback, idPtr, messagePtr, res.message.length || res.message.byteLength, 0, 0); } GameGlobal.Module._free(idPtr); GameGlobal.Module._free(messagePtr); diff --git a/Runtime/wechat-default/unity-sdk/UDPSocket/index.js b/Runtime/wechat-default/unity-sdk/UDPSocket/index.js index 7d9e01e1..a0955f1a 100644 --- a/Runtime/wechat-default/unity-sdk/UDPSocket/index.js +++ b/Runtime/wechat-default/unity-sdk/UDPSocket/index.js @@ -102,12 +102,12 @@ function WX_UDPSocketOnMessage(id, needInfo) { if (needInfo) { const localInfoPtr = convertInfoToPointer(res.localInfo); const remoteInfoPtr = convertInfoToPointer(res.remoteInfo); - GameGlobal.Module.dynCall_viiiii(wxUDPSocketOnMessageCallback, idPtr, messagePtr, res.message.byteLength, localInfoPtr, remoteInfoPtr); + GameGlobal.Module.dynCall_viiiii(wxUDPSocketOnMessageCallback, idPtr, messagePtr, res.message.length || res.message.byteLength, localInfoPtr, remoteInfoPtr); GameGlobal.Module._free(localInfoPtr); GameGlobal.Module._free(remoteInfoPtr); } else { - GameGlobal.Module.dynCall_viiiii(wxUDPSocketOnMessageCallback, idPtr, messagePtr, res.message.byteLength, 0, 0); + GameGlobal.Module.dynCall_viiiii(wxUDPSocketOnMessageCallback, idPtr, messagePtr, res.message.length || res.message.byteLength, 0, 0); } GameGlobal.Module._free(idPtr); GameGlobal.Module._free(messagePtr); diff --git a/Runtime/wechat-default/unity-sdk/utils.js b/Runtime/wechat-default/unity-sdk/utils.js index d02cb474..b4754512 100644 --- a/Runtime/wechat-default/unity-sdk/utils.js +++ b/Runtime/wechat-default/unity-sdk/utils.js @@ -294,7 +294,7 @@ export function convertDataToPointer(data) { if (typeof data === 'string') { return convertStringToPointer(data); } - if (data instanceof ArrayBuffer) { + if (data instanceof ArrayBuffer || typeof data === 'object') { return convertArrayBufferToPointer(data); } return 0; diff --git a/package.json b/package.json index f74afeba..0a2a6c39 100644 --- a/package.json +++ b/package.json @@ -1 +1 @@ -{"name":"com.qq.weixin.minigame","displayName":"WXSDK","description":"WeChat Mini Game Tuanjie Engine Adapter SDK Package.","version":"0.1.6","unity":"2019.4","unityRelease":"29f1","keywords":["Tuanjie","WX"],"dependencies":{}} +{"name":"com.qq.weixin.minigame","displayName":"WXSDK","description":"WeChat Mini Game Tuanjie Engine Adapter SDK Package.","version":"0.1.7","unity":"2019.4","unityRelease":"29f1","keywords":["Tuanjie","WX"],"dependencies":{}}