diff --git a/CHANGELOG.md b/CHANGELOG.md index 98d33dbb..21a31478 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,6 @@ Removed - 删除功能/接口 Fixed - 修复问题 Others - 其他 --> -## v0.1.26 【普通更新】 -### Feature -* 普通:增加禁止多点触控的配置 -### Fixed -* 普通:修复IOS长音频获取数据延迟的bug -* 普通:性能分析工具,修复callstack中的堆栈悬空丢失的问题 - ## v0.1.25 【普通更新】 ### Feature * 普通:性能深入分析工具,支持Lua capture能力 diff --git a/Editor/WXConvertCore.cs b/Editor/WXConvertCore.cs index 9318ad12..71234b90 100644 --- a/Editor/WXConvertCore.cs +++ b/Editor/WXConvertCore.cs @@ -93,6 +93,14 @@ namespace WeChatWASM #endif } } + // 用于replaceRules判断是否需要注入相关的修改 + public static bool UseNativeCommandbuffer + { + get + { + return config.CompileOptions.enableIOSNativeCommandbuffer; + } + } // 可以调用这个来集成 public static WXExportError DoExport(bool buildWebGL = true) { @@ -118,6 +126,7 @@ namespace WeChatWASM CheckBuildTarget(); Init(); ProcessWxPerfBinaries(); + ProcessWxNativeCommandbufferBinaries(); MakeEnvForLuaAdaptor(); // JSLib SettingWXTextureMinJSLib(); @@ -331,6 +340,39 @@ namespace WeChatWASM AssetDatabase.Refresh(); } + private static void ProcessWxNativeCommandbufferBinaries() + { + 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}libnative_command_buffer.a", + }; + } + else + { + string glLibRootDir = $"Assets{DS}WX-WASM-SDK-V2{DS}Runtime{DS}Plugins{DS}"; + glLibs = new string[] + { + $"{glLibRootDir}libnative_command_buffer.a", + }; + } + for (int i = 0; i < glLibs.Length; i++) + { + var importer = AssetImporter.GetAtPath(glLibs[i]) as PluginImporter; + #if PLATFORM_WEIXINMINIGAME + importer.SetCompatibleWithPlatform(BuildTarget.WeixinMiniGame, config.CompileOptions.enableIOSNativeCommandbuffer); + #else + importer.SetCompatibleWithPlatform(BuildTarget.WebGL, config.CompileOptions.enableIOSNativeCommandbuffer); + #endif + // importer.SaveAndReimport(); + SetPluginCompatibilityByModifyingMetadataFile(glLibs[i], config.CompileOptions.enableIOSNativeCommandbuffer); + } + AssetDatabase.Refresh(); + } + /** * Lua Adaptor Settings. */ @@ -801,7 +843,8 @@ namespace WeChatWASM PlayerSettings.WeixinMiniGame.emscriptenArgs = string.Empty; if (WXExtEnvDef.GETDEF("UNITY_2021_2_OR_NEWER")) { - PlayerSettings.WeixinMiniGame.emscriptenArgs += " -s EXPORTED_FUNCTIONS=_main,_sbrk,_emscripten_stack_get_base,_emscripten_stack_get_end -s ERROR_ON_UNDEFINED_SYMBOLS=0"; + // PlayerSettings.WeixinMiniGame.emscriptenArgs += " -s EXPORTED_FUNCTIONS=_main,_sbrk,_emscripten_stack_get_base,_emscripten_stack_get_end"; + PlayerSettings.WeixinMiniGame.emscriptenArgs += " -s EXPORTED_FUNCTIONS=_sbrk,_emscripten_stack_get_base,_emscripten_stack_get_end -s ERROR_ON_UNDEFINED_SYMBOLS=0"; } #else @@ -1908,7 +1951,6 @@ namespace WeChatWASM config.CompileOptions.DevelopBuild ? "true" : "false", config.CompileOptions.enablePerfAnalysis ? "true" : "false", config.ProjectConf.MemorySize.ToString(), - config.SDKOptions.disableMultiTouch ? "true" : "false", }); List replaceList = new List(replaceArrayList); diff --git a/Editor/WXEditorSettingHelper.cs b/Editor/WXEditorSettingHelper.cs index 87c5f2eb..d302c5ef 100644 --- a/Editor/WXEditorSettingHelper.cs +++ b/Editor/WXEditorSettingHelper.cs @@ -170,7 +170,6 @@ namespace WeChatWASM this.formCheckbox("useFriendRelation", "使用好友关系链"); this.formCheckbox("useMiniGameChat", "使用社交组件"); this.formCheckbox("preloadWXFont", "预加载微信字体(?)", "在game.js执行开始时预载微信系统字体,运行期间可使用WX.GetWXFont获取微信字体"); - this.formCheckbox("disableMultiTouch", "禁用多点触控"); EditorGUILayout.EndVertical(); } @@ -189,6 +188,7 @@ namespace WeChatWASM this.formCheckbox("profilingMemory", "Profiling Memory"); this.formCheckbox("webgl2", "WebGL2.0(beta)"); this.formCheckbox("iOSPerformancePlus", "iOSPerformancePlus(?)", "是否使用iOS高性能+渲染方案,有助于提升渲染兼容性、降低WebContent进程内存"); + this.formCheckbox("iOSNativeCommandbuffer", "iOSNativeCmdbuffer(?)", "是否使用iOS高性能+ NativeCommandbuffer渲染方案"); this.formCheckbox("deleteStreamingAssets", "Clear Streaming Assets"); this.formCheckbox("cleanBuild", "Clean WebGL Build"); // this.formCheckbox("cleanCloudDev", "Clean Cloud Dev"); @@ -452,11 +452,11 @@ namespace WeChatWASM this.setData("customNodePath", config.CompileOptions.CustomNodePath); this.setData("webgl2", config.CompileOptions.Webgl2); this.setData("iOSPerformancePlus", config.CompileOptions.enableIOSPerformancePlus); + this.setData("iOSNativeCommandbuffer", config.CompileOptions.enableIOSNativeCommandbuffer); this.setData("fbslim", config.CompileOptions.fbslim); this.setData("useFriendRelation", config.SDKOptions.UseFriendRelation); this.setData("useMiniGameChat", config.SDKOptions.UseMiniGameChat); this.setData("preloadWXFont", config.SDKOptions.PreloadWXFont); - this.setData("disableMultiTouch", config.SDKOptions.disableMultiTouch); this.setData("bgImageSrc", config.ProjectConf.bgImageSrc); tex = AssetDatabase.LoadAssetAtPath(config.ProjectConf.bgImageSrc); this.setData("memorySize", config.ProjectConf.MemorySize.ToString()); @@ -530,11 +530,11 @@ namespace WeChatWASM config.CompileOptions.CustomNodePath = this.getDataInput("customNodePath"); config.CompileOptions.Webgl2 = this.getDataCheckbox("webgl2"); config.CompileOptions.enableIOSPerformancePlus = this.getDataCheckbox("iOSPerformancePlus"); + config.CompileOptions.enableIOSNativeCommandbuffer = this.getDataCheckbox("iOSNativeCommandbuffer"); config.CompileOptions.fbslim = this.getDataCheckbox("fbslim"); config.SDKOptions.UseFriendRelation = this.getDataCheckbox("useFriendRelation"); config.SDKOptions.UseMiniGameChat = this.getDataCheckbox("useMiniGameChat"); config.SDKOptions.PreloadWXFont = this.getDataCheckbox("preloadWXFont"); - config.SDKOptions.disableMultiTouch = this.getDataCheckbox("disableMultiTouch"); config.ProjectConf.bgImageSrc = this.getDataInput("bgImageSrc"); config.ProjectConf.MemorySize = int.Parse(this.getDataInput("memorySize")); config.ProjectConf.HideAfterCallMain = this.getDataCheckbox("hideAfterCallMain"); diff --git a/Editor/WXExtDef.cs b/Editor/WXExtDef.cs index 3763d7e7..6e18bc18 100644 --- a/Editor/WXExtDef.cs +++ b/Editor/WXExtDef.cs @@ -125,6 +125,10 @@ namespace WeChatWASM { return WXConvertCore.UseIL2CPP; }); + WXExtEnvDef.RegisterAction("WXConvertCore.UseNativeCommandbuffer", (args) => + { + return WXConvertCore.UseNativeCommandbuffer; + }); WXExtEnvDef.RegisterAction("UnityUtil.GetWxSDKRootPath", (args) => { #if UNITY_2018 diff --git a/Editor/WXPluginVersion.cs b/Editor/WXPluginVersion.cs index 7942432c..80c1ee05 100644 --- a/Editor/WXPluginVersion.cs +++ b/Editor/WXPluginVersion.cs @@ -2,7 +2,7 @@ namespace WeChatWASM { public class WXPluginVersion { - public static string pluginVersion = "202505120809"; // 这一行不要改他,导出的时候会自动替换 + public static string pluginVersion = "202506100940"; // 这一行不要改他,导出的时候会自动替换 } public class WXPluginConf diff --git a/Editor/wx-editor.dll b/Editor/wx-editor.dll index 45980b0c..ec4d3463 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 331e7064..0b7762b3 100644 --- a/Editor/wx-editor.xml +++ b/Editor/wx-editor.xml @@ -543,11 +543,6 @@ 预载系统字体 - - - 是否禁止多点触控 - - Development Build @@ -638,6 +633,11 @@ 是否使用iOS高性能Plus + + + 是否使用iOS高性能Plus NativeCommandbuffer + + 是否使用brotli多线程压缩 diff --git a/Editor/wx-editor.xml.meta b/Editor/wx-editor.xml.meta index 7e92f91c..c5bb2855 100644 --- a/Editor/wx-editor.xml.meta +++ b/Editor/wx-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 69a894eefcf7a97830ad465e4668424b +guid: a876093c0845eafc71827b33f04c10aa DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/libnative_command_buffer.a b/Runtime/Plugins/libnative_command_buffer.a new file mode 100644 index 00000000..f2d75f6e Binary files /dev/null and b/Runtime/Plugins/libnative_command_buffer.a differ diff --git a/Runtime/Plugins/libnative_command_buffer.a.meta b/Runtime/Plugins/libnative_command_buffer.a.meta new file mode 100644 index 00000000..e1b55626 --- /dev/null +++ b/Runtime/Plugins/libnative_command_buffer.a.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: cccbd1d680cfe34fa1fef9e4875e5f06 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 0 + Exclude Linux64: 0 + Exclude OSXUniversal: 0 + Exclude WebGL: 0 + Exclude Win: 0 + Exclude Win64: 0 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + WebGL: WebGL + second: + enabled: 1 + settings: {} + - first: + WeixinMiniGame: WeixinMiniGame + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Plugins/wx-perf.dll b/Runtime/Plugins/wx-perf.dll index 2718ec07..254078c0 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 1b230561..e03b306f 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.meta b/Runtime/Plugins/wx-runtime-editor.xml.meta index 17f02338..6100531e 100644 --- a/Runtime/Plugins/wx-runtime-editor.xml.meta +++ b/Runtime/Plugins/wx-runtime-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e804d8e7fcbdd8120297b31d43cba494 +guid: 542d2fb9b76a6e9d28738228a8c4ac1f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/wx-runtime.dll b/Runtime/Plugins/wx-runtime.dll index d2803238..d99d19ad 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.meta b/Runtime/Plugins/wx-runtime.xml.meta index ee7e9dbf..e960a656 100644 --- a/Runtime/Plugins/wx-runtime.xml.meta +++ b/Runtime/Plugins/wx-runtime.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f1ac621062d513597aaf96b982e6d32a +guid: 3820097fcb1ba91d84e70e7230c30822 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/wx_perf_2021.a b/Runtime/Plugins/wx_perf_2021.a index 2748bc3a..f510a4a5 100644 Binary files a/Runtime/Plugins/wx_perf_2021.a and b/Runtime/Plugins/wx_perf_2021.a differ diff --git a/Runtime/Plugins/wx_perf_2022.a b/Runtime/Plugins/wx_perf_2022.a index e0a76f1a..d696ed5e 100644 Binary files a/Runtime/Plugins/wx_perf_2022.a and b/Runtime/Plugins/wx_perf_2022.a differ diff --git a/Runtime/WXSDKPerf/WXPerfEngine.cs b/Runtime/WXSDKPerf/WXPerfEngine.cs index 88cdd158..00552b35 100644 --- a/Runtime/WXSDKPerf/WXPerfEngine.cs +++ b/Runtime/WXSDKPerf/WXPerfEngine.cs @@ -47,12 +47,6 @@ namespace WXSDKPerf #if UNITY_EDITOR return; #else - // Don't record annotation if we are not recording. - if (!IsRecording()) - { - return; - } - if (m_PerfEngineImplementation == null) { UnityEngine.Debug.LogError("Annotation: Invalid m_PerfEngineImplementation! "); diff --git a/Runtime/wechat-default/check-version.js.meta b/Runtime/wechat-default/check-version.js.meta index 600cebc5..9aa4a08f 100644 --- a/Runtime/wechat-default/check-version.js.meta +++ b/Runtime/wechat-default/check-version.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cc37c7d5506b085a6df346222b3ab6a5 +guid: 1cd547aa3fc25393740296f4789dcda6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/data-package/game.js.meta b/Runtime/wechat-default/data-package/game.js.meta index 4f9ddcad..c14d9c6e 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: 0c6505cc99fc839915faa622b6cccaff +guid: badbb090376d9677f6c137f3e7ee688c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/events.js.meta b/Runtime/wechat-default/events.js.meta index 5e32939c..5f5bf285 100644 --- a/Runtime/wechat-default/events.js.meta +++ b/Runtime/wechat-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d581d1e0029e9c614b8f8f213920d0f +guid: a4ea938685f7ac2a6e1c48908ef79694 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.js.meta b/Runtime/wechat-default/game.js.meta index 0a5cae27..04722e38 100644 --- a/Runtime/wechat-default/game.js.meta +++ b/Runtime/wechat-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5b031ecc782f78cea8e6989d68732cb3 +guid: 6278072d3ac9cc1e8732023434d8837d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.json.meta b/Runtime/wechat-default/game.json.meta index 2952d8ca..91e3dc1c 100644 --- a/Runtime/wechat-default/game.json.meta +++ b/Runtime/wechat-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dfb0e4876224d2c4895c8b6ffc41692a +guid: 4b6f86fd26657c276cc63a310cd8e5ae DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/background.jpg.meta b/Runtime/wechat-default/images/background.jpg.meta index 43fe4d78..e9b1d13e 100644 --- a/Runtime/wechat-default/images/background.jpg.meta +++ b/Runtime/wechat-default/images/background.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4e7005d801d03c8f40b7d03fef28dd0d +guid: 99c07dc175f036fe6c02d4338e4730c6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/unity_logo.png.meta b/Runtime/wechat-default/images/unity_logo.png.meta index 02eaa972..4d85c04b 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: 4aa5e2d6d65e5f123b7024edea08d90e +guid: 0c0785f490303b6bcf823f5584f82c11 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/data/index.js.meta b/Runtime/wechat-default/open-data/data/index.js.meta index 532ac269..123cb5d8 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: a57a7e708b31462e3e96e159b74d9ece +guid: b3246569c26dfbcad41f509c1649e2bb 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 077aaec8..e296c855 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: 9bd4067b4928849450aa2497d81c8309 +guid: c9c250b67952937bc72bd5ef6b2a1a73 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/index.js.meta b/Runtime/wechat-default/open-data/index.js.meta index 3674e74a..acef0f6c 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: 7d5ede0f5069e1216243d748a6194706 +guid: c414a3220a34c729d5a9b6543246da9c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/loading.js.meta b/Runtime/wechat-default/open-data/loading.js.meta index 5f6bf52d..b8a5f1de 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: 947ff46b2e5c42f09121ffa5d91a4e2e +guid: c4c71fb31580367ab6a442b3bf87cf37 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/avatar.png.meta b/Runtime/wechat-default/open-data/render/image/avatar.png.meta index adead47a..cda39bd7 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: 4c4cbd2db17f742dbf2e9906c198ee66 +guid: c78e238d9d17d1dce7747a737406a63b 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 21ac2a63..94e587bd 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: fffb1884d435f35f2fc4afb0dfa10f2e +guid: 83ea27abf6935850933a9c86b39031a1 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 5cbb54a1..5338a6f2 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: 670428b454eee42aa1a2342bbf5de8ba +guid: a91536024bd61a31c3265241b9bc40a4 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 b45ea5d1..7a3353d7 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: 8f7498abde47adda094eb2386319c3dd +guid: 2252d09fbfc761f49facfa6ec9dc712d 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 93f35273..0b3e83db 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: 51a96b62dcb0e4c4b43c9954055a70e2 +guid: 56fb129a0e863a83b453e6c74cd45295 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 eaa4c1fb..6934f74d 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: 8e8892d2d973cb9ebefed399f94de3cb +guid: c498469cc53f885d8169a4a671506ffa 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 70ab2f29..5635d9a3 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: 2663cd8a6c36cde9bb045fe559937b69 +guid: 3d1e0621b5b9e6e6a52592cb17d1754b 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 9963bc7b..514d6342 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: 73d0c8e298e9d108b405aa58b57c1412 +guid: d264c75ee57e832ff1b5400cb33a552e 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 963cc0ec..055596e4 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: 0095cb4357181a5ad837e15f71abd3c5 +guid: f3ca68f8f3ee6d1c6539a99ed4ded2f9 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 6100d7d3..f2a42051 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: b7786cc94403abb4c77ca7d320d69ffd +guid: 35e7aecea1aef41185367d57bd6cb274 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/styles/friendRank.js.meta b/Runtime/wechat-default/open-data/render/styles/friendRank.js.meta index cd68728d..177b12bf 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: 7752ac82de1afe56f9ad8c3f0f2054a1 +guid: fa0c49df60ca52b00838da75d63faafa 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 f894ffa0..08a26c0d 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: accd3b9008ae1243954474f19fbdfaf4 +guid: 69b8023bc31a71d1be0663a60767f6af DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/tpls/friendRank.js.meta b/Runtime/wechat-default/open-data/render/tpls/friendRank.js.meta index 87c2c156..2e81dc31 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: be375a525905238eb889806efaf8f39e +guid: 9463da33c11f5fd0d0b07563ce60e38f 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 9269099e..cffa7b04 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: b4a1ea7f75bb16d4ccd1552249c4d1df +guid: 57d7be555fec49db04e92202f7c7fa1f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugin-config.js.meta b/Runtime/wechat-default/plugin-config.js.meta index 7c6666fd..5be54093 100644 --- a/Runtime/wechat-default/plugin-config.js.meta +++ b/Runtime/wechat-default/plugin-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0907eeaa24ac1ec755f57f396f70169f +guid: dacfa1cb7df1655e22b000270cf60ad5 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/check-update.js.meta b/Runtime/wechat-default/plugins/check-update.js.meta index b8b8c21d..f28dd32e 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: 2a0badeb444f3c1d1182f14b64fe3d96 +guid: 8e530a81b0616df2a27e9c45560fa1a7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/screen-adapter.js.meta b/Runtime/wechat-default/plugins/screen-adapter.js.meta index 98acc79a..78b4f3bd 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: ba2d38ed253ad969c2e04e6c71aef526 +guid: bb55e7afd4243d91f4921775568716ef DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/project.config.json.meta b/Runtime/wechat-default/project.config.json.meta index aa85f9e4..4527b0a7 100644 --- a/Runtime/wechat-default/project.config.json.meta +++ b/Runtime/wechat-default/project.config.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 097d9da849631cad4a9289161caa8d8a +guid: befcc06e70991625735b52b418c86821 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/texture-config.js.meta b/Runtime/wechat-default/texture-config.js.meta index dd7925d8..ac98a3a5 100644 --- a/Runtime/wechat-default/texture-config.js.meta +++ b/Runtime/wechat-default/texture-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d8a04157a342f8f9bfb5b048cad64bae +guid: a6064cf540efbe0e9d49602a89a60127 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-namespace.js b/Runtime/wechat-default/unity-namespace.js index 30f8347b..f0db4907 100644 --- a/Runtime/wechat-default/unity-namespace.js +++ b/Runtime/wechat-default/unity-namespace.js @@ -113,7 +113,6 @@ GameGlobal.WebAssembly = GameGlobal.WXWebAssembly; GameGlobal.unityNamespace = GameGlobal.unityNamespace || unityNamespace; GameGlobal.realtimeLogManager = wx.getRealtimeLogManager(); GameGlobal.logmanager = wx.getLogManager({ level: 0 }); -GameGlobal.disableMultiTouch = $DISABLE_MULTI_TOUCH; // 提前监听错误并打日志 function bindGloblException() { // 默认上报小游戏实时日志与用户反馈日志(所有error日志+小程序框架异常) diff --git a/Runtime/wechat-default/unity-namespace.js.meta b/Runtime/wechat-default/unity-namespace.js.meta index 938bcd3d..1dd0e0cd 100644 --- a/Runtime/wechat-default/unity-namespace.js.meta +++ b/Runtime/wechat-default/unity-namespace.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: da06eb2c03b61487943fec9ab1b2eae7 +guid: b10311d39ea505b329a95ef720b33745 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta index 9aac17b5..f93ee084 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: 8ca80df7e7218f6fe39668ca89007cbb +guid: bdcfe72fad60da940ca7ae9df74e5071 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta b/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta index 64869759..515d5fd3 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: 71119a04b5075e9e086cb4d695cb5ebb +guid: 111d697e399650a9ee59087e70c05f22 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/ad.js.meta b/Runtime/wechat-default/unity-sdk/ad.js.meta index 40006278..d77189a9 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: a79b9b59ad70bb85fbb1627c98157b26 +guid: 12760babd4bf4666a986e1699420e6f0 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/common.js.meta b/Runtime/wechat-default/unity-sdk/audio/common.js.meta index 61950e87..425154ae 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: b766e2632c2efe53229999ec68fa3bf2 +guid: a16b41206d0aa087b018c9950d29fec9 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 3a0cbfb3..ab3a2192 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: 17390c8131f551bba6610e44abf3036c +guid: 807eeee18151d886bdff8c22e02a5bf5 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 d550190f..62a1661c 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: 1dda419766006d67219138804be03d41 +guid: 20cee3b06b77faa188f01a3958d523ac 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 4b727a01..8f96a74e 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: cb3eeaad97016020e38bc9f36ad197b1 +guid: 2d8f76d446e23e799d66def426657767 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 935df511..609dfbb5 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: 6cd819420d3390c5cb16fa7f95b67946 +guid: efc2272b06b1c4e6504ee71d7ec8a3d3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/unity-audio.js b/Runtime/wechat-default/unity-sdk/audio/unity-audio.js index 15227940..11231497 100644 --- a/Runtime/wechat-default/unity-sdk/audio/unity-audio.js +++ b/Runtime/wechat-default/unity-sdk/audio/unity-audio.js @@ -9,7 +9,7 @@ import { debugLog } from '../utils'; const defaultSoundLength = 441000; -const needGetLength = true; +const needGetLength = false; function jsAudioCreateUncompressedSoundClip(buffer, error, length) { const soundClip = { buffer, @@ -70,25 +70,6 @@ function jsAudioCreateUncompressedSoundClipFromCompressedAudio(audioData, ptr, l }); return soundClip; } -function getSoundLength(getAudio, retryCount = 3) { - return new Promise((resolve, reject) => { - const { duration } = getAudio; - if (duration > 0) { - resolve(duration); - } - else { - if (retryCount > 0) { - - setTimeout(() => { - resolve(getSoundLength(getAudio, retryCount - 1)); - }, 100); - } - else { - reject('getAudio.duration is 0'); - } - } - }); -} function jsAudioCreateCompressedSoundClip(audioData, ptr, length) { const soundClip = { error: false, @@ -122,14 +103,12 @@ function jsAudioCreateCompressedSoundClip(audioData, ptr, length) { if (isSupportBufferURL) { const url = wx.createBufferURL(audioData); soundClip.url = url; - setSoundLength(); WEBAudio.audioBufferLength += length; } else { const tempFilePath = `${TEMP_DIR_PATH}/temp-audio${ptr + length}.mp3`; if (GameGlobal.manager.getCachePath(tempFilePath)) { soundClip.url = tempFilePath; - setSoundLength(); WEBAudio.audioBufferLength += length; } else { @@ -137,7 +116,6 @@ function jsAudioCreateCompressedSoundClip(audioData, ptr, length) { .writeFile(tempFilePath, audioData) .then(() => { soundClip.url = tempFilePath; - setSoundLength(); WEBAudio.audioBufferLength += length; }) .catch((res) => { @@ -146,24 +124,16 @@ function jsAudioCreateCompressedSoundClip(audioData, ptr, length) { }); } } - function setSoundLength() { - if (needGetLength && soundClip.url) { - const { audio: getAudio } = createInnerAudio(); - getAudio.src = soundClip.url; - getAudio.onCanplay(() => { - getSoundLength(getAudio).then((duration) => { - soundClip.length = duration * 44100; - getAudio.destroy(); - }) - .catch((e) => { - if (soundClip.length === 0) { - soundClip.error = true; - printErrMsg(e); - } - getAudio.destroy(); - }); - }); - } + if (needGetLength && soundClip.url) { + const { audio: getAudio } = createInnerAudio(); + getAudio.src = soundClip.url; + getAudio.onCanplay(() => { + soundClip.length = getAudio.duration * 44100; + setTimeout(() => { + soundClip.length = getAudio.duration * 44100; + getAudio.destroy(); + }, 0); + }); } return soundClip; } @@ -249,7 +219,6 @@ export class AudioChannelInstance { this.source.mediaElement.volume = 0; } this.source.mediaElement.onPlay(() => { - debugLog('this.source.mediaElement.onPlay'); if (typeof this.source !== 'undefined') { this.source.isPlaying = true; if (!this.source.loop && this.source.mediaElement) { @@ -271,7 +240,7 @@ export class AudioChannelInstance { } }); this.source.mediaElement.onPause(() => { - debugLog('this.source.mediaElement.onPause'); + debugLog('onPause'); if (typeof this.source !== 'undefined') { this.source.isPlaying = false; if (this.source.stopTicker) { @@ -281,7 +250,7 @@ export class AudioChannelInstance { } }); this.source.mediaElement.onStop(() => { - debugLog('this.source.mediaElement.onStop'); + debugLog('onStop'); if (typeof this.source !== 'undefined') { if (this.source.playAfterStop) { this.source._reset(); @@ -298,7 +267,7 @@ export class AudioChannelInstance { } }); this.source.mediaElement.onEnded(() => { - debugLog('this.source.mediaElement.onEnded'); + debugLog('onEnded'); if (typeof this.source !== 'undefined') { this.source._reset(); this.disconnectSource(); @@ -308,7 +277,7 @@ export class AudioChannelInstance { } }); this.source.mediaElement.onError((e) => { - debugLog('this.source.mediaElement.onError', e); + debugLog('onError', e); printErrMsg(e); const { errMsg } = e; @@ -322,17 +291,15 @@ export class AudioChannelInstance { } }); const fn = () => { - debugLog('this.source.mediaElement.onCanplay'); if (typeof this.source !== 'undefined' && this.source.mediaElement) { - getSoundLength(this.source.mediaElement).then((duration) => { - soundClip.length = duration * 44100; - }) - .catch((e) => { - if (soundClip.length === 0) { - soundClip.error = true; - printErrMsg(e); + // @ts-ignore + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const { duration } = this.source.mediaElement; + setTimeout(() => { + if (soundClip && this.source && this.source.mediaElement) { + soundClip.length = Math.round(Math.max(this.source.mediaElement.duration, 0) * 44100); } - }); + }, 0); } }; if (!this.source.canPlayFnList) { @@ -943,7 +910,7 @@ export default { if (isIOS175) { WEBAudio.audioContext?.close(); WEBAudio.audioContext = wx.createWebAudioContext(); - Object.values(WEBAudio.audioInstances).forEach((it) => it.resetGain()); + Object.values(WEBAudio.audioInstances).forEach(it => it.resetGain()); } else { WEBAudio.audioContext?.resume(); @@ -1159,7 +1126,6 @@ export default { if (WEBAudio.audioWebEnabled === 0) { return; } - debugLog('_JS_Sound_SetPaused', channelInstance, paused); const channel = WEBAudio.audioInstances[channelInstance]; if (!!paused !== channel.isPaused()) { if (paused) { diff --git a/Runtime/wechat-default/unity-sdk/audio/unity-audio.js.meta b/Runtime/wechat-default/unity-sdk/audio/unity-audio.js.meta index 64809bc9..d15bc96b 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: f65e6719bbf1a79f569dca5cf2299b96 +guid: 2a11c6d0a7d33567e82e7d4dc56c1782 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 aa64020b..e170014f 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: 83ea95246b4a34f6d49b449998b32fce +guid: 8883fed896dd6e52959bbef2bb468a08 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/authorize.js.meta b/Runtime/wechat-default/unity-sdk/authorize.js.meta index 0c710347..907550fe 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: ad3283f50a4d5e70b6747bb5019782de +guid: a34c1347b5176a48cd3795ce594215f7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta b/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta index b9074833..e64e3bd0 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: 3f52df6608057cf7aa6a93f2e9001ce7 +guid: 2c88c59f40c2d63022909bb1d971e297 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/camera.js.meta b/Runtime/wechat-default/unity-sdk/camera.js.meta index 882754f1..8e06e85f 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: dfc080ce256354f8366a0aeb42a48c2e +guid: 99f344dafd9294866aa2ec31240381f8 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 811434c0..26b06475 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: 70618cf437cdecdc8980e89319d8d3f3 +guid: 1423c95169f91cd6842c90d088994e74 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/canvas.js.meta b/Runtime/wechat-default/unity-sdk/canvas.js.meta index 714f599e..b0fb1bc9 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: 2037d28ebba16820374ba6a40c1858f2 +guid: 24cba1d6a9d8994f254ac56bfd93c643 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/chat.js.meta b/Runtime/wechat-default/unity-sdk/chat.js.meta index 50066800..2fd5d55c 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: e71b04341b5b2c08116e5227bde02ccf +guid: 2dbacaaa415fe0fa57a1812b25722eb5 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/cloud.js.meta b/Runtime/wechat-default/unity-sdk/cloud.js.meta index 842dbfb0..7f3d0919 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: e3f8770fd8cb23d485c84d63b2e4003b +guid: 84d0bcf060d7e2ef3fb9be3cb2a7d80f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/conf.js.meta b/Runtime/wechat-default/unity-sdk/conf.js.meta index 0f6dca6e..bd12c136 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: 7df6b4dbd22118920d9ecc1c616197b5 +guid: c90253a8f31ff537674df51d9b6a0d30 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 939ba903..c188af10 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: 524afce71a79938d4709341b761ffd48 +guid: e3b5bdcca1d6239c9dbd9deb6c3cf280 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fix.js.meta b/Runtime/wechat-default/unity-sdk/fix.js.meta index 1c8d2a0d..381c711d 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: 856fb3e2282d080313cbfe4e6b417f55 +guid: 25623d5bd38e8139ad6103adf4e1e99e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font/fix-cmap.js.meta b/Runtime/wechat-default/unity-sdk/font/fix-cmap.js.meta index 79d70b22..247d4d7f 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: 2a96d76916d429cf104cc2664a09c64a +guid: c8c7c72ee770f58144e21a596d9cc1e8 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 0f7824b8..4d138639 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: 468c0ce3be26ae784ca796db1838e8e3 +guid: 92547e564f87be9542466b6da4cd1b7d 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 483ad6cf..fca9945b 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: 28e9e0f00912938e462e65d369c09035 +guid: 36bdbb73fc7de0fe8cdf335bec3f1ab6 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 c2fa7242..e010bdd0 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: 1154c39f8d497da60511be50a37e7b71 +guid: 6e98d0153913520227e1b35b859bf73a 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 9481fb9e..3404e385 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: 44d2f50cec161b668c974f16ac9644c7 +guid: 46d05ab7e883d0d6394a223d493fcc2d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fs.js.meta b/Runtime/wechat-default/unity-sdk/fs.js.meta index 97682365..a91c3fd7 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: 67beeca9622d08e2cf4d06cde485dc0f +guid: 44f71d07a7107b13faea0cb48c568c22 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 7b5af917..f703dc64 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: cd03072d51b0a648a5d15248c75785a0 +guid: 4629075627fa4e6b3dd433dd697cc488 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 8b9cb332..d5edf6f2 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: 5a51257b8600a38caa3c96860a7b4c05 +guid: 7631e3853401b13434b43fd3054253cb DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta b/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta index d9d18c65..5b2d9cde 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: 2464224126d2b028947d6e2738541bea +guid: 5dc458142024c1249b147b34b35b11a3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/index.js.meta b/Runtime/wechat-default/unity-sdk/index.js.meta index 8aded24e..d369b19d 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: 6f098aa16fe8c501e48f3b522380df1e +guid: aa671bc7d092d0c425c469becedba629 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/logger.js.meta b/Runtime/wechat-default/unity-sdk/logger.js.meta index c4039001..b6c1d62b 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: 838e920a8b57e2bd06215103a7034da3 +guid: a8ee49fc987b629de4035a49e05ab8d7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta b/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta index a78c8adc..bf37c136 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: a03b4588b7f0a7348ee0d2e68ea7e6df +guid: 5d1c77147a596beaf4c8a27f73135397 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 d8dfa50d..15b66a64 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: 6b5dee70678180bde43519658d9e2b28 +guid: 1160f04ea652ecd72ad03e0223ed02da DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/open-data.js.meta b/Runtime/wechat-default/unity-sdk/open-data.js.meta index 1b0a424f..5e88e9fa 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: ad706d4d17566ba00ea38d26cdc3b44c +guid: ff3a75990e784bdfca7ae683390b7311 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/recorder.js.meta b/Runtime/wechat-default/unity-sdk/recorder.js.meta index bc685db4..75375376 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: dce75ff1b8a8e3d89c302bb0fa994d9a +guid: bf4f73b458ca757df419f55f516c58c5 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resType.js.meta b/Runtime/wechat-default/unity-sdk/resType.js.meta index a008bd3b..9ea6a7d5 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: 1581db04b681c7aa23df4e44fe1eaaf6 +guid: 8a7cadee6a96fac2464cfad4f23f913a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta index 6efc36c5..f1efd680 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: 15615a6b0d57713ea06ad37c4d7398d0 +guid: bede0c1349558660423b869b2c67be22 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/response.js.meta b/Runtime/wechat-default/unity-sdk/response.js.meta index aaf1cb1e..31c25d09 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: 02652adbf286694cca9ea76551ebe4e3 +guid: 6886c26403a99a3789b4ccbd17ae4524 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/sdk.js.meta b/Runtime/wechat-default/unity-sdk/sdk.js.meta index e2422f6b..bf41b6e4 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: a4efc86e69127646796b3ce94b26b7eb +guid: d3c5fdd1687f0f8f4e56b5a89511a0f1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/share.js.meta b/Runtime/wechat-default/unity-sdk/share.js.meta index 511083a9..8f758274 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: c0cb6d9b4a953b5a16a603e4af5090d0 +guid: 8c6d9db077a95ad7f7b83eb8ec5b953c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/storage.js.meta b/Runtime/wechat-default/unity-sdk/storage.js.meta index e4eeb558..eb011ba1 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: 1b7c62cf49cca4894002340e64adb8e6 +guid: aa1cf02b29cef5f760b3843d4602c1ac DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/texture.js.meta b/Runtime/wechat-default/unity-sdk/texture.js.meta index 5dc21a4d..49dbd513 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: 25701fdeb1d9aa5a997212b45e6be999 +guid: da795ee0a646df18b15671a470feab4f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/touch/index.js.meta b/Runtime/wechat-default/unity-sdk/touch/index.js.meta index f79820da..290ae8a7 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: 03fb4392690093e3c0356b1da1f23958 +guid: fc744aa33d5a5bcb796adc4ce8c7f1cd 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 0762a538..1ed19995 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: 52748a96f26147d47abec3e7f2ef1520 +guid: 0395de8fd688d9b2f8272f7c20f88316 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/userinfo.js.meta b/Runtime/wechat-default/unity-sdk/userinfo.js.meta index 15344b2c..7c3ff289 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: 9cd3314178f847ce8f0d76e38b5d3aa5 +guid: 364b09c1c7aaa75bb67921565676347e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/util.js.meta b/Runtime/wechat-default/unity-sdk/util.js.meta index aba24251..65df10b5 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: 84a01956240b13b423a61752cf01c282 +guid: f48369bff633ce6fc8960c10d091c7fc DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/utils.js.meta b/Runtime/wechat-default/unity-sdk/utils.js.meta index 59951a10..2adaf6aa 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: 70bae897c4d2a685ab3e5bc9489d6c67 +guid: bd772e2eee7723cdc1754387f4202de5 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.js.meta b/Runtime/wechat-default/unity-sdk/video.js.meta index b98e1588..20dd653a 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: 3fb8ae147eb8e81bbde1ca209f9c07d7 +guid: 9e8fc947f7e2bb960b8830be7d4a4d60 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video/index.js.meta b/Runtime/wechat-default/unity-sdk/video/index.js.meta index 6b4c4a17..2b8dc7d8 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: 638c95f4d2bf9fc508a5e543c7abff06 +guid: 567c18f188f7901d893524d36f53456b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/wasmcode/game.js.meta b/Runtime/wechat-default/wasmcode/game.js.meta index c7a41ab4..9c6e5c1b 100644 --- a/Runtime/wechat-default/wasmcode/game.js.meta +++ b/Runtime/wechat-default/wasmcode/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 110d0dafaf72fcfb8154456c2c3bf6e8 +guid: f93ea710429fabc3be743b0541e1844a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/weapp-adapter.js b/Runtime/wechat-default/weapp-adapter.js index d6d67579..1ad847b9 100644 --- a/Runtime/wechat-default/weapp-adapter.js +++ b/Runtime/wechat-default/weapp-adapter.js @@ -1197,52 +1197,8 @@ const isWK = false; identifier: formatIdentifier(v.identifier, type, changed) }; } - let activeTouchId = -1; function touchEventHandlerFactory(type) { return function (event) { - // 禁止多点触控 - if (GameGlobal.disableMultiTouch) { - if (event.touches.length > 0 || event.changedTouches.length > 0) { - if (activeTouchId !== -1) { - const touch = event.touches.find(v => v.identifier === activeTouchId); - const changedTouch = event.changedTouches.find(v => v.identifier === activeTouchId); - event.touches = touch ? [touch] : []; - event.changedTouches = changedTouch ? [changedTouch] : []; - } - else { - event.touches = event.touches.slice(0, 1); - event.changedTouches = event.changedTouches.slice(0, 1); - } - let getFirstTouchId; - if (event.changedTouches.length > 0) { - getFirstTouchId = event.changedTouches[0].identifier; - } - if (type === 'touchstart') { - if (activeTouchId === -1) { - activeTouchId = getFirstTouchId; - } - else { - return; - } - } - else if (type === 'touchmove') { - if (getFirstTouchId !== activeTouchId) { - return; - } - } - else if (type === 'touchend') { - if (getFirstTouchId === activeTouchId) { - activeTouchId = -1; - } - else { - return; - } - } - else if (type === 'touchcancel') { - activeTouchId = -1; - } - } - } const touchEvent = new TouchEvent(type); touchEvent.touches = event.touches.map(v => formatTouchEvent(v, event.type)); touchEvent.targetTouches = Array.prototype.slice.call(event.touches).map(v => formatTouchEvent(v, event.type)); diff --git a/Runtime/wechat-default/weapp-adapter.js.meta b/Runtime/wechat-default/weapp-adapter.js.meta index 4928ff11..800480ca 100644 --- a/Runtime/wechat-default/weapp-adapter.js.meta +++ b/Runtime/wechat-default/weapp-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b019f9b0adb1bc223664200394846f3c +guid: 2b5747a8da5a30d69fc07280d402ae1f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/workers/response/index.js.meta b/Runtime/wechat-default/workers/response/index.js.meta index 33183cbc..a612f2e9 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: 1d78aa1e7e9b11d9f76462225b0975ee +guid: b90a92e616d05514d0bc23643149d821 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