diff --git a/CHANGELOG.md b/CHANGELOG.md index 21a314787..98d33dbb3 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 d22449ee1..9318ad121 100644 --- a/Editor/WXConvertCore.cs +++ b/Editor/WXConvertCore.cs @@ -809,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"; @@ -875,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 @@ -1911,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 f60905e69..085a731e3 100644 --- a/Editor/WXPluginVersion.cs +++ b/Editor/WXPluginVersion.cs @@ -2,7 +2,7 @@ namespace WeChatWASM { public class WXPluginVersion { - public static string pluginVersion = "202503201129"; // 这一行不要改他,导出的时候会自动替换 + public static string pluginVersion = "202505070335"; // 这一行不要改他,导出的时候会自动替换 } public class WXPluginConf diff --git a/Editor/wx-editor.dll b/Editor/wx-editor.dll index 8214821b9..342663084 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/Editor/wx-editor.xml.meta b/Editor/wx-editor.xml.meta index 2d1f67cbf..6c1bf06cd 100644 --- a/Editor/wx-editor.xml.meta +++ b/Editor/wx-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: de30b00673b9e3c767982f8dcc838a6c +guid: efd1b5a9325db358e70d7a6c62aeaa71 DefaultImporter: externalObjects: {} userData: 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 a961ad3f2..dc94ed0f3 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 a117cc5d7..e1eeacb32 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..7964732a4 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 协议) @@ -4283,7 +4319,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 +5676,8 @@ - 需要基础库: `3.4.3` - 是否处于省电模式,目前仅 iOS 端支持 + 需要基础库: `3.5.0` + 是否处于省电模式 @@ -6308,6 +6344,21 @@ 接口调用成功的回调函数 + + + 动态令牌 + + + + + 回调信息(成功失败都会返回) + + + + + 错误码(失败时返回) + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -6454,6 +6505,41 @@ 超时时间,单位 ms + + + 接口调用结束的回调函数(调用成功、失败都会执行) + + + + + 接口调用失败的回调函数 + + + + + 接口调用成功的回调函数 + + + + + 封面广告组件展示状态码 + 可选值: + - -1: 初始值,状态未知; + - 1: 展示成功; + - 2: 主动拦截过滤,不展示广告; + - 3: 展示超时; + + + + + 封面广告组件展示状态 + 可选值: + - 'unknown': 初始值,状态未知; + - 'pending': 进行展示中; + - 'success': 展示成功; + - 'fail': 展示失败; + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -6944,7 +7030,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 +7350,16 @@ 错误调用堆栈 + + + 本次连接到的 Gamepad 实例。 + + + + + 本次断开的 Gamepad 实例。 + + 需要传递给接力客户端的 query @@ -7303,36 +7399,6 @@ - 15: TRIM_MEMORY_RUNNING_CRITICAL; - - - 下边界坐标,单位:px - - - - - 高度,单位:px - - - - - 左边界坐标,单位:px - - - - - 右边界坐标,单位:px - - - - - 上边界坐标,单位:px - - - - - 宽度,单位:px - - 按键类型,0左键,1中键,2右键 @@ -7414,16 +7480,6 @@ - 'stop': 结束录屏; - - - 错误信息 - - - - - 是否成功 - - 转发显示图片的链接,可以是网络图片路径或本地图片文件路径或相对代码包根目录的图片文件路径。(该图片用于分享到朋友圈的卡片以及从朋友圈转发到会话消息的卡片展示) @@ -7438,12 +7494,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 +8009,21 @@ 对局回放背景音乐的地址 + + + 接口调用结束的回调函数(调用成功、失败都会执行) + + 分享的对局回放打开后的描述内容 + + + 接口调用失败的回调函数 + + 分享的对局回放打开后跳转小游戏的 path (独立分包路径) @@ -7968,6 +8034,11 @@ 分享的对局回放打开后跳转小游戏的 query + + + 接口调用成功的回调函数 + + 对局回放的剪辑区间,是一个二维数组,单位 ms(毫秒)。[[1000, 3000], [4000, 5000]] 表示剪辑已录制对局回放的 1-3 秒和 4-5 秒最终合成为一个 3 秒的对局回放。对局回放剪辑后的总时长最多 60 秒,即 1 分钟 @@ -8570,7 +8641,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 +8765,7 @@ 可选值: - 'barCode': 一维码; - 'qrCode': 二维码; + - 'wxCode': 小程序码; - 'datamatrix': Data Matrix 码; - 'pdf417': PDF417 条码; @@ -9040,7 +9112,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 +9171,7 @@ - 当点击完成时键盘是否收起 + 当点击完成时键盘是否保持显示 @@ -10053,14 +10125,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 +10146,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-editor.xml.meta b/Runtime/Plugins/wx-runtime-editor.xml.meta index bb7add6c8..9daec1987 100644 --- a/Runtime/Plugins/wx-runtime-editor.xml.meta +++ b/Runtime/Plugins/wx-runtime-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 796356e817f1ef1f5429227f2169bba7 +guid: 19682f1ce552909d28f2256dfff99849 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/wx-runtime.dll b/Runtime/Plugins/wx-runtime.dll index 9bc2bf395..790c61309 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..004e076b2 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 协议) @@ -4289,7 +4325,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 +5682,8 @@ - 需要基础库: `3.4.3` - 是否处于省电模式,目前仅 iOS 端支持 + 需要基础库: `3.5.0` + 是否处于省电模式 @@ -6314,6 +6350,21 @@ 接口调用成功的回调函数 + + + 动态令牌 + + + + + 回调信息(成功失败都会返回) + + + + + 错误码(失败时返回) + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -6460,6 +6511,41 @@ 超时时间,单位 ms + + + 接口调用结束的回调函数(调用成功、失败都会执行) + + + + + 接口调用失败的回调函数 + + + + + 接口调用成功的回调函数 + + + + + 封面广告组件展示状态码 + 可选值: + - -1: 初始值,状态未知; + - 1: 展示成功; + - 2: 主动拦截过滤,不展示广告; + - 3: 展示超时; + + + + + 封面广告组件展示状态 + 可选值: + - 'unknown': 初始值,状态未知; + - 'pending': 进行展示中; + - 'success': 展示成功; + - 'fail': 展示失败; + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -6950,7 +7036,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 +7356,16 @@ 错误调用堆栈 + + + 本次连接到的 Gamepad 实例。 + + + + + 本次断开的 Gamepad 实例。 + + 需要传递给接力客户端的 query @@ -7309,36 +7405,6 @@ - 15: TRIM_MEMORY_RUNNING_CRITICAL; - - - 下边界坐标,单位:px - - - - - 高度,单位:px - - - - - 左边界坐标,单位:px - - - - - 右边界坐标,单位:px - - - - - 上边界坐标,单位:px - - - - - 宽度,单位:px - - 按键类型,0左键,1中键,2右键 @@ -7420,16 +7486,6 @@ - 'stop': 结束录屏; - - - 错误信息 - - - - - 是否成功 - - 转发显示图片的链接,可以是网络图片路径或本地图片文件路径或相对代码包根目录的图片文件路径。(该图片用于分享到朋友圈的卡片以及从朋友圈转发到会话消息的卡片展示) @@ -7444,12 +7500,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 +8015,21 @@ 对局回放背景音乐的地址 + + + 接口调用结束的回调函数(调用成功、失败都会执行) + + 分享的对局回放打开后的描述内容 + + + 接口调用失败的回调函数 + + 分享的对局回放打开后跳转小游戏的 path (独立分包路径) @@ -7974,6 +8040,11 @@ 分享的对局回放打开后跳转小游戏的 query + + + 接口调用成功的回调函数 + + 对局回放的剪辑区间,是一个二维数组,单位 ms(毫秒)。[[1000, 3000], [4000, 5000]] 表示剪辑已录制对局回放的 1-3 秒和 4-5 秒最终合成为一个 3 秒的对局回放。对局回放剪辑后的总时长最多 60 秒,即 1 分钟 @@ -8576,7 +8647,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 +8771,7 @@ 可选值: - 'barCode': 一维码; - 'qrCode': 二维码; + - 'wxCode': 小程序码; - 'datamatrix': Data Matrix 码; - 'pdf417': PDF417 条码; @@ -9046,7 +9118,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 +9177,7 @@ - 当点击完成时键盘是否收起 + 当点击完成时键盘是否保持显示 @@ -10059,14 +10131,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 +10152,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.xml.meta b/Runtime/Plugins/wx-runtime.xml.meta index aef90bd3f..1b319aebe 100644 --- a/Runtime/Plugins/wx-runtime.xml.meta +++ b/Runtime/Plugins/wx-runtime.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bceb1444171fa1a7c7f482b2272cbb8b +guid: f73b38d14ca43e58073c26e46ff01a0a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/WX.cs b/Runtime/WX.cs index da06f19a3..9271d69ae 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 的结构** /// | 属性 | 类型 | 说明 | /// | ------- |------- | -------------------------------------- | @@ -737,9 +738,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 +788,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 +864,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 +1382,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 +1400,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 事件后才能调用。后台接入方式与小程序一致,详见 [客服消息接入](#) /// **注意事项** /// - 在客服会话内点击小程序消息卡片进入小程序时,不能通过 wx.onShow 或 wx.getEnterOptionsSync 等接口获取启动路径和参数,而是应该通过 wx.openCustomerServiceConversation 接口的 success 回调获取启动路径和参数 /// @@ -1455,6 +1473,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 +1766,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)。 /// - 系统订阅消息只需要订阅一次,永久有效。 /// **错误码** @@ -2135,7 +2162,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 +2577,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 +2607,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 +2630,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 +2641,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 +3001,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 +3092,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 +3161,9 @@ namespace WeChatWASM /// **示例代码** /// ```js /// wx.onMemoryWarning(function () { - /// console.log('onMemoryWarningReceive') + /// console.log('onMemoryWarningReceive') /// }) - /// `` + /// ``` /// </summary> public static void OnMemoryWarning(Action<OnMemoryWarningListenerResult> result) { @@ -3128,28 +3175,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 +3531,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 +3702,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 +3720,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 +3919,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 +3932,8 @@ namespace WeChatWASM /// // 预期接收方可以通过以下方式拿到设置 /// wx.getEnterOptionsSync().query.shareMessageToFriendScene // 1 /// wx.getEnterOptionsSync().query.query // 'testquery' - /// 示例代码-特殊字符query** + /// ``` + /// **示例代码-特殊字符query** /// ```js /// // 发送方 /// wx.setMessageToFriendQuery({ 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 e4d225cb0..06b0b8887 100644 --- a/Runtime/wechat-default/check-version.js.meta +++ b/Runtime/wechat-default/check-version.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7458a53d203b94cec8e301493f1047ee +guid: 7a96e0a653f3e68825cb4153ac98d2a5 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/data-package/game.js.meta b/Runtime/wechat-default/data-package/game.js.meta index 715b56a0b..22f20cf4f 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: 1cec0016d087e543ed1ecc9075dd0b37 +guid: b83ce95d7a528a63cd594d912dc3d3ff DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/events.js.meta b/Runtime/wechat-default/events.js.meta index 04af63f81..5c848bdb8 100644 --- a/Runtime/wechat-default/events.js.meta +++ b/Runtime/wechat-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 64aee071d9533c347011dce5d3f81730 +guid: 2808d90aab44b1ee252a21da58e35bba DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.js.meta b/Runtime/wechat-default/game.js.meta index fb22801e8..ff54d878c 100644 --- a/Runtime/wechat-default/game.js.meta +++ b/Runtime/wechat-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 11199437bff29959a23ac333f8048509 +guid: 7a40b3da71a516caf59692fdf5f5cabd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.json.meta b/Runtime/wechat-default/game.json.meta index 15ace6a0b..7e6cdbb7f 100644 --- a/Runtime/wechat-default/game.json.meta +++ b/Runtime/wechat-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 723efd1c7bf424ccb43e544c52863083 +guid: f286b1c77bca9a37d339a70b7f410cbb DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/background.jpg.meta b/Runtime/wechat-default/images/background.jpg.meta index e0c6aaa38..2300926c3 100644 --- a/Runtime/wechat-default/images/background.jpg.meta +++ b/Runtime/wechat-default/images/background.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 07107ad194645475e363ef602d031774 +guid: fe6051c4649b0f8dda180d29a33b773c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/unity_logo.png.meta b/Runtime/wechat-default/images/unity_logo.png.meta index 55b4fb8ab..59dc5f8ee 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: f7559808db4c05d5251cd8b7dc1b9c74 +guid: 2749dbcf672b69d1f646cab7ba08cea9 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 2ae3ddcd9..650994352 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: 12ef48bb4bf9d7f732dd00aaca5d6692 +guid: cf7449bdad8341dd6748563625165cee 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 423677c6a..c96c1d3fb 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: a694243b68921ef5c6907ce002ef472e +guid: 9a32bd403854f2c194c30c941eb3eed7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/index.js.meta b/Runtime/wechat-default/open-data/index.js.meta index 0bb6ddcb5..50619f6d8 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: 5535c3721abef84db6f8567761be9cef +guid: a7bb8833a8e168576835c1ec68f0cb66 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/loading.js.meta b/Runtime/wechat-default/open-data/loading.js.meta index eeee5c10b..0902ee1ee 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: 6000b768f6c79001e9ac13bae4f62955 +guid: c53bcbfb33e6359996b87f1a6c996029 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 631fc97ac..987c61c71 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: 2d8d4ac41182abbfb6def3d4407795c5 +guid: 1267da79e757f7d23926f762b6913056 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 f0bd4e753..cdeef0864 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: 2acde6d2057055d037358fde493133ad +guid: 4d39d94b4d70729dfbdbf4b8cac439fd 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 cedd97c90..f39953758 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: ac54f3d46d95b15e3e3a781fb92e3e66 +guid: 003df7147b1574e6523d07f34ddd075c 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 f682bc376..fee461508 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: 4586c84c0b19d3ca580b43f51b0a082a +guid: 172838b944130ebaddfba4763a7821bc 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 a91f57b92..8745449d3 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: 4c886f4c050cb9db535f3eba1983b4c3 +guid: 67c5ec5b2765d179e55214a00c4743bf 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 f24c40829..91340df12 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: 9d81de9efae5330c276d170dcda1f072 +guid: d4cad7d5936198de751e000cc6acd696 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 fdbd666e2..7fb74dfd4 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: 7334a144a92f19d61915d635b9d0e5f6 +guid: 325860ffb5bd677b8408cd68654200af 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 ce81749e4..26def3a11 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: d62bdbb7596469389312e77f50f5d7b2 +guid: 30f1d0200f038ef844bef617c82a6c20 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 2ad36a5cf..442d819f9 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: 82bf166391e2308c819376bc335752a1 +guid: 0fb8c444a8527e8e1bb08fe7faa4c261 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 f35d9ca17..84111e68a 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: a499a40c54fe7ab2ec57d0bbcaaa2379 +guid: 7133efa2e2d56beacb36021f6f5a976d 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 34a8d98d6..936df6876 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: 699aa6cf94ae48e07177b100ef7dd441 +guid: 05e67f2b9fe55b772474b41931ccbad5 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 1a855eabf..54ab7b201 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: 9a5156d06eb6321b47e1f73ca741ad20 +guid: 64b517f445254925d626ea76ecedd5fe 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 f6c7003a8..6cb9f0e98 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: 10bf77ddd0630561c493e9ce6a14e174 +guid: 64e0a9b47d84f350c8d743e76916e294 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 a1bca3889..3a17ed145 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: e3303aa463b3fc3f4e5abb1dc8485b0a +guid: 94c40353613637d01961868e423644c1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugin-config.js.meta b/Runtime/wechat-default/plugin-config.js.meta index f1b405d32..043d0ad7c 100644 --- a/Runtime/wechat-default/plugin-config.js.meta +++ b/Runtime/wechat-default/plugin-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: efce2b538447c86ad4b9015aa43757fd +guid: 30bbb345de3b5c83b9f69cb6ca18fbc1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/check-update.js.meta b/Runtime/wechat-default/plugins/check-update.js.meta index bfd40f450..2f20917b4 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: 209f6445727a3a42e3cdce1e78fae606 +guid: 6cfb6b44ff0e0d60777f8c5b73890112 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/screen-adapter.js.meta b/Runtime/wechat-default/plugins/screen-adapter.js.meta index 6eac69168..705a43191 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: fd127891c85f766e457e2ac5e2f30606 +guid: 1c57316bf87dbdbbf2991696a710a281 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/project.config.json.meta b/Runtime/wechat-default/project.config.json.meta index f74839fbb..4534f6fbd 100644 --- a/Runtime/wechat-default/project.config.json.meta +++ b/Runtime/wechat-default/project.config.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fdc6db6b0e454f94be9c4c8e6571e6fe +guid: 7111a97ef2df9c3c514cc18fa068bfa0 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/texture-config.js.meta b/Runtime/wechat-default/texture-config.js.meta index 852a0f1fe..96e2a69f7 100644 --- a/Runtime/wechat-default/texture-config.js.meta +++ b/Runtime/wechat-default/texture-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aec3e23437af6e06c4879aab5f83c1d5 +guid: 7f1c8c2f6a9ad41df4ef11ba4655333d 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 0c970424e..d416fe6f1 100644 --- a/Runtime/wechat-default/unity-namespace.js.meta +++ b/Runtime/wechat-default/unity-namespace.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1a3d7f4aa993eca0b1bbeeab07cf31eb +guid: 2258ff9139b90f5f2fbfedf429e15b57 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 642817f90..43b11fe4c 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: 99a79345f94488f74b4ed55378611cc0 +guid: 3033451267d4dbd688d2cf9688cbda39 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 9fabc94c2..bd7fbd36b 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: b374025e503de25869898cb485d4752e +guid: 37b03444b791f66c7820762069e07762 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/ad.js.meta b/Runtime/wechat-default/unity-sdk/ad.js.meta index cb3fbaecf..4dcf8652c 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: 5650a5cda6b9af0f68e1b833e662e5cb +guid: dc381840cc746d3ae85b402219284e99 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 3e93bb49b..5b1ddb9d5 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: 2129787324bb003bad3215bcfb99f3af +guid: 2d89a1dd0fe1eb9090f633d62cd0700e 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 c22507ef5..073d94507 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: 5a0f4879d438dd28b9ca2cea34f1cd66 +guid: 7f7f00e418f948aee97dd34d3ca630f5 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 2062424ed..70057d1e3 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: beeed2616d43505a19894d0810f67c87 +guid: ad0868418e637fe827736f41e7e3961f 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 d24055e0b..8dc5edc5b 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: b1370e90f3fabacb13866fdafab49974 +guid: 21d0ee1af2faa8aa12361a6b33b40515 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 e154cc1a4..0e770814f 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: 04c1c097e15dbce3f11a8a59ce889ba4 +guid: 062ca758b128e6c23b1522943d673961 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 ecf281506..248717f05 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: 89b24e4c4811ae41d5768f53772ec9c7 +guid: dd4f77f584d999f455831b89004c30b8 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 d284e2fc9..a662dd451 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: ab4929520e388d3e3b8ff28760df61b1 +guid: 3ed26ca22eaa0efb3f09785d90e3192f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/authorize.js.meta b/Runtime/wechat-default/unity-sdk/authorize.js.meta index a35c81f86..0ce2cf704 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: e68958f293002c38063b5e16a7e99164 +guid: 7c2cecc418461f30dcf809034e880577 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 522238295..4e6111b73 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: 8ebfce3a0af3b658d754ff2031a60f51 +guid: 3a9004f10554bff3eeab5b16172611ee DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/camera.js.meta b/Runtime/wechat-default/unity-sdk/camera.js.meta index 1b330fa3f..2abcdf7d3 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: b69b0e28446c3554079944462b9b4280 +guid: 089cc7d83cb516f594128386791e8285 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 f7d5c80f3..8cd540be2 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: 47dcc4ae345dd1a69ad13c4e027b208d +guid: 9196e4534bba438c81a3039377f4cd88 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/canvas.js.meta b/Runtime/wechat-default/unity-sdk/canvas.js.meta index 1ff78a3da..027cbd7f5 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: 239b00582a1b1b7309b8c4fea820d0f9 +guid: 60df8e5f2708ef983d934140be38cd70 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/chat.js.meta b/Runtime/wechat-default/unity-sdk/chat.js.meta index a0e09d4e6..3ae09cd26 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: cceb0597593867c41e250559482f9deb +guid: 483581fe5c70aa8f25152859213ef8c4 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/cloud.js.meta b/Runtime/wechat-default/unity-sdk/cloud.js.meta index ea8288cc1..a2cef0624 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: 89809d2b88d8fe9c4b4431cabd851247 +guid: 7d402b2887a693c82f4749a4901d723f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/conf.js.meta b/Runtime/wechat-default/unity-sdk/conf.js.meta index 4252ea783..eadfacd63 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: 465f98ac20795c8869ccd3eb778b5934 +guid: 1654726387c2c8991400d8bd0b981cf1 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 a211ef358..5e61a7655 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: 4e8a0e5959a296aa94ea69fb34b50baf +guid: f662c60fb8060b3d72d0ddeebd6ee73d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fix.js.meta b/Runtime/wechat-default/unity-sdk/fix.js.meta index 401693e57..38470c263 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: 856abe7fe8553d05d4633936eec456fe +guid: ff8148236b46c4939349ec48734a77ac 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 4aa67e7f4..f681665b7 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: 2ce608b628ed79ffe0d0264d74cde36c +guid: ee81d6cc02114cbd8cad5aa5d837aa64 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 04716b0bf..06ea2bd5c 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: 5f1edc3a2bb3ca13f25470825ac3ba05 +guid: f264d29f34e8ef20449c04f642f24df7 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 617ff65b3..617990ea1 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: 0384d98d8df9db9f2958bf4809ec337f +guid: 3373f6ff61c44dc98b37e13630fb44ad 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 b28890472..e725f66ff 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: 1f8cfe3c5c480380519c7c01abf52a16 +guid: c58220de3038c4a2f5e0ec7bb10c0ed1 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 0f008e38b..14d479d48 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: 1f675616e975f8f20cfe607b8d73b3dd +guid: 55e6f527c28df91314b5732ce69551e0 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fs.js.meta b/Runtime/wechat-default/unity-sdk/fs.js.meta index 90f1107e7..ba841454e 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: 9dc1ca2ad7ad96b7c7e18ecbd25bf97e +guid: 2eb4eab0b03c78a52dac03f0465a6706 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 3ef02a06d..7f6a10707 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: d3fb29bdab17d05616495d7d02c22799 +guid: 71f8eeea5df94c91f873b05d3684fd2e 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 30bd775aa..02d53dec8 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: 528990423ee7e2a1f84a51728873dcd3 +guid: 8571a7d6af588da67b874971b6f861de 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 747309600..be7afaf06 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: 043444941a2e6cd1ceefb488bac9172a +guid: 472d9dcb4fb09315af6c284b9f987536 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/index.js.meta b/Runtime/wechat-default/unity-sdk/index.js.meta index c145bf8d1..5d1677d93 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: 10628f13e5cf82f74974f1009fda974c +guid: 9f4739f62f7ea84f360e32a3f9b8808d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/logger.js.meta b/Runtime/wechat-default/unity-sdk/logger.js.meta index 6c7837cf6..5146aece7 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: 1330ef64516a2d48aa5f2e3f28d9eedc +guid: 480a2ccebe1123e484310abe412ba77e 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 0c69284b0..25d6a7fe1 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: 9c29e11ea425f6221dd61ec9f01ba97a +guid: b9ad80647831b1ae4d506d446ce7a225 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 584e8bbcc..83f807ce5 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: baf01de91d2e0d3a27ef8e97f76322d5 +guid: 269016ae5e9d8f86f663dad34640d629 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 f77e15c16..8c7d9a7c2 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: 8e6f6377d0174a82e2d96316846e638c +guid: 378214ad8849f2c50babdcb9148b837e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/recorder.js.meta b/Runtime/wechat-default/unity-sdk/recorder.js.meta index ede3958ef..62edce4bd 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: c5714b972a8fc6bcbe227eb0710c6268 +guid: b607a44b3005e1e3a08398c846f8b1fa DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resType.js b/Runtime/wechat-default/unity-sdk/resType.js index e81a85770..1cc38b161 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', @@ -496,7 +503,7 @@ export const ResType = { headUrl: 'string', nickname: 'string', nonceId: 'string', - otherInfos: 'AnyKeyword[]', + otherInfos: 'any[]', replayStatus: 'number', status: 'number', errMsg: 'string', @@ -505,7 +512,7 @@ export const ResType = { headUrl: 'string', nickname: 'string', noticeId: 'string', - otherInfos: 'AnyKeyword[]', + otherInfos: 'any[]', reservable: 'bool', startTime: 'string', status: 'number', @@ -574,6 +581,11 @@ export const ResType = { weakNet: 'bool', errMsg: 'string', }, + GetPhoneNumberSuccessCallbackResult: { + code: 'string', + errMsg: 'string', + errno: 'number', + }, GetPrivacySettingSuccessCallbackResult: { needAuthorization: 'bool', privacyContractName: 'string', @@ -598,6 +610,10 @@ export const ResType = { mainSwitch: 'bool', itemSettings: 'object', }, + GetShowSplashAdStatusSuccessCallbackResult: { + status: 'string', + errMsg: 'string', + }, GetStorageInfoSuccessCallbackOption: { currentSize: 'number', keys: 'string[]', @@ -724,6 +740,12 @@ export const ResType = { message: 'string', stack: 'string', }, + OnGamepadConnectedListenerResult: { + gamepad: 'string', + }, + OnGamepadDisconnectedListenerResult: { + gamepad: 'string', + }, OnHandoffListenerResult: { query: 'string', }, @@ -741,14 +763,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 +863,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 c9bf827bb..abfcd6537 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: e32d3034bdbc36996ef98be8584ffcd4 +guid: 200e24f3569393f4601acd2c64ef2a3f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta index 51a71e459..1c4f8663b 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: 235f65c17d3c9daf2e10b2c9c1f46c40 +guid: 471cc0dc9bf300093c2ce9dfe3874343 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/response.js.meta b/Runtime/wechat-default/unity-sdk/response.js.meta index 83327a2dc..6498e8a8c 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: dfa4eeb1fe7d6df3849b855a2fe4c8cb +guid: 23c3f48c4199f71ae8029f5383c402b9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/sdk.js.meta b/Runtime/wechat-default/unity-sdk/sdk.js.meta index 2ab341d21..575abf68b 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: f0ff7f0c8e354b5f27b699214e82673b +guid: 5cf1a4186cbdbb64db956595af6a5cfd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/share.js.meta b/Runtime/wechat-default/unity-sdk/share.js.meta index 330f23e34..b6e7f3168 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: f283ef6b4ae6c3cf56d251e3f9edbc2b +guid: 3759d599e6c216fd7f77c93ca2a306da DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/storage.js.meta b/Runtime/wechat-default/unity-sdk/storage.js.meta index a255b6f3c..1686dbb56 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: 12f0b78f6971d0c2ef78a6569a56f22e +guid: 212ad7391801bff50bc53b0d791133c0 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/texture.js.meta b/Runtime/wechat-default/unity-sdk/texture.js.meta index 0b87f8b27..f068fdab3 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: 233179598e0d3c6a2bd7a88b0cfaef6d +guid: 15b3b7264c1d84e7fa9022ed9ca9b7e1 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 366941fb3..34fd9593c 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: a7add0e522937655ac5b480a2bc2f03b +guid: 484b93784c3bfa56d91a6f2cd754b917 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 9b34e6151..70a79a991 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: 17361beb484be3a3615fcad45bf99a40 +guid: b26d65848fc680deffef986f8c67583f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/userinfo.js.meta b/Runtime/wechat-default/unity-sdk/userinfo.js.meta index d83006df7..dea9ffa54 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: 6dabf5cf02704da3289bd984298f9f9c +guid: a85d67792e34644665444f4ae70c5624 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/util.js.meta b/Runtime/wechat-default/unity-sdk/util.js.meta index 29ef82f84..4d1876528 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: 7df9232755091dba206c92e6c58ad052 +guid: 94c6c5e775c600fae169cefb9aa54874 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 1676bb20a..f305b127c 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: b96e022596dfcce19d3e1d3921b7944d +guid: 15a7c65386e5650c332551acc24f6b1b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.js.meta b/Runtime/wechat-default/unity-sdk/video.js.meta index 33df744d4..f5475d23c 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: 953ee8b0ad35986b2ed94d29de05e030 +guid: 4da238dd293947be69b9a0a58829472d 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 57df16966..f212d9261 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: 963691ecc4020d2dc3b3d3c6bca7eaa3 +guid: 71da8a1b33a7510723010ba4b43b4749 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/wasmcode/game.js.meta b/Runtime/wechat-default/wasmcode/game.js.meta index 75d88edd7..37cf46640 100644 --- a/Runtime/wechat-default/wasmcode/game.js.meta +++ b/Runtime/wechat-default/wasmcode/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 062332f8661e116083141475eddb0b26 +guid: 14c5e8ebf538e6cb30fb68aa91acb74d 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 12b790d50..52abc4162 100644 --- a/Runtime/wechat-default/weapp-adapter.js.meta +++ b/Runtime/wechat-default/weapp-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 020faa8dfc48a379736de026e738f098 +guid: ac6f9f0a70555f8db6d3323a0fdae104 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/workers/response/index.js.meta b/Runtime/wechat-default/workers/response/index.js.meta index ea3eb5b49..6e2575a7e 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: e772cc1b13a445fe6f6ab9491ca55453 +guid: 688570fbd0f53319b5da4397105a15d0 DefaultImporter: externalObjects: {} userData: diff --git a/package.json b/package.json index fe757f366..7c1c0b9f2 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.25","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.26","unity":"2019.4","unityRelease":"29f1","keywords":["Tuanjie","WX"],"dependencies":{}}