diff --git a/Editor/LuaHooker.meta b/Editor/LuaHooker.meta new file mode 100644 index 00000000..c9f683d1 --- /dev/null +++ b/Editor/LuaHooker.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40c6637bb15e03e4d9dc2ccd6a5a494a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/LuaHooker/mac.meta b/Editor/LuaHooker/mac.meta new file mode 100644 index 00000000..2c36c7a1 --- /dev/null +++ b/Editor/LuaHooker/mac.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad7c64672515f2846a69fbe2c3a0c3ab +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/LuaHooker/mac/newstatehooker.dylib b/Editor/LuaHooker/mac/newstatehooker.dylib new file mode 100644 index 00000000..d8461d5b Binary files /dev/null and b/Editor/LuaHooker/mac/newstatehooker.dylib differ diff --git a/Editor/LuaHooker/mac/newstatehooker.dylib.meta b/Editor/LuaHooker/mac/newstatehooker.dylib.meta new file mode 100644 index 00000000..68c08a86 --- /dev/null +++ b/Editor/LuaHooker/mac/newstatehooker.dylib.meta @@ -0,0 +1,64 @@ +fileFormatVersion: 2 +guid: 8b2ed2be1f98c46c69f29eb343d66213 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: OSX + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/LuaHooker/win.meta b/Editor/LuaHooker/win.meta new file mode 100644 index 00000000..443609e6 --- /dev/null +++ b/Editor/LuaHooker/win.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46192946025b0e94c99441a1832ba866 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/LuaHooker/win/newstatehooker.dll b/Editor/LuaHooker/win/newstatehooker.dll new file mode 100644 index 00000000..70a169f3 Binary files /dev/null and b/Editor/LuaHooker/win/newstatehooker.dll differ diff --git a/Editor/LuaHooker/win/newstatehooker.dll.meta b/Editor/LuaHooker/win/newstatehooker.dll.meta new file mode 100644 index 00000000..2c34aa0b --- /dev/null +++ b/Editor/LuaHooker/win/newstatehooker.dll.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: 1c53e55830d63074d8af0d0cf34587a8 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude WindowsStoreApps: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: x86_64 + DefaultValueInitialized: true + OS: Windows + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/WXConvertCore.cs b/Editor/WXConvertCore.cs index cdc1f6fa..6f101671 100644 --- a/Editor/WXConvertCore.cs +++ b/Editor/WXConvertCore.cs @@ -11,8 +11,9 @@ using LitJson; using UnityEditor.Build; using System.Linq; using System.Net; +using System.Net.Sockets; +using System.Runtime.InteropServices; using static WeChatWASM.LifeCycleEvent; - namespace WeChatWASM { public class WXConvertCore @@ -996,8 +997,61 @@ namespace WeChatWASM return boot["resources"][key].Keys.Select(file => Path.Combine(config.ProjectConf.DST, webglDir, "Code", "wwwroot", "_framework", file)).ToArray(); } + [DllImport("newstatehooker.dll", EntryPoint = "add_lua_newstate_hook")] + private static extern int add_lua_newstate_hook_win(string filename); + + [DllImport("newstatehooker", EntryPoint = "add_lua_newstate_hook")] + private static extern int add_lua_newstate_hook_osx(string filename); + + private static int add_lua_newstate_hook(string filename) + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + return add_lua_newstate_hook_win(filename); + } + + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + return add_lua_newstate_hook_osx(filename); + } + + throw new System.NotSupportedException($"add_lua_newstate_hook not supported on: {RuntimeInformation.OSDescription}"); + } + + private static void MaybeInstallLuaNewStateHook() + { + // 当前版本仅支持 win & mac, 不满足时直接跳过. + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && !RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + Debug.LogWarning($"MaybeInstallLuaNewStateHook:: Cannot install lua runtime on {RuntimeInformation.OSDescription}"); + return; + } + + // 没有开启 perf tools, 不引入 newstate hook. + if (!config.CompileOptions.enablePerfAnalysis) + { + return; + } + + string codePath = GetWebGLCodePath(); + try + { + var ret = add_lua_newstate_hook(codePath); + if (ret != 0) + { + Debug.LogWarning($"cannot add lua new state hook: {ret}"); + } + } + catch (Exception e) + { + Debug.LogError($"cannot add lua new state hook: {e}"); + } + } + private static void finishExport() { + MaybeInstallLuaNewStateHook(); + int code = GenerateBinFile(); if (code == 0) { @@ -1748,15 +1802,23 @@ namespace WeChatWASM // 添加player-connection-ip信息 try { - var host = Dns.GetHostEntry(""); - foreach (var ip in host.AddressList) - { - if (ip.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) - { - sb.Append($"player-connection-ip={ip.ToString()}"); - break; - } - } + var ips = Dns.GetHostEntry("").AddressList + .Where(ip => ip.AddressFamily == AddressFamily.InterNetwork) + .Select(ip => ip.ToString()) + .ToList(); + + // 优先选择局域网IP(192.168.x.x, 10.x.x.x, 172.16.x.x) + var localNetworkIps = ips.Where(ip => + ip.StartsWith("192.168.") || + ip.StartsWith("10.") || + (ip.StartsWith("172.") && int.Parse(ip.Split('.')[1]) >= 16 && int.Parse(ip.Split('.')[1]) <= 31)) + .ToList(); + + // 如果有局域网IP则使用,否则使用其他IP,最后回退到127.0.0.1 + var selectedIp = localNetworkIps.Any() ? localNetworkIps.First() : + ips.Any() ? ips.First() : "127.0.0.1"; + + sb.Append($"player-connection-ip={selectedIp}"); } catch (Exception e) { diff --git a/Editor/WXPluginVersion.cs b/Editor/WXPluginVersion.cs index 760a806d..434c1de5 100644 --- a/Editor/WXPluginVersion.cs +++ b/Editor/WXPluginVersion.cs @@ -2,7 +2,7 @@ namespace WeChatWASM { public class WXPluginVersion { - public static string pluginVersion = "202502251234"; // 这一行不要改他,导出的时候会自动替换 + public static string pluginVersion = "202503171222"; // 这一行不要改他,导出的时候会自动替换 } public class WXPluginConf diff --git a/Editor/wx-editor.dll b/Editor/wx-editor.dll index 0c5ac4e1..b0642e41 100644 Binary files a/Editor/wx-editor.dll and b/Editor/wx-editor.dll differ diff --git a/Runtime/Plugins/LuaAdaptor/lua_adaptor_comm.c b/Runtime/Plugins/LuaAdaptor/lua_adaptor_comm.c index 67d27555..f3dfb3f3 100644 --- a/Runtime/Plugins/LuaAdaptor/lua_adaptor_comm.c +++ b/Runtime/Plugins/LuaAdaptor/lua_adaptor_comm.c @@ -1,4 +1,5 @@ #include "lua_adaptor_import.h" +#include lua_Debug* lua_newdebugar() { return malloc(sizeof(lua_Debug)); } void lua_deletedebugar(lua_Debug* ar) { return free(ar); } @@ -18,3 +19,12 @@ lua_State* lua_State_getmainthread(lua_State* L) { return G(L)->mainthread; } void (lua_do_sethook) (lua_State *L, lua_Hook func, int mask, int count) { lua_sethook(L, func, mask, count); } + +extern void SetLuaState(lua_State* L); +EMSCRIPTEN_KEEPALIVE lua_State* invoke_lua_newstate_with_wx_perf_callback(lua_Alloc f, void *ud) { + lua_State* L; + L = lua_newstate(f, ud); + SetLuaState(L); + + return L; +} \ No newline at end of file diff --git a/Runtime/Plugins/wx-perf.dll b/Runtime/Plugins/wx-perf.dll index b4b3d520..30664c51 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 c0ed92fd..241fd283 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 6ec30147..7964732a 100644 --- a/Runtime/Plugins/wx-runtime-editor.xml +++ b/Runtime/Plugins/wx-runtime-editor.xml @@ -3331,8 +3331,8 @@ - 需要基础库: `3.4.3` - 是否处于省电模式,目前仅 iOS 端支持 + 需要基础库: `3.5.0` + 是否处于省电模式 @@ -5676,8 +5676,8 @@ - 需要基础库: `3.4.3` - 是否处于省电模式,目前仅 iOS 端支持 + 需要基础库: `3.5.0` + 是否处于省电模式 @@ -6505,6 +6505,41 @@ 超时时间,单位 ms + + + 接口调用结束的回调函数(调用成功、失败都会执行) + + + + + 接口调用失败的回调函数 + + + + + 接口调用成功的回调函数 + + + + + 封面广告组件展示状态码 + 可选值: + - -1: 初始值,状态未知; + - 1: 展示成功; + - 2: 主动拦截过滤,不展示广告; + - 3: 展示超时; + + + + + 封面广告组件展示状态 + 可选值: + - 'unknown': 初始值,状态未知; + - 'pending': 进行展示中; + - 'success': 展示成功; + - 'fail': 展示失败; + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -6995,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 等信息 @@ -7364,36 +7399,6 @@ - 15: TRIM_MEMORY_RUNNING_CRITICAL; - - - 下边界坐标,单位:px - - - - - 高度,单位:px - - - - - 左边界坐标,单位:px - - - - - 右边界坐标,单位:px - - - - - 上边界坐标,单位:px - - - - - 宽度,单位:px - - 按键类型,0左键,1中键,2右键 @@ -7489,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#使用审核通过的转发图片) @@ -8760,6 +8765,7 @@ 可选值: - 'barCode': 一维码; - 'qrCode': 二维码; + - 'wxCode': 小程序码; - 'datamatrix': Data Matrix 码; - 'pdf417': PDF417 条码; @@ -9106,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#使用审核通过的转发图片) diff --git a/Runtime/Plugins/wx-runtime.dll b/Runtime/Plugins/wx-runtime.dll index 1bbd8f17..8c42f43a 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 2fe2b5ca..004e076b 100644 --- a/Runtime/Plugins/wx-runtime.xml +++ b/Runtime/Plugins/wx-runtime.xml @@ -3337,8 +3337,8 @@ - 需要基础库: `3.4.3` - 是否处于省电模式,目前仅 iOS 端支持 + 需要基础库: `3.5.0` + 是否处于省电模式 @@ -5682,8 +5682,8 @@ - 需要基础库: `3.4.3` - 是否处于省电模式,目前仅 iOS 端支持 + 需要基础库: `3.5.0` + 是否处于省电模式 @@ -6511,6 +6511,41 @@ 超时时间,单位 ms + + + 接口调用结束的回调函数(调用成功、失败都会执行) + + + + + 接口调用失败的回调函数 + + + + + 接口调用成功的回调函数 + + + + + 封面广告组件展示状态码 + 可选值: + - -1: 初始值,状态未知; + - 1: 展示成功; + - 2: 主动拦截过滤,不展示广告; + - 3: 展示超时; + + + + + 封面广告组件展示状态 + 可选值: + - 'unknown': 初始值,状态未知; + - 'pending': 进行展示中; + - 'success': 展示成功; + - 'fail': 展示失败; + + 接口调用结束的回调函数(调用成功、失败都会执行) @@ -7001,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 等信息 @@ -7370,36 +7405,6 @@ - 15: TRIM_MEMORY_RUNNING_CRITICAL; - - - 下边界坐标,单位:px - - - - - 高度,单位:px - - - - - 左边界坐标,单位:px - - - - - 右边界坐标,单位:px - - - - - 上边界坐标,单位:px - - - - - 宽度,单位:px - - 按键类型,0左键,1中键,2右键 @@ -7495,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#使用审核通过的转发图片) @@ -8766,6 +8771,7 @@ 可选值: - 'barCode': 一维码; - 'qrCode': 二维码; + - 'wxCode': 小程序码; - 'datamatrix': Data Matrix 码; - 'pdf417': PDF417 条码; @@ -9112,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#使用审核通过的转发图片) diff --git a/Runtime/Plugins/wx_perf_2021.a b/Runtime/Plugins/wx_perf_2021.a index da9074be..f510a4a5 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 9b27bc26..d696ed5e 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 b2ad829a..9271d69a 100644 --- a/Runtime/WX.cs +++ b/Runtime/WX.cs @@ -864,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的相关信息。 @@ -3156,28 +3175,6 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.OffMemoryWarning(result); } - /// - /// [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) - /// ``` - /// - public static void OnMenuButtonBoundingClientRectWeightChange(Action result) - { - WXSDKManagerHandler.Instance.OnMenuButtonBoundingClientRectWeightChange(result); - } - - public static void OffMenuButtonBoundingClientRectWeightChange(Action result) - { - WXSDKManagerHandler.Instance.OffMenuButtonBoundingClientRectWeightChange(result); - } - /// /// [wx.onMessage(function callback)](https://developers.weixin.qq.com/minigame/dev/api/open-api/context/wx.onMessage.html) /// 监听主域发送的消息 diff --git a/Runtime/wechat-default/check-version.js.meta b/Runtime/wechat-default/check-version.js.meta index 496d36fb..64437191 100644 --- a/Runtime/wechat-default/check-version.js.meta +++ b/Runtime/wechat-default/check-version.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d740c6f413de47591006663f44528ff +guid: ae60a81ea60da7627a9cfdf3ad6a346d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/data-package/game.js.meta b/Runtime/wechat-default/data-package/game.js.meta index df81faf3..49a81fdc 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: ca5b735ef3f02f209e8233efac3a4f90 +guid: 1e00ce1e374a72e2cf07e59a39270d27 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/events.js.meta b/Runtime/wechat-default/events.js.meta index 7e108bdb..e4f8876f 100644 --- a/Runtime/wechat-default/events.js.meta +++ b/Runtime/wechat-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0aa346d3140e8d3071e1e16da2f4bb82 +guid: d2b4086dbf49eaed27af1597ea7d6941 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.js.meta b/Runtime/wechat-default/game.js.meta index e5f9f11d..db6cbe50 100644 --- a/Runtime/wechat-default/game.js.meta +++ b/Runtime/wechat-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 48391417514c32f83acb0e7be1ffcd7f +guid: 23b0d8022a716dec8b64a37c8690afda DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.json b/Runtime/wechat-default/game.json index 2fd4a2b5..7c8d11ed 100644 --- a/Runtime/wechat-default/game.json +++ b/Runtime/wechat-default/game.json @@ -23,7 +23,7 @@ ], "plugins": { "UnityPlugin": { - "version": "1.2.65", + "version": "1.2.69", "provider": "wxe5a48f1ed5f544b7", "contexts": [ { diff --git a/Runtime/wechat-default/game.json.meta b/Runtime/wechat-default/game.json.meta index 21a97c8b..ed028dbf 100644 --- a/Runtime/wechat-default/game.json.meta +++ b/Runtime/wechat-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e72ef2ad543216010795936ac09ffb36 +guid: a18dd536d65d2b11c9308125f16abea6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/background.jpg.meta b/Runtime/wechat-default/images/background.jpg.meta index 642da712..87b09631 100644 --- a/Runtime/wechat-default/images/background.jpg.meta +++ b/Runtime/wechat-default/images/background.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c115c7dff84bb26de6d718d3f33882dd +guid: 8fb31cb8dfdb1a22e8bbd69843cbf1af DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/unity_logo.png.meta b/Runtime/wechat-default/images/unity_logo.png.meta index 71d0bd14..03fcd8a4 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: 8d12b7cf3e21a0391b623658d44205a7 +guid: c890186b9e70817f9ff65571ca010692 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 01694a87..df16e4f1 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: f4853a93d0d21eedd1bc81c8083d0307 +guid: 0e3a5b02397c8dba18ee3b9275253ac2 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 f0d7330b..42186f0d 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: 91a0e94f24d42f1369504cda35152b0d +guid: 5c1b03758ee550bdd8a214f906f34274 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/index.js.meta b/Runtime/wechat-default/open-data/index.js.meta index eb85aa62..1e57c71a 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: 03d541d8389cc0642157ad0d9e15f285 +guid: fee1373cd038b619791c89e7f0d1ba13 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/loading.js.meta b/Runtime/wechat-default/open-data/loading.js.meta index 71a599b7..32136e7d 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: bd194df810f6ec353271d8bd8e4b850a +guid: 6f83c1db8f511c9c9c5da047754d8738 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 59699905..825e0dd9 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: e40ee2dbfc721e094ac4063a4d96c901 +guid: df333caebaa727285735876115564871 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 4e133c4e..9520e091 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: e64caaf08491b7d77e30b5b1b8954521 +guid: fb9243c01ad8499c0b47d6c16d4b212d 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 ab6a070c..3e1ebb1e 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: e417569e6a406f9946b64b4fc2878142 +guid: dc679e15d375b2786321de78d78cd47a 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 9e55f661..c7a6e54f 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: 50e93c09e8ff139e1c49e779f8f68a33 +guid: d09095d1a61337ecb861b311c992b29e 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 6b166f34..9f307048 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: 5147ef8296fc133e6ded861080e4e20f +guid: 999141e05246ca72190f5fd730711e8d 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 bfe6c060..77078eb9 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: 965a48466b4f2f41544333ac0e8b7d9a +guid: dc6fcd001cf7e2b1c675ef0339c9351b 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 c416798e..ddb43ce7 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: 280cfd9cb6c306f0ed3763290d001ddf +guid: 44415c15274384ee6300d242a72631bd 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 29e85fd8..b8296068 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: c3170c1a7e916f785807e129692ec546 +guid: 72a3b631fe779ec59986c3235dbbd4e3 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 b968bd9e..76a19acf 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: 6ef3c52cb1ba1d2ec6b82377c86c5eb3 +guid: da37990fbcac3d3fda0f29841302726b 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 d43ba002..1a699747 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: 89c69b3474329229bf1ea953da9d3d5c +guid: ecf7bbf7536c0bb8c01f31cf5c31b98b 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 59906ef4..9423fe7a 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: c53dc08f34f99e3e2e87a3c6d72ddbfc +guid: 20f209cad14d9cc879a914407fd6c55b 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 bc1b113a..bb7a9f66 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: 791fe21d237fbe41b69516a857e51d7d +guid: 68fbb67371b5d75553bfa4f4fffe2e82 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 5f201386..a789a456 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: c15332b3735dc4f035eea6d49a8e584d +guid: 6723247ff2663878fdc07d4dd9e22f3f 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 7a561165..63b7c4da 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: 6003b0cb804f30e3e8693185fab534e3 +guid: 49eee9cd651e0d6230b648174eb73d8f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugin-config.js.meta b/Runtime/wechat-default/plugin-config.js.meta index a6429a67..7b2a0892 100644 --- a/Runtime/wechat-default/plugin-config.js.meta +++ b/Runtime/wechat-default/plugin-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f7e3056602642051c7948c50505c1c3d +guid: 3ee6d1c29f899477f53abb291f32a9bd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/check-update.js.meta b/Runtime/wechat-default/plugins/check-update.js.meta index 83267712..7fc624b4 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: b0391cdc3ea757ae8682ab1f95337d5e +guid: 5ce31cbfb9c68c7e58ad15cb62b76e1e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/screen-adapter.js.meta b/Runtime/wechat-default/plugins/screen-adapter.js.meta index 59be513c..25be4056 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: c7de60c5e96dbdaf956cd190dfee2a57 +guid: 38e5381695960274a05977cf71ead7a2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/project.config.json.meta b/Runtime/wechat-default/project.config.json.meta index 24e13c17..06a60526 100644 --- a/Runtime/wechat-default/project.config.json.meta +++ b/Runtime/wechat-default/project.config.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bce464543be0028c6e298f0f52bd7879 +guid: 5a3033c10b564501a2052299f282e96b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/texture-config.js.meta b/Runtime/wechat-default/texture-config.js.meta index 2a493eac..ed641e17 100644 --- a/Runtime/wechat-default/texture-config.js.meta +++ b/Runtime/wechat-default/texture-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a0f054960e5665deb2f9e338ff81702a +guid: 647e9cc55c4b8e4426212a3277b8aeff DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-namespace.js.meta b/Runtime/wechat-default/unity-namespace.js.meta index fccdb716..dd75f265 100644 --- a/Runtime/wechat-default/unity-namespace.js.meta +++ b/Runtime/wechat-default/unity-namespace.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ad67adc8491c84dc657b2025bd5d31db +guid: 0e67b891eecc0461fb2ae092989d61ca DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta index 89855c3e..1f980c65 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: 26763d74f27b6b2aa9cecfb9cead8e94 +guid: 1457f36d1e3c2e5ecd29e7b9e02eb639 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 9b8f4dba..b6d28e10 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: 131f7b086a567fcdca462a8433594bc6 +guid: 6cde41d9d8730cb82462df303922bc77 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/ad.js.meta b/Runtime/wechat-default/unity-sdk/ad.js.meta index 9ffc462a..158685d0 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: 4a37ee51b0eba98599a3f2d2a360d1a6 +guid: 36acb16a8a324f14baf1826052c819a6 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 87b13c40..9672dcc9 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: 215a96f385c55e041b9be9d2b439d53a +guid: 79035f4b89810e525e5b6f056bcab1da 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 714a3a0d..ebf0b88b 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: f7a19b2c06f9fa4ceb57a88ac1bdd00e +guid: 06185d3b630418314f869f69f0a12bd4 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 d9b85f3c..be651953 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: a539456c43d41db73452f7444fea4b2f +guid: 035e83d53e52cce09a95be5ca1a5e284 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 4702248d..6f7a3bcf 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: 6ff2f0580766bd5ee92027256a5446b9 +guid: 12a44897ca33fd80f2ec01208e56d8b4 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 82ca59b7..ecf896e7 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: b66bb16ea618550bb76cae7af04e1487 +guid: 4599c4114773b0d4512d47a35e896a67 DefaultImporter: externalObjects: {} userData: 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 e3f3ee53..6c68e7b7 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: ca2a6d97b93807b0a1e3d6a5538cb7b0 +guid: 75c1d30bfad39522fd6b2cb4a268d1eb DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/utils.js.meta b/Runtime/wechat-default/unity-sdk/audio/utils.js.meta index 7b182f14..aa85242e 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: 0488b1864bdcbad990f3ead342f8b190 +guid: d0d381daa7373f4fc03405832d6f6701 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/authorize.js.meta b/Runtime/wechat-default/unity-sdk/authorize.js.meta index d0ccb3bd..ef7136b3 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: 9ce86f46e53cadbe01fed22e8bb11b96 +guid: 30727dbf2987059c61888eaa3f4f835b 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 f9339a5c..d2af9792 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: 28206c8bff5a3231f7e019ce547666ce +guid: f37ac8c23587e60efafd310b87f49bdb DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/camera.js.meta b/Runtime/wechat-default/unity-sdk/camera.js.meta index a43f7061..71f8ac01 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: c8df47e1d4f347629395f0b236b9eead +guid: f506c8b0a56163e94af80e058b6d4e59 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 87bcf239..12d73119 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: 468c40570ac683063c4ef328c48a2ba9 +guid: a9fc3049a67a29a9796bc6dcc5d3efb1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/canvas.js.meta b/Runtime/wechat-default/unity-sdk/canvas.js.meta index abdc68c1..e58871a4 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: 5be8fca742f0ecebfa91f233d9f278a5 +guid: 0578fdc4545d20efd1bd07e7b6015314 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/chat.js.meta b/Runtime/wechat-default/unity-sdk/chat.js.meta index 0596a4d4..3840481b 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: 2a766b00a4395eee3ba70206a5e19a26 +guid: 800e80eb14dab88d70589dde662cec5d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/cloud.js.meta b/Runtime/wechat-default/unity-sdk/cloud.js.meta index 1e1f3afd..5fd3382c 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: a221123d31d6c5690f2485fb169f0818 +guid: 9d248c99b894feb10d039e1917bb949f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/conf.js.meta b/Runtime/wechat-default/unity-sdk/conf.js.meta index 97c9aef9..fc267dd6 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: 3cc201ff9ea722ae09d84382493f9fca +guid: a05714e8bc86fdd8365029451d2bef18 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 662de833..5d24af18 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: cdaed51870d471599dab8f1f4aaf0ae9 +guid: ea0dbf5e7b14481751b2375fb1641c27 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fix.js.meta b/Runtime/wechat-default/unity-sdk/fix.js.meta index 2a4b3ef0..4eaba75a 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: 5550217c38837247187a5a233760c4a6 +guid: 4ac8286774cc2d7ea43ea7dda3d8e3f6 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 f37636ca..7c53aefa 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: ec3d2de4e6236747eec5f9e5de52443d +guid: 4ed86efddd7e82d41557f3084b9ca6ae 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 a22f6b73..621435ff 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: 3d7cda6cf133527749d558e046ed53b7 +guid: 1905271aebfff28a526c27c659ff86f4 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 337af16e..81acf0de 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: 1d083e9d6269dd022d0d90ce0622020d +guid: 2e4e4d29fc1fc6de77061251cf85390e 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 121031b3..925c1317 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: 9f56ff3b2c19c6f756cbb9f3b03698f9 +guid: 9b8391bc2975c15e5edf2419b726c280 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 7097ad2f..e7b865cf 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: ab8223ffa97b88e8a7a956b7983c5ee6 +guid: 8ebf02724ab51ef0e27144b67a4fda72 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fs.js.meta b/Runtime/wechat-default/unity-sdk/fs.js.meta index 8cf6a332..220fcb43 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: fc95335d3c45a7693a1600f1fd4cdf70 +guid: 488f70aaa5294306ab437ef8eced92ee 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 9c2c267b..5b3d4eda 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: 273b3bf2f4ad45acfda1df709c1def9d +guid: 779bbc1ae17f839c356e1a8c93131c8c 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 d56b6883..f792ac18 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: c78a6ff5e98cb6515b863a24d61ce46a +guid: 147e34e2c33ddbbd60d7d6d0363c24f2 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 6d2a6c42..f35a6561 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: 155662ea256c0fafaa98dcf6f50b8e22 +guid: 4b8b9c6d285f7f9d8237bf66210e9771 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/index.js.meta b/Runtime/wechat-default/unity-sdk/index.js.meta index be6bdd9e..ad4e9c7f 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: 32dfad02ee6ed3f4a08844c3137a56e5 +guid: f532a306eddfde9e00d24c1dd8704b8c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/logger.js.meta b/Runtime/wechat-default/unity-sdk/logger.js.meta index 8123ab88..38bfa0d6 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: b9d6b71c398f91f80b190364bf29c9ce +guid: 7afb34dc178465ea5f0c767926f474a3 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 681f7248..ea5043c7 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: a979c3cebaf1ab770e6321183f01b645 +guid: 6ee95953e4bc47308085b7b55fa99506 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 8ae7cb6e..71da2273 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: 37224ea464194717d8d62c143a775358 +guid: 15df071f09050c56ffbb8e5fe2fa9acf 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 f384377b..0c8ba911 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: 50d8ce534bf8afe4b306b61b5bdaaeb7 +guid: b151148eae664944494727c842426c24 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/recorder.js.meta b/Runtime/wechat-default/unity-sdk/recorder.js.meta index 6f81a3c0..7f113752 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: 1c55df857a3fdc4ad01342c6b07dc001 +guid: 2d0f4b8f21c902340046d1fe6a2af973 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resType.js b/Runtime/wechat-default/unity-sdk/resType.js index 21a12530..1cc38b16 100644 --- a/Runtime/wechat-default/unity-sdk/resType.js +++ b/Runtime/wechat-default/unity-sdk/resType.js @@ -610,6 +610,10 @@ export const ResType = { mainSwitch: 'bool', itemSettings: 'object', }, + GetShowSplashAdStatusSuccessCallbackResult: { + status: 'string', + errMsg: 'string', + }, GetStorageInfoSuccessCallbackOption: { currentSize: 'number', keys: 'string[]', @@ -759,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', diff --git a/Runtime/wechat-default/unity-sdk/resType.js.meta b/Runtime/wechat-default/unity-sdk/resType.js.meta index 9022e1b5..bb61ffee 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: 034d235e693d304a0ea808fbca7b6cfb +guid: 9bb49cb06110f497b19d2e888ba542bf DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta index 9cbc160b..aefa8070 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: 435f633782a626c79e47cc4cd6aa7086 +guid: 8641b1e0df3fc337c5ee2185c6b3e083 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/response.js.meta b/Runtime/wechat-default/unity-sdk/response.js.meta index 1b84c822..afc27268 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: 55cd33bb6dc0dabea4d93c8cd8f090f4 +guid: d3bb31cd39e18cd27048c06cee0fc639 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/sdk.js.meta b/Runtime/wechat-default/unity-sdk/sdk.js.meta index d04b0d79..9548f89f 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: a00c5b8f9ac073d041977a14c991fe5d +guid: d956c2c58855c585cae5964f3238d53a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/share.js.meta b/Runtime/wechat-default/unity-sdk/share.js.meta index af9a8610..cadd6f9d 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: 27110c4b93fdb7d29c15624e43550811 +guid: fa36ef88a6eea57340010a2e64581e3d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/storage.js.meta b/Runtime/wechat-default/unity-sdk/storage.js.meta index 51fc2dcb..eb674b3f 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: 477b5744ef8f37480c5f80cc32016590 +guid: a039de4d0b8a8d703722bbbcd32ea2ce DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/texture.js.meta b/Runtime/wechat-default/unity-sdk/texture.js.meta index f4962f3d..dcde9585 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: 2e8aadc7cd3a8de168bea9f817208d7f +guid: 3298fc606f8581b0c0fdfd32c9fd0c03 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 6150d9cd..9097b4b2 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: 024ba104809fef08e6de97a4ca718f61 +guid: db2983f49d561062c80bf0ccbcac877f 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 879fbbf7..23b50fc6 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: 89e0f53e795342be124f4a9d7c37627b +guid: 9c41eb32e1f3c5250cb0b4dbb874bac9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/userinfo.js.meta b/Runtime/wechat-default/unity-sdk/userinfo.js.meta index 9a1b1c62..2f5d4c22 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: 045051a4f0a4db8ad20ac873c8abf626 +guid: ee7b9630bc6893049584adc1f5675a2c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/util.js.meta b/Runtime/wechat-default/unity-sdk/util.js.meta index 6194dda8..f80406ab 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: 3d874f4d16e89bea2cbebff63c5d8d5a +guid: acec300e0f0f4a8afb4a9bdc3620ccfa DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/utils.js.meta b/Runtime/wechat-default/unity-sdk/utils.js.meta index b215528c..c4088f13 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: eb2f6bb2dd7393df364d89c25f3bac83 +guid: 67f816a895b92768a4f58a3608fa5179 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.js.meta b/Runtime/wechat-default/unity-sdk/video.js.meta index 7c61f5b0..0446ed3e 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: 2c720aba12d1d79f6ad750e333710069 +guid: f55171ccb0bca2276057d085b42df566 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video/index.js b/Runtime/wechat-default/unity-sdk/video/index.js index c9403467..70041d90 100644 --- a/Runtime/wechat-default/unity-sdk/video/index.js +++ b/Runtime/wechat-default/unity-sdk/video/index.js @@ -63,7 +63,7 @@ function _JS_Video_Create(url) { videoWidth: 0, videoHeight: 0, isReady: false, - stoped: false, + stoped: true, paused: false, ended: false, seeking: false, @@ -75,8 +75,7 @@ function _JS_Video_Create(url) { videoDecoder.remove(); videoDecoder.on('start', (res) => { debugLog('wxVideoDecoder start:', res); - videoInstance.paused = false; - videoInstance.stoped = false; + if (!videoInstance.isReady) { if (res.video && res.video.duration) { videoInstance.duration = res.video.duration / 1000; @@ -86,6 +85,10 @@ function _JS_Video_Create(url) { videoInstance.isReady = true; videoDecoder.stop(); } + else { + videoInstance.paused = false; + videoInstance.stoped = false; + } }); videoDecoder.on('stop', (res) => { debugLog('wxVideoDecoder stop:', res); @@ -143,7 +146,6 @@ function _JS_Video_Create(url) { videoInstance.seeking = true; videoDecoder.emitter.emit('seek', {}); }; - videoInstance.play(); videoInstance.destroy = () => { if (needCache) { videoDecoder.stop(); @@ -158,13 +160,14 @@ function _JS_Video_Create(url) { delete videoInstance.videoDecoder; delete videoInstance.onendedCallback; delete videoInstance.frameData; - videoInstance.stoped = false; + videoInstance.stoped = true; videoInstance.paused = false; videoInstance.ended = false; videoInstance.seeking = false; videoInstance.currentTime = 0; videoInstance.onended = null; }; + videoInstance.play(); } return videoInstanceIdCounter; } diff --git a/Runtime/wechat-default/unity-sdk/video/index.js.meta b/Runtime/wechat-default/unity-sdk/video/index.js.meta index fd5e4221..b5dad325 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: 75838d1cb7ccd43e097b2d08481be21b +guid: 1a830f109a03756c25be48285c18d895 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/wasmcode/game.js.meta b/Runtime/wechat-default/wasmcode/game.js.meta index 8d24087e..ec67fbba 100644 --- a/Runtime/wechat-default/wasmcode/game.js.meta +++ b/Runtime/wechat-default/wasmcode/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d8790647d1746c7d14cb730755f969be +guid: adbf518175932ccccf9ba028bb9b5e63 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/weapp-adapter.js.meta b/Runtime/wechat-default/weapp-adapter.js.meta index 956fb0a2..f652c240 100644 --- a/Runtime/wechat-default/weapp-adapter.js.meta +++ b/Runtime/wechat-default/weapp-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ebf11cc1a2f58993875ad125d495f5be +guid: ad9047e0d93ea0b0841c2132980ad4ce DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/workers/response/index.js.meta b/Runtime/wechat-default/workers/response/index.js.meta index 9df0aae4..5a61d831 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: 0f98b57ce91475c3fbaa5bc95dc9b033 +guid: 4b5fe5d9b8e1c18a44338657d712b4fb DefaultImporter: externalObjects: {} userData: