diff --git a/CHANGELOG.md b/CHANGELOG.md index 61b40d7f..1177ca28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,6 @@ Removed - 删除功能/接口 Fixed - 修复问题 Others - 其他 --> -## 2025-9-8 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 92fa06b6..252f755c 100644 --- a/Editor/BuildProfile.meta +++ b/Editor/BuildProfile.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 4ada38394365d4d28a5ce4c336723cce +guid: DytLvSj8UC9CKob0XUy9Y3usKDmX8US1YgxYmBxa1iAZ/I8JbM5wZwE= folderAsset: yes DefaultImporter: externalObjects: {} userData: assetBundleName: - assetBundleVariant: \ No newline at end of file + assetBundleVariant: diff --git a/Editor/BuildProfile/lib.meta b/Editor/BuildProfile/lib.meta index 4a30858e..87b4cc3c 100644 --- a/Editor/BuildProfile/lib.meta +++ b/Editor/BuildProfile/lib.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: a100628dafec44bf49842a207d510696 +guid: XSwesi78AS28ymfR2HEhHpEBAC2DHupI1hIKP7HApjHRaZgGw+DTwWI= folderAsset: yes DefaultImporter: externalObjects: {} userData: assetBundleName: - assetBundleVariant: \ No newline at end of file + assetBundleVariant: diff --git a/Editor/BuildProfile/lib/libwx-metal-cpp.bc b/Editor/BuildProfile/lib/libwx-metal-cpp.bc index d8b6c657..e8ae1211 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 cd5e1bb7..28e81d7a 100644 --- a/Editor/BuildProfile/lib/libwx-metal-cpp.bc.meta +++ b/Editor/BuildProfile/lib/libwx-metal-cpp.bc.meta @@ -1,93 +1,7 @@ fileFormatVersion: 2 guid: c113acfee35db6b5c61fd4a76596cfd3 -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 +DefaultImporter: +externalObjects: {} +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 3a662c16..b6f7cf5d 100644 --- a/Editor/BuildProfile/lib/mtl_library.jslib +++ b/Editor/BuildProfile/lib/mtl_library.jslib @@ -2,21 +2,26 @@ mergeInto(LibraryManager.library, { // 定义供 C/C++ 调用的 JS 函数 js_batchRender_malloc: function(data, size, isSync) { // 直接从 WASM 内存创建视图（零拷贝） - const targetBuffer = new Uint8Array(Module.HEAPU8.buffer, data, size); + const binaryData = new Uint8Array(Module.HEAPU8.buffer, data, size); + // 转换为标准 ArrayBuffer（如果需要复制） + const targetBuffer = + binaryData.buffer.slice(binaryData.byteOffset, binaryData.byteOffset + binaryData.byteLength); //console.log("processBinaryData invoke"); - const extBuffer = new ArrayBuffer(1); - + 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); if(!isSync){ - mtl.batchRenderAsync(targetBuffer, extBuffer); + mtl.batchRenderAsync(merged.buffer, extBuffer); return null; } - const response = mtl.batchRender(targetBuffer, extBuffer); - if (!response) { - return null; - } - const result = response.buffer; - if(!result || result.byteLength == 0){ - return null; + const result = mtl.batchRender(merged.buffer, extBuffer).buffer; + if(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 fd1272a9..3882fefc 100644 --- a/Editor/BuildProfile/lib/mtl_library.jslib.meta +++ b/Editor/BuildProfile/lib/mtl_library.jslib.meta @@ -1,93 +1,7 @@ fileFormatVersion: 2 guid: dda1926f3454e003333e8085a4f2c0fd -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 +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Editor/WXConvertCore.cs b/Editor/WXConvertCore.cs index 8e4d0bac..5c83d263 100644 --- a/Editor/WXConvertCore.cs +++ b/Editor/WXConvertCore.cs @@ -107,14 +107,6 @@ namespace WeChatWASM return config.CompileOptions.enableiOSMetal; } } - // 用于replaceRules判断是否需要注入相关的修改 - public static bool UseEmscriptenGLX - { - get - { - return config.CompileOptions.enableEmscriptenGLX; - } - } // public static void SetPlayableEnabled(bool enabled) // { // isPlayableBuild = enabled; @@ -134,8 +126,6 @@ namespace WeChatWASM } // iOS metal 的相关特性 ProcessWxiOSMetalBinaries(); - // emscriptenglx的相关特性 - ProcessWxEmscriptenGLXBinaries(); MakeEnvForLuaAdaptor(); // JSLib SettingWXTextureMinJSLib(); @@ -312,8 +302,7 @@ namespace WeChatWASM } catch (Exception ex) { - // 避免 Error 日志阻塞打包流程 - UnityEngine.Debug.LogWarning($"Failed to enable plugin asset: {ex.Message}"); + UnityEngine.Debug.LogError($"Failed to enable plugin asset: {ex.Message}"); } } @@ -382,59 +371,6 @@ 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. */ @@ -1459,7 +1395,8 @@ 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) + Path.Combine(config.ProjectConf.DST, miniGameDir), + true ); buildTemplate.start(); // FIX: 2021.2版本生成symbol有bug，导出时生成symbol报错，有symbol才copy @@ -2046,7 +1983,7 @@ namespace WeChatWASM config.ProjectConf.bundleHashLength.ToString(), bundlePathIdentifierStr, excludeFileExtensionsStr, - config.CompileOptions.Webgl2 ? "2" : "1", + config.CompileOptions.enableiOSMetal ? "5" : (config.CompileOptions.Webgl2 ? "2" : "1"), Application.unityVersion, WXExtEnvDef.pluginVersion, config.ProjectConf.dataFileSubPrefix, @@ -2095,9 +2032,7 @@ namespace WeChatWASM config.ProjectConf.MemorySize.ToString(), config.SDKOptions.disableMultiTouch ? "true" : "false", // Perfstream，暂时设为false - "false", - config.CompileOptions.enableEmscriptenGLX ? "true" : "false", - config.CompileOptions.enableiOSMetal ? "true" : "false" + "false" }); List replaceList = new List(replaceArrayList); diff --git a/Editor/WXEditorSettingHelper.cs b/Editor/WXEditorSettingHelper.cs index 21ccfe2d..ccfe4ea6 100644 --- a/Editor/WXEditorSettingHelper.cs +++ b/Editor/WXEditorSettingHelper.cs @@ -185,7 +185,6 @@ 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"); @@ -450,7 +449,6 @@ 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); @@ -530,7 +528,6 @@ 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 54f139a2..08a5888e 100644 --- a/Editor/WXExtDef.cs +++ b/Editor/WXExtDef.cs @@ -129,10 +129,6 @@ 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 dd8b5760..51a6d12c 100644 --- a/Editor/WXPluginVersion.cs +++ b/Editor/WXPluginVersion.cs @@ -2,7 +2,7 @@ namespace WeChatWASM { public class WXPluginVersion { - public static string pluginVersion = "202509080251"; // 这一行不要改他，导出的时候会自动替换 + public static string pluginVersion = "202509080252"; // 这一行不要改他，导出的时候会自动替换 } public class WXPluginConf diff --git a/Editor/wx-editor.dll b/Editor/wx-editor.dll index 0eda1d66..9b751d9c 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 71eca621..8bd12eb5 100644 --- a/Editor/wx-editor.xml +++ b/Editor/wx-editor.xml @@ -653,7 +653,6 @@ 是否使用iOS metal指令流 - 是否使用brotli多线程压缩 diff --git a/Editor/wx-editor.xml.meta b/Editor/wx-editor.xml.meta index f5b42bcb..8ab8b560 100644 --- a/Editor/wx-editor.xml.meta +++ b/Editor/wx-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 78cd82125cde73f2aff3b68d406d91da +guid: dd80a72ead55a9e5c0cde49c75829fd3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/SDK-Call-JS-Old.jslib b/Runtime/Plugins/SDK-Call-JS-Old.jslib index b22e4020..6d658038 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, isLast) { - window.WXWASMSDK.WXVideoDestroy(_WXPointer_stringify_adaptor(id), isLast); + WXVideoDestroy: function(id) { + window.WXWASMSDK.WXVideoDestroy(_WXPointer_stringify_adaptor(id)); }, WXVideoExitFullScreen: function(id) { window.WXWASMSDK.WXVideoExitFullScreen(_WXPointer_stringify_adaptor(id)); @@ -627,9 +627,6 @@ 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 7645012b..83908007 100644 --- a/Runtime/Plugins/WXAssetBundle.jslib +++ b/Runtime/Plugins/WXAssetBundle.jslib @@ -51,6 +51,7 @@ var WXAssetBundleLibrary = { WXFS.msg = ""; WXFS.fd2wxStream = new Map; WXFS.path2fd = new Map; + WXFS.refRecord = new Map; WXFS.fs = wx.getFileSystemManager(); WXFS.nowfd = FS.MAX_OPEN_FDS + 1; WXFS.isWXAssetBundle = function(url){ @@ -98,19 +99,18 @@ var WXAssetBundleLibrary = { value: function get(key) { var temp = this.hash.get(key); if (temp !== undefined) { - // 忽略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')); - // } - // } + 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); @@ -321,6 +321,9 @@ var WXAssetBundleLibrary = { } if(!WXFS.disk.has(path)){ WXFS.disk.set(path, 0); + WXFS.refRecord.set(path, 0); + } else { + WXFS.refRecord.set(path, WXFS.refRecord.get(path) + 1); } return true; }, @@ -328,11 +331,16 @@ var WXAssetBundleLibrary = { UnloadbyPath: function (ptr) { var path = WXFS.url2path(UTF8ToString(ptr)); var fd = WXFS.path2fd.get(path); - if(WXFS.cache.has(fd)){ - WXFS.cache.delete(fd); - } - if(WXFS.disk.has(path)){ - WXFS.disk.delete(path); + var refCount = WXFS.refRecord.get(path); + if(!refCount){ + if(WXFS.cache.has(fd)){ + WXFS.cache.delete(fd); + } + if(WXFS.disk.has(path)){ + WXFS.disk.delete(path); + } + }else{ + WXFS.refRecord.set(path, refCount - 1); } }, diff --git a/Runtime/Plugins/wx-perf.dll b/Runtime/Plugins/wx-perf.dll index 88256cf6..d5e1e44f 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 6aca8810..e04ca5e4 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 2f1482e2..498b52a2 100644 --- a/Runtime/Plugins/wx-runtime-editor.xml +++ b/Runtime/Plugins/wx-runtime-editor.xml @@ -1749,126 +1749,116 @@ 视频的总时长，单位为秒 - - - 视频的资源地址 - - - - - 视频是否自动播放 - - - - - 视频背景颜色 - - - - - 视频是否显示控件 - - - - - 是否开启双击播放的手势 - - - - - 是否启用手势控制播放进度 - - - - - 视频的高度 - - - - - 视频的初始播放位置，单位为 s 秒 - - - - - 视频是否为直播 - - - - - 视频是否是否循环播放 - - - - - 视频是否禁音播放 - - - - - 视频是否遵循系统静音开关设置（仅iOS） - - - - - 视频的缩放模式 - - - - - 视频的播放速率，有效值有 0.5、0.8、1.0、1.25、1.5 - - - - - 视频的封面 - - - - - 是否显示视频中央的播放按钮 - - - - - 是否显示视频底部进度条 - - - - - 是否显示控制栏的进度条 - - - - - 视频的宽度 - - - + 视频的左上角横坐标 - + 视频的左上角纵坐标 - + + + 视频的宽度 + + + + + 视频的高度 + + + + + 视频的资源地址 + + + + + 视频的封面 + + + + + 视频的初始播放位置，单位为 s 秒 + + + + + 视频的播放速率，有效值有 0.5、0.8、1.0、1.25、1.5 + + + + + 视频是否为直播 + + + + + 视频的缩放模式 + + + + + 视频是否显示控件 + + + + + 是否显示视频底部进度条 + + + + + 是否显示控制栏的进度条 + + + + + 视频背景颜色 + + + + + 视频是否自动播放 + + + + + 视频是否是否循环播放 + + + + + 视频是否禁音播放 + + + + + 视频是否遵循系统静音开关设置（仅iOS） + + + + + 是否启用手势控制播放进度 + + + + + 是否开启双击播放的手势 + + + + + 是否显示视频中央的播放按钮 + + + 视频是否显示在游戏画布之下 - - - 视频跳转后自动暂停播放 - - - - - 视频跳转原生页后自动暂停播放 - - 开发版 @@ -3139,100 +3129,6 @@ 选填，部分活动、功能允许接收自定义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) - - 一个表示控制器设备上存在的坐标轴的数组 (比如控制器摇杆)。 @@ -8613,44 +8509,22 @@ 显示用户信息按钮 - - - 微信小游戏视频组件 - - - - - 视频实例字典 (内部使用，请不要访问) - - - - - 视频实例ID - - - - - 视频创建参数 - - - - - 创建视频实例 - - 实例ID - 创建参数 - - - - 初始化属性 - - 内部函数,请不要调用 + + + 视频的资源地址 + + + + + 视频的封面 + + 视频的左上角横坐标 @@ -8671,69 +8545,9 @@ 视频的高度 - + - 视频的资源地址 - - - - - 视频的封面 - - - - - 是否为直播 - - - - - 当视频大小与 video 容器大小不一致时，视频的表现形式 - - - - - 是否显示默认播放控件（播放/暂停按钮、播放进度、时间） - - - - - 是否显示播放进度 - - - - - 在非全屏模式下，是否开启亮度和音量调节手势 - - - - - 视频的背景色 - - - - - 是否遵循系统静音开关 - - - - - 是否开启控制进度的手势 - - - - - 是否开启播放手势 - - - - - 是否显示视频中间的播放按钮 - - - - - 销毁当前实例 + Gets a value indicating whether 是否正在播放 @@ -8741,54 +8555,6 @@ 播放视频 - - - 暂停 - - - - - 停止视频 - - - - - 视频跳转 - - 视频跳转到指定位置，单位为 s 秒 - - - - 视频全屏 - - 设置全屏时视频的方向 0: 正常竖向, 90: 屏幕逆时针90度 . -90: 屏幕顺时针90度 - - - - 视频退出全屏 - - - - - 监听视频由于需要缓冲下一帧而停止时触发 - - - - - 取消监听视频由于需要缓冲下一帧而停止时触发,action 为空表示移除全部事件监听 - - - - - 监听视频下载（缓冲）事件 - - - - - - 取消监听视频下载（缓冲）事件 ,action 为空表示移除全部事件监听 - - 监听视频播放事件 @@ -8799,6 +8565,26 @@ 取消监听视频播放事件,action 为空表示移除全部事件监听 + + + 监听视频播放到末尾事件 + + + + + 取消监听视频播放到末尾事件 + + + + + 监听视频错误事件 + + + + + 取消监听视频错误事件,action 为空表示移除全部事件监听 + + 监听视频暂停事件 @@ -8809,14 +8595,46 @@ 取消监听视频暂停事件,action 为空表示移除全部事件监听 - + - 监听视频播放到末尾事件 + 监听视频由于需要缓冲下一帧而停止时触发 - + - 取消监听视频播放到末尾事件 + 取消监听视频由于需要缓冲下一帧而停止时触发,action 为空表示移除全部事件监听 + + + + + 销毁当前实例 + + + + + 视频退出全屏 + + + + + 暂停 + + + + + 视频全屏 + + 设置全屏时视频的方向 0: 正常竖向, 90: 屏幕逆时针90度 . -90: 屏幕顺时针90度 + + + + 视频跳转 + + 视频跳转到指定位置，单位为 s 秒 + + + + 停止视频 @@ -8830,14 +8648,15 @@ 取消监听视频播放进度更新事件,action 为空表示移除全部事件监听 - + - 监听视频错误事件 + 监听视频下载（缓冲）事件 + - + - 取消监听视频错误事件,action 为空表示移除全部事件监听 + 取消监听视频下载（缓冲）事件 ,action 为空表示移除全部事件监听 diff --git a/Runtime/Plugins/wx-runtime-editor.xml.meta b/Runtime/Plugins/wx-runtime-editor.xml.meta index 9a18ec89..5d0b7d1a 100644 --- a/Runtime/Plugins/wx-runtime-editor.xml.meta +++ b/Runtime/Plugins/wx-runtime-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 214caf8d86ad32d584fbf1aae0c16f78 +guid: b63ff2425b9e01ed6cf89d56f54497f1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/wx-runtime.dll b/Runtime/Plugins/wx-runtime.dll index 47f36005..6ddc365c 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 482a88a2..d4e4841f 100644 --- a/Runtime/Plugins/wx-runtime.xml +++ b/Runtime/Plugins/wx-runtime.xml @@ -1755,126 +1755,116 @@ 视频的总时长，单位为秒 - - - 视频的资源地址 - - - - - 视频是否自动播放 - - - - - 视频背景颜色 - - - - - 视频是否显示控件 - - - - - 是否开启双击播放的手势 - - - - - 是否启用手势控制播放进度 - - - - - 视频的高度 - - - - - 视频的初始播放位置，单位为 s 秒 - - - - - 视频是否为直播 - - - - - 视频是否是否循环播放 - - - - - 视频是否禁音播放 - - - - - 视频是否遵循系统静音开关设置（仅iOS） - - - - - 视频的缩放模式 - - - - - 视频的播放速率，有效值有 0.5、0.8、1.0、1.25、1.5 - - - - - 视频的封面 - - - - - 是否显示视频中央的播放按钮 - - - - - 是否显示视频底部进度条 - - - - - 是否显示控制栏的进度条 - - - - - 视频的宽度 - - - + 视频的左上角横坐标 - + 视频的左上角纵坐标 - + + + 视频的宽度 + + + + + 视频的高度 + + + + + 视频的资源地址 + + + + + 视频的封面 + + + + + 视频的初始播放位置，单位为 s 秒 + + + + + 视频的播放速率，有效值有 0.5、0.8、1.0、1.25、1.5 + + + + + 视频是否为直播 + + + + + 视频的缩放模式 + + + + + 视频是否显示控件 + + + + + 是否显示视频底部进度条 + + + + + 是否显示控制栏的进度条 + + + + + 视频背景颜色 + + + + + 视频是否自动播放 + + + + + 视频是否是否循环播放 + + + + + 视频是否禁音播放 + + + + + 视频是否遵循系统静音开关设置（仅iOS） + + + + + 是否启用手势控制播放进度 + + + + + 是否开启双击播放的手势 + + + + + 是否显示视频中央的播放按钮 + + + 视频是否显示在游戏画布之下 - - - 视频跳转后自动暂停播放 - - - - - 视频跳转原生页后自动暂停播放 - - 开发版 @@ -3145,100 +3135,6 @@ 选填，部分活动、功能允许接收自定义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) - - 一个表示控制器设备上存在的坐标轴的数组 (比如控制器摇杆)。 @@ -8619,44 +8515,22 @@ 显示用户信息按钮 - - - 微信小游戏视频组件 - - - - - 视频实例字典 (内部使用，请不要访问) - - - - - 视频实例ID - - - - - 视频创建参数 - - - - - 创建视频实例 - - 实例ID - 创建参数 - - - - 初始化属性 - - 内部函数,请不要调用 + + + 视频的资源地址 + + + + + 视频的封面 + + 视频的左上角横坐标 @@ -8677,69 +8551,9 @@ 视频的高度 - + - 视频的资源地址 - - - - - 视频的封面 - - - - - 是否为直播 - - - - - 当视频大小与 video 容器大小不一致时，视频的表现形式 - - - - - 是否显示默认播放控件（播放/暂停按钮、播放进度、时间） - - - - - 是否显示播放进度 - - - - - 在非全屏模式下，是否开启亮度和音量调节手势 - - - - - 视频的背景色 - - - - - 是否遵循系统静音开关 - - - - - 是否开启控制进度的手势 - - - - - 是否开启播放手势 - - - - - 是否显示视频中间的播放按钮 - - - - - 销毁当前实例 + Gets a value indicating whether 是否正在播放 @@ -8747,54 +8561,6 @@ 播放视频 - - - 暂停 - - - - - 停止视频 - - - - - 视频跳转 - - 视频跳转到指定位置，单位为 s 秒 - - - - 视频全屏 - - 设置全屏时视频的方向 0: 正常竖向, 90: 屏幕逆时针90度 . -90: 屏幕顺时针90度 - - - - 视频退出全屏 - - - - - 监听视频由于需要缓冲下一帧而停止时触发 - - - - - 取消监听视频由于需要缓冲下一帧而停止时触发,action 为空表示移除全部事件监听 - - - - - 监听视频下载（缓冲）事件 - - - - - - 取消监听视频下载（缓冲）事件 ,action 为空表示移除全部事件监听 - - 监听视频播放事件 @@ -8805,6 +8571,26 @@ 取消监听视频播放事件,action 为空表示移除全部事件监听 + + + 监听视频播放到末尾事件 + + + + + 取消监听视频播放到末尾事件 + + + + + 监听视频错误事件 + + + + + 取消监听视频错误事件,action 为空表示移除全部事件监听 + + 监听视频暂停事件 @@ -8815,14 +8601,46 @@ 取消监听视频暂停事件,action 为空表示移除全部事件监听 - + - 监听视频播放到末尾事件 + 监听视频由于需要缓冲下一帧而停止时触发 - + - 取消监听视频播放到末尾事件 + 取消监听视频由于需要缓冲下一帧而停止时触发,action 为空表示移除全部事件监听 + + + + + 销毁当前实例 + + + + + 视频退出全屏 + + + + + 暂停 + + + + + 视频全屏 + + 设置全屏时视频的方向 0: 正常竖向, 90: 屏幕逆时针90度 . -90: 屏幕顺时针90度 + + + + 视频跳转 + + 视频跳转到指定位置，单位为 s 秒 + + + + 停止视频 @@ -8836,14 +8654,15 @@ 取消监听视频播放进度更新事件,action 为空表示移除全部事件监听 - + - 监听视频错误事件 + 监听视频下载（缓冲）事件 + - + - 取消监听视频错误事件,action 为空表示移除全部事件监听 + 取消监听视频下载（缓冲）事件 ,action 为空表示移除全部事件监听 diff --git a/Runtime/Plugins/wx-runtime.xml.meta b/Runtime/Plugins/wx-runtime.xml.meta index 89d6f9ec..dd43346b 100644 --- a/Runtime/Plugins/wx-runtime.xml.meta +++ b/Runtime/Plugins/wx-runtime.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 98e7a30426c77b220b99d299fa9b87d1 +guid: 4f69fa652217d82ffa79ec1ddfe04737 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/WXBase.cs b/Runtime/WXBase.cs index 2ff47d7a..31be7b59 100644 --- a/Runtime/WXBase.cs +++ b/Runtime/WXBase.cs @@ -535,7 +535,7 @@ namespace WeChatWASM /// /// /// - public static WXVideo CreateVideo(CreateVideoOption param) + public static WXVideo CreateVideo(WXCreateVideoParam param) { return WXSDKManagerHandler.Instance.CreateVideo(param); } @@ -766,16 +766,6 @@ namespace WeChatWASM return WXSDKManagerHandler.Instance.GetCachePath(url); } - /// - /// 临时修复安卓在主线程繁忙时，异步读缓存耗时高，但需关注同步读文件可能导致掉帧 - /// 仅在有需要的情况下主动开启，需要同步读的场景完成后再主动关闭 - /// - /// - public static void SetSyncReadCacheEnabled(bool enabled) - { - WXSDKManagerHandler.Instance.SetSyncReadCacheEnabled(enabled); - } - #endregion /// @@ -1137,15 +1127,6 @@ 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 a36d52e4..198611f1 100644 --- a/Runtime/playable-default/check-version.js.meta +++ b/Runtime/playable-default/check-version.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 7b29bd214619eca95a3a7df5d0ac6838 + guid: 18001b3be153b7136df7535aae850554 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/data-package.meta b/Runtime/playable-default/data-package.meta index 765936f3..c61f2860 100644 --- a/Runtime/playable-default/data-package.meta +++ b/Runtime/playable-default/data-package.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5e3013b8e893d219dfee55012ae860c0 +guid: 35cdf6c38bac630ff83021b332fd66c5 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 833f7989..93d64591 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: fd20525d173e3b137e736aff31bda2fe + guid: 6c230fa5a564fd181c4ecbad1c645146 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/events.js.meta b/Runtime/playable-default/events.js.meta index 376c8cef..83b2b8cc 100644 --- a/Runtime/playable-default/events.js.meta +++ b/Runtime/playable-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: e4ffc9bdb4f961181db10eb73dac0eca + guid: 4a5d3e1056b315e6b39a3b50ef88bcc8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/game.js.meta b/Runtime/playable-default/game.js.meta index b1ee70c3..f57737e2 100644 --- a/Runtime/playable-default/game.js.meta +++ b/Runtime/playable-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 31c877cffda57741091ad5674ce7bf1e + guid: 1bbb0506b7e7005608024968c7e0c64b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/game.json.meta b/Runtime/playable-default/game.json.meta index 86b12838..4c1ec195 100644 --- a/Runtime/playable-default/game.json.meta +++ b/Runtime/playable-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: fcb7af98d0e30e27e93ac91aa475b4ae + guid: 3498cbbe631f2803862baf8e88807af2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/playable-fix.js.meta b/Runtime/playable-default/playable-fix.js.meta index 2e3522c8..6ede95f5 100644 --- a/Runtime/playable-default/playable-fix.js.meta +++ b/Runtime/playable-default/playable-fix.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: d4c8377ae967a81f39a6ba48bf25d991 + guid: 43f86f482d6b6244e4770a153c36b255 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/plugin-config.js.meta b/Runtime/playable-default/plugin-config.js.meta index 02e408c3..fe73fcd9 100644 --- a/Runtime/playable-default/plugin-config.js.meta +++ b/Runtime/playable-default/plugin-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 8a33564f0e2c694a922831599e3c4799 + guid: fb23cf0ec98d661b6dc1826b06670a63 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/plugins.meta b/Runtime/playable-default/plugins.meta index e89655e7..00d1ef29 100644 --- a/Runtime/playable-default/plugins.meta +++ b/Runtime/playable-default/plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7f291662319ee5f41238e8bcd2e301de +guid: 580493b1ff6f4f10b6eeefcd02ebc7c7 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 67301137..bfa87881 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: 392699c49615d381e55c4d9680cc6b99 + guid: 8b8a127a77648318bb462832e7a00964 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/plugins/screen-adapter.js.meta b/Runtime/playable-default/plugins/screen-adapter.js.meta index b275e3e3..e499f7ef 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: 882fe8aa3468645befd19c12a214910b + guid: 906bd0c462d0389ef5ab37bd0edd0410 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/project.config.json.meta b/Runtime/playable-default/project.config.json.meta index 25db3b58..b8b0089e 100644 --- a/Runtime/playable-default/project.config.json.meta +++ b/Runtime/playable-default/project.config.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 08cd59af895efabd001d65064a0afdeb + guid: d5fee66ca0896763b0f2f28c55bac711 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/texture-config.js.meta b/Runtime/playable-default/texture-config.js.meta index 476e4792..73b67caf 100644 --- a/Runtime/playable-default/texture-config.js.meta +++ b/Runtime/playable-default/texture-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: a53ee6ad3bd88da011246179c0894ec9 + guid: ea164211c19c3ab6b4bc367338eec024 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-namespace.js.meta b/Runtime/playable-default/unity-namespace.js.meta index 3d8c7696..c1ff9e02 100644 --- a/Runtime/playable-default/unity-namespace.js.meta +++ b/Runtime/playable-default/unity-namespace.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 3927fb6a9ef8dc00286ab9c6509c4644 + guid: e7294c59bd1f538ece25a1af04b95196 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-playable-plugin.meta b/Runtime/playable-default/unity-playable-plugin.meta index cb97a65c..b1dc577a 100644 --- a/Runtime/playable-default/unity-playable-plugin.meta +++ b/Runtime/playable-default/unity-playable-plugin.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e1c685a71ed53308ed3b38f664e068cb +guid: afd9139ed18cb8881011bf340e1337e4 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 9ed3646c..0ccbefe3 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: cbfcc4bfb5d889f51cc5c49d6e4ad4d3 + guid: 2fe4aa013207654fa0a5b429f42f4d71 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk.meta b/Runtime/playable-default/unity-sdk.meta index 4f8a6a19..d6b17562 100644 --- a/Runtime/playable-default/unity-sdk.meta +++ b/Runtime/playable-default/unity-sdk.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 384515e2db4fbab7331c88d7751e8d59 +guid: f965afdd0e9bdbc1229026a2b10bf9e1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/unity-sdk/audio.meta b/Runtime/playable-default/unity-sdk/audio.meta index cb06b5ac..8ae6b390 100644 --- a/Runtime/playable-default/unity-sdk/audio.meta +++ b/Runtime/playable-default/unity-sdk/audio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f3ab4630922940726f140af3de2912d +guid: 102664b2b4df39848d5e4dfcf5825578 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 d5b925b3..4a28d30f 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: 6da13b56138ea28196c94a0a58b9f927 + guid: dab9cde4b35d7fb5129c9d9933083218 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 770de377..af8a4d4f 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: a8abad52465b30aadd8a3612e1e06f4a + guid: bd14023ca230ef82abdabc3bad9003d6 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 40031bc0..eaf2d54b 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: cd0573eb0cc64ca0a992b2a846fe5257 + guid: 9914919cd9f78b9377c4736d55a234c7 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 967660d1..a8223867 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: 85d5a6e008e54e5b805fe659407edc2c + guid: 9605a6f27920c98089fe5564ce9d63ad 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 0574b771..406dd3a8 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: a565f3d908b78417d7c1d30064bf61ce + guid: 945084850929122e1dc6e5b9dc08afa1 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 3dcb2fd5..bf675abc 100644 --- a/Runtime/playable-default/unity-sdk/audio/unity-audio.js +++ b/Runtime/playable-default/unity-sdk/audio/unity-audio.js @@ -1018,9 +1018,6 @@ 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 098b94e8..8352a7f1 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: 0f2dbe5157c016c9d0935e0dba64be1a + guid: 1b94f01f9ef9f60a09c2e95b1d74e15d 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 a383cf2f..c3a95685 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: ac7095ca3b40388b9aee6d0efd863855 + guid: 2317020b433582b79e508d6fcb9c198c 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 9809772f..33067061 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: bc0158143e037c1f94119f8b653e0835 + guid: 6daceb3f4c39d2e33589b2473744128a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/canvas.js.meta b/Runtime/playable-default/unity-sdk/canvas.js.meta index 5788d283..67ebd551 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: ba245bc639da63aa1624cfac4c64fc9f + guid: 7374963fb3f60ce379f8475e8c49e5d4 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/conf.js.meta b/Runtime/playable-default/unity-sdk/conf.js.meta index 52e76422..4e1dffa3 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: 005e7f191e773017df2e768af7a65482 + guid: 845c2877b3002e7df0e99e3bb88dc1c7 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 3890c8e4..4dca8c95 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: dc434544f5ea6baafaeb55586b034714 + guid: f3702ee200213b2bb301dfcd0333a117 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/fix.js.meta b/Runtime/playable-default/unity-sdk/fix.js.meta index 6b82f3bc..d0303106 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: 4dcbcbbd80d49eec110bf4a738466c49 + guid: 832666e4cf9ab37dbc103c268f67699e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/fs.js.meta b/Runtime/playable-default/unity-sdk/fs.js.meta index 403b41b7..d7e5c9a0 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: 91287448bd3041b914e3a6509c00b6f7 + guid: 35bfe161c04d97766a3ebc802351e7c0 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/index.js.meta b/Runtime/playable-default/unity-sdk/index.js.meta index 193b64d1..c2353efa 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: 095b32d677e92343ac6bd20b4a81a8b8 + guid: e0a36de441ca41054e65ba775c8dbbe2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/logger.js.meta b/Runtime/playable-default/unity-sdk/logger.js.meta index 95f99ca6..2612d144 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: 2e3a1729fcbff1be163587c57f65a4cd + guid: 73acf972820ebd467d45f4e1b1f65876 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/mobileKeyboard.meta b/Runtime/playable-default/unity-sdk/mobileKeyboard.meta index e161812b..1832b75f 100644 --- a/Runtime/playable-default/unity-sdk/mobileKeyboard.meta +++ b/Runtime/playable-default/unity-sdk/mobileKeyboard.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2006cce64c405b26c2a987ea6e8cacac +guid: be50bf53744c0c74f03fa556d5c03df9 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 c12999f2..9f5ff924 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: a7d723dcf34bdef9048bbb2f0da56d4f + guid: 023ff74649210218f2c42f0382160206 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 13f4270a..e2520d63 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: 6a1dfc6d7e77c45378c73cffaf6c3ca6 + guid: 76725eb9f7b72dee6058d255b30b75b7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/recorder.js.meta b/Runtime/playable-default/unity-sdk/recorder.js.meta index 5fe23e00..a7211178 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: 213d9e4b1d78f9388feef8fe9042fd4f + guid: d8c7e6ba7d6ff042f6146307356d3e26 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/resType.js.meta b/Runtime/playable-default/unity-sdk/resType.js.meta index f269e4e3..207abb1a 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: 62d89289e117f4a27a70c0d8b76429a1 + guid: fc85621c912c0400fd118997fdc6c8e4 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/resTypeOther.js.meta b/Runtime/playable-default/unity-sdk/resTypeOther.js.meta index db995273..19723267 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: 95627abb0c66e913317de78a7843dd29 + guid: 700a29c0f7dee0f2b683659494a2d61b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/response.js.meta b/Runtime/playable-default/unity-sdk/response.js.meta index b0840bd2..ee64638c 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: b5a4e495de6badeb4f7366cf514d77ab + guid: 467d031abf673efaa843e1692975bb0e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/sdk.js.meta b/Runtime/playable-default/unity-sdk/sdk.js.meta index a1de7051..b143d46b 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: 8c36ef8d4e0acefc7658017ea1762501 + guid: 0b609acf3e5bf05095984cfffda38a7d 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 39fcbd77..c7229841 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: 24ee6f9a69bbc1c723b38b02b3168eff + guid: c995637b7bd7bd3ef332323f749d69d7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/texture.js.meta b/Runtime/playable-default/unity-sdk/texture.js.meta index 13d2c101..c5c007da 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: f467b4956b848fb4aa4aaad96122ff1f + guid: 30d64143ac825143a9d8a3cb36407219 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/touch.meta b/Runtime/playable-default/unity-sdk/touch.meta index a3b046c2..5a48ee4d 100644 --- a/Runtime/playable-default/unity-sdk/touch.meta +++ b/Runtime/playable-default/unity-sdk/touch.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 626edd53d9cbfd10a9e16a95b55957f8 +guid: 2ea5f1975ebfb634ff77c0845bd73cd2 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 1b989062..eafe5f28 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: 775d237729a1ec89def72a5ebe40c980 + guid: 39f79e1a6133db8bd9df2cad8bf36f01 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/util.js.meta b/Runtime/playable-default/unity-sdk/util.js.meta index d8b28f53..79d143bb 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: 07c1fa42beee80e0288b1c9a64da43f5 + guid: 83f52813aaa2966261a5f2656f437f09 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/utils.js.meta b/Runtime/playable-default/unity-sdk/utils.js.meta index f33a88ac..d574b9a9 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: 48e271c6ef10e2284bbae3d9a569a40c + guid: cce47e4c5c58aa9cc4b4ad5664e5cbad DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/video.js b/Runtime/playable-default/unity-sdk/video.js index 53706d8c..e81be2bb 100644 --- a/Runtime/playable-default/unity-sdk/video.js +++ b/Runtime/playable-default/unity-sdk/video.js @@ -18,27 +18,32 @@ export default { if (!obj) { return; } - if (key === 'x' || key === 'y' || key === 'width' || key === 'height' || key === 'initialTime' || key === 'playbackRate') { + if (key === 'x' || key === 'y' || key === 'width' || key === 'height') { obj[key] = +value; } - else if (key === 'src' || key === 'poster' || key === 'objectFit' || key === 'backgroundColor') { + else if (key === 'src' || key === 'poster') { obj[key] = value; } - 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'; + }, + WXVideoPlay(id) { + const obj = getObject(id); + if (!obj) { + return; } + obj.play(); }, WXVideoAddListener(id, key) { - getObject(id)?.[key]((e) => { + const obj = getObject(id); + if (!obj) { + return; + } + obj[key]((e) => { moduleHelper.send('OnVideoCallback', JSON.stringify({ callbackId: id, - type: key, - position: e?.position, - buffered: e?.buffered ? Number(e.buffered) : undefined, - duration: e?.duration, - errMsg: e?.errMsg, + errMsg: key, + position: e && e.position, + buffered: e && e.buffered, + duration: e && e.duration, })); if (key === 'onError') { GameGlobal.enableTransparentCanvas = false; @@ -46,31 +51,54 @@ export default { } }); }, - WXVideoRemoveListener(id, key) { - getObject(id)?.[key](); - }, - WXVideoDestroy(id, isLast) { - getObject(id)?.destroy(); - if (isLast) { - GameGlobal.enableTransparentCanvas = false; + WXVideoDestroy(id) { + const obj = getObject(id); + if (!obj) { + return; } - }, - WXVideoPlay(id) { - getObject(id)?.play(); - }, - WXVideoPause(id) { - getObject(id)?.pause(); - }, - WXVideoStop(id) { - getObject(id)?.stop(); - }, - WXVideoSeek(id, time) { - getObject(id)?.seek(time); - }, - WXVideoRequestFullScreen(id, direction) { - getObject(id)?.requestFullScreen(direction); + obj.destroy(); + GameGlobal.enableTransparentCanvas = false; }, WXVideoExitFullScreen(id) { - getObject(id)?.exitFullScreen(); + const obj = getObject(id); + if (!obj) { + return; + } + obj.exitFullScreen(); + }, + 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); + }, + WXVideoStop(id) { + const obj = getObject(id); + if (!obj) { + return; + } + obj.stop(); + }, + WXVideoRemoveListener(id, key) { + const obj = getObject(id); + if (!obj) { + return; + } + obj[key](); }, }; diff --git a/Runtime/playable-default/unity-sdk/video.js.meta b/Runtime/playable-default/unity-sdk/video.js.meta index e1b46e0c..6358c1e6 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: 8e6ac4ff2987057dd3b844ef1bb65b0d + guid: 1360b92182277ca4481804d14f297f01 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/video.meta b/Runtime/playable-default/unity-sdk/video.meta index ff62ddf6..d953d023 100644 --- a/Runtime/playable-default/unity-sdk/video.meta +++ b/Runtime/playable-default/unity-sdk/video.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 28236c6226b794a96bc6ee7faa3707d9 +guid: 410a19e8869dab59fa2f3b9b9f09b00b 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 6fa2ac90..c9403467 100644 --- a/Runtime/playable-default/unity-sdk/video/index.js +++ b/Runtime/playable-default/unity-sdk/video/index.js @@ -171,12 +171,6 @@ 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) { @@ -381,29 +375,7 @@ 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 88772576..5dfc9a6c 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: ea86fc54cc0a4babd55d0ad798fa1e4c + guid: 921a42a7d23b928762145e1452476f0c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/wasmcode.meta b/Runtime/playable-default/wasmcode.meta index 8c1ee7b8..5ec8de89 100644 --- a/Runtime/playable-default/wasmcode.meta +++ b/Runtime/playable-default/wasmcode.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 673120a13a83a386e6eeddc2132346c0 +guid: 687ba973cdb29e0aa9d12e30defdf028 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/wasmcode/game.js.meta b/Runtime/playable-default/wasmcode/game.js.meta index 14570de5..b9f7bc67 100644 --- a/Runtime/playable-default/wasmcode/game.js.meta +++ b/Runtime/playable-default/wasmcode/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: e245c42abfe92a7b7ead38f1e5585bd5 + guid: 5db4d1ccaf3b7c0bea8ddf80fad84c98 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/weapp-adapter.js.meta b/Runtime/playable-default/weapp-adapter.js.meta index d8891700..784fb445 100644 --- a/Runtime/playable-default/weapp-adapter.js.meta +++ b/Runtime/playable-default/weapp-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: d07b89654001786f1098b243b8cab435 + guid: 1f0d14675875275ede4d2e0bcd853e34 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/check-version.js.meta b/Runtime/wechat-default/check-version.js.meta index 1e071bee..6d7b30c1 100644 --- a/Runtime/wechat-default/check-version.js.meta +++ b/Runtime/wechat-default/check-version.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 2045c5d8b9eb8f2f704e1a550cda3667 + guid: b3b42c2faea9a0598b214a6fbf0e9287 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/data-package.meta b/Runtime/wechat-default/data-package.meta index 89cd0f4d..a51c0859 100644 --- a/Runtime/wechat-default/data-package.meta +++ b/Runtime/wechat-default/data-package.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3a3dbb3d00ad347a7f107b78bc43238d +guid: d956507c88602b5327901779ad98ad04 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 dd9d05f8..bd70a6e9 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: d39c131ced64599353b1dca9fb12bf76 + guid: ac1de3046dd5334fa6f4336dd3516ef5 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/events.js.meta b/Runtime/wechat-default/events.js.meta index 3f183842..086c44a2 100644 --- a/Runtime/wechat-default/events.js.meta +++ b/Runtime/wechat-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: de4fdc451e7a65a8ce6c683c485f76c2 + guid: 720c0c007893cf51d53b9de06c71a6cf DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.js b/Runtime/wechat-default/game.js index 79956cd5..2d09dae7 100644 --- a/Runtime/wechat-default/game.js +++ b/Runtime/wechat-default/game.js @@ -27,11 +27,7 @@ const managerConfig = { '$PRELOAD_LIST', ], contextConfig: { - contextType: $WEBGL_VERSION, - contextExt: { - enableGLX: $ENABLE_GLX, - enableMetal: $ENABLE_METAL, - } + contextType: $WEBGL_VERSION, // 1: webgl1 2: webgl2 }, PROFILER_UPLOAD_URL: '', }; diff --git a/Runtime/wechat-default/game.js.meta b/Runtime/wechat-default/game.js.meta index f2760fa4..164fc17d 100644 --- a/Runtime/wechat-default/game.js.meta +++ b/Runtime/wechat-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: a7ee9091d01828b17691bc2a674bdd92 + guid: 835d3b8b0b41f66568f2289b9cbec7cc DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.json b/Runtime/wechat-default/game.json index 52a1a62a..e11fd7b6 100644 --- a/Runtime/wechat-default/game.json +++ b/Runtime/wechat-default/game.json @@ -23,7 +23,7 @@ ], "plugins": { "UnityPlugin": { - "version": "1.2.82", + "version": "1.2.79", "provider": "wxe5a48f1ed5f544b7", "contexts": [ { @@ -32,7 +32,7 @@ ] }, "Layout": { - "version": "1.0.16", + "version": "1.0.15", "provider": "wx7a727ff7d940bb3f", "contexts": [ { diff --git a/Runtime/wechat-default/game.json.meta b/Runtime/wechat-default/game.json.meta index d5e5f4c3..48b5083a 100644 --- a/Runtime/wechat-default/game.json.meta +++ b/Runtime/wechat-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 0d4ed012ff085ee6cb732ea9e2b11f9a + guid: 0981c46c7ce5f6f31cb3ed29af250a6f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images.meta b/Runtime/wechat-default/images.meta index 6ced8661..32b8eb43 100644 --- a/Runtime/wechat-default/images.meta +++ b/Runtime/wechat-default/images.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5d3019d9996bfa07b54c5f6c600901f9 +guid: 5b2b3ca74b1a5fea1200f7034cb14744 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/images/background.jpg.meta b/Runtime/wechat-default/images/background.jpg.meta index 0b478bd2..eab15f12 100644 --- a/Runtime/wechat-default/images/background.jpg.meta +++ b/Runtime/wechat-default/images/background.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 09eb45aa936fe636a49a99fb3e2cd21b + guid: ad87985986e6f82e44f4e4a69d88c24d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/unity_logo.png.meta b/Runtime/wechat-default/images/unity_logo.png.meta index def04867..0d6d616b 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: 450415f2e52d4e18f4b314f2970787b3 + guid: 24d6ea06330e6047679c4e08f572fc6d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data.meta b/Runtime/wechat-default/open-data.meta index cc0f1135..1e664265 100644 --- a/Runtime/wechat-default/open-data.meta +++ b/Runtime/wechat-default/open-data.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 70ff77ebb516a06424a51ac4d9547765 +guid: b9ddbf5ad4fe3064dd64133b1d5f0d09 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/open-data/data.meta b/Runtime/wechat-default/open-data/data.meta index 66ead9a3..030bff71 100644 --- a/Runtime/wechat-default/open-data/data.meta +++ b/Runtime/wechat-default/open-data/data.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 073387b90eb90048ddcd050e67a725da +guid: 35dcac5ca2c527091aa49465e53a7a48 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 fd3f5cfe..845b0466 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: 414773f02764ba0eb35bb64837b36684 + guid: a8b9099885a7b30ca6fe4ae9504fe7b2 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 91b18795..206b35ea 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: da9534e28a466c99226eb96e0a745932 + guid: 55d115a66f4ebc963aa63fceec36ffb9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/index.js.meta b/Runtime/wechat-default/open-data/index.js.meta index 85ae0414..d9494a1c 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: a9c0fc3eb2f8366e32f1fc694a9f3aa6 + guid: 21508816a9d427f65f32a673c1d5d5f8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/loading.js.meta b/Runtime/wechat-default/open-data/loading.js.meta index f2ec8d18..c34a29f9 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: 199b1fc4c40d778aba4a4f0be35b4b26 + guid: 453a4006c9c8053cc56b409477de8f5f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render.meta b/Runtime/wechat-default/open-data/render.meta index 9f330552..65e00731 100644 --- a/Runtime/wechat-default/open-data/render.meta +++ b/Runtime/wechat-default/open-data/render.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3a618ed9c81977674f71abb36643afc1 +guid: 74b689e5b74856a50091adc8aff67c48 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 66b53fd2..618c501d 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: 9a6543accff97d88038332e3bb6f6cbb +guid: f33b48ee4f2304f90654dd79786f01cd 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 30b049e7..6a958d39 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: 58f2976539efcd9f76b348d549cf364a + guid: ecfefaa9bab5fb3dd1cee46f2c537c5e 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 3311e8cd..98fd7b1a 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: c5f0abda8f3107c10bde27b195e425f1 + guid: 5549b5f93f078ca6f72716477e5517be 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 9b0fc74a..f1b11c1f 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: baf3a3a9da063319ff4fbcab834e9c31 + guid: 77077a5fa30c3c872696d70be4dbf44d 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 b62d086a..ad4dd9c4 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: 252b983e7c2f9240d56d460e8c391237 + guid: 7734d7fb5b1169f539a0520793967e8f 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 bbeca524..bfe6639c 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: 159391761ee114e2e81ef3bf8eb68185 + guid: 483443622a1705f7069cc38b0a29a7d5 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 f2835e66..6ac58774 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: cab564db34b231ffc7002944fc75aa68 + guid: cb123b2136f00540bc6575369579eb4c 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 039c99af..f151fd25 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: 0b458b20e46009c10884f310c5a4c0ea + guid: 0b4afbdb631d4e8126ecb1508cea9052 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 09559f11..4b7aa1b7 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: 95f9bb4ee7fcd93a9f78aad7d1e8660e + guid: 2202b9fb5ea6b49e4b59e8f04c793894 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 34099ef6..9efb17fe 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: 4d03fa6e12c57f30bcce5fd061f4bc67 + guid: 37d2a440830d96bea83f1ce8ab4a85c5 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 f722c60e..d2bd2fda 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: ef3f900d5a26bc71e29e791e2c37a8c5 + guid: 768d24e0c1a128ce3340da7af10e64da DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/styles.meta b/Runtime/wechat-default/open-data/render/styles.meta index 53558e57..5def0cf9 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: 43a2422ca465e740037f137e7d644ea0 +guid: d60083b5be4ccc00f4ada906ae151fc8 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 95266e47..c2e95785 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: c21ae04a9afb77078e29f9081701e790 + guid: dcb6516d1ef557f096bf904719eb44ff 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 35b89aaf..77cb04a8 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: eb64ab2869a9004373a5e4a6208bb2a2 + guid: c83a9a174a081fde8d4b2c1dc6300e4d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/tpls.meta b/Runtime/wechat-default/open-data/render/tpls.meta index 0dd0c307..7a84eaac 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: f71942d869f7a2af63f4e9e7a3968518 +guid: 3bea37f89435a8343fd10d4b61f3b21d 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 8e80cf85..d0a8a5bb 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: 2e37937d677ad8dafb01d410031a1856 + guid: d493f9c1aff58ba17a45c7f0c85433f3 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 f9caa6a0..9692a472 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: 755e9dba0f58be7cb0a722083569b93b + guid: 0fcbd317cbf7c8f2955d3d34f33555df DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugin-config.js.meta b/Runtime/wechat-default/plugin-config.js.meta index a17a87a8..f80a61ae 100644 --- a/Runtime/wechat-default/plugin-config.js.meta +++ b/Runtime/wechat-default/plugin-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: e6eca3dc170ef911473ba4b932cdcbd1 + guid: 528157ce22f4b63a5a215e4bb124c1b4 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins.meta b/Runtime/wechat-default/plugins.meta index 2a585604..a5315790 100644 --- a/Runtime/wechat-default/plugins.meta +++ b/Runtime/wechat-default/plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1a37f54ed3c19f19279b73bcfbbaf818 +guid: c445802a7390ed2cff58621a02985b22 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 1cb6a653..a85d798d 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: 5c5ecd41876515141ff0dbe5515ef86b + guid: 67b4d97478081c307cb0452d3a198152 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/screen-adapter.js.meta b/Runtime/wechat-default/plugins/screen-adapter.js.meta index ff49e1f8..6342d2ce 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: ce0b2bc732de999bc0bf3fb2b834884a + guid: 56207d6721b80966ffb5f677ffbd731a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/project.config.json.meta b/Runtime/wechat-default/project.config.json.meta index b2071040..61982446 100644 --- a/Runtime/wechat-default/project.config.json.meta +++ b/Runtime/wechat-default/project.config.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 0fe96c22d0f1ee0ba84b87e12f571458 + guid: 3e6d63395d43505a0ac95c2b125168ec DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/texture-config.js.meta b/Runtime/wechat-default/texture-config.js.meta index 41a051b9..3db5b653 100644 --- a/Runtime/wechat-default/texture-config.js.meta +++ b/Runtime/wechat-default/texture-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: c97477bf16b4e7852ec9b00f9abef895 + guid: 196d646df2c6ce50108f452f801ec84b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-namespace.js.meta b/Runtime/wechat-default/unity-namespace.js.meta index ed8ceeef..fedc803d 100644 --- a/Runtime/wechat-default/unity-namespace.js.meta +++ b/Runtime/wechat-default/unity-namespace.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: b72128891432d5dcca5d44828fb13853 + guid: 61f5100c4327ad5f79ac2d1e0f1032b3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk.meta b/Runtime/wechat-default/unity-sdk.meta index 77e0344d..3087d19b 100644 --- a/Runtime/wechat-default/unity-sdk.meta +++ b/Runtime/wechat-default/unity-sdk.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c7a8935875805f8969de5f72c43b6297 +guid: 5429ca935656eaa1d9366a3f433dde50 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/TCPSocket.meta b/Runtime/wechat-default/unity-sdk/TCPSocket.meta index f9d8a1e2..e6ead7d9 100644 --- a/Runtime/wechat-default/unity-sdk/TCPSocket.meta +++ b/Runtime/wechat-default/unity-sdk/TCPSocket.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5608c0ce697594d18dbcade01ae66caf +guid: 69f6cb28c9b9aeea11c20082d8c45771 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 3e8c5e50..4e7c1eaa 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: a65b7360a359b408526e0e6152b61fad + guid: c2c50e0cbaab850224ef89b3fd1ab5f1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/UDPSocket.meta b/Runtime/wechat-default/unity-sdk/UDPSocket.meta index 996aab08..9894876b 100644 --- a/Runtime/wechat-default/unity-sdk/UDPSocket.meta +++ b/Runtime/wechat-default/unity-sdk/UDPSocket.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4f030a93a9eeb3e7eef67c1999dc4612 +guid: b6b3a4df38fcf8588572ae3034344a4e 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 0f907c9c..695b7ec5 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: 064bf744579b5207b4ae768543c8da8a + guid: 8f4466127681c6a8e85bd9f1fa90e269 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/ad.js.meta b/Runtime/wechat-default/unity-sdk/ad.js.meta index 7c8fb00e..dd41e3ee 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: f381fad7c832046a6cfa23205ab4fdcc + guid: d9a2332707052765eab2e09e51de937e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio.meta b/Runtime/wechat-default/unity-sdk/audio.meta index bfb17663..4231c4ca 100644 --- a/Runtime/wechat-default/unity-sdk/audio.meta +++ b/Runtime/wechat-default/unity-sdk/audio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d8bd5ca0535a5e8ccf3be5aa9f0bf485 +guid: ede390d9caf7c52232e374bf1a160a5a 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 fc5cb51e..b293eea0 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: 30c064c09395fda2b5e5658b67725e1a + guid: ca1883254fc871df18b42cbcec7f217a 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 8ee625d7..2940b67f 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: 9b64945bc892cd196a5616eb6c00062c + guid: 34579e452912f29d27ced721d7be5a5d 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 4406ed02..3b46461d 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: 8e2a074698ffb59944f2b848ee925d96 + guid: ee07db5cfe10bc9d951a0839e49413fe 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 81357110..05ee0386 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: 7730de53a313baf8347b95c34beacc75 + guid: 221b41a685db16e96a06b7fae0660eb4 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 be7f93a4..1f88b4bc 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: 5341cd6d0cc65fb193999ebc97edb179 + guid: 5064bfd84b0e434e5dc92796bbbfe1bc 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 a2c3ae0f..7f96d771 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: 6fcce433f51465e6831948ded4609720 + guid: 22840dfb83bab688d7ec202dd7d06afe 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 8c144cf9..b90536af 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: 64d0fd7495cc712a28dab84b15710164 + guid: 516c897d1f5427802b2e650bf605ab40 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/authorize.js.meta b/Runtime/wechat-default/unity-sdk/authorize.js.meta index a908fa6b..42a9a279 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: 9a0ac1769da47f680570a5bbfd79aced + guid: a2b19ced705f62276d0ce07fbb8e6066 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/bluetooth.meta b/Runtime/wechat-default/unity-sdk/bluetooth.meta index 247d4019..074141fd 100644 --- a/Runtime/wechat-default/unity-sdk/bluetooth.meta +++ b/Runtime/wechat-default/unity-sdk/bluetooth.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c4358b3bcd86a31ef6e7d1886a8636cd +guid: 011e30d89e170dfae7ed9914d8203a74 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 6427d2ef..bbb9e4fe 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: d8ba0e52ac9e84ae31f9c1aa2e933dcb + guid: bfa54848abbf199c2d4c0a470ecdc8ea DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/camera.js.meta b/Runtime/wechat-default/unity-sdk/camera.js.meta index 04a078a8..9d3b1c3c 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: 52a0ea56957e464368081e275fff270b + guid: 9128a2d35dd9b085611b01b585e15329 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 81a5a0a7..dcee8683 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: 7b835b81522f68944357eb34300b001f + guid: 526e8fb7f9a0a6f33cc920db2dae71fd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/canvas.js.meta b/Runtime/wechat-default/unity-sdk/canvas.js.meta index 2d4a65ec..6be9a13a 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: aad0a104443808db020da64f87ff06f4 + guid: cee5a63a2511cc6082e9306c63026391 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/chat.js.meta b/Runtime/wechat-default/unity-sdk/chat.js.meta index cb10d6d5..7c1b7730 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: b5cfaceb9e687275b9d10630c6afc75c + guid: fc5f695ca48df44cb3d133845953538a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/cloud.js.meta b/Runtime/wechat-default/unity-sdk/cloud.js.meta index ac4629b4..7858d84a 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: e9ae99cf2a25f32bf6ce84ff3894df8a + guid: 53d6c858e7f8fec3aba16361d09489ca DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/conf.js.meta b/Runtime/wechat-default/unity-sdk/conf.js.meta index 4b802563..d7c260b9 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: 1bba45499c4e593088838eb6787afdc0 + guid: 819abc5687292d343af63f4df6af6cbd 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 a4ff7e8d..ceb5451f 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: 10b3348f797089c64fbd8b0d4e3b84f6 + guid: 01e8f476b27734c37bfb4bb0b2cd279e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fix.js.meta b/Runtime/wechat-default/unity-sdk/fix.js.meta index 37877f5e..821ffdcc 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: 6ae98f447370722a8619c320ed7d9425 + guid: a5f26a75d8c7d84f52b33fefccbe9b18 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font.meta b/Runtime/wechat-default/unity-sdk/font.meta index c2e3bb9f..6be4cacd 100644 --- a/Runtime/wechat-default/unity-sdk/font.meta +++ b/Runtime/wechat-default/unity-sdk/font.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f4c739bf83075c20bdec1435a17e4449 +guid: 2dba3377e99b3b803f4b66ec1cb8098c 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 d1a0ef4b..eda5dcff 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: 0062ecca5bd3574b84c572175d34657f + guid: 371c05b4c843c85bf9c8f4249424d513 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 ef32b450..4edb15a7 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: 1f5cd8fe47b1b8774633ac60ffaee0da + guid: 2211ed38eb853580832b46d611161c29 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 2c7bdaf9..293392b0 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: ddc5fcb64106a51ac210fedeec8bd11a + guid: 17e7bf0457919169e3812083ec19e2cf 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 48d75c22..b29fd335 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: 75a003a5f47400821c16a07376d6949e + guid: 7469845919faa320e2f5d6e23975ad50 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 b7b2958c..c434f41d 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: 560040c680b919aed25b5aaa06df6fe0 + guid: 503f62e2be6ad7c41493ad189af18fe4 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fs.js.meta b/Runtime/wechat-default/unity-sdk/fs.js.meta index c923b671..47eafe76 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: 307fae1aecd614dcfdf2fe74e318e815 + guid: 64214edc669a3406a8cec1e29741a38b 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 13f2a1dc..f621a73b 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: 36d255da814787ae5504c12ce859c268 + guid: 38ed7f05f33edeba93ec47dd8b387852 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 3867633c..8ba3bd26 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: 356d888d8a3e3fb3dfd2061b1148655e + guid: 79b94158b4faff01fe9ec7e08c64f44d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/gyroscope.meta b/Runtime/wechat-default/unity-sdk/gyroscope.meta index 345c1ee1..abe6f632 100644 --- a/Runtime/wechat-default/unity-sdk/gyroscope.meta +++ b/Runtime/wechat-default/unity-sdk/gyroscope.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d26b8ab98e380c7351a98523ce194bc6 +guid: 8ab2ac974dce841c44b9cf0f3a1ea539 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 f6997b82..0f5192f5 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: 0e66bdf4dce65998be9f824bd3d9fb58 + guid: afc4fc9ac40ffd7afe9eb9eac63f9baf DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/index.js.meta b/Runtime/wechat-default/unity-sdk/index.js.meta index a2f5b9ca..53399c09 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: 6444f8940fafe8aa4339b0e89c25eee9 + guid: fde6d89c7543bf4edb24d647ff72b8ba DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/logger.js.meta b/Runtime/wechat-default/unity-sdk/logger.js.meta index 9d314a4f..db28fd6d 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: 5be706eb67aae01569ebd975de28e75e + guid: e7ed434167862364f5a23655ff520ce1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta b/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta index 8ddb246e..8699c217 100644 --- a/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta +++ b/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8177fd1348aabb4c5d9079f0f156df14 +guid: 7423daee550013774b36bab643552572 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 3c38502d..09dd5624 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: 9db9bb2df86ac5c29d359716fc1d6e3e + guid: df626b5e3860f38909196faf5753bcf4 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 c46ad2ed..1b57d148 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: 041b665f96829645ec8a686b431ce968 + guid: ce9810f1af3c0ab29d674fd423ef77c6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/open-data.js b/Runtime/wechat-default/unity-sdk/open-data.js index 7e366061..f5e16425 100644 --- a/Runtime/wechat-default/unity-sdk/open-data.js +++ b/Runtime/wechat-default/unity-sdk/open-data.js @@ -12,6 +12,7 @@ var SharedCanvasMode; })(SharedCanvasMode || (SharedCanvasMode = {})); let sharedCanvasMode; let timerId; +let textureObject = null; let textureId; function getOpenDataContext(mode) { @@ -50,25 +51,34 @@ function hookUnityRender() { if (!textureId) { return; } - const Module = GameGlobal.manager.gameInstance.Module; - const { GL } = Module; + const { GL } = GameGlobal.manager.gameInstance.Module; const gl = GL.currentContext.GLctx; - 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, GL.textures[textureId]); - if (isLinearColorSpace) { + 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()); } - timerId = requestAnimationFrame(hookUnityRender); + 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); } + else { + + 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.textures[textureId] = textureObject; + timerId = requestAnimationFrame(hookUnityRender); } function stopLastRenderLoop() { @@ -88,13 +98,10 @@ function stopHookUnityRender() { sharedCanvas.width = 1; sharedCanvas.height = 1; - const Module = GameGlobal.manager.gameInstance.Module; - const { GL } = Module; + const { GL } = GameGlobal.manager.gameInstance.Module; const gl = GL.currentContext.GLctx; - - if (gl.emscriptenGLX) { - Module.ccall('glxHideOpenData', null, [], []); - } + gl.deleteTexture(textureObject); + textureObject = 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 d749fab1..cff6ebd0 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: 7b93504e5994ae1d2fbb482d45709842 + guid: f43f48fe6fd650541b503fb3aadfba4f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/recorder.js.meta b/Runtime/wechat-default/unity-sdk/recorder.js.meta index 5dc83de2..50caa1d8 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: 34708f52356d692e56d935b1672de4c6 + guid: 80a1446c271bf9af1fccfe66e81bd76c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resType.js.meta b/Runtime/wechat-default/unity-sdk/resType.js.meta index dcaffb0e..ea22f643 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: 7feafdc0f918526980eb64b07b523ac4 + guid: 99676aa973379ac3b6bd4e6afe4a9628 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta index 967c1f31..8f4e1913 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: 1ad5d8d39841c183f9cc2e2acdc731cb + guid: e38887787afdaf34740ebf7eb4e10d92 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/response.js.meta b/Runtime/wechat-default/unity-sdk/response.js.meta index 4255e2cd..a3b9ea16 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: 63cc7647c1df87351c26777e692201db + guid: a6c97b8bd43d787d66c8223b89938061 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/sdk.js.meta b/Runtime/wechat-default/unity-sdk/sdk.js.meta index 268378fb..b0f19724 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: a997c4d5b62c857c55266d4eff8288b7 + guid: 3f10e915c0780693cf84269363ca01f6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/share.js.meta b/Runtime/wechat-default/unity-sdk/share.js.meta index 598a379d..4a82a318 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: cd2f870cc3e313c0443e4953bc63f38e + guid: 7473e7dfe0cc456795d49663a514172f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/storage.js.meta b/Runtime/wechat-default/unity-sdk/storage.js.meta index fd71c01f..7444fa80 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: 4de71e2ccf12aea2b075507c1fc3a72e + guid: dab1d5c9f83bf793acc8198eb0b61b23 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/texture.js.meta b/Runtime/wechat-default/unity-sdk/texture.js.meta index fe98766d..611cd3a6 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: 4c3b0edec17cbc9bbcc758dce0aad149 + guid: 1a02d5ab9f3c50425dfc3f0767e8a0ff DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/touch.meta b/Runtime/wechat-default/unity-sdk/touch.meta index 96fedf3a..3da5800f 100644 --- a/Runtime/wechat-default/unity-sdk/touch.meta +++ b/Runtime/wechat-default/unity-sdk/touch.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 130dc167b94f60e4c2a835e69932633e +guid: b0ec220040ee6cc7d4766af6c9121402 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 a71e0097..5d8a525e 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: b03c72a7349c22342f996078db814de4 + guid: c6a04846b6831daad81e59ddcb131824 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 9dbd1d8d..39224ada 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: a94b3f03ff6d7ef82e600966545f3e36 + guid: a47a9401c34aa7d6628c72f91d14d28a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/userinfo.js.meta b/Runtime/wechat-default/unity-sdk/userinfo.js.meta index 2c03080c..9986f141 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: b1e97d5372e7afdb2b578b679e2adf3d + guid: e5ed13bb16b84bd9a4ecdab03308827f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/util.js b/Runtime/wechat-default/unity-sdk/util.js index ce3058ba..3108ab05 100644 --- a/Runtime/wechat-default/unity-sdk/util.js +++ b/Runtime/wechat-default/unity-sdk/util.js @@ -174,9 +174,4 @@ 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 a4374cf4..62101590 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: 8dbaeb65221f001e698e24741c4c15b4 + guid: 931fec5eebae787172c4b5686e4df0c0 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/utils.js.meta b/Runtime/wechat-default/unity-sdk/utils.js.meta index dada1cae..77d4f2e3 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: d1deb86f2cf373c715d2629460ae5d68 + guid: 6b21019bddb8bbdf7bcb54806e649dfc DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.js b/Runtime/wechat-default/unity-sdk/video.js index 53706d8c..e81be2bb 100644 --- a/Runtime/wechat-default/unity-sdk/video.js +++ b/Runtime/wechat-default/unity-sdk/video.js @@ -18,27 +18,32 @@ export default { if (!obj) { return; } - if (key === 'x' || key === 'y' || key === 'width' || key === 'height' || key === 'initialTime' || key === 'playbackRate') { + if (key === 'x' || key === 'y' || key === 'width' || key === 'height') { obj[key] = +value; } - else if (key === 'src' || key === 'poster' || key === 'objectFit' || key === 'backgroundColor') { + else if (key === 'src' || key === 'poster') { obj[key] = value; } - 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'; + }, + WXVideoPlay(id) { + const obj = getObject(id); + if (!obj) { + return; } + obj.play(); }, WXVideoAddListener(id, key) { - getObject(id)?.[key]((e) => { + const obj = getObject(id); + if (!obj) { + return; + } + obj[key]((e) => { moduleHelper.send('OnVideoCallback', JSON.stringify({ callbackId: id, - type: key, - position: e?.position, - buffered: e?.buffered ? Number(e.buffered) : undefined, - duration: e?.duration, - errMsg: e?.errMsg, + errMsg: key, + position: e && e.position, + buffered: e && e.buffered, + duration: e && e.duration, })); if (key === 'onError') { GameGlobal.enableTransparentCanvas = false; @@ -46,31 +51,54 @@ export default { } }); }, - WXVideoRemoveListener(id, key) { - getObject(id)?.[key](); - }, - WXVideoDestroy(id, isLast) { - getObject(id)?.destroy(); - if (isLast) { - GameGlobal.enableTransparentCanvas = false; + WXVideoDestroy(id) { + const obj = getObject(id); + if (!obj) { + return; } - }, - WXVideoPlay(id) { - getObject(id)?.play(); - }, - WXVideoPause(id) { - getObject(id)?.pause(); - }, - WXVideoStop(id) { - getObject(id)?.stop(); - }, - WXVideoSeek(id, time) { - getObject(id)?.seek(time); - }, - WXVideoRequestFullScreen(id, direction) { - getObject(id)?.requestFullScreen(direction); + obj.destroy(); + GameGlobal.enableTransparentCanvas = false; }, WXVideoExitFullScreen(id) { - getObject(id)?.exitFullScreen(); + const obj = getObject(id); + if (!obj) { + return; + } + obj.exitFullScreen(); + }, + 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); + }, + WXVideoStop(id) { + const obj = getObject(id); + if (!obj) { + return; + } + obj.stop(); + }, + WXVideoRemoveListener(id, key) { + const obj = getObject(id); + if (!obj) { + return; + } + obj[key](); }, }; diff --git a/Runtime/wechat-default/unity-sdk/video.js.meta b/Runtime/wechat-default/unity-sdk/video.js.meta index 382c3d8f..36cfc107 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: f220d592314cf1e029070db28c889ad9 + guid: 450952544f1f150857c3b7288f4aef80 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.meta b/Runtime/wechat-default/unity-sdk/video.meta index bc6032aa..f143e6c8 100644 --- a/Runtime/wechat-default/unity-sdk/video.meta +++ b/Runtime/wechat-default/unity-sdk/video.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a673f349f7b17599c28bd8d5f1f350cb +guid: c5773a6e5d62cfa6a2889f7e3406493d 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 53a12d87..70041d90 100644 --- a/Runtime/wechat-default/unity-sdk/video/index.js +++ b/Runtime/wechat-default/unity-sdk/video/index.js @@ -7,43 +7,8 @@ let FrameworkData = null; const isWebVideo = (isH5Renderer && !GameGlobal.isIOSHighPerformanceModePlus) || isPc || isDevtools; const needCache = true; const cacheVideoDecoder = []; -let supportVideoFrame = !!GameGlobal.isIOSHighPerformanceModePlus; +const 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) { @@ -75,12 +40,6 @@ 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); @@ -153,7 +112,7 @@ function _JS_Video_Create(url) { // @ts-ignore videoInstance.currentTime = res.pts / 1000; - if (supportVideoFrame || GameGlobal.mtl) { + if (supportVideoFrame) { videoInstance.frameData?.close?.(); } @@ -215,19 +174,6 @@ 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) { @@ -432,45 +378,7 @@ 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 6a6d7dd2..453cc0e0 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: 2e0e72e09829b5128b499d810699171e + guid: f8458172697be11b9cfc8f13ef8b17b2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/wasmcode.meta b/Runtime/wechat-default/wasmcode.meta index 209f948b..a8190f82 100644 --- a/Runtime/wechat-default/wasmcode.meta +++ b/Runtime/wechat-default/wasmcode.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d690797d377c01cf3ab37c4128e74d00 +guid: a4bfae3c5df9608b390f0f300ddaa87e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/wasmcode/game.js.meta b/Runtime/wechat-default/wasmcode/game.js.meta index a46dfc0c..d73feb33 100644 --- a/Runtime/wechat-default/wasmcode/game.js.meta +++ b/Runtime/wechat-default/wasmcode/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 465ddd4956d95b9e7991851842a934f6 + guid: 3c4111d30b8db667b552f527c7e424aa DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/weapp-adapter.js.meta b/Runtime/wechat-default/weapp-adapter.js.meta index f24a681f..89410da3 100644 --- a/Runtime/wechat-default/weapp-adapter.js.meta +++ b/Runtime/wechat-default/weapp-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 595c4ad6ff77a1dee7be2c409a0ff560 + guid: 9fca9b7e06c30b1ad12e622c42d01be3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/workers.meta b/Runtime/wechat-default/workers.meta index aa52b6ca..f3098e9e 100644 --- a/Runtime/wechat-default/workers.meta +++ b/Runtime/wechat-default/workers.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8f63e251b87f9dd962941b92311a1570 +guid: d9536c2245730ec80b308b594498cf2c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/workers/response.meta b/Runtime/wechat-default/workers/response.meta index 745f35d8..8609ab72 100644 --- a/Runtime/wechat-default/workers/response.meta +++ b/Runtime/wechat-default/workers/response.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8962660f0627ff90db2da77d48ede6a7 +guid: 1a8c41778b567ce6b606dd652c584040 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 bfc0e07b..3c63470f 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: 77e298f491dd8a95951a0718d6b2451b + guid: 9e6f84cdadf86316adcabccdc70d0ce1 DefaultImporter: externalObjects: {} userData: diff --git a/package.json b/package.json index 66abb38f..650163cc 100644 --- a/package.json +++ b/package.json @@ -1 +1,14 @@ -{"name":"com.qq.weixin.minigame","displayName":"WXSDK","description":"WeChat Mini Game Tuanjie Engine Adapter SDK Package.","version":"0.1.1","unity":"2019.4","unityRelease":"29f1","keywords":["Tuanjie","WX"],"dependencies":{}} +{ + "name": "com.qq.weixin.minigame", + "displayName": "WXSDK", + "description": "WeChat Mini Game Tuanjie Engine Adapter SDK Package.", + "version": "0.1.1", + "unity": "2019.4", + "unityRelease": "29f1", + "keywords": [ + "Tuanjie", + "WX" + ], + "dependencies": { + } +} \ No newline at end of file