diff --git a/CHANGELOG.md b/CHANGELOG.md index 92ac350d7..61b40d7ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,32 +6,6 @@ Removed - 删除功能/接口 Fixed - 修复问题 Others - 其他 --> -## 2026-3-15 v0.1.32 【普通更新】 -### Feature -* 普通：更新基础库版本 -* 普通：擂台赛api新增subScoreKey参数 -* 普通：支持gameeventreport（试玩） -* 普通：添加WX数据保护插件，支持游戏数据加密存储和篡改检测 -### Fixed -* 普通：修复订阅消息报错问题 - -## 2026-1-13 v0.1.31 【普通更新】 -### Fixed -* 普通：修复glx模式下 createVideo underGameView为true 黑屏的问题 -* 普通：修复build profile在团结1.6之后的导出问题 - -## 2025-11-6 v0.1.30 【重要更新】 -### Feature -* 重要：EmscriptenGLX支持微信压缩纹理 -* 普通：EmscriptenGLX支持Android glReadpixels -* 普通：EmscriptenGLX优化Android CPU与功耗 -* 普通：Metal高帧率下功耗优化 -* 普通：团结引擎buildprofile支持 -### Fixed -* 重要：Metal编码库batch size修复 -* 普通：PageManager相关问题修复 -* 普通：iOS18的微信字体修复 - ## 2025-9-8 v0.1.29 【重要更新】 ### Feature * 普通：本地缓存存在时，UnityWebRequest支持同步方式(API：wx.SetSyncReadCacheEnabled)以加快读取速度 diff --git a/Editor/BuildProfile/WeixinMiniGameSettings.cs b/Editor/BuildProfile/WeixinMiniGameSettings.cs index 27c279bdd..9cb64e499 100644 --- a/Editor/BuildProfile/WeixinMiniGameSettings.cs +++ b/Editor/BuildProfile/WeixinMiniGameSettings.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_6_OR_NEWER +#if TUANJIE_1_4_OR_NEWER using System; using System.IO; using System.Collections; diff --git a/Editor/BuildProfile/WeixinMiniGameSettingsEditor.cs b/Editor/BuildProfile/WeixinMiniGameSettingsEditor.cs index 97225378c..74b04a5d0 100644 --- a/Editor/BuildProfile/WeixinMiniGameSettingsEditor.cs +++ b/Editor/BuildProfile/WeixinMiniGameSettingsEditor.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_6_OR_NEWER +#if TUANJIE_1_4_OR_NEWER using System; using System.Collections.Generic; using System.IO; diff --git a/Editor/BuildProfile/WeixinSubplatformInterface.cs b/Editor/BuildProfile/WeixinSubplatformInterface.cs index 8df8c231d..892f383b7 100644 --- a/Editor/BuildProfile/WeixinSubplatformInterface.cs +++ b/Editor/BuildProfile/WeixinSubplatformInterface.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_6_OR_NEWER +#if TUANJIE_1_4_OR_NEWER using System; using System.Collections; using System.Collections.Generic; @@ -52,6 +52,12 @@ namespace WeChatWASM public override BuildMiniGameError Build(BuildProfile buildProfile, BuildOptions options) { + + var bcLibPath = Path.GetFullPath(Path.Combine("Packages", "com.qq.weixin.minigame", "Editor", "BuildProfile", "lib", "libwx-metal-cpp.bc")); + var jsLibPath = Path.GetFullPath(Path.Combine("Packages", "com.qq.weixin.minigame", "Editor", "BuildProfile", "lib", "mtl_library.jslib")); + string libPath = bcLibPath + ';' + jsLibPath; + EditorUtility.SetMiniGameGfxLibraryPath(libPath); + WeixinMiniGameSettings settings = buildProfile.miniGameSettings as WeixinMiniGameSettings; BuildMiniGameError buildMiniGameError = BuildMiniGameError.Unknown; @@ -121,7 +127,7 @@ namespace WeChatWASM if (Directory.Exists(absolutePath)) PlayerSettings.MiniGame.SetTemplatePath_Internal(playerSettings, $"PATH:{absolutePath}"); - PlayerSettings.MiniGame.SetThreadsSupport_Internal(playerSettings, false); + PlayerSettings.MiniGame.SetThreadsSupport_Internal(playerSettings, true); PlayerSettings.MiniGame.SetCompressionFormat_Internal(playerSettings, MiniGameCompressionFormat.Disabled); PlayerSettings.MiniGame.SetLinkerTarget_Internal(playerSettings, MiniGameLinkerTarget.Wasm); PlayerSettings.MiniGame.SetDataCaching_Internal(playerSettings, false); diff --git a/Editor/BuildProfile/lib/libwx-metal-cpp.bc b/Editor/BuildProfile/lib/libwx-metal-cpp.bc index 2a8e5683e..b43267907 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/WXConvertCore.cs b/Editor/WXConvertCore.cs index 08f39476d..86b67c66b 100644 --- a/Editor/WXConvertCore.cs +++ b/Editor/WXConvertCore.cs @@ -28,20 +28,13 @@ namespace WeChatWASM { string templateHeader = "PROJECT:"; #if TUANJIE_2022_3_OR_NEWER - PlayerSettings.WeixinMiniGame.threadsSupport = false; + PlayerSettings.WeixinMiniGame.threadsSupport = WXConvertCore.EnableRenderThread; PlayerSettings.runInBackground = false; PlayerSettings.WeixinMiniGame.compressionFormat = WeixinMiniGameCompressionFormat.Disabled; if(UnityUtil.GetEngineVersion() == UnityUtil.EngineVersion.Tuanjie) { var absolutePath = Path.GetFullPath("Packages/com.qq.weixin.minigame/WebGLTemplates/WXTemplate2022TJ"); - if (!Directory.Exists(absolutePath)) - { - PlayerSettings.WeixinMiniGame.template = $"{templateHeader}WXTemplate2022TJ"; - } - else - { - PlayerSettings.WeixinMiniGame.template = $"PATH:{absolutePath}"; - } + PlayerSettings.WeixinMiniGame.template = $"PATH:{absolutePath}"; } else { @@ -85,6 +78,8 @@ namespace WeChatWASM public static string miniGameDir = "minigame"; // 生成小游戏的目录 public static string audioDir = "Assets"; // 音频资源目录 public static string frameworkDir = "framework"; + public static string frameworkFilename = "webgl.wasm.framework.unityweb.js"; + public static string wasmWorkerIndexFilename = "webgl.worker.js"; public static string dataFileSize = string.Empty; public static string codeMd5 = string.Empty; public static string dataMd5 = string.Empty; @@ -122,6 +117,13 @@ namespace WeChatWASM return config.CompileOptions.enableEmscriptenGLX; } } + public static bool EnableRenderThread + { + get + { + return config.CompileOptions.enableRenderThread; + } + } // public static void SetPlayableEnabled(bool enabled) // { // isPlayableBuild = enabled; @@ -228,9 +230,6 @@ namespace WeChatWASM { var rootPath = Directory.GetParent(Application.dataPath).FullName; string webglDir = WXExtEnvDef.GETDEF("WEIXINMINIGAME") ? "WeixinMiniGame" : "WebGL"; -#if PLATFORM_PLAYABLEADS - webglDir = "PlayableAds"; -#endif symFile1 = Path.Combine(rootPath, "Library", "Bee", "artifacts", webglDir, "build", "debug_WebGL_wasm", "build.js.symbols"); } WeChatWASM.UnityUtil.preprocessSymbols(symFile1, GetWebGLSymbolPath()); @@ -356,9 +355,7 @@ namespace WeChatWASM { // WxPerfJsBridge.jslib var wxPerfJSBridgeImporter = AssetImporter.GetAtPath(wxPerfPlugins[0]) as PluginImporter; -#if PLATFORM_PLAYABLEADS - wxPerfJSBridgeImporter.SetCompatibleWithPlatform(BuildTarget.PlayableAds, config.CompileOptions.enablePerfAnalysis); -#elif PLATFORM_WEIXINMINIGAME +#if PLATFORM_WEIXINMINIGAME wxPerfJSBridgeImporter.SetCompatibleWithPlatform(BuildTarget.WeixinMiniGame, config.CompileOptions.enablePerfAnalysis); #else wxPerfJSBridgeImporter.SetCompatibleWithPlatform(BuildTarget.WebGL, config.CompileOptions.enablePerfAnalysis); @@ -371,10 +368,7 @@ namespace WeChatWASM bool bShouldEnablePerf2022Plugin = config.CompileOptions.enablePerfAnalysis && IsCompatibleWithUnity202203OrNewer(); var wxPerf2022Importer = AssetImporter.GetAtPath(wxPerfPlugins[1]) as PluginImporter; - -#if PLATFORM_PLAYABLEADS - wxPerf2022Importer.SetCompatibleWithPlatform(BuildTarget.PlayableAds, bShouldEnablePerf2022Plugin); -#elif PLATFORM_WEIXINMINIGAME +#if PLATFORM_WEIXINMINIGAME wxPerf2022Importer.SetCompatibleWithPlatform(BuildTarget.WeixinMiniGame, bShouldEnablePerf2022Plugin); #else wxPerf2022Importer.SetCompatibleWithPlatform(BuildTarget.WebGL, bShouldEnablePerf2022Plugin); @@ -387,9 +381,7 @@ namespace WeChatWASM bool bShouldEnablePerf2021Plugin = config.CompileOptions.enablePerfAnalysis && IsCompatibleWithUnity202102To202203(); var wxPerf2021Importer = AssetImporter.GetAtPath(wxPerfPlugins[2]) as PluginImporter; -#if PLATFORM_PLAYABLEADS - wxPerf2021Importer.SetCompatibleWithPlatform(BuildTarget.PlayableAds, bShouldEnablePerf2021Plugin); -#elif PLATFORM_WEIXINMINIGAME +#if PLATFORM_WEIXINMINIGAME wxPerf2021Importer.SetCompatibleWithPlatform(BuildTarget.WeixinMiniGame, bShouldEnablePerf2021Plugin); #else wxPerf2021Importer.SetCompatibleWithPlatform(BuildTarget.WebGL, bShouldEnablePerf2021Plugin); @@ -589,9 +581,7 @@ namespace WeChatWASM Debug.LogError("Lua Adaptor Importer Not Found: " + maybeBuildFile); continue; } -#if PLATFORM_PLAYABLEADS - wxPerfJSBridgeImporter.SetCompatibleWithPlatform(BuildTarget.PlayableAds, shouldBuild); -#elif PLATFORM_WEIXINMINIGAME +#if PLATFORM_WEIXINMINIGAME wxPerfJSBridgeImporter.SetCompatibleWithPlatform(BuildTarget.WeixinMiniGame, shouldBuild); #else wxPerfJSBridgeImporter.SetCompatibleWithPlatform(BuildTarget.WebGL, shouldBuild); @@ -641,12 +631,7 @@ namespace WeChatWASM else { #if TUANJIE_2022_3_OR_NEWER - if(EditorUserBuildSettings.activeBuildTarget != BuildTarget.WeixinMiniGame -#if PLATFORM_PLAYABLEADS - && EditorUserBuildSettings.activeBuildTarget != BuildTarget.PlayableAds -#endif - ) - EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.WeixinMiniGame, BuildTarget.WeixinMiniGame); + EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.WeixinMiniGame, BuildTarget.WeixinMiniGame); #endif } Emit(LifeCycle.afterSwitchActiveBuildTarget); @@ -669,7 +654,7 @@ namespace WeChatWASM PlayerSettings.SetGraphicsAPIs(BuildTarget.WeixinMiniGame, new GraphicsDeviceType[] { GraphicsDeviceType.Metal, GraphicsDeviceType.OpenGLES2 }); } } - else + else { if (config.CompileOptions.Webgl2) { @@ -693,54 +678,96 @@ namespace WeChatWASM #endif } + public static int SeekFunctionEnd(string input, int lastIndex) + { + int braceCount = 0; + while (input[lastIndex] != '{') + { + lastIndex++; + } + + braceCount = 1; + ++lastIndex; + + while (lastIndex < input.Length && braceCount > 0) + { + if (input[lastIndex] == '{') + { + ++braceCount; + } + else if (input[lastIndex] == '}') + { + --braceCount; + } + ++lastIndex; + } + return lastIndex; + } /// - /// 移除输入js代码字符串中所有以prefix为前缀的函数的函数体，function与函数名之间仅允许有一个空格 + /// 扫一遍代码，把带删除前缀的函数删除，把带替换前缀的替换成调sdk的接口，function与函数名之间仅允许有一个空格 /// /// 输入字符串 - /// 函数前缀 + /// 要删除函数的名字前缀要替换函数的前缀> /// 处理后的字符串 - public static string RemoveFunctionsWithPrefix(string input, string prefix) + public static string ReplaceOrRemoveFunctionsWithPrefix(string input, string[] removePrefixes, string[] replacePrefixes) { StringBuilder output = new StringBuilder(); - - int braceCount = 0; int lastIndex = 0; - int index = input.IndexOf("function " + prefix); + int index = input.IndexOf("function "); while (index != -1) { output.Append(input, lastIndex, index - lastIndex); lastIndex = index; - - while (input[lastIndex] != '{') + index = input.IndexOf("(", lastIndex); + if (index == -1) { - lastIndex++; + break; } - - braceCount = 1; - ++lastIndex; - - while (braceCount > 0) + bool shouldRemove = false; + bool shouldReplace = false; + string funcName = input.Substring(lastIndex + 9, index - lastIndex - 9).TrimStart(); + for (int i = 0; i < removePrefixes.Length; ++i) { - if (input[lastIndex] == '{') + if (funcName.Contains(removePrefixes[i])) { - ++braceCount; + shouldRemove = true; + break; } - else if (input[lastIndex] == '}') - { - --braceCount; - } - ++lastIndex; } - - index = input.IndexOf("function " + prefix, lastIndex); + if (shouldRemove) + { + lastIndex = SeekFunctionEnd(input, index); + index = lastIndex < input.Length ? input.IndexOf("function ", lastIndex) : -1; + continue; + } + for (int i = 0; i < replacePrefixes.Length; ++i) + { + if (funcName.Contains(replacePrefixes[i])) + { + shouldReplace = true; + break; + } + } + if (shouldReplace) + { + lastIndex = SeekFunctionEnd(input, index); + index = lastIndex < input.Length ? input.IndexOf("function ", lastIndex) : -1; + output.Append("var " + funcName + " = window.WXWASMSDK." + funcName + " ? window.WXWASMSDK." + funcName + " : () => console.warn(\"unimplemented:" + funcName + "\", jsStackTrace());"); + continue; + } + index = input.IndexOf("function ", index); + } + if (lastIndex < input.Length) + { + output.Append(input, lastIndex, input.Length - lastIndex); } - - output.Append(input, lastIndex, input.Length - lastIndex); return output.ToString(); } + private static bool CheckBuildTemplate() { string[] res = BuildTemplate.CheckCustomCoverBaseConflict( @@ -814,7 +841,7 @@ namespace WeChatWASM private static void ConvertDotnetFrameworkCode() { - var target = "webgl.wasm.framework.unityweb.js"; + var target = frameworkFilename; var dotnetJsPath = Path.Combine(config.ProjectConf.DST, webglDir, "Code", "wwwroot", "_framework", "dotnet.js"); var dotnetJs = File.ReadAllText(dotnetJsPath, Encoding.UTF8); @@ -838,7 +865,7 @@ namespace WeChatWASM UnityUtil.DelectDir(Path.Combine(config.ProjectConf.DST, miniGameDir)); string text = String.Empty; - var target = "webgl.wasm.framework.unityweb.js"; + var target = frameworkFilename; if (WXExtEnvDef.GETDEF("UNITY_2020_1_OR_NEWER")) { if (UseIL2CPP) @@ -856,6 +883,16 @@ namespace WeChatWASM { text = File.ReadAllText(Path.Combine(config.ProjectConf.DST, webglDir, "Build", "webgl.wasm.framework.unityweb"), Encoding.UTF8); } + string[] removePrefixes = new string[] { + "jsAudio", + }; + string[] replacePrefixes = new string[] { + "_JS_Video_", + "_JS_Sound_", + "_JS_MobileKeyboard_", + "_JS_MobileKeybard_" + }; + text = ReplaceOrRemoveFunctionsWithPrefix(text, removePrefixes, replacePrefixes); int i; for (i = 0; i < ReplaceRules.rules.Length; i++) { @@ -869,20 +906,12 @@ namespace WeChatWASM text = Regex.Replace(text, rule.old, rule.newStr); } } - EditorUtility.ClearProgressBar(); - string[] prefixs = - { - "_JS_Video_", - //"jsVideo", - "_JS_Sound_", - "jsAudio", - "_JS_MobileKeyboard_", - "_JS_MobileKeybard_" - }; - foreach (var prefix in prefixs) + if (EnableRenderThread) { - text = RemoveFunctionsWithPrefix(text, prefix); + text = ReplaceByRegex(text, ReplaceRules.MainThreadRules(), "MainThreadReplaceRules"); } + EditorUtility.ClearProgressBar(); + #if PLATFORM_WEIXINMINIGAME if (PlayerSettings.WeixinMiniGame.exceptionSupport == WeixinMiniGameExceptionSupport.None) #else @@ -1080,7 +1109,7 @@ namespace WeChatWASM #if UNITY_6000_0_OR_NEWER // 从小游戏转换工具里无法直接开启wasm2023特性 会导致转出的webgl异常，所以强制关闭 PlayerSettings.WebGL.wasm2023 = false; -#endif +#endif #if UNITY_2021_2_OR_NEWER #if UNITY_2022_1_OR_NEWER @@ -1119,11 +1148,7 @@ namespace WeChatWASM } #endif #if TUANJIE_2022_3_OR_NEWER - if (EditorUserBuildSettings.activeBuildTarget != BuildTarget.WeixinMiniGame -#if PLATFORM_PLAYABLEADS - && EditorUserBuildSettings.activeBuildTarget != BuildTarget.PlayableAds -#endif - ) + if (EditorUserBuildSettings.activeBuildTarget != BuildTarget.WeixinMiniGame) { UnityEngine.Debug.LogFormat("[Builder] Current target is: {0}, switching to: {1}", EditorUserBuildSettings.activeBuildTarget, BuildTarget.WeixinMiniGame); if (!EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.WeixinMiniGame, BuildTarget.WeixinMiniGame)) @@ -1134,11 +1159,8 @@ namespace WeChatWASM } var projDir = Path.Combine(config.ProjectConf.DST, webglDir); -#if PLATFORM_PLAYABLEADS - var result = BuildPipeline.BuildPlayer(GetScenePaths(), projDir, BuildTarget.PlayableAds, option); -#else + var result = BuildPipeline.BuildPlayer(GetScenePaths(), projDir, BuildTarget.WeixinMiniGame, option); -#endif if (result.summary.result != UnityEditor.Build.Reporting.BuildResult.Succeeded) { UnityEngine.Debug.LogFormat("[Builder] BuildPlayer failed. emscriptenArgs:{0}", PlayerSettings.WeixinMiniGame.emscriptenArgs); @@ -1264,6 +1286,10 @@ namespace WeChatWASM int code = GenerateBinFile(); if (code == 0) { + if (EnableRenderThread) + { + ConvertForThread(); + } convertDataPackage(false); UnityEngine.Debug.LogFormat("[Converter] All done!"); //ShowNotification(new GUIContent("转换完成")); @@ -2277,9 +2303,7 @@ namespace WeChatWASM { var importer = AssetImporter.GetAtPath(jsLibs[i]) as PluginImporter; bool value = i == index; -#if PLATFORM_PLAYABLEADS - importer.SetCompatibleWithPlatform(BuildTarget.PlayableAds, value); -#elif PLATFORM_WEIXINMINIGAME +#if PLATFORM_WEIXINMINIGAME importer.SetCompatibleWithPlatform(BuildTarget.WeixinMiniGame, value); #else importer.SetCompatibleWithPlatform(BuildTarget.WebGL, value); @@ -2316,7 +2340,18 @@ namespace WeChatWASM return ""; #endif } - + public static string ReplaceByRegex(string text, Rule[] rules, string file) + { + for (int i = 0; i < rules.Length; i++) + { + var rule = rules[i]; + if (ShowMatchFailedWarning(text, rule.old, file) == false) + { + text = Regex.Replace(text, rule.old, rule.newStr); + } + } + return text; + } public static bool ShowMatchFailedWarning(string text, string rule, string file) { if (Regex.IsMatch(text, rule) == false) @@ -2326,6 +2361,28 @@ namespace WeChatWASM } return false; } + public static void ConvertForThread() + { + string workerDir = Path.Combine(config.ProjectConf.DST, miniGameDir, "workers", "response"); + string workerFrameworkPath = Path.Combine(workerDir, frameworkFilename); + string workerIndexPath = Path.Combine(workerDir, wasmWorkerIndexFilename); + + + // 拷贝胶水层到worker里并替换 + File.Copy(Path.Combine(config.ProjectConf.DST, miniGameDir, frameworkFilename), workerFrameworkPath); + string text = File.ReadAllText(workerFrameworkPath, Encoding.UTF8); + text = ReplaceByRegex(text, ReplaceRules.WorkerThreadRules(), "WorkerThreadReplaceRules"); + + text += ReplaceRules.WorkerThreadFooter; + File.WriteAllText(workerFrameworkPath, text); + + // 拷贝worker.js到worker里并替换 + File.Copy(Path.Combine(config.ProjectConf.DST, webglDir, "Build", wasmWorkerIndexFilename), workerIndexPath); + text = File.ReadAllText(workerIndexPath, Encoding.UTF8); + text = ReplaceByRegex(text, ReplaceRules.WorkerIndexRules(), "WorkerIndexReplaceRules"); + text += ReplaceRules.WorkerIndexFooter; + File.WriteAllText(workerIndexPath, text); + } } } diff --git a/Editor/WXEditorSettingHelper.cs b/Editor/WXEditorSettingHelper.cs index a7f7417b2..994e2ae9d 100644 --- a/Editor/WXEditorSettingHelper.cs +++ b/Editor/WXEditorSettingHelper.cs @@ -80,14 +80,54 @@ namespace WeChatWASM PluginUpdateManager.CheckUpdateOnce(); scrollRoot = EditorGUILayout.BeginScrollView(scrollRoot); - GUIStyle linkStyle = GetLinkStyle(); + GUIStyle linkStyle = new GUIStyle(GUI.skin.label); + linkStyle.normal.textColor = Color.yellow; + linkStyle.hover.textColor = Color.yellow; + linkStyle.stretchWidth = false; + linkStyle.alignment = TextAnchor.UpperLeft; + linkStyle.wordWrap = true; foldBaseInfo = EditorGUILayout.Foldout(foldBaseInfo, "基本信息"); if (foldBaseInfo) { EditorGUILayout.BeginVertical("frameBox", GUILayout.ExpandWidth(true)); - OnSettingBaseInfo(); - OnSettingChooseFolder(); + + this.formInput("appid", "游戏AppID"); + this.formInput("cdn", "游戏资源CDN"); + this.formInput("projectName", "小游戏项目名"); + this.formIntPopup("orientation", "游戏方向", new[] { "Portrait", "Landscape", "LandscapeLeft", "LandscapeRight" }, new[] { 0, 1, 2, 3 }); + this.formInput("memorySize", "UnityHeap预留内存(?)", "单位MB，预分配内存值，超休闲游戏256/中轻度496/重度游戏768，需预估游戏最大UnityHeap值以防止内存自动扩容带来的峰值尖刺。预估方法请查看GIT文档《优化Unity WebGL的内存》"); + + GUILayout.BeginHorizontal(); + string targetDst = "dst"; + if (!formInputData.ContainsKey(targetDst)) + { + formInputData[targetDst] = ""; + } + EditorGUILayout.LabelField(string.Empty, GUILayout.Width(10)); + GUILayout.Label(new GUIContent("导出路径(?)", "支持输入相对于项目根目录的相对路径，如：wxbuild"), GUILayout.Width(140)); + formInputData[targetDst] = GUILayout.TextField(formInputData[targetDst], GUILayout.MaxWidth(EditorGUIUtility.currentViewWidth - 270)); + if (GUILayout.Button(new GUIContent("打开"), GUILayout.Width(40))) + { + if (!formInputData[targetDst].Trim().Equals(string.Empty)) + { + EditorUtility.RevealInFinder(GetAbsolutePath(formInputData[targetDst])); + } + GUIUtility.ExitGUI(); + } + if (GUILayout.Button(new GUIContent("选择"), GUILayout.Width(40))) + { + var dstPath = EditorUtility.SaveFolderPanel("选择你的游戏导出目录", string.Empty, string.Empty); + if (dstPath != string.Empty) + { + formInputData[targetDst] = dstPath; + this.saveData(); + } + GUIUtility.ExitGUI(); + } + GUILayout.EndHorizontal(); + + EditorGUILayout.EndVertical(); } @@ -108,7 +148,12 @@ namespace WeChatWASM } GUILayout.EndHorizontal(); - OnSettingLoadingConfig(); + this.formInput("videoUrl", "加载阶段视频URL"); + this.formIntPopup("assetLoadType", "首包资源加载方式", new[] { "CDN", "小游戏包内" }, new[] { 0, 1 }); + this.formCheckbox("compressDataPackage", "压缩首包资源(?)", "将首包资源Brotli压缩, 降低资源大小. 注意: 首次启动耗时可能会增加200ms, 仅推荐使用小游戏分包加载时节省包体大小使用"); + this.formInput("bundleExcludeExtensions", "不自动缓存文件类型(?)", "(使用;分割)当请求url包含资源'cdn+StreamingAssets'时会自动缓存，但StreamingAssets目录下不是所有文件都需缓存，此选项配置不需要自动缓存的文件拓展名。默认值json"); + this.formInput("bundleHashLength", "Bundle名称Hash长度(?)", "自定义Bundle文件名中hash部分长度，默认值32，用于缓存控制。"); + this.formInput("preloadFiles", "预下载文件列表(?)", "使用;间隔，支持模糊匹配"); EditorGUILayout.EndVertical(); } @@ -117,14 +162,59 @@ namespace WeChatWASM if (foldSDKOptions) { EditorGUILayout.BeginVertical("frameBox", GUILayout.ExpandWidth(true)); - OnSettingSDKOptions(); + + this.formCheckbox("useFriendRelation", "使用好友关系链"); + this.formCheckbox("useMiniGameChat", "使用社交组件"); + this.formCheckbox("preloadWXFont", "预加载微信字体(?)", "在game.js执行开始时预载微信系统字体，运行期间可使用WX.GetWXFont获取微信字体"); + this.formCheckbox("disableMultiTouch", "禁用多点触控"); + EditorGUILayout.EndVertical(); } foldDebugOptions = EditorGUILayout.Foldout(foldDebugOptions, "调试编译选项"); if (foldDebugOptions) { - OnSettingDebugOptions(true); + EditorGUILayout.BeginVertical("frameBox", GUILayout.ExpandWidth(true)); + + + this.formCheckbox("developBuild", "Development Build", "", false, null, OnDevelopmentBuildToggleChanged); + this.formCheckbox("autoProfile", "Auto connect Profiler"); + this.formCheckbox("scriptOnly", "Scripts Only Build"); + this.formCheckbox("il2CppOptimizeSize", "Il2Cpp Optimize Size(?)", "对应于Il2CppCodeGeneration选项，勾选时使用OptimizeSize(默认推荐)，生成代码小15%左右，取消勾选则使用OptimizeSpeed。游戏中大量泛型集合的高频访问建议OptimizeSpeed，在使用HybridCLR等第三方组件时只能用OptimizeSpeed。(Dotnet Runtime模式下该选项无效)", !UseIL2CPP); + this.formCheckbox("profilingFuncs", "Profiling Funcs"); + 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"); + // this.formCheckbox("cleanCloudDev", "Clean Cloud Dev"); + this.formCheckbox("fbslim", "首包资源优化(?)", "导出时自动清理UnityEditor默认打包但游戏项目从未使用的资源，瘦身首包资源体积。（团结引擎已无需开启该能力）", UnityUtil.GetEngineVersion() > 0, (res) => + { + var fbWin = EditorWindow.GetWindow(typeof(WXFbSettingWindow), false, "首包资源优化配置面板", true); + fbWin.minSize = new Vector2(680, 350); + fbWin.Show(); + }); + this.formCheckbox("autoAdaptScreen", "自适应屏幕尺寸(?)", "移动端旋转屏幕和PC端拉伸窗口时，自动调整画布尺寸"); + this.formCheckbox("showMonitorSuggestModal", "显示优化建议弹窗"); + this.formCheckbox("enableProfileStats", "显示性能面板"); + this.formCheckbox("enableRenderAnalysis", "显示渲染日志(dev only)"); + this.formCheckbox("brotliMT", "brotli多线程压缩(?)", "开启多线程压缩可以提高出包速度，但会降低压缩率。如若不使用wasm代码分包请勿用多线程出包上线"); + // #if TUANJIE_2022_3_OR_NEWER + this.formCheckbox("enableRenderThread", "开启渲染线程(?)", "开启渲染线程，提升执行性能"); + // #endif + +#if UNITY_6000_0_OR_NEWER + this.formCheckbox("enableWasm2023", "WebAssembly 2023(?)", "WebAssembly 2023包括对WebAssembly.Table和BigInt的支持。（Android (Android 10 or later recommended), iOS (iOS 15 or later recommended)）"); +#endif + + if (m_EnablePerfTool) + { + this.formCheckbox("enablePerfAnalysis", "集成性能分析工具", "将性能分析工具集成入Development Build包中", false, null, OnPerfAnalysisFeatureToggleChanged); + } + + EditorGUILayout.EndVertical(); } @@ -179,268 +269,31 @@ namespace WeChatWASM if (foldFontOptions) { EditorGUILayout.BeginVertical("frameBox", GUILayout.ExpandWidth(true)); - OnSettingFontOptions(); + this.formCheckbox("CJK_Unified_Ideographs", "基本汉字(?)", "Unicode [0x4e00, 0x9fff]"); + this.formCheckbox("C0_Controls_and_Basic_Latin", "基本拉丁语（英文大小写、数字、英文标点）(?)", "Unicode [0x0, 0x7f]"); + this.formCheckbox("CJK_Symbols_and_Punctuation", "中文标点符号(?)", "Unicode [0x3000, 0x303f]"); + this.formCheckbox("General_Punctuation", "通用标点符号(?)", "Unicode [0x2000, 0x206f]"); + this.formCheckbox("Enclosed_CJK_Letters_and_Months", "CJK字母及月份(?)", "Unicode [0x3200, 0x32ff]"); + this.formCheckbox("Vertical_Forms", "中文竖排标点(?)", "Unicode [0xfe10, 0xfe1f]"); + this.formCheckbox("CJK_Compatibility_Forms", "CJK兼容符号(?)", "Unicode [0xfe30, 0xfe4f]"); + this.formCheckbox("Miscellaneous_Symbols", "杂项符号(?)", "Unicode [0x2600, 0x26ff]"); + this.formCheckbox("CJK_Compatibility", "CJK特殊符号(?)", "Unicode [0x3300, 0x33ff]"); + this.formCheckbox("Halfwidth_and_Fullwidth_Forms", "全角ASCII、全角中英文标点、半宽片假名、半宽平假名、半宽韩文字母(?)", "Unicode [0xff00, 0xffef]"); + this.formCheckbox("Dingbats", "装饰符号(?)", "Unicode [0x2700, 0x27bf]"); + this.formCheckbox("Letterlike_Symbols", "字母式符号(?)", "Unicode [0x2100, 0x214f]"); + this.formCheckbox("Enclosed_Alphanumerics", "带圈或括号的字母数字(?)", "Unicode [0x2460, 0x24ff]"); + this.formCheckbox("Number_Forms", "数字形式(?)", "Unicode [0x2150, 0x218f]"); + this.formCheckbox("Currency_Symbols", "货币符号(?)", "Unicode [0x20a0, 0x20cf]"); + this.formCheckbox("Arrows", "箭头(?)", "Unicode [0x2190, 0x21ff]"); + this.formCheckbox("Geometric_Shapes", "几何图形(?)", "Unicode [0x25a0, 0x25ff]"); + this.formCheckbox("Mathematical_Operators", "数学运算符号(?)", "Unicode [0x2200, 0x22ff]"); + this.formInput("CustomUnicode", "自定义Unicode(?)", "将填入的所有字符强制加入字体预加载列表"); EditorGUILayout.EndVertical(); } EditorGUILayout.EndScrollView(); } - public void OnSettingsGUI(SerializedObject serializedObject, SerializedProperty miniGameProperty) - { - loadData(serializedObject, miniGameProperty); - - scrollRoot = EditorGUILayout.BeginScrollView(scrollRoot); - - GUIStyle linkStyle = GetLinkStyle(); - - foldBaseInfo = EditorGUILayout.Foldout(foldBaseInfo, "基本信息"); - if (foldBaseInfo) - { - EditorGUILayout.BeginVertical("frameBox", GUILayout.ExpandWidth(true)); - OnSettingBaseInfo(); - EditorGUILayout.EndVertical(); - } - - foldLoadingConfig = EditorGUILayout.Foldout(foldLoadingConfig, "启动Loading配置"); - if (foldLoadingConfig) - { - EditorGUILayout.BeginVertical("frameBox", GUILayout.ExpandWidth(true)); - - // Call saveData(serializedObject, miniGameProperty) not saveData() - GUILayout.BeginHorizontal(); - string targetBg = "bgImageSrc"; - EditorGUILayout.LabelField(string.Empty, GUILayout.Width(10)); - tex = (Texture)EditorGUILayout.ObjectField("启动背景图/视频封面", tex, typeof(Texture2D), false); - var currentBgSrc = AssetDatabase.GetAssetPath(tex); - if (!string.IsNullOrEmpty(currentBgSrc) && currentBgSrc != formInputData[targetBg]) - { - formInputData[targetBg] = currentBgSrc; - saveData(serializedObject, miniGameProperty); - } - GUILayout.EndHorizontal(); - - OnSettingLoadingConfig(); - - EditorGUILayout.EndVertical(); - } - - foldSDKOptions = EditorGUILayout.Foldout(foldSDKOptions, "SDK功能选项"); - if (foldSDKOptions) - { - EditorGUILayout.BeginVertical("frameBox", GUILayout.ExpandWidth(true)); - OnSettingSDKOptions(); - EditorGUILayout.EndVertical(); - } - - foldDebugOptions = EditorGUILayout.Foldout(foldDebugOptions, "调试编译选项"); - if (foldDebugOptions) - { - OnSettingDebugOptions(false); - } - - if (WXConvertCore.IsInstantGameAutoStreaming()) - { - foldInstantGame = EditorGUILayout.Foldout(foldInstantGame, "Instant Game - AutoStreaming"); - if (foldInstantGame) - { - EditorGUILayout.BeginVertical("frameBox", GUILayout.ExpandWidth(true)); - formInput("bundlePathIdentifier", "Bundle Path Identifier"); - formInput("dataFileSubPrefix", "Data File Sub Prefix"); - - EditorGUI.BeginDisabledGroup(true); - formCheckbox("autoUploadFirstBundle", "构建后自动上传首包(?)", "仅在开启AutoStreaming生效", true); - EditorGUI.EndDisabledGroup(); - - GUILayout.BeginHorizontal(); - EditorGUILayout.LabelField(string.Empty, GUILayout.Width(10)); - GUILayout.Label(new GUIContent("清理AS配置(?)", "如需关闭AutoStreaming选用默认发布方案则需要清理AS配置项目。"), GUILayout.Width(140)); - EditorGUI.BeginDisabledGroup(WXConvertCore.IsInstantGameAutoStreaming()); - // It is not same as OnSettingsGUI(EditorWindow) - if (GUILayout.Button(new GUIContent("恢复"), GUILayout.Width(60))) - { - var ProjectConf = miniGameProperty.FindPropertyRelative("ProjectConf"); - string identifier = ProjectConf.FindPropertyRelative("bundlePathIdentifier").stringValue; - string[] identifiers = identifier.Split(";"); - string idStr = ""; - foreach (string id in identifiers) - { - if (id != "AS" && id != "CUS/CustomAB") - { - idStr += id + ";"; - } - } - ProjectConf.FindPropertyRelative("bundlePathIdentifier").stringValue = idStr.Trim(';'); - - if (ProjectConf.FindPropertyRelative("dataFileSubPrefix").stringValue == "CUS") - { - ProjectConf.FindPropertyRelative("dataFileSubPrefix").stringValue = ""; - } - loadData(serializedObject, miniGameProperty); - } - EditorGUI.EndDisabledGroup(); - GUILayout.EndHorizontal(); - - EditorGUILayout.BeginHorizontal(); - EditorGUILayout.LabelField(string.Empty); - if (GUILayout.Button(new GUIContent("了解Instant Game AutoStreaming", ""), linkStyle)) - { - Application.OpenURL("https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/blob/main/Design/InstantGameGuide.md"); - } - EditorGUILayout.EndHorizontal(); - EditorGUILayout.EndVertical(); - } - } - - foldFontOptions = EditorGUILayout.Foldout(foldFontOptions, "字体配置"); - if (foldFontOptions) - { - EditorGUILayout.BeginVertical("frameBox", GUILayout.ExpandWidth(true)); - OnSettingFontOptions(); - EditorGUILayout.EndVertical(); - } - - EditorGUILayout.EndScrollView(); - saveData(serializedObject, miniGameProperty); - } - - private GUIStyle GetLinkStyle() - { - GUIStyle linkStyle = new GUIStyle(GUI.skin.label); - linkStyle.normal.textColor = Color.yellow; - linkStyle.hover.textColor = Color.yellow; - linkStyle.stretchWidth = false; - linkStyle.alignment = TextAnchor.UpperLeft; - linkStyle.wordWrap = true; - return linkStyle; - } - - private void OnSettingBaseInfo() - { - this.formInput("appid", "游戏AppID"); - this.formInput("cdn", "游戏资源CDN"); - this.formInput("projectName", "小游戏项目名"); - this.formIntPopup("orientation", "游戏方向", new[] { "Portrait", "Landscape", "LandscapeLeft", "LandscapeRight" }, new[] { 0, 1, 2, 3 }); - this.formInput("memorySize", "UnityHeap预留内存(?)", "单位MB，预分配内存值，超休闲游戏256/中轻度496/重度游戏768，需预估游戏最大UnityHeap值以防止内存自动扩容带来的峰值尖刺。预估方法请查看GIT文档《优化Unity WebGL的内存》"); - } - - private void OnSettingChooseFolder() - { - GUILayout.BeginHorizontal(); - string targetDst = "dst"; - if (!formInputData.ContainsKey(targetDst)) - { - formInputData[targetDst] = ""; - } - EditorGUILayout.LabelField(string.Empty, GUILayout.Width(10)); - GUILayout.Label(new GUIContent("导出路径(?)", "支持输入相对于项目根目录的相对路径，如：wxbuild"), GUILayout.Width(140)); - formInputData[targetDst] = GUILayout.TextField(formInputData[targetDst], GUILayout.MaxWidth(EditorGUIUtility.currentViewWidth - 270)); - if (GUILayout.Button(new GUIContent("打开"), GUILayout.Width(40))) - { - if (!formInputData[targetDst].Trim().Equals(string.Empty)) - { - EditorUtility.RevealInFinder(GetAbsolutePath(formInputData[targetDst])); - } - GUIUtility.ExitGUI(); - } - if (GUILayout.Button(new GUIContent("选择"), GUILayout.Width(40))) - { - var dstPath = EditorUtility.SaveFolderPanel("选择你的游戏导出目录", string.Empty, string.Empty); - if (dstPath != string.Empty) - { - formInputData[targetDst] = dstPath; - this.saveData(); - } - GUIUtility.ExitGUI(); - } - GUILayout.EndHorizontal(); - } - - private void OnSettingLoadingConfig() - { - this.formInput("videoUrl", "加载阶段视频URL"); - this.formIntPopup("assetLoadType", "首包资源加载方式", new[] { "CDN", "小游戏包内" }, new[] { 0, 1 }); - this.formCheckbox("compressDataPackage", "压缩首包资源(?)", "将首包资源Brotli压缩, 降低资源大小. 注意: 首次启动耗时可能会增加200ms, 仅推荐使用小游戏分包加载时节省包体大小使用"); - this.formInput("bundleExcludeExtensions", "不自动缓存文件类型(?)", "(使用;分割)当请求url包含资源'cdn+StreamingAssets'时会自动缓存，但StreamingAssets目录下不是所有文件都需缓存，此选项配置不需要自动缓存的文件拓展名。默认值json"); - this.formInput("bundleHashLength", "Bundle名称Hash长度(?)", "自定义Bundle文件名中hash部分长度，默认值32，用于缓存控制。"); - this.formInput("preloadFiles", "预下载文件列表(?)", "使用;间隔，支持模糊匹配"); - } - - private void OnSettingSDKOptions() - { - formCheckbox("useFriendRelation", "使用好友关系链"); - formCheckbox("useMiniGameChat", "使用社交组件"); - formCheckbox("preloadWXFont", "预加载微信字体(?)", "在game.js执行开始时预载微信系统字体，运行期间可使用WX.GetWXFont获取微信字体"); - formCheckbox("disableMultiTouch", "禁止多点触控"); - } - - private void OnSettingDebugOptions(bool showDevBuild) - { - EditorGUILayout.BeginVertical("frameBox", GUILayout.ExpandWidth(true)); - - if (showDevBuild) - { - this.formCheckbox("developBuild", "Development Build", "", false, null, OnDevelopmentBuildToggleChanged); - } - this.formCheckbox("autoProfile", "Auto connect Profiler"); - this.formCheckbox("scriptOnly", "Scripts Only Build"); - this.formCheckbox("il2CppOptimizeSize", "Il2Cpp Optimize Size(?)", "对应于Il2CppCodeGeneration选项，勾选时使用OptimizeSize(默认推荐)，生成代码小15%左右，取消勾选则使用OptimizeSpeed。游戏中大量泛型集合的高频访问建议OptimizeSpeed，在使用HybridCLR等第三方组件时只能用OptimizeSpeed。(Dotnet Runtime模式下该选项无效)", !UseIL2CPP); - this.formCheckbox("profilingFuncs", "Profiling Funcs"); - 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"); - // this.formCheckbox("cleanCloudDev", "Clean Cloud Dev"); - this.formCheckbox("fbslim", "首包资源优化(?)", "导出时自动清理UnityEditor默认打包但游戏项目从未使用的资源，瘦身首包资源体积。（团结引擎已无需开启该能力）", UnityUtil.GetEngineVersion() > 0, (res) => - { - var fbWin = EditorWindow.GetWindow(typeof(WXFbSettingWindow), false, "首包资源优化配置面板", true); - fbWin.minSize = new Vector2(680, 350); - fbWin.Show(); - }); - this.formCheckbox("autoAdaptScreen", "自适应屏幕尺寸(?)", "移动端旋转屏幕和PC端拉伸窗口时，自动调整画布尺寸"); - this.formCheckbox("showMonitorSuggestModal", "显示优化建议弹窗"); - this.formCheckbox("enableProfileStats", "显示性能面板"); - this.formCheckbox("enableRenderAnalysis", "显示渲染日志(dev only)"); - this.formCheckbox("brotliMT", "brotli多线程压缩(?)", "开启多线程压缩可以提高出包速度，但会降低压缩率。如若不使用wasm代码分包请勿用多线程出包上线"); -#if UNITY_6000_0_OR_NEWER - this.formCheckbox("enableWasm2023", "WebAssembly 2023(?)", "WebAssembly 2023包括对WebAssembly.Table和BigInt的支持。（Android (Android 10 or later recommended), iOS (iOS 15 or later recommended)）"); -#endif - - if (m_EnablePerfTool) - { - this.formCheckbox("enablePerfAnalysis", "集成性能分析工具", "将性能分析工具集成入Development Build包中", false, null, OnPerfAnalysisFeatureToggleChanged); - } - - EditorGUILayout.EndVertical(); - } - - private void OnSettingFontOptions() - { - formCheckbox("CJK_Unified_Ideographs", "基本汉字(?)", "Unicode [0x4e00, 0x9fff]"); - formCheckbox("C0_Controls_and_Basic_Latin", "基本拉丁语（英文大小写、数字、英文标点）(?)", "Unicode [0x0, 0x7f]"); - formCheckbox("CJK_Symbols_and_Punctuation", "中文标点符号(?)", "Unicode [0x3000, 0x303f]"); - formCheckbox("General_Punctuation", "通用标点符号(?)", "Unicode [0x2000, 0x206f]"); - formCheckbox("Enclosed_CJK_Letters_and_Months", "CJK字母及月份(?)", "Unicode [0x3200, 0x32ff]"); - formCheckbox("Vertical_Forms", "中文竖排标点(?)", "Unicode [0xfe10, 0xfe1f]"); - formCheckbox("CJK_Compatibility_Forms", "CJK兼容符号(?)", "Unicode [0xfe30, 0xfe4f]"); - formCheckbox("Miscellaneous_Symbols", "杂项符号(?)", "Unicode [0x2600, 0x26ff]"); - formCheckbox("CJK_Compatibility", "CJK特殊符号(?)", "Unicode [0x3300, 0x33ff]"); - formCheckbox("Halfwidth_and_Fullwidth_Forms", "全角ASCII、全角中英文标点、半宽片假名、半宽平假名、半宽韩文字母(?)", "Unicode [0xff00, 0xffef]"); - formCheckbox("Dingbats", "装饰符号(?)", "Unicode [0x2700, 0x27bf]"); - formCheckbox("Letterlike_Symbols", "字母式符号(?)", "Unicode [0x2100, 0x214f]"); - formCheckbox("Enclosed_Alphanumerics", "带圈或括号的字母数字(?)", "Unicode [0x2460, 0x24ff]"); - formCheckbox("Number_Forms", "数字形式(?)", "Unicode [0x2150, 0x218f]"); - formCheckbox("Currency_Symbols", "货币符号(?)", "Unicode [0x20a0, 0x20cf]"); - formCheckbox("Arrows", "箭头(?)", "Unicode [0x2190, 0x21ff]"); - formCheckbox("Geometric_Shapes", "几何图形(?)", "Unicode [0x25a0, 0x25ff]"); - formCheckbox("Mathematical_Operators", "数学运算符号(?)", "Unicode [0x2200, 0x22ff]"); - formInput("CustomUnicode", "自定义Unicode(?)", "将填入的所有字符强制加入字体预加载列表"); - } - - public void OnBuildButtonGUI(EditorWindow window) { GUIStyle linkStyle = new GUIStyle(GUI.skin.label); @@ -577,454 +430,168 @@ namespace WeChatWASM } } - this.setData("autoUploadFirstBundle", true); - loadProjectConfData(config.ProjectConf); - loadSDKOptionsData(config.SDKOptions); - loadCompileOptionsData(config.CompileOptions); - loadFontOptionsData(config.FontOptions); - } + this.setData("projectName", config.ProjectConf.projectName); + this.setData("appid", config.ProjectConf.Appid); + this.setData("cdn", config.ProjectConf.CDN); + this.setData("assetLoadType", config.ProjectConf.assetLoadType); + this.setData("compressDataPackage", config.ProjectConf.compressDataPackage); + this.setData("videoUrl", config.ProjectConf.VideoUrl); + this.setData("orientation", (int)config.ProjectConf.Orientation); + this.setData("dst", config.ProjectConf.relativeDST); + this.setData("bundleHashLength", config.ProjectConf.bundleHashLength.ToString()); + this.setData("bundlePathIdentifier", config.ProjectConf.bundlePathIdentifier); + this.setData("bundleExcludeExtensions", config.ProjectConf.bundleExcludeExtensions); + this.setData("preloadFiles", config.ProjectConf.preloadFiles); + this.setData("developBuild", config.CompileOptions.DevelopBuild); + this.setData("autoProfile", config.CompileOptions.AutoProfile); + this.setData("scriptOnly", config.CompileOptions.ScriptOnly); + this.setData("il2CppOptimizeSize", config.CompileOptions.Il2CppOptimizeSize); + this.setData("profilingFuncs", config.CompileOptions.profilingFuncs); + this.setData("profilingMemory", config.CompileOptions.ProfilingMemory); + this.setData("deleteStreamingAssets", config.CompileOptions.DeleteStreamingAssets); + this.setData("cleanBuild", config.CompileOptions.CleanBuild); + this.setData("customNodePath", config.CompileOptions.CustomNodePath); + 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); + 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()); + this.setData("hideAfterCallMain", config.ProjectConf.HideAfterCallMain); - private void loadData(SerializedObject serializedObject, SerializedProperty miniGameProperty) - { - serializedObject.UpdateIfRequiredOrScript(); - var ProjectConf = miniGameProperty.FindPropertyRelative("ProjectConf"); - - // Instant Game - if (WXConvertCore.IsInstantGameAutoStreaming()) - { - var automaticfillinstantgame = miniGameProperty.FindPropertyRelative("m_AutomaticFillInstantGame"); - if (automaticfillinstantgame.boolValue) - { - ProjectConf.FindPropertyRelative("CDN").stringValue = WXConvertCore.GetInstantGameAutoStreamingCDN(); - if (!ProjectConf.FindPropertyRelative("bundlePathIdentifier").stringValue.Contains("AS;")) - { - ProjectConf.FindPropertyRelative("bundlePathIdentifier").stringValue += "AS;"; - } - if (!ProjectConf.FindPropertyRelative("bundlePathIdentifier").stringValue.Contains("CUS/CustomAB;")) - { - ProjectConf.FindPropertyRelative("bundlePathIdentifier").stringValue += "CUS/CustomAB;"; - } - ProjectConf.FindPropertyRelative("dataFileSubPrefix").stringValue = "CUS"; - } - } - - var _ProjectConf = new WXProjectConf(); - deserializeProjectConf(_ProjectConf, ProjectConf); - loadProjectConfData(_ProjectConf); - - var SDKOptions = miniGameProperty.FindPropertyRelative("SDKOptions"); - var _SDKOptions = new SDKOptions(); - deserializeSDKOptions(_SDKOptions, SDKOptions); - loadSDKOptionsData(_SDKOptions); - - var CompileOptions = miniGameProperty.FindPropertyRelative("CompileOptions"); - var _CompileOptions = new CompileOptions(); - deserializeCompileOptions(_CompileOptions, CompileOptions); - loadCompileOptionsData(_CompileOptions); - - var FontOptions = miniGameProperty.FindPropertyRelative("FontOptions"); - var _FontOptions = new FontOptions(); - deserializeFontOptions(_FontOptions, FontOptions); - loadFontOptionsData(_FontOptions); - } - - private void loadProjectConfData(WXProjectConf ProjectConf) - { - this.setData("projectName", ProjectConf.projectName); - this.setData("appid", ProjectConf.Appid); - this.setData("cdn", ProjectConf.CDN); - this.setData("assetLoadType", ProjectConf.assetLoadType); - this.setData("compressDataPackage", ProjectConf.compressDataPackage); - this.setData("videoUrl", ProjectConf.VideoUrl); - this.setData("orientation", (int)ProjectConf.Orientation); - this.setData("dst", ProjectConf.relativeDST); - this.setData("bundleHashLength", ProjectConf.bundleHashLength.ToString()); - this.setData("bundlePathIdentifier", ProjectConf.bundlePathIdentifier); - this.setData("bundleExcludeExtensions", ProjectConf.bundleExcludeExtensions); - this.setData("preloadFiles", ProjectConf.preloadFiles); - this.setData("bgImageSrc", ProjectConf.bgImageSrc); - - tex = AssetDatabase.LoadAssetAtPath(ProjectConf.bgImageSrc); - this.setData("memorySize", ProjectConf.MemorySize.ToString()); - this.setData("hideAfterCallMain", ProjectConf.HideAfterCallMain); - - this.setData("dataFileSubPrefix", ProjectConf.dataFileSubPrefix); - this.setData("maxStorage", ProjectConf.maxStorage.ToString()); - this.setData("defaultReleaseSize", ProjectConf.defaultReleaseSize.ToString()); - this.setData("texturesHashLength", ProjectConf.texturesHashLength.ToString()); - this.setData("texturesPath", ProjectConf.texturesPath); - this.setData("needCacheTextures", ProjectConf.needCacheTextures); - this.setData("loadingBarWidth", ProjectConf.loadingBarWidth.ToString()); - this.setData("needCheckUpdate", ProjectConf.needCheckUpdate); - this.setData("disableHighPerformanceFallback", ProjectConf.disableHighPerformanceFallback); - } - - private void loadSDKOptionsData(SDKOptions SDKOptions) - { - this.setData("useFriendRelation", SDKOptions.UseFriendRelation); - this.setData("useMiniGameChat", SDKOptions.UseMiniGameChat); - this.setData("preloadWXFont", SDKOptions.PreloadWXFont); - this.setData("disableMultiTouch", SDKOptions.disableMultiTouch); - } - - private void loadCompileOptionsData(CompileOptions CompileOptions) - { - this.setData("developBuild", CompileOptions.DevelopBuild); - this.setData("autoProfile", CompileOptions.AutoProfile); - this.setData("scriptOnly", CompileOptions.ScriptOnly); - this.setData("il2CppOptimizeSize", CompileOptions.Il2CppOptimizeSize); - this.setData("profilingFuncs", CompileOptions.profilingFuncs); - this.setData("profilingMemory", CompileOptions.ProfilingMemory); - this.setData("deleteStreamingAssets", CompileOptions.DeleteStreamingAssets); - this.setData("cleanBuild", CompileOptions.CleanBuild); - this.setData("customNodePath", CompileOptions.CustomNodePath); - this.setData("webgl2", CompileOptions.Webgl2); - this.setData("iOSPerformancePlus", CompileOptions.enableIOSPerformancePlus); - this.setData("iOSMetal", CompileOptions.enableiOSMetal); - this.setData("EmscriptenGLX", CompileOptions.enableEmscriptenGLX); - this.setData("fbslim", CompileOptions.fbslim); - this.setData("autoAdaptScreen", CompileOptions.autoAdaptScreen); - this.setData("showMonitorSuggestModal", CompileOptions.showMonitorSuggestModal); - this.setData("enableProfileStats", CompileOptions.enableProfileStats); - this.setData("enableRenderAnalysis", CompileOptions.enableRenderAnalysis); - this.setData("brotliMT", CompileOptions.brotliMT); + this.setData("dataFileSubPrefix", config.ProjectConf.dataFileSubPrefix); + this.setData("maxStorage", config.ProjectConf.maxStorage.ToString()); + this.setData("defaultReleaseSize", config.ProjectConf.defaultReleaseSize.ToString()); + this.setData("texturesHashLength", config.ProjectConf.texturesHashLength.ToString()); + this.setData("texturesPath", config.ProjectConf.texturesPath); + this.setData("needCacheTextures", config.ProjectConf.needCacheTextures); + this.setData("loadingBarWidth", config.ProjectConf.loadingBarWidth.ToString()); + this.setData("needCheckUpdate", config.ProjectConf.needCheckUpdate); + this.setData("disableHighPerformanceFallback", config.ProjectConf.disableHighPerformanceFallback); + this.setData("autoAdaptScreen", config.CompileOptions.autoAdaptScreen); + this.setData("showMonitorSuggestModal", config.CompileOptions.showMonitorSuggestModal); + this.setData("enableProfileStats", config.CompileOptions.enableProfileStats); + this.setData("enableRenderAnalysis", config.CompileOptions.enableRenderAnalysis); + this.setData("brotliMT", config.CompileOptions.brotliMT); #if UNITY_6000_0_OR_NEWER - this.setData("enableWasm2023", CompileOptions.enableWasm2023); -#endif - this.setData("enablePerfAnalysis", CompileOptions.enablePerfAnalysis); - } + this.setData("enableWasm2023", config.CompileOptions.enableWasm2023); +#endif + // #if TUANJIE_2022_3_OR_NEWER + this.setData("enableRenderThread", config.CompileOptions.enableRenderThread); + // #endif + this.setData("enablePerfAnalysis", config.CompileOptions.enablePerfAnalysis); + this.setData("autoUploadFirstBundle", true); - private void loadFontOptionsData(FontOptions FontOptions) - { - this.setData("CJK_Unified_Ideographs", FontOptions.CJK_Unified_Ideographs); - this.setData("C0_Controls_and_Basic_Latin", FontOptions.C0_Controls_and_Basic_Latin); - this.setData("CJK_Symbols_and_Punctuation", FontOptions.CJK_Symbols_and_Punctuation); - this.setData("General_Punctuation", FontOptions.General_Punctuation); - this.setData("Enclosed_CJK_Letters_and_Months", FontOptions.Enclosed_CJK_Letters_and_Months); - this.setData("Vertical_Forms", FontOptions.Vertical_Forms); - this.setData("CJK_Compatibility_Forms", FontOptions.CJK_Compatibility_Forms); - this.setData("Miscellaneous_Symbols", FontOptions.Miscellaneous_Symbols); - this.setData("CJK_Compatibility", FontOptions.CJK_Compatibility); - this.setData("Halfwidth_and_Fullwidth_Forms", FontOptions.Halfwidth_and_Fullwidth_Forms); - this.setData("Dingbats", FontOptions.Dingbats); - this.setData("Letterlike_Symbols", FontOptions.Letterlike_Symbols); - this.setData("Enclosed_Alphanumerics", FontOptions.Enclosed_Alphanumerics); - this.setData("Number_Forms", FontOptions.Number_Forms); - this.setData("Currency_Symbols", FontOptions.Currency_Symbols); - this.setData("Arrows", FontOptions.Arrows); - this.setData("Geometric_Shapes", FontOptions.Geometric_Shapes); - this.setData("Mathematical_Operators", FontOptions.Mathematical_Operators); - this.setData("CustomUnicode", FontOptions.CustomUnicode); + // font options + this.setData("CJK_Unified_Ideographs", config.FontOptions.CJK_Unified_Ideographs); + this.setData("C0_Controls_and_Basic_Latin", config.FontOptions.C0_Controls_and_Basic_Latin); + this.setData("CJK_Symbols_and_Punctuation", config.FontOptions.CJK_Symbols_and_Punctuation); + this.setData("General_Punctuation", config.FontOptions.General_Punctuation); + this.setData("Enclosed_CJK_Letters_and_Months", config.FontOptions.Enclosed_CJK_Letters_and_Months); + this.setData("Vertical_Forms", config.FontOptions.Vertical_Forms); + this.setData("CJK_Compatibility_Forms", config.FontOptions.CJK_Compatibility_Forms); + this.setData("Miscellaneous_Symbols", config.FontOptions.Miscellaneous_Symbols); + this.setData("CJK_Compatibility", config.FontOptions.CJK_Compatibility); + this.setData("Halfwidth_and_Fullwidth_Forms", config.FontOptions.Halfwidth_and_Fullwidth_Forms); + this.setData("Dingbats", config.FontOptions.Dingbats); + this.setData("Letterlike_Symbols", config.FontOptions.Letterlike_Symbols); + this.setData("Enclosed_Alphanumerics", config.FontOptions.Enclosed_Alphanumerics); + this.setData("Number_Forms", config.FontOptions.Number_Forms); + this.setData("Currency_Symbols", config.FontOptions.Currency_Symbols); + this.setData("Arrows", config.FontOptions.Arrows); + this.setData("Geometric_Shapes", config.FontOptions.Geometric_Shapes); + this.setData("Mathematical_Operators", config.FontOptions.Mathematical_Operators); + this.setData("CustomUnicode", config.FontOptions.CustomUnicode); } private void saveData() { - saveProjectConfData(config.ProjectConf); - saveSDKOptionsData(config.SDKOptions); - saveCompileOptionsData(config.CompileOptions); - saveFontOptionsData(config.FontOptions); + config.ProjectConf.projectName = this.getDataInput("projectName"); + config.ProjectConf.Appid = this.getDataInput("appid"); + config.ProjectConf.CDN = this.getDataInput("cdn"); + config.ProjectConf.assetLoadType = this.getDataPop("assetLoadType"); + config.ProjectConf.compressDataPackage = this.getDataCheckbox("compressDataPackage"); + config.ProjectConf.VideoUrl = this.getDataInput("videoUrl"); + config.ProjectConf.Orientation = (WXScreenOritation)this.getDataPop("orientation"); + config.ProjectConf.relativeDST = this.getDataInput("dst"); + config.ProjectConf.DST = GetAbsolutePath(config.ProjectConf.relativeDST); + config.ProjectConf.bundleHashLength = int.Parse(this.getDataInput("bundleHashLength")); + config.ProjectConf.bundlePathIdentifier = this.getDataInput("bundlePathIdentifier"); + config.ProjectConf.bundleExcludeExtensions = this.getDataInput("bundleExcludeExtensions"); + config.ProjectConf.preloadFiles = this.getDataInput("preloadFiles"); + config.CompileOptions.DevelopBuild = this.getDataCheckbox("developBuild"); + config.CompileOptions.AutoProfile = this.getDataCheckbox("autoProfile"); + config.CompileOptions.ScriptOnly = this.getDataCheckbox("scriptOnly"); + config.CompileOptions.Il2CppOptimizeSize = this.getDataCheckbox("il2CppOptimizeSize"); + config.CompileOptions.profilingFuncs = this.getDataCheckbox("profilingFuncs"); + config.CompileOptions.ProfilingMemory = this.getDataCheckbox("profilingMemory"); + config.CompileOptions.DeleteStreamingAssets = this.getDataCheckbox("deleteStreamingAssets"); + config.CompileOptions.CleanBuild = this.getDataCheckbox("cleanBuild"); + config.CompileOptions.CustomNodePath = this.getDataInput("customNodePath"); + 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"); + // #if TUANJIE_2022_3_OR_NEWER + config.CompileOptions.enableRenderThread = this.getDataCheckbox("enableRenderThread"); + // #endif + 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"); + config.ProjectConf.dataFileSubPrefix = this.getDataInput("dataFileSubPrefix"); + config.ProjectConf.maxStorage = int.Parse(this.getDataInput("maxStorage")); + config.ProjectConf.defaultReleaseSize = int.Parse(this.getDataInput("defaultReleaseSize")); + config.ProjectConf.texturesHashLength = int.Parse(this.getDataInput("texturesHashLength")); + config.ProjectConf.texturesPath = this.getDataInput("texturesPath"); + config.ProjectConf.needCacheTextures = this.getDataCheckbox("needCacheTextures"); + config.ProjectConf.loadingBarWidth = int.Parse(this.getDataInput("loadingBarWidth")); + config.ProjectConf.needCheckUpdate = this.getDataCheckbox("needCheckUpdate"); + config.ProjectConf.disableHighPerformanceFallback = this.getDataCheckbox("disableHighPerformanceFallback"); + config.CompileOptions.autoAdaptScreen = this.getDataCheckbox("autoAdaptScreen"); + config.CompileOptions.showMonitorSuggestModal = this.getDataCheckbox("showMonitorSuggestModal"); + config.CompileOptions.enableProfileStats = this.getDataCheckbox("enableProfileStats"); + config.CompileOptions.enableRenderAnalysis = this.getDataCheckbox("enableRenderAnalysis"); + config.CompileOptions.brotliMT = this.getDataCheckbox("brotliMT"); +#if UNITY_6000_0_OR_NEWER + config.CompileOptions.enableWasm2023 = this.getDataCheckbox("enableWasm2023"); +#endif + config.CompileOptions.enablePerfAnalysis = this.getDataCheckbox("enablePerfAnalysis"); + + // font options + config.FontOptions.CJK_Unified_Ideographs = this.getDataCheckbox("CJK_Unified_Ideographs"); + config.FontOptions.C0_Controls_and_Basic_Latin = this.getDataCheckbox("C0_Controls_and_Basic_Latin"); + config.FontOptions.CJK_Symbols_and_Punctuation = this.getDataCheckbox("CJK_Symbols_and_Punctuation"); + config.FontOptions.General_Punctuation = this.getDataCheckbox("General_Punctuation"); + config.FontOptions.Enclosed_CJK_Letters_and_Months = this.getDataCheckbox("Enclosed_CJK_Letters_and_Months"); + config.FontOptions.Vertical_Forms = this.getDataCheckbox("Vertical_Forms"); + config.FontOptions.CJK_Compatibility_Forms = this.getDataCheckbox("CJK_Compatibility_Forms"); + config.FontOptions.Miscellaneous_Symbols = this.getDataCheckbox("Miscellaneous_Symbols"); + config.FontOptions.CJK_Compatibility = this.getDataCheckbox("CJK_Compatibility"); + config.FontOptions.Halfwidth_and_Fullwidth_Forms = this.getDataCheckbox("Halfwidth_and_Fullwidth_Forms"); + config.FontOptions.Dingbats = this.getDataCheckbox("Dingbats"); + config.FontOptions.Letterlike_Symbols = this.getDataCheckbox("Letterlike_Symbols"); + config.FontOptions.Enclosed_Alphanumerics = this.getDataCheckbox("Enclosed_Alphanumerics"); + config.FontOptions.Number_Forms = this.getDataCheckbox("Number_Forms"); + config.FontOptions.Currency_Symbols = this.getDataCheckbox("Currency_Symbols"); + config.FontOptions.Arrows = this.getDataCheckbox("Arrows"); + config.FontOptions.Geometric_Shapes = this.getDataCheckbox("Geometric_Shapes"); + config.FontOptions.Mathematical_Operators = this.getDataCheckbox("Mathematical_Operators"); + config.FontOptions.CustomUnicode = this.getDataInput("CustomUnicode"); ApplyPerfAnalysisSetting(); } - private void saveData(SerializedObject serializedObject, SerializedProperty miniGameProperty) - { - serializedObject.UpdateIfRequiredOrScript(); - - var ProjectConf = miniGameProperty.FindPropertyRelative("ProjectConf"); - var _ProjectConf = new WXProjectConf(); - saveProjectConfData(_ProjectConf); - serializeProjectConf(_ProjectConf, ProjectConf); - - var CompileOptions = miniGameProperty.FindPropertyRelative("CompileOptions"); - var _CompileOptions = new CompileOptions(); - saveCompileOptionsData(_CompileOptions); - serializeCompileOptions(_CompileOptions, CompileOptions); - - var SDKOptions = miniGameProperty.FindPropertyRelative("SDKOptions"); - var _SDKOptions = new SDKOptions(); - saveSDKOptionsData(_SDKOptions); - serializeSDKOptions(_SDKOptions, SDKOptions); - - var FontOptions = miniGameProperty.FindPropertyRelative("FontOptions"); - var _FontOptions = new FontOptions(); - saveFontOptionsData(_FontOptions); - serializeFontOptions(_FontOptions, FontOptions); - - miniGameProperty.FindPropertyRelative("m_AutomaticFillInstantGame").boolValue = getDataCheckbox("m_AutomaticFillInstantGame"); - - serializedObject.ApplyModifiedProperties(); - } - - private void saveProjectConfData(WXProjectConf ProjectConf) - { - ProjectConf.projectName = this.getDataInput("projectName"); - ProjectConf.Appid = this.getDataInput("appid"); - ProjectConf.CDN = this.getDataInput("cdn"); - ProjectConf.assetLoadType = this.getDataPop("assetLoadType"); - ProjectConf.compressDataPackage = this.getDataCheckbox("compressDataPackage"); - ProjectConf.VideoUrl = this.getDataInput("videoUrl"); - ProjectConf.Orientation = (WXScreenOritation)this.getDataPop("orientation"); - ProjectConf.relativeDST = this.getDataInput("dst"); - ProjectConf.DST = GetAbsolutePath(ProjectConf.relativeDST); - ProjectConf.bundleHashLength = int.Parse(this.getDataInput("bundleHashLength")); - ProjectConf.bundlePathIdentifier = this.getDataInput("bundlePathIdentifier"); - ProjectConf.bundleExcludeExtensions = this.getDataInput("bundleExcludeExtensions"); - ProjectConf.preloadFiles = this.getDataInput("preloadFiles"); - - ProjectConf.bgImageSrc = this.getDataInput("bgImageSrc"); - ProjectConf.MemorySize = int.Parse(this.getDataInput("memorySize")); - ProjectConf.HideAfterCallMain = this.getDataCheckbox("hideAfterCallMain"); - ProjectConf.dataFileSubPrefix = this.getDataInput("dataFileSubPrefix"); - ProjectConf.maxStorage = int.Parse(this.getDataInput("maxStorage")); - ProjectConf.defaultReleaseSize = int.Parse(this.getDataInput("defaultReleaseSize")); - ProjectConf.texturesHashLength = int.Parse(this.getDataInput("texturesHashLength")); - ProjectConf.texturesPath = this.getDataInput("texturesPath"); - ProjectConf.needCacheTextures = this.getDataCheckbox("needCacheTextures"); - ProjectConf.loadingBarWidth = int.Parse(this.getDataInput("loadingBarWidth")); - ProjectConf.needCheckUpdate = this.getDataCheckbox("needCheckUpdate"); - ProjectConf.disableHighPerformanceFallback = this.getDataCheckbox("disableHighPerformanceFallback"); - } - - private void saveSDKOptionsData(SDKOptions SDKOptions) - { - SDKOptions.UseFriendRelation = this.getDataCheckbox("useFriendRelation"); - SDKOptions.UseMiniGameChat = this.getDataCheckbox("useMiniGameChat"); - SDKOptions.PreloadWXFont = this.getDataCheckbox("preloadWXFont"); - SDKOptions.disableMultiTouch = this.getDataCheckbox("disableMultiTouch"); - } - - private void saveCompileOptionsData(CompileOptions CompileOptions) - { - CompileOptions.DevelopBuild = this.getDataCheckbox("developBuild"); - CompileOptions.AutoProfile = this.getDataCheckbox("autoProfile"); - CompileOptions.ScriptOnly = this.getDataCheckbox("scriptOnly"); - CompileOptions.Il2CppOptimizeSize = this.getDataCheckbox("il2CppOptimizeSize"); - CompileOptions.profilingFuncs = this.getDataCheckbox("profilingFuncs"); - CompileOptions.ProfilingMemory = this.getDataCheckbox("profilingMemory"); - CompileOptions.DeleteStreamingAssets = this.getDataCheckbox("deleteStreamingAssets"); - CompileOptions.CleanBuild = this.getDataCheckbox("cleanBuild"); - CompileOptions.CustomNodePath = this.getDataInput("customNodePath"); - CompileOptions.Webgl2 = this.getDataCheckbox("webgl2"); - CompileOptions.enableIOSPerformancePlus = this.getDataCheckbox("iOSPerformancePlus"); - CompileOptions.enableiOSMetal = this.getDataCheckbox("iOSMetal"); - CompileOptions.enableEmscriptenGLX = this.getDataCheckbox("EmscriptenGLX"); - CompileOptions.fbslim = this.getDataCheckbox("fbslim"); - - CompileOptions.autoAdaptScreen = this.getDataCheckbox("autoAdaptScreen"); - CompileOptions.showMonitorSuggestModal = this.getDataCheckbox("showMonitorSuggestModal"); - CompileOptions.enableProfileStats = this.getDataCheckbox("enableProfileStats"); - CompileOptions.enableRenderAnalysis = this.getDataCheckbox("enableRenderAnalysis"); - CompileOptions.brotliMT = this.getDataCheckbox("brotliMT"); -#if UNITY_6000_0_OR_NEWER - CompileOptions.enableWasm2023 = this.getDataCheckbox("enableWasm2023"); -#endif - CompileOptions.enablePerfAnalysis = this.getDataCheckbox("enablePerfAnalysis"); - } - - private void saveFontOptionsData(FontOptions FontOptions) - { - FontOptions.CJK_Unified_Ideographs = this.getDataCheckbox("CJK_Unified_Ideographs"); - FontOptions.C0_Controls_and_Basic_Latin = this.getDataCheckbox("C0_Controls_and_Basic_Latin"); - FontOptions.CJK_Symbols_and_Punctuation = this.getDataCheckbox("CJK_Symbols_and_Punctuation"); - FontOptions.General_Punctuation = this.getDataCheckbox("General_Punctuation"); - FontOptions.Enclosed_CJK_Letters_and_Months = this.getDataCheckbox("Enclosed_CJK_Letters_and_Months"); - FontOptions.Vertical_Forms = this.getDataCheckbox("Vertical_Forms"); - FontOptions.CJK_Compatibility_Forms = this.getDataCheckbox("CJK_Compatibility_Forms"); - FontOptions.Miscellaneous_Symbols = this.getDataCheckbox("Miscellaneous_Symbols"); - FontOptions.CJK_Compatibility = this.getDataCheckbox("CJK_Compatibility"); - FontOptions.Halfwidth_and_Fullwidth_Forms = this.getDataCheckbox("Halfwidth_and_Fullwidth_Forms"); - FontOptions.Dingbats = this.getDataCheckbox("Dingbats"); - FontOptions.Letterlike_Symbols = this.getDataCheckbox("Letterlike_Symbols"); - FontOptions.Enclosed_Alphanumerics = this.getDataCheckbox("Enclosed_Alphanumerics"); - FontOptions.Number_Forms = this.getDataCheckbox("Number_Forms"); - FontOptions.Currency_Symbols = this.getDataCheckbox("Currency_Symbols"); - FontOptions.Arrows = this.getDataCheckbox("Arrows"); - FontOptions.Geometric_Shapes = this.getDataCheckbox("Geometric_Shapes"); - FontOptions.Mathematical_Operators = this.getDataCheckbox("Mathematical_Operators"); - FontOptions.CustomUnicode = this.getDataInput("CustomUnicode"); - } - - private void deserializeProjectConf(WXProjectConf _ProjectConf, SerializedProperty ProjectConf) - { - _ProjectConf.projectName = ProjectConf.FindPropertyRelative("projectName").stringValue; - _ProjectConf.Appid = ProjectConf.FindPropertyRelative("Appid").stringValue; - _ProjectConf.CDN = ProjectConf.FindPropertyRelative("CDN").stringValue; - _ProjectConf.assetLoadType = ProjectConf.FindPropertyRelative("assetLoadType").intValue; - _ProjectConf.compressDataPackage = ProjectConf.FindPropertyRelative("compressDataPackage").boolValue; - _ProjectConf.VideoUrl = ProjectConf.FindPropertyRelative("VideoUrl").stringValue; - _ProjectConf.Orientation = (WXScreenOritation)ProjectConf.FindPropertyRelative("Orientation").enumValueIndex; - _ProjectConf.relativeDST = ProjectConf.FindPropertyRelative("relativeDST").stringValue; - _ProjectConf.DST = ProjectConf.FindPropertyRelative("DST").stringValue; - - _ProjectConf.bundleHashLength = ProjectConf.FindPropertyRelative("bundleHashLength").intValue; - _ProjectConf.bundlePathIdentifier = ProjectConf.FindPropertyRelative("bundlePathIdentifier").stringValue; - _ProjectConf.bundleExcludeExtensions = ProjectConf.FindPropertyRelative("bundleExcludeExtensions").stringValue; - _ProjectConf.preloadFiles = ProjectConf.FindPropertyRelative("preloadFiles").stringValue; - _ProjectConf.bgImageSrc = ProjectConf.FindPropertyRelative("bgImageSrc").stringValue; - _ProjectConf.MemorySize = ProjectConf.FindPropertyRelative("MemorySize").intValue; - _ProjectConf.HideAfterCallMain = ProjectConf.FindPropertyRelative("HideAfterCallMain").boolValue; - _ProjectConf.dataFileSubPrefix = ProjectConf.FindPropertyRelative("dataFileSubPrefix").stringValue; - _ProjectConf.maxStorage = ProjectConf.FindPropertyRelative("maxStorage").intValue; - _ProjectConf.defaultReleaseSize = ProjectConf.FindPropertyRelative("defaultReleaseSize").intValue; - _ProjectConf.texturesHashLength = ProjectConf.FindPropertyRelative("texturesHashLength").intValue; - _ProjectConf.texturesPath = ProjectConf.FindPropertyRelative("texturesPath").stringValue; - _ProjectConf.needCacheTextures = ProjectConf.FindPropertyRelative("needCacheTextures").boolValue; - _ProjectConf.loadingBarWidth = ProjectConf.FindPropertyRelative("loadingBarWidth").intValue; - _ProjectConf.needCheckUpdate = ProjectConf.FindPropertyRelative("needCheckUpdate").boolValue; - _ProjectConf.disableHighPerformanceFallback = ProjectConf.FindPropertyRelative("disableHighPerformanceFallback").boolValue; - } - private void serializeProjectConf(WXProjectConf _ProjectConf, SerializedProperty ProjectConf) - { - ProjectConf.FindPropertyRelative("projectName").stringValue = _ProjectConf.projectName; - ProjectConf.FindPropertyRelative("Appid").stringValue = _ProjectConf.Appid; - ProjectConf.FindPropertyRelative("CDN").stringValue = _ProjectConf.CDN; - ProjectConf.FindPropertyRelative("assetLoadType").intValue = _ProjectConf.assetLoadType; - ProjectConf.FindPropertyRelative("compressDataPackage").boolValue = _ProjectConf.compressDataPackage; - ProjectConf.FindPropertyRelative("VideoUrl").stringValue = _ProjectConf.VideoUrl; - ProjectConf.FindPropertyRelative("Orientation").enumValueIndex = (int)_ProjectConf.Orientation; - ProjectConf.FindPropertyRelative("relativeDST").stringValue = _ProjectConf.relativeDST; - ProjectConf.FindPropertyRelative("DST").stringValue = _ProjectConf.DST; - - ProjectConf.FindPropertyRelative("bundleHashLength").intValue = _ProjectConf.bundleHashLength; - ProjectConf.FindPropertyRelative("bundlePathIdentifier").stringValue = _ProjectConf.bundlePathIdentifier; - ProjectConf.FindPropertyRelative("bundleExcludeExtensions").stringValue = _ProjectConf.bundleExcludeExtensions; - ProjectConf.FindPropertyRelative("preloadFiles").stringValue = _ProjectConf.preloadFiles; - ProjectConf.FindPropertyRelative("bgImageSrc").stringValue = _ProjectConf.bgImageSrc; - ProjectConf.FindPropertyRelative("MemorySize").intValue = _ProjectConf.MemorySize; - ProjectConf.FindPropertyRelative("HideAfterCallMain").boolValue = _ProjectConf.HideAfterCallMain; - ProjectConf.FindPropertyRelative("dataFileSubPrefix").stringValue = _ProjectConf.dataFileSubPrefix; - ProjectConf.FindPropertyRelative("maxStorage").intValue = _ProjectConf.maxStorage; - ProjectConf.FindPropertyRelative("defaultReleaseSize").intValue = _ProjectConf.defaultReleaseSize; - ProjectConf.FindPropertyRelative("texturesHashLength").intValue = _ProjectConf.texturesHashLength; - ProjectConf.FindPropertyRelative("texturesPath").stringValue = _ProjectConf.texturesPath; - ProjectConf.FindPropertyRelative("needCacheTextures").boolValue = _ProjectConf.needCacheTextures; - ProjectConf.FindPropertyRelative("loadingBarWidth").intValue = _ProjectConf.loadingBarWidth; - ProjectConf.FindPropertyRelative("needCheckUpdate").boolValue = _ProjectConf.needCheckUpdate; - ProjectConf.FindPropertyRelative("disableHighPerformanceFallback").boolValue = _ProjectConf.disableHighPerformanceFallback; - - //miniGameProperty.FindPropertyRelative("m_AutomaticFillInstantGame").boolValue = getDataCheckbox("m_AutomaticFillInstantGame"); - - } - - private void deserializeSDKOptions(SDKOptions _SDKOptions, SerializedProperty SDKOptions) - { - _SDKOptions.UseFriendRelation = SDKOptions.FindPropertyRelative("UseFriendRelation").boolValue; - _SDKOptions.UseMiniGameChat = SDKOptions.FindPropertyRelative("UseMiniGameChat").boolValue; - _SDKOptions.PreloadWXFont = SDKOptions.FindPropertyRelative("PreloadWXFont").boolValue; - _SDKOptions.disableMultiTouch = SDKOptions.FindPropertyRelative("disableMultiTouch").boolValue; - } - private void serializeSDKOptions(SDKOptions _SDKOptionsf, SerializedProperty SDKOptions) - { - SDKOptions.FindPropertyRelative("UseFriendRelation").boolValue = _SDKOptionsf.UseFriendRelation; - SDKOptions.FindPropertyRelative("UseMiniGameChat").boolValue = _SDKOptionsf.UseMiniGameChat; - SDKOptions.FindPropertyRelative("PreloadWXFont").boolValue = _SDKOptionsf.PreloadWXFont; - SDKOptions.FindPropertyRelative("disableMultiTouch").boolValue = _SDKOptionsf.disableMultiTouch; - } - - private void deserializeCompileOptions(CompileOptions _CompileOptions, SerializedProperty CompileOptions) - { - //CompileOptions.FindPropertyRelative("DevelopBuild").boolValue = serializedObject.FindProperty("m_PlatformSettings").FindPropertyRelative("m_Development").boolValue; - _CompileOptions.DevelopBuild = CompileOptions.FindPropertyRelative("DevelopBuild").boolValue; - _CompileOptions.AutoProfile = CompileOptions.FindPropertyRelative("AutoProfile").boolValue; - _CompileOptions.ScriptOnly = CompileOptions.FindPropertyRelative("ScriptOnly").boolValue; - _CompileOptions.Il2CppOptimizeSize = CompileOptions.FindPropertyRelative("Il2CppOptimizeSize").boolValue; - _CompileOptions.profilingFuncs = CompileOptions.FindPropertyRelative("profilingFuncs").boolValue; - _CompileOptions.ProfilingMemory = CompileOptions.FindPropertyRelative("ProfilingMemory").boolValue; - _CompileOptions.DeleteStreamingAssets = CompileOptions.FindPropertyRelative("DeleteStreamingAssets").boolValue; - _CompileOptions.CleanBuild = CompileOptions.FindPropertyRelative("CleanBuild").boolValue; - _CompileOptions.CustomNodePath = CompileOptions.FindPropertyRelative("CustomNodePath").stringValue; - _CompileOptions.Webgl2 = CompileOptions.FindPropertyRelative("Webgl2").boolValue; - _CompileOptions.enableIOSPerformancePlus = CompileOptions.FindPropertyRelative("enableIOSPerformancePlus").boolValue; - _CompileOptions.enableiOSMetal = CompileOptions.FindPropertyRelative("enableiOSMetal").boolValue; - _CompileOptions.enableEmscriptenGLX = CompileOptions.FindPropertyRelative("enableEmscriptenGLX").boolValue; - _CompileOptions.fbslim = CompileOptions.FindPropertyRelative("fbslim").boolValue; - - _CompileOptions.autoAdaptScreen = CompileOptions.FindPropertyRelative("autoAdaptScreen").boolValue; - _CompileOptions.showMonitorSuggestModal = CompileOptions.FindPropertyRelative("showMonitorSuggestModal").boolValue; - _CompileOptions.enableProfileStats = CompileOptions.FindPropertyRelative("enableProfileStats").boolValue; - _CompileOptions.enableRenderAnalysis = CompileOptions.FindPropertyRelative("enableRenderAnalysis").boolValue; - _CompileOptions.brotliMT = CompileOptions.FindPropertyRelative("brotliMT").boolValue; -#if UNITY_6000_0_OR_NEWER - _CompileOptions.enableWasm2023 = CompileOptions.FindPropertyRelative("enableWasm2023").boolValue; -#endif - _CompileOptions.enablePerfAnalysis = CompileOptions.FindPropertyRelative("enablePerfAnalysis").boolValue; - } - private void serializeCompileOptions(CompileOptions _CompileOptions, SerializedProperty CompileOptions) - { - //CompileOptions.FindPropertyRelative("DevelopBuild").boolValue = serializedObject.FindProperty("m_PlatformSettings").FindPropertyRelative("m_Development").boolValue; - CompileOptions.FindPropertyRelative("AutoProfile").boolValue = _CompileOptions.AutoProfile; - CompileOptions.FindPropertyRelative("ScriptOnly").boolValue = _CompileOptions.ScriptOnly; - CompileOptions.FindPropertyRelative("Il2CppOptimizeSize").boolValue = _CompileOptions.Il2CppOptimizeSize; - CompileOptions.FindPropertyRelative("profilingFuncs").boolValue = _CompileOptions.profilingFuncs; - CompileOptions.FindPropertyRelative("ProfilingMemory").boolValue = _CompileOptions.ProfilingMemory; - CompileOptions.FindPropertyRelative("DeleteStreamingAssets").boolValue = _CompileOptions.DeleteStreamingAssets; - CompileOptions.FindPropertyRelative("CleanBuild").boolValue = _CompileOptions.CleanBuild; - CompileOptions.FindPropertyRelative("CustomNodePath").stringValue = _CompileOptions.CustomNodePath; - CompileOptions.FindPropertyRelative("Webgl2").boolValue = _CompileOptions.Webgl2; - CompileOptions.FindPropertyRelative("enableIOSPerformancePlus").boolValue = _CompileOptions.enableIOSPerformancePlus; - CompileOptions.FindPropertyRelative("enableiOSMetal").boolValue = _CompileOptions.enableiOSMetal; - CompileOptions.FindPropertyRelative("enableEmscriptenGLX").boolValue = _CompileOptions.enableEmscriptenGLX; - CompileOptions.FindPropertyRelative("fbslim").boolValue = _CompileOptions.fbslim; - - CompileOptions.FindPropertyRelative("autoAdaptScreen").boolValue = _CompileOptions.autoAdaptScreen; - CompileOptions.FindPropertyRelative("showMonitorSuggestModal").boolValue = _CompileOptions.showMonitorSuggestModal; - CompileOptions.FindPropertyRelative("enableProfileStats").boolValue = _CompileOptions.enableProfileStats; - CompileOptions.FindPropertyRelative("enableRenderAnalysis").boolValue = _CompileOptions.enableRenderAnalysis; - CompileOptions.FindPropertyRelative("brotliMT").boolValue = _CompileOptions.brotliMT; - - } - - private void deserializeFontOptions(FontOptions _FontOptions, SerializedProperty FontOptions) - { - _FontOptions.CJK_Unified_Ideographs = FontOptions.FindPropertyRelative("CJK_Unified_Ideographs").boolValue; - _FontOptions.C0_Controls_and_Basic_Latin = FontOptions.FindPropertyRelative("C0_Controls_and_Basic_Latin").boolValue; - _FontOptions.CJK_Symbols_and_Punctuation = FontOptions.FindPropertyRelative("CJK_Symbols_and_Punctuation").boolValue; - _FontOptions.General_Punctuation = FontOptions.FindPropertyRelative("General_Punctuation").boolValue; - _FontOptions.Enclosed_CJK_Letters_and_Months = FontOptions.FindPropertyRelative("Enclosed_CJK_Letters_and_Months").boolValue; - _FontOptions.Vertical_Forms = FontOptions.FindPropertyRelative("Vertical_Forms").boolValue; - _FontOptions.CJK_Compatibility_Forms = FontOptions.FindPropertyRelative("CJK_Compatibility_Forms").boolValue; - _FontOptions.Miscellaneous_Symbols = FontOptions.FindPropertyRelative("Miscellaneous_Symbols").boolValue; - _FontOptions.CJK_Compatibility = FontOptions.FindPropertyRelative("CJK_Compatibility").boolValue; - _FontOptions.Halfwidth_and_Fullwidth_Forms = FontOptions.FindPropertyRelative("Halfwidth_and_Fullwidth_Forms").boolValue; - _FontOptions.Dingbats = FontOptions.FindPropertyRelative("Dingbats").boolValue; - _FontOptions.Letterlike_Symbols = FontOptions.FindPropertyRelative("Letterlike_Symbols").boolValue; - _FontOptions.Enclosed_Alphanumerics = FontOptions.FindPropertyRelative("Enclosed_Alphanumerics").boolValue; - _FontOptions.Number_Forms = FontOptions.FindPropertyRelative("Number_Forms").boolValue; - _FontOptions.Currency_Symbols = FontOptions.FindPropertyRelative("Currency_Symbols").boolValue; - _FontOptions.Arrows = FontOptions.FindPropertyRelative("Arrows").boolValue; - _FontOptions.Geometric_Shapes = FontOptions.FindPropertyRelative("Geometric_Shapes").boolValue; - _FontOptions.Mathematical_Operators = FontOptions.FindPropertyRelative("Mathematical_Operators").boolValue; - _FontOptions.CustomUnicode = FontOptions.FindPropertyRelative("CustomUnicode").stringValue; - } - private void serializeFontOptions(FontOptions _FontOptions, SerializedProperty FontOptions) - { - FontOptions.FindPropertyRelative("CJK_Unified_Ideographs").boolValue = _FontOptions.CJK_Unified_Ideographs; - FontOptions.FindPropertyRelative("C0_Controls_and_Basic_Latin").boolValue = _FontOptions.C0_Controls_and_Basic_Latin; - FontOptions.FindPropertyRelative("CJK_Symbols_and_Punctuation").boolValue = _FontOptions.CJK_Symbols_and_Punctuation; - FontOptions.FindPropertyRelative("General_Punctuation").boolValue = _FontOptions.General_Punctuation; - FontOptions.FindPropertyRelative("Enclosed_CJK_Letters_and_Months").boolValue = _FontOptions.Enclosed_CJK_Letters_and_Months; - FontOptions.FindPropertyRelative("Vertical_Forms").boolValue = _FontOptions.Vertical_Forms; - FontOptions.FindPropertyRelative("CJK_Compatibility_Forms").boolValue = _FontOptions.CJK_Compatibility_Forms; - FontOptions.FindPropertyRelative("Miscellaneous_Symbols").boolValue = _FontOptions.Miscellaneous_Symbols; - FontOptions.FindPropertyRelative("CJK_Compatibility").boolValue = _FontOptions.CJK_Compatibility; - FontOptions.FindPropertyRelative("Halfwidth_and_Fullwidth_Forms").boolValue = _FontOptions.Halfwidth_and_Fullwidth_Forms; - FontOptions.FindPropertyRelative("Dingbats").boolValue = _FontOptions.Dingbats; - FontOptions.FindPropertyRelative("Letterlike_Symbols").boolValue = _FontOptions.Letterlike_Symbols; - FontOptions.FindPropertyRelative("Enclosed_Alphanumerics").boolValue = _FontOptions.Enclosed_Alphanumerics; - FontOptions.FindPropertyRelative("Number_Forms").boolValue = _FontOptions.Number_Forms; - FontOptions.FindPropertyRelative("Currency_Symbols").boolValue = _FontOptions.Currency_Symbols; - FontOptions.FindPropertyRelative("Arrows").boolValue = _FontOptions.Arrows; - FontOptions.FindPropertyRelative("Geometric_Shapes").boolValue = _FontOptions.Geometric_Shapes; - FontOptions.FindPropertyRelative("Mathematical_Operators").boolValue = _FontOptions.Mathematical_Operators; - FontOptions.FindPropertyRelative("CustomUnicode").stringValue = _FontOptions.CustomUnicode; - FontOptions.FindPropertyRelative("Arrows").boolValue = _FontOptions.Arrows; - FontOptions.FindPropertyRelative("Geometric_Shapes").boolValue = _FontOptions.Geometric_Shapes; - FontOptions.FindPropertyRelative("Mathematical_Operators").boolValue = _FontOptions.Mathematical_Operators; - FontOptions.FindPropertyRelative("CustomUnicode").stringValue = _FontOptions.CustomUnicode; - } - - private string getDataInput(string target) { if (this.formInputData.ContainsKey(target)) diff --git a/Editor/WXMultiPackageMergeWindow.cs b/Editor/WXMultiPackageMergeWindow.cs new file mode 100644 index 000000000..d18abd042 --- /dev/null +++ b/Editor/WXMultiPackageMergeWindow.cs @@ -0,0 +1,270 @@ +using UnityEngine; +using UnityEditor; +using System.IO; +using System; + +namespace WeChatWASM +{ + /// + /// 多包融合工具面板 + /// UI层实现，业务逻辑调用 WXMultiPackageMergeCore + /// 纯C#实现，无需Node.js + /// + public class WXMultiPackageMergeWindow : EditorWindow + { + // 开发调试插件ID，由 preview:robot 自动更新 + private const string DevPluginId = "fa0437c7ef2edbeccceea93cec2b68d6"; + private static WXEditorScriptObject config; + private Vector2 scrollPosition; + private bool foldStPackage = true; + private bool foldMtPackage = true; + private bool foldMergeOptions = true; + private bool foldAdvancedOptions = true; + + [MenuItem("微信小游戏 / 多包融合工具", false, 2)] + public static void Open() + { + var win = GetWindow(typeof(WXMultiPackageMergeWindow), false, "多包融合工具"); + win.minSize = new Vector2(500, 600); + win.position = new Rect(100, 100, 700, 800); + win.Show(); + } + + private void OnEnable() + { + LoadConfig(); + } + + private void OnFocus() + { + LoadConfig(); + } + + private void LoadConfig() + { + if (config == null) + { + config = UnityUtil.GetEditorConf(); + } + if (config.MultiPackageMerge == null) + { + config.MultiPackageMerge = new MultiPackageMergeConfig(); + } + } + + private void SaveConfig() + { + if (config != null) + { + EditorUtility.SetDirty(config); + } + } + + public void OnGUI() + { + LoadConfig(); + + scrollPosition = EditorGUILayout.BeginScrollView(scrollPosition); + + GUILayout.Space(10); + EditorGUILayout.LabelField("多包融合工具", new GUIStyle(EditorStyles.largeLabel) { fontSize = 18, fontStyle = FontStyle.Bold }); + EditorGUILayout.LabelField("将单线程包(ST)和多线程包(MT)融合为一个支持多线程的小游戏", EditorStyles.wordWrappedLabel); + GUILayout.Space(10); + + // ST包配置 + foldStPackage = EditorGUILayout.Foldout(foldStPackage, "ST包配置 (单线程包)", true, EditorStyles.foldoutHeader); + if (foldStPackage) + { + EditorGUILayout.BeginVertical("box"); + + EditorGUILayout.LabelField("ST包路径", EditorStyles.boldLabel); + EditorGUILayout.BeginHorizontal(); + config.MultiPackageMerge.stPackagePath = EditorGUILayout.TextField(config.MultiPackageMerge.stPackagePath); + if (GUILayout.Button("选择", GUILayout.Width(60))) + { + string path = EditorUtility.OpenFolderPanel("选择ST包目录", config.MultiPackageMerge.stPackagePath, ""); + if (!string.IsNullOrEmpty(path)) + { + config.MultiPackageMerge.stPackagePath = path; + SaveConfig(); + } + } + if (GUILayout.Button("打开", GUILayout.Width(60)) && !string.IsNullOrEmpty(config.MultiPackageMerge.stPackagePath) && Directory.Exists(config.MultiPackageMerge.stPackagePath)) + { + EditorUtility.RevealInFinder(config.MultiPackageMerge.stPackagePath); + } + EditorGUILayout.EndHorizontal(); + + GUILayout.Space(5); + EditorGUILayout.LabelField("ST构建模式", EditorStyles.boldLabel); + string[] stModes = new string[] { "standard (标准模式)", "split (代码分包模式)" }; + int stModeIndex = config.MultiPackageMerge.stMode == "split" ? 1 : 0; + stModeIndex = EditorGUILayout.Popup(stModeIndex, stModes); + config.MultiPackageMerge.stMode = stModeIndex == 1 ? "split" : "standard"; + + EditorGUILayout.EndVertical(); + } + + GUILayout.Space(10); + + // MT包配置 + foldMtPackage = EditorGUILayout.Foldout(foldMtPackage, "MT包配置 (多线程包)", true, EditorStyles.foldoutHeader); + if (foldMtPackage) + { + EditorGUILayout.BeginVertical("box"); + + EditorGUILayout.LabelField("MT包路径", EditorStyles.boldLabel); + EditorGUILayout.BeginHorizontal(); + config.MultiPackageMerge.mtPackagePath = EditorGUILayout.TextField(config.MultiPackageMerge.mtPackagePath); + if (GUILayout.Button("选择", GUILayout.Width(60))) + { + string path = EditorUtility.OpenFolderPanel("选择MT包目录", config.MultiPackageMerge.mtPackagePath, ""); + if (!string.IsNullOrEmpty(path)) + { + config.MultiPackageMerge.mtPackagePath = path; + SaveConfig(); + } + } + if (GUILayout.Button("打开", GUILayout.Width(60)) && !string.IsNullOrEmpty(config.MultiPackageMerge.mtPackagePath) && Directory.Exists(config.MultiPackageMerge.mtPackagePath)) + { + EditorUtility.RevealInFinder(config.MultiPackageMerge.mtPackagePath); + } + EditorGUILayout.EndHorizontal(); + + EditorGUILayout.EndVertical(); + } + + GUILayout.Space(10); + + // 融合选项 + foldMergeOptions = EditorGUILayout.Foldout(foldMergeOptions, "融合选项", true, EditorStyles.foldoutHeader); + if (foldMergeOptions) + { + EditorGUILayout.BeginVertical("box"); + + // 融合模式固定使用 seperateJsCode (JS分离模式) + config.MultiPackageMerge.mergeMode = "seperateJsCode"; + + // 分离文件列表和存放方式已注释，使用默认的 topDir 模式 + // if (config.MultiPackageMerge.mergeMode == "seperateJsCode") + // { + // GUILayout.Space(5); + // EditorGUILayout.LabelField("分离文件列表 (逗号分隔)", EditorStyles.boldLabel); + // config.MultiPackageMerge.seperateFileList = EditorGUILayout.TextField(config.MultiPackageMerge.seperateFileList); + // + // GUILayout.Space(5); + // EditorGUILayout.LabelField("分离文件存放方式", EditorStyles.boldLabel); + // string[] seperateModes = new string[] { "subDir (子目录)", "topDir (顶层目录)" }; + // int seperateModeIndex = config.MultiPackageMerge.seperateMode == "topDir" ? 1 : 0; + // seperateModeIndex = EditorGUILayout.Popup(seperateModeIndex, seperateModes); + // config.MultiPackageMerge.seperateMode = seperateModeIndex == 1 ? "topDir" : "subDir"; + // } + // 强制使用 topDir 模式 + config.MultiPackageMerge.seperateMode = "topDir"; + + GUILayout.Space(5); + EditorGUILayout.LabelField("输出目录", EditorStyles.boldLabel); + EditorGUILayout.BeginHorizontal(); + config.MultiPackageMerge.outputPath = EditorGUILayout.TextField(config.MultiPackageMerge.outputPath); + if (GUILayout.Button("选择", GUILayout.Width(60))) + { + string path = EditorUtility.OpenFolderPanel("选择输出目录", config.MultiPackageMerge.outputPath, ""); + if (!string.IsNullOrEmpty(path)) + { + config.MultiPackageMerge.outputPath = path; + SaveConfig(); + } + } + if (GUILayout.Button("打开", GUILayout.Width(60)) && !string.IsNullOrEmpty(config.MultiPackageMerge.outputPath) && Directory.Exists(config.MultiPackageMerge.outputPath)) + { + EditorUtility.RevealInFinder(config.MultiPackageMerge.outputPath); + } + EditorGUILayout.EndHorizontal(); + + EditorGUILayout.EndVertical(); + } + + // 高级选项仅在非 release 模式下显示 +#if !RELEASE + GUILayout.Space(10); + + // 高级选项 + foldAdvancedOptions = EditorGUILayout.Foldout(foldAdvancedOptions, "高级选项", true, EditorStyles.foldoutHeader); + if (foldAdvancedOptions) + { + EditorGUILayout.BeginVertical("box"); + + EditorGUILayout.LabelField("开发插件 ID (devPluginId)", EditorStyles.boldLabel); + EditorGUILayout.LabelField("用于开发调试的插件 ID，发布时请使用正式插件 ID", EditorStyles.miniLabel); + config.MultiPackageMerge.devPluginId = EditorGUILayout.TextField(config.MultiPackageMerge.devPluginId); + + EditorGUILayout.EndVertical(); + } +#endif + + GUILayout.Space(20); + + // 操作按钮 + EditorGUILayout.BeginHorizontal(); + GUILayout.FlexibleSpace(); + + GUI.backgroundColor = new Color(0.2f, 0.8f, 0.2f); + if (GUILayout.Button("开始融合", GUILayout.Width(150), GUILayout.Height(40))) + { + StartMerge(); + } + GUI.backgroundColor = Color.white; + + GUILayout.FlexibleSpace(); + EditorGUILayout.EndHorizontal(); + + GUILayout.Space(20); + + // 说明文档 + EditorGUILayout.LabelField("使用说明:", EditorStyles.boldLabel); + EditorGUILayout.LabelField( + "1. 准备ST包(单线程包)和MT包(多线程包)\n" + + "2. 分别选择两个包的路径\n" + + "3. 配置融合选项\n" + + "4. 点击\"开始融合\"按钮\n" + + "5. 融合完成后在输出目录查看结果", + EditorStyles.wordWrappedLabel); + + EditorGUILayout.EndScrollView(); + + // 实时保存 + if (GUI.changed) + { + SaveConfig(); + } + } + + private void StartMerge() + { + // 验证配置 + if (!WXMultiPackageMergeCore.ValidateConfig(config.MultiPackageMerge, out string errorMessage)) + { + EditorUtility.DisplayDialog("错误", errorMessage, "确定"); + return; + } + + SaveConfig(); + + // 调用融合逻辑 + WXMultiPackageMergeCore.ExecuteMerge( + config.MultiPackageMerge, + onOutput: (log) => UnityEngine.Debug.Log(log), + onError: (error) => UnityEngine.Debug.LogError(error), + onSuccess: () => + { + EditorUtility.DisplayDialog("成功", $"多包融合完成！\n输出目录: {config.MultiPackageMerge.outputPath}", "确定"); + EditorUtility.RevealInFinder(config.MultiPackageMerge.outputPath); + }, + onFailed: (error) => + { + EditorUtility.DisplayDialog("错误", $"融合失败:\n{error}", "确定"); + } + ); + } + } +} diff --git a/Editor/WXMultiPackageMergeWindow.cs.meta b/Editor/WXMultiPackageMergeWindow.cs.meta new file mode 100644 index 000000000..1d51c2903 --- /dev/null +++ b/Editor/WXMultiPackageMergeWindow.cs.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3a449d1fb46d1b8520f764dc46a52f5c +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Editor/WXPluginVersion.cs b/Editor/WXPluginVersion.cs index 1daae2571..121d98a3d 100644 --- a/Editor/WXPluginVersion.cs +++ b/Editor/WXPluginVersion.cs @@ -2,7 +2,7 @@ namespace WeChatWASM { public class WXPluginVersion { - public static string pluginVersion = "202603160259"; // 这一行不要改他，导出的时候会自动替换 + public static string pluginVersion = "202604081246"; // 这一行不要改他，导出的时候会自动替换 } public class WXPluginConf diff --git a/Editor/wx-editor.dll b/Editor/wx-editor.dll index 4443e0e0d..7cb045d3c 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 71eca6215..5bbd29832 100644 --- a/Editor/wx-editor.xml +++ b/Editor/wx-editor.xml @@ -664,6 +664,11 @@ 是否开启 WebAssembly2023特性 + + + 是否使用多线程 + + 基本汉字 [0x4e00, 0x9fff] https://www.unicode.org/charts/PDF/U4E00.pdf @@ -759,6 +764,51 @@ 自定义需要的Unicode字符 + + + 多包融合配置 + + + + + ST包路径（单线程包） + + + + + MT包路径（多线程包） + + + + + ST模式：standard 或 split + + + + + 融合模式：standard / seperateJsCode，默认使用 seperateJsCode + + + + + JS分离模式下的文件列表（逗号分隔） + + + + + JS分离存放方式：subDir / topDir + + + + + 融合输出目录 + + + + + 开发插件 ID（devPluginId） + + 压缩纹理配置 @@ -774,6 +824,73 @@ 字体配置 + + + 多包融合配置 + + + + + 多包融合核心逻辑类 + 提供多包融合的业务逻辑，不包含UI相关代码 + 使用纯C#实现，无需Node.js + + + + + 验证融合配置 + + 融合配置 + 错误信息输出 + 是否验证通过 + + + + 执行多包融合 + + 融合配置 + 输出回调（日志） + 错误回调 + 成功回调 + 失败回调 + + + + 解析分离文件列表 + + + + + 多包融合引擎 - 纯C#实现 + 替代原Node.js工具的功能 + + + + + 执行多包融合 + + + + + 递归合并两个 JsonData，source 优先，target 补充，冲突时打日志 + + + + + 创建分包配置对象 + + + + + 简单的 JSON 格式化 + + + + + 为 MT 包的 game-mt.js 插入额外配置字段 + 在 CODE_FILE_MD5 之前插入 useOffscreenCanvas 和 CODE_MODULE_NAME + + 试玩项目名 diff --git a/Editor/wx-editor.xml.meta b/Editor/wx-editor.xml.meta index a1b05c6cb..b8a7c516d 100644 --- a/Editor/wx-editor.xml.meta +++ b/Editor/wx-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7330c57dbe403f6a6825fe311f4436ca +guid: 7006a5c591c2e63a2f0bdb755a321651 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/DisableKeyboardInput.cs b/Runtime/DisableKeyboardInput.cs index a0cc2330e..fa300352b 100644 --- a/Runtime/DisableKeyboardInput.cs +++ b/Runtime/DisableKeyboardInput.cs @@ -10,9 +10,7 @@ internal class DisableKeyboardInput : MonoBehaviour private static void OnGameLaunch() { #if !UNITY_EDITOR -#if PLATFORM_PLAYABLEADS - PlayableAdsInput.mobileKeyboardSupport = false; -#elif PLATFORM_WEIXINMINIGAME +#if PLATFORM_WEIXINMINIGAME WeixinMiniGameInput.mobileKeyboardSupport = false; #elif PLATFORM_WEBGL #if UNITY_2022_1_OR_NEWER diff --git a/Runtime/Plugins/SDK-Call-JS-Old.jslib b/Runtime/Plugins/SDK-Call-JS-Old.jslib index b22e40206..09d9ec303 100755 --- a/Runtime/Plugins/SDK-Call-JS-Old.jslib +++ b/Runtime/Plugins/SDK-Call-JS-Old.jslib @@ -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/WxGameDataMonitor.jslib b/Runtime/Plugins/WxGameDataMonitor.jslib index 909f639f2..f9b504c7f 100644 --- a/Runtime/Plugins/WxGameDataMonitor.jslib +++ b/Runtime/Plugins/WxGameDataMonitor.jslib @@ -1,6 +1,5 @@ mergeInto(LibraryManager.library, { JSStartGameDataMonitor: function() { - if (!Module.IsWxGame) return; console.log("call JSStartGameDataMonitor \n"); if (typeof GameGlobal.manager.getGameDataMonitor === 'function') diff --git a/Runtime/Plugins/libemscriptenglx.a b/Runtime/Plugins/libemscriptenglx.a index 6d8ed7386..e5e1841ee 100644 Binary files a/Runtime/Plugins/libemscriptenglx.a and b/Runtime/Plugins/libemscriptenglx.a differ diff --git a/Runtime/Plugins/libemscriptenglx_2021.a b/Runtime/Plugins/libemscriptenglx_2021.a index 115623e8c..8afffee83 100644 Binary files a/Runtime/Plugins/libemscriptenglx_2021.a and b/Runtime/Plugins/libemscriptenglx_2021.a differ diff --git a/Runtime/Plugins/wx-perf.dll b/Runtime/Plugins/wx-perf.dll index 5320d0af3..f889fde44 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 2c9f8ea64..ca962cd45 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 49960d977..2af153258 100644 --- a/Runtime/Plugins/wx-runtime-editor.xml +++ b/Runtime/Plugins/wx-runtime-editor.xml @@ -4,91 +4,6 @@ wx-runtime-editor - - - WX数据保护插件使用示例 - 演示如何使用数据保护功能来保护游戏中的重要数值 - - - - - 示例1：基础用法 - 存储和读取数据 - - - - - 示例2：安全获取数据（推荐方式） - - - - - 示例3：存储复杂对象 - - - - - 示例4：数据管理 - - - - - 数据篡改事件处理 - - - - - 处理数据篡改 - - - - - 示例：玩家属性数据结构 - 注意：使用 JsonUtility 序列化时，必须使用公共字段 - - - - - 游戏货币管理器示例 - 封装常用的货币操作，简化调用 - - - - - 初始化货币数据 - - - - - 获取金币数量 - - - - - 增加金币 - - - - - 消费金币 - - 是否消费成功 - - - - 获取钻石数量 - - - - - 增加钻石 - - - - - 消费钻石 - - 是否消费成功 - Banner 广告,详见 https://developers.weixin.qq.com/minigame/dev/guide/open-ability/ad/banner-ad.html @@ -3204,47 +3119,6 @@  是否结束 - - - 事件ID，开发者自行维护（必需） - - - - - 事件耗时，单位ms（可选）不填时为0 - - - - - 事件结果，默认成功（可选）不填时默认成功 - - - - - reportGameEvent的事件类型 - - - - - 成功事件 - - - - - 失败事件 - - - - - 错误码，文档可见 https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/wx.createPageManager.html - - - - - 错误信息 - - - 从不同渠道获得的OPENLINK字符串 @@ -3270,7 +3144,6 @@ 结果对象的json字符串，各项为实验的相关信息 - 错误信息 @@ -3410,7 +3283,7 @@ 需要基础库： `2.10.0` 小程序版本 可选值： - - 'develop': 开发版，提交代码审核时默认使用开发版进行审核。; + - 'develop': 开发版; - 'trial': 体验版; - 'release': 正式版; @@ -3486,11 +3359,6 @@ 允许微信读写日历的开关 - - - PC 内核版本号，仅在 PC 端存在该值 - - 客户端基础库版本 @@ -3593,14 +3461,6 @@ 客户端平台 - 可选值： - - 'ios': iOS微信（包含 iPhone、iPad）; - - 'android': Android微信; - - 'ohos': HarmonyOS 手机端微信; - - 'ohos_pc': HarmonyOS PC微信; - - 'windows': Windows微信; - - 'mac': macOS微信; - - 'devtools': 微信开发者工具; @@ -3608,16 +3468,6 @@ 操作系统及版本 - - - 当前是否处于直接广告中 - - - - - 当前是否处于蒙层阶段 - - 需要基础库： `2.20.0` @@ -3684,11 +3534,6 @@ 直播间 id - - - 宿主传递的数据，第三方 app 中运行小游戏时返回 - - 启动小游戏的 query 参数 @@ -3719,11 +3564,6 @@ shareTicket，详见[获取更多转发信息](#) - - - 宿主app对应的场景值 - - 下边界坐标，单位：px @@ -3754,86 +3594,11 @@ 宽度，单位：px - - - 擂台赛组件领奖信息 - - 通知组件信息 - - - 福利组件信息 - - - - - 组件的名称 - - - - - 领取事件详情（只在onOfficialComponentsInfoChange回调中返回） - - - - - 奖励领取结果：1-全部成功, 2-部分成功（礼物达到领取上限）, 3-领奖失败 - - - - - 是否收到了稀有奖励 - - - - - 用户领取的奖励列表 - - - - - 奖励类型：0-道具礼包, 1-微信蓝包, 2-h5商家券, 3-现金红包, 4-小程序券, 5-盲盒 - - - - - 奖励来源信息 - - - - - 获取的奖励数量 - - - - - 道具列表 - - - - - 奖励类型：1-普通奖励, 2-稀有奖励 - - - - - 礼包名称 - - - - - 道具名称 - - - - - 道具数量 - - 组件的布局位置信息 @@ -3849,46 +3614,6 @@ 组件的名称 - - - 可领取的好友礼包数量 - - - - - 可领取的礼包数量 - - - - - 组件的名称 - - - - - 领取事件详情（只在onOfficialComponentsInfoChange回调中返回） - - - - - 礼包描述，只有 gift 类型才有 - - - - - 礼包图标，只有 gift 类型才有 - - - - - 礼包名称，只有 gift 类型才有 - - - - - gift: 礼包, friendGift: 好友礼包 - - 当前占用的空间大小, 单位 KB @@ -4035,8 +3760,7 @@ 可选值： - 'ios': iOS微信（包含 iPhone、iPad）; - 'android': Android微信; - - 'ohos': HarmonyOS 手机端微信; - - 'ohos_pc': HarmonyOS PC微信; + - 'ohos': HarmonyOS微信; - 'windows': Windows微信; - 'mac': macOS微信; - 'devtools': 微信开发者工具; @@ -4691,36 +4415,6 @@ 是否被添加至 「我的小程序」 - - - 错误信息 - - - - - 支付支持信息对象 - - - - - 调用结果信息，格式为 "checkIsSupportMidasPayment:ok" - - - - - 是否支持支付，true 表示支持，false 表示不支持 - - - - - 错误码，0 表示成功 - - - - - 错误信息，"success" 表示成功 - - 最多可以选择的图片张数 @@ -5889,22 +5583,22 @@ 预告状态：0可用 1取消 2已用 - + 敏感数据对应的云 ID，开通[云开发](https://developers.weixin.qq.com/minigame/dev/wxcloud/basis/getting-started.html)的小程序才会返回，可通过云调用直接获取开放数据，详细见[云调用直接获取开放数据](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/signature.html#method-cloud) - + 包括敏感数据在内的完整转发信息的加密数据，详细见[加密数据解密算法](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/signature.html) - + 错误信息 - + 加密算法的初始向量，详细见[加密数据解密算法](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/signature.html) @@ -5999,21 +5693,6 @@ 实验参数数组，不填则获取所有实验参数 - - - 实验ID，标识实验 - - - - - 参数名称 - - - - - 参数值 - - 需要基础库： `3.7.8` @@ -6135,67 +5814,6 @@ 本机局域网子网掩码，基础库 2.24.0 开始支持 - - - 需要基础库： `1.6.0` - 传入 true 会返回高度信息，由于获取高度需要较高精确度，会减慢接口返回速度 - - - - - 需要基础库： `2.9.0` - 高精度定位超时时间(ms)，指定时间内返回最高精度，该值3000ms以上高精度定位才有效果 - - - - - 需要基础库： `2.9.0` - 开启高精度定位 - - - - - wgs84 返回 gps 坐标，gcj02 返回可用于 wx.openLocation 的坐标 - - - - - 位置的精确度，反应与真实位置之间的接近程度，可以理解成10即与真实位置相差10m，越小越精确 - - - - - 需要基础库： `1.2.0` - 高度，单位 m - - - - - 需要基础库： `1.2.0` - 水平精度，单位 m - - - - - 纬度，范围为 -90~90，负数表示南纬 - - - - - 经度，范围为 -180~180，负数表示西经 - - - - - 速度，单位 m/s - - - - - 需要基础库： `1.2.0` - 垂直精度，单位 m（Android 无法获取，返回 0） - - 需要基础库： `2.22.1` @@ -6311,17 +5929,6 @@ - itemSettings 只返回用户勾选过订阅面板中的“总是保持以上选择，不再询问”的订阅消息。 - - - shareTicket，详见[获取更多转发信息](#) - - - - - 需要基础库： `1.9.90` - 超时时间，单位 ms - - 封面广告组件展示状态码 @@ -6868,11 +6475,6 @@ 用短链打开小程序时当前页面携带的查询字符串。小程序中使用时，应在进入页面时调用 `wx.onCopyUrl` 自定义 `query`，退出页面时调用 `wx.offCopyUrl`，防止影响其它页面。 - - - 短链中的自定义标题，显示在小程序名称之后，可以不填 - - 当 手机坐标 X/Y 和 地球 X/Y 重合时，绕着 Z 轴转动的夹角为 alpha，范围值为 [0, 2*PI)。逆时针转动为正。 @@ -6896,21 +6498,6 @@ - 'landscapeReverse': 横屏反方向，以 HOME 键在屏幕左侧为反方向; - - - 当前直玩广告是否由于异常流程而结束（如 下拉/搜索 进入正在直玩广告流程中的游戏） - - - - - 当前是否处于直接广告中 - - - - - 当前是否处于蒙层阶段 - - 错误信息，包含堆栈 @@ -7306,7 +6893,7 @@ - 视频号id（参考格式为：sphcqO59YEPCvoe；查看路径为：微信客户端->我tab->视频号->右上角.-＞视频号名字-视频号ID） + 视频号 id @@ -7626,53 +7213,6 @@ 自定义维度，基础库 v2.14.0 开始支持可选 - - - 错误信息 - | 错误码 | 错误信息 | 说明 | - | - | - | - | - | 0 | 人脸识别成功 | | - | 2002004 | 人脸识别失败 | | - | 2002006 | 用户取消/超时/不同意，导致未完成人脸识别 | | - | 2002007 | 本用户7天内人脸识别已通过，通过日期为XX | | - | 2002008 | 本日已调起过人脸识别或者本月调用次数已达上限 | | - | 2002009 | 无权限发起人脸识别 | | - - - - - 错误码 - | 错误码 | 错误信息 | 说明 | - | - | - | - | - | 0 | 人脸识别成功 | | - | 2002004 | 人脸识别失败 | | - | 2002006 | 用户取消/超时/不同意，导致未完成人脸识别 | | - | 2002007 | 本用户7天内人脸识别已通过，通过日期为XX | | - | 2002008 | 本日已调起过人脸识别或者本月调用次数已达上限 | | - | 2002009 | 无权限发起人脸识别 | | - - - - - 人脸核身会话唯一标识（小程序后台根据「用户实名信息（姓名+身份证）」调用微信后台[getVerifyId](https://developers.weixin.qq.com/miniprogram/dev/server/API/face/api_getverifyid.html)接口获取） - - - - - 错误信息 - | 错误码 | 错误信息 | 说明 | - | - | - | - | - | 0 | 人脸识别完成（需要通过[queryVerifyInfo](https://developers.weixin.qq.com/miniprogram/dev/server/API/face/api_queryverifyinfo.html)接口查询人脸核身真实验证结果） | | - - - - - 错误码 - | 错误码 | 错误信息 | 说明 | - | - | - | - | - | 0 | 人脸识别完成（需要通过[queryVerifyInfo](https://developers.weixin.qq.com/miniprogram/dev/server/API/face/api_queryverifyinfo.html)接口查询人脸核身真实验证结果） | | - - 购买数量。mode=game 时必填。购买数量。详见 [buyQuantity 限制说明](#buyQuantity限制说明)。 @@ -8058,7 +7598,7 @@ - 自定义的登录态。上限 1024 字符。 + 自定义的登录态 diff --git a/Runtime/Plugins/wx-runtime-editor.xml.meta b/Runtime/Plugins/wx-runtime-editor.xml.meta index 4006ea299..38bb9ae1e 100644 --- a/Runtime/Plugins/wx-runtime-editor.xml.meta +++ b/Runtime/Plugins/wx-runtime-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 59f30477a8bb77aeb6d56b69f0799388 +guid: 745942d95ed4495a64bba4eea8162794 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/wx-runtime.dll b/Runtime/Plugins/wx-runtime.dll index b5bebdce2..63e55e05e 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 65fae8683..1464853eb 100644 --- a/Runtime/Plugins/wx-runtime.xml +++ b/Runtime/Plugins/wx-runtime.xml @@ -4,91 +4,12 @@ wx-runtime - + - WX数据保护插件使用示例 - 演示如何使用数据保护功能来保护游戏中的重要数值 + 覆盖unity的PlayerPrefs + 注意：调用均为同步调用， 容易阻塞游戏主线程造成卡顿，不建议频繁调用 - - - 示例1：基础用法 - 存储和读取数据 - - - - - 示例2：安全获取数据（推荐方式） - - - - - 示例3：存储复杂对象 - - - - - 示例4：数据管理 - - - - - 数据篡改事件处理 - - - - - 处理数据篡改 - - - - - 示例：玩家属性数据结构 - 注意：使用 JsonUtility 序列化时，必须使用公共字段 - - - - - 游戏货币管理器示例 - 封装常用的货币操作，简化调用 - - - - - 初始化货币数据 - - - - - 获取金币数量 - - - - - 增加金币 - - - - - 消费金币 - - 是否消费成功 - - - - 获取钻石数量 - - - - - 增加钻石 - - - - - 消费钻石 - - 是否消费成功 - Banner 广告,详见 https://developers.weixin.qq.com/minigame/dev/guide/open-ability/ad/banner-ad.html @@ -3204,47 +3125,6 @@  是否结束 - - - 事件ID，开发者自行维护（必需） - - - - - 事件耗时，单位ms（可选）不填时为0 - - - - - 事件结果，默认成功（可选）不填时默认成功 - - - - - reportGameEvent的事件类型 - - - - - 成功事件 - - - - - 失败事件 - - - - - 错误码，文档可见 https://developers.weixin.qq.com/minigame/dev/api/open-api/openlink/wx.createPageManager.html - - - - - 错误信息 - - - 从不同渠道获得的OPENLINK字符串 @@ -3270,7 +3150,6 @@ 结果对象的json字符串，各项为实验的相关信息 - 错误信息 @@ -3410,7 +3289,7 @@ 需要基础库： `2.10.0` 小程序版本 可选值： - - 'develop': 开发版，提交代码审核时默认使用开发版进行审核。; + - 'develop': 开发版; - 'trial': 体验版; - 'release': 正式版; @@ -3486,11 +3365,6 @@ 允许微信读写日历的开关 - - - PC 内核版本号，仅在 PC 端存在该值 - - 客户端基础库版本 @@ -3593,14 +3467,6 @@ 客户端平台 - 可选值： - - 'ios': iOS微信（包含 iPhone、iPad）; - - 'android': Android微信; - - 'ohos': HarmonyOS 手机端微信; - - 'ohos_pc': HarmonyOS PC微信; - - 'windows': Windows微信; - - 'mac': macOS微信; - - 'devtools': 微信开发者工具; @@ -3608,16 +3474,6 @@ 操作系统及版本 - - - 当前是否处于直接广告中 - - - - - 当前是否处于蒙层阶段 - - 需要基础库： `2.20.0` @@ -3684,11 +3540,6 @@ 直播间 id - - - 宿主传递的数据，第三方 app 中运行小游戏时返回 - - 启动小游戏的 query 参数 @@ -3719,11 +3570,6 @@ shareTicket，详见[获取更多转发信息](#) - - - 宿主app对应的场景值 - - 下边界坐标，单位：px @@ -3754,86 +3600,11 @@ 宽度，单位：px - - - 擂台赛组件领奖信息 - - 通知组件信息 - - - 福利组件信息 - - - - - 组件的名称 - - - - - 领取事件详情（只在onOfficialComponentsInfoChange回调中返回） - - - - - 奖励领取结果：1-全部成功, 2-部分成功（礼物达到领取上限）, 3-领奖失败 - - - - - 是否收到了稀有奖励 - - - - - 用户领取的奖励列表 - - - - - 奖励类型：0-道具礼包, 1-微信蓝包, 2-h5商家券, 3-现金红包, 4-小程序券, 5-盲盒 - - - - - 奖励来源信息 - - - - - 获取的奖励数量 - - - - - 道具列表 - - - - - 奖励类型：1-普通奖励, 2-稀有奖励 - - - - - 礼包名称 - - - - - 道具名称 - - - - - 道具数量 - - 组件的布局位置信息 @@ -3849,46 +3620,6 @@ 组件的名称 - - - 可领取的好友礼包数量 - - - - - 可领取的礼包数量 - - - - - 组件的名称 - - - - - 领取事件详情（只在onOfficialComponentsInfoChange回调中返回） - - - - - 礼包描述，只有 gift 类型才有 - - - - - 礼包图标，只有 gift 类型才有 - - - - - 礼包名称，只有 gift 类型才有 - - - - - gift: 礼包, friendGift: 好友礼包 - - 当前占用的空间大小, 单位 KB @@ -4035,8 +3766,7 @@ 可选值： - 'ios': iOS微信（包含 iPhone、iPad）; - 'android': Android微信; - - 'ohos': HarmonyOS 手机端微信; - - 'ohos_pc': HarmonyOS PC微信; + - 'ohos': HarmonyOS微信; - 'windows': Windows微信; - 'mac': macOS微信; - 'devtools': 微信开发者工具; @@ -4691,36 +4421,6 @@ 是否被添加至 「我的小程序」 - - - 错误信息 - - - - - 支付支持信息对象 - - - - - 调用结果信息，格式为 "checkIsSupportMidasPayment:ok" - - - - - 是否支持支付，true 表示支持，false 表示不支持 - - - - - 错误码，0 表示成功 - - - - - 错误信息，"success" 表示成功 - - 最多可以选择的图片张数 @@ -5889,22 +5589,22 @@ 预告状态：0可用 1取消 2已用 - + 敏感数据对应的云 ID，开通[云开发](https://developers.weixin.qq.com/minigame/dev/wxcloud/basis/getting-started.html)的小程序才会返回，可通过云调用直接获取开放数据，详细见[云调用直接获取开放数据](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/signature.html#method-cloud) - + 包括敏感数据在内的完整转发信息的加密数据，详细见[加密数据解密算法](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/signature.html) - + 错误信息 - + 加密算法的初始向量，详细见[加密数据解密算法](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/signature.html) @@ -5999,21 +5699,6 @@ 实验参数数组，不填则获取所有实验参数 - - - 实验ID，标识实验 - - - - - 参数名称 - - - - - 参数值 - - 需要基础库： `3.7.8` @@ -6135,67 +5820,6 @@ 本机局域网子网掩码，基础库 2.24.0 开始支持 - - - 需要基础库： `1.6.0` - 传入 true 会返回高度信息，由于获取高度需要较高精确度，会减慢接口返回速度 - - - - - 需要基础库： `2.9.0` - 高精度定位超时时间(ms)，指定时间内返回最高精度，该值3000ms以上高精度定位才有效果 - - - - - 需要基础库： `2.9.0` - 开启高精度定位 - - - - - wgs84 返回 gps 坐标，gcj02 返回可用于 wx.openLocation 的坐标 - - - - - 位置的精确度，反应与真实位置之间的接近程度，可以理解成10即与真实位置相差10m，越小越精确 - - - - - 需要基础库： `1.2.0` - 高度，单位 m - - - - - 需要基础库： `1.2.0` - 水平精度，单位 m - - - - - 纬度，范围为 -90~90，负数表示南纬 - - - - - 经度，范围为 -180~180，负数表示西经 - - - - - 速度，单位 m/s - - - - - 需要基础库： `1.2.0` - 垂直精度，单位 m（Android 无法获取，返回 0） - - 需要基础库： `2.22.1` @@ -6311,17 +5935,6 @@ - itemSettings 只返回用户勾选过订阅面板中的“总是保持以上选择，不再询问”的订阅消息。 - - - shareTicket，详见[获取更多转发信息](#) - - - - - 需要基础库： `1.9.90` - 超时时间，单位 ms - - 封面广告组件展示状态码 @@ -6868,11 +6481,6 @@ 用短链打开小程序时当前页面携带的查询字符串。小程序中使用时，应在进入页面时调用 `wx.onCopyUrl` 自定义 `query`，退出页面时调用 `wx.offCopyUrl`，防止影响其它页面。 - - - 短链中的自定义标题，显示在小程序名称之后，可以不填 - - 当 手机坐标 X/Y 和 地球 X/Y 重合时，绕着 Z 轴转动的夹角为 alpha，范围值为 [0, 2*PI)。逆时针转动为正。 @@ -6896,21 +6504,6 @@ - 'landscapeReverse': 横屏反方向，以 HOME 键在屏幕左侧为反方向; - - - 当前直玩广告是否由于异常流程而结束（如 下拉/搜索 进入正在直玩广告流程中的游戏） - - - - - 当前是否处于直接广告中 - - - - - 当前是否处于蒙层阶段 - - 错误信息，包含堆栈 @@ -7306,7 +6899,7 @@ - 视频号id（参考格式为：sphcqO59YEPCvoe；查看路径为：微信客户端->我tab->视频号->右上角.-＞视频号名字-视频号ID） + 视频号 id @@ -7626,53 +7219,6 @@ 自定义维度，基础库 v2.14.0 开始支持可选 - - - 错误信息 - | 错误码 | 错误信息 | 说明 | - | - | - | - | - | 0 | 人脸识别成功 | | - | 2002004 | 人脸识别失败 | | - | 2002006 | 用户取消/超时/不同意，导致未完成人脸识别 | | - | 2002007 | 本用户7天内人脸识别已通过，通过日期为XX | | - | 2002008 | 本日已调起过人脸识别或者本月调用次数已达上限 | | - | 2002009 | 无权限发起人脸识别 | | - - - - - 错误码 - | 错误码 | 错误信息 | 说明 | - | - | - | - | - | 0 | 人脸识别成功 | | - | 2002004 | 人脸识别失败 | | - | 2002006 | 用户取消/超时/不同意，导致未完成人脸识别 | | - | 2002007 | 本用户7天内人脸识别已通过，通过日期为XX | | - | 2002008 | 本日已调起过人脸识别或者本月调用次数已达上限 | | - | 2002009 | 无权限发起人脸识别 | | - - - - - 人脸核身会话唯一标识（小程序后台根据「用户实名信息（姓名+身份证）」调用微信后台[getVerifyId](https://developers.weixin.qq.com/miniprogram/dev/server/API/face/api_getverifyid.html)接口获取） - - - - - 错误信息 - | 错误码 | 错误信息 | 说明 | - | - | - | - | - | 0 | 人脸识别完成（需要通过[queryVerifyInfo](https://developers.weixin.qq.com/miniprogram/dev/server/API/face/api_queryverifyinfo.html)接口查询人脸核身真实验证结果） | | - - - - - 错误码 - | 错误码 | 错误信息 | 说明 | - | - | - | - | - | 0 | 人脸识别完成（需要通过[queryVerifyInfo](https://developers.weixin.qq.com/miniprogram/dev/server/API/face/api_queryverifyinfo.html)接口查询人脸核身真实验证结果） | | - - 购买数量。mode=game 时必填。购买数量。详见 [buyQuantity 限制说明](#buyQuantity限制说明)。 @@ -8058,7 +7604,7 @@ - 自定义的登录态。上限 1024 字符。 + 自定义的登录态 @@ -9567,11 +9113,5 @@ 注册监听录制事件的回调函数。当对应事件触发时，回调函数会被执行 - - - 覆盖unity的PlayerPrefs - 注意：调用均为同步调用， 容易阻塞游戏主线程造成卡顿，不建议频繁调用 - - diff --git a/Runtime/Plugins/wx-runtime.xml.meta b/Runtime/Plugins/wx-runtime.xml.meta index 47bcc2740..2c849fa44 100644 --- a/Runtime/Plugins/wx-runtime.xml.meta +++ b/Runtime/Plugins/wx-runtime.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 33778f932d74b9c0309d7573c86c9e5b +guid: 8c8b9dd4972bf87d5bd40b9496ecae1b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/WX.cs b/Runtime/WX.cs index 6f6c03762..0049afc2d 100644 --- a/Runtime/WX.cs +++ b/Runtime/WX.cs @@ -107,69 +107,6 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.CheckIsAddedToMyMiniProgram(callback); } - /// - /// [wx.checkIsSupportFacialRecognition(Object object)](https://developers.weixin.qq.com/minigame/dev/api/open-api/face/wx.checkIsSupportFacialRecognition.html) - /// 需要基础库： `3.8.12` - /// 检查当前设备是否支持人脸识别能力 - /// **示例代码** - /// ```js - /// wx.checkIsSupportFacialRecognition({ - /// success() { - /// // 支持人脸识别 - /// }, - /// fail() { - /// // 不支持人脸识别 - /// }, - /// }) - /// ``` - /// - public static void CheckIsSupportFacialRecognition(CheckIsSupportFacialRecognitionOption callback) - { - WXSDKManagerHandler.Instance.CheckIsSupportFacialRecognition(callback); - } - - /// - /// [wx.checkIsSupportMidasPayment(Object object)](https://developers.weixin.qq.com/minigame/dev/api/midas-payment/wx.checkIsSupportMidasPayment.html) - /// 需要基础库： `3.10.3` - /// 检查当前环境是否支持虚拟支付。使用前请注意阅读[相关说明](https://developers.weixin.qq.com/minigame/dev/guide/open-ability/virtual-payment/virtual-payment2.html)。 - /// **平台支持说明** - /// - Android、Windows、OHOS 平台：默认支持虚拟支付，接口直接返回支持 - /// - iOS 平台：需满足以下环境要求才可能支持虚拟支付 - /// - 操作系统要求：使用 iPhone 或者 iPad，iOS 15 及以上版本 - /// - 基础库版本要求：3.10.3 及以上 - /// - 客户端版本要求：8.0.68 及以上 - /// - 苹果支付不支持使用沙箱环境，仅支持使用现网环境 - /// **注意事项** - /// 若该 API 都不存在，则 iOS 一定不支持虚拟支付，请保持旧版本逻辑。 - /// **示例代码** - /// ```js - /// if (wx.checkIsSupportMidasPayment) { - /// wx.checkIsSupportMidasPayment({ - /// success(res) { - /// console.log('支持检查结果:', res) - /// if (res.data.allow_pay) { - /// console.log('当前环境支持支付') - /// // 可以继续调用支付相关接口 - /// } else { - /// console.log('当前环境不支持支付') - /// // 请自行适配用户提示文案 - /// } - /// }, - /// fail(err) { - /// console.error('检查支持情况失败:', err) - /// }, - /// complete() { - /// console.log('检查完成') - /// } - /// }) - /// } - /// ``` - /// - public static void CheckIsSupportMidasPayment(CheckIsSupportMidasPaymentOption callback) - { - WXSDKManagerHandler.Instance.CheckIsSupportMidasPayment(callback); - } - /// /// [wx.checkSession(Object object)](https://developers.weixin.qq.com/minigame/dev/api/open-api/login/wx.checkSession.html) /// 检查登录态 session_key 是否过期。 @@ -342,7 +279,7 @@ namespace WeChatWASM /// /// [wx.exitChatTool(Object object)](https://developers.weixin.qq.com/minigame/dev/api/chattool/wx.exitChatTool.html) /// 需要基础库： `3.7.12` - /// 退出聊天工具开放能力模式 + /// 退出聊天工具模式 /// public static void ExitChatTool(ExitChatToolOption callback) { @@ -738,7 +675,6 @@ namespace WeChatWASM /// | 8 | 当天(自然日)赞官方贴子数 | 无需传入 | | /// | 9 | 当天(自然日)评论官方贴子数 | 无需传入 | | /// | 10 | 当天(自然日)发表到本圈子话题的贴子数 | 传入话题id，从mp-游戏圈话题管理处获取 | | - /// | 11 | 用户最近一次推荐游戏时间 | 无需传入 | 秒级时间戳 | | /// **encryptedData 解密后得到的 GameClubData 的结构** /// | 属性 | 类型 | 说明 | /// | ------- | ------- | -------------------------------------- | @@ -755,22 +691,9 @@ namespace WeChatWASM } /// - /// [wx.getGameExptInfo(Object options)](https://developers.weixin.qq.com/minigame/dev/api/data-analysis/wx.getGameExptInfo.html) + /// [wx.getGameExptInfo(Object object)](https://developers.weixin.qq.com/minigame/dev/api/data-analysis/wx.getGameExptInfo.html) /// 需要基础库： `3.8.8` /// 给定实验参数数组，获取对应的实验参数值 - /// **示例代码** - /// ```js - /// wx.getGameExptInfo({ - /// keyList: ['experiment_key1', 'experiment_key2'], - /// success(res) { - /// res.list.forEach((expParam) => { - /// console.log('实验ID:', expParam.expt_id); - /// console.log('参数名:', expParam.param_name); - /// console.log('参数值:', expParam.param_value); - /// }) - /// } - /// }); - /// ``` /// public static void GetGameExptInfo(GetGameExptInfoOption callback) { @@ -867,14 +790,6 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.GetLocalIPAddress(callback); } - /// - /// [wx.getLocation(Object object)](https://developers.weixin.qq.com/minigame/dev/api/location/wx.getLocation.html) - /// - public static void GetLocation(GetLocationOption callback) - { - WXSDKManagerHandler.Instance.GetLocation(callback); - } - /// /// [wx.getNetworkType(Object object)](https://developers.weixin.qq.com/minigame/dev/api/device/network/wx.getNetworkType.html) /// 获取网络类型 @@ -1001,15 +916,6 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.GetSetting(callback); } - /// - /// [wx.getShareInfo(Object object)](https://developers.weixin.qq.com/minigame/dev/api/share/wx.getShareInfo.html) - /// 需要基础库： `1.1.0` - /// - public static void GetShareInfo(GetShareInfoOption callback) - { - WXSDKManagerHandler.Instance.GetShareInfo(callback); - } - /// /// [wx.getShowSplashAdStatus(Object object)](https://developers.weixin.qq.com/minigame/dev/api/ad/wx.getShowSplashAdStatus.html) /// 需要基础库： `3.7.8` @@ -1356,6 +1262,9 @@ namespace WeChatWASM /// 从 2.3.0 版本开始，若用户未点击小程序页面任意位置，则开发者将无法调用此接口自动跳转至其他小程序。 /// ##### 需要用户确认跳转 /// 从 2.3.0 版本开始，在跳转至其他小程序前，将统一增加弹窗，询问是否跳转，用户确认后才可以跳转其他小程序。如果用户点击取消，则回调 `fail cancel`。 + /// ##### 无需声明跳转名单，不限跳转数量（众测中） + /// 1. 从2020年4月24日起，使用跳转其他小程序功能将无需在全局配置中声明跳转名单，调用此接口时将不再校验所跳转的 AppID 是否在 navigateToMiniProgramAppIdList 中。 + /// 2. 从2020年4月24日起，跳转其他小程序将不再受数量限制，使用此功能时请注意遵守运营规范。 /// **运营规范** /// 平台将坚决打击小程序盒子等互推行为，使用此功能时请严格遵守[《微信小程序平台运营规范》](https://developers.weixin.qq.com/miniprogram/product/#_5-10-%E4%BA%92%E6%8E%A8%E8%A1%8C%E4%B8%BA)，若发现小程序违反运营规范将被下架处理。 /// **关于调试** @@ -1791,125 +1700,6 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.ReportScene(callback); } - /// - /// [wx.requestFacialRecognition(Object object)](https://developers.weixin.qq.com/minigame/dev/api/open-api/account-info/wx.requestFacialRecognition.html) - /// 需要基础库： `3.11.2` - /// 腾讯游戏人脸识别验证功能是基于健康系统防沉迷体系，用于识别疑似未成年人冒用成年人账号游玩游戏的行为，是防止未成年人沉迷网络游戏的一项重要措施。本接口是为开通虚拟支付功能的小游戏开发者提供的，此接口是基于人脸识别的未成年人身份核验接口。本次识别是根据用户在腾讯健康系统中留存的实名信息进行验证，结果将直接返回至开发者。 - /// **接口限额** - /// - 超出限额后将返回错误码 2002008（频率控制） - /// - 1天内全部游戏对一个用户只能调起1次人脸识别 - /// - 若用户人脸识别通过：7天内不能再被弹出人脸识别 - /// - 根据小游戏评级每个月限制使用次数，一旦发现恶意滥用接口，会取消使用资格。具体使用次数如下： - /// - S级：300次/月 - /// - A级：100次/月 - /// - B级：30次/月 - /// **处理流程** - /// 人脸识别流程图 - /// **示例代码** - /// ```js - /// // 实际业务场景：防沉迷身份验证 - /// function checkUserIdentity() { - /// wx.requestFacialRecognition({ - /// success(res) { - /// // 场景 1：本次人脸识别通过 - /// // res = { errCode: 0, errMsg: 'ok' } - /// console.log('人脸识别成功:', res) - /// // 允许继续游戏 - /// startGame() - /// }, - /// fail(err) { - /// console.error('人脸识别失败:', err) - /// let tipMessage = '' - /// let shouldBlock = false // 是否需要阻断游戏 - /// // 根据错误码进行不同处理 - /// switch (err.errCode) { - /// case 2002004: - /// // 人脸识别失败（需要阻断） - /// // err = { errCode: 2002004, errMsg: '人脸识别失败' } - /// tipMessage = '识别失败，请稍后重试' - /// shouldBlock = true - /// break - /// case 2002006: - /// // 用户取消/超时/不同意，导致未完成人脸识别（需要阻断） - /// // err = { errCode: 2002006, errMsg: '用户取消' } - /// tipMessage = '您已取消验证，无法继续游戏' - /// shouldBlock = true - /// break - /// case 2002007: - /// // 本用户7天内人脸识别已通过（可以继续游戏） - /// // err = { errCode: 2002007, errMsg: '本用户7天内人脸识别已通过，通过日期为2024-01-15' } - /// tipMessage = '您已完成验证' - /// shouldBlock = false - /// break - /// case 2002008: - /// // 频率控制：本日已调起过人脸识别 or 本月调用次数已达上限（可以继续游戏） - /// // err = { errCode: 2002008, errMsg: '本日已调起过人脸识别' } - /// // 或 err = { errCode: 2002008, errMsg: '本月调用次数已达上限' } - /// tipMessage = '今日验证次数已达上限' - /// shouldBlock = false - /// break - /// case 2002009: - /// // 无权限发起人脸识别（可以继续游戏） - /// // err = { errCode: 2002009, errMsg: '无权限发起人脸识别' } - /// tipMessage = '暂无权限使用此功能' - /// shouldBlock = false - /// break - /// default: - /// // 系统异常等其他错误（可以继续游戏，避免影响正常用户） - /// tipMessage = '系统异常，请稍后重试' - /// shouldBlock = false - /// } - /// if (tipMessage) { - /// wx.showModal({ - /// title: '提示', - /// content: tipMessage, - /// showCancel: false - /// }) - /// } - /// if (shouldBlock) { - /// // 仅对识别失败(2002004)和用户取消(2002006)阻断游戏 - /// restrictGameFeatures() - /// } else { - /// // 其他情况允许继续游戏 - /// startGame() - /// } - /// }, - /// complete(res) { - /// // 无论成功失败均会触发 - /// console.log('人脸识别流程结束:', res) - /// } - /// }) - /// } - /// ``` - /// - public static void RequestFacialRecognition(RequestFacialRecognitionOption callback) - { - WXSDKManagerHandler.Instance.RequestFacialRecognition(callback); - } - - /// - /// [wx.requestFacialVerify(Object object)](https://developers.weixin.qq.com/minigame/dev/api/open-api/face/wx.requestFacialVerify.html) - /// 需要基础库： `3.8.12` - /// 对用户实名信息进行基于生物识别的人脸核身验证 - /// **示例代码** - /// ```js - /// wx.requestFacialVerify({ - /// // 人脸核身会话唯一标识 - /// verifyId: 'xxx', - /// success() { - /// // 人脸核身验证成功，需要通知小程序后台根据本次人脸核身会话唯一标识 verifyId 字段调用微信后台 queryVerifyInfo 接口查询人脸核身真实验证结果。 - /// }, - /// fail() { - /// // 人脸核身验证失败 - /// }, - /// }) - /// ``` - /// - public static void RequestFacialVerify(RequestFacialVerifyOption callback) - { - WXSDKManagerHandler.Instance.RequestFacialVerify(callback); - } - /// /// [wx.requestMidasFriendPayment(Object object)](https://developers.weixin.qq.com/minigame/dev/api/midas-payment/wx.requestMidasFriendPayment.html) /// 需要基础库： `2.11.0` @@ -2253,8 +2043,6 @@ namespace WeChatWASM /// [wx.setDeviceOrientation(Object object)](https://developers.weixin.qq.com/minigame/dev/api/device/orientation/wx.setDeviceOrientation.html) /// 需要基础库： `2.26.0` /// 切换横竖屏。接口调用成功后会触发 wx.onDeviceOrientationChange 事件 - /// **注意** - /// - PC小程序处于全屏时，无法切换横竖屏。 /// public static void SetDeviceOrientation(SetDeviceOrientationOption callback) { @@ -2975,15 +2763,6 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.ReportEvent(eventId, data); } - /// - /// [wx.reportMonitor(string name, number value)](https://developers.weixin.qq.com/minigame/dev/api/data-analysis/wx.reportMonitor.html) - /// 需要基础库： `2.1.2` - /// - public static void ReportMonitor(string name, double value) - { - WXSDKManagerHandler.Instance.ReportMonitor(name, value); - } - /// /// [wx.reportPerformance(Number id, Number value, String|Array dimensions)](https://developers.weixin.qq.com/minigame/dev/api/base/performance/wx.reportPerformance.html) /// 需要基础库： `2.10.0` @@ -3248,7 +3027,6 @@ namespace WeChatWASM /// 监听搜索到新设备的事件 /// **注意** /// - 若在 [wx.onBluetoothDeviceFound](https://developers.weixin.qq.com/minigame/dev/api/device/bluetooth/wx.onBluetoothDeviceFound.html) 回调了某个设备，则此设备会添加到 [wx.getBluetoothDevices](https://developers.weixin.qq.com/minigame/dev/api/device/bluetooth/wx.getBluetoothDevices.html) 接口获取到的数组中。 - /// - 地址变化这个是鸿蒙系统特性，小程序可以不缓存地址，重新搜索连接。 /// **示例代码** /// [在微信开发者工具中查看示例](https://developers.weixin.qq.com/s/pQU51zmz7a3K) /// ```js @@ -3343,34 +3121,6 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.OffDeviceOrientationChange(result); } - /// - /// [wx.onDirectAdStatusChange(function listener)](https://developers.weixin.qq.com/minigame/dev/api/ad/wx.onDirectAdStatusChange.html) - /// 需要基础库： `3.11.2` - /// 监听监听直玩广告状态变化 - /// **示例代码** - /// ```js - /// wx.onDirectAdStatusChange(res => { - /// // 会有如下的几种状态值组合 - /// // a) { isInMask: true, isInDirectGameAd: true } -> 表示当前正在直玩广告 且 未戳破蒙层 - /// // b) { isInMask: false, isInDirectGameAd: true } -> 表示当前正在直玩广告 且 戳破了蒙层 - /// // c) { isInMask: false, isInDirectGameAd: false, isEndByAbnormal: false }, -> 表示倒计时结束了，并且选择了继续玩 - /// // d) { isInMask: false, isInDirectGameAd: false, isEndByAbnormal: true }, -> 表示由于异常流程而结束 - /// console.log(res.isInMask) - /// console.log(res.isInDirectGameAd) - /// console.log(res.isEndByAbnormal) - /// }) - /// ``` - /// - public static void OnDirectAdStatusChange(Action result) - { - WXSDKManagerHandler.Instance.OnDirectAdStatusChange(result); - } - - public static void OffDirectAdStatusChange(Action result) - { - WXSDKManagerHandler.Instance.OffDirectAdStatusChange(result); - } - /// /// [wx.onError(function listener)](https://developers.weixin.qq.com/minigame/dev/api/base/app/app-event/wx.onError.html) /// 监听全局错误事件 @@ -3745,21 +3495,21 @@ namespace WeChatWASM /// 需要基础库： `2.8.1` /// 监听用户主动截屏事件。用户使用系统截屏按键截屏时触发，只能注册一个监听 /// **示例代码** - /// 页面要先调用wx.showShareMenu()来允许调用 /// ```js /// wx.onUserCaptureScreen(function (res) { /// console.log('用户截屏了') /// return { /// query: "parameter=test", // 通过截屏图片打开小程序的query参数 /// promise: new Promise((resolve) => { // 通过promise延时传递小程序的query参数 - /// setTimeout(() => { - /// resolve({ - /// query: "parameter=test2", - /// }) - /// }, 1000) // 在1秒内对query进行解析 - /// }) + /// setTimeout(() => { + /// resolve({ + /// query: "parameter=test2", + /// }) + /// }, 1000) // 在1秒内对query进行解析 + /// }) /// } - /// }) + /// } + /// ) /// ``` /// public static void OnUserCaptureScreen(Action result) @@ -3893,7 +3643,7 @@ namespace WeChatWASM /// /// [wx.onCopyUrl(function listener)](https://developers.weixin.qq.com/minigame/dev/api/share/wx.onCopyUrl.html) /// 需要基础库： `2.14.3` - /// 监听用户点击右上角菜单的「复制链接」按钮时触发的事件。 + /// 监听用户点击右上角菜单的「复制链接」按钮时触发的事件。本接口为 Beta 版本，暂只在 Android 平台支持。 /// public static void OnCopyUrl(Action> callback) { @@ -4081,23 +3831,6 @@ namespace WeChatWASM return WXSDKManagerHandler.GetDeviceInfo(); } - /// - /// [Object wx.getDirectAdStatusSync()](https://developers.weixin.qq.com/minigame/dev/api/ad/wx.getDirectAdStatusSync.html) - /// 需要基础库： `3.11.2` - /// 获取直玩广告组件展示状态。 - /// **示例代码** - /// ```js - /// const statusInfo = wx.getDirectAdStatusSync(); - /// console.log(statusInfo.isInMask) // 当前是否在蒙层阶段 - /// console.log(statusInfo.isInDirectGameAd) // 当前是否在直玩广告中 - /// ``` - /// - /// - public static DirectAdStatusInfo GetDirectAdStatusSync() - { - return WXSDKManagerHandler.GetDirectAdStatusSync(); - } - /// /// [Object wx.getEnterOptionsSync()](https://developers.weixin.qq.com/minigame/dev/api/base/app/life-cycle/wx.getEnterOptionsSync.html) /// 需要基础库： `2.13.2` @@ -4312,19 +4045,19 @@ namespace WeChatWASM } /// - /// [[ImageData](https://developers.weixin.qq.com/minigame/dev/api/render/image/ImageData.html) wx.createImageData(number width, number height, Uint8ClampedArray data)](https://developers.weixin.qq.com/minigame/dev/api/render/image/wx.createImageData.html) + /// [[ImageData](https://developers.weixin.qq.com/minigame/dev/api/render/image/ImageData.html) wx.createImageData(number width, number height)](https://developers.weixin.qq.com/minigame/dev/api/render/image/wx.createImageData.html) /// 需要基础库： `3.4.10` - /// 这里有两种使用方法, 一种是指定ImageData的宽和高, 另外一种使用已有的ImageData的图像二进制数据，来构建新的对象。 + /// 这里有两种使用方法, 一种是指定ImageData的宽和高, 另外一种是使用ImageData, 通过它本身的宽高尺寸来构建新的对象。 /// **示例代码** /// ```js - /// const imageData1 = wx.createImageData(100, 100) - /// const imageData2 = wx.createImageData(imageData1.data, 100, 100) + /// const imageData1 = wx.createImageData(100, 100) + /// const imageData2 = wx.createImageData(imageData1) /// ``` /// /// - public static ImageData CreateImageData(double width, double height, int[] data) + public static ImageData CreateImageData(double width, double height) { - return WXSDKManagerHandler.CreateImageData(width, height, data); + return WXSDKManagerHandler.CreateImageData(width, height); } /// diff --git a/Runtime/WXBase.cs b/Runtime/WXBase.cs index 7f7718edd..69c19104d 100644 --- a/Runtime/WXBase.cs +++ b/Runtime/WXBase.cs @@ -766,16 +766,6 @@ namespace WeChatWASM return WXSDKManagerHandler.Instance.GetCachePath(url); } - /// - /// 临时修复安卓在主线程繁忙时，异步读缓存耗时高，但需关注同步读文件可能导致掉帧 - /// 仅在有需要的情况下主动开启，需要同步读的场景完成后再主动关闭 - /// - /// - public static void SetSyncReadCacheEnabled(bool enabled) - { - WXSDKManagerHandler.Instance.SetSyncReadCacheEnabled(enabled); - } - #endregion /// @@ -1136,14 +1126,6 @@ namespace WeChatWASM { WXSDKManagerHandler.Instance.NotifyMiniProgramPlayableStatus(option); } - /// - /// 上报自定义打点数据 - /// - /// - public static void ReportGameEvent(ReportGameEventOption option) - { - WXSDKManagerHandler.Instance.ReportGameEvent(option); - } #endregion #region 虚拟支付 /// @@ -1155,7 +1137,6 @@ namespace WeChatWASM } #endregion -#region PageManager /// /// [[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) /// 需要基础库： `3.6.7` @@ -1181,22 +1162,12 @@ namespace WeChatWASM { return WXSDKManagerHandler.Instance.CreatePageManager(); } -#endregion -#region 上报 /// public static WXMiniReportManager GetMiniReportManager(GetMiniReportManagerParam param) { return WXSDKManagerHandler.Instance.GetMiniReportManager(param); } -#endregion - -#region 社交特色能力 - public static WXRankManager GetRankManager() { - return WXSDKManagerHandler.Instance.GetRankManager(); - } } } -#endregion - #endif diff --git a/Runtime/WXTouchInputOverride.cs b/Runtime/WXTouchInputOverride.cs index 82a963b51..dc7ca2b6d 100644 --- a/Runtime/WXTouchInputOverride.cs +++ b/Runtime/WXTouchInputOverride.cs @@ -149,9 +149,7 @@ public class WXTouchInputOverride : BaseInput Text text = selectedObject.GetComponent(); if (text != null) { -#if PLATFORM_PLAYABLEADS - PlayableAdsInput.mobileKeyboardSupport = true; -#elif PLATFORM_WEIXINMINIGAME +#if PLATFORM_WEIXINMINIGAME WeixinMiniGameInput.mobileKeyboardSupport = true; #elif PLATFORM_WEBGL #if UNITY_2022_1_OR_NEWER @@ -161,9 +159,7 @@ public class WXTouchInputOverride : BaseInput } else { -#if PLATFORM_PLAYABLEADS - PlayableAdsInput.mobileKeyboardSupport = false; -#elif PLATFORM_WEIXINMINIGAME +#if PLATFORM_WEIXINMINIGAME WeixinMiniGameInput.mobileKeyboardSupport = false; #elif PLATFORM_WEBGL #if UNITY_2022_1_OR_NEWER diff --git a/Runtime/playable-default/check-version.js.meta b/Runtime/playable-default/check-version.js.meta index 3ee1fbe67..5394689c5 100644 --- a/Runtime/playable-default/check-version.js.meta +++ b/Runtime/playable-default/check-version.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: d3d5d2167fc6b91f7fa3e08ea84c3cda + guid: f8e56380c8717e0f63b2b87fcf8ad6cd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/data-package.meta b/Runtime/playable-default/data-package.meta index fb95538b9..8ac80787a 100644 --- a/Runtime/playable-default/data-package.meta +++ b/Runtime/playable-default/data-package.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6c06693e00be3ab1fde2607590ab4e6d +guid: ef1adc3c8a4ce0a362164e7b302c21d3 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 c68b1a91f..8e4da2b2e 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: a02513af1cc852341848d1ee2622c3aa + guid: 5cfbbbf665ae1f231c1413179bb1d380 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/events.js.meta b/Runtime/playable-default/events.js.meta index 0481ed41a..16f892330 100644 --- a/Runtime/playable-default/events.js.meta +++ b/Runtime/playable-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: de11e750d070e1521430f1ea7d7e9b10 + guid: 864541a30712923f5a037d6b394be541 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/game.js.meta b/Runtime/playable-default/game.js.meta index 4b92cef81..cb64808dc 100644 --- a/Runtime/playable-default/game.js.meta +++ b/Runtime/playable-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 75c495849e8b58894c4df4019c28990f + guid: d417c9f20a7823e5fdd6b4f124c26c1a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/game.json.meta b/Runtime/playable-default/game.json.meta index eb5ec6a81..158c425fc 100644 --- a/Runtime/playable-default/game.json.meta +++ b/Runtime/playable-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 2676c806e8720f27b3c91d7b88934aea + guid: b471f26abb4ebbc26a9dc7871a862be3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/playable-fix.js.meta b/Runtime/playable-default/playable-fix.js.meta index 53c145c8e..a2994a6cd 100644 --- a/Runtime/playable-default/playable-fix.js.meta +++ b/Runtime/playable-default/playable-fix.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: f98ab3c051a738848f5f25b3963ff875 + guid: bc1d3fd1a24970595474781f50499498 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/plugin-config.js.meta b/Runtime/playable-default/plugin-config.js.meta index 08bed247a..99ab64722 100644 --- a/Runtime/playable-default/plugin-config.js.meta +++ b/Runtime/playable-default/plugin-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 14b4dacf147a2eb0b690def4fd2a25f8 + guid: f82ac2b3932563458dea2af183513caf DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/plugins.meta b/Runtime/playable-default/plugins.meta index b3393336c..0223119fb 100644 --- a/Runtime/playable-default/plugins.meta +++ b/Runtime/playable-default/plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fdc5a07bfe255668c4bc90b063ab0439 +guid: 340f0aa0cfeafbb6f622f10d3406c4e8 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 2b7584192..e68c60826 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: cc12ac5f1dcfb4041e5b88bdb3d39df1 + guid: 6bb3222466c34d331a132ff0e51523b9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/plugins/screen-adapter.js.meta b/Runtime/playable-default/plugins/screen-adapter.js.meta index 30d3586d0..2a68783b0 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: 3a78826b373fd69d30b14736655164fc + guid: 22191070a15f223c68d00c8a739d32e6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/project.config.json.meta b/Runtime/playable-default/project.config.json.meta index c0d720d1c..2ec9d078c 100644 --- a/Runtime/playable-default/project.config.json.meta +++ b/Runtime/playable-default/project.config.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 7e3a00c4051da2b6217cd8e156b32adc + guid: 5aa89f82bfacd415e7a3eb105a3681fd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/texture-config.js.meta b/Runtime/playable-default/texture-config.js.meta index 2bbf5fa16..e71a268e3 100644 --- a/Runtime/playable-default/texture-config.js.meta +++ b/Runtime/playable-default/texture-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: fa4490b63d04c3666e7d5bd6dbbe4a58 + guid: 2d6660d412bab5cd0ea3014d9c639272 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-namespace.js.meta b/Runtime/playable-default/unity-namespace.js.meta index 2945472bd..8e1f3df0a 100644 --- a/Runtime/playable-default/unity-namespace.js.meta +++ b/Runtime/playable-default/unity-namespace.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 942f7b8a85c48dce854289ad244f3ca4 + guid: 7242be781e59d5ea4c589eef5c7c764c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-playable-plugin.meta b/Runtime/playable-default/unity-playable-plugin.meta index d18d1f76d..ddfb7e2fb 100644 --- a/Runtime/playable-default/unity-playable-plugin.meta +++ b/Runtime/playable-default/unity-playable-plugin.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4dadbfddf470bde3a646527500a79bb6 +guid: 03ed5bb2b96a835abfe7c27d5e036ad8 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 37f7d5cd5..182eb7f68 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: 1516197a3756cc06853320f648bd30f2 + guid: 2bf517728ca3373bf7ef6cb950911481 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk.meta b/Runtime/playable-default/unity-sdk.meta index e69020b1b..b2090d4e0 100644 --- a/Runtime/playable-default/unity-sdk.meta +++ b/Runtime/playable-default/unity-sdk.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b193152a2bbc37d0feda3c6544e7afc8 +guid: 715ff6f13bf3a36f13f44655d0263c47 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/unity-sdk/audio.meta b/Runtime/playable-default/unity-sdk/audio.meta index f4c7747ef..d3f5139a9 100644 --- a/Runtime/playable-default/unity-sdk/audio.meta +++ b/Runtime/playable-default/unity-sdk/audio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b5a694336b7dd91fd242250f890f19b5 +guid: 8ab3bcdf9be0c167735f3172375deb3d 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 d7c4d78d0..d83eb93ff 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: 5f862d1c69deabf4048bebed751c846d + guid: 4702c234e4bc60db5596c887021e79a6 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 1b2ee6429..2a2a99b90 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: 7eb49c157fec3510cca59918268546d6 + guid: 31012aa075cf35b577d4a47a7db11341 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 4d2f50fe9..cb40f5b9f 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: f6eb3ae66cc21f0114a7c9e15ac57d76 + guid: 6479e6ec164cc07746e855a3adf3c529 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 8e85a55bd..d4cf8f8d5 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: 1151cf42fe9e3fe2b444ddddbde08396 + guid: 171d69c0774874220ceddc29b8ff6c55 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 00ac079e0..7202deb3c 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: 2b6db07c37dc2366237d59d8f785fd48 + guid: af35d40ce3b2e357a44a2bb9b7b45753 DefaultImporter: externalObjects: {} userData: 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 9600bc8c0..5d977980d 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: 0e2b29c063f2d000be5dd2313958fa6c + guid: 478fa5c14008007b2ab8c829db723e2b 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 d1144c63b..fc9e2e1dc 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: d34cf0ce316d07409a850c605540a013 + guid: 9a341e77ad232f3b5bcdde8d073d4f22 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 ef3bf7b3a..422077587 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: d91ef4c43c9f3c9a6da9a65b379b5740 + guid: 5a9a0027825b380d4f5916065fdc0ab1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/canvas.js.meta b/Runtime/playable-default/unity-sdk/canvas.js.meta index fb3860152..422ccda48 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: 6660a6a8aacee1f2096340441fdbd3ce + guid: 25c1c333796702ba56006c67eafbadf6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/conf.js.meta b/Runtime/playable-default/unity-sdk/conf.js.meta index 6bab336a1..4af8997e4 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: 119c8bb6b0ad127ed8bac3162a9969f8 + guid: 2486b07d7abf46c6cbdaa624cbfb4a71 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 15fe9bdb1..ea4dcedc0 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: 59d869d78f133094896b88faa762234a + guid: a7ec9ec2226c4467d6bf50ed6c7e1822 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/fix.js.meta b/Runtime/playable-default/unity-sdk/fix.js.meta index 24628b842..2c9076fa4 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: 34d39008817c30ca826af31fc01525e7 + guid: bd0a2f3bfdad33952b631d4524fffe8e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/fs.js.meta b/Runtime/playable-default/unity-sdk/fs.js.meta index 2ea010643..dcb711caa 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: 73a18f6a646fbaf0e8526fc1526ae97a + guid: 929ddfe7a8d5252ce3fd3fd8ce02ce0a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/index.js.meta b/Runtime/playable-default/unity-sdk/index.js.meta index ab924e481..6a2565ab7 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: c9e4678df01d9876b1b0aa336ee45401 + guid: b4cf07874b458c87fe518e6ad32eaf92 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/logger.js.meta b/Runtime/playable-default/unity-sdk/logger.js.meta index 42775c959..e045a18ac 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: c2c849f6ee1aeeb7f9ccc36695a38d24 + guid: 1612ffb6f0370a765a74afd2c485a794 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/mobileKeyboard.meta b/Runtime/playable-default/unity-sdk/mobileKeyboard.meta index af2d906db..c84c3d223 100644 --- a/Runtime/playable-default/unity-sdk/mobileKeyboard.meta +++ b/Runtime/playable-default/unity-sdk/mobileKeyboard.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b2200a16cb9b949081f51aa4fe6807bd +guid: 754dd6fef16c3300ccfffd98913ad098 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 8f0603112..76a3c34a3 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: b89e0228f0375beca9b6d7b1ad95356a + guid: 31a0ff6fb3fca6b4119ca1510edc3d71 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 922378151..2704bb79c 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: c82e223e59fd93811d3aa303bb51f02e + guid: 25706688859ef19d654ae55e2fd10aa3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/recorder.js.meta b/Runtime/playable-default/unity-sdk/recorder.js.meta index 0dc3e8b8d..3efdced64 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: 3c570e4eb7ff538d7aa640fb8c3d02da + guid: e84fdf14f761213077c92cefaed0501b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/resType.js b/Runtime/playable-default/unity-sdk/resType.js index 52ec7f576..a4a98d884 100644 --- a/Runtime/playable-default/unity-sdk/resType.js +++ b/Runtime/playable-default/unity-sdk/resType.js @@ -33,7 +33,6 @@ export const ResType = { phoneCalendarAuthorized: 'string', }, AppBaseInfo: { - PCKernelVersion: 'string', SDKVersion: 'string', enableDebug: 'bool', fontSizeScaleFactor: 'number', @@ -62,10 +61,6 @@ export const ResType = { platform: 'string', system: 'string', }, - DirectAdStatusInfo: { - isInDirectGameAd: 'bool', - isInMask: 'bool', - }, EnterOptionsGame: { apiCategory: 'string', query: 'object', @@ -84,16 +79,12 @@ export const ResType = { feedId: 'string', }, LaunchOptionsGame: { - hostExtraData: 'HostExtraData', query: 'object', referrerInfo: 'EnterOptionsGameReferrerInfo', scene: 'number', chatType: 'number', shareTicket: 'string', }, - HostExtraData: { - host_scene: 'string', - }, ClientRect: { bottom: 'number', height: 'number', @@ -103,50 +94,13 @@ export const ResType = { width: 'number', }, OfficialComponentsInfo: { - challengeRewardsComponentInfo: 'ChallengeRewardsComponentInfo', notificationComponentInfo: 'OfficialComponentInfo', - rewardsComponentInfo: 'RewardsComponentInfo', - }, - ChallengeRewardsComponentInfo: { - name: 'string', - receiveDetail: 'ChallengeReceiveDetail', - }, - ChallengeReceiveDetail: { - awardResult: 'number', - receivedRareReward: 'bool', - userSourceList: 'UserSource[]', - }, - UserSource: { - sourceType: 'number', - source: 'SourceInfo', - sourceNum: 'number', - }, - SourceInfo: { - propList: 'PropInfo[]', - type: 'number', - sourceName: 'string', - }, - PropInfo: { - propName: 'string', - propNum: 'number', }, OfficialComponentInfo: { boundingClientRect: 'ClientRect', isVisible: 'bool', name: 'string', }, - RewardsComponentInfo: { - canReceiveFriendGiftCount: 'number', - canReceiveGiftCount: 'number', - name: 'string', - receiveDetail: 'ReceiveDetail', - }, - ReceiveDetail: { - desc: 'string', - icon: 'string', - name: 'string', - type: 'string', - }, GetStorageInfoSyncOption: { currentSize: 'number', keys: 'string[]', @@ -330,18 +284,6 @@ export const ResType = { added: 'bool', errMsg: 'string', }, - CheckIsSupportMidasPaymentFailCallbackErr: { - errMsg: 'string', - }, - CheckIsSupportMidasPaymentSuccessCallbackResult: { - data: 'CheckIsSupportMidasPaymentSuccessCallbackDataResult', - errMsg: 'string', - }, - CheckIsSupportMidasPaymentSuccessCallbackDataResult: { - allow_pay: 'bool', - err_code: 'number', - err_msg: 'string', - }, ChooseImageSuccessCallbackResult: { tempFilePaths: 'string[]', tempFiles: 'ImageFile[]', @@ -589,7 +531,7 @@ export const ResType = { status: 'number', errMsg: 'string', }, - RequestMidasFriendPaymentSuccessCallbackResult: { + GetChatToolInfoSuccessCallbackResult: { cloudID: 'string', encryptedData: 'string', errMsg: 'string', @@ -633,14 +575,9 @@ export const ResType = { errMsg: 'string', }, GetGameExptInfoSuccessCallbackResult: { - list: 'GameExptInfo[]', + list: 'object', errMsg: 'string', }, - GameExptInfo: { - expt_id: 'number', - param_name: 'string', - param_value: 'string', - }, GetGroupEnterInfoError: { errMsg: 'string', errCode: 'number', @@ -674,16 +611,6 @@ export const ResType = { localip: 'string', netmask: 'string', }, - GetLocationSuccessCallbackResult: { - accuracy: 'number', - altitude: 'number', - horizontalAccuracy: 'number', - latitude: 'number', - longitude: 'number', - speed: 'number', - verticalAccuracy: 'number', - errMsg: 'string', - }, GetNetworkTypeSuccessCallbackResult: { hasSystemProxy: 'bool', networkType: 'string', @@ -837,7 +764,6 @@ export const ResType = { }, OnCopyUrlListenerResult: { query: 'string', - title: 'string', }, OnDeviceMotionChangeListenerResult: { alpha: 'number', @@ -847,11 +773,6 @@ export const ResType = { OnDeviceOrientationChangeListenerResult: { value: 'string', }, - OnDirectAdStatusChangeListenerResult: { - isEndByAbnormal: 'bool', - isInDirectGameAd: 'bool', - isInMask: 'bool', - }, ListenerError: { message: 'string', }, @@ -1006,14 +927,6 @@ export const ResType = { eventType: 'number', branchDim: 'string', }, - FacialRecognitionError: { - errMsg: 'string', - errCode: 'number', - }, - RequestFacialVerifyError: { - errMsg: 'string', - errCode: 'number', - }, MidasFriendPaymentError: { errMsg: 'string', errCode: 'number', @@ -1048,7 +961,7 @@ export const ResType = { errMsg: 'string', }, RequestSubscribeMessageSuccessCallbackResult: { - anyKeyWord: 'object', + anyKeyWord: 'string', errMsg: 'string', }, RequestSubscribeSystemMessageSuccessCallbackResult: { diff --git a/Runtime/playable-default/unity-sdk/resType.js.meta b/Runtime/playable-default/unity-sdk/resType.js.meta index e4d29d04d..2272b5e2c 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: 9a8702f6acee306755d112480d39813c + guid: eb3c33464e2fe6ef33aa1e2bd348f620 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/resTypeOther.js.meta b/Runtime/playable-default/unity-sdk/resTypeOther.js.meta index 5b99b9ca8..85e6258ed 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: 90a536e2c5a0814cc1c58b70c92da9a4 + guid: 84f03f9d5f84935288ca9dfbbddb72f0 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/response.js.meta b/Runtime/playable-default/unity-sdk/response.js.meta index da697a76c..26158ad2e 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: 02830b8246e010bdd89e47fefd9adf6b + guid: 2c77a788c03ce84662f17d1f805b6567 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/sdk.js b/Runtime/playable-default/unity-sdk/sdk.js index 9046d24b0..73ac9f1cf 100644 --- a/Runtime/playable-default/unity-sdk/sdk.js +++ b/Runtime/playable-default/unity-sdk/sdk.js @@ -361,8 +361,7 @@ export default { } ClassOnEventLists[className + functionName][id + eventName].push(callback); // WXVideoDecoder OnEvent 不规范 特殊处理 - // update: 2025.9.27: 严重怀疑之前 WXPageManager 压根没有跑通过事件监听，跑到下面去了 - if (className === 'WXVideoDecoder' || className === 'WXPageManager') { + if (className === 'WXVideoDecoder') { obj[functionName.replace(/^\w/, (a) => a.toLowerCase())](eventName, callback); } else { @@ -385,8 +384,7 @@ export default { } ClassOnEventLists[className + functionName][id + eventName].forEach((v) => { - - if (className === 'WXVideoDecoder' || className === 'WXPageManager') { + if (className === 'WXVideoDecoder') { obj[functionName.replace(/^\w/, (a) => a.toLowerCase())](eventName, v); } else { diff --git a/Runtime/playable-default/unity-sdk/sdk.js.meta b/Runtime/playable-default/unity-sdk/sdk.js.meta index 9dedb472b..6d034cfee 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: 853f4640fa1b8a092c4ccb4669d6971c + guid: 8f5060b13c373ee0cf439e2b270ed39b 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 c177f04e9..50ae7fc7b 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: 24c205c5759ec41da1b00eda2ac42564 + guid: 6f36eec09ef070e25ad54827279f91fc DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/texture.js.meta b/Runtime/playable-default/unity-sdk/texture.js.meta index 9cf4f8537..21af7e1ef 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: 9782628a70978396e495b86274aa398d + guid: 4ad275b4bbf453ae4c0cc4ff9b51915f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/touch.meta b/Runtime/playable-default/unity-sdk/touch.meta index b3ce6d8cc..da1d94f95 100644 --- a/Runtime/playable-default/unity-sdk/touch.meta +++ b/Runtime/playable-default/unity-sdk/touch.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 674bba89e7bc0b330d4920c8a1d2470f +guid: d87c9943504554e788221a4340dd6ed1 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 71cc2b1bc..65384fc71 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: faa496c26f840b60f61ac89b5f564f32 + guid: 29657e51882c85f91950acd4170e7e76 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/util.js.meta b/Runtime/playable-default/unity-sdk/util.js.meta index 0d550a94b..b49f5ab41 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: 6cbac21da9894d5092f47042e7dcab8e + guid: 8a24c2342c5224322c0c4bcfd38c65a2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/utils.js.meta b/Runtime/playable-default/unity-sdk/utils.js.meta index 19d7152b9..e141d0374 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: aa534e5bd9009a4f986abd6cc2ff823b + guid: 1f2e452bb97d8eddf8b6302df8df8a56 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/video.js.meta b/Runtime/playable-default/unity-sdk/video.js.meta index 3f6123120..4fd97b86a 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: 3251c8f50cca5fae20e0e2bbc567bf40 + guid: ce3542f5ba330d8b5e02733fdb31e73a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/unity-sdk/video.meta b/Runtime/playable-default/unity-sdk/video.meta index f65da60aa..407b32535 100644 --- a/Runtime/playable-default/unity-sdk/video.meta +++ b/Runtime/playable-default/unity-sdk/video.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6ee130afc0339063c59da8a830c7663e +guid: 371be3a2a9ec5acfda075e907a479201 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/unity-sdk/video/index.js.meta b/Runtime/playable-default/unity-sdk/video/index.js.meta index 63baed34d..267dad894 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: 30161526e5960c70e6965463a8c98492 + guid: 7ba3ee216bdf08b304d8089bd79cde72 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/wasmcode.meta b/Runtime/playable-default/wasmcode.meta index ba0aa256d..35d268c2b 100644 --- a/Runtime/playable-default/wasmcode.meta +++ b/Runtime/playable-default/wasmcode.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 47d2bb9aac0b87cfdf12358dc192e755 +guid: ba8d69f24ec045b5c416b1e474ca6b86 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/playable-default/wasmcode/game.js.meta b/Runtime/playable-default/wasmcode/game.js.meta index 11e065318..93b715806 100644 --- a/Runtime/playable-default/wasmcode/game.js.meta +++ b/Runtime/playable-default/wasmcode/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 7babfccd3322d8f0bb49bb466cc03624 + guid: 4f8fcc7c63a098e7b355fb11c37fbd06 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/playable-default/weapp-adapter.js.meta b/Runtime/playable-default/weapp-adapter.js.meta index 04b3af04a..dbbb9265a 100644 --- a/Runtime/playable-default/weapp-adapter.js.meta +++ b/Runtime/playable-default/weapp-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: a99dd0e69496ec987fc46d387fee8587 + guid: 77281bc88cd1888fda166ceef80a972b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/check-version.js.meta b/Runtime/wechat-default/check-version.js.meta index 69124942e..6879f2a00 100644 --- a/Runtime/wechat-default/check-version.js.meta +++ b/Runtime/wechat-default/check-version.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: deb969752e56efd1f30292483076fe8d + guid: 1391ce2f8a40cfeb75ab743023b75854 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/data-package.meta b/Runtime/wechat-default/data-package.meta index a2d178242..3812b1bab 100644 --- a/Runtime/wechat-default/data-package.meta +++ b/Runtime/wechat-default/data-package.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 873c3ff5c09c499cea533e76613b289c +guid: 3c0478712dbe2dca9557fc290c88e4d1 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 e3a33d18d..f813c2229 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: b62dfcd3bba0143fe64bb393b6718200 + guid: 63cada06c61677307e09748fdd5398da DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/events.js.meta b/Runtime/wechat-default/events.js.meta index e2aba010f..3f8919f20 100644 --- a/Runtime/wechat-default/events.js.meta +++ b/Runtime/wechat-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 0f5d268ad00ae324c34a888a2bc0f3b9 + guid: 7a8e0aab9945e4729edcb760f98d5c75 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.js.meta b/Runtime/wechat-default/game.js.meta index 88a17a104..623cbe250 100644 --- a/Runtime/wechat-default/game.js.meta +++ b/Runtime/wechat-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: c4b7634dc3628a25ae87b92a174f5056 + guid: e7acc0476b06155f7208bbabe6f2090a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.json b/Runtime/wechat-default/game.json index 078c0d1ed..7916885b2 100644 --- a/Runtime/wechat-default/game.json +++ b/Runtime/wechat-default/game.json @@ -23,7 +23,7 @@ ], "plugins": { "UnityPlugin": { - "version": "1.2.91", + "version": "1.2.84", "provider": "wxe5a48f1ed5f544b7", "contexts": [ { diff --git a/Runtime/wechat-default/game.json.meta b/Runtime/wechat-default/game.json.meta index 71ff9558f..39da182c2 100644 --- a/Runtime/wechat-default/game.json.meta +++ b/Runtime/wechat-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: acc81d1c264bc0dadd4552d59e6b5cc0 + guid: 937807cc012aa923262734d128716e29 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images.meta b/Runtime/wechat-default/images.meta index a759e39d2..16d479330 100644 --- a/Runtime/wechat-default/images.meta +++ b/Runtime/wechat-default/images.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 304fa8442a722ea29aaf75c80ecf36d0 +guid: f632d7cc5ec5edec67e2e7a85306add6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/images/background.jpg.meta b/Runtime/wechat-default/images/background.jpg.meta index 84907c342..1dc8f8a4c 100644 --- a/Runtime/wechat-default/images/background.jpg.meta +++ b/Runtime/wechat-default/images/background.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 07577f5e35b0d9d10be3e7da2f636244 + guid: 2d723c2841188f376b2bfd7560d599fd DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/unity_logo.png.meta b/Runtime/wechat-default/images/unity_logo.png.meta index 3bc5caad9..82a927311 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: 90f5231878ca8f4be00b3ce66b678dd1 + guid: fc6f41f74970d77dcf189a2aa806bcd0 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data.meta b/Runtime/wechat-default/open-data.meta index 407e58d88..8768bb855 100644 --- a/Runtime/wechat-default/open-data.meta +++ b/Runtime/wechat-default/open-data.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f54994eb4369a71edd1d509002ad2f14 +guid: 4249da690ce1c35e4d12518151a3c564 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/open-data/data.meta b/Runtime/wechat-default/open-data/data.meta index 8b4d35470..86a8400f3 100644 --- a/Runtime/wechat-default/open-data/data.meta +++ b/Runtime/wechat-default/open-data/data.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 48fbcdad3f9d3b9f921019659939b17c +guid: 3d02a7524fa125445249df48ae2b5124 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 a38acefeb..ba1ad7050 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: 116976e02bc785ec509b059f15a5826b + guid: 3517fed75fb91ab35f3ec1065ccb2317 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 63fc5362d..4325f533b 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: 39b854a719f26a74ceafd3208b3d1559 + guid: 3f47f31ae94e18e85bc3e5c6635c21bb DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/index.js.meta b/Runtime/wechat-default/open-data/index.js.meta index f513e21c5..a4df8906a 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: 71c319aa5539d8cc938c59c1f95015a2 + guid: c5342465a8540308e3f7452c1debf7d1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/loading.js.meta b/Runtime/wechat-default/open-data/loading.js.meta index 654458fb3..8ec0fc281 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: 4c4cd8fe6d78dca85ddf042297dbfa8e + guid: d3e63d512ef41b9f3625fe712192bbbe DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render.meta b/Runtime/wechat-default/open-data/render.meta index f38c2a239..e6f31f104 100644 --- a/Runtime/wechat-default/open-data/render.meta +++ b/Runtime/wechat-default/open-data/render.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bfe81ba23a1b4042745b051435b5580c +guid: 3f8f4838d5e28f3ce12996efc637d67f 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 0dfdf02e4..f0808bbbd 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: b2047abd88a0e4c828645361f0825461 +guid: e6344a909140e8859a320cb674155902 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 21836350e..0b213698e 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: 05954e3656c1b42399214f7a474e1dc3 + guid: b090abb66f9e2a8f78034ea05d4d0436 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 ef8a18a7c..511efc95a 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: a10c90dec186b4fb6907d4c144ee7ab5 + guid: 0be4fcf78856b22a3038476b3d3c0d3b 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 b91ed14fb..fca443300 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: 9aa5b725da3747ea7fdd3007c9fc1e9a + guid: 6b4970cde3e0a4967d33844f70f3a8c0 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 d338d6aee..152b5299f 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: 3af9f84d877d17c7ba3a46100af46468 + guid: 119d5dc41c7a1fafa1cfe44b06346d5a 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 02b41f253..7f2f76637 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: 55b4fb765fdc8b3266dd1a0bbc43e676 + guid: 8cd8ea3de706ff839f14937b1c1cbdba 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 cb120a372..f00da449d 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: 00afcfdfb3003edd8e2b656b605b3ffa + guid: 33c82d2374ca3d01fc836ed5667d7336 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 f4277baa1..aef4aa568 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: 89cb03c9ed8a7e361bce00ef148ccbf2 + guid: 53fc20668d126e168815b55d5891983a 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 38398ff45..480dace5c 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: 59e31d5214092a6aac6c531551853ca0 + guid: 0f462217b8760e426b897dceaf0cbe7e 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 45d0d4685..6a489339d 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: 4a5a798604b6be679069a20a57e11ae1 + guid: f7b6e4b95a938c7abda6307c7cc96119 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 fd027e578..7e86e3906 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: 9a5673030b9bf70f70afdca6c803b04c + guid: e1e6f8b646697199dd85934d8489801c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/styles.meta b/Runtime/wechat-default/open-data/render/styles.meta index 80c139eb2..577caa770 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: a58425242d56601ca5e7a8bf142541f6 +guid: 18bd7e29b419338b6fcbd82299253b40 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 50c297394..38c2cfb40 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: 29cded948b6b950b5355ab9df10b67f1 + guid: 9d1163cc5245768ac8aa05af122c67f6 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 5809ce348..04046f64f 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: f6bd670007bd1d4bc41da7f15fb61de3 + guid: 7553c8d5cb1d3d622e723a1cef4d621a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/tpls.meta b/Runtime/wechat-default/open-data/render/tpls.meta index 733956fcb..06a477f9f 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: 5f46ee06f252207d0c6c78773d336387 +guid: 7a50c6203b83ad9b40edc636f6ae838f 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 c870e9e55..eb3976ef3 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: 6b99f11c83f8a7a71c350d75494fe556 + guid: 2abd7df8e5e87359c685ec3680f4a7e2 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 3510e5d57..fe492fa86 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: ff57ccfe8dab7a471b52563b9972e2c3 + guid: 78da5e214321d3154bdfea5d3bd44107 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugin-config.js.meta b/Runtime/wechat-default/plugin-config.js.meta index 3f17ab3a7..5f4776628 100644 --- a/Runtime/wechat-default/plugin-config.js.meta +++ b/Runtime/wechat-default/plugin-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: f9cf8a7a084a8619a252f84e1fb1f251 + guid: 18116cd50a616e07572fb44402ab45b7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins.meta b/Runtime/wechat-default/plugins.meta index fc981b2a9..d41f28b0f 100644 --- a/Runtime/wechat-default/plugins.meta +++ b/Runtime/wechat-default/plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6a74b91bbf9d4d98c4fff2ffab7a52c9 +guid: 1c299b61736796a7e881dacaec2866b2 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 df1bfdbcb..f09045828 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: 26d8803cf9ba80350590438dd73bc5ca + guid: c5e78fca729d13743d91a95414eae9fb DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/screen-adapter.js.meta b/Runtime/wechat-default/plugins/screen-adapter.js.meta index 49d987b5e..2e4b3c9d9 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: 96a9103f7ec0a0d4fe95340265f74ecf + guid: 45049c62673f67f3e6482f45741324d7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/project.config.json.meta b/Runtime/wechat-default/project.config.json.meta index e49b727e1..ab4cdd126 100644 --- a/Runtime/wechat-default/project.config.json.meta +++ b/Runtime/wechat-default/project.config.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: edb9d40efac2bdc4f79004a24386e758 + guid: f21979e0d41eebbae02030c4ab652021 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/texture-config.js.meta b/Runtime/wechat-default/texture-config.js.meta index 287bac263..cedeb19a6 100644 --- a/Runtime/wechat-default/texture-config.js.meta +++ b/Runtime/wechat-default/texture-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: cee42bcbf2a6dc2f7ee386bdd7e6b7a6 + guid: 62da0a3e832973eb7e50286076b3d199 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-namespace.js.meta b/Runtime/wechat-default/unity-namespace.js.meta index 2b1180e8d..270d68b50 100644 --- a/Runtime/wechat-default/unity-namespace.js.meta +++ b/Runtime/wechat-default/unity-namespace.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 21b27cff06bdcc6455c16b124f88c9ac + guid: dc802072f346b496a1548969d02529d6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk.meta b/Runtime/wechat-default/unity-sdk.meta index 15cc2d141..6e2b8ea36 100644 --- a/Runtime/wechat-default/unity-sdk.meta +++ b/Runtime/wechat-default/unity-sdk.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f5411f494113c860af36d9dc677da755 +guid: c20135f0b25f6273f80f4ce746418d17 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/TCPSocket.meta b/Runtime/wechat-default/unity-sdk/TCPSocket.meta index cfd10c115..28dc916b0 100644 --- a/Runtime/wechat-default/unity-sdk/TCPSocket.meta +++ b/Runtime/wechat-default/unity-sdk/TCPSocket.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 200c2363eb490ac8bd42de6a6152acb7 +guid: 0177fd948f97f5a51400d0291d67386d 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 92d547e00..f48bfbaef 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: c62268f3cbc41cfa6a869aa488b7dcaa + guid: 9ad9610f1b25e8bb563d002126a44427 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/UDPSocket.meta b/Runtime/wechat-default/unity-sdk/UDPSocket.meta index 56dd83b4c..8a9934c4b 100644 --- a/Runtime/wechat-default/unity-sdk/UDPSocket.meta +++ b/Runtime/wechat-default/unity-sdk/UDPSocket.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5d17de8310e96d5659e9eedc881d8caf +guid: 8b4ce3fb2065c1d77ca8419449e54b03 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 b7f7dde93..7e7c59dcf 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: 90de48298fb45b9074181f93ec2daade + guid: 33f5fbb0f7fd8d7f140ff474bf2cdd72 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/ad.js.meta b/Runtime/wechat-default/unity-sdk/ad.js.meta index 63cd9f370..570bd6bc1 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: d111d3fd9892730124f6eb52437251c3 + guid: 35042da8ab67ebd4d01f0b9314a461dc DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio.meta b/Runtime/wechat-default/unity-sdk/audio.meta index cfb18e7e4..a6b165c0d 100644 --- a/Runtime/wechat-default/unity-sdk/audio.meta +++ b/Runtime/wechat-default/unity-sdk/audio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c3df3a78955de8c28dc7c459aded8ff +guid: 162b48d85f270ce64dced3667a6cb743 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 3aef7145c..470dfde20 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: 525f9e24a2e7e928d6d04b11580c04be + guid: bcd553992ae227de825325fd898714e3 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 cf990437b..e6d25e85f 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: 8aca97c9d6119da269ba15f63acfede4 + guid: ab8890cac948bf204b8bff6b58dc35d8 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 22038d6f9..3eecec030 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: 6402c7c79ecacc3240c1adf0319f7c89 + guid: cc8e783915fd3f902fc7d2168f34bbbf 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 8dd92d36f..845a9a04f 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: d500a2aa78215a88443bfe7115e1ccf2 + guid: 6269bf7b074fad7eb06179338f945874 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 ff1c7a51e..fe0f1569c 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: c406972ff66cdfdea6b3856ec52f6e19 + guid: 489508ab9df9444594a800071acc2efd 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 d1198d25e..ba2cb87bb 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: 95da111cd0fd60e43b7cb02a7bc38fd1 + guid: d7cbca722b6c02d3d4149471083f1ef5 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 599eb5742..63d133307 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: 52bb3fb3cd0456b94ed3bd611de4227d + guid: 7ca576d06709693baaba7d0fb1f24d44 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/authorize.js.meta b/Runtime/wechat-default/unity-sdk/authorize.js.meta index ecfee1b34..656e730ae 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: 4a3c2e5d9acbe7daffe66f981f2c8355 + guid: a73101a9f2163a8527dd447ae66a8471 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/bluetooth.meta b/Runtime/wechat-default/unity-sdk/bluetooth.meta index 2830c2a0d..438f82ae4 100644 --- a/Runtime/wechat-default/unity-sdk/bluetooth.meta +++ b/Runtime/wechat-default/unity-sdk/bluetooth.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e3ced4be60a007b23382c35a96c329c8 +guid: 7139d7123b37ee9958c909f3879fe762 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 3bed9bf74..71793c465 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: ea18d2b47acdcd3fbd34ae8a4228936a + guid: 155c7b5c4622feac4adb5b6fadd7ceac DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/camera.js.meta b/Runtime/wechat-default/unity-sdk/camera.js.meta index 3bcf4be7d..aff731f84 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: 2298b5ff5eef247e681f2a1b4a31ced8 + guid: eba98eef91a552c428d22b435a67fbf2 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 cdce1e1c5..f9c5cd664 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: 2d8f13a9dbeca7eab9e20fe95aaf7363 + guid: c6b1e0a4406e0962add2f1cea7407a63 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/canvas.js.meta b/Runtime/wechat-default/unity-sdk/canvas.js.meta index cd2b0a278..1cd31f038 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: 413a48902a2c99154741472fd5f89d1a + guid: 404c25206d401540d135927fc5aedce6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/chat.js.meta b/Runtime/wechat-default/unity-sdk/chat.js.meta index 30a4271f9..8a755182e 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: c86b3be554947b7ad72a89bb5a4920bd + guid: 4a0d9d0a87e944a0c0e7ba6d45235615 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/cloud.js.meta b/Runtime/wechat-default/unity-sdk/cloud.js.meta index 801b1e2c4..9493aca2a 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: 81e2c4a262721de36fabc0e3e8636666 + guid: d1b03a08e70b379ac31049c8e0949986 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/conf.js.meta b/Runtime/wechat-default/unity-sdk/conf.js.meta index aa5e9de9c..454d67b2c 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: a796bbbfc63077cf9c917378f42cc5ce + guid: 442580ae8c2d730e056027b62927b2f4 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 588b02adf..fdf924ef3 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: 9fed21f35a9be181a00d4e1f48df49d4 + guid: 6f3fb44eb28f16370aae2d9e64795aec DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fix.js.meta b/Runtime/wechat-default/unity-sdk/fix.js.meta index f783ca130..8e63d4b88 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: 55859b2ca9b107764ea697eae3e6f33a + guid: 63824f5f28a68f0306fc388ad631dec9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font.meta b/Runtime/wechat-default/unity-sdk/font.meta index 6c3f7076e..632559557 100644 --- a/Runtime/wechat-default/unity-sdk/font.meta +++ b/Runtime/wechat-default/unity-sdk/font.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6b4ad72a189d905586c044d29c3cf484 +guid: a1769ee10b6bb932de8023c280d08d5a 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 9b36cdfcd..e930fd454 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: 0186d384afa80caf0e51eab25c5b010e + guid: d1635371e61a869c136c9e9ae85188e4 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 ad332fdda..0de23ba0c 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: e4dc7847e9f58fea1e593ff983f0f359 + guid: b9a8eca3e83bbe05b585653525a670eb 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 f6bba8af9..d9adfef20 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: dcdf306b70074dd327165ac845156d73 + guid: cac29d93a10100bb5542ee5d4961f8b9 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 3d81b22b6..e259f98fb 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: efb28ec972ad9078ca87cddf5cf95037 + guid: 277ffd63e9bc2b84ef61afe48e888304 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 693261c4f..d6d7e0e31 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: 32b999d9c6c6a3e78a71abd75808cd40 + guid: bfdcd8d014f07fe51b9b9ce1d8747132 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fs.js.meta b/Runtime/wechat-default/unity-sdk/fs.js.meta index 15023f67b..091dc5e99 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: 2690f08b3b083bcc69bfd72d86d61e86 + guid: a072554656f62d1a779904914ce801e4 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 37b493441..a6b115283 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: 972995c9786a741030857bc9ecc6440f + guid: 9704b6d86f91322d216ac797f95aabf1 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 0fac10b46..a2d51d161 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: 5764aa6b5049b3c0b2b1b13f0ee16e94 + guid: d9e88c7d0b63af27a93ec612a6aa1381 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/gyroscope.meta b/Runtime/wechat-default/unity-sdk/gyroscope.meta index 4b488dfe4..588c6f3b2 100644 --- a/Runtime/wechat-default/unity-sdk/gyroscope.meta +++ b/Runtime/wechat-default/unity-sdk/gyroscope.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7f257d8ce4cdba29c20b438fbbaafb2e +guid: 35ac19db5712076533cb85ef1cbe7c88 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 4d3424a3b..be04c9f17 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: 38f16790c9580a28264b8bbb93f61056 + guid: 38675f651b6a4e43d94645e620f18a49 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/index.js.meta b/Runtime/wechat-default/unity-sdk/index.js.meta index 61b7e9557..8a5b5df7e 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: e3b3c6dd61d8c57b1734b263a8673ba8 + guid: 6220a397a7bc163e8328ac9454e6adb6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/logger.js.meta b/Runtime/wechat-default/unity-sdk/logger.js.meta index 3ba21280e..a351ff690 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: 87f83da2d74a47c731c31dd520fee7e8 + guid: 5664cd86f95ed14f5b74976863d43d9d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta b/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta index 2a4e99f66..c383ec907 100644 --- a/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta +++ b/Runtime/wechat-default/unity-sdk/mobileKeyboard.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 25b9ac066940849660126f4ab20e4182 +guid: 8c867c28decf0a670df12bdb14bbc8ff 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 b6c5e7d85..be93dae81 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: 707eedbe7c6973ee2ccfdfb6dd0cec6a + guid: d37a9ec6afbed0a94c173199a9d08826 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 770b6b39e..d5d90ef19 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: 6b1d85d81eae9b38e0dd3aa97254f227 + guid: 7c8f0f300ee92384205e1267878199dc 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 957ab336b..5497c8255 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: ba989a8c2ef29f95456c9f20c4978eae + guid: 79a7e9009f1d1e3ee8e93c54d72bca02 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/recorder.js.meta b/Runtime/wechat-default/unity-sdk/recorder.js.meta index 49a4a3cd4..20ccd8ef9 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: 947f1c70452864cb3b61b43580dc14cf + guid: d18c130879922433d50e64b8ea78c796 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resType.js b/Runtime/wechat-default/unity-sdk/resType.js index 52ec7f576..a4a98d884 100644 --- a/Runtime/wechat-default/unity-sdk/resType.js +++ b/Runtime/wechat-default/unity-sdk/resType.js @@ -33,7 +33,6 @@ export const ResType = { phoneCalendarAuthorized: 'string', }, AppBaseInfo: { - PCKernelVersion: 'string', SDKVersion: 'string', enableDebug: 'bool', fontSizeScaleFactor: 'number', @@ -62,10 +61,6 @@ export const ResType = { platform: 'string', system: 'string', }, - DirectAdStatusInfo: { - isInDirectGameAd: 'bool', - isInMask: 'bool', - }, EnterOptionsGame: { apiCategory: 'string', query: 'object', @@ -84,16 +79,12 @@ export const ResType = { feedId: 'string', }, LaunchOptionsGame: { - hostExtraData: 'HostExtraData', query: 'object', referrerInfo: 'EnterOptionsGameReferrerInfo', scene: 'number', chatType: 'number', shareTicket: 'string', }, - HostExtraData: { - host_scene: 'string', - }, ClientRect: { bottom: 'number', height: 'number', @@ -103,50 +94,13 @@ export const ResType = { width: 'number', }, OfficialComponentsInfo: { - challengeRewardsComponentInfo: 'ChallengeRewardsComponentInfo', notificationComponentInfo: 'OfficialComponentInfo', - rewardsComponentInfo: 'RewardsComponentInfo', - }, - ChallengeRewardsComponentInfo: { - name: 'string', - receiveDetail: 'ChallengeReceiveDetail', - }, - ChallengeReceiveDetail: { - awardResult: 'number', - receivedRareReward: 'bool', - userSourceList: 'UserSource[]', - }, - UserSource: { - sourceType: 'number', - source: 'SourceInfo', - sourceNum: 'number', - }, - SourceInfo: { - propList: 'PropInfo[]', - type: 'number', - sourceName: 'string', - }, - PropInfo: { - propName: 'string', - propNum: 'number', }, OfficialComponentInfo: { boundingClientRect: 'ClientRect', isVisible: 'bool', name: 'string', }, - RewardsComponentInfo: { - canReceiveFriendGiftCount: 'number', - canReceiveGiftCount: 'number', - name: 'string', - receiveDetail: 'ReceiveDetail', - }, - ReceiveDetail: { - desc: 'string', - icon: 'string', - name: 'string', - type: 'string', - }, GetStorageInfoSyncOption: { currentSize: 'number', keys: 'string[]', @@ -330,18 +284,6 @@ export const ResType = { added: 'bool', errMsg: 'string', }, - CheckIsSupportMidasPaymentFailCallbackErr: { - errMsg: 'string', - }, - CheckIsSupportMidasPaymentSuccessCallbackResult: { - data: 'CheckIsSupportMidasPaymentSuccessCallbackDataResult', - errMsg: 'string', - }, - CheckIsSupportMidasPaymentSuccessCallbackDataResult: { - allow_pay: 'bool', - err_code: 'number', - err_msg: 'string', - }, ChooseImageSuccessCallbackResult: { tempFilePaths: 'string[]', tempFiles: 'ImageFile[]', @@ -589,7 +531,7 @@ export const ResType = { status: 'number', errMsg: 'string', }, - RequestMidasFriendPaymentSuccessCallbackResult: { + GetChatToolInfoSuccessCallbackResult: { cloudID: 'string', encryptedData: 'string', errMsg: 'string', @@ -633,14 +575,9 @@ export const ResType = { errMsg: 'string', }, GetGameExptInfoSuccessCallbackResult: { - list: 'GameExptInfo[]', + list: 'object', errMsg: 'string', }, - GameExptInfo: { - expt_id: 'number', - param_name: 'string', - param_value: 'string', - }, GetGroupEnterInfoError: { errMsg: 'string', errCode: 'number', @@ -674,16 +611,6 @@ export const ResType = { localip: 'string', netmask: 'string', }, - GetLocationSuccessCallbackResult: { - accuracy: 'number', - altitude: 'number', - horizontalAccuracy: 'number', - latitude: 'number', - longitude: 'number', - speed: 'number', - verticalAccuracy: 'number', - errMsg: 'string', - }, GetNetworkTypeSuccessCallbackResult: { hasSystemProxy: 'bool', networkType: 'string', @@ -837,7 +764,6 @@ export const ResType = { }, OnCopyUrlListenerResult: { query: 'string', - title: 'string', }, OnDeviceMotionChangeListenerResult: { alpha: 'number', @@ -847,11 +773,6 @@ export const ResType = { OnDeviceOrientationChangeListenerResult: { value: 'string', }, - OnDirectAdStatusChangeListenerResult: { - isEndByAbnormal: 'bool', - isInDirectGameAd: 'bool', - isInMask: 'bool', - }, ListenerError: { message: 'string', }, @@ -1006,14 +927,6 @@ export const ResType = { eventType: 'number', branchDim: 'string', }, - FacialRecognitionError: { - errMsg: 'string', - errCode: 'number', - }, - RequestFacialVerifyError: { - errMsg: 'string', - errCode: 'number', - }, MidasFriendPaymentError: { errMsg: 'string', errCode: 'number', @@ -1048,7 +961,7 @@ export const ResType = { errMsg: 'string', }, RequestSubscribeMessageSuccessCallbackResult: { - anyKeyWord: 'object', + anyKeyWord: 'string', errMsg: 'string', }, RequestSubscribeSystemMessageSuccessCallbackResult: { diff --git a/Runtime/wechat-default/unity-sdk/resType.js.meta b/Runtime/wechat-default/unity-sdk/resType.js.meta index 05277469b..65548a648 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: 7902ec18d20301ca3fa2dbfed7792a1c + guid: 3ca674774be5e4554d2044c8aae0311a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta index 55c59475d..3041785c6 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: dec3ce46096de8834db3ed98536e74e1 + guid: 5c51f4d5dee19f19efeaabb878f7a091 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/response.js.meta b/Runtime/wechat-default/unity-sdk/response.js.meta index 36918d0f8..071a16971 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: 2c05ae6f9561735272fef3e3f6b4ecc9 + guid: 69649c184d7d9686c07e5b7520711c6c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/sdk.js b/Runtime/wechat-default/unity-sdk/sdk.js index 9046d24b0..73ac9f1cf 100644 --- a/Runtime/wechat-default/unity-sdk/sdk.js +++ b/Runtime/wechat-default/unity-sdk/sdk.js @@ -361,8 +361,7 @@ export default { } ClassOnEventLists[className + functionName][id + eventName].push(callback); // WXVideoDecoder OnEvent 不规范 特殊处理 - // update: 2025.9.27: 严重怀疑之前 WXPageManager 压根没有跑通过事件监听，跑到下面去了 - if (className === 'WXVideoDecoder' || className === 'WXPageManager') { + if (className === 'WXVideoDecoder') { obj[functionName.replace(/^\w/, (a) => a.toLowerCase())](eventName, callback); } else { @@ -385,8 +384,7 @@ export default { } ClassOnEventLists[className + functionName][id + eventName].forEach((v) => { - - if (className === 'WXVideoDecoder' || className === 'WXPageManager') { + if (className === 'WXVideoDecoder') { obj[functionName.replace(/^\w/, (a) => a.toLowerCase())](eventName, v); } else { diff --git a/Runtime/wechat-default/unity-sdk/sdk.js.meta b/Runtime/wechat-default/unity-sdk/sdk.js.meta index 8a4e0cd28..6470c726b 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: 301415e3de7d5406a649871fdfde772a + guid: 7618f7570dcc2726df95dfec58ab4f37 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/share.js.meta b/Runtime/wechat-default/unity-sdk/share.js.meta index 89cf8bb33..ea94051d1 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: bb97bd028a4d0c712efa2ba280ab24e0 + guid: 4ecd6d1c6373f62d35472eb6442d3311 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/storage.js.meta b/Runtime/wechat-default/unity-sdk/storage.js.meta index cd6f28a82..e63ea7bd2 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: 97cd600b2fb9ef89d94ba7c0274cc490 + guid: b842d0e9f13223ba956265f2e9ee4dc7 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/texture.js b/Runtime/wechat-default/unity-sdk/texture.js index 242514223..ad06d3ebd 100644 --- a/Runtime/wechat-default/unity-sdk/texture.js +++ b/Runtime/wechat-default/unity-sdk/texture.js @@ -39,15 +39,8 @@ const mod = { if (hasCheckSupportedExtensions) { return GameGlobal.TextureCompressedFormat; } - - const isSupportEmscriptenGLX = wx.env.isSuppportEmscriptenGLX || wx.env.isSupportEmscriptenGLX; - const isWebGL2 = GameGlobal.managerConfig.contextConfig.contextType === 2; - let finalContextType = isWebGL2 ? 'webgl2' : 'webgl'; - if (isSupportEmscriptenGLX) { - finalContextType = isWebGL2 ? 'wxwebgl2' : 'wxwebgl'; - } - const list = canvas - .getContext(finalContextType) + const list = canvas + .getContext(GameGlobal.managerConfig.contextConfig.contextType === 2 ? 'webgl2' : 'webgl') .getSupportedExtensions(); const noneLimitSupportedTextures = ['']; // 兜底采用png GameGlobal.TextureCompressedFormat = ''; diff --git a/Runtime/wechat-default/unity-sdk/texture.js.meta b/Runtime/wechat-default/unity-sdk/texture.js.meta index 15247a7ef..7f2f202c2 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: 8c12a26b5aaf29c9a496493181298ac1 + guid: 8e50fc7c592c198edc1497cb5470c13a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/touch.meta b/Runtime/wechat-default/unity-sdk/touch.meta index 5e0f63569..0f76813a9 100644 --- a/Runtime/wechat-default/unity-sdk/touch.meta +++ b/Runtime/wechat-default/unity-sdk/touch.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2a527e638944a2c7966cca8f883d97a3 +guid: 5f224f5522a01d1398c8446f8f510be2 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 2a916cd9e..63737e4f8 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: d26931ee77b39d82ac4a590215d2d401 + guid: e1cec6ef86c3c80c8697040a2fc635da 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 77eed949a..41140987d 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: 41da85adab1a8375154b0d0cbddcad56 + guid: 1e81db69f358f9a2fd4e51ced07642e4 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/userinfo.js.meta b/Runtime/wechat-default/unity-sdk/userinfo.js.meta index 9b025c9ce..cc5b81486 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: 5290186188fb99f148a0909a6fec0e65 + guid: deeb7f575c6aa989c93db26ab58e5d7c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/util.js b/Runtime/wechat-default/unity-sdk/util.js index ce3058ba6..3108ab050 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 d0b488b4a..5f0af6b04 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: bb38d68a06ebcf4f826db14afe5c86a6 + guid: 2136e9c0fe1af4a5f10a9b9260847e46 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/utils.js.meta b/Runtime/wechat-default/unity-sdk/utils.js.meta index 699f118d2..686ba19d1 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: 86115cda650af5a491322811dd151afa + guid: 5369e51cb948e6373879d2a3e08475eb DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.js.meta b/Runtime/wechat-default/unity-sdk/video.js.meta index bae6f763a..6b5df9cfd 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: ecdfb9c9c051a9e0327f05b356062db0 + guid: a36ac4b81efbddc19fdd36e9ab23fa5d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.meta b/Runtime/wechat-default/unity-sdk/video.meta index 9a0f158b8..1cd371931 100644 --- a/Runtime/wechat-default/unity-sdk/video.meta +++ b/Runtime/wechat-default/unity-sdk/video.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ef797d24859e9a0d7f684b1937e06e3f +guid: 76ea4f679e42cab9046db9d3f9ab3b62 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/unity-sdk/video/index.js.meta b/Runtime/wechat-default/unity-sdk/video/index.js.meta index 922fdd3fe..c93789c6c 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: 5d8f555bce860047602ef541b6c5063b + guid: 5576604bdbaabd301491ef962031b8da DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/wasmcode.meta b/Runtime/wechat-default/wasmcode.meta index 385051c8f..33aeb5a21 100644 --- a/Runtime/wechat-default/wasmcode.meta +++ b/Runtime/wechat-default/wasmcode.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 35a601e53c9e15487be956df49fbb317 +guid: 3ea405ba8371f6e926da8462574dd709 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/wasmcode/game.js.meta b/Runtime/wechat-default/wasmcode/game.js.meta index 3e997cd8b..d2ffb364a 100644 --- a/Runtime/wechat-default/wasmcode/game.js.meta +++ b/Runtime/wechat-default/wasmcode/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: 801f369a209b7c5cd65e0ab77059cdcf + guid: 3f7fbf6881d3b54ef3f384c600a83e76 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/weapp-adapter.js.meta b/Runtime/wechat-default/weapp-adapter.js.meta index f5e4fc61e..678b3fd8e 100644 --- a/Runtime/wechat-default/weapp-adapter.js.meta +++ b/Runtime/wechat-default/weapp-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 - guid: a2c66f789f28151d12999baaa3bdaeb5 + guid: 6d026fe9b26d9f6c218e00975144dda4 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/workers.meta b/Runtime/wechat-default/workers.meta index afb4062c3..e0b32ed7c 100644 --- a/Runtime/wechat-default/workers.meta +++ b/Runtime/wechat-default/workers.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3e862c14cabeade40e53ac32d5011a75 +guid: ecf6116139ce31477079a8e0e8f8062c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/wechat-default/workers/response.meta b/Runtime/wechat-default/workers/response.meta index 239f34c0b..ba090787d 100644 --- a/Runtime/wechat-default/workers/response.meta +++ b/Runtime/wechat-default/workers/response.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fd93c94282bbc01d424b2680fb68be66 +guid: 4658fa5fe7efaf491cca38078813fb0e 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 24f55df69..9fba2853e 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: edcb4e85d6566bdaa4c8b83ba9ac2ad9 + guid: 97b5b93fd60781ed2ed05e8ada10169f DefaultImporter: externalObjects: {} userData: diff --git a/WebGLTemplates/WXTemplate2022TJ/index.html b/WebGLTemplates/WXTemplate2022TJ/index.html index ee0fda0ff..24ed9df79 100644 --- a/WebGLTemplates/WXTemplate2022TJ/index.html +++ b/WebGLTemplates/WXTemplate2022TJ/index.html @@ -393,26 +393,6 @@ WX_RecorderResume() {}, WX_RecorderStart() {}, WX_RecorderStop() {}, - WX_RegisterOnTouchCancelCallback() {}, - WX_RegisterOnTouchEndCallback() {}, - WX_RegisterOnTouchMoveCallback() {}, - WX_RegisterOnTouchStartCallback() {}, - WX_RegisterUDPSocketOnMessageCallback() {}, - WX_RegisterUDPSocketOnErrorCallback() {}, - WX_RegisterUDPSocketOnCloseCallback() {}, - WX_RegisterUDPSocketOnOpenCallback() {}, - WX_RegisterUDPSocketOnMessageCallback() {}, - WX_RegisterUDPSocketOnErrorCallback() {}, - WX_RegisterUDPSocketOnCloseCallback() {}, - WX_RegisterUDPSocketOnOpenCallback() {}, - WX_RegisterTCPSocketOnMessageCallback() {}, - WX_RegisterTCPSocketOnErrorCallback() {}, - WX_RegisterTCPSocketOnCloseCallback() {}, - WX_RegisterTCPSocketOnOpenCallback() {}, - WX_RegisterOnBLECharacteristicValueChangeCallback() {}, - WX_RegisterStartGyroscopeCallback() {}, - WX_RegisterStopGyroscopeCallback() {}, - WX_RegisterOnGyroscopeChangeCallback() {}, WX_UploadFile() {}, WXUploadTaskAbort() {}, WXUploadTaskOffHeadersReceived() {}, diff --git a/package.json b/package.json index 496db7a3d..650163cc4 100644 --- a/package.json +++ b/package.json @@ -1 +1,14 @@ -{"name":"com.qq.weixin.minigame","displayName":"WXSDK","description":"WeChat Mini Game Tuanjie Engine Adapter SDK Package.","version":"0.1.32","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