diff --git a/CHANGELOG.md b/CHANGELOG.md index 1177ca28..909a031f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,15 @@ Removed - 删除功能/接口 Fixed - 修复问题 Others - 其他 --> +## 2025-9-8 v0.1.29 【重要更新】 +PackageManager(git URL): https://github.com/wechat-miniprogram/minigame-tuanjie-transform-sdk.git#pre-v0.1.29 +### Feature +* 普通：本地缓存存在时，UnityWebRequest支持同步方式(API：wx.SetSyncReadCacheEnabled)以加快读取速度 +* 重要：Emscriptenglx相关能力支持，兼容unity2021/2022/tuanjie +* 重要：新版本的Wasm分包能力支持：大幅度优化了iOS平台高性能（+）模式的分包性能表现，大幅度减少了开发者预处理操作耗时，优化了分包操作耗时 +* 普通：适配插件版本升至1.2.80 + + ## 2025-8-12 v0.1.28 【重要更新】 ### Feature * 普通：PageManager.Show支持Promise diff --git a/Editor/BuildProfile.meta b/Editor/BuildProfile.meta index 252f755c..92fa06b6 100644 --- a/Editor/BuildProfile.meta +++ b/Editor/BuildProfile.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: DytLvSj8UC9CKob0XUy9Y3usKDmX8US1YgxYmBxa1iAZ/I8JbM5wZwE= +guid: 4ada38394365d4d28a5ce4c336723cce 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 87b4cc3c..4a30858e 100644 --- a/Editor/BuildProfile/lib.meta +++ b/Editor/BuildProfile/lib.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: XSwesi78AS28ymfR2HEhHpEBAC2DHupI1hIKP7HApjHRaZgGw+DTwWI= +guid: a100628dafec44bf49842a207d510696 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 e8ae1211..d8b6c657 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/libwx-metal-cpp.bc.meta b/Editor/BuildProfile/lib/libwx-metal-cpp.bc.meta index 28e81d7a..cd5e1bb7 100644 --- a/Editor/BuildProfile/lib/libwx-metal-cpp.bc.meta +++ b/Editor/BuildProfile/lib/libwx-metal-cpp.bc.meta @@ -1,7 +1,93 @@ fileFormatVersion: 2 guid: c113acfee35db6b5c61fd4a76596cfd3 -DefaultImporter: -externalObjects: {} -userData: -assetBundleName: -assetBundleVariant: \ No newline at end of file +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: \ No newline at end of file diff --git a/Editor/BuildProfile/lib/mtl_library.jslib b/Editor/BuildProfile/lib/mtl_library.jslib index b6f7cf5d..3a662c16 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/BuildProfile/lib/mtl_library.jslib.meta b/Editor/BuildProfile/lib/mtl_library.jslib.meta index 3882fefc..fd1272a9 100644 --- a/Editor/BuildProfile/lib/mtl_library.jslib.meta +++ b/Editor/BuildProfile/lib/mtl_library.jslib.meta @@ -1,7 +1,93 @@ fileFormatVersion: 2 guid: dda1926f3454e003333e8085a4f2c0fd -DefaultImporter: -externalObjects: {} -userData: -assetBundleName: -assetBundleVariant: \ No newline at end of file +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: \ No newline at end of file diff --git a/Editor/WXConvertCore.cs b/Editor/WXConvertCore.cs index 5c83d263..8e4d0bac 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(); @@ -302,7 +312,8 @@ namespace WeChatWASM } catch (Exception ex) { - UnityEngine.Debug.LogError($"Failed to enable plugin asset: {ex.Message}"); + // 避免 Error 日志阻塞打包流程 + UnityEngine.Debug.LogWarning($"Failed to enable plugin asset: {ex.Message}"); } } @@ -371,6 +382,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 +1459,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 +2046,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 +2095,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 ccfe4ea6..21ccfe2d 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 08a5888e..54f139a2 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 bf9ad703..ced1de2a 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 = "202509080246"; // 这一行不要改他，导出的时候会自动替换 } public class WXPluginConf diff --git a/Editor/wx-editor.dll b/Editor/wx-editor.dll index 7405b7e1..94b67848 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 8bd12eb5..71eca621 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 69abbf80..ac376a81 100644 --- a/Editor/wx-editor.xml.meta +++ b/Editor/wx-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4e2a80fab2cbe76fc8f8a9443ecab609 +guid: e723e5d7817980f48d8114d1e8b16695 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/SDK-Call-JS-Old.jslib b/Runtime/Plugins/SDK-Call-JS-Old.jslib index 6d658038..b22e4020 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)); @@ -627,6 +627,9 @@ mergeInto(LibraryManager.library, { stringToUTF8(returnStr, buffer, bufferSize); return buffer; }, + WXSetSyncReadCacheEnabled: function(enabled) { + window.WXWASMSDK.WXSetSyncReadCacheEnabled(enabled); + }, WXGetPluginCachePath: function() { var returnStr = window.WXWASMSDK.WXGetPluginCachePath(); var bufferSize = lengthBytesUTF8(returnStr || '') + 1; diff --git a/Runtime/Plugins/WXAssetBundle.jslib b/Runtime/Plugins/WXAssetBundle.jslib index ab24b88e..7645012b 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 00000000..6d7da756 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 00000000..1e81a957 --- /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 00000000..5fb86d9d 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 00000000..005cde2b --- /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 eca9ff9a..939f34fb 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 9a1ebc49..d3a9b5be 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 498b52a2..2f1482e2 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 b368cd71..83f18bb4 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: 6b30b0ee49b6f4602e25a18f86c6f5cd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/wx-runtime.dll b/Runtime/Plugins/wx-runtime.dll index e9191461..5ad23d93 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 d4e4841f..482a88a2 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 269db31e..7e5118a8 100644 --- a/Runtime/Plugins/wx-runtime.xml.meta +++ b/Runtime/Plugins/wx-runtime.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 00bce541fac34af9181e2dc507ef6680 +guid: f0e805266e738f127dede0375b8fca9b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/WXBase.cs b/Runtime/WXBase.cs index 31be7b59..2ff47d7a 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); } @@ -766,6 +766,16 @@ namespace WeChatWASM return WXSDKManagerHandler.Instance.GetCachePath(url); } + /// + /// 临时修复安卓在主线程繁忙时，异步读缓存耗时高，但需关注同步读文件可能导致掉帧 + /// 仅在有需要的情况下主动开启，需要同步读的场景完成后再主动关闭 + /// + /// + public static void SetSyncReadCacheEnabled(bool enabled) + { + WXSDKManagerHandler.Instance.SetSyncReadCacheEnabled(enabled); + } + #endregion /// @@ -1127,6 +1137,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 d1cf0ec6..d5393c85 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: 5c0bff33a39071e24eb6f9d3b2d60e81 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/data-package.meta b/Runtime/playable-default/data-package.meta index 52970a36..b6580800 100644 --- a/Runtime/playable-default/data-package.meta +++ b/Runtime/playable-default/data-package.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a997306c2732066bba544aa059476b08 +guid: 6ac3f015e333997e6661db3d28aa1bef 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 38f53b0a..11f1cbfc 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: f6b281784e38dc435d6494e18d68be2e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/events.js.meta b/Runtime/playable-default/events.js.meta index 26446335..c6800b71 100644 --- a/Runtime/playable-default/events.js.meta +++ b/Runtime/playable-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: fd42866e6c5266b7e4359f2543a1fec8 + guid: c86aa80cdc9c55e1a332481783b43b08 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/game.js.meta b/Runtime/playable-default/game.js.meta index c9f8339c..4fbe3596 100644 --- a/Runtime/playable-default/game.js.meta +++ b/Runtime/playable-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 9cd04a9e88b74649448d33f0cd13031e + guid: 3fa881d0bd2faa381656ed166b9b97e1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/game.json.meta b/Runtime/playable-default/game.json.meta index ad1772cf..688aa98c 100644 --- a/Runtime/playable-default/game.json.meta +++ b/Runtime/playable-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: c611738fcc7802f4d0a2c44863e28ee8 + guid: 5d16b063d382279feeab27694080e73a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/playable-fix.js.meta b/Runtime/playable-default/playable-fix.js.meta index 8a567ac0..9ff0eae4 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: 8460ab6d69b07872f42253ab46e97604 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/plugin-config.js.meta b/Runtime/playable-default/plugin-config.js.meta index c2cd2d72..043fc03e 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: 3899a726c5000059559ac690435cd76d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/plugins.meta b/Runtime/playable-default/plugins.meta index 81162e38..2df5863b 100644 --- a/Runtime/playable-default/plugins.meta +++ b/Runtime/playable-default/plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac4244e6a18805d144af9149f834e0a1 +guid: 0f579f6a65ee17dfea022df76ed7b0d1 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 667feca6..755dabf0 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: e1d62f1c747d1d13591b32bbc5490da6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/plugins/screen-adapter.js.meta b/Runtime/playable-default/plugins/screen-adapter.js.meta index a511491c..efa18471 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: 266e1c3784878561c9da18841cbba7ae DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/project.config.json.meta b/Runtime/playable-default/project.config.json.meta index 4598a4a7..4b295aac 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: d289398b012281d6268e029fce8f487b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/texture-config.js.meta b/Runtime/playable-default/texture-config.js.meta index 58b9f3dc..749913d4 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: ebbc9d067f9c3cef33da5554f28ef35a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-namespace.js.meta b/Runtime/playable-default/unity-namespace.js.meta index 44518b0f..b2208d23 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: 49d81c15930e48124b8600f083c57acd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-playable-plugin.meta b/Runtime/playable-default/unity-playable-plugin.meta index a7a44fbe..c7698685 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: 7a537f061a10fa0a6aeae79dcd6d312d 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 2a39e507..c11ecc8c 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: 71bcd3825a1b5e14f02ab5628c8f7166 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk.meta b/Runtime/playable-default/unity-sdk.meta index 6e39a31b..36beaff7 100644 --- a/Runtime/playable-default/unity-sdk.meta +++ b/Runtime/playable-default/unity-sdk.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e1c372ff8f4195bc75114c9554eaff6f +guid: 857764ff54fa3bf9e2ffc94342494685 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/unity-sdk/audio.meta b/Runtime/playable-default/unity-sdk/audio.meta index 69904d6f..bf4a316c 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: d3d4b4a1ed77d1efd66a570da6f4ff99 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 f538bee4..c1df656d 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: 0ada20c0e6151f7de4cce1b0b2a4de36 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 47544ca1..01ea7542 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: cc3e5ed63ad73e46272d0f9df6fdf4bd 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 643ecfe1..d9cdd74b 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: 1eb15f4681be9fd219931e7d7522346e 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 cebe02cb..bcf92cbe 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: 3866f5c1a60534bf83f06b315e59f45e 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 b1f5b01b..8b4bbfd9 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: 3ac8efb5cc3c684547c6e3c0128beb64 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 bf675abc..3dcb2fd5 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 8484192c..53465088 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: 65de96d30c38379d3eda5bb3a26edbfe 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 96dee8e3..465e775f 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: 07732312a98b66b404a0f35c2844200a 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 996e271d..fc12978e 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: ad3efc7b8b917fb9f9aaaa81ffbfe6da DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/canvas.js.meta b/Runtime/playable-default/unity-sdk/canvas.js.meta index 4028cbd0..13e6d842 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: 9395fc4ef72892f2056310affa30c2f2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/conf.js.meta b/Runtime/playable-default/unity-sdk/conf.js.meta index 1c3c3249..c4bc8c72 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: 8a3ebb7210ffda2dab34a93f792edfdd 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 f328d9d6..46e512d0 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: abf2d04456860875c9c62279b32d5b14 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/fix.js.meta b/Runtime/playable-default/unity-sdk/fix.js.meta index e7cb6d2a..e58c1777 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: ba29adb089b1bda608192b07251b21e8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/fs.js.meta b/Runtime/playable-default/unity-sdk/fs.js.meta index 73029aa1..0c48ef59 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: 9d2dc0e961cbe7723fa2a5c48ab29605 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/index.js.meta b/Runtime/playable-default/unity-sdk/index.js.meta index b9704250..649b591c 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: 67243fb6e353b25e397d6107d66760a6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/logger.js.meta b/Runtime/playable-default/unity-sdk/logger.js.meta index 3db0cdef..22e8baa3 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: 1ffab2ae9c4506f67891f65af164cfe4 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/mobileKeyboard.meta b/Runtime/playable-default/unity-sdk/mobileKeyboard.meta index 4fa34ef1..94feca1b 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: 5510d485c8a37111ca49ede25b8e411e 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 e131c9ff..34cacb82 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: d75fde650290dc48607c4315c1e4c66b 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 ab5313fb..41d7362b 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: a024b5a2c7ba068d0dcfaaf7e6449b17 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/recorder.js.meta b/Runtime/playable-default/unity-sdk/recorder.js.meta index 77f07217..68144869 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: 13928794106ca6e393d34cae52b3c61f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/resType.js.meta b/Runtime/playable-default/unity-sdk/resType.js.meta index ab484939..88552fc3 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: 8bcf60e931e68a5b653ec55263746ed8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/resTypeOther.js.meta b/Runtime/playable-default/unity-sdk/resTypeOther.js.meta index 9bd1eb4f..b9f1d58e 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: 9d2f2ee8d08b7f3a185ffc9236c40d1a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/response.js.meta b/Runtime/playable-default/unity-sdk/response.js.meta index 4120b0c7..061552fb 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: 60b7b03f9152dfc1eaed5d699cd65b93 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/sdk.js.meta b/Runtime/playable-default/unity-sdk/sdk.js.meta index f807b608..044e8690 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: 2b1a092289475a0526fa2b0a9acde09c 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 160c446a..542b9b5e 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: abbb8b505dfb4bffa84ecdec070629d6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/texture.js.meta b/Runtime/playable-default/unity-sdk/texture.js.meta index b6b88eaa..d2363a27 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: 6cc6589b632f3c7575e7d61ac2760a61 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/touch.meta b/Runtime/playable-default/unity-sdk/touch.meta index 7a299a6d..8569caf4 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: 588b2e342364158ef979c5a5be2ee878 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 7734b2ba..81b64d0f 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: 72a90b481a97fb8862486a0352cd1127 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/util.js.meta b/Runtime/playable-default/unity-sdk/util.js.meta index b4d6dc92..bc83b917 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: 2124cb82c6f0bf3a14d27a8ee6a2ca62 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/utils.js.meta b/Runtime/playable-default/unity-sdk/utils.js.meta index 24781a48..64816433 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: b77c5ae3f8b041930ce6f79b7afab064 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/video.js b/Runtime/playable-default/unity-sdk/video.js index e81be2bb..53706d8c 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 91ce4c5f..9dcb7e6a 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: 7b87b98fd105ac3763a1eaaa60b0655d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/video.meta b/Runtime/playable-default/unity-sdk/video.meta index fe877c7c..f0df8645 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: 7256b2133c0660e1fa4f7f96d257f166 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 c9403467..6fa2ac90 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 a9324354..3e8d5de4 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: 8d167dd1eb7645eb68940b29bca19afa DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/wasmcode.meta b/Runtime/playable-default/wasmcode.meta index eec624e2..07845ed4 100644 --- a/Runtime/playable-default/wasmcode.meta +++ b/Runtime/playable-default/wasmcode.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8d8052d59bb07606065585cf08b0253d +guid: 4044bab64ad3076e9013ff733bc2c3fa folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/wasmcode/game.js.meta b/Runtime/playable-default/wasmcode/game.js.meta index d8b68a8e..b79940a8 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: fb3cc19fd1e047bf6a65ebf550c500b6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/weapp-adapter.js.meta b/Runtime/playable-default/weapp-adapter.js.meta index a6df53b8..674ef9e6 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: 7735b5bd1b2a186dee8fe6fff2e18f4a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/check-version.js.meta b/Runtime/wechat-default/check-version.js.meta index 2ef40845..b3ff8772 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: 3399694fa6e5c1da68093823f197534d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/data-package.meta b/Runtime/wechat-default/data-package.meta index 3a3b572a..4efad103 100644 --- a/Runtime/wechat-default/data-package.meta +++ b/Runtime/wechat-default/data-package.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9b4020b540b9a7aa06d2d8136e952572 +guid: d619f1bd178836aabc3bc82d02d4b4b5 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 9d0c62bd..63393962 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: f1c6daf27b837e375e269eb027fd56ab DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/events.js.meta b/Runtime/wechat-default/events.js.meta index c53c862a..894a3df7 100644 --- a/Runtime/wechat-default/events.js.meta +++ b/Runtime/wechat-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 82e623a803146806f2646ef54be62f88 + guid: 574c985758469a6f66c5a538a8380627 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.js b/Runtime/wechat-default/game.js index 2d09dae7..79956cd5 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 e327f12a..2b8258ff 100644 --- a/Runtime/wechat-default/game.js.meta +++ b/Runtime/wechat-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: dfb3621b99c16fe5918bd0f61cabef6d + guid: d0c5cc3a4de2c56909dab16ac87315fa DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.json b/Runtime/wechat-default/game.json index e11fd7b6..52a1a62a 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.82", "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 9115dc43..47f98ab0 100644 --- a/Runtime/wechat-default/game.json.meta +++ b/Runtime/wechat-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 43a58900cd1f2cceeebe71cd0da6e9ea + guid: 179da2ed074829e524dfc2872975e325 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images.meta b/Runtime/wechat-default/images.meta index ad08a610..36abb65e 100644 --- a/Runtime/wechat-default/images.meta +++ b/Runtime/wechat-default/images.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b1d832e9cee1c57b74a2fded945106ca +guid: 9db9162ee5f1a2a397d10c3777c83f87 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/images/background.jpg.meta b/Runtime/wechat-default/images/background.jpg.meta index 621d8416..5f71d579 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: 88efc2aa831eb2db158d75d77bdacfc8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/unity_logo.png.meta b/Runtime/wechat-default/images/unity_logo.png.meta index 92b9b047..751f145b 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: 637302f3614737bbe64ebd9b2521d5ad DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data.meta b/Runtime/wechat-default/open-data.meta index 7dec9e47..d01b2050 100644 --- a/Runtime/wechat-default/open-data.meta +++ b/Runtime/wechat-default/open-data.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dce8b79ef90a5f0785efa79abc051250 +guid: dd40781319439a99d2528adecbeec5dd folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/open-data/data.meta b/Runtime/wechat-default/open-data/data.meta index f7b04433..de3fe42d 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: 2c0893d210a02e90a2ee51713cf3aab7 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 aefec334..0868732a 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: 9a62b6fb1452f58ef0bed95d77959e96 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 77b4aaba..09fff23d 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: 2abad3d3bebda938e47df35efbad73d9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/index.js.meta b/Runtime/wechat-default/open-data/index.js.meta index aaaca295..60f9d91f 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: 3bdf53a0b4d3347cd1eca6125612aa3e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/loading.js.meta b/Runtime/wechat-default/open-data/loading.js.meta index 95fc44fc..83837589 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: f19e7107fcdef0effafe9c88f6954509 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render.meta b/Runtime/wechat-default/open-data/render.meta index 4a824a23..0173dccf 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: 1c2e4ec92205b636b514de376f4b2163 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 57792228..b2a6cefd 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: 31744f4c0fada1bd79b5d0353566283d 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 763a2384..885ce3cc 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: 56bca02ef89857305dde0d3b716d9bde 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 7f6f92ba..06dfb52d 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: 079a67450374285d8024f48e47b247f0 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 e2e53b46..63134f0d 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: 95a5e01a7c3bafff197cb8e708e687b6 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 78441d91..fa96e75c 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: 2e279b4cc7c1a9eb9c4f0f829358b241 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 1ed44759..a70a6e26 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: ab2f66c6bf426d7796699ca644873165 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 3ba1cbd9..945f0a1a 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: 2147ef08ea03ef8582442b95ea87c0a6 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 309aae67..9d855670 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: 6d8057f0c274c9a13b6b15e60a199d43 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 3ed25d4c..aae80bbe 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: 6ffcdae4decf17f68bb4ac6db251377f 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 61a7a5be..73daec79 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: 996fba6104f7ab70a0c5bf3e7997dcdb 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 2ace2f7e..6471b429 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: 9c40d13a5ea220b285bf602fbbd16e63 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/styles.meta b/Runtime/wechat-default/open-data/render/styles.meta index 29ff810b..3b678ec0 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: cdd0fb951c76850df394fd03b69a7bf0 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 23d7d352..99c31437 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: c4e8a4f07c6236ab8f03021b8ef5e08e 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 54a2e7cd..267f6235 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: 28f35bb36deed009cdb38935479004e8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/tpls.meta b/Runtime/wechat-default/open-data/render/tpls.meta index 556bd32f..a52dba33 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: 546eadc9d4a7611f81963f2b1d868053 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 e129a41a..1e18263a 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: 17c86eb92a5359a9ae0bc684a6bd2c01 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 bcf48c68..b6e0fad4 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: 570aaefdd6b4f199ce0d7142664714fd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugin-config.js.meta b/Runtime/wechat-default/plugin-config.js.meta index 0242b322..60e5c827 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: 1531e7e47f8e8f7feb618a79da54944d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins.meta b/Runtime/wechat-default/plugins.meta index 39c57418..9ee94a0f 100644 --- a/Runtime/wechat-default/plugins.meta +++ b/Runtime/wechat-default/plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f817247029bab4d8378e683dd0768663 +guid: 1b05495c80b7bd631e98cf526afb8f2c 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 164ea7b2..7e4558e5 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: 723db6aaf65378a05cce76f43d1864da DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/screen-adapter.js.meta b/Runtime/wechat-default/plugins/screen-adapter.js.meta index 182a8286..590aa895 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: c41a145f865af730632e1ad52b2dca96 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/project.config.json.meta b/Runtime/wechat-default/project.config.json.meta index 4eff91ef..9ebfcdd0 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: 462b50f31058566252eaca712d7953dd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/texture-config.js.meta b/Runtime/wechat-default/texture-config.js.meta index dcebcf2a..cfe5a54a 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: cc19aad3bbe255fc71458ee9b002e07c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-namespace.js.meta b/Runtime/wechat-default/unity-namespace.js.meta index 43e30760..3f7c0cbb 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: ab8fd6420f07989f1bd3c8d6b750a359 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk.meta b/Runtime/wechat-default/unity-sdk.meta index 8080547c..5e1c3ef2 100644 --- a/Runtime/wechat-default/unity-sdk.meta +++ b/Runtime/wechat-default/unity-sdk.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2481e7305f0c4a6d5e524778fe2f9463 +guid: 79157ad3578d28c490d9aaeaf46aeca6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/TCPSocket.meta b/Runtime/wechat-default/unity-sdk/TCPSocket.meta index f5725ac4..364f47f5 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: edeb7e11877f1976bc30955988a1f1e2 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 5e8592c9..f30159cd 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: fe459287dde1d5b3cf0cd914b1c274df DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/UDPSocket.meta b/Runtime/wechat-default/unity-sdk/UDPSocket.meta index e32c7169..abba503f 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: 6104a3773dd3022f3873bbaa08953fa2 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 ac1f5b33..4a635547 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: 1497ad1981a9b4ba8f3ac86a788119f5 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/ad.js.meta b/Runtime/wechat-default/unity-sdk/ad.js.meta index acd341fd..c9d81aec 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: 63e81f0e80842125372709dab5d6d756 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio.meta b/Runtime/wechat-default/unity-sdk/audio.meta index 221a2454..70725a12 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: c444609b31cdef52fb57163a60eb6c06 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 f7cc811e..c032f2c9 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: 1b25ad45f151903cd6ba89234c06a4ba 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 5b35465a..6b88d3b7 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: d4b7490816fe89eb9011b41321f7dbd2 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 c6b6e302..1dbb326c 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: 881b3bb461fc0f61ee820254fcf59064 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 48f80d10..4060dd2b 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: bbb30ce69dbb2912fad9d1a6e8a0597f 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 7379ca62..4374b23e 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: 48661d12885d8644d0e3d87276d67b6b 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 acdbb8f7..68b9112f 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: 21a3bd4c6d0cf0b37ceaeeb2d9f14745 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 3a5da3c5..2a358f76 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: 4f42535d2a84c224561b4b91a1ca2985 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/authorize.js.meta b/Runtime/wechat-default/unity-sdk/authorize.js.meta index 524c8bae..79e194c4 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: cbb0513e9b071b51f1072d37a864a991 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/bluetooth.meta b/Runtime/wechat-default/unity-sdk/bluetooth.meta index 7f9effa6..94d8f800 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: b5ff368cf4776e39675555b334e3d2e2 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 dfed5e20..85095a37 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: 206193087bc996368874e42bcb68ee93 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/camera.js.meta b/Runtime/wechat-default/unity-sdk/camera.js.meta index d159709c..540e8e10 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: 8ad5f52a9eb6e42af499463884f8365e 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 19ddeaad..51b1be29 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: 15e1ec16a8fdbe5113e89f39fbfb9d2c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/canvas.js.meta b/Runtime/wechat-default/unity-sdk/canvas.js.meta index 77edbd34..f4e99d55 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: c9034a5d33403a4c7eeec4bfbdeda793 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/chat.js.meta b/Runtime/wechat-default/unity-sdk/chat.js.meta index cfef3227..f9895516 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: 4de10ce5c7e41d5cac22c32a53ca5b9f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/cloud.js.meta b/Runtime/wechat-default/unity-sdk/cloud.js.meta index 392cd10e..f602d4bf 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: 4d0045b4ea4505c1e5c96f47bd2bc273 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/conf.js.meta b/Runtime/wechat-default/unity-sdk/conf.js.meta index 237094de..bbb9632f 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: 6683a56327a0e3defc240eb7b9e33c93 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 a54906bc..ba7115bb 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: e4aacfa44512b7c23a140b65035a796e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fix.js.meta b/Runtime/wechat-default/unity-sdk/fix.js.meta index 22c0ffac..68ad5c05 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: 3c88ff606ac8e511bc023e8dcab190e3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font.meta b/Runtime/wechat-default/unity-sdk/font.meta index 8247319e..df99f82b 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: 893aae342cfd7b36cf630c844eff792a 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 d74951cb..74cb03d5 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: 747693489eead1d1dc9b7dc7a0eaed7e 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 f410f3dd..61cfa37c 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: 01a3818ef35f31221710557e97c31fc1 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 3f4bbbee..c9f2bc0f 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: 81f7177931e45ac3b724ceeb71aad8b8 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 fa3a33d1..45ce08c8 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: f49aaee76a1aae77189f8f967ed191cf 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 d246ded6..f79458c1 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: 664bb6dbe4fd2660ccefb5c331006b48 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fs.js.meta b/Runtime/wechat-default/unity-sdk/fs.js.meta index 5a1c39e2..ed015484 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: f003a8adc0f33c8750783a35d5168322 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 506e4221..94ef90fb 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: 77ef4108528a47b1bd47d4ba6e33cdab 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 164a6759..20594921 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: 9424a1bcb9e91deb72d2789fbaaf5124 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/gyroscope.meta b/Runtime/wechat-default/unity-sdk/gyroscope.meta index 3d4a0783..88333c40 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: f0c0dd8026ecfd6481152f48f35f022a 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 881ab63a..634d5a78 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: 83994d63c1eda0fdb5e6c8996375f1c1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/index.js.meta b/Runtime/wechat-default/unity-sdk/index.js.meta index 633e1774..d38ace9c 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: a295cf239a972bd37e60d6e825497c75 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/logger.js.meta b/Runtime/wechat-default/unity-sdk/logger.js.meta index 06003719..5b4da848 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: 7fd02e64b942963594e282380afd9255 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta b/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta index 5d74aa38..d71f56be 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: aff9795f13e3f120bebe15a5539ab4e3 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 3ae87572..1bc79a5e 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: 0a4db319d83991ca6e68455480523c2b 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 b830520a..183d9aeb 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: b51368507b7ee9a91325635b1e7bd7ac DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/open-data.js b/Runtime/wechat-default/unity-sdk/open-data.js index f5e16425..7e366061 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 40888822..0c121550 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: eab9813dade6367613f055605084b7c9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/recorder.js.meta b/Runtime/wechat-default/unity-sdk/recorder.js.meta index a331283c..e46515bd 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: 1faf1b9bc9f2b6f1b085d256c0f8fb82 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resType.js.meta b/Runtime/wechat-default/unity-sdk/resType.js.meta index 9d647cb5..36b59828 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: 805c732158e450376a8fc12bc120a912 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta index 9e4f5d4b..23975f22 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: de678dd96b7dbca429a7a4ad9de97f7b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/response.js.meta b/Runtime/wechat-default/unity-sdk/response.js.meta index ecdadc6a..a314c825 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: ef92614a5a505da33d1a2df246a1b182 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/sdk.js.meta b/Runtime/wechat-default/unity-sdk/sdk.js.meta index bd73c9e0..c473463e 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: f9a113ff0d036bd80c958a5afef12a56 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/share.js.meta b/Runtime/wechat-default/unity-sdk/share.js.meta index e43c9a6b..57eb1c9d 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: aaae1aff86312dcde9ff52dafe77630d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/storage.js.meta b/Runtime/wechat-default/unity-sdk/storage.js.meta index 937ad3dd..a5ecc854 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: 840911a98c0dcb1fd4d2eb5e1d19e9d9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/texture.js.meta b/Runtime/wechat-default/unity-sdk/texture.js.meta index 0f6fdadb..dccca9a1 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: a37853e8d2e58168e33baf1652e08e91 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/touch.meta b/Runtime/wechat-default/unity-sdk/touch.meta index b3eed703..ffdd4635 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: dec325a9d05dee774c86050956b82c2c 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 6bb6f96b..fe1970cf 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: a4006af94320046fd6d2dc359fa531e2 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 a3a6c454..984315b1 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: bd45ea08113ab1e8ce7a629023197cab DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/userinfo.js.meta b/Runtime/wechat-default/unity-sdk/userinfo.js.meta index 4134d8b0..6143d2a5 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: c323b98e31f33e02bcd23cb7ec1ad724 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/util.js b/Runtime/wechat-default/unity-sdk/util.js index 3108ab05..ce3058ba 100644 --- a/Runtime/wechat-default/unity-sdk/util.js +++ b/Runtime/wechat-default/unity-sdk/util.js @@ -174,4 +174,9 @@ export default { WX_SetPreferredFramesPerSecond(fps) { wx.setPreferredFramesPerSecond(fps); }, + WXSetSyncReadCacheEnabled(enabled) { + if (GameGlobal.manager && GameGlobal.manager.fs.setSyncReadCacheEnabled) { + GameGlobal.manager.fs.setSyncReadCacheEnabled(!!enabled); + } + } }; diff --git a/Runtime/wechat-default/unity-sdk/util.js.meta b/Runtime/wechat-default/unity-sdk/util.js.meta index 8ff2c088..74102a80 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: 2634fe78f8ec63b5d945cbed0e56dc87 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/utils.js.meta b/Runtime/wechat-default/unity-sdk/utils.js.meta index 847d5a31..5a149645 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: a042007a109abcd96193c4c70a8a9ae1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.js b/Runtime/wechat-default/unity-sdk/video.js index e81be2bb..53706d8c 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 bd82a8a8..e62bb92f 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: 3eab8d4b88aea906581f28a73fee92c3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.meta b/Runtime/wechat-default/unity-sdk/video.meta index 95d4d81a..f49aa7ce 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: 4e7605481b74d33cdbf18439eae71433 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 70041d90..53a12d87 100644 --- a/Runtime/wechat-default/unity-sdk/video/index.js +++ b/Runtime/wechat-default/unity-sdk/video/index.js @@ -7,8 +7,43 @@ let FrameworkData = null; const isWebVideo = (isH5Renderer && !GameGlobal.isIOSHighPerformanceModePlus) || isPc || isDevtools; const needCache = true; const cacheVideoDecoder = []; -const supportVideoFrame = !!GameGlobal.isIOSHighPerformanceModePlus; +let supportVideoFrame = !!GameGlobal.isIOSHighPerformanceModePlus; const videoInstances = {}; +class VideoBufferManager { + videoBuffers = new Map(); + getTempBuffer(videoId, byteLength) { + const Module = GameGlobal.manager.gameInstance.Module; + if (this.videoBuffers.has(videoId)) { + const bufferInfo = this.videoBuffers.get(videoId); + if (bufferInfo.byteLength >= byteLength) { + return bufferInfo.ptr; + } + if (bufferInfo.ptr !== null) { + Module._free(bufferInfo.ptr); + } + } + const newPtr = Module._malloc(byteLength); + if (newPtr === null) { + return null; + } + this.videoBuffers.set(videoId, { byteLength, ptr: newPtr }); + return newPtr; + } + destroyTempBuffer(videoId) { + if (this.videoBuffers.has(videoId)) { + const Module = GameGlobal.manager.gameInstance.Module; + const bufferInfo = this.videoBuffers.get(videoId); + if (bufferInfo.ptr !== null) { + Module._free(bufferInfo.ptr); + + } + this.videoBuffers.delete(videoId); + } + } +} +; +let videoBufferManager; + function _JS_Video_CanPlayFormat(format, data) { @@ -40,6 +75,12 @@ function _JS_Video_Create(url) { source = FrameworkData.UTF8ToString(url); } debugLog('_JS_Video_Create', source); + if (GameGlobal.mtl) { + supportVideoFrame = false; + if (!videoBufferManager) { + videoBufferManager = new VideoBufferManager(); + } + } if (isWebVideo) { // @ts-ignore const video = GameGlobal.manager.createWKVideo(source, FrameworkData.GLctx); @@ -112,7 +153,7 @@ function _JS_Video_Create(url) { // @ts-ignore videoInstance.currentTime = res.pts / 1000; - if (supportVideoFrame) { + if (supportVideoFrame || GameGlobal.mtl) { videoInstance.frameData?.close?.(); } @@ -174,6 +215,19 @@ 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; + if (GameGlobal.mtl) { + if (!isWebVideo) { + videoBufferManager?.destroyTempBuffer(video); + } + } + else { + const gl = GL.currentContext.GLctx; + if (!isWebVideo && gl.emscriptenGLX && Module._glxVideoDestroy) { + Module._glxVideoDestroy(video); + } + } delete videoInstances[video]; } function _JS_Video_Duration(video) { @@ -378,7 +432,45 @@ function _JS_Video_UpdateToTexture(video, tex) { if (!FrameworkData) { return false; } + const Module = GameGlobal.manager.gameInstance.Module; const { GL, GLctx } = FrameworkData; + + if (!isWebVideo && GameGlobal.mtl) { + if (supportVideoFrame) { + + return false; + } + const data = v.frameData?.data; + const source = supportVideoFrame ? data : new Uint8ClampedArray(data); + const byteLength = supportVideoFrame ? 0 : source.byteLength; + const sourceIdOrPtr = videoBufferManager?.getTempBuffer(video, byteLength); + if (sourceIdOrPtr) { + Module.HEAPU8.set(source, sourceIdOrPtr); + } + return Module._mtlVideoUpdateToTexture(video, supportVideoFrame, tex, v.videoWidth, v.videoHeight, sourceIdOrPtr); + } + + 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 e0dcdc3c..6a0e9105 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: 46a1f351aa6f8057c349f4231a5fa720 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/wasmcode.meta b/Runtime/wechat-default/wasmcode.meta index 5f5576a0..67f77fcd 100644 --- a/Runtime/wechat-default/wasmcode.meta +++ b/Runtime/wechat-default/wasmcode.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d561119fefeca5aeb48773e39a34b1ce +guid: 422bbee7b34ad78daeb1c8132afd642b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/wasmcode/game.js.meta b/Runtime/wechat-default/wasmcode/game.js.meta index 9be88e90..ab06de19 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: 0cbfb83267d99708215ca4c9f4ff38e2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/weapp-adapter.js.meta b/Runtime/wechat-default/weapp-adapter.js.meta index cbf2323a..6bcdb821 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: d749ba4c0f51e5001ae43b152db2be58 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/workers.meta b/Runtime/wechat-default/workers.meta index f1f9af22..159e625e 100644 --- a/Runtime/wechat-default/workers.meta +++ b/Runtime/wechat-default/workers.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac4d918ee6094ab64c058df6ac845d74 +guid: a0187777e88c50a05dfeee8370598867 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/workers/response.meta b/Runtime/wechat-default/workers/response.meta index 32780b78..f5700ca9 100644 --- a/Runtime/wechat-default/workers/response.meta +++ b/Runtime/wechat-default/workers/response.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 82bb642c8fbfa9bb367068cbcbac83ad +guid: a637aa1f9ae0b90fb45cda1c87f7d313 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 6248f93c..492b27a6 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: ee29a4af96dbf0f226a7ac5b79f5b7f7 DefaultImporter: externalObjects: {} userData: diff --git a/package.json b/package.json index 5a473674..4e01cbcc 100644 --- a/package.json +++ b/package.json @@ -1 +1 @@ -{"name":"com.qq.weixin.minigame","displayName":"WXSDK","description":"WeChat Mini Game Tuanjie Engine Adapter SDK Package.","version":"0.1.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.29","unity":"2019.4","unityRelease":"29f1","keywords":["Tuanjie","WX"],"dependencies":{}}