diff --git a/Editor/BuildProfile.meta b/Editor/BuildProfile.meta index 252f755cb..c9c8801e6 100644 --- a/Editor/BuildProfile.meta +++ b/Editor/BuildProfile.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: DytLvSj8UC9CKob0XUy9Y3usKDmX8US1YgxYmBxa1iAZ/I8JbM5wZwE= +guid: cccbd1d680cfe34fa1fef9e4875e5a12 folderAsset: yes DefaultImporter: externalObjects: {} userData: assetBundleName: - assetBundleVariant: + assetBundleVariant: \ No newline at end of file diff --git a/Editor/BuildProfile/lib.meta b/Editor/BuildProfile/lib.meta index 87b4cc3cf..e957db024 100644 --- a/Editor/BuildProfile/lib.meta +++ b/Editor/BuildProfile/lib.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: XSwesi78AS28ymfR2HEhHpEBAC2DHupI1hIKP7HApjHRaZgGw+DTwWI= +guid: cccbd1d680cfe34fa1fef9e3375e5a12 folderAsset: yes DefaultImporter: externalObjects: {} userData: assetBundleName: - assetBundleVariant: + assetBundleVariant: \ No newline at end of file diff --git a/Editor/BuildProfile/lib/libwx-metal-cpp.bc b/Editor/BuildProfile/lib/libwx-metal-cpp.bc index e8ae12117..4051e2fde 100644 Binary files a/Editor/BuildProfile/lib/libwx-metal-cpp.bc and b/Editor/BuildProfile/lib/libwx-metal-cpp.bc differ diff --git a/Editor/BuildProfile/lib/mtl_library.jslib b/Editor/BuildProfile/lib/mtl_library.jslib index b6f7cf5df..3a662c16c 100644 --- a/Editor/BuildProfile/lib/mtl_library.jslib +++ b/Editor/BuildProfile/lib/mtl_library.jslib @@ -2,26 +2,21 @@ mergeInto(LibraryManager.library, { // 定义供 C/C++ 调用的 JS 函数 js_batchRender_malloc: function(data, size, isSync) { // 直接从 WASM 内存创建视图（零拷贝） - const binaryData = new Uint8Array(Module.HEAPU8.buffer, data, size); - // 转换为标准 ArrayBuffer（如果需要复制） - const targetBuffer = - binaryData.buffer.slice(binaryData.byteOffset, binaryData.byteOffset + binaryData.byteLength); + const targetBuffer = new Uint8Array(Module.HEAPU8.buffer, data, size); //console.log("processBinaryData invoke"); - const extBuffer = new ArrayBuffer(1); - const headerBuffer = new ArrayBuffer(8); - const headerBufferView = new DataView(headerBuffer); - headerBufferView.setUint32(0, 0xDEC0DE, true); - headerBufferView.setUint32(4, mtl.ctx.__uid(), true); - const merged = new Uint8Array(headerBuffer.byteLength + targetBuffer.byteLength); - merged.set(new Uint8Array(headerBuffer), 0); - merged.set(new Uint8Array(targetBuffer), headerBuffer.byteLength); + const extBuffer = new ArrayBuffer(1); + if(!isSync){ - mtl.batchRenderAsync(merged.buffer, extBuffer); + mtl.batchRenderAsync(targetBuffer, extBuffer); return null; } - const result = mtl.batchRender(merged.buffer, extBuffer).buffer; - if(result.byteLength == 0){ - return null;; + const response = mtl.batchRender(targetBuffer, extBuffer); + if (!response) { + return null; + } + const result = response.buffer; + if(!result || result.byteLength == 0){ + return null; } // 申请内存空间,后续在cpp wasm部分使用，记得释放 const ptr = Module._malloc(result.byteLength); diff --git a/Editor/WXConvertCore.cs b/Editor/WXConvertCore.cs index 5c83d2639..613481662 100644 --- a/Editor/WXConvertCore.cs +++ b/Editor/WXConvertCore.cs @@ -107,6 +107,14 @@ namespace WeChatWASM return config.CompileOptions.enableiOSMetal; } } + // 用于replaceRules判断是否需要注入相关的修改 + public static bool UseEmscriptenGLX + { + get + { + return config.CompileOptions.enableEmscriptenGLX; + } + } // public static void SetPlayableEnabled(bool enabled) // { // isPlayableBuild = enabled; @@ -126,6 +134,8 @@ namespace WeChatWASM } // iOS metal 的相关特性 ProcessWxiOSMetalBinaries(); + // emscriptenglx的相关特性 + ProcessWxEmscriptenGLXBinaries(); MakeEnvForLuaAdaptor(); // JSLib SettingWXTextureMinJSLib(); @@ -371,6 +381,59 @@ namespace WeChatWASM AssetDatabase.Refresh(); } + private static void ProcessWxEmscriptenGLXBinaries() + { + string[] glLibs; + string DS = WXAssetsTextTools.DS; + if (UnityUtil.GetSDKMode() == UnityUtil.SDKMode.Package) + { + glLibs = new string[] + { + $"Packages{DS}com.qq.weixin.minigame{DS}Runtime{DS}Plugins{DS}libemscriptenglx.a", + $"Packages{DS}com.qq.weixin.minigame{DS}Runtime{DS}Plugins{DS}libemscriptenglx_2021.a", + }; + } + else + { + string glLibRootDir = $"Assets{DS}WX-WASM-SDK-V2{DS}Runtime{DS}Plugins{DS}"; + + // 下方顺序不要变动 + glLibs = new string[] + { + $"{glLibRootDir}libemscriptenglx.a", + $"{glLibRootDir}libemscriptenglx_2021.a", + }; + } + + { + // unity2022, tuanjie lib引入 + bool showEnableGLX2022Plugin = config.CompileOptions.enableEmscriptenGLX && IsCompatibleWithUnity202203OrNewer(); + + var glx2022Importer = AssetImporter.GetAtPath(glLibs[0]) as PluginImporter; + #if PLATFORM_WEIXINMINIGAME + glx2022Importer.SetCompatibleWithPlatform(BuildTarget.WeixinMiniGame, showEnableGLX2022Plugin); + #else + glx2022Importer.SetCompatibleWithPlatform(BuildTarget.WebGL, showEnableGLX2022Plugin); + #endif + SetPluginCompatibilityByModifyingMetadataFile(glLibs[0], showEnableGLX2022Plugin); + } + + { + // unity2021 lib引入 + bool showEnableGLX2021Plugin = config.CompileOptions.enableEmscriptenGLX && IsCompatibleWithUnity202102To202203(); + + var glx2021Importer = AssetImporter.GetAtPath(glLibs[1]) as PluginImporter; + #if PLATFORM_WEIXINMINIGAME + glx2021Importer.SetCompatibleWithPlatform(BuildTarget.WeixinMiniGame, showEnableGLX2021Plugin); + #else + glx2021Importer.SetCompatibleWithPlatform(BuildTarget.WebGL, showEnableGLX2021Plugin); + #endif + SetPluginCompatibilityByModifyingMetadataFile(glLibs[1], showEnableGLX2021Plugin); + } + + AssetDatabase.Refresh(); + } + /** * Lua Adaptor Settings. */ @@ -1395,8 +1458,7 @@ namespace WeChatWASM var buildTemplate = new BuildTemplate( Path.Combine(UnityUtil.GetWxSDKRootPath(), "Runtime", defaultTemplateDir), Path.Combine(Application.dataPath, "WX-WASM-SDK-V2", "Editor", "template"), - Path.Combine(config.ProjectConf.DST, miniGameDir), - true + Path.Combine(config.ProjectConf.DST, miniGameDir) ); buildTemplate.start(); // FIX: 2021.2版本生成symbol有bug，导出时生成symbol报错，有symbol才copy @@ -1983,7 +2045,7 @@ namespace WeChatWASM config.ProjectConf.bundleHashLength.ToString(), bundlePathIdentifierStr, excludeFileExtensionsStr, - config.CompileOptions.enableiOSMetal ? "5" : (config.CompileOptions.Webgl2 ? "2" : "1"), + config.CompileOptions.Webgl2 ? "2" : "1", Application.unityVersion, WXExtEnvDef.pluginVersion, config.ProjectConf.dataFileSubPrefix, @@ -2032,7 +2094,9 @@ namespace WeChatWASM config.ProjectConf.MemorySize.ToString(), config.SDKOptions.disableMultiTouch ? "true" : "false", // Perfstream，暂时设为false - "false" + "false", + config.CompileOptions.enableEmscriptenGLX ? "true" : "false", + config.CompileOptions.enableiOSMetal ? "true" : "false" }); List replaceList = new List(replaceArrayList); diff --git a/Editor/WXEditorSettingHelper.cs b/Editor/WXEditorSettingHelper.cs index ccfe4ea6a..21ccfe2d2 100644 --- a/Editor/WXEditorSettingHelper.cs +++ b/Editor/WXEditorSettingHelper.cs @@ -185,6 +185,7 @@ namespace WeChatWASM this.formCheckbox("profilingMemory", "Profiling Memory"); this.formCheckbox("webgl2", "WebGL2.0"); this.formCheckbox("iOSPerformancePlus", "iOSPerformancePlus(?)", "是否使用iOS高性能+渲染方案，有助于提升渲染兼容性、降低WebContent进程内存"); + this.formCheckbox("EmscriptenGLX", "EmscriptenGLX(?)", "是否使用EmscriptenGLX渲染方案"); // this.formCheckbox("iOSMetal", "iOSMetal(?)", "是否使用iOSMetal渲染方案，需要开启iOS高性能+模式，有助于提升运行性能，降低iOS功耗"); this.formCheckbox("deleteStreamingAssets", "Clear Streaming Assets"); this.formCheckbox("cleanBuild", "Clean WebGL Build"); @@ -449,6 +450,7 @@ namespace WeChatWASM this.setData("webgl2", config.CompileOptions.Webgl2); this.setData("iOSPerformancePlus", config.CompileOptions.enableIOSPerformancePlus); this.setData("iOSMetal", config.CompileOptions.enableiOSMetal); + this.setData("EmscriptenGLX", config.CompileOptions.enableEmscriptenGLX); this.setData("fbslim", config.CompileOptions.fbslim); this.setData("useFriendRelation", config.SDKOptions.UseFriendRelation); this.setData("useMiniGameChat", config.SDKOptions.UseMiniGameChat); @@ -528,6 +530,7 @@ namespace WeChatWASM config.CompileOptions.Webgl2 = this.getDataCheckbox("webgl2"); config.CompileOptions.enableIOSPerformancePlus = this.getDataCheckbox("iOSPerformancePlus"); config.CompileOptions.enableiOSMetal = this.getDataCheckbox("iOSMetal"); + config.CompileOptions.enableEmscriptenGLX = this.getDataCheckbox("EmscriptenGLX"); config.CompileOptions.fbslim = this.getDataCheckbox("fbslim"); config.SDKOptions.UseFriendRelation = this.getDataCheckbox("useFriendRelation"); config.SDKOptions.UseMiniGameChat = this.getDataCheckbox("useMiniGameChat"); diff --git a/Editor/WXExtDef.cs b/Editor/WXExtDef.cs index 08a5888e4..54f139a28 100644 --- a/Editor/WXExtDef.cs +++ b/Editor/WXExtDef.cs @@ -129,6 +129,10 @@ namespace WeChatWASM { return WXConvertCore.UseiOSMetal; }); + WXExtEnvDef.RegisterAction("WXConvertCore.UseEmscriptenGLX", (args) => + { + return WXConvertCore.UseEmscriptenGLX; + }); WXExtEnvDef.RegisterAction("UnityUtil.GetWxSDKRootPath", (args) => { #if UNITY_2018 diff --git a/Editor/WXPluginVersion.cs b/Editor/WXPluginVersion.cs index bf9ad703d..bbe861623 100644 --- a/Editor/WXPluginVersion.cs +++ b/Editor/WXPluginVersion.cs @@ -2,7 +2,7 @@ namespace WeChatWASM { public class WXPluginVersion { - public static string pluginVersion = "202508190736"; // 这一行不要改他，导出的时候会自动替换 + public static string pluginVersion = "202509031144"; // 这一行不要改他，导出的时候会自动替换 } public class WXPluginConf diff --git a/Editor/wx-editor.dll b/Editor/wx-editor.dll index 7405b7e19..fdf6934e7 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 8bd12eb5f..71eca6215 100644 --- a/Editor/wx-editor.xml +++ b/Editor/wx-editor.xml @@ -653,6 +653,7 @@ 是否使用iOS metal指令流 + 是否使用brotli多线程压缩 diff --git a/Editor/wx-editor.xml.meta b/Editor/wx-editor.xml.meta index 69abbf802..1291eea18 100644 --- a/Editor/wx-editor.xml.meta +++ b/Editor/wx-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4e2a80fab2cbe76fc8f8a9443ecab609 +guid: cfde08f93a9119f61e03c34aa0df4504 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/SDK-Call-JS-Old.jslib b/Runtime/Plugins/SDK-Call-JS-Old.jslib index 6d658038c..09d9ec303 100755 --- a/Runtime/Plugins/SDK-Call-JS-Old.jslib +++ b/Runtime/Plugins/SDK-Call-JS-Old.jslib @@ -416,11 +416,11 @@ mergeInto(LibraryManager.library, { WXVideoPlay: function(id) { window.WXWASMSDK.WXVideoPlay(_WXPointer_stringify_adaptor(id)); }, - WXVideoAddListener: function(id,key) { + WXVideoAddListener: function(id, key) { window.WXWASMSDK.WXVideoAddListener(_WXPointer_stringify_adaptor(id), _WXPointer_stringify_adaptor(key)); }, - WXVideoDestroy: function(id) { - window.WXWASMSDK.WXVideoDestroy(_WXPointer_stringify_adaptor(id)); + WXVideoDestroy: function(id, isLast) { + window.WXWASMSDK.WXVideoDestroy(_WXPointer_stringify_adaptor(id), isLast); }, WXVideoExitFullScreen: function(id) { window.WXWASMSDK.WXVideoExitFullScreen(_WXPointer_stringify_adaptor(id)); diff --git a/Runtime/Plugins/WXAssetBundle.jslib b/Runtime/Plugins/WXAssetBundle.jslib index ab24b88e2..7645012b6 100644 --- a/Runtime/Plugins/WXAssetBundle.jslib +++ b/Runtime/Plugins/WXAssetBundle.jslib @@ -98,18 +98,19 @@ var WXAssetBundleLibrary = { value: function get(key) { var temp = this.hash.get(key); if (temp !== undefined) { - if(temp.cleanable && unityNamespace.isAndroid && temp.time + this.ttl * 1000 < Date.now()){ - try { - var check_path = WXFS.fd2wxStream.get(key).path - if(!GameGlobal.manager.getCachePath(check_path)){ - throw new Error("No such file in the wx cache system") - } - WXFS.fs.statSync(check_path) - } catch (e) { - GameGlobal.manager.reporter.wxAssetBundle.reportEmptyContent({stage: WXFS.WXABErrorSteps['kCacheGet'], path: check_path, error: !!e ? e.toString() : 'unknown'}); - GameGlobal.manager.Logger.pluginLog('[WXAssetBundle]Android statSync path: ' + check_path + ' error: ' + (!!e ? e.toString() : 'unknown')); - } - } + // 忽略permission denied，屏蔽上报 + // if(temp.cleanable && unityNamespace.isAndroid && temp.time + this.ttl * 1000 < Date.now()){ + // try { + // var check_path = WXFS.fd2wxStream.get(key).path + // if(!GameGlobal.manager.getCachePath(check_path)){ + // throw new Error("No such file in the wx cache system") + // } + // WXFS.fs.statSync(check_path) + // } catch (e) { + // GameGlobal.manager.reporter.wxAssetBundle.reportEmptyContent({stage: WXFS.WXABErrorSteps['kCacheGet'], path: check_path, error: !!e ? e.toString() : 'unknown'}); + // GameGlobal.manager.Logger.pluginLog('[WXAssetBundle]Android statSync path: ' + check_path + ' error: ' + (!!e ? e.toString() : 'unknown')); + // } + // } this.hash.delete(key); temp.time = Date.now(); this.hash.set(key, temp); diff --git a/Runtime/Plugins/libemscriptenglx.a b/Runtime/Plugins/libemscriptenglx.a new file mode 100644 index 000000000..5a72695b3 Binary files /dev/null and b/Runtime/Plugins/libemscriptenglx.a differ diff --git a/Runtime/Plugins/libemscriptenglx.a.meta b/Runtime/Plugins/libemscriptenglx.a.meta new file mode 100644 index 000000000..1e81a9574 --- /dev/null +++ b/Runtime/Plugins/libemscriptenglx.a.meta @@ -0,0 +1,69 @@ +fileFormatVersion: 2 +guid: cccbd1d680cfe34fa1fef9e4875e5f23 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 0 + Exclude Linux64: 0 + Exclude OSXUniversal: 0 + Exclude WeixinMiniGame: 0 + Exclude Win: 0 + Exclude Win64: 0 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + WeixinMiniGame: WeixinMiniGame + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Plugins/libemscriptenglx_2021.a b/Runtime/Plugins/libemscriptenglx_2021.a new file mode 100644 index 000000000..d8f9ac356 Binary files /dev/null and b/Runtime/Plugins/libemscriptenglx_2021.a differ diff --git a/Runtime/Plugins/libemscriptenglx_2021.a.meta b/Runtime/Plugins/libemscriptenglx_2021.a.meta new file mode 100644 index 000000000..005cde2bd --- /dev/null +++ b/Runtime/Plugins/libemscriptenglx_2021.a.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 89ccba97a8e2991dc502c741bc8cd6c6 +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: 1 + 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: + AndroidSharedLibraryType: Executable + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + - first: + WebGL: WebGL + second: + enabled: 0 + settings: {} + - first: + WeixinMiniGame: WeixinMiniGame + second: + enabled: 0 + settings: {} + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend +userData: +assetBundleName: +assetBundleVariant: diff --git a/Runtime/Plugins/wx-perf.dll b/Runtime/Plugins/wx-perf.dll index eca9ff9a5..8103d6f86 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 9a1ebc49c..00be122ca 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 498b52a2d..2f1482e27 100644 --- a/Runtime/Plugins/wx-runtime-editor.xml +++ b/Runtime/Plugins/wx-runtime-editor.xml @@ -1749,116 +1749,126 @@ 视频的总时长，单位为秒 - - - 视频的左上角横坐标 - - - - - 视频的左上角纵坐标 - - - - - 视频的宽度 - - - - - 视频的高度 - - - + 视频的资源地址 - - - 视频的封面 - - - - - 视频的初始播放位置，单位为 s 秒 - - - - - 视频的播放速率，有效值有 0.5、0.8、1.0、1.25、1.5 - - - - - 视频是否为直播 - - - - - 视频的缩放模式 - - - - - 视频是否显示控件 - - - - - 是否显示视频底部进度条 - - - - - 是否显示控制栏的进度条 - - - - - 视频背景颜色 - - - + 视频是否自动播放 - + - 视频是否是否循环播放 + 视频背景颜色 - + - 视频是否禁音播放 + 视频是否显示控件 - - - 视频是否遵循系统静音开关设置（仅iOS） - - - - - 是否启用手势控制播放进度 - - - + 是否开启双击播放的手势 - + + + 是否启用手势控制播放进度 + + + + + 视频的高度 + + + + + 视频的初始播放位置，单位为 s 秒 + + + + + 视频是否为直播 + + + + + 视频是否是否循环播放 + + + + + 视频是否禁音播放 + + + + + 视频是否遵循系统静音开关设置（仅iOS） + + + + + 视频的缩放模式 + + + + + 视频的播放速率，有效值有 0.5、0.8、1.0、1.25、1.5 + + + + + 视频的封面 + + + 是否显示视频中央的播放按钮 - + + + 是否显示视频底部进度条 + + + + + 是否显示控制栏的进度条 + + + + + 视频的宽度 + + + + + 视频的左上角横坐标 + + + + + 视频的左上角纵坐标 + + + 视频是否显示在游戏画布之下 + + + 视频跳转后自动暂停播放 + + + + + 视频跳转原生页后自动暂停播放 + + 开发版 @@ -3129,6 +3139,100 @@ 选填，部分活动、功能允许接收自定义query参数，请参阅渠道说明，默认可不填 + + 错误信息 + + | 错误码 | 错误信息 | 说明 | + | - | - | - | + | 1001 | | 参数错误 | + | -1 | | 支付失败 | + | -2 | | 支付取消 | + | -4 | | 风控拦截 | + | -5 | | 开通签约结果未知 | + | -15001 | | 参数错误,具体原因见err_msg | + | -15002 | | outTradeNo重复使用,请换新单号重试 | + | -15003 | | 系统错误 | + | -15004 | | currencyType错误,目前只能填CNY | + | -15005 | | 用户态签名signature错误 | + | -15006 | | 支付签名paySig错误 | + | -15007 | | session_key过期 | + | -15008 | | 二级商户进件未完成 | + | -15009 | | 代币未发布 | + | -15010 | | 道具productId未发布 | + | -15011 | | 现网版本的env只能是0,不能填1(沙盒环境) | + | -15012 | | 调用米大师失败导致关单,请换新单号重试 | + | -15013 | | goodsPrice道具价格错误 | + | -15014 | | 道具/代币发布未生效，禁止下单，大概10分钟后生效 | + | -15016 | | signData格式有问题 | + | -15017 | | 此商家涉嫌违规，收款功能已被限制，暂无法支付。商家可以登录微信商户平台/微信支付商家助手小程序查看原因和解决方案 | + | -15018 | | 代币或者道具productId审核不通过 | + | -15019 | | 调微信报商户受限,商家可以登录微信商户平台/微信支付商家助手小程序查看原因和解决方案 | + | -15020 | | 操作过快，请稍候再试 | + | -15021 | | 小程序被限频交易 | + + + 错误码 + + | 错误码 | 错误信息 | 说明 | + | - | - | - | + | 1001 | | 参数错误 | + | -1 | | 支付失败 | + | -2 | | 支付取消 | + | -4 | | 风控拦截 | + | -5 | | 开通签约结果未知 | + | -15001 | | 参数错误,具体原因见err_msg | + | -15002 | | outTradeNo重复使用,请换新单号重试 | + | -15003 | | 系统错误 | + | -15004 | | currencyType错误,目前只能填CNY | + | -15005 | | 用户态签名signature错误 | + | -15006 | | 支付签名paySig错误 | + | -15007 | | session_key过期 | + | -15008 | | 二级商户进件未完成 | + | -15009 | | 代币未发布 | + | -15010 | | 道具productId未发布 | + | -15011 | | 现网版本的env只能是0,不能填1(沙盒环境) | + | -15012 | | 调用米大师失败导致关单,请换新单号重试 | + | -15013 | | goodsPrice道具价格错误 | + | -15014 | | 道具/代币发布未生效，禁止下单，大概10分钟后生效 | + | -15016 | | signData格式有问题 | + | -15017 | | 此商家涉嫌违规，收款功能已被限制，暂无法支付。商家可以登录微信商户平台/微信支付商家助手小程序查看原因和解决方案 | + | -15018 | | 代币或者道具productId审核不通过 | + | -15019 | | 调微信报商户受限,商家可以登录微信商户平台/微信支付商家助手小程序查看原因和解决方案 | + | -15020 | | 操作过快，请稍候再试 | + | -15021 | | 小程序被限频交易 | + + + 错误码 + + + 错误信息 + + + 调用成功信息 + + + + 支付的类型, 不同的支付类型有各自额外要传的附加参数 + 可选值： + - 'short_series_goods': 道具直购; + - 'short_series_coin': 代币充值; + + + + + 支付签名, 详见[《签名详解》](https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/virtual-payment.html) + + + + + 具体支付参数见signData, 该参数需以string形式传递, 例如signData: '{"offerId":"123","buyQuantity":1,"env":0,"currencyType":"CNY","productId":"testproductId","goodsPrice":10,"outTradeNo":"xxxxxx","attach":"testdata"}' + + + + + 用户态签名, 详见[《签名详解》](https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/virtual-payment.html) + + 一个表示控制器设备上存在的坐标轴的数组 (比如控制器摇杆)。 @@ -8509,22 +8613,44 @@ 显示用户信息按钮 + + + 微信小游戏视频组件 + + + + + 视频实例字典 (内部使用，请不要访问) + + + + + 视频实例ID + + + + + 视频创建参数 + + + + + 创建视频实例 + + 实例ID + 创建参数 + + + + 初始化属性 + + 内部函数,请不要调用 - - - 视频的资源地址 - - - - - 视频的封面 - - 视频的左上角横坐标 @@ -8545,9 +8671,69 @@ 视频的高度 - + - Gets a value indicating whether 是否正在播放 + 视频的资源地址 + + + + + 视频的封面 + + + + + 是否为直播 + + + + + 当视频大小与 video 容器大小不一致时，视频的表现形式 + + + + + 是否显示默认播放控件（播放/暂停按钮、播放进度、时间） + + + + + 是否显示播放进度 + + + + + 在非全屏模式下，是否开启亮度和音量调节手势 + + + + + 视频的背景色 + + + + + 是否遵循系统静音开关 + + + + + 是否开启控制进度的手势 + + + + + 是否开启播放手势 + + + + + 是否显示视频中间的播放按钮 + + + + + 销毁当前实例 @@ -8555,44 +8741,31 @@ 播放视频 - + - 监听视频播放事件 + 暂停 - + - 取消监听视频播放事件,action 为空表示移除全部事件监听 + 停止视频 - + - 监听视频播放到末尾事件 + 视频跳转 + 视频跳转到指定位置，单位为 s 秒 - + - 取消监听视频播放到末尾事件 + 视频全屏 + 设置全屏时视频的方向 0: 正常竖向, 90: 屏幕逆时针90度 . -90: 屏幕顺时针90度 - + - 监听视频错误事件 - - - - - 取消监听视频错误事件,action 为空表示移除全部事件监听 - - - - - 监听视频暂停事件 - - - - - 取消监听视频暂停事件,action 为空表示移除全部事件监听 + 视频退出全屏 @@ -8605,36 +8778,45 @@ 取消监听视频由于需要缓冲下一帧而停止时触发,action 为空表示移除全部事件监听 - + - 销毁当前实例 + 监听视频下载（缓冲）事件 + + + + + + 取消监听视频下载（缓冲）事件 ,action 为空表示移除全部事件监听 - + - 视频退出全屏 + 监听视频播放事件 - + - 暂停 + 取消监听视频播放事件,action 为空表示移除全部事件监听 - + - 视频全屏 + 监听视频暂停事件 - 设置全屏时视频的方向 0: 正常竖向, 90: 屏幕逆时针90度 . -90: 屏幕顺时针90度 - + - 视频跳转 + 取消监听视频暂停事件,action 为空表示移除全部事件监听 - 视频跳转到指定位置，单位为 s 秒 - + - 停止视频 + 监听视频播放到末尾事件 + + + + + 取消监听视频播放到末尾事件 @@ -8648,15 +8830,14 @@ 取消监听视频播放进度更新事件,action 为空表示移除全部事件监听 - + - 监听视频下载（缓冲）事件 + 监听视频错误事件 - - + - 取消监听视频下载（缓冲）事件 ,action 为空表示移除全部事件监听 + 取消监听视频错误事件,action 为空表示移除全部事件监听 diff --git a/Runtime/Plugins/wx-runtime-editor.xml.meta b/Runtime/Plugins/wx-runtime-editor.xml.meta index b368cd71e..c6062b9a3 100644 --- a/Runtime/Plugins/wx-runtime-editor.xml.meta +++ b/Runtime/Plugins/wx-runtime-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 744bf12ecf3dfaa699dd812a15f33b22 +guid: 9ee77de8b3b4879018f479b8dd8d4205 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/wx-runtime.dll b/Runtime/Plugins/wx-runtime.dll index e91914610..a7a878b92 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 d4e4841fa..482a88a22 100644 --- a/Runtime/Plugins/wx-runtime.xml +++ b/Runtime/Plugins/wx-runtime.xml @@ -1755,116 +1755,126 @@ 视频的总时长，单位为秒 - - - 视频的左上角横坐标 - - - - - 视频的左上角纵坐标 - - - - - 视频的宽度 - - - - - 视频的高度 - - - + 视频的资源地址 - - - 视频的封面 - - - - - 视频的初始播放位置，单位为 s 秒 - - - - - 视频的播放速率，有效值有 0.5、0.8、1.0、1.25、1.5 - - - - - 视频是否为直播 - - - - - 视频的缩放模式 - - - - - 视频是否显示控件 - - - - - 是否显示视频底部进度条 - - - - - 是否显示控制栏的进度条 - - - - - 视频背景颜色 - - - + 视频是否自动播放 - + - 视频是否是否循环播放 + 视频背景颜色 - + - 视频是否禁音播放 + 视频是否显示控件 - - - 视频是否遵循系统静音开关设置（仅iOS） - - - - - 是否启用手势控制播放进度 - - - + 是否开启双击播放的手势 - + + + 是否启用手势控制播放进度 + + + + + 视频的高度 + + + + + 视频的初始播放位置，单位为 s 秒 + + + + + 视频是否为直播 + + + + + 视频是否是否循环播放 + + + + + 视频是否禁音播放 + + + + + 视频是否遵循系统静音开关设置（仅iOS） + + + + + 视频的缩放模式 + + + + + 视频的播放速率，有效值有 0.5、0.8、1.0、1.25、1.5 + + + + + 视频的封面 + + + 是否显示视频中央的播放按钮 - + + + 是否显示视频底部进度条 + + + + + 是否显示控制栏的进度条 + + + + + 视频的宽度 + + + + + 视频的左上角横坐标 + + + + + 视频的左上角纵坐标 + + + 视频是否显示在游戏画布之下 + + + 视频跳转后自动暂停播放 + + + + + 视频跳转原生页后自动暂停播放 + + 开发版 @@ -3135,6 +3145,100 @@ 选填，部分活动、功能允许接收自定义query参数，请参阅渠道说明，默认可不填 + + 错误信息 + + | 错误码 | 错误信息 | 说明 | + | - | - | - | + | 1001 | | 参数错误 | + | -1 | | 支付失败 | + | -2 | | 支付取消 | + | -4 | | 风控拦截 | + | -5 | | 开通签约结果未知 | + | -15001 | | 参数错误,具体原因见err_msg | + | -15002 | | outTradeNo重复使用,请换新单号重试 | + | -15003 | | 系统错误 | + | -15004 | | currencyType错误,目前只能填CNY | + | -15005 | | 用户态签名signature错误 | + | -15006 | | 支付签名paySig错误 | + | -15007 | | session_key过期 | + | -15008 | | 二级商户进件未完成 | + | -15009 | | 代币未发布 | + | -15010 | | 道具productId未发布 | + | -15011 | | 现网版本的env只能是0,不能填1(沙盒环境) | + | -15012 | | 调用米大师失败导致关单,请换新单号重试 | + | -15013 | | goodsPrice道具价格错误 | + | -15014 | | 道具/代币发布未生效，禁止下单，大概10分钟后生效 | + | -15016 | | signData格式有问题 | + | -15017 | | 此商家涉嫌违规，收款功能已被限制，暂无法支付。商家可以登录微信商户平台/微信支付商家助手小程序查看原因和解决方案 | + | -15018 | | 代币或者道具productId审核不通过 | + | -15019 | | 调微信报商户受限,商家可以登录微信商户平台/微信支付商家助手小程序查看原因和解决方案 | + | -15020 | | 操作过快，请稍候再试 | + | -15021 | | 小程序被限频交易 | + + + 错误码 + + | 错误码 | 错误信息 | 说明 | + | - | - | - | + | 1001 | | 参数错误 | + | -1 | | 支付失败 | + | -2 | | 支付取消 | + | -4 | | 风控拦截 | + | -5 | | 开通签约结果未知 | + | -15001 | | 参数错误,具体原因见err_msg | + | -15002 | | outTradeNo重复使用,请换新单号重试 | + | -15003 | | 系统错误 | + | -15004 | | currencyType错误,目前只能填CNY | + | -15005 | | 用户态签名signature错误 | + | -15006 | | 支付签名paySig错误 | + | -15007 | | session_key过期 | + | -15008 | | 二级商户进件未完成 | + | -15009 | | 代币未发布 | + | -15010 | | 道具productId未发布 | + | -15011 | | 现网版本的env只能是0,不能填1(沙盒环境) | + | -15012 | | 调用米大师失败导致关单,请换新单号重试 | + | -15013 | | goodsPrice道具价格错误 | + | -15014 | | 道具/代币发布未生效，禁止下单，大概10分钟后生效 | + | -15016 | | signData格式有问题 | + | -15017 | | 此商家涉嫌违规，收款功能已被限制，暂无法支付。商家可以登录微信商户平台/微信支付商家助手小程序查看原因和解决方案 | + | -15018 | | 代币或者道具productId审核不通过 | + | -15019 | | 调微信报商户受限,商家可以登录微信商户平台/微信支付商家助手小程序查看原因和解决方案 | + | -15020 | | 操作过快，请稍候再试 | + | -15021 | | 小程序被限频交易 | + + + 错误码 + + + 错误信息 + + + 调用成功信息 + + + + 支付的类型, 不同的支付类型有各自额外要传的附加参数 + 可选值： + - 'short_series_goods': 道具直购; + - 'short_series_coin': 代币充值; + + + + + 支付签名, 详见[《签名详解》](https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/virtual-payment.html) + + + + + 具体支付参数见signData, 该参数需以string形式传递, 例如signData: '{"offerId":"123","buyQuantity":1,"env":0,"currencyType":"CNY","productId":"testproductId","goodsPrice":10,"outTradeNo":"xxxxxx","attach":"testdata"}' + + + + + 用户态签名, 详见[《签名详解》](https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/virtual-payment.html) + + 一个表示控制器设备上存在的坐标轴的数组 (比如控制器摇杆)。 @@ -8515,22 +8619,44 @@ 显示用户信息按钮 + + + 微信小游戏视频组件 + + + + + 视频实例字典 (内部使用，请不要访问) + + + + + 视频实例ID + + + + + 视频创建参数 + + + + + 创建视频实例 + + 实例ID + 创建参数 + + + + 初始化属性 + + 内部函数,请不要调用 - - - 视频的资源地址 - - - - - 视频的封面 - - 视频的左上角横坐标 @@ -8551,9 +8677,69 @@ 视频的高度 - + - Gets a value indicating whether 是否正在播放 + 视频的资源地址 + + + + + 视频的封面 + + + + + 是否为直播 + + + + + 当视频大小与 video 容器大小不一致时，视频的表现形式 + + + + + 是否显示默认播放控件（播放/暂停按钮、播放进度、时间） + + + + + 是否显示播放进度 + + + + + 在非全屏模式下，是否开启亮度和音量调节手势 + + + + + 视频的背景色 + + + + + 是否遵循系统静音开关 + + + + + 是否开启控制进度的手势 + + + + + 是否开启播放手势 + + + + + 是否显示视频中间的播放按钮 + + + + + 销毁当前实例 @@ -8561,44 +8747,31 @@ 播放视频 - + - 监听视频播放事件 + 暂停 - + - 取消监听视频播放事件,action 为空表示移除全部事件监听 + 停止视频 - + - 监听视频播放到末尾事件 + 视频跳转 + 视频跳转到指定位置，单位为 s 秒 - + - 取消监听视频播放到末尾事件 + 视频全屏 + 设置全屏时视频的方向 0: 正常竖向, 90: 屏幕逆时针90度 . -90: 屏幕顺时针90度 - + - 监听视频错误事件 - - - - - 取消监听视频错误事件,action 为空表示移除全部事件监听 - - - - - 监听视频暂停事件 - - - - - 取消监听视频暂停事件,action 为空表示移除全部事件监听 + 视频退出全屏 @@ -8611,36 +8784,45 @@ 取消监听视频由于需要缓冲下一帧而停止时触发,action 为空表示移除全部事件监听 - + - 销毁当前实例 + 监听视频下载（缓冲）事件 + + + + + + 取消监听视频下载（缓冲）事件 ,action 为空表示移除全部事件监听 - + - 视频退出全屏 + 监听视频播放事件 - + - 暂停 + 取消监听视频播放事件,action 为空表示移除全部事件监听 - + - 视频全屏 + 监听视频暂停事件 - 设置全屏时视频的方向 0: 正常竖向, 90: 屏幕逆时针90度 . -90: 屏幕顺时针90度 - + - 视频跳转 + 取消监听视频暂停事件,action 为空表示移除全部事件监听 - 视频跳转到指定位置，单位为 s 秒 - + - 停止视频 + 监听视频播放到末尾事件 + + + + + 取消监听视频播放到末尾事件 @@ -8654,15 +8836,14 @@ 取消监听视频播放进度更新事件,action 为空表示移除全部事件监听 - + - 监听视频下载（缓冲）事件 + 监听视频错误事件 - - + - 取消监听视频下载（缓冲）事件 ,action 为空表示移除全部事件监听 + 取消监听视频错误事件,action 为空表示移除全部事件监听 diff --git a/Runtime/Plugins/wx-runtime.xml.meta b/Runtime/Plugins/wx-runtime.xml.meta index 269db31e7..f01b3407f 100644 --- a/Runtime/Plugins/wx-runtime.xml.meta +++ b/Runtime/Plugins/wx-runtime.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 00bce541fac34af9181e2dc507ef6680 +guid: f4930eb7e98ddba34e56cfff9b657d9e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/WXBase.cs b/Runtime/WXBase.cs index 31be7b595..5a74542d4 100644 --- a/Runtime/WXBase.cs +++ b/Runtime/WXBase.cs @@ -535,7 +535,7 @@ namespace WeChatWASM /// /// /// - public static WXVideo CreateVideo(WXCreateVideoParam param) + public static WXVideo CreateVideo(CreateVideoOption param) { return WXSDKManagerHandler.Instance.CreateVideo(param); } @@ -1127,6 +1127,15 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.NotifyMiniProgramPlayableStatus(option); } #endregion +#region 虚拟支付 + /// + /// 请求虚拟支付 + /// + public static void RequestVirtualPayment(RequestVirtualPaymentOption option) + { + WXSDKManagerHandler.Instance.RequestVirtualPayment(option); + } +#endregion /// /// [[PageManager](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/PageManager.html) wx.createPageManager()](https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/wx.createPageManager.html) diff --git a/Runtime/playable-default/check-version.js.meta b/Runtime/playable-default/check-version.js.meta index d1cf0ec62..9a7653c1b 100644 --- a/Runtime/playable-default/check-version.js.meta +++ b/Runtime/playable-default/check-version.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 72b139033b80b9d6b99085dfc8bc2a49 + guid: a964dd3a9866c6b8a897a1403752ceab DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/data-package.meta b/Runtime/playable-default/data-package.meta index 52970a36b..fc926bc69 100644 --- a/Runtime/playable-default/data-package.meta +++ b/Runtime/playable-default/data-package.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a997306c2732066bba544aa059476b08 +guid: 968b94056c545b44286ed0de065541e1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/data-package/game.js.meta b/Runtime/playable-default/data-package/game.js.meta index 38f53b0ad..160c10605 100644 --- a/Runtime/playable-default/data-package/game.js.meta +++ b/Runtime/playable-default/data-package/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: ebbc2640a5b6186f28f1b7605fbabab7 + guid: d73f40db8eaf08f9e0efb17e0174c413 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/events.js.meta b/Runtime/playable-default/events.js.meta index 264463350..1567c8aba 100644 --- a/Runtime/playable-default/events.js.meta +++ b/Runtime/playable-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: fd42866e6c5266b7e4359f2543a1fec8 + guid: d5240d8735a85195cc5ea0852e37e329 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/game.js.meta b/Runtime/playable-default/game.js.meta index c9f8339c8..26c31ee60 100644 --- a/Runtime/playable-default/game.js.meta +++ b/Runtime/playable-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 9cd04a9e88b74649448d33f0cd13031e + guid: 8bfbe3f76600720747f3782569d7da3e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/game.json.meta b/Runtime/playable-default/game.json.meta index ad1772cf5..5101d2bf5 100644 --- a/Runtime/playable-default/game.json.meta +++ b/Runtime/playable-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: c611738fcc7802f4d0a2c44863e28ee8 + guid: bf37709d66b233638517b93e5bff6be7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/playable-fix.js.meta b/Runtime/playable-default/playable-fix.js.meta index 8a567ac0e..696097d0c 100644 --- a/Runtime/playable-default/playable-fix.js.meta +++ b/Runtime/playable-default/playable-fix.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 434a16c5ea815113890c5d6f58c6c7ca + guid: 11189805ff5588013366deccd0976c6a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/plugin-config.js.meta b/Runtime/playable-default/plugin-config.js.meta index c2cd2d721..c22e25d47 100644 --- a/Runtime/playable-default/plugin-config.js.meta +++ b/Runtime/playable-default/plugin-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: a0cc3b7ca12186d2d446018c3ddf214d + guid: 5df8450edc9906d5052d64aca3e14c7f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/plugins.meta b/Runtime/playable-default/plugins.meta index 81162e38e..ec5849774 100644 --- a/Runtime/playable-default/plugins.meta +++ b/Runtime/playable-default/plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac4244e6a18805d144af9149f834e0a1 +guid: 4a224a2b07b5ce59392f507267014a6b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/plugins/check-update.js.meta b/Runtime/playable-default/plugins/check-update.js.meta index 667feca6e..dae92f942 100644 --- a/Runtime/playable-default/plugins/check-update.js.meta +++ b/Runtime/playable-default/plugins/check-update.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 2bf22c2d04a9e7d9f297501c1323ac4d + guid: c7eb1437300c20adc0ab1b4be0d76d7c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/plugins/screen-adapter.js.meta b/Runtime/playable-default/plugins/screen-adapter.js.meta index a511491c8..24af8fe44 100644 --- a/Runtime/playable-default/plugins/screen-adapter.js.meta +++ b/Runtime/playable-default/plugins/screen-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 8570e6b4206b6d7d341446244a6c4da7 + guid: 377e39fa5403cb9452bbef8ece51b346 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/project.config.json.meta b/Runtime/playable-default/project.config.json.meta index 4598a4a72..caddb8070 100644 --- a/Runtime/playable-default/project.config.json.meta +++ b/Runtime/playable-default/project.config.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 7eaa133708b8be10e36a5ebe9452e572 + guid: 097289614139a3553151e676289c98ce DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/texture-config.js.meta b/Runtime/playable-default/texture-config.js.meta index 58b9f3dc3..995775c8c 100644 --- a/Runtime/playable-default/texture-config.js.meta +++ b/Runtime/playable-default/texture-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 5d03bc8e8d87086243a0a65794f51bd6 + guid: f2b55a59a14faee103488d7c3d80cdb7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-namespace.js.meta b/Runtime/playable-default/unity-namespace.js.meta index 44518b0f7..50a0650c4 100644 --- a/Runtime/playable-default/unity-namespace.js.meta +++ b/Runtime/playable-default/unity-namespace.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: d5b36e6b6d042ee0548fa62635223b58 + guid: 0b994073aff72030f20cc1508a5ac336 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-playable-plugin.meta b/Runtime/playable-default/unity-playable-plugin.meta index a7a44fbe1..d3e1e5534 100644 --- a/Runtime/playable-default/unity-playable-plugin.meta +++ b/Runtime/playable-default/unity-playable-plugin.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 140fee18982d4e45623dd3a1e66ac75e +guid: d3c73470e10dac77d232db60d671090c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/unity-playable-plugin/index.js.meta b/Runtime/playable-default/unity-playable-plugin/index.js.meta index 2a39e5075..32c0b665c 100644 --- a/Runtime/playable-default/unity-playable-plugin/index.js.meta +++ b/Runtime/playable-default/unity-playable-plugin/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 659e2b43f55112843ee9c6407128bac6 + guid: 9e2806496ee106d6c0a2148012efe4a9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk.meta b/Runtime/playable-default/unity-sdk.meta index 6e39a31b3..cf16b8058 100644 --- a/Runtime/playable-default/unity-sdk.meta +++ b/Runtime/playable-default/unity-sdk.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e1c372ff8f4195bc75114c9554eaff6f +guid: f473a2cdce3d02d3134873a4f191b5a2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/unity-sdk/audio.meta b/Runtime/playable-default/unity-sdk/audio.meta index 69904d6f4..854440893 100644 --- a/Runtime/playable-default/unity-sdk/audio.meta +++ b/Runtime/playable-default/unity-sdk/audio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2fa6a51b71803dc08b295c766489b9ea +guid: 23371689907a490dc66b1e81bee95246 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/unity-sdk/audio/common.js.meta b/Runtime/playable-default/unity-sdk/audio/common.js.meta index f538bee45..c5aa27423 100644 --- a/Runtime/playable-default/unity-sdk/audio/common.js.meta +++ b/Runtime/playable-default/unity-sdk/audio/common.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 1484f1e87b79ffa93541f61a84b1893f + guid: fd5a2fac2fef60aaae2b1b0739041e9b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/audio/const.js.meta b/Runtime/playable-default/unity-sdk/audio/const.js.meta index 47544ca17..ba1265231 100644 --- a/Runtime/playable-default/unity-sdk/audio/const.js.meta +++ b/Runtime/playable-default/unity-sdk/audio/const.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 345eb4b995090af85b5e5ba6a3a0515a + guid: 12aa709d2386ea1228a174394e019317 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/audio/index.js.meta b/Runtime/playable-default/unity-sdk/audio/index.js.meta index 643ecfe1f..28cd9d66d 100644 --- a/Runtime/playable-default/unity-sdk/audio/index.js.meta +++ b/Runtime/playable-default/unity-sdk/audio/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: b38adae15bfe35672bce4821ca5930db + guid: c264285a8f2065a1cf87c9e4f0573657 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/audio/inner-audio.js.meta b/Runtime/playable-default/unity-sdk/audio/inner-audio.js.meta index cebe02cbb..159856941 100644 --- a/Runtime/playable-default/unity-sdk/audio/inner-audio.js.meta +++ b/Runtime/playable-default/unity-sdk/audio/inner-audio.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: a775d3ea945670380658bc11adcc9728 + guid: 7b7108da5dd20a0fd699e874d054a915 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/audio/store.js.meta b/Runtime/playable-default/unity-sdk/audio/store.js.meta index b1f5b01bd..10f9c7a70 100644 --- a/Runtime/playable-default/unity-sdk/audio/store.js.meta +++ b/Runtime/playable-default/unity-sdk/audio/store.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 163cfa54d38fa37b54e9b08c88273927 + guid: 413fc1b5d423735f5baff311fef6e02c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/audio/unity-audio.js b/Runtime/playable-default/unity-sdk/audio/unity-audio.js index bf675abc0..3dcb2fd5c 100644 --- a/Runtime/playable-default/unity-sdk/audio/unity-audio.js +++ b/Runtime/playable-default/unity-sdk/audio/unity-audio.js @@ -1018,6 +1018,9 @@ export default { if (WEBAudio.audioWebSupport === 0 || WEBAudio.audioWebEnabled === 0) { return; } + if (WEBAudio.audioContext && WEBAudio.audioContext.state !== 'suspended') { + return; + } resumeWebAudio(); }, _JS_Sound_Set3D(channelInstance, threeD) { diff --git a/Runtime/playable-default/unity-sdk/audio/unity-audio.js.meta b/Runtime/playable-default/unity-sdk/audio/unity-audio.js.meta index 8484192ca..79f3db470 100644 --- a/Runtime/playable-default/unity-sdk/audio/unity-audio.js.meta +++ b/Runtime/playable-default/unity-sdk/audio/unity-audio.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: a77aeffdf1e4e4cae8e2605672c55550 + guid: d282a9944a2c0d9bcb9d58a088f3307a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/audio/utils.js.meta b/Runtime/playable-default/unity-sdk/audio/utils.js.meta index 96dee8e33..eadf00b5f 100644 --- a/Runtime/playable-default/unity-sdk/audio/utils.js.meta +++ b/Runtime/playable-default/unity-sdk/audio/utils.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: e2941757369859aeba3d7e6ebd831fa2 + guid: d1b701088168d081aa938c87a73add8a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/canvas-context.js.meta b/Runtime/playable-default/unity-sdk/canvas-context.js.meta index 996e271d0..70e8a15aa 100644 --- a/Runtime/playable-default/unity-sdk/canvas-context.js.meta +++ b/Runtime/playable-default/unity-sdk/canvas-context.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 73b593c254c758a6cea0d1c1d60fc3e7 + guid: 3fab2c0d76ed04d359ea667ec36941cb DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/canvas.js.meta b/Runtime/playable-default/unity-sdk/canvas.js.meta index 4028cbd08..cebd6b713 100644 --- a/Runtime/playable-default/unity-sdk/canvas.js.meta +++ b/Runtime/playable-default/unity-sdk/canvas.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 4ea8a010da6162ea8ea52fb1f569e671 + guid: ad00c394f06513851af97551c058d8a6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/conf.js.meta b/Runtime/playable-default/unity-sdk/conf.js.meta index 1c3c3249d..873380f09 100644 --- a/Runtime/playable-default/unity-sdk/conf.js.meta +++ b/Runtime/playable-default/unity-sdk/conf.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 2ba51385d798e8f725194b8f0044ee13 + guid: d2b8d7b55cf84ccd03edf313af9a8c29 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/file-info.js.meta b/Runtime/playable-default/unity-sdk/file-info.js.meta index f328d9d62..b33b9f3b7 100644 --- a/Runtime/playable-default/unity-sdk/file-info.js.meta +++ b/Runtime/playable-default/unity-sdk/file-info.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 320dac1f684fc429e72cdca93fe1f0c8 + guid: 158b1da34c20537f2b9b57c8b3da38ca DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/fix.js.meta b/Runtime/playable-default/unity-sdk/fix.js.meta index e7cb6d2a8..573c1d3c3 100644 --- a/Runtime/playable-default/unity-sdk/fix.js.meta +++ b/Runtime/playable-default/unity-sdk/fix.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 24dad2d7efe34e93f6a63a48016423ae + guid: 7ad26b099ae843df3824e9c34aca1d3b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/fs.js.meta b/Runtime/playable-default/unity-sdk/fs.js.meta index 73029aa19..36462e363 100644 --- a/Runtime/playable-default/unity-sdk/fs.js.meta +++ b/Runtime/playable-default/unity-sdk/fs.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 8367c4606f2866b4e651d631280b4ac0 + guid: 02fa83cebcff4c9ce6c85255012714e3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/index.js.meta b/Runtime/playable-default/unity-sdk/index.js.meta index b9704250a..6be780168 100644 --- a/Runtime/playable-default/unity-sdk/index.js.meta +++ b/Runtime/playable-default/unity-sdk/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: c30c8164896ec58e547faa1c28b542c3 + guid: 8d3ba345e637f4e6f43e4861ea6583b8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/logger.js.meta b/Runtime/playable-default/unity-sdk/logger.js.meta index 3db0cdefd..0fc68c545 100644 --- a/Runtime/playable-default/unity-sdk/logger.js.meta +++ b/Runtime/playable-default/unity-sdk/logger.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 3682b97797acb1af66d14874ecb5ef66 + guid: 3af3770c7cc729444430d05a7a5b6ca6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/mobileKeyboard.meta b/Runtime/playable-default/unity-sdk/mobileKeyboard.meta index 4fa34ef11..1878cede1 100644 --- a/Runtime/playable-default/unity-sdk/mobileKeyboard.meta +++ b/Runtime/playable-default/unity-sdk/mobileKeyboard.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bdb08ac45c3e02d1cca0bc6baaa7cff9 +guid: 68b8c4f42e662b0e7509f4beea0cbfb4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/unity-sdk/mobileKeyboard/index.js.meta b/Runtime/playable-default/unity-sdk/mobileKeyboard/index.js.meta index e131c9ffc..fdc73d701 100644 --- a/Runtime/playable-default/unity-sdk/mobileKeyboard/index.js.meta +++ b/Runtime/playable-default/unity-sdk/mobileKeyboard/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: e4748760dc46a32255e35634543f34af + guid: 91ca01360e9ef64d2b51ce8c18e38f5c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/module-helper.js.meta b/Runtime/playable-default/unity-sdk/module-helper.js.meta index ab5313fb2..23ab80a23 100644 --- a/Runtime/playable-default/unity-sdk/module-helper.js.meta +++ b/Runtime/playable-default/unity-sdk/module-helper.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 9c37db65e214cfc4b0653da8ad7410b4 + guid: 3ecf7c97ad4cc9c15e2a1dc3530168b6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/recorder.js.meta b/Runtime/playable-default/unity-sdk/recorder.js.meta index 77f072172..162af1b24 100644 --- a/Runtime/playable-default/unity-sdk/recorder.js.meta +++ b/Runtime/playable-default/unity-sdk/recorder.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 95757d8548b999bde6d0b6787c0ae1d9 + guid: 44b52d4962d80c314225bcd4c42922af DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/resType.js.meta b/Runtime/playable-default/unity-sdk/resType.js.meta index ab4849395..1023a9e86 100644 --- a/Runtime/playable-default/unity-sdk/resType.js.meta +++ b/Runtime/playable-default/unity-sdk/resType.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: ecf2513c35b8072a06c821bd5737fadf + guid: 8b62f84805df2827e4d0db6a1a77f117 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/resTypeOther.js.meta b/Runtime/playable-default/unity-sdk/resTypeOther.js.meta index 9bd1eb4ff..29a766527 100644 --- a/Runtime/playable-default/unity-sdk/resTypeOther.js.meta +++ b/Runtime/playable-default/unity-sdk/resTypeOther.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 8f418650d2052e382b5c4facc7970625 + guid: 40b7cda50b4ab131db3312e550734d6f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/response.js.meta b/Runtime/playable-default/unity-sdk/response.js.meta index 4120b0c7d..1ec28a3d2 100644 --- a/Runtime/playable-default/unity-sdk/response.js.meta +++ b/Runtime/playable-default/unity-sdk/response.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: ca2e677b7926336eed382fbb4ae7c866 + guid: 9e059a9187d1edd998cf811476659ea8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/sdk.js.meta b/Runtime/playable-default/unity-sdk/sdk.js.meta index f807b608e..ec37852c2 100644 --- a/Runtime/playable-default/unity-sdk/sdk.js.meta +++ b/Runtime/playable-default/unity-sdk/sdk.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 7f2df765fb49ed9c7a770ba4ea740bc1 + guid: 2ce4d3f6e7ce709df30b933dc71a6717 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/special-callbacks.js.meta b/Runtime/playable-default/unity-sdk/special-callbacks.js.meta index 160c446a9..7f2d1c523 100644 --- a/Runtime/playable-default/unity-sdk/special-callbacks.js.meta +++ b/Runtime/playable-default/unity-sdk/special-callbacks.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 8b714053feed532ca6f7d0491c47b557 + guid: df3edd75b2eeb58f3a6d524da80f0691 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/texture.js.meta b/Runtime/playable-default/unity-sdk/texture.js.meta index b6b88eaa3..d5a01c4ab 100644 --- a/Runtime/playable-default/unity-sdk/texture.js.meta +++ b/Runtime/playable-default/unity-sdk/texture.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: aafe1f1425bb63fb2a8a1f2c952f6547 + guid: ccbbfe719f555cbf28d66ae5a9495ecc DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/touch.meta b/Runtime/playable-default/unity-sdk/touch.meta index 7a299a6dc..565b81161 100644 --- a/Runtime/playable-default/unity-sdk/touch.meta +++ b/Runtime/playable-default/unity-sdk/touch.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 81b0595187bd2e72660b4a973fb371db +guid: cd7fad2baf5ad0c24e3a5efb96cc316a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/unity-sdk/touch/index.js.meta b/Runtime/playable-default/unity-sdk/touch/index.js.meta index 7734b2ba7..0f938c5a7 100644 --- a/Runtime/playable-default/unity-sdk/touch/index.js.meta +++ b/Runtime/playable-default/unity-sdk/touch/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 6ff4a02d27c350c57c91f7658eb1581b + guid: 2b4c898304e4f26569836ab43cc295e5 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/util.js.meta b/Runtime/playable-default/unity-sdk/util.js.meta index b4d6dc923..c31ff755b 100644 --- a/Runtime/playable-default/unity-sdk/util.js.meta +++ b/Runtime/playable-default/unity-sdk/util.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: df87d731e861a442062d81f9deea71d7 + guid: a03ab7b636a4f273e339ec6697ce5ba6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/utils.js.meta b/Runtime/playable-default/unity-sdk/utils.js.meta index 24781a48a..eea2b12be 100644 --- a/Runtime/playable-default/unity-sdk/utils.js.meta +++ b/Runtime/playable-default/unity-sdk/utils.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 0c16e081ef5eb96f146e80079e9c7b83 + guid: f2342ec4f6f330da28a47d81c76ca2d3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/video.js b/Runtime/playable-default/unity-sdk/video.js index e81be2bbe..53706d8cc 100644 --- a/Runtime/playable-default/unity-sdk/video.js +++ b/Runtime/playable-default/unity-sdk/video.js @@ -18,32 +18,27 @@ export default { if (!obj) { return; } - if (key === 'x' || key === 'y' || key === 'width' || key === 'height') { + if (key === 'x' || key === 'y' || key === 'width' || key === 'height' || key === 'initialTime' || key === 'playbackRate') { obj[key] = +value; } - else if (key === 'src' || key === 'poster') { + else if (key === 'src' || key === 'poster' || key === 'objectFit' || key === 'backgroundColor') { obj[key] = value; } - }, - WXVideoPlay(id) { - const obj = getObject(id); - if (!obj) { - return; + else if (key === 'live' || key === 'controls' || key === 'showProgress' || key === 'showProgressInControlMode' + || key === 'autoplay' || key === 'loop' || key === 'muted' || key === 'obeyMuteSwitch' + || key === 'enableProgressGesture' || key === 'enablePlayGesture' || key === 'showCenterPlayBtn') { + obj[key] = value === 'True'; } - obj.play(); }, WXVideoAddListener(id, key) { - const obj = getObject(id); - if (!obj) { - return; - } - obj[key]((e) => { + getObject(id)?.[key]((e) => { moduleHelper.send('OnVideoCallback', JSON.stringify({ callbackId: id, - errMsg: key, - position: e && e.position, - buffered: e && e.buffered, - duration: e && e.duration, + type: key, + position: e?.position, + buffered: e?.buffered ? Number(e.buffered) : undefined, + duration: e?.duration, + errMsg: e?.errMsg, })); if (key === 'onError') { GameGlobal.enableTransparentCanvas = false; @@ -51,54 +46,31 @@ export default { } }); }, - WXVideoDestroy(id) { - const obj = getObject(id); - if (!obj) { - return; - } - obj.destroy(); - GameGlobal.enableTransparentCanvas = false; + WXVideoRemoveListener(id, key) { + getObject(id)?.[key](); }, - WXVideoExitFullScreen(id) { - const obj = getObject(id); - if (!obj) { - return; + WXVideoDestroy(id, isLast) { + getObject(id)?.destroy(); + if (isLast) { + GameGlobal.enableTransparentCanvas = false; } - obj.exitFullScreen(); + }, + WXVideoPlay(id) { + getObject(id)?.play(); }, WXVideoPause(id) { - const obj = getObject(id); - if (!obj) { - return; - } - obj.pause(); - }, - WXVideoRequestFullScreen(id, direction) { - const obj = getObject(id); - if (!obj) { - return; - } - obj.requestFullScreen(direction); - }, - WXVideoSeek(id, time) { - const obj = getObject(id); - if (!obj) { - return; - } - obj.seek(time); + getObject(id)?.pause(); }, WXVideoStop(id) { - const obj = getObject(id); - if (!obj) { - return; - } - obj.stop(); + getObject(id)?.stop(); }, - WXVideoRemoveListener(id, key) { - const obj = getObject(id); - if (!obj) { - return; - } - obj[key](); + WXVideoSeek(id, time) { + getObject(id)?.seek(time); + }, + WXVideoRequestFullScreen(id, direction) { + getObject(id)?.requestFullScreen(direction); + }, + WXVideoExitFullScreen(id) { + getObject(id)?.exitFullScreen(); }, }; diff --git a/Runtime/playable-default/unity-sdk/video.js.meta b/Runtime/playable-default/unity-sdk/video.js.meta index 91ce4c5f1..7c6561d29 100644 --- a/Runtime/playable-default/unity-sdk/video.js.meta +++ b/Runtime/playable-default/unity-sdk/video.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: fbba2afedf7de369f6616a2737e6584e + guid: f8c20bcb3e76b7b5f5b801707d050003 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/video.meta b/Runtime/playable-default/unity-sdk/video.meta index fe877c7c4..d2aa91433 100644 --- a/Runtime/playable-default/unity-sdk/video.meta +++ b/Runtime/playable-default/unity-sdk/video.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 425bb6592b83479f021f4ac580380f95 +guid: 55f639dcee2147410c19c80917a0fb44 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/unity-sdk/video/index.js b/Runtime/playable-default/unity-sdk/video/index.js index c94034672..6fa2ac90a 100644 --- a/Runtime/playable-default/unity-sdk/video/index.js +++ b/Runtime/playable-default/unity-sdk/video/index.js @@ -171,6 +171,12 @@ function _JS_Video_Create(url) { function _JS_Video_Destroy(video) { debugLog('_JS_Video_Destroy', video); videoInstances[video].destroy(); + const Module = GameGlobal.manager.gameInstance.Module; + const { GL } = Module; + const gl = GL.currentContext.GLctx; + if (!isWebVideo && gl.emscriptenGLX && Module._glxVideoDestroy) { + Module._glxVideoDestroy(video); + } delete videoInstances[video]; } function _JS_Video_Duration(video) { @@ -375,7 +381,29 @@ function _JS_Video_UpdateToTexture(video, tex) { if (!FrameworkData) { return false; } + const Module = GameGlobal.manager.gameInstance.Module; const { GL, GLctx } = FrameworkData; + const gl = GL.currentContext.GLctx; + + if (!isWebVideo && Module._glxVideoUpdateToTexture && gl.emscriptenGLX) { + const data = v.frameData?.data; + const source = supportVideoFrame ? data : new Uint8ClampedArray(data); + const byteLength = supportVideoFrame ? 0 : source.byteLength; + let sourceIdOrPtr; + if (supportVideoFrame) { + sourceIdOrPtr = source.__uid; + } + else { + sourceIdOrPtr = Module._glxGetVideoTempBuffer(video, byteLength); + if (sourceIdOrPtr) { + Module.HEAPU8.set(source, sourceIdOrPtr); + } + } + + Module._glxVideoUpdateToTexture(v, supportVideoFrame, tex, v.videoWidth, v.videoHeight, sourceIdOrPtr); + return true; + } + GLctx.pixelStorei(GLctx.UNPACK_FLIP_Y_WEBGL, true); diff --git a/Runtime/playable-default/unity-sdk/video/index.js.meta b/Runtime/playable-default/unity-sdk/video/index.js.meta index a9324354d..b069b38dd 100644 --- a/Runtime/playable-default/unity-sdk/video/index.js.meta +++ b/Runtime/playable-default/unity-sdk/video/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: bd6bf06ecfb1617fb7b6603427825f15 + guid: f7132932dd6f78b1716a5a6c28b06e81 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/wasmcode.meta b/Runtime/playable-default/wasmcode.meta index eec624e26..e19d0a833 100644 --- a/Runtime/playable-default/wasmcode.meta +++ b/Runtime/playable-default/wasmcode.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8d8052d59bb07606065585cf08b0253d +guid: 3e9dce4d0280b6195d2a9c0b17dc6a27 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/wasmcode/game.js.meta b/Runtime/playable-default/wasmcode/game.js.meta index d8b68a8e8..3b975060a 100644 --- a/Runtime/playable-default/wasmcode/game.js.meta +++ b/Runtime/playable-default/wasmcode/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 11f12368f26a118555972961efe907fd + guid: 3ac2882df9577d829012de685539f981 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/weapp-adapter.js.meta b/Runtime/playable-default/weapp-adapter.js.meta index a6df53b89..a885ce6a2 100644 --- a/Runtime/playable-default/weapp-adapter.js.meta +++ b/Runtime/playable-default/weapp-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: b1c65667ff7aa0db7dd760e09e48d235 + guid: 4a63e0d5b0124a15fde5a6bc2c312718 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/check-version.js.meta b/Runtime/wechat-default/check-version.js.meta index 2ef408450..d88c38de5 100644 --- a/Runtime/wechat-default/check-version.js.meta +++ b/Runtime/wechat-default/check-version.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: b359eabcdef1919195de839fb78762b2 + guid: 6de90ad629a0e0b3135e82730acc3ffc DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/data-package.meta b/Runtime/wechat-default/data-package.meta index 3a3b572a4..1d50fc365 100644 --- a/Runtime/wechat-default/data-package.meta +++ b/Runtime/wechat-default/data-package.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9b4020b540b9a7aa06d2d8136e952572 +guid: 493fd929c707e2cedbe684736ce70492 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/data-package/game.js.meta b/Runtime/wechat-default/data-package/game.js.meta index 9d0c62bd5..6f63370e1 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: d1cea326b818f8026ffe01ca8bbd6c7a + guid: 28ace6833a94c347e525c3b81a41655e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/events.js.meta b/Runtime/wechat-default/events.js.meta index c53c862a7..cd11e6ffd 100644 --- a/Runtime/wechat-default/events.js.meta +++ b/Runtime/wechat-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 82e623a803146806f2646ef54be62f88 + guid: d480902ebf7c709d69ace74f941ce791 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.js b/Runtime/wechat-default/game.js index 2d09dae72..79956cd58 100644 --- a/Runtime/wechat-default/game.js +++ b/Runtime/wechat-default/game.js @@ -27,7 +27,11 @@ const managerConfig = { '$PRELOAD_LIST', ], contextConfig: { - contextType: $WEBGL_VERSION, // 1: webgl1 2: webgl2 + contextType: $WEBGL_VERSION, + contextExt: { + enableGLX: $ENABLE_GLX, + enableMetal: $ENABLE_METAL, + } }, PROFILER_UPLOAD_URL: '', }; diff --git a/Runtime/wechat-default/game.js.meta b/Runtime/wechat-default/game.js.meta index e327f12a6..0130de24b 100644 --- a/Runtime/wechat-default/game.js.meta +++ b/Runtime/wechat-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: dfb3621b99c16fe5918bd0f61cabef6d + guid: e219fc3b2e4921c2815e0db73e287549 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.json b/Runtime/wechat-default/game.json index e11fd7b6b..5e6d01000 100644 --- a/Runtime/wechat-default/game.json +++ b/Runtime/wechat-default/game.json @@ -23,7 +23,7 @@ ], "plugins": { "UnityPlugin": { - "version": "1.2.79", + "version": "1.2.80", "provider": "wxe5a48f1ed5f544b7", "contexts": [ { @@ -32,7 +32,7 @@ ] }, "Layout": { - "version": "1.0.15", + "version": "1.0.16", "provider": "wx7a727ff7d940bb3f", "contexts": [ { diff --git a/Runtime/wechat-default/game.json.meta b/Runtime/wechat-default/game.json.meta index 9115dc432..9ae748388 100644 --- a/Runtime/wechat-default/game.json.meta +++ b/Runtime/wechat-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 43a58900cd1f2cceeebe71cd0da6e9ea + guid: 641d129115eadd3bea672fc7766155a8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images.meta b/Runtime/wechat-default/images.meta index ad08a610a..56dc22044 100644 --- a/Runtime/wechat-default/images.meta +++ b/Runtime/wechat-default/images.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b1d832e9cee1c57b74a2fded945106ca +guid: 958b4c9c63ba5cdd4a1c3b40474ab733 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/images/background.jpg.meta b/Runtime/wechat-default/images/background.jpg.meta index 621d8416b..34b2429d6 100644 --- a/Runtime/wechat-default/images/background.jpg.meta +++ b/Runtime/wechat-default/images/background.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 4fbb60bb57bfbc6477067e849d4c899a + guid: fa4a43634ac9df3e1662f6bf8ee39987 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/unity_logo.png.meta b/Runtime/wechat-default/images/unity_logo.png.meta index 92b9b047d..32c879f70 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: 62d3610273924692d8a468a7612ca4ba + guid: f328399a9ae5327f3f07dab97f763981 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data.meta b/Runtime/wechat-default/open-data.meta index 7dec9e474..ed653deba 100644 --- a/Runtime/wechat-default/open-data.meta +++ b/Runtime/wechat-default/open-data.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dce8b79ef90a5f0785efa79abc051250 +guid: 90acae64389bb42d7cb17b12bee114f0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/open-data/data.meta b/Runtime/wechat-default/open-data/data.meta index f7b04433c..e82ec400c 100644 --- a/Runtime/wechat-default/open-data/data.meta +++ b/Runtime/wechat-default/open-data/data.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5e4435258531c885590de46de0a68372 +guid: 1e3b84a66ed40bb904b0dc39833e2952 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/open-data/data/index.js.meta b/Runtime/wechat-default/open-data/data/index.js.meta index aefec334d..8673d8182 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: 83a12c74827ac659f16b70e632b0a36b + guid: f3d313570b42c08ac65c57f8e0e4d62d 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 77b4aaba8..3d5003fe1 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: d16ea1b19da3cbb0776441ccf58afbf5 + guid: 7eb5c1e91a36f76ba7d3b4464c1c7356 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/index.js.meta b/Runtime/wechat-default/open-data/index.js.meta index aaaca2957..a27f6a781 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: da79e742fd6f9ced13d2208f2588ed39 + guid: 3ea562214d2ebc00c8cc92c9a058f22d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/loading.js.meta b/Runtime/wechat-default/open-data/loading.js.meta index 95fc44fcd..e64222c3d 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: 949a3f0616e67d1ce1337ed2c59fa822 + guid: ae4a14fcff600a9a9efbb9cc7303a42c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render.meta b/Runtime/wechat-default/open-data/render.meta index 4a824a231..d958bd798 100644 --- a/Runtime/wechat-default/open-data/render.meta +++ b/Runtime/wechat-default/open-data/render.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d232f8799adc892248cb4c0dc6e5c40a +guid: 78a644291a8b9dc8c46d7160d0cba6e4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/open-data/render/image.meta b/Runtime/wechat-default/open-data/render/image.meta index 57792228a..d0a1cb22d 100644 --- a/Runtime/wechat-default/open-data/render/image.meta +++ b/Runtime/wechat-default/open-data/render/image.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a7a7440873159df79ad30343d0a7fa97 +guid: 360d70c53a2575798f44b91dcff1e4e2 folderAsset: yes DefaultImporter: externalObjects: {} 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 763a23843..1d7b4fd30 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: ee533953826d9d9c4cb0291691e1b608 + guid: b1a397f1f57f519a3cee319d8227f8a1 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 7f6f92ba2..e2550c7c2 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: 46a723a67bd4b6ee5333584557212874 + guid: ad0b22cb29ba269641764bef12358b42 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 e2e53b46a..295d2a0a0 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: e5beb47a7a3e97157d24f21aae34b1a0 + guid: 4addd465dd70ed1fbae7c274f4677b66 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 78441d917..e4ab8a72b 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: d166c6892cd742fe6ee449e519168f51 + guid: 10c91e092aab2fd775c0b51dbee63b05 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 1ed447595..6f494c5d0 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: e3d922faf659fb2f5321801daafb7d28 + guid: eb9af055559e774433d5cf97c6f4cbd4 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 3ba1cbd98..381394720 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: 398acef606ef104ab0715b23023520f0 + guid: 0483e1c573bcdd39e285d864e7003c87 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 309aae677..998e62175 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: da8ea56c5c1dedd89d1c7d12ee8cd911 + guid: 837761be7d36a4e83c04494f853de5d5 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 3ed25d4cf..423c1051e 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: f10a1f4d932cbdb0fe9bf1a0476bdc4e + guid: 2ddcdd9f95f6cd41675f2aa0da2dc72c 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 61a7a5beb..cb06d156c 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: 9beab2d6233f4d41c7d1f698611ad5c9 + guid: aed0ee60b3040d55714362abb170160b 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 2ace2f7ee..99cf87305 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: dc2e337596896fcf8ba39fad1dbb01f4 + guid: 2eb6d5d348f765c8ac93c48fd6d9358f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/styles.meta b/Runtime/wechat-default/open-data/render/styles.meta index 29ff810b7..e619aae9c 100644 --- a/Runtime/wechat-default/open-data/render/styles.meta +++ b/Runtime/wechat-default/open-data/render/styles.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 696044a48860d800e3009fb3d202f80b +guid: d4aa3bc76a871de7e29a380f67b88b69 folderAsset: yes DefaultImporter: externalObjects: {} 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 23d7d352c..7bec54257 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: 6b3dac806ae44ddca7e3a5cac6283268 + guid: 5988fcaacf638dbb50e20ea0fd6a31f0 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 54a2e7cda..5fb68b67e 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: 16d87f2bbc7e0cab87750e250d8fb706 + guid: 981ddb3a3c0a591bac6c9432c71c68c8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/tpls.meta b/Runtime/wechat-default/open-data/render/tpls.meta index 556bd32fa..f341f269d 100644 --- a/Runtime/wechat-default/open-data/render/tpls.meta +++ b/Runtime/wechat-default/open-data/render/tpls.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe60024e035250cb8a1ea48bbfd0bd77 +guid: d8665c805bf22077161292c5132c5f6b folderAsset: yes DefaultImporter: externalObjects: {} 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 e129a41a7..ed211be01 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: e2533bbd0f2233803378a322b319d0e8 + guid: 4fe17781df1378365124afc47210352c 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 bcf48c68a..396952163 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: 0240fe214f6ddc3de61e9f07f3811586 + guid: 91fa0f24cc6608d07b605e63bdd1a640 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugin-config.js.meta b/Runtime/wechat-default/plugin-config.js.meta index 0242b322b..8b3980e56 100644 --- a/Runtime/wechat-default/plugin-config.js.meta +++ b/Runtime/wechat-default/plugin-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 1e2e88509f4f353bcfa082724749eb11 + guid: 11548afccf1fbb782c410584dedc8bb5 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins.meta b/Runtime/wechat-default/plugins.meta index 39c574181..a105007eb 100644 --- a/Runtime/wechat-default/plugins.meta +++ b/Runtime/wechat-default/plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f817247029bab4d8378e683dd0768663 +guid: 7f7f9dd8b0889dcf5d5fff484e401c54 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/plugins/check-update.js.meta b/Runtime/wechat-default/plugins/check-update.js.meta index 164ea7b24..979c1bcb9 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: be3cac760ab8bc453d3c027b8c2154cd + guid: eed5acdfdb0cc2f02ad6a4047b80eb45 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/screen-adapter.js.meta b/Runtime/wechat-default/plugins/screen-adapter.js.meta index 182a8286d..240e66186 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: 60f64091f2848e6137295f416114a714 + guid: ebc4a98a01106b741993f714f5b78ae5 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/project.config.json.meta b/Runtime/wechat-default/project.config.json.meta index 4eff91efa..39a9aaec8 100644 --- a/Runtime/wechat-default/project.config.json.meta +++ b/Runtime/wechat-default/project.config.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: c8a1a9d25ffd216df601a9f5336012b8 + guid: edec435cad53d971fba3a2453a0542ea DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/texture-config.js.meta b/Runtime/wechat-default/texture-config.js.meta index dcebcf2a8..f2f0fe04e 100644 --- a/Runtime/wechat-default/texture-config.js.meta +++ b/Runtime/wechat-default/texture-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: e77d47c87b89bb732afa7ada8b872f5e + guid: 558756db671916176dfbee511f7b51b6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-namespace.js.meta b/Runtime/wechat-default/unity-namespace.js.meta index 43e307605..cf3986e58 100644 --- a/Runtime/wechat-default/unity-namespace.js.meta +++ b/Runtime/wechat-default/unity-namespace.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 64c41db52f19c0a8407d5d10b19505ac + guid: b31e98a21692ceb80fcebdcda4e74cca DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk.meta b/Runtime/wechat-default/unity-sdk.meta index 8080547cf..9f4874dca 100644 --- a/Runtime/wechat-default/unity-sdk.meta +++ b/Runtime/wechat-default/unity-sdk.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2481e7305f0c4a6d5e524778fe2f9463 +guid: b5f97c8074b64f33a7e0fd57466cb10d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/TCPSocket.meta b/Runtime/wechat-default/unity-sdk/TCPSocket.meta index f5725ac43..a3e85b006 100644 --- a/Runtime/wechat-default/unity-sdk/TCPSocket.meta +++ b/Runtime/wechat-default/unity-sdk/TCPSocket.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 94d3ea7c1bc2c7f3f953638d5f707160 +guid: 18e024d6236bbdf0df43289b8259061b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta index 5e8592c95..822b3a69d 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: 285bde1ec13dc5f6348730177b0d245c + guid: 1523bce94eb7a75508e43221d7e79443 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/UDPSocket.meta b/Runtime/wechat-default/unity-sdk/UDPSocket.meta index e32c71691..d044c76a9 100644 --- a/Runtime/wechat-default/unity-sdk/UDPSocket.meta +++ b/Runtime/wechat-default/unity-sdk/UDPSocket.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e3b28bba2cfc6f695b0e5a9a4fe5a35 +guid: 586761caa90b3c3bf18703b84df62f56 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta b/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta index ac1f5b33f..2b2a447f1 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: 5e0850d637c82dfbff7816c1dea56bd1 + guid: febac8c98efa4f94b8c1c78ae4cec0a9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/ad.js.meta b/Runtime/wechat-default/unity-sdk/ad.js.meta index acd341fde..e65e5ceda 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: 7f50192fc0113f27f329934f80ae4793 + guid: d95eb84d936340ea05b812212a043bae DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio.meta b/Runtime/wechat-default/unity-sdk/audio.meta index 221a24540..01ea4bdf5 100644 --- a/Runtime/wechat-default/unity-sdk/audio.meta +++ b/Runtime/wechat-default/unity-sdk/audio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e9d098d826e4fcd0215d2725100ae138 +guid: 0908636f47de7fb5bdd4fa7285b4b32b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/audio/common.js.meta b/Runtime/wechat-default/unity-sdk/audio/common.js.meta index f7cc811e6..f2fa9bbb0 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: 268c52bb8771248c65d514bc54290b2f + guid: 64b420a4121abe6df0f292863e94eb70 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 5b35465a6..ed3371d09 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: 46855f8999e1242708e4b9a81a5f0385 + guid: 0fd589cdb8af1d4b30e709ad259651bd 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 c6b6e3020..589abd339 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: 5ff5c97d55325012a959fe4ec0f12c10 + guid: 3b22ef9d13b09e6c8773f17cc43de6ff 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 48f80d107..3c10afe58 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: 43ae6900428af4d43b7ae2c7aeb6f12f + guid: 5ad12499749e32eb255f59a60e89b28b 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 7379ca626..dec384606 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: e3beb55f1cb4133f2af74fef14418fb0 + guid: 7c7f85f550a899f5e445f24f53961b9b 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 acdbb8f7f..e6f357c72 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: 4a136b63ad6ffa12df694fd561a6f937 + guid: d781d12ab2e2c2838afb4365fcc00668 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 3a5da3c5d..bf50e99ef 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: ac223f4358ef0f93f539f1d20a72bf94 + guid: 0a0a562b014863e85d842d92972cf691 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/authorize.js.meta b/Runtime/wechat-default/unity-sdk/authorize.js.meta index 524c8bae0..0ab1d37aa 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: b228afe32c844326c91d68e051c7462f + guid: 23e339e446545b0f09e9a11d87407e5d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/bluetooth.meta b/Runtime/wechat-default/unity-sdk/bluetooth.meta index 7f9effa66..d1cdf2885 100644 --- a/Runtime/wechat-default/unity-sdk/bluetooth.meta +++ b/Runtime/wechat-default/unity-sdk/bluetooth.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ca1d18b6a84bd88b338a5002c90aa5f2 +guid: b5881be2e56528de98a5e80dac132106 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta b/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta index dfed5e201..3a2d191de 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: d53043e59342509fad398f015b5c650f + guid: b8276049c40426c7f2140611abbe1ecb DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/camera.js.meta b/Runtime/wechat-default/unity-sdk/camera.js.meta index d159709c5..ea7d80afe 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: 67bbfe86fa63aa3e73b5b774a79dfbbd + guid: 7cdfab413e666b8b2d90ad91d1497ef4 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 19ddeaad7..18349c688 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: 2d6336c5606b3e31207f27aaca40e7d8 + guid: 4d8227a2ef7e6f4c9564136fd0d6f295 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/canvas.js.meta b/Runtime/wechat-default/unity-sdk/canvas.js.meta index 77edbd348..56323a6b3 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: 49e417151695b335ee45d4ee00d88b8c + guid: 289ac24878b814b8f5047bc83767ec91 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/chat.js.meta b/Runtime/wechat-default/unity-sdk/chat.js.meta index cfef32271..c4f647b3d 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: 54fd529ea288c9f5e6e1b2d9a650cc82 + guid: 9555b1b8c3796f8c367a3d2073d45bd9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/cloud.js.meta b/Runtime/wechat-default/unity-sdk/cloud.js.meta index 392cd10e7..3732b1e4c 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: 19220e9aafce528e58347b08d25e9694 + guid: 5e04a607ffdcbde1c14dd1685b965701 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/conf.js.meta b/Runtime/wechat-default/unity-sdk/conf.js.meta index 237094deb..cbbd8cbe3 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: 90e409a46ab75878116e90de9044b33d + guid: 3ef0408cec9a3aa0cc4babfa6cd43e05 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 a54906bcb..d85b23260 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: 5e86e1524f8729dc6be0a5913faa56aa + guid: 0516ba93cae061f22d6407892b5b95be DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fix.js.meta b/Runtime/wechat-default/unity-sdk/fix.js.meta index 22c0ffacb..ef5376daa 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: 3fc571676e9b1e4f43327482ff6a146c + guid: 8f01f06969a5581786ea75bdc1e2fd6c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font.meta b/Runtime/wechat-default/unity-sdk/font.meta index 8247319e5..0b083883b 100644 --- a/Runtime/wechat-default/unity-sdk/font.meta +++ b/Runtime/wechat-default/unity-sdk/font.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 34134add152cd9c1b4b72cb7bdeaa057 +guid: 5bc226d21f21eefb063b8f4d52f80443 folderAsset: yes DefaultImporter: externalObjects: {} 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 d74951cbc..cae68b90f 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: 8cb80db6db16629919f72813c4108615 + guid: 27f536c52b5881b7d553792bf7fbd4de 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 f410f3dd8..2ecf5b944 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: 107f269005e185d33353c3485ff60598 + guid: 6c8ec958817b90211583ad91398efa01 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 3f4bbbeef..58a1e3074 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: 95b2dfa20a6854301be7a9c14f919238 + guid: bb89e54f2a649e6f182cba57ac87cc10 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 fa3a33d14..ca19b7482 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: fc59ea968a5d31cd3bbdc47650061fdc + guid: 7a7c389bfe6711f9b249abd2e333e5e1 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 d246ded6d..906bda095 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: b191274cf498a2d31bff400d109fbc73 + guid: e6cefbbe560806d0d9b19ca84ad0e6ba DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fs.js.meta b/Runtime/wechat-default/unity-sdk/fs.js.meta index 5a1c39e23..a0f29183e 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: 1f27d3739bce0052d26d91f6c598e789 + guid: 9ba20544d6f9a551118de233981220cf 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 506e42213..ac51ea832 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: a1d0f8f2550312c95d880363974a9bff + guid: 8e89099d8faf37dc428ecf3f60420c6c 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 164a6759b..34008c3ea 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: e4d459179fed20f63f0bfb3af85e335c + guid: 72c04034ff992f42341588a1db6681d7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/gyroscope.meta b/Runtime/wechat-default/unity-sdk/gyroscope.meta index 3d4a0783a..5d92df08d 100644 --- a/Runtime/wechat-default/unity-sdk/gyroscope.meta +++ b/Runtime/wechat-default/unity-sdk/gyroscope.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 859b39a72adfc6442252d32350293e7b +guid: a15ebfe361c88edebf28d0968f1e0bc3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta b/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta index 881ab63a0..27b417cf2 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: 8c797330abda21e77d6e3d4e21bfc0b5 + guid: 7c471c50f1d337d0a92cf34d108e015e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/index.js.meta b/Runtime/wechat-default/unity-sdk/index.js.meta index 633e1774c..33e954b94 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: 8a9908f655f35dc1b2cc5c7f0d68dc01 + guid: 392ae096836c7f12c403736e411da961 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/logger.js.meta b/Runtime/wechat-default/unity-sdk/logger.js.meta index 06003719f..8a671c9ce 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: 2194cd3266fbc2c4e2c02fdbcf614127 + guid: ed782e20c9d9fb989aefd512ddf4144a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta b/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta index 5d74aa38b..91478cf35 100644 --- a/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta +++ b/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a28544814a7699f7a8eb9a4470885a37 +guid: f92d0e552d799ceeb40755e5d09b5c83 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta b/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta index 3ae87572a..f5f1ac4c5 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: 340cdaa58bc2b682476d0ea945c45678 + guid: e0b3d168aa0705d2e0052966490a0a31 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 b830520a5..762059217 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: 32813a734424d368f63e45522a70acca + guid: 536aecfd2124dd89dec2c6e71251e5b9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/open-data.js b/Runtime/wechat-default/unity-sdk/open-data.js index f5e16425f..7e3660613 100644 --- a/Runtime/wechat-default/unity-sdk/open-data.js +++ b/Runtime/wechat-default/unity-sdk/open-data.js @@ -12,7 +12,6 @@ var SharedCanvasMode; })(SharedCanvasMode || (SharedCanvasMode = {})); let sharedCanvasMode; let timerId; -let textureObject = null; let textureId; function getOpenDataContext(mode) { @@ -51,34 +50,25 @@ function hookUnityRender() { if (!textureId) { return; } - const { GL } = GameGlobal.manager.gameInstance.Module; + const Module = GameGlobal.manager.gameInstance.Module; + const { GL } = Module; const gl = GL.currentContext.GLctx; - if (!textureObject) { - textureObject = gl.createTexture(); - gl.bindTexture(gl.TEXTURE_2D, textureObject); - if (GameGlobal.unityNamespace.unityColorSpace === 'Linear') { - gl.texImage2D(gl.TEXTURE_2D, 0, gl.SRGB8_ALPHA8, gl.RGBA, gl.UNSIGNED_BYTE, getSharedCanvas()); - } - else { - gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, getSharedCanvas()); - } - gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR); - gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR); - gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE); - gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE); + const isLinearColorSpace = GameGlobal.unityNamespace.unityColorSpace === 'Linear'; + + if (gl.emscriptenGLX) { + Module.ccall('glxShowOpenData', null, ['number', 'number', 'bool'], [textureId, getSharedCanvas().__uid(), isLinearColorSpace]); } else { - gl.bindTexture(gl.TEXTURE_2D, textureObject); - if (GameGlobal.unityNamespace.unityColorSpace === 'Linear') { + gl.bindTexture(gl.TEXTURE_2D, GL.textures[textureId]); + if (isLinearColorSpace) { gl.texImage2D(gl.TEXTURE_2D, 0, gl.SRGB8_ALPHA8, gl.RGBA, gl.UNSIGNED_BYTE, getSharedCanvas()); } else { gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, getSharedCanvas()); } + timerId = requestAnimationFrame(hookUnityRender); } - GL.textures[textureId] = textureObject; - timerId = requestAnimationFrame(hookUnityRender); } function stopLastRenderLoop() { @@ -98,10 +88,13 @@ function stopHookUnityRender() { sharedCanvas.width = 1; sharedCanvas.height = 1; - const { GL } = GameGlobal.manager.gameInstance.Module; + const Module = GameGlobal.manager.gameInstance.Module; + const { GL } = Module; const gl = GL.currentContext.GLctx; - gl.deleteTexture(textureObject); - textureObject = null; + + if (gl.emscriptenGLX) { + Module.ccall('glxHideOpenData', null, [], []); + } } wx.onShow(() => { if (cachedOpenDataContext) { diff --git a/Runtime/wechat-default/unity-sdk/open-data.js.meta b/Runtime/wechat-default/unity-sdk/open-data.js.meta index 408888223..c2bbd9270 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: 7aa654f9b38e3a8775b6b95bd920fc09 + guid: cf88a76c50884ee6a38aa53332d43560 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/recorder.js.meta b/Runtime/wechat-default/unity-sdk/recorder.js.meta index a331283c5..3ef64fa9e 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: f3ee18fc329856a00469d5d3d18796e7 + guid: 04ad24bf6564f70eac375f308b671765 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resType.js.meta b/Runtime/wechat-default/unity-sdk/resType.js.meta index 9d647cb50..f9c85a9a0 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: 18b902f4b8ffc22907922e7e74c69aa5 + guid: 119f43b649cc62c2931246b3731113fa DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta index 9e4f5d4b2..83c0f916b 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: a579df0d128040edf8a3146cdb0f5b3f + guid: fa819ab76ad028840e1bed10e45efb56 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/response.js.meta b/Runtime/wechat-default/unity-sdk/response.js.meta index ecdadc6ad..a3a44a8a4 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: 11e93d2222848763c07b7f4398148e1d + guid: a905870c65fe52c96ae003743bab1f1d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/sdk.js.meta b/Runtime/wechat-default/unity-sdk/sdk.js.meta index bd73c9e09..f5e75cc0e 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: 4fea15fbae3983299ada389d87b13ee8 + guid: 7fef07b96483aca6bae9199a4428f521 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/share.js.meta b/Runtime/wechat-default/unity-sdk/share.js.meta index e43c9a6b0..56f439f49 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: bcd43b7dc107f49795e1771a6bed4a2e + guid: e9ec597b5e70b34fbae505baf8dae9b9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/storage.js.meta b/Runtime/wechat-default/unity-sdk/storage.js.meta index 937ad3dde..59cc7f172 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: 3458df3da5fc934d7d6cbbfa826e490d + guid: cb58e22c263438ec035f9877b46a1058 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/texture.js.meta b/Runtime/wechat-default/unity-sdk/texture.js.meta index 0f6fdadb4..9143124f5 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: c2e6e07dc2d54ec7929b5c05763a1edc + guid: a9d6a32bd9c8566e147e5943982e7a44 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/touch.meta b/Runtime/wechat-default/unity-sdk/touch.meta index b3eed703f..7267ebb6c 100644 --- a/Runtime/wechat-default/unity-sdk/touch.meta +++ b/Runtime/wechat-default/unity-sdk/touch.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f793fb569a2cca5b909cd3dbffdcf5c5 +guid: 5953dd914384b986b55009451e73774e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/touch/index.js.meta b/Runtime/wechat-default/unity-sdk/touch/index.js.meta index 6bb6f96be..04196318e 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: 6c042b2d93da639446780d00753f9591 + guid: 89fc17b706d96a1ab42b4e036d2ad7a9 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 a3a6c4543..e45d08740 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: 50f79217c055b71398cb6ae728b04b73 + guid: 280e7635ccc1f8213e0961b037116d5c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/userinfo.js.meta b/Runtime/wechat-default/unity-sdk/userinfo.js.meta index 4134d8b02..fda4f4726 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: 8f1aa7289d475d2134922c5acdfe3c56 + guid: 18e54d38e8f6d9df8e73247c6da44d90 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/util.js.meta b/Runtime/wechat-default/unity-sdk/util.js.meta index 8ff2c088d..6f423c584 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: 4072be3c0fd80ccf12d37877a8fcdd13 + guid: 751ba053fd2dd068ddc944d2e95a5352 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/utils.js.meta b/Runtime/wechat-default/unity-sdk/utils.js.meta index 847d5a313..b5edd1cba 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: 3b39bf56317deb21f0f9d6293e57f5c8 + guid: 5120e6d7219093cf27684e967dbf6e83 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.js b/Runtime/wechat-default/unity-sdk/video.js index e81be2bbe..53706d8cc 100644 --- a/Runtime/wechat-default/unity-sdk/video.js +++ b/Runtime/wechat-default/unity-sdk/video.js @@ -18,32 +18,27 @@ export default { if (!obj) { return; } - if (key === 'x' || key === 'y' || key === 'width' || key === 'height') { + if (key === 'x' || key === 'y' || key === 'width' || key === 'height' || key === 'initialTime' || key === 'playbackRate') { obj[key] = +value; } - else if (key === 'src' || key === 'poster') { + else if (key === 'src' || key === 'poster' || key === 'objectFit' || key === 'backgroundColor') { obj[key] = value; } - }, - WXVideoPlay(id) { - const obj = getObject(id); - if (!obj) { - return; + else if (key === 'live' || key === 'controls' || key === 'showProgress' || key === 'showProgressInControlMode' + || key === 'autoplay' || key === 'loop' || key === 'muted' || key === 'obeyMuteSwitch' + || key === 'enableProgressGesture' || key === 'enablePlayGesture' || key === 'showCenterPlayBtn') { + obj[key] = value === 'True'; } - obj.play(); }, WXVideoAddListener(id, key) { - const obj = getObject(id); - if (!obj) { - return; - } - obj[key]((e) => { + getObject(id)?.[key]((e) => { moduleHelper.send('OnVideoCallback', JSON.stringify({ callbackId: id, - errMsg: key, - position: e && e.position, - buffered: e && e.buffered, - duration: e && e.duration, + type: key, + position: e?.position, + buffered: e?.buffered ? Number(e.buffered) : undefined, + duration: e?.duration, + errMsg: e?.errMsg, })); if (key === 'onError') { GameGlobal.enableTransparentCanvas = false; @@ -51,54 +46,31 @@ export default { } }); }, - WXVideoDestroy(id) { - const obj = getObject(id); - if (!obj) { - return; - } - obj.destroy(); - GameGlobal.enableTransparentCanvas = false; + WXVideoRemoveListener(id, key) { + getObject(id)?.[key](); }, - WXVideoExitFullScreen(id) { - const obj = getObject(id); - if (!obj) { - return; + WXVideoDestroy(id, isLast) { + getObject(id)?.destroy(); + if (isLast) { + GameGlobal.enableTransparentCanvas = false; } - obj.exitFullScreen(); + }, + WXVideoPlay(id) { + getObject(id)?.play(); }, WXVideoPause(id) { - const obj = getObject(id); - if (!obj) { - return; - } - obj.pause(); - }, - WXVideoRequestFullScreen(id, direction) { - const obj = getObject(id); - if (!obj) { - return; - } - obj.requestFullScreen(direction); - }, - WXVideoSeek(id, time) { - const obj = getObject(id); - if (!obj) { - return; - } - obj.seek(time); + getObject(id)?.pause(); }, WXVideoStop(id) { - const obj = getObject(id); - if (!obj) { - return; - } - obj.stop(); + getObject(id)?.stop(); }, - WXVideoRemoveListener(id, key) { - const obj = getObject(id); - if (!obj) { - return; - } - obj[key](); + WXVideoSeek(id, time) { + getObject(id)?.seek(time); + }, + WXVideoRequestFullScreen(id, direction) { + getObject(id)?.requestFullScreen(direction); + }, + WXVideoExitFullScreen(id) { + getObject(id)?.exitFullScreen(); }, }; diff --git a/Runtime/wechat-default/unity-sdk/video.js.meta b/Runtime/wechat-default/unity-sdk/video.js.meta index bd82a8a82..e74d8ab1e 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: 3d41a72825ca3254923ec7aea1267d29 + guid: ef79ab0e61eef05078659ef3dfa9c0f7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.meta b/Runtime/wechat-default/unity-sdk/video.meta index 95d4d81a8..1b85267fe 100644 --- a/Runtime/wechat-default/unity-sdk/video.meta +++ b/Runtime/wechat-default/unity-sdk/video.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6324ae7a0170ba64ff6cd43e1bd75052 +guid: 2a0e63c96930805299833da83bf26e92 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/video/index.js b/Runtime/wechat-default/unity-sdk/video/index.js index 70041d907..6ab56dd17 100644 --- a/Runtime/wechat-default/unity-sdk/video/index.js +++ b/Runtime/wechat-default/unity-sdk/video/index.js @@ -174,6 +174,12 @@ function _JS_Video_Create(url) { function _JS_Video_Destroy(video) { debugLog('_JS_Video_Destroy', video); videoInstances[video].destroy(); + const Module = GameGlobal.manager.gameInstance.Module; + const { GL } = Module; + const gl = GL.currentContext.GLctx; + if (!isWebVideo && gl.emscriptenGLX && Module._glxVideoDestroy) { + Module._glxVideoDestroy(video); + } delete videoInstances[video]; } function _JS_Video_Duration(video) { @@ -378,7 +384,29 @@ function _JS_Video_UpdateToTexture(video, tex) { if (!FrameworkData) { return false; } + const Module = GameGlobal.manager.gameInstance.Module; const { GL, GLctx } = FrameworkData; + const gl = GL.currentContext.GLctx; + + if (!isWebVideo && Module._glxVideoUpdateToTexture && gl.emscriptenGLX) { + const data = v.frameData?.data; + const source = supportVideoFrame ? data : new Uint8ClampedArray(data); + const byteLength = supportVideoFrame ? 0 : source.byteLength; + let sourceIdOrPtr; + if (supportVideoFrame) { + sourceIdOrPtr = source.__uid; + } + else { + sourceIdOrPtr = Module._glxGetVideoTempBuffer(video, byteLength); + if (sourceIdOrPtr) { + Module.HEAPU8.set(source, sourceIdOrPtr); + } + } + + Module._glxVideoUpdateToTexture(v, supportVideoFrame, tex, v.videoWidth, v.videoHeight, sourceIdOrPtr); + return true; + } + GLctx.pixelStorei(GLctx.UNPACK_FLIP_Y_WEBGL, true); diff --git a/Runtime/wechat-default/unity-sdk/video/index.js.meta b/Runtime/wechat-default/unity-sdk/video/index.js.meta index e0dcdc3cb..5d5cf5753 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: 9c286dde38e778d5e94c87db3aca4947 + guid: 7a93c9b0c0bac525fa88c204fbcd5b57 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/wasmcode.meta b/Runtime/wechat-default/wasmcode.meta index 5f5576a0b..a629f4ffd 100644 --- a/Runtime/wechat-default/wasmcode.meta +++ b/Runtime/wechat-default/wasmcode.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d561119fefeca5aeb48773e39a34b1ce +guid: 4cb7ca407e700ea71d67001ae6a61d03 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/wasmcode/game.js.meta b/Runtime/wechat-default/wasmcode/game.js.meta index 9be88e904..ca8b9ec6f 100644 --- a/Runtime/wechat-default/wasmcode/game.js.meta +++ b/Runtime/wechat-default/wasmcode/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 82a5758f8b1c4f47c48bb866d0b35cca + guid: 392b140c372424f308135833cccb220f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/weapp-adapter.js.meta b/Runtime/wechat-default/weapp-adapter.js.meta index cbf2323a8..9db4be1c8 100644 --- a/Runtime/wechat-default/weapp-adapter.js.meta +++ b/Runtime/wechat-default/weapp-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 7cc01582723c5240f30675efc3edb657 + guid: 3fb7251bf620de74b6dd9bf28e9ffe7c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/workers.meta b/Runtime/wechat-default/workers.meta index f1f9af22e..cc3a662db 100644 --- a/Runtime/wechat-default/workers.meta +++ b/Runtime/wechat-default/workers.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac4d918ee6094ab64c058df6ac845d74 +guid: fed193a450feb42b064e3db80bbec2fe folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/workers/response.meta b/Runtime/wechat-default/workers/response.meta index 32780b783..6c54de4a0 100644 --- a/Runtime/wechat-default/workers/response.meta +++ b/Runtime/wechat-default/workers/response.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 82bb642c8fbfa9bb367068cbcbac83ad +guid: 9101176cb9c44e58fb8022b4849d9391 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/workers/response/index.js.meta b/Runtime/wechat-default/workers/response/index.js.meta index 6248f93cb..7febca5d0 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: 70a825f1451a9739a21018621dd38a31 + guid: 0613864866bfea3ea805fbee60f44fed DefaultImporter: externalObjects: {} userData: diff --git a/package.json b/package.json index 5a4736743..650163cc4 100644 --- a/package.json +++ b/package.json @@ -1 +1,14 @@ -{"name":"com.qq.weixin.minigame","displayName":"WXSDK","description":"WeChat Mini Game Tuanjie Engine Adapter SDK Package.","version":"0.1.28","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.1", + "unity": "2019.4", + "unityRelease": "29f1", + "keywords": [ + "Tuanjie", + "WX" + ], + "dependencies": { + } +} \ No newline at end of file