diff --git a/CHANGELOG.md b/CHANGELOG.md index 21a314787..eda644193 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ Removed - 删除功能/接口 Fixed - 修复问题 Others - 其他 --> +## v0.1.26 【预发布】 +### Feature +* 普通:增加禁止多点触控的配置 +### Fixed +* 普通:修复IOS长音频获取数据延迟的bug +* 普通:性能分析工具,修复callstack中的堆栈悬空丢失的问题 + ## v0.1.25 【普通更新】 ### Feature * 普通:性能深入分析工具,支持Lua capture能力 diff --git a/Editor/WXConvertCore.cs b/Editor/WXConvertCore.cs index 044185dba..9318ad121 100644 --- a/Editor/WXConvertCore.cs +++ b/Editor/WXConvertCore.cs @@ -801,8 +801,7 @@ namespace WeChatWASM PlayerSettings.WeixinMiniGame.emscriptenArgs = string.Empty; if (WXExtEnvDef.GETDEF("UNITY_2021_2_OR_NEWER")) { - // PlayerSettings.WeixinMiniGame.emscriptenArgs += " -s EXPORTED_FUNCTIONS=_main,_sbrk,_emscripten_stack_get_base,_emscripten_stack_get_end"; - PlayerSettings.WeixinMiniGame.emscriptenArgs += " -s EXPORTED_FUNCTIONS=_sbrk,_emscripten_stack_get_base,_emscripten_stack_get_end -s ERROR_ON_UNDEFINED_SYMBOLS=0"; + PlayerSettings.WeixinMiniGame.emscriptenArgs += " -s EXPORTED_FUNCTIONS=_main,_sbrk,_emscripten_stack_get_base,_emscripten_stack_get_end -s ERROR_ON_UNDEFINED_SYMBOLS=0"; } #else @@ -810,7 +809,7 @@ namespace WeChatWASM if (WXExtEnvDef.GETDEF("UNITY_2021_2_OR_NEWER")) { PlayerSettings.WebGL.emscriptenArgs += " -s EXPORTED_FUNCTIONS=_sbrk,_emscripten_stack_get_base,_emscripten_stack_get_end"; -#if UNITY_2021_2_5 || UNITY_6000_0_OR_NEWER +#if UNITY_2021_2_5 PlayerSettings.WebGL.emscriptenArgs += ",_main"; #endif PlayerSettings.WebGL.emscriptenArgs += " -s ERROR_ON_UNDEFINED_SYMBOLS=0"; @@ -876,11 +875,8 @@ namespace WeChatWASM } #if UNITY_6000_0_OR_NEWER - if (config.CompileOptions.enableWasm2023) { - PlayerSettings.WebGL.wasm2023 = true; - } else { - PlayerSettings.WebGL.wasm2023 = false; - } + // 从小游戏转换工具里无法直接开启wasm2023特性 会导致转出的webgl异常,所以强制关闭 + PlayerSettings.WebGL.wasm2023 = false; #endif #if UNITY_2021_2_OR_NEWER @@ -1912,6 +1908,7 @@ namespace WeChatWASM config.CompileOptions.DevelopBuild ? "true" : "false", config.CompileOptions.enablePerfAnalysis ? "true" : "false", config.ProjectConf.MemorySize.ToString(), + config.SDKOptions.disableMultiTouch ? "true" : "false", }); List replaceList = new List(replaceArrayList); diff --git a/Editor/WXEditorSettingHelper.cs b/Editor/WXEditorSettingHelper.cs index f5665124f..87c5f2ebc 100644 --- a/Editor/WXEditorSettingHelper.cs +++ b/Editor/WXEditorSettingHelper.cs @@ -170,6 +170,7 @@ namespace WeChatWASM this.formCheckbox("useFriendRelation", "使用好友关系链"); this.formCheckbox("useMiniGameChat", "使用社交组件"); this.formCheckbox("preloadWXFont", "预加载微信字体(?)", "在game.js执行开始时预载微信系统字体,运行期间可使用WX.GetWXFont获取微信字体"); + this.formCheckbox("disableMultiTouch", "禁用多点触控"); EditorGUILayout.EndVertical(); } @@ -455,6 +456,7 @@ namespace WeChatWASM this.setData("useFriendRelation", config.SDKOptions.UseFriendRelation); this.setData("useMiniGameChat", config.SDKOptions.UseMiniGameChat); this.setData("preloadWXFont", config.SDKOptions.PreloadWXFont); + this.setData("disableMultiTouch", config.SDKOptions.disableMultiTouch); this.setData("bgImageSrc", config.ProjectConf.bgImageSrc); tex = AssetDatabase.LoadAssetAtPath(config.ProjectConf.bgImageSrc); this.setData("memorySize", config.ProjectConf.MemorySize.ToString()); @@ -532,6 +534,7 @@ namespace WeChatWASM config.SDKOptions.UseFriendRelation = this.getDataCheckbox("useFriendRelation"); config.SDKOptions.UseMiniGameChat = this.getDataCheckbox("useMiniGameChat"); config.SDKOptions.PreloadWXFont = this.getDataCheckbox("preloadWXFont"); + config.SDKOptions.disableMultiTouch = this.getDataCheckbox("disableMultiTouch"); config.ProjectConf.bgImageSrc = this.getDataInput("bgImageSrc"); config.ProjectConf.MemorySize = int.Parse(this.getDataInput("memorySize")); config.ProjectConf.HideAfterCallMain = this.getDataCheckbox("hideAfterCallMain"); diff --git a/Editor/WXPluginVersion.cs b/Editor/WXPluginVersion.cs index da8b23d24..927088ed0 100644 --- a/Editor/WXPluginVersion.cs +++ b/Editor/WXPluginVersion.cs @@ -2,7 +2,7 @@ namespace WeChatWASM { public class WXPluginVersion { - public static string pluginVersion = "202503181106"; // 这一行不要改他,导出的时候会自动替换 + public static string pluginVersion = "202504150349"; // 这一行不要改他,导出的时候会自动替换 } public class WXPluginConf diff --git a/Editor/wx-editor.dll b/Editor/wx-editor.dll index 9d986f6ef..33019c703 100644 Binary files a/Editor/wx-editor.dll and b/Editor/wx-editor.dll differ diff --git a/Editor/wx-editor.xml b/Editor/wx-editor.xml index 6dc11b213..331e70649 100644 --- a/Editor/wx-editor.xml +++ b/Editor/wx-editor.xml @@ -543,6 +543,11 @@ 预载系统字体 + + + 是否禁止多点触控 + + Development Build diff --git a/Runtime/DisableKeyboardInput.cs b/Runtime/DisableKeyboardInput.cs index 62ec5b549..fa300352b 100644 --- a/Runtime/DisableKeyboardInput.cs +++ b/Runtime/DisableKeyboardInput.cs @@ -14,7 +14,7 @@ internal class DisableKeyboardInput : MonoBehaviour WeixinMiniGameInput.mobileKeyboardSupport = false; #elif PLATFORM_WEBGL #if UNITY_2022_1_OR_NEWER - WebGLInput.mobileKeyboardSupport = false; + WebGLInput.mobileKeyboardSupport = false; #endif #endif #endif diff --git a/Runtime/Plugins/wx-perf.dll b/Runtime/Plugins/wx-perf.dll index fbbad637a..cf7e1ddd2 100644 Binary files a/Runtime/Plugins/wx-perf.dll and b/Runtime/Plugins/wx-perf.dll differ diff --git a/Runtime/Plugins/wx-runtime-editor.dll b/Runtime/Plugins/wx-runtime-editor.dll index 60bb4382e..74d6db387 100644 Binary files a/Runtime/Plugins/wx-runtime-editor.dll and b/Runtime/Plugins/wx-runtime-editor.dll differ diff --git a/Runtime/Plugins/wx-runtime-editor.xml b/Runtime/Plugins/wx-runtime-editor.xml index 37d9fdc87..7f62b32cf 100644 --- a/Runtime/Plugins/wx-runtime-editor.xml +++ b/Runtime/Plugins/wx-runtime-editor.xml @@ -1395,25 +1395,25 @@ 运行JS函数 - + [LogManager.debug()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/LogManager.debug.html) 写 debug 日志 - + [LogManager.info()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/LogManager.info.html) 写 info 日志 - + [LogManager.log()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/LogManager.log.html) 写 log 日志 - + [LogManager.warn()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/LogManager.warn.html) 写 warn 日志 @@ -3144,6 +3144,41 @@ 接口调用成功的回调函数 + + + 错误信息 + + + + + 是否成功 + + + + + 一个表示控制器设备上存在的坐标轴的数组 (比如控制器摇杆)。 + + + + + 设备上的按键的数组。 + + + + + 控制器是否仍然连接着系统. + + + + + 一个包含着控制器标识信息的 string + + + + + 一个自增的整形数字,对于当前连接到系统的每一个设备是唯一的 + + 小程序账号信息 @@ -3296,8 +3331,8 @@ - 需要基础库: `3.4.3` - 是否处于省电模式,目前仅 iOS 端支持 + 需要基础库: `3.5.0` + 是否处于省电模式 @@ -3621,6 +3656,7 @@ 可选值: - 'ios': iOS微信(包含 iPhone、iPad); - 'android': Android微信; + - 'ohos': HarmonyOS微信; - 'windows': Windows微信; - 'mac': macOS微信; - 'devtools': 微信开发者工具; @@ -3807,7 +3843,7 @@ 需要基础库: `2.10.4` - 是否开启 Quic 协议(gQUIC Q43) + 是否开启 Quic/h3 协议(iOS 微信目前使用 gQUIC-Q43;Android 微信在 v8.0.54 前使用 gQUIC-Q43,v8.0.54 开始使用 IETF QUIC,即 h3 协议;PC微信使用 IETF QUIC,即 h3 协议) @@ -4127,6 +4163,26 @@ 取值为0/1,取值为0表示会把 `App`、`Page` 的生命周期函数和 `wx` 命名空间下的函数调用写入日志,取值为1则不会。默认值是 0 + + + 从不同渠道获得的OPENLINK字符串 + + + + + 选填,部分活动、功能允许接收自定义query参数,请参阅渠道说明,默认可不填 + + + + + 从不同渠道获得的OPENLINK字符串 + + + + + 选填,部分活动、功能允许接收自定义query参数,请参阅渠道说明,默认可不填 + + 是否有新版本 @@ -4283,7 +4339,7 @@ - 经过加密的activityId,解密后可得到原始的activityId。若解密后得到的activityId可以与开发者后台的活动id对应上则验证通过,否则表明valid字段不可靠(被篡改) 详细见[加密数据解密算法](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/signature.html) + 经过加密的activityId,解密后可得到原始的activityId。若解密后得到的activityId可以与开发者后台的活动id对应上则验证通过,否则表明valid字段不可靠(被篡改) 详细见[加密数据解密算法](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/signature.html) @@ -5640,8 +5696,8 @@ - 需要基础库: `3.4.3` - 是否处于省电模式,目前仅 iOS 端支持 + 需要基础库: `3.5.0` + 是否处于省电模式 @@ -6134,6 +6190,12 @@ 使用 sha1( rawData + sessionkey ) 得到字符串,用于校验用户信息 + + + 需要基础库: `3.7.8` + 开启后单聊下返回 open_single_roomid + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -6144,6 +6206,12 @@ 接口调用失败的回调函数 + + + 需要基础库: `3.7.8` + 开启后返回用户在群(含单聊)下的 group_openid + + 接口调用成功的回调函数 @@ -6308,6 +6376,21 @@ 接口调用成功的回调函数 + + + 动态令牌 + + + + + 回调信息(成功失败都会返回) + + + + + 错误码(失败时返回) + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -6454,6 +6537,41 @@ 超时时间,单位 ms + + + 接口调用结束的回调函数(调用成功、失败都会执行) + + + + + 接口调用失败的回调函数 + + + + + 接口调用成功的回调函数 + + + + + 封面广告组件展示状态码 + 可选值: + - -1: 初始值,状态未知; + - 1: 展示成功; + - 2: 主动拦截过滤,不展示广告; + - 3: 展示超时; + + + + + 封面广告组件展示状态 + 可选值: + - 'unknown': 初始值,状态未知; + - 'pending': 进行展示中; + - 'success': 展示成功; + - 'fail': 展示失败; + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -6944,7 +7062,7 @@ - 用户登录凭证(有效期五分钟)。开发者需要在开发者服务器后台调用 [code2Session](#),使用 code 换取 openid、unionid、session_key 等信息 + 用户登录凭证(有效期五分钟)。开发者需要在开发者服务器后台调用 [code2Session](https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-login/code2Session.html),使用 code 换取 openid、unionid、session_key 等信息 @@ -7264,6 +7382,16 @@ 错误调用堆栈 + + + 本次连接到的 Gamepad 实例。 + + + + + 本次断开的 Gamepad 实例。 + + 需要传递给接力客户端的 query @@ -7303,36 +7431,6 @@ - 15: TRIM_MEMORY_RUNNING_CRITICAL; - - - 下边界坐标,单位:px - - - - - 高度,单位:px - - - - - 左边界坐标,单位:px - - - - - 右边界坐标,单位:px - - - - - 上边界坐标,单位:px - - - - - 宽度,单位:px - - 按键类型,0左键,1中键,2右键 @@ -7414,16 +7512,6 @@ - 'stop': 结束录屏; - - - 错误信息 - - - - - 是否成功 - - 转发显示图片的链接,可以是网络图片路径或本地图片文件路径或相对代码包根目录的图片文件路径。(该图片用于分享到朋友圈的卡片以及从朋友圈转发到会话消息的卡片展示) @@ -7438,12 +7526,12 @@ 需要基础库: `2.14.3` - 审核通过的朋友圈预览图图片 ID,详见 [使用审核通过的转发图片](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html#使用审核通过的转发图片) + 审核通过的朋友圈预览图图片编号,详见 [使用审核通过的转发图片](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html#使用审核通过的转发图片) - 审核通过的图片 ID,详见 [使用审核通过的转发图片](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html#使用审核通过的转发图片) + 审核通过的图片编号,详见 [使用审核通过的转发图片](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html#使用审核通过的转发图片) @@ -7953,11 +8041,21 @@ 对局回放背景音乐的地址 + + + 接口调用结束的回调函数(调用成功、失败都会执行) + + 分享的对局回放打开后的描述内容 + + + 接口调用失败的回调函数 + + 分享的对局回放打开后跳转小游戏的 path (独立分包路径) @@ -7968,6 +8066,11 @@ 分享的对局回放打开后跳转小游戏的 query + + + 接口调用成功的回调函数 + + 对局回放的剪辑区间,是一个二维数组,单位 ms(毫秒)。[[1000, 3000], [4000, 5000]] 表示剪辑已录制对局回放的 1-3 秒和 4-5 秒最终合成为一个 3 秒的对局回放。对局回放剪辑后的总时长最多 60 秒,即 1 分钟 @@ -8570,7 +8673,7 @@ - 系统订阅消息类型列表,一次调用最多可订阅3种类型的消息,目前支持两种类型,"SYS_MSG_TYPE_INTERACTIVE"(好友互动提醒)、"SYS_MSG_TYPE_RANK"(排行榜超越提醒) + 系统订阅消息类型列表,一次调用最多可订阅3种类型的消息,目前支持:"SYS_MSG_TYPE_INTERACTIVE"(好友互动提醒)、"SYS_MSG_TYPE_RANK"(排行榜超越提醒)、"SYS_MSG_TYPE_WHATS_NEW"(游戏更新提醒) @@ -8694,6 +8797,7 @@ 可选值: - 'barCode': 一维码; - 'qrCode': 二维码; + - 'wxCode': 小程序码; - 'datamatrix': Data Matrix 码; - 'pdf417': PDF417 条码; @@ -9040,7 +9144,7 @@ 需要基础库: `2.4.3` - 审核通过的图片 ID,详见 [使用审核通过的转发图片](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html#使用审核通过的转发图片) + 审核通过的图片编号,详见 [使用审核通过的转发图片](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html#使用审核通过的转发图片) @@ -9099,7 +9203,7 @@ - 当点击完成时键盘是否收起 + 当点击完成时键盘是否保持显示 @@ -9273,12 +9377,6 @@ 分享的图片消息是否要带小程序入口 (仅部分小程序类目可用) - - - 需要基础库: `3.2.0` - 分享样式,小程序可选 v2 - - 接口调用成功的回调函数 @@ -9600,6 +9698,12 @@ 动态消息的 activityId。通过 [updatableMessage.createActivityId](https://developers.weixin.qq.com/minigame/dev/api-backend/open-api/updatable-message/updatableMessage.createActivityId.html) 接口获取 + + + 需要基础库: `3.7.8` + 指定成员的方式 + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -9622,6 +9726,11 @@ 是否是动态消息,详见[动态消息](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/updatable-message.html) + + + 参与用户此聊天室下的 group_openid 列表 + + 接口调用成功的回调函数 @@ -9639,6 +9748,12 @@ 群待办消息的id,通过toDoActivityId可以把多个群待办消息聚合为同一个。通过 [updatableMessage.createActivityId](https://developers.weixin.qq.com/minigame/dev/api-backend/open-api/updatable-message/updatableMessage.createActivityId.html) 接口获取。详见[群待办消息](#) + + + 需要基础库: `3.7.8` + 聊天工具模式特殊动态消息 + + 是否使用带 shareTicket 的转发[详情](#) @@ -10046,6 +10161,41 @@ 要发送的消息 + + + [PageManager.destroy()](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/PageManager.destroy.html) + 需要基础库: `3.6.7` + 销毁开放页面实例。 + + + + + [PageManager.off(string eventName, function callback)](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/PageManager.off.html) + 需要基础库: `3.6.7` + 取消监听来自活动、功能向开发者产生的某些事件。 + + + + + [PageManager.on(string eventName, function callback)](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/PageManager.on.html) + 需要基础库: `3.6.7` + 监听来自活动、功能向开发者产生的某些事件。 + + + + + [Promise PageManager.load(Object object)](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/PageManager.load.html) + 需要基础库: `3.6.7` + 提供OPENLINK加载活动、功能信息。 + + + + + [Promise PageManager.show(Object object)](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/PageManager.show.html) + 需要基础库: `3.6.7` + 显示已经成功加载信息的开放页面活动、功能。如果调用前未执行 `.load({ ... })` 将自动调用1次并返回加载信息结果。 + + [RealtimeLogManager.addFilterMsg(string msg)](https://developers.weixin.qq.com/minigame/dev/api/base/debug/RealtimeLogManager.addFilterMsg.html) @@ -10053,14 +10203,14 @@ 添加过滤关键字,暂不支持在插件使用 - + [RealtimeLogManager.error()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/RealtimeLogManager.error.html) 需要基础库: `2.14.4` 写 error 日志,暂不支持在插件使用 - + [RealtimeLogManager.info()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/RealtimeLogManager.info.html) 需要基础库: `2.14.4` @@ -10074,7 +10224,7 @@ 设置过滤关键字,暂不支持在插件使用 - + [RealtimeLogManager.warn()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/RealtimeLogManager.warn.html) 需要基础库: `2.14.4` diff --git a/Runtime/Plugins/wx-runtime.dll b/Runtime/Plugins/wx-runtime.dll index 568bf8b0c..1bdbe3b8f 100644 Binary files a/Runtime/Plugins/wx-runtime.dll and b/Runtime/Plugins/wx-runtime.dll differ diff --git a/Runtime/Plugins/wx-runtime.xml b/Runtime/Plugins/wx-runtime.xml index 63c0b1c5b..13ed2713a 100644 --- a/Runtime/Plugins/wx-runtime.xml +++ b/Runtime/Plugins/wx-runtime.xml @@ -1401,25 +1401,25 @@ 运行JS函数 - + [LogManager.debug()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/LogManager.debug.html) 写 debug 日志 - + [LogManager.info()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/LogManager.info.html) 写 info 日志 - + [LogManager.log()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/LogManager.log.html) 写 log 日志 - + [LogManager.warn()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/LogManager.warn.html) 写 warn 日志 @@ -3150,6 +3150,41 @@ 接口调用成功的回调函数 + + + 错误信息 + + + + + 是否成功 + + + + + 一个表示控制器设备上存在的坐标轴的数组 (比如控制器摇杆)。 + + + + + 设备上的按键的数组。 + + + + + 控制器是否仍然连接着系统. + + + + + 一个包含着控制器标识信息的 string + + + + + 一个自增的整形数字,对于当前连接到系统的每一个设备是唯一的 + + 小程序账号信息 @@ -3302,8 +3337,8 @@ - 需要基础库: `3.4.3` - 是否处于省电模式,目前仅 iOS 端支持 + 需要基础库: `3.5.0` + 是否处于省电模式 @@ -3627,6 +3662,7 @@ 可选值: - 'ios': iOS微信(包含 iPhone、iPad); - 'android': Android微信; + - 'ohos': HarmonyOS微信; - 'windows': Windows微信; - 'mac': macOS微信; - 'devtools': 微信开发者工具; @@ -3813,7 +3849,7 @@ 需要基础库: `2.10.4` - 是否开启 Quic 协议(gQUIC Q43) + 是否开启 Quic/h3 协议(iOS 微信目前使用 gQUIC-Q43;Android 微信在 v8.0.54 前使用 gQUIC-Q43,v8.0.54 开始使用 IETF QUIC,即 h3 协议;PC微信使用 IETF QUIC,即 h3 协议) @@ -4133,6 +4169,26 @@ 取值为0/1,取值为0表示会把 `App`、`Page` 的生命周期函数和 `wx` 命名空间下的函数调用写入日志,取值为1则不会。默认值是 0 + + + 从不同渠道获得的OPENLINK字符串 + + + + + 选填,部分活动、功能允许接收自定义query参数,请参阅渠道说明,默认可不填 + + + + + 从不同渠道获得的OPENLINK字符串 + + + + + 选填,部分活动、功能允许接收自定义query参数,请参阅渠道说明,默认可不填 + + 是否有新版本 @@ -4289,7 +4345,7 @@ - 经过加密的activityId,解密后可得到原始的activityId。若解密后得到的activityId可以与开发者后台的活动id对应上则验证通过,否则表明valid字段不可靠(被篡改) 详细见[加密数据解密算法](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/signature.html) + 经过加密的activityId,解密后可得到原始的activityId。若解密后得到的activityId可以与开发者后台的活动id对应上则验证通过,否则表明valid字段不可靠(被篡改) 详细见[加密数据解密算法](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/signature.html) @@ -5646,8 +5702,8 @@ - 需要基础库: `3.4.3` - 是否处于省电模式,目前仅 iOS 端支持 + 需要基础库: `3.5.0` + 是否处于省电模式 @@ -6140,6 +6196,12 @@ 使用 sha1( rawData + sessionkey ) 得到字符串,用于校验用户信息 + + + 需要基础库: `3.7.8` + 开启后单聊下返回 open_single_roomid + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -6150,6 +6212,12 @@ 接口调用失败的回调函数 + + + 需要基础库: `3.7.8` + 开启后返回用户在群(含单聊)下的 group_openid + + 接口调用成功的回调函数 @@ -6314,6 +6382,21 @@ 接口调用成功的回调函数 + + + 动态令牌 + + + + + 回调信息(成功失败都会返回) + + + + + 错误码(失败时返回) + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -6460,6 +6543,41 @@ 超时时间,单位 ms + + + 接口调用结束的回调函数(调用成功、失败都会执行) + + + + + 接口调用失败的回调函数 + + + + + 接口调用成功的回调函数 + + + + + 封面广告组件展示状态码 + 可选值: + - -1: 初始值,状态未知; + - 1: 展示成功; + - 2: 主动拦截过滤,不展示广告; + - 3: 展示超时; + + + + + 封面广告组件展示状态 + 可选值: + - 'unknown': 初始值,状态未知; + - 'pending': 进行展示中; + - 'success': 展示成功; + - 'fail': 展示失败; + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -6950,7 +7068,7 @@ - 用户登录凭证(有效期五分钟)。开发者需要在开发者服务器后台调用 [code2Session](#),使用 code 换取 openid、unionid、session_key 等信息 + 用户登录凭证(有效期五分钟)。开发者需要在开发者服务器后台调用 [code2Session](https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-login/code2Session.html),使用 code 换取 openid、unionid、session_key 等信息 @@ -7270,6 +7388,16 @@ 错误调用堆栈 + + + 本次连接到的 Gamepad 实例。 + + + + + 本次断开的 Gamepad 实例。 + + 需要传递给接力客户端的 query @@ -7309,36 +7437,6 @@ - 15: TRIM_MEMORY_RUNNING_CRITICAL; - - - 下边界坐标,单位:px - - - - - 高度,单位:px - - - - - 左边界坐标,单位:px - - - - - 右边界坐标,单位:px - - - - - 上边界坐标,单位:px - - - - - 宽度,单位:px - - 按键类型,0左键,1中键,2右键 @@ -7420,16 +7518,6 @@ - 'stop': 结束录屏; - - - 错误信息 - - - - - 是否成功 - - 转发显示图片的链接,可以是网络图片路径或本地图片文件路径或相对代码包根目录的图片文件路径。(该图片用于分享到朋友圈的卡片以及从朋友圈转发到会话消息的卡片展示) @@ -7444,12 +7532,12 @@ 需要基础库: `2.14.3` - 审核通过的朋友圈预览图图片 ID,详见 [使用审核通过的转发图片](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html#使用审核通过的转发图片) + 审核通过的朋友圈预览图图片编号,详见 [使用审核通过的转发图片](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html#使用审核通过的转发图片) - 审核通过的图片 ID,详见 [使用审核通过的转发图片](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html#使用审核通过的转发图片) + 审核通过的图片编号,详见 [使用审核通过的转发图片](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html#使用审核通过的转发图片) @@ -7959,11 +8047,21 @@ 对局回放背景音乐的地址 + + + 接口调用结束的回调函数(调用成功、失败都会执行) + + 分享的对局回放打开后的描述内容 + + + 接口调用失败的回调函数 + + 分享的对局回放打开后跳转小游戏的 path (独立分包路径) @@ -7974,6 +8072,11 @@ 分享的对局回放打开后跳转小游戏的 query + + + 接口调用成功的回调函数 + + 对局回放的剪辑区间,是一个二维数组,单位 ms(毫秒)。[[1000, 3000], [4000, 5000]] 表示剪辑已录制对局回放的 1-3 秒和 4-5 秒最终合成为一个 3 秒的对局回放。对局回放剪辑后的总时长最多 60 秒,即 1 分钟 @@ -8576,7 +8679,7 @@ - 系统订阅消息类型列表,一次调用最多可订阅3种类型的消息,目前支持两种类型,"SYS_MSG_TYPE_INTERACTIVE"(好友互动提醒)、"SYS_MSG_TYPE_RANK"(排行榜超越提醒) + 系统订阅消息类型列表,一次调用最多可订阅3种类型的消息,目前支持:"SYS_MSG_TYPE_INTERACTIVE"(好友互动提醒)、"SYS_MSG_TYPE_RANK"(排行榜超越提醒)、"SYS_MSG_TYPE_WHATS_NEW"(游戏更新提醒) @@ -8700,6 +8803,7 @@ 可选值: - 'barCode': 一维码; - 'qrCode': 二维码; + - 'wxCode': 小程序码; - 'datamatrix': Data Matrix 码; - 'pdf417': PDF417 条码; @@ -9046,7 +9150,7 @@ 需要基础库: `2.4.3` - 审核通过的图片 ID,详见 [使用审核通过的转发图片](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html#使用审核通过的转发图片) + 审核通过的图片编号,详见 [使用审核通过的转发图片](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html#使用审核通过的转发图片) @@ -9105,7 +9209,7 @@ - 当点击完成时键盘是否收起 + 当点击完成时键盘是否保持显示 @@ -9279,12 +9383,6 @@ 分享的图片消息是否要带小程序入口 (仅部分小程序类目可用) - - - 需要基础库: `3.2.0` - 分享样式,小程序可选 v2 - - 接口调用成功的回调函数 @@ -9606,6 +9704,12 @@ 动态消息的 activityId。通过 [updatableMessage.createActivityId](https://developers.weixin.qq.com/minigame/dev/api-backend/open-api/updatable-message/updatableMessage.createActivityId.html) 接口获取 + + + 需要基础库: `3.7.8` + 指定成员的方式 + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -9628,6 +9732,11 @@ 是否是动态消息,详见[动态消息](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/updatable-message.html) + + + 参与用户此聊天室下的 group_openid 列表 + + 接口调用成功的回调函数 @@ -9645,6 +9754,12 @@ 群待办消息的id,通过toDoActivityId可以把多个群待办消息聚合为同一个。通过 [updatableMessage.createActivityId](https://developers.weixin.qq.com/minigame/dev/api-backend/open-api/updatable-message/updatableMessage.createActivityId.html) 接口获取。详见[群待办消息](#) + + + 需要基础库: `3.7.8` + 聊天工具模式特殊动态消息 + + 是否使用带 shareTicket 的转发[详情](#) @@ -10052,6 +10167,41 @@ 要发送的消息 + + + [PageManager.destroy()](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/PageManager.destroy.html) + 需要基础库: `3.6.7` + 销毁开放页面实例。 + + + + + [PageManager.off(string eventName, function callback)](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/PageManager.off.html) + 需要基础库: `3.6.7` + 取消监听来自活动、功能向开发者产生的某些事件。 + + + + + [PageManager.on(string eventName, function callback)](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/PageManager.on.html) + 需要基础库: `3.6.7` + 监听来自活动、功能向开发者产生的某些事件。 + + + + + [Promise PageManager.load(Object object)](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/PageManager.load.html) + 需要基础库: `3.6.7` + 提供OPENLINK加载活动、功能信息。 + + + + + [Promise PageManager.show(Object object)](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/PageManager.show.html) + 需要基础库: `3.6.7` + 显示已经成功加载信息的开放页面活动、功能。如果调用前未执行 `.load({ ... })` 将自动调用1次并返回加载信息结果。 + + [RealtimeLogManager.addFilterMsg(string msg)](https://developers.weixin.qq.com/minigame/dev/api/base/debug/RealtimeLogManager.addFilterMsg.html) @@ -10059,14 +10209,14 @@ 添加过滤关键字,暂不支持在插件使用 - + [RealtimeLogManager.error()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/RealtimeLogManager.error.html) 需要基础库: `2.14.4` 写 error 日志,暂不支持在插件使用 - + [RealtimeLogManager.info()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/RealtimeLogManager.info.html) 需要基础库: `2.14.4` @@ -10080,7 +10230,7 @@ 设置过滤关键字,暂不支持在插件使用 - + [RealtimeLogManager.warn()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/RealtimeLogManager.warn.html) 需要基础库: `2.14.4` diff --git a/Runtime/Plugins/wx_perf_2021.a b/Runtime/Plugins/wx_perf_2021.a index f510a4a57..2748bc3a3 100644 Binary files a/Runtime/Plugins/wx_perf_2021.a and b/Runtime/Plugins/wx_perf_2021.a differ diff --git a/Runtime/Plugins/wx_perf_2022.a b/Runtime/Plugins/wx_perf_2022.a index d696ed5eb..e0a76f1a3 100644 Binary files a/Runtime/Plugins/wx_perf_2022.a and b/Runtime/Plugins/wx_perf_2022.a differ diff --git a/Runtime/WX.cs b/Runtime/WX.cs index da06f19a3..cbb9acb6f 100644 --- a/Runtime/WX.cs +++ b/Runtime/WX.cs @@ -1,5 +1,6 @@ #if UNITY_WEBGL || WEIXINMINIGAME || UNITY_EDITOR using System; +using System.Collections.Generic; namespace WeChatWASM { @@ -278,7 +279,7 @@ namespace WeChatWASM /// /// [wx.exitMiniProgram(Object object)](https://developers.weixin.qq.com/minigame/dev/api/navigate/wx.exitMiniProgram.html) /// 需要基础库: `2.17.3` - /// 退出当前小程序。必须有点击行为才能调用成功。 + /// 退出当前小程序 /// public static void ExitMiniProgram(ExitMiniProgramOption callback) { @@ -628,7 +629,7 @@ namespace WeChatWASM /// **encryptedData 解密后得到的 GameClubData 的结构** /// | 属性 | 类型 | 说明 | /// | ------- | ------- | -------------------------------------- | - /// | dataList | Array | 游戏圈相关数据的对象数组 | + /// | dataList | Array\ | 游戏圈相关数据的对象数组 | /// **GameClubDataByType 的结构** /// | 属性 | 类型 | 说明 | /// | ------- |------- | -------------------------------------- | @@ -647,6 +648,7 @@ namespace WeChatWASM /// ## 注意事项 /// - 基础库 v2.10.4 开始支持获取群工具小程序启动信息 /// - 基础库 v2.17.3 开始支持获取群聊小程序消息卡片、群待办小程序启动信息 + /// - 基础库 v3.7.8 支持获取单聊群启动信息,获取的群(含单聊)唯一标识,可用于[聊天工具模式](https://developers.weixin.qq.com/minigame/dev/api/chattool/wx.openChatTool.html)。 /// **示例代码** /// ```js /// wx.getGroupEnterInfo({ @@ -666,7 +668,10 @@ namespace WeChatWASM /// 获取得到的开放数据为以下 json 结构(其中 opengid 为当前群的唯一标识): /// ```json /// { - /// "opengid": "OPENGID" + /// "opengid": "OPENGID", // 多聊群下返回的群唯一标识 + /// "open_single_roomid": "", // 单聊群下返回的群唯一标识 + /// "group_openid": "", // 用户在当前群的唯一标识 + /// "chat_type": 3, // 聊天室类型 /// } /// ``` /// **Tips** @@ -737,9 +742,6 @@ namespace WeChatWASM /// /// [wx.getPhoneNumber(Object object)](https://developers.weixin.qq.com/minigame/dev/api/open-api/user-info/wx.getPhoneNumber.html) /// 手机号快速验证,向用户申请,并在用户同意后,快速填写和验证手机 [具体说明](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/getPhoneNumber.html) - /// **** - /// ## 注意事项 - /// - 用户点击后才可进行调用 /// public static void GetPhoneNumber(GetPhoneNumberOption callback) { @@ -790,10 +792,11 @@ namespace WeChatWASM /// **示例代码** /// ```js /// wx.getScreenRecordingState({ - /// success: function (res) { - /// console.log(res.state) - /// }, + /// success: function (res) { + /// console.log(res.state) + /// }, /// }) + /// ``` /// public static void GetScreenRecordingState(GetScreenRecordingStateOption callback) { @@ -865,6 +868,25 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.GetShareInfo(callback); } + /// + /// [wx.getShowSplashAdStatus(Object object)](https://developers.weixin.qq.com/minigame/dev/api/ad/wx.getShowSplashAdStatus.html) + /// 需要基础库: `3.7.8` + /// 获取封面广告组件展示状态。请通过 [wx.getSystemInfoSync()](https://developers.weixin.qq.com/minigame/dev/api/base/system/wx.getSystemInfoSync.html) 返回对象的 SDKVersion 判断基础库版本号后再使用该 API(小游戏端要求 >= 3.7.8, 小程序端要求 >= 3.7.8)。 + /// **示例代码** + /// ```js + /// // 获取封面广告展示状态 + /// wx.getShowSplashAdStatus({ + /// success: res => { + /// console.log('getShowSplashAdStatus res', res.status, res.code) + /// }, + /// }) + /// ``` + /// + public static void GetShowSplashAdStatus(GetShowSplashAdStatusOption callback) + { + WXSDKManagerHandler.Instance.GetShowSplashAdStatus(callback); + } + /// /// [wx.getStorageInfo(Object object)](https://developers.weixin.qq.com/minigame/dev/api/storage/wx.getStorageInfo.html) /// 异步获取当前storage的相关信息。 @@ -1364,7 +1386,7 @@ namespace WeChatWASM /// /// [wx.openCustomerServiceChat(Object object)](https://developers.weixin.qq.com/minigame/dev/api/open-api/service-chat/wx.openCustomerServiceChat.html) /// 需要基础库: `2.30.4` - /// 打开微信客服,页面产生点击事件(例如 button 上 bindtap 的回调中)后才可调用。了解更多信息,可以参考[微信客服介绍](https://work.weixin.qq.com/kf/)。 + /// 打开微信客服,页面产生点击事件后才可调用。了解更多信息,可以参考[微信客服介绍](https://work.weixin.qq.com/kf/)。 /// **示例代码** /// ```js /// wx.openCustomerServiceChat({ @@ -1382,7 +1404,7 @@ namespace WeChatWASM /// /// [wx.openCustomerServiceConversation(Object object)](https://developers.weixin.qq.com/minigame/dev/api/open-api/customer-message/wx.openCustomerServiceConversation.html) /// 需要基础库: `2.0.3` - /// 进入客服会话。要求在用户发生过至少一次 touch 事件后才能调用。后台接入方式与小程序一致,详见 [客服消息接入](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/customer-message/customer-message.html) + /// 进入客服会话。要求在用户发生过至少一次 touch 事件后才能调用。后台接入方式与小程序一致,详见 [客服消息接入](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/customer-message/customer-message.html) /// **注意事项** /// - 在客服会话内点击小程序消息卡片进入小程序时,不能通过 wx.onShow 或 wx.getEnterOptionsSync 等接口获取启动路径和参数,而是应该通过 wx.openCustomerServiceConversation 接口的 success 回调获取启动路径和参数 /// @@ -1455,6 +1477,16 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.OpenSystemBluetoothSetting(callback); } + /// + /// [wx.operateGameRecorderVideo(Object object)](https://developers.weixin.qq.com/minigame/dev/api/game-recorder/wx.operateGameRecorderVideo.html) + /// 需要基础库: `2.26.1` + /// 分享游戏对局回放。安卓微信8.0.28开始支持,iOS微信8.0.30开始支持。 + /// + public static void OperateGameRecorderVideo(OperateGameRecorderVideoOption callback) + { + WXSDKManagerHandler.Instance.OperateGameRecorderVideo(callback); + } + /// /// [wx.previewImage(Object object)](https://developers.weixin.qq.com/minigame/dev/api/media/image/wx.previewImage.html) /// 在新页面中全屏预览图片。预览的过程中用户可以进行保存图片、发送给朋友等操作。 @@ -1738,7 +1770,6 @@ namespace WeChatWASM /// 需要基础库: `2.9.4` /// 调起小游戏系统订阅消息界面,返回用户订阅消息的操作结果。当用户勾选了订阅面板中的“总是保持以上选择,不再询问”时,模板消息会被添加到用户的小游戏设置页,通过 [wx.getSetting](https://developers.weixin.qq.com/minigame/dev/api/open-api/setting/wx.getSetting.html) 接口可获取用户对相关模板消息的订阅状态。 /// ## 注意事项 - /// - 需要在 touchend 事件的回调中调用。 /// - 使用前建议阅读 [小游戏系统订阅消息使用指引](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/subscribe-system-message.html)。 /// - 系统订阅消息只需要订阅一次,永久有效。 /// **错误码** @@ -2123,9 +2154,6 @@ namespace WeChatWASM /// [wx.showShareImageMenu(Object object)](https://developers.weixin.qq.com/minigame/dev/api/share/wx.showShareImageMenu.html) /// 需要基础库: `2.14.3` /// 打开分享图片弹窗,可以将图片发送给朋友、收藏或下载 - /// **Bug & Tip** - /// 1. `tip`: `needShowEntrance`分享的图片消息是否要带小程序入口,支持申明类目:商家自营、电商平台、餐饮服务(餐饮服务场所/餐饮服务管理企业、点餐平台、外卖平台)、旅游服务(住宿服务、景区服务、OTA、旅游管理单位)、生活服务(家政服务、丽人服务、宠物(非医院类)、婚庆服务、洗浴保健、休闲娱乐、百货/超市/便利店、开锁服务、营业性演出票务、其他宠物健康服务、洗浴保健平台、共享服务、跑腿、寄存、求职/招聘) - /// 2. `tip`: `needShowEntrance`小游戏所有类目都支持 /// public static void ShowShareImageMenu(ShowShareImageMenuOption callback) { @@ -2135,7 +2163,7 @@ namespace WeChatWASM /// /// [wx.showShareMenu(Object object)](https://developers.weixin.qq.com/minigame/dev/api/share/wx.showShareMenu.html) /// 需要基础库: `1.1.0` - /// 显示当前页面的转发按钮 + /// 设置右上角点开的详情界面中的分享按钮是否可用 /// **** /// ## 注意事项 /// - "shareAppMessage"表示“发送给朋友”按钮,"shareTimeline"表示“分享到朋友圈”按钮 @@ -2550,16 +2578,6 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.ExitPointerLock(); } - /// - /// [wx.operateGameRecorderVideo(Object object)](https://developers.weixin.qq.com/minigame/dev/api/game-recorder/wx.operateGameRecorderVideo.html) - /// 需要基础库: `2.26.1` - /// 分享游戏对局回放。安卓微信8.0.28开始支持,iOS微信8.0.30开始支持。 - /// - public static void OperateGameRecorderVideo(OperateGameRecorderVideoOption option) - { - WXSDKManagerHandler.Instance.OperateGameRecorderVideo(option); - } - /// /// [wx.removeStorageSync(string key)](https://developers.weixin.qq.com/minigame/dev/api/storage/wx.removeStorageSync.html) /// [wx.removeStorage](https://developers.weixin.qq.com/minigame/dev/api/storage/wx.removeStorage.html) 的同步版本 @@ -2590,7 +2608,7 @@ namespace WeChatWASM /// 需要基础库: `2.14.4` /// 事件上报 /// - public static void ReportEvent(string eventId, T data) + public static void ReportEvent(string eventId, Dictionary data) { WXSDKManagerHandler.Instance.ReportEvent(eventId, data); } @@ -2613,7 +2631,7 @@ namespace WeChatWASM /// /// [wx.reportUserBehaviorBranchAnalytics(Object object)](https://developers.weixin.qq.com/minigame/dev/api/data-analysis/wx.reportUserBehaviorBranchAnalytics.html) /// 需要基础库: `2.12.0` - /// 用于分支相关的UI组件(一般是按钮)相关事件的上报,事件目前有曝光、点击两种 + /// 上报场景分析,用于UI组件(一般是按钮)相关事件的上报,事件目前有曝光、点击两种,查看[相关文档](https://developers.weixin.qq.com/minigame/analysis/selfanalysis.html) /// public static void ReportUserBehaviorBranchAnalytics(ReportUserBehaviorBranchAnalyticsOption option) { @@ -2624,13 +2642,13 @@ namespace WeChatWASM /// [wx.requestPointerLock()](https://developers.weixin.qq.com/minigame/dev/api/render/cursor/wx.requestPointerLock.html) /// 需要基础库: `3.2.0` /// 锁定鼠标指针。锁定指针后,鼠标会被隐藏,可以通过 [wx.touchMove](#) 事件获取鼠标偏移量。 **此接口仅在 Windows、Mac 端支持,且必须在用户进行操作后才可调用。** - /// **示例代码 + /// **示例代码** /// ```js /// wx.onTouchEnd(() => { /// wx.requestPointerLock() // 触发鼠标锁定 /// }) /// ``` - /// 示例 demo** + /// **示例 demo** /// 下方打开后点按窗口会鼠标锁定,同时会在 touchMove 时持续在控制台打印偏移量。 /// [https://developers.weixin.qq.com/s/wGruMHm97tMF](https://developers.weixin.qq.com/s/wGruMHm97tMF) /// </summary> @@ -2984,6 +3002,36 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.OffError(error); } + /// <summary> + /// [wx.onGamepadConnected(function listener)](https://developers.weixin.qq.com/minigame/dev/api/device/gamepad/wx.onGamepadConnected.html) + /// 需要基础库: `3.6.4` + /// 监听用户已连接游戏手柄的事件。 + /// </summary> + public static void OnGamepadConnected(Action<OnGamepadConnectedListenerResult> result) + { + WXSDKManagerHandler.Instance.OnGamepadConnected(result); + } + + public static void OffGamepadConnected(Action<OnGamepadConnectedListenerResult> result) + { + WXSDKManagerHandler.Instance.OffGamepadConnected(result); + } + + /// <summary> + /// [wx.onGamepadDisconnected(function listener)](https://developers.weixin.qq.com/minigame/dev/api/device/gamepad/wx.onGamepadDisconnected.html) + /// 需要基础库: `3.6.4` + /// 监听用户断开游戏手柄的事件。 + /// </summary> + public static void OnGamepadDisconnected(Action<OnGamepadDisconnectedListenerResult> result) + { + WXSDKManagerHandler.Instance.OnGamepadDisconnected(result); + } + + public static void OffGamepadDisconnected(Action<OnGamepadDisconnectedListenerResult> result) + { + WXSDKManagerHandler.Instance.OffGamepadDisconnected(result); + } + /// <summary> /// [wx.onHide(function listener)](https://developers.weixin.qq.com/minigame/dev/api/base/app/life-cycle/wx.onHide.html) /// 监听小游戏隐藏到后台事件。锁屏、按 HOME 键退到桌面、显示在聊天顶部等操作会触发此事件。 @@ -3045,7 +3093,7 @@ namespace WeChatWASM /// <summary> /// [wx.onKeyboardComplete(function listener)](https://developers.weixin.qq.com/minigame/dev/api/device/keyboard/wx.onKeyboardComplete.html) - /// 监听监听键盘收起的事件 + /// 监听键盘收起的事件 /// </summary> public static void OnKeyboardComplete(Action<OnKeyboardInputListenerResult> result) { @@ -3114,9 +3162,9 @@ namespace WeChatWASM /// **示例代码** /// ```js /// wx.onMemoryWarning(function () { - /// console.log('onMemoryWarningReceive') + /// console.log('onMemoryWarningReceive') /// }) - /// `` + /// ``` /// </summary> public static void OnMemoryWarning(Action<OnMemoryWarningListenerResult> result) { @@ -3128,28 +3176,6 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.OffMemoryWarning(result); } - /// <summary> - /// [wx.onMenuButtonBoundingClientRectWeightChange(function listener)](https://developers.weixin.qq.com/minigame/dev/api/ui/menu/wx.onMenuButtonBoundingClientRectWeightChange.html) - /// 需要基础库: `3.4.3` - /// 监听菜单按钮(右上角胶囊按钮)的布局位置信息变化事件 - /// **示例代码** - /// ```js - /// const callback = res => console.log('menuButtonBoundingClientRectWeightChange', res) - /// wx.onMenuButtonBoundingClientRectWeightChange(callback) - /// // 取消监听 - /// wx.offMenuButtonBoundingClientRectWeightChange(callback) - /// ``` - /// </summary> - public static void OnMenuButtonBoundingClientRectWeightChange(Action<OnMenuButtonBoundingClientRectWeightChangeListenerResult> result) - { - WXSDKManagerHandler.Instance.OnMenuButtonBoundingClientRectWeightChange(result); - } - - public static void OffMenuButtonBoundingClientRectWeightChange(Action<OnMenuButtonBoundingClientRectWeightChangeListenerResult> result) - { - WXSDKManagerHandler.Instance.OffMenuButtonBoundingClientRectWeightChange(result); - } - /// <summary> /// [wx.onMessage(function callback)](https://developers.weixin.qq.com/minigame/dev/api/open-api/context/wx.onMessage.html) /// 监听主域发送的消息 @@ -3506,6 +3532,24 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.OffGameLiveStateChange(callback); } + /// <summary> + /// [Array.<Object> wx.getGamepads()](https://developers.weixin.qq.com/minigame/dev/api/device/gamepad/wx.getGamepads.html) + /// 需要基础库: `3.6.4` + /// 获取已连接的游戏手柄信息,仅在 PC 平台支持。 + /// **示例代码** + /// ```js + /// const gamepads = wx.getGamepads(); + /// console.log(gamepads); + /// ``` + /// **示例代码片段** + /// [在微信开发者工具中查看示例](https://developers.weixin.qq.com/s/6al1r2m17oV6) + /// </summary> + /// <returns></returns> + public static Gamepad[] GetGamepads() + { + return WXSDKManagerHandler.GetGamepads(); + } + /// <summary> /// [Boolean wx.setHandoffQuery(String query)](https://developers.weixin.qq.com/minigame/dev/api/share/wx.setHandoffQuery.html) /// 需要基础库: `2.14.4` @@ -3659,9 +3703,9 @@ namespace WeChatWASM /// 而 wx.getExptInfoSync(['color']) 则只会返回 `{color:'#fff'}` /// </summary> /// <returns></returns> - public static T GetExptInfoSync<T>(string[] keys) + public static Dictionary<string, string> GetExptInfoSync(string[] keys) { - return WXSDKManagerHandler.GetExptInfoSync<T>(keys); + return WXSDKManagerHandler.GetExptInfoSync(keys); } /// <summary> @@ -3677,9 +3721,9 @@ namespace WeChatWASM /// ``` /// </summary> /// <returns></returns> - public static T GetExtConfigSync<T>() + public static Dictionary<string, string> GetExtConfigSync() { - return WXSDKManagerHandler.GetExtConfigSync<T>(); + return WXSDKManagerHandler.GetExtConfigSync(); } /// <summary> @@ -3876,10 +3920,10 @@ namespace WeChatWASM /// <summary> /// [boolean wx.setMessageToFriendQuery(Object object)](https://developers.weixin.qq.com/minigame/dev/api/share/wx.setMessageToFriendQuery.html) /// 设置 wx.shareMessageToFriend 接口 query 字段的值 - /// **提示 + /// **提示** /// 1. 此处的 query 参数与 wx.onShow 取到的启动查询参数 query 不是同一个概念,仅仅是启动查询参数会增加一个字段为 query。 /// 2. query 参数如涉及 "?"和"&" 等特殊符号,需自行进行 encodeURIComponent 和 decodeURIComponent 等操作。 - /// 示例代码 + /// **示例代码** /// ```js /// // 发送方 /// wx.setMessageToFriendQuery({ @@ -3889,7 +3933,8 @@ namespace WeChatWASM /// // 预期接收方可以通过以下方式拿到设置 /// wx.getEnterOptionsSync().query.shareMessageToFriendScene // 1 /// wx.getEnterOptionsSync().query.query // 'testquery' - /// 示例代码-特殊字符query** + /// ``` + /// **示例代码-特殊字符query** /// ```js /// // 发送方 /// wx.setMessageToFriendQuery({ @@ -3991,6 +4036,32 @@ namespace WeChatWASM return WXSDKManagerHandler.Instance.GetLogManager(option); } + /// <summary> + /// [[PageManager](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/PageManager.html) wx.createPageManager()](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/wx.createPageManager.html) + /// 需要基础库: `3.6.7` + /// 小游戏开放页面管理器,用于启动微信内置的各种小游戏活动、功能页面。具体OPENLINK值由不同的能力渠道获得。 + /// **示例代码** + /// ```js + /// const pageManager = wx.createPageManager(); + /// pageManager.load({ + /// openlink: 'xxxxxxx-xxxxxx', // 由不同渠道获得的OPENLINK值 + /// }).then((res) => { + /// // 加载成功,res 可能携带不同活动、功能返回的特殊回包信息(具体请参阅渠道说明) + /// console.log(res); + /// // 加载成功后按需显示 + /// pageManager.show(); + /// }).catch((err) => { + /// // 加载失败,请查阅 err 给出的错误信息 + /// console.error(err); + /// }) + /// ``` + /// </summary> + /// <returns></returns> + public static WXPageManager CreatePageManager() + { + return WXSDKManagerHandler.Instance.CreatePageManager(); + } + /// <summary> /// [[RealtimeLogManager](https://developers.weixin.qq.com/minigame/dev/api/base/debug/RealtimeLogManager.html) wx.getRealtimeLogManager()](https://developers.weixin.qq.com/minigame/dev/api/base/debug/wx.getRealtimeLogManager.html) /// 需要基础库: `2.14.4` diff --git a/Runtime/WXSDKPerf/WXPerfEngine.cs b/Runtime/WXSDKPerf/WXPerfEngine.cs index 00552b351..88cdd1586 100644 --- a/Runtime/WXSDKPerf/WXPerfEngine.cs +++ b/Runtime/WXSDKPerf/WXPerfEngine.cs @@ -47,6 +47,12 @@ namespace WXSDKPerf #if UNITY_EDITOR return; #else + // Don't record annotation if we are not recording. + if (!IsRecording()) + { + return; + } + if (m_PerfEngineImplementation == null) { UnityEngine.Debug.LogError("Annotation: Invalid m_PerfEngineImplementation! "); diff --git a/Runtime/wechat-default/check-version.js b/Runtime/wechat-default/check-version.js index e3c1ac2e5..1f65ece21 100644 --- a/Runtime/wechat-default/check-version.js +++ b/Runtime/wechat-default/check-version.js @@ -64,7 +64,7 @@ const isMobileBrotliInvalid = isMobile && !compareVersion(SDKVersion, '2.21.1'); // @ts-ignore const isBrotliInvalid = $COMPRESS_DATA_PACKAGE && (isPcBrotliInvalid || isMobileBrotliInvalid); // iOS系统版本>=17.5时,小游戏退后台会导致异常 -export const isIOS175 = compareVersion(systemVersion, '17.5') || isH5Renderer; +export const isIOS175 = compareVersion(systemVersion, '17.5') && isH5Renderer; // 是否支持开放数据域渲染模式,使用ScreenCanvas模式可以优化ToTempFilePath的使用 export const isSupportSharedCanvasMode = compareVersion(SDKVersion, '3.6.6'); // 是否能以iOS高性能模式运行 diff --git a/Runtime/wechat-default/check-version.js.meta b/Runtime/wechat-default/check-version.js.meta index 2468e87d2..23bab4939 100644 --- a/Runtime/wechat-default/check-version.js.meta +++ b/Runtime/wechat-default/check-version.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b1d5c5a293c4e6f758baa418d6e27073 +guid: 16317d382054d211eec839025e302258 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/data-package/game.js.meta b/Runtime/wechat-default/data-package/game.js.meta index 3e6c09545..9ca05d5b7 100644 --- a/Runtime/wechat-default/data-package/game.js.meta +++ b/Runtime/wechat-default/data-package/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dacf22747877e863bdaf3d6e4e8e8d13 +guid: 9be004a046a176efca29fb61af1bcd50 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/events.js.meta b/Runtime/wechat-default/events.js.meta index 23b0b3ce3..fced802c4 100644 --- a/Runtime/wechat-default/events.js.meta +++ b/Runtime/wechat-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c3cd14edeb9702898dd2ae85b1d13321 +guid: 00104f73d798ac0df383751d207eda41 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.js.meta b/Runtime/wechat-default/game.js.meta index e93c339cf..b8e2d7c7e 100644 --- a/Runtime/wechat-default/game.js.meta +++ b/Runtime/wechat-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8a10a99e0e9b35604cfeb09e658ddbe9 +guid: 3e30fa4f9025b27580e264d58d2301cf DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.json.meta b/Runtime/wechat-default/game.json.meta index 539a38f3a..e0bccccce 100644 --- a/Runtime/wechat-default/game.json.meta +++ b/Runtime/wechat-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ce738b792f1c30ce60616cf521e2497a +guid: ba2cc23abbfd34018a46932d90b02289 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/background.jpg.meta b/Runtime/wechat-default/images/background.jpg.meta index f916bbd8a..fe01635b2 100644 --- a/Runtime/wechat-default/images/background.jpg.meta +++ b/Runtime/wechat-default/images/background.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cac1584555b5c47e2a5e0235c3385963 +guid: 63d72019b57a32e36f240f3f84838a30 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/unity_logo.png.meta b/Runtime/wechat-default/images/unity_logo.png.meta index 5f4e3a50d..b8b2bfc2b 100644 --- a/Runtime/wechat-default/images/unity_logo.png.meta +++ b/Runtime/wechat-default/images/unity_logo.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e9b1bec83892f621c66d7ce59ced1bac +guid: 64ad1661c00c3de89b911cb9c5865530 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/data/index.js.meta b/Runtime/wechat-default/open-data/data/index.js.meta index 5df717ecc..9b9c88565 100644 --- a/Runtime/wechat-default/open-data/data/index.js.meta +++ b/Runtime/wechat-default/open-data/data/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f901293df61f1741b549d3988dcc8a02 +guid: 1df77d8ada2ef9edf67f3695de505577 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/data/utils.js.meta b/Runtime/wechat-default/open-data/data/utils.js.meta index 98b23da85..c186daffc 100644 --- a/Runtime/wechat-default/open-data/data/utils.js.meta +++ b/Runtime/wechat-default/open-data/data/utils.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b7c5e5c5bdb2f74377b5784bd4fb95ea +guid: 3a46b689ea47b24011c2de71b696a5ff DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/index.js.meta b/Runtime/wechat-default/open-data/index.js.meta index 007b5a965..a6efc5164 100644 --- a/Runtime/wechat-default/open-data/index.js.meta +++ b/Runtime/wechat-default/open-data/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f669ac8dbbd3c2ee49f6d8529ce2de0 +guid: edb2ad01ba8d7f8a2604441fa6123e39 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/loading.js.meta b/Runtime/wechat-default/open-data/loading.js.meta index a2521f80e..ca5769a62 100644 --- a/Runtime/wechat-default/open-data/loading.js.meta +++ b/Runtime/wechat-default/open-data/loading.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b7212dfec91a4e92ed7a51c90f543671 +guid: 5862b65f695609c65aca47c8577abac2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/avatar.png.meta b/Runtime/wechat-default/open-data/render/image/avatar.png.meta index f34b6546b..c3f4dba2e 100644 --- a/Runtime/wechat-default/open-data/render/image/avatar.png.meta +++ b/Runtime/wechat-default/open-data/render/image/avatar.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2a6368b60f06a28c4388799cb9f6fc34 +guid: 718435a438028306621a9393bedd513e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/button1.png.meta b/Runtime/wechat-default/open-data/render/image/button1.png.meta index a0a240b3e..445e9196d 100644 --- a/Runtime/wechat-default/open-data/render/image/button1.png.meta +++ b/Runtime/wechat-default/open-data/render/image/button1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dc65e9ab1e5794cb36d024118e7a283c +guid: 87e44c0acb7d131b1c65b5ed77e20058 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/button2.png.meta b/Runtime/wechat-default/open-data/render/image/button2.png.meta index ff1e55c12..67bcc0540 100644 --- a/Runtime/wechat-default/open-data/render/image/button2.png.meta +++ b/Runtime/wechat-default/open-data/render/image/button2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7eb8c0f704011f9501073a6bd469c82a +guid: f1ae3eb5888ba11e9e81d31f8359da4f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/button3.png.meta b/Runtime/wechat-default/open-data/render/image/button3.png.meta index 5d550d560..4d712bd79 100644 --- a/Runtime/wechat-default/open-data/render/image/button3.png.meta +++ b/Runtime/wechat-default/open-data/render/image/button3.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2313eb872afaafe8c8cd98eb4fd77a62 +guid: 367b2b41ecdfaf48a306f8ed45068242 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/loading.png.meta b/Runtime/wechat-default/open-data/render/image/loading.png.meta index 333475c63..dde120c92 100644 --- a/Runtime/wechat-default/open-data/render/image/loading.png.meta +++ b/Runtime/wechat-default/open-data/render/image/loading.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: af7c7bb9b44763c1b4850b08149a4d64 +guid: b4483568fe4ee92a82da441373a063e3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/nameBg.png.meta b/Runtime/wechat-default/open-data/render/image/nameBg.png.meta index 042265377..f30325f6c 100644 --- a/Runtime/wechat-default/open-data/render/image/nameBg.png.meta +++ b/Runtime/wechat-default/open-data/render/image/nameBg.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dbc6f34f5595006688690ab0820c6843 +guid: 25bcf5a1e6fb59785c49c387678a16eb DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/rankAvatar.png.meta b/Runtime/wechat-default/open-data/render/image/rankAvatar.png.meta index 20d960189..d3302e8a0 100644 --- a/Runtime/wechat-default/open-data/render/image/rankAvatar.png.meta +++ b/Runtime/wechat-default/open-data/render/image/rankAvatar.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2ce86ecd94939d0b772aa935f822ef6c +guid: 37b6b5b5f053529ae0fd38604bbfebfd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/rankBg.png.meta b/Runtime/wechat-default/open-data/render/image/rankBg.png.meta index 1f5c1d001..6f65e8eb0 100644 --- a/Runtime/wechat-default/open-data/render/image/rankBg.png.meta +++ b/Runtime/wechat-default/open-data/render/image/rankBg.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 91145347c1f9630546188fb92e35cafb +guid: 0792c0c05bcf5b6c9294508965b81a8f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/shareBg.png.meta b/Runtime/wechat-default/open-data/render/image/shareBg.png.meta index 54bac9086..48af8f5ee 100644 --- a/Runtime/wechat-default/open-data/render/image/shareBg.png.meta +++ b/Runtime/wechat-default/open-data/render/image/shareBg.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b54bb16f3a347f2af35fc9a0603d3981 +guid: 80bfbc6f0f6e8f424173540bf7442c89 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/shareBg2.png.meta b/Runtime/wechat-default/open-data/render/image/shareBg2.png.meta index 975d3e307..b7d8fb819 100644 --- a/Runtime/wechat-default/open-data/render/image/shareBg2.png.meta +++ b/Runtime/wechat-default/open-data/render/image/shareBg2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 23eac3782c3d2a5283106db0ac1de823 +guid: 214cad94faa36ee0601217f54ee34fdc DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/styles/friendRank.js.meta b/Runtime/wechat-default/open-data/render/styles/friendRank.js.meta index 79e740acd..25f9b89d6 100644 --- a/Runtime/wechat-default/open-data/render/styles/friendRank.js.meta +++ b/Runtime/wechat-default/open-data/render/styles/friendRank.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c32e13d79523fff52899471add65840 +guid: 2a0c047b950f9c0d252128884d892d93 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/styles/tips.js.meta b/Runtime/wechat-default/open-data/render/styles/tips.js.meta index 502fc1efc..b5e104769 100644 --- a/Runtime/wechat-default/open-data/render/styles/tips.js.meta +++ b/Runtime/wechat-default/open-data/render/styles/tips.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e559913eb6c0885ea57f132ab833f1c4 +guid: 5f741f5f532d857bd52a6772b3868a23 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/tpls/friendRank.js.meta b/Runtime/wechat-default/open-data/render/tpls/friendRank.js.meta index ed4c475f8..1298c57a0 100644 --- a/Runtime/wechat-default/open-data/render/tpls/friendRank.js.meta +++ b/Runtime/wechat-default/open-data/render/tpls/friendRank.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1228a90aaa4598fd74c33baf4bef18df +guid: f829f523305c7f48276c9a52d8174daa DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/tpls/tips.js.meta b/Runtime/wechat-default/open-data/render/tpls/tips.js.meta index 742f462ce..0343456ac 100644 --- a/Runtime/wechat-default/open-data/render/tpls/tips.js.meta +++ b/Runtime/wechat-default/open-data/render/tpls/tips.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bb6b9d0b2743b35939f0c4797e575653 +guid: ca6a32e78005a3f91727543038460f71 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugin-config.js.meta b/Runtime/wechat-default/plugin-config.js.meta index eafd4c368..b01b61a4b 100644 --- a/Runtime/wechat-default/plugin-config.js.meta +++ b/Runtime/wechat-default/plugin-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b82887f3f5789eaf68f47a9ec797c9c5 +guid: 14f80fda66b6d477ff0c417dde5d7d20 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/check-update.js.meta b/Runtime/wechat-default/plugins/check-update.js.meta index 013701a72..5de719c87 100644 --- a/Runtime/wechat-default/plugins/check-update.js.meta +++ b/Runtime/wechat-default/plugins/check-update.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ea474b029657fdaa319becc29f164cb2 +guid: 90532d59817a4618452372809aea4a54 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/screen-adapter.js.meta b/Runtime/wechat-default/plugins/screen-adapter.js.meta index 3b4821598..76a494252 100644 --- a/Runtime/wechat-default/plugins/screen-adapter.js.meta +++ b/Runtime/wechat-default/plugins/screen-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f92148091aaaeef613e4f735f3132ded +guid: e8df67e1a35b644d684c53c2240063f7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/project.config.json.meta b/Runtime/wechat-default/project.config.json.meta index af6c28b28..b6052e12f 100644 --- a/Runtime/wechat-default/project.config.json.meta +++ b/Runtime/wechat-default/project.config.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f979dbc1b844293c47fe854ccc6b145 +guid: 6d8771ef0303d36ce5a5b63fcf80d0f1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/texture-config.js.meta b/Runtime/wechat-default/texture-config.js.meta index 861e08d17..714ef9509 100644 --- a/Runtime/wechat-default/texture-config.js.meta +++ b/Runtime/wechat-default/texture-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 599277840d42f8d1f857dab7b550af17 +guid: 2392ef57d6a360e2cb54b7e557ecbb53 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-namespace.js b/Runtime/wechat-default/unity-namespace.js index f0db49076..30f8347b6 100644 --- a/Runtime/wechat-default/unity-namespace.js +++ b/Runtime/wechat-default/unity-namespace.js @@ -113,6 +113,7 @@ GameGlobal.WebAssembly = GameGlobal.WXWebAssembly; GameGlobal.unityNamespace = GameGlobal.unityNamespace || unityNamespace; GameGlobal.realtimeLogManager = wx.getRealtimeLogManager(); GameGlobal.logmanager = wx.getLogManager({ level: 0 }); +GameGlobal.disableMultiTouch = $DISABLE_MULTI_TOUCH; // 提前监听错误并打日志 function bindGloblException() { // 默认上报小游戏实时日志与用户反馈日志(所有error日志+小程序框架异常) diff --git a/Runtime/wechat-default/unity-namespace.js.meta b/Runtime/wechat-default/unity-namespace.js.meta index e5d2d21fc..98d82b760 100644 --- a/Runtime/wechat-default/unity-namespace.js.meta +++ b/Runtime/wechat-default/unity-namespace.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7e0463fe9935417828ef997ebf78e69c +guid: 1786b76da991741f65fabf34da0aa109 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js index 9c3208e07..02ad18f3c 100644 --- a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js +++ b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js @@ -9,7 +9,7 @@ const wxTCPSocketMessageList = {}; const getTCPSocketObject = getListObject(TCPSocketList, 'TCPSocket'); let wxTCPSocketOnMessageCallback; function WX_CreateTCPSocket() { - const obj = wx.createTCPSocket(); + const obj = wx.createTCPSocket({ type: 'ipv4' }); const key = uid(); TCPSocketList[key] = obj; return key; diff --git a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta index 98a578b9c..c22a4159f 100644 --- a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4c152c60a8f695a05e9c1cfd45670d67 +guid: 8f8eb5428f1cb8c7529c1f05f0059ef3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta b/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta index e3465b6cd..48b0d3986 100644 --- a/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1a323ca4b1e3f5fa8580bdf0a262e6ee +guid: 222286b4576348b8a07ae4e78375812c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/ad.js.meta b/Runtime/wechat-default/unity-sdk/ad.js.meta index d1a46a3a1..9aadc2ae2 100644 --- a/Runtime/wechat-default/unity-sdk/ad.js.meta +++ b/Runtime/wechat-default/unity-sdk/ad.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 88df4563d1888d9e7b3b18352390c5b6 +guid: 398e7b5e55e680018edd9ad9d43004aa DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/common.js.meta b/Runtime/wechat-default/unity-sdk/audio/common.js.meta index 4469b8963..8b4747768 100644 --- a/Runtime/wechat-default/unity-sdk/audio/common.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/common.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8bcb12e67168e61d7d55d8992fc46dc5 +guid: 2897165acd8981b69477d10d3b6d253c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/const.js.meta b/Runtime/wechat-default/unity-sdk/audio/const.js.meta index 507232b12..9cf39e233 100644 --- a/Runtime/wechat-default/unity-sdk/audio/const.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/const.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 214586cbf5e220680a8d02988974f4b2 +guid: ee4ffb5d7430955273a5f6816e1dfc64 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/index.js.meta b/Runtime/wechat-default/unity-sdk/audio/index.js.meta index d87c02f66..9913e8aed 100644 --- a/Runtime/wechat-default/unity-sdk/audio/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 13e426cbe62547c301edb312f099d76f +guid: f2f63535dc186e2c081d71407b73234f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/inner-audio.js.meta b/Runtime/wechat-default/unity-sdk/audio/inner-audio.js.meta index e7d389289..9a45f4456 100644 --- a/Runtime/wechat-default/unity-sdk/audio/inner-audio.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/inner-audio.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f688e52387945c3bd95b79b5bba03e4d +guid: 665ca3a7085449d82fc7636161f13903 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/store.js.meta b/Runtime/wechat-default/unity-sdk/audio/store.js.meta index 9f81cd51a..0b2dfdfe0 100644 --- a/Runtime/wechat-default/unity-sdk/audio/store.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/store.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5226d881d41490dc07c13761d9a2a5b7 +guid: f4d6c5fa8fdfc1d3d0ae30a5e48de752 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/unity-audio.js b/Runtime/wechat-default/unity-sdk/audio/unity-audio.js index 112314977..152279404 100644 --- a/Runtime/wechat-default/unity-sdk/audio/unity-audio.js +++ b/Runtime/wechat-default/unity-sdk/audio/unity-audio.js @@ -9,7 +9,7 @@ import { debugLog } from '../utils'; const defaultSoundLength = 441000; -const needGetLength = false; +const needGetLength = true; function jsAudioCreateUncompressedSoundClip(buffer, error, length) { const soundClip = { buffer, @@ -70,6 +70,25 @@ function jsAudioCreateUncompressedSoundClipFromCompressedAudio(audioData, ptr, l }); return soundClip; } +function getSoundLength(getAudio, retryCount = 3) { + return new Promise((resolve, reject) => { + const { duration } = getAudio; + if (duration > 0) { + resolve(duration); + } + else { + if (retryCount > 0) { + + setTimeout(() => { + resolve(getSoundLength(getAudio, retryCount - 1)); + }, 100); + } + else { + reject('getAudio.duration is 0'); + } + } + }); +} function jsAudioCreateCompressedSoundClip(audioData, ptr, length) { const soundClip = { error: false, @@ -103,12 +122,14 @@ function jsAudioCreateCompressedSoundClip(audioData, ptr, length) { if (isSupportBufferURL) { const url = wx.createBufferURL(audioData); soundClip.url = url; + setSoundLength(); WEBAudio.audioBufferLength += length; } else { const tempFilePath = `${TEMP_DIR_PATH}/temp-audio${ptr + length}.mp3`; if (GameGlobal.manager.getCachePath(tempFilePath)) { soundClip.url = tempFilePath; + setSoundLength(); WEBAudio.audioBufferLength += length; } else { @@ -116,6 +137,7 @@ function jsAudioCreateCompressedSoundClip(audioData, ptr, length) { .writeFile(tempFilePath, audioData) .then(() => { soundClip.url = tempFilePath; + setSoundLength(); WEBAudio.audioBufferLength += length; }) .catch((res) => { @@ -124,16 +146,24 @@ function jsAudioCreateCompressedSoundClip(audioData, ptr, length) { }); } } - if (needGetLength && soundClip.url) { - const { audio: getAudio } = createInnerAudio(); - getAudio.src = soundClip.url; - getAudio.onCanplay(() => { - soundClip.length = getAudio.duration * 44100; - setTimeout(() => { - soundClip.length = getAudio.duration * 44100; - getAudio.destroy(); - }, 0); - }); + function setSoundLength() { + if (needGetLength && soundClip.url) { + const { audio: getAudio } = createInnerAudio(); + getAudio.src = soundClip.url; + getAudio.onCanplay(() => { + getSoundLength(getAudio).then((duration) => { + soundClip.length = duration * 44100; + getAudio.destroy(); + }) + .catch((e) => { + if (soundClip.length === 0) { + soundClip.error = true; + printErrMsg(e); + } + getAudio.destroy(); + }); + }); + } } return soundClip; } @@ -219,6 +249,7 @@ export class AudioChannelInstance { this.source.mediaElement.volume = 0; } this.source.mediaElement.onPlay(() => { + debugLog('this.source.mediaElement.onPlay'); if (typeof this.source !== 'undefined') { this.source.isPlaying = true; if (!this.source.loop && this.source.mediaElement) { @@ -240,7 +271,7 @@ export class AudioChannelInstance { } }); this.source.mediaElement.onPause(() => { - debugLog('onPause'); + debugLog('this.source.mediaElement.onPause'); if (typeof this.source !== 'undefined') { this.source.isPlaying = false; if (this.source.stopTicker) { @@ -250,7 +281,7 @@ export class AudioChannelInstance { } }); this.source.mediaElement.onStop(() => { - debugLog('onStop'); + debugLog('this.source.mediaElement.onStop'); if (typeof this.source !== 'undefined') { if (this.source.playAfterStop) { this.source._reset(); @@ -267,7 +298,7 @@ export class AudioChannelInstance { } }); this.source.mediaElement.onEnded(() => { - debugLog('onEnded'); + debugLog('this.source.mediaElement.onEnded'); if (typeof this.source !== 'undefined') { this.source._reset(); this.disconnectSource(); @@ -277,7 +308,7 @@ export class AudioChannelInstance { } }); this.source.mediaElement.onError((e) => { - debugLog('onError', e); + debugLog('this.source.mediaElement.onError', e); printErrMsg(e); const { errMsg } = e; @@ -291,15 +322,17 @@ export class AudioChannelInstance { } }); const fn = () => { + debugLog('this.source.mediaElement.onCanplay'); if (typeof this.source !== 'undefined' && this.source.mediaElement) { - // @ts-ignore - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const { duration } = this.source.mediaElement; - setTimeout(() => { - if (soundClip && this.source && this.source.mediaElement) { - soundClip.length = Math.round(Math.max(this.source.mediaElement.duration, 0) * 44100); + getSoundLength(this.source.mediaElement).then((duration) => { + soundClip.length = duration * 44100; + }) + .catch((e) => { + if (soundClip.length === 0) { + soundClip.error = true; + printErrMsg(e); } - }, 0); + }); } }; if (!this.source.canPlayFnList) { @@ -910,7 +943,7 @@ export default { if (isIOS175) { WEBAudio.audioContext?.close(); WEBAudio.audioContext = wx.createWebAudioContext(); - Object.values(WEBAudio.audioInstances).forEach(it => it.resetGain()); + Object.values(WEBAudio.audioInstances).forEach((it) => it.resetGain()); } else { WEBAudio.audioContext?.resume(); @@ -1126,6 +1159,7 @@ export default { if (WEBAudio.audioWebEnabled === 0) { return; } + debugLog('_JS_Sound_SetPaused', channelInstance, paused); const channel = WEBAudio.audioInstances[channelInstance]; if (!!paused !== channel.isPaused()) { if (paused) { diff --git a/Runtime/wechat-default/unity-sdk/audio/unity-audio.js.meta b/Runtime/wechat-default/unity-sdk/audio/unity-audio.js.meta index 010303054..2893aa714 100644 --- a/Runtime/wechat-default/unity-sdk/audio/unity-audio.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/unity-audio.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 84c3c5b4ec642602b237d3e3b66834bd +guid: 3812553fa58b8d3528936822acee78e9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/utils.js b/Runtime/wechat-default/unity-sdk/audio/utils.js index 1a0e39b9e..c5b9caa27 100644 --- a/Runtime/wechat-default/unity-sdk/audio/utils.js +++ b/Runtime/wechat-default/unity-sdk/audio/utils.js @@ -10,6 +10,8 @@ export const resumeWebAudio = () => { WEBAudio.audioContext?.resume(); + GameGlobal.Module.mContext?.resume(); + GameGlobal.Module.context?.resume(); }; export const createInnerAudio = () => { const id = uid(); diff --git a/Runtime/wechat-default/unity-sdk/audio/utils.js.meta b/Runtime/wechat-default/unity-sdk/audio/utils.js.meta index 11b823d03..5f177cd24 100644 --- a/Runtime/wechat-default/unity-sdk/audio/utils.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/utils.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a7e1e43d8a6825ef883a04805fa686a5 +guid: a9e54bafd5c78e838a43c82729056d15 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/authorize.js.meta b/Runtime/wechat-default/unity-sdk/authorize.js.meta index 756dac24a..ad9181d12 100644 --- a/Runtime/wechat-default/unity-sdk/authorize.js.meta +++ b/Runtime/wechat-default/unity-sdk/authorize.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9aea2f0543137025b345b1c4f2e165b3 +guid: 736d3868ec9b4bc8641930a6426c7663 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta b/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta index 4611a90b3..287fe9bec 100644 --- a/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 713a669cddc1b0d3d3d958cbaf9f49c1 +guid: 3f0c12678fb9ecd0d86fa4a681d44e15 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/camera.js.meta b/Runtime/wechat-default/unity-sdk/camera.js.meta index 469dcba1b..c7f9ca06a 100644 --- a/Runtime/wechat-default/unity-sdk/camera.js.meta +++ b/Runtime/wechat-default/unity-sdk/camera.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1df83a17a4da78cf858367183e984083 +guid: 51ff4646f5fcb8e3c80e4120d01552dd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/canvas-context.js.meta b/Runtime/wechat-default/unity-sdk/canvas-context.js.meta index aa7729573..910a305f2 100644 --- a/Runtime/wechat-default/unity-sdk/canvas-context.js.meta +++ b/Runtime/wechat-default/unity-sdk/canvas-context.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 29eecf2c17c4c8adef717de8e81a9d4a +guid: 65d52595d15101dfca7f8105fcdc7510 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/canvas.js.meta b/Runtime/wechat-default/unity-sdk/canvas.js.meta index 752e47b2c..8329629f1 100644 --- a/Runtime/wechat-default/unity-sdk/canvas.js.meta +++ b/Runtime/wechat-default/unity-sdk/canvas.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: af01929d16697921e25c3709ac4bf8c4 +guid: 1f8c830da7d1632692b15a09fc2c1d32 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/chat.js.meta b/Runtime/wechat-default/unity-sdk/chat.js.meta index bb447bc51..85d9558da 100644 --- a/Runtime/wechat-default/unity-sdk/chat.js.meta +++ b/Runtime/wechat-default/unity-sdk/chat.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2653b4f27ac94070c19d6ef2c4755739 +guid: da14abeefc8d1ed0ad271357509ab7b8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/cloud.js.meta b/Runtime/wechat-default/unity-sdk/cloud.js.meta index 09f1854ba..35d7c07f1 100644 --- a/Runtime/wechat-default/unity-sdk/cloud.js.meta +++ b/Runtime/wechat-default/unity-sdk/cloud.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 335f6cc7aeafc8aadc0878957dc683ea +guid: 340d72d3c20245ae5b3d33ee902ba245 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/conf.js.meta b/Runtime/wechat-default/unity-sdk/conf.js.meta index 15a7a7455..f93c4f651 100644 --- a/Runtime/wechat-default/unity-sdk/conf.js.meta +++ b/Runtime/wechat-default/unity-sdk/conf.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dde40e2b223abc5927e4759165bef593 +guid: 45ab498079f23b43da03ac02a0c56b81 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/file-info.js.meta b/Runtime/wechat-default/unity-sdk/file-info.js.meta index 5e1a99dd0..ceeae4d38 100644 --- a/Runtime/wechat-default/unity-sdk/file-info.js.meta +++ b/Runtime/wechat-default/unity-sdk/file-info.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 74b34d3cbf56d9dbea8abed92c489701 +guid: 3aa11f8290caa89de5b6e93aef908951 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fix.js.meta b/Runtime/wechat-default/unity-sdk/fix.js.meta index 00fac6c0e..12af005e0 100644 --- a/Runtime/wechat-default/unity-sdk/fix.js.meta +++ b/Runtime/wechat-default/unity-sdk/fix.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 64d41034384b0a30c2b509c4a4bdf231 +guid: 61c4a9357d99954e324a09d41569d30f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font/fix-cmap.js.meta b/Runtime/wechat-default/unity-sdk/font/fix-cmap.js.meta index 283c548c4..0e100bbf3 100644 --- a/Runtime/wechat-default/unity-sdk/font/fix-cmap.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/fix-cmap.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2c24a86991bf9da31d74873e461bf179 +guid: 66a40d9df7979618cbad21d2637e3180 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font/index.js.meta b/Runtime/wechat-default/unity-sdk/font/index.js.meta index 7df492964..5de7c89a7 100644 --- a/Runtime/wechat-default/unity-sdk/font/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e5ff29805407c220017ca85abf51f27c +guid: a015f98467b6cb30eb4511b3429e7768 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font/read-metrics.js.meta b/Runtime/wechat-default/unity-sdk/font/read-metrics.js.meta index b63413481..fa981a1d3 100644 --- a/Runtime/wechat-default/unity-sdk/font/read-metrics.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/read-metrics.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 383b3b212417b1409be4371c988199f7 +guid: fe788b1390da8467e25db543829ee9a8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font/split-sc.js.meta b/Runtime/wechat-default/unity-sdk/font/split-sc.js.meta index 27ae27f0a..2cdb2bb49 100644 --- a/Runtime/wechat-default/unity-sdk/font/split-sc.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/split-sc.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b929dfed6b2c23ddc9b1d14656f851ae +guid: c54a9b57d4630146835a92c6adf53b38 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font/util.js.meta b/Runtime/wechat-default/unity-sdk/font/util.js.meta index 449ba1d8a..112646010 100644 --- a/Runtime/wechat-default/unity-sdk/font/util.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/util.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 932cd927b832929d77570803d839bd4d +guid: 9215e8d7b139ee8d53fc4fa5f16c7975 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fs.js.meta b/Runtime/wechat-default/unity-sdk/fs.js.meta index ca9c317a2..143befac6 100644 --- a/Runtime/wechat-default/unity-sdk/fs.js.meta +++ b/Runtime/wechat-default/unity-sdk/fs.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6ef559783d97aa9e93d6d1fc29483521 +guid: af45d430b31e29a13d43d4f1251f2b6c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/game-club.js.meta b/Runtime/wechat-default/unity-sdk/game-club.js.meta index aa1977315..be18bebcc 100644 --- a/Runtime/wechat-default/unity-sdk/game-club.js.meta +++ b/Runtime/wechat-default/unity-sdk/game-club.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0d0fdb47737a1e4c0b9ca61f17307cb5 +guid: 4cbfe93326c531993ca1765cef3f2ce2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/game-recorder.js.meta b/Runtime/wechat-default/unity-sdk/game-recorder.js.meta index 8f6e6a5b7..f4f252009 100644 --- a/Runtime/wechat-default/unity-sdk/game-recorder.js.meta +++ b/Runtime/wechat-default/unity-sdk/game-recorder.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5fbed826b3078a3b612c62c5ec8c1554 +guid: f514d5c1c7e2729f4278d1a06b20a801 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta b/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta index b71444e32..0feacdd44 100644 --- a/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5b9402695af0478d885bb30326949bc1 +guid: 7e4a493383c66222edae3e9595d805f5 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/index.js.meta b/Runtime/wechat-default/unity-sdk/index.js.meta index 5873374a9..1b11722e4 100644 --- a/Runtime/wechat-default/unity-sdk/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 21147964b091ab8f4a34b9400396793a +guid: 6ca56b3a52d1f594c1bc0d0ac4dc57c2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/logger.js.meta b/Runtime/wechat-default/unity-sdk/logger.js.meta index 6d49fce5d..e27784899 100644 --- a/Runtime/wechat-default/unity-sdk/logger.js.meta +++ b/Runtime/wechat-default/unity-sdk/logger.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 58554b3c9c8fd013aa1ce09ebeefdef3 +guid: 3cffbfd0741bdbd82c1b7d71baa85c3c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta b/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta index 3993c7971..aea494fe2 100644 --- a/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ba39608a082ebdd87df015d51f5230e8 +guid: f922d60cc5829ee3611af058817ecd38 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/module-helper.js.meta b/Runtime/wechat-default/unity-sdk/module-helper.js.meta index efba1fd7f..6b20abbd2 100644 --- a/Runtime/wechat-default/unity-sdk/module-helper.js.meta +++ b/Runtime/wechat-default/unity-sdk/module-helper.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ed6c0cc3367bf16be72f8ccbadcd6411 +guid: 72d48497a74853f02de79e77761e0f5c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/open-data.js.meta b/Runtime/wechat-default/unity-sdk/open-data.js.meta index dff339cfc..c2af84e69 100644 --- a/Runtime/wechat-default/unity-sdk/open-data.js.meta +++ b/Runtime/wechat-default/unity-sdk/open-data.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0e6ca64fa9a4d08d772c4eb53dc90d7e +guid: f83f98e3c16982a649e2452393a268a9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/recorder.js.meta b/Runtime/wechat-default/unity-sdk/recorder.js.meta index 1e7ef0fc4..54f9e4a6d 100644 --- a/Runtime/wechat-default/unity-sdk/recorder.js.meta +++ b/Runtime/wechat-default/unity-sdk/recorder.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 142a80ea7c6045682a598b626dcc9b88 +guid: a1eb54de2dbd31193b791ee51776602f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resType.js b/Runtime/wechat-default/unity-sdk/resType.js index e81a85770..fbc6da17c 100644 --- a/Runtime/wechat-default/unity-sdk/resType.js +++ b/Runtime/wechat-default/unity-sdk/resType.js @@ -1,4 +1,11 @@ export const ResType = { + Gamepad: { + axes: 'IAnyObject[]', + buttons: 'IAnyObject[]', + connected: 'bool', + id: 'string', + index: 'string', + }, AccountInfo: { miniProgram: 'MiniProgram', plugin: 'Plugin', @@ -226,6 +233,14 @@ export const ResType = { GetLogManagerOption: { level: 'number', }, + LoadOption: { + openlink: 'string', + query: 'object', + }, + ShowOption: { + openlink: 'string', + query: 'object', + }, Path2D: {}, OnCheckForUpdateListenerResult: { hasUpdate: 'bool', @@ -496,7 +511,7 @@ export const ResType = { headUrl: 'string', nickname: 'string', nonceId: 'string', - otherInfos: 'AnyKeyword[]', + otherInfos: 'any[]', replayStatus: 'number', status: 'number', errMsg: 'string', @@ -505,7 +520,7 @@ export const ResType = { headUrl: 'string', nickname: 'string', noticeId: 'string', - otherInfos: 'AnyKeyword[]', + otherInfos: 'any[]', reservable: 'bool', startTime: 'string', status: 'number', @@ -574,6 +589,11 @@ export const ResType = { weakNet: 'bool', errMsg: 'string', }, + GetPhoneNumberSuccessCallbackResult: { + code: 'string', + errMsg: 'string', + errno: 'number', + }, GetPrivacySettingSuccessCallbackResult: { needAuthorization: 'bool', privacyContractName: 'string', @@ -598,6 +618,10 @@ export const ResType = { mainSwitch: 'bool', itemSettings: 'object', }, + GetShowSplashAdStatusSuccessCallbackResult: { + status: 'string', + errMsg: 'string', + }, GetStorageInfoSuccessCallbackOption: { currentSize: 'number', keys: 'string[]', @@ -724,6 +748,12 @@ export const ResType = { message: 'string', stack: 'string', }, + OnGamepadConnectedListenerResult: { + gamepad: 'string', + }, + OnGamepadDisconnectedListenerResult: { + gamepad: 'string', + }, OnHandoffListenerResult: { query: 'string', }, @@ -741,14 +771,6 @@ export const ResType = { OnMemoryWarningListenerResult: { level: 'number', }, - OnMenuButtonBoundingClientRectWeightChangeListenerResult: { - bottom: 'number', - height: 'number', - left: 'number', - right: 'number', - top: 'number', - width: 'number', - }, OnMouseDownListenerResult: { button: 'number', timeStamp: 'long', @@ -849,17 +871,6 @@ export const ResType = { subscriptionsSetting: 'SubscriptionsSetting', errMsg: 'string', }, - OperateGameRecorderVideoOption: { - atempo: 'number', - audioMix: 'bool', - bgm: 'string', - desc: 'string', - path: 'string', - query: 'string', - timeRange: 'number[]', - title: 'string', - volume: 'number', - }, MediaSource: { url: 'string', poster: 'string', diff --git a/Runtime/wechat-default/unity-sdk/resType.js.meta b/Runtime/wechat-default/unity-sdk/resType.js.meta index df55d9dad..027bc5fea 100644 --- a/Runtime/wechat-default/unity-sdk/resType.js.meta +++ b/Runtime/wechat-default/unity-sdk/resType.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bce16a6df89268f012822b9cb931c1f3 +guid: c8472c5b3e85f37297135095c6c6e0c7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta index 492bf936b..7b339e159 100644 --- a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta +++ b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4c060e598a8383700d7a2b76a40123e2 +guid: 310f51bb7f4da383caafd0172e171ef6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/response.js.meta b/Runtime/wechat-default/unity-sdk/response.js.meta index 14d417153..515fea1c0 100644 --- a/Runtime/wechat-default/unity-sdk/response.js.meta +++ b/Runtime/wechat-default/unity-sdk/response.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fea2dbdbb276d54fb6c2a4a32dab0a56 +guid: f7626753685a7095ca4845b8117afa43 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/sdk.js.meta b/Runtime/wechat-default/unity-sdk/sdk.js.meta index a18bf6448..ae1b7a121 100644 --- a/Runtime/wechat-default/unity-sdk/sdk.js.meta +++ b/Runtime/wechat-default/unity-sdk/sdk.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4d8c5f71bf7fc934299663d29dbf6d94 +guid: 5b3a2d67e244b3dbf3172ec1b0cc23da DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/share.js.meta b/Runtime/wechat-default/unity-sdk/share.js.meta index 1f8cadc09..457e11139 100644 --- a/Runtime/wechat-default/unity-sdk/share.js.meta +++ b/Runtime/wechat-default/unity-sdk/share.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9d08c459f74d9830e732005dc5a45681 +guid: 8584bbb618d34f6d676726eb9a4d4caf DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/storage.js.meta b/Runtime/wechat-default/unity-sdk/storage.js.meta index 7cc141adf..ddd11710c 100644 --- a/Runtime/wechat-default/unity-sdk/storage.js.meta +++ b/Runtime/wechat-default/unity-sdk/storage.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 04cadfaa606bb99101bb63006258519e +guid: 3614d6c3becf8c2c4a151c3e2ed4c402 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/texture.js.meta b/Runtime/wechat-default/unity-sdk/texture.js.meta index 363f30d6f..0097d6fa7 100644 --- a/Runtime/wechat-default/unity-sdk/texture.js.meta +++ b/Runtime/wechat-default/unity-sdk/texture.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d3512debef4835e62b3b5a6d37199989 +guid: 42631eea5fd94de5f20cce0767074fc6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/touch/index.js.meta b/Runtime/wechat-default/unity-sdk/touch/index.js.meta index 845994f68..dd9e05be7 100644 --- a/Runtime/wechat-default/unity-sdk/touch/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/touch/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 043d13d25597559405e8b68363dec9f3 +guid: fa884bc4fb22fa186b83ab2e39ddfd70 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/upload-file.js.meta b/Runtime/wechat-default/unity-sdk/upload-file.js.meta index b6575fa7c..bd02f4811 100644 --- a/Runtime/wechat-default/unity-sdk/upload-file.js.meta +++ b/Runtime/wechat-default/unity-sdk/upload-file.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2955cdc3239cec2bd8eb0fdba6d90158 +guid: c46768920f257a350bcf2c8f63138c67 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/userinfo.js.meta b/Runtime/wechat-default/unity-sdk/userinfo.js.meta index 766de507d..8fd66b24f 100644 --- a/Runtime/wechat-default/unity-sdk/userinfo.js.meta +++ b/Runtime/wechat-default/unity-sdk/userinfo.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8998e29409d4f9370dfb2ed20bdddf05 +guid: 35ecbf3e5fdf34594cae3c9802a59a11 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/util.js.meta b/Runtime/wechat-default/unity-sdk/util.js.meta index 270504b50..4c54a9d2c 100644 --- a/Runtime/wechat-default/unity-sdk/util.js.meta +++ b/Runtime/wechat-default/unity-sdk/util.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b37331d1365e0b5e75eca2c997e5e29 +guid: 9ed2292659375e6992722450fad8d8ee DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/utils.js b/Runtime/wechat-default/unity-sdk/utils.js index 1d47e36d0..aee1120f7 100644 --- a/Runtime/wechat-default/unity-sdk/utils.js +++ b/Runtime/wechat-default/unity-sdk/utils.js @@ -24,7 +24,7 @@ const typeMap = { number: 0, bool: false, object: {}, -}; +}; // 类型默认值映射 const interfaceTypeMap = { array: 'object', arrayBuffer: 'object', diff --git a/Runtime/wechat-default/unity-sdk/utils.js.meta b/Runtime/wechat-default/unity-sdk/utils.js.meta index 0a76b5953..d988b4162 100644 --- a/Runtime/wechat-default/unity-sdk/utils.js.meta +++ b/Runtime/wechat-default/unity-sdk/utils.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9b87ec7c6721010a976a680a8ae79e80 +guid: cfe9add54488722b099d864c563e199d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.js.meta b/Runtime/wechat-default/unity-sdk/video.js.meta index 71efb7245..14452f6d2 100644 --- a/Runtime/wechat-default/unity-sdk/video.js.meta +++ b/Runtime/wechat-default/unity-sdk/video.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 20b955aaa3f7f3faa79894c2b1884c38 +guid: 9effea75059fef2f3db029d199ed48f9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video/index.js.meta b/Runtime/wechat-default/unity-sdk/video/index.js.meta index 74b38c5cf..8a97a1b38 100644 --- a/Runtime/wechat-default/unity-sdk/video/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/video/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4434e764ea58d862a7623d37b279b515 +guid: 50da07ebf529a662c169341f89792f62 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/wasmcode/game.js.meta b/Runtime/wechat-default/wasmcode/game.js.meta index 1c6e02217..83771d3c9 100644 --- a/Runtime/wechat-default/wasmcode/game.js.meta +++ b/Runtime/wechat-default/wasmcode/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7538c4bcfd3599dc1fe247d3ce338eab +guid: 52d1e3ce411239e5d4b45af3fc031cb3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/weapp-adapter.js b/Runtime/wechat-default/weapp-adapter.js index 1ad847b95..d6d67579c 100644 --- a/Runtime/wechat-default/weapp-adapter.js +++ b/Runtime/wechat-default/weapp-adapter.js @@ -1197,8 +1197,52 @@ const isWK = false; identifier: formatIdentifier(v.identifier, type, changed) }; } + let activeTouchId = -1; function touchEventHandlerFactory(type) { return function (event) { + // 禁止多点触控 + if (GameGlobal.disableMultiTouch) { + if (event.touches.length > 0 || event.changedTouches.length > 0) { + if (activeTouchId !== -1) { + const touch = event.touches.find(v => v.identifier === activeTouchId); + const changedTouch = event.changedTouches.find(v => v.identifier === activeTouchId); + event.touches = touch ? [touch] : []; + event.changedTouches = changedTouch ? [changedTouch] : []; + } + else { + event.touches = event.touches.slice(0, 1); + event.changedTouches = event.changedTouches.slice(0, 1); + } + let getFirstTouchId; + if (event.changedTouches.length > 0) { + getFirstTouchId = event.changedTouches[0].identifier; + } + if (type === 'touchstart') { + if (activeTouchId === -1) { + activeTouchId = getFirstTouchId; + } + else { + return; + } + } + else if (type === 'touchmove') { + if (getFirstTouchId !== activeTouchId) { + return; + } + } + else if (type === 'touchend') { + if (getFirstTouchId === activeTouchId) { + activeTouchId = -1; + } + else { + return; + } + } + else if (type === 'touchcancel') { + activeTouchId = -1; + } + } + } const touchEvent = new TouchEvent(type); touchEvent.touches = event.touches.map(v => formatTouchEvent(v, event.type)); touchEvent.targetTouches = Array.prototype.slice.call(event.touches).map(v => formatTouchEvent(v, event.type)); diff --git a/Runtime/wechat-default/weapp-adapter.js.meta b/Runtime/wechat-default/weapp-adapter.js.meta index 5df7f619d..8da3be5c4 100644 --- a/Runtime/wechat-default/weapp-adapter.js.meta +++ b/Runtime/wechat-default/weapp-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f4a9950200dc9e4dbdf31188da821c39 +guid: 3bcd415cc0007333273e1c911f96f0f7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/workers/response/index.js.meta b/Runtime/wechat-default/workers/response/index.js.meta index 53f9d7ba9..f1612c727 100644 --- a/Runtime/wechat-default/workers/response/index.js.meta +++ b/Runtime/wechat-default/workers/response/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 82aa5ddbfe75ed45ffd9876654dddc5f +guid: d08c00090c3cc4e761281bb192084f5e DefaultImporter: externalObjects: {} userData: