diff --git a/Editor/Brotli/linux_x86_64/libbrotlicommon.so b/Editor/Brotli/linux_x86_64/libbrotlicommon.so new file mode 100644 index 00000000..7a913283 Binary files /dev/null and b/Editor/Brotli/linux_x86_64/libbrotlicommon.so differ diff --git a/Editor/Brotli/linux_x86_64/libbrotlicommon.so.meta b/Editor/Brotli/linux_x86_64/libbrotlicommon.so.meta new file mode 100644 index 00000000..2b975bd7 --- /dev/null +++ b/Editor/Brotli/linux_x86_64/libbrotlicommon.so.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 26999bc34f7d1b3448cb3f93c500c1b6 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/Brotli/linux_x86_64/libbrotlienc.so b/Editor/Brotli/linux_x86_64/libbrotlienc.so new file mode 100644 index 00000000..e6aeb0b8 Binary files /dev/null and b/Editor/Brotli/linux_x86_64/libbrotlienc.so differ diff --git a/Editor/Brotli/linux_x86_64/libbrotlienc.so.meta b/Editor/Brotli/linux_x86_64/libbrotlienc.so.meta new file mode 100644 index 00000000..51f95200 --- /dev/null +++ b/Editor/Brotli/linux_x86_64/libbrotlienc.so.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 84106878858c34f4495d07c9caf95b2b +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/Brotli/macos/libbrotlicommon.dylib b/Editor/Brotli/macos/libbrotlicommon.dylib new file mode 100644 index 00000000..c16d910f Binary files /dev/null and b/Editor/Brotli/macos/libbrotlicommon.dylib differ diff --git a/Editor/Brotli/macos/libbrotlicommon.dylib.meta b/Editor/Brotli/macos/libbrotlicommon.dylib.meta new file mode 100644 index 00000000..2eec6a14 --- /dev/null +++ b/Editor/Brotli/macos/libbrotlicommon.dylib.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 894a22bfc94a12543b3d68ec88cb5161 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/Brotli/macos/libbrotlienc.dylib b/Editor/Brotli/macos/libbrotlienc.dylib new file mode 100644 index 00000000..43cb3cbd Binary files /dev/null and b/Editor/Brotli/macos/libbrotlienc.dylib differ diff --git a/Editor/Brotli/macos/libbrotlienc.dylib.meta b/Editor/Brotli/macos/libbrotlienc.dylib.meta new file mode 100644 index 00000000..b1f31a0f --- /dev/null +++ b/Editor/Brotli/macos/libbrotlienc.dylib.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 71bd70f02cc3e024492b5cf4e7fe001a +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/Brotli/win_x86_64/libbrotlicommon.dll b/Editor/Brotli/win_x86_64/libbrotlicommon.dll new file mode 100644 index 00000000..84248435 Binary files /dev/null and b/Editor/Brotli/win_x86_64/libbrotlicommon.dll differ diff --git a/Editor/Brotli/win_x86_64/libbrotlicommon.dll.meta b/Editor/Brotli/win_x86_64/libbrotlicommon.dll.meta new file mode 100644 index 00000000..645aa208 --- /dev/null +++ b/Editor/Brotli/win_x86_64/libbrotlicommon.dll.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 11a25072934d7774980b8bb4ed24b59c +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/Brotli/win_x86_64/libbrotlienc.dll b/Editor/Brotli/win_x86_64/libbrotlienc.dll new file mode 100644 index 00000000..460590bc Binary files /dev/null and b/Editor/Brotli/win_x86_64/libbrotlienc.dll differ diff --git a/Editor/Brotli/win_x86_64/libbrotlienc.dll.meta b/Editor/Brotli/win_x86_64/libbrotlienc.dll.meta new file mode 100644 index 00000000..ed5fb764 --- /dev/null +++ b/Editor/Brotli/win_x86_64/libbrotlienc.dll.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: b18f4be17de93e246a9af4379ecb2650 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/MiniGameConfig.asset b/Editor/MiniGameConfig.asset index 04612c49..3f2ac660 100644 --- a/Editor/MiniGameConfig.asset +++ b/Editor/MiniGameConfig.asset @@ -62,6 +62,7 @@ MonoBehaviour: enableRenderAnalysis: 0 iOSAutoGCInterval: 10000 enableIOSPerformancePlus: 0 + brotliMT: 0 CompressTexture: halfSize: 0 useDXT5: 0 diff --git a/Editor/WXConvertCore.cs b/Editor/WXConvertCore.cs index 02a2eb07..ccd3c06d 100644 --- a/Editor/WXConvertCore.cs +++ b/Editor/WXConvertCore.cs @@ -10,6 +10,7 @@ using UnityEngine.Rendering; using LitJson; using UnityEditor.Build; using System.Linq; +using System.Net; using static WeChatWASM.LifeCycleEvent; namespace WeChatWASM @@ -80,6 +81,8 @@ namespace WeChatWASM public static string dataMd5 = string.Empty; private static string SDKFilePath = string.Empty; public static string defaultImgSrc = "Assets/WX-WASM-SDK-V2/Runtime/wechat-default/images/background.jpg"; + + private static bool lastBrotliType = false; public static bool UseIL2CPP { get @@ -114,6 +117,22 @@ namespace WeChatWASM EditorUtility.SetDirty(config); AssetDatabase.SaveAssets(); + // 记录上次导出的brotliType + { + var filePath = Path.Combine(config.ProjectConf.DST, miniGameDir, "unity-namespace.js"); + string content = string.Empty; + if (File.Exists(filePath)) + { + content = File.ReadAllText(filePath, Encoding.UTF8); + } + Regex regex = new Regex("brotliMT\\s*:\\s*(true|false)", RegexOptions.IgnoreCase); + Match match = regex.Match(content); + if (match.Success) + { + lastBrotliType = match.Groups[1].Value == "true"; + } + } + if (config.ProjectConf.DST == string.Empty) { Debug.LogError("请先配置游戏导出路径"); @@ -540,7 +559,13 @@ namespace WeChatWASM #endif } + string original_EXPORTED_RUNTIME_METHODS = "\"ccall\",\"cwrap\",\"stackTrace\",\"addRunDependency\",\"removeRunDependency\",\"FS_createPath\",\"FS_createDataFile\",\"stackTrace\",\"writeStackCookie\",\"checkStackCookie\""; + // 添加额外的EXPORTED_RUNTIME_METHODS + string additional_EXPORTED_RUNTIME_METHODS = ",\"lengthBytesUTF8\",\"stringToUTF8\""; + #if PLATFORM_WEIXINMINIGAME + PlayerSettings.WeixinMiniGame.emscriptenArgs += " -s EXPORTED_RUNTIME_METHODS='[" + original_EXPORTED_RUNTIME_METHODS + additional_EXPORTED_RUNTIME_METHODS + "]'"; + if (config.CompileOptions.ProfilingMemory) { PlayerSettings.WeixinMiniGame.emscriptenArgs += " --memoryprofiler "; @@ -562,6 +587,8 @@ namespace WeChatWASM UnityEngine.Debug.Log("[Builder] Starting to build WeixinMiniGame project ... "); UnityEngine.Debug.Log("PlayerSettings.WeixinMiniGame.emscriptenArgs : " + PlayerSettings.WeixinMiniGame.emscriptenArgs); #else + PlayerSettings.WebGL.emscriptenArgs += " -s EXPORTED_RUNTIME_METHODS='[" + original_EXPORTED_RUNTIME_METHODS + additional_EXPORTED_RUNTIME_METHODS + "]'"; + if (config.CompileOptions.ProfilingMemory) { PlayerSettings.WebGL.emscriptenArgs += " --memoryprofiler "; @@ -572,11 +599,6 @@ namespace WeChatWASM PlayerSettings.WebGL.emscriptenArgs += " --profiling-funcs "; } - string original_EXPORTED_RUNTIME_METHODS = "\"ccall\",\"cwrap\",\"stackTrace\",\"addRunDependency\",\"removeRunDependency\",\"FS_createPath\",\"FS_createDataFile\",\"stackTrace\",\"writeStackCookie\",\"checkStackCookie\""; - // 添加额外的EXPORTED_RUNTIME_METHODS - string additional_EXPORTED_RUNTIME_METHODS = ",\"lengthBytesUTF8\",\"stringToUTF8\""; - PlayerSettings.WebGL.emscriptenArgs += " -s EXPORTED_RUNTIME_METHODS='[" + original_EXPORTED_RUNTIME_METHODS + additional_EXPORTED_RUNTIME_METHODS + "]'"; - #if UNITY_2021_2_OR_NEWER #if UNITY_2022_1_OR_NEWER // 默认更改为OptimizeSize，减少代码包体积 @@ -916,6 +938,7 @@ namespace WeChatWASM ModifyWeChatConfigs(isFromConvert); ModifySDKFile(); ClearFriendRelationCode(); + GameJsPlugins(); // 如果没有StreamingAssets目录，默认生成 if (!Directory.Exists(Path.Combine(config.ProjectConf.DST, webglDir, "StreamingAssets"))) @@ -931,13 +954,12 @@ namespace WeChatWASM var cachePath = Path.Combine(config.ProjectConf.DST, webglDir, filename); var shortFilename = filename.Substring(filename.IndexOf('.') + 1); - // 如果code没有发生过变化，则不再进行br压缩 - if (File.Exists(cachePath)) + // 如果code没有发生过变化，且压缩方式不变，则不再进行br压缩 + if (File.Exists(cachePath) && lastBrotliType == config.CompileOptions.brotliMT) { File.Copy(cachePath, targetPath, true); return 0; } - // 删除旧的br压缩文件 if (Directory.Exists(Path.Combine(config.ProjectConf.DST, webglDir))) { @@ -950,7 +972,15 @@ namespace WeChatWASM } } } - UnityUtil.brotli(sourcePath, targetPath); + if (config.CompileOptions.brotliMT) + { + MultiThreadBrotliCompress(sourcePath, targetPath); + } + else + { + UnityUtil.brotli(sourcePath, targetPath); + } + if (targetPath != cachePath) { File.Copy(targetPath, cachePath, true); @@ -958,9 +988,39 @@ namespace WeChatWASM return 0; } + public static bool MultiThreadBrotliCompress(string sourcePath, string dstPath, int quality = 11, int window = 21, int maxCpuThreads = 0) + { + if (maxCpuThreads == 0) maxCpuThreads = Environment.ProcessorCount; + var sourceBuffer = File.ReadAllBytes(sourcePath); + byte[] outputBuffer = new byte[0]; + int ret = 0; + if (sourceBuffer.Length > 50 * 1024 * 1024 && Path.GetExtension(sourcePath) == ".wasm") // 50MB以上的wasm压缩率低了可能导致小游戏包超过20MB，需提高压缩率 + { + ret = BrotliEnc.CompressWasmMT(sourceBuffer, ref outputBuffer, quality, window, maxCpuThreads); + } + else + { + ret = BrotliEnc.CompressBufferMT(sourceBuffer, ref outputBuffer, quality, window, maxCpuThreads); + } + + if (ret == 0) + { + using (FileStream fileStream = new FileStream(dstPath, FileMode.Create, FileAccess.Write)) + { + fileStream.Write(outputBuffer, 0, outputBuffer.Length); + } + return true; + } + else + { + Debug.LogError("CompressWasmMT failed"); + return false; + } + } + /// - /// 如果没有使用好友关系链的话，自动删掉无用代码 + /// 更新game.json /// private static void ClearFriendRelationCode() { @@ -969,7 +1029,7 @@ namespace WeChatWASM string content = File.ReadAllText(filePath, Encoding.UTF8); JsonData gameJson = JsonMapper.ToObject(content); - if (!config.SDKOptions.UseFriendRelation || !config.SDKOptions.UseMiniGameChat) + if (!config.SDKOptions.UseFriendRelation || !config.SDKOptions.UseMiniGameChat || config.CompileOptions.autoAdaptScreen) { JsonWriter writer = new JsonWriter(); writer.IndentValue = 2; @@ -993,12 +1053,66 @@ namespace WeChatWASM UnityEngine.Debug.Log(gameJson["plugins"]); } + if (config.CompileOptions.autoAdaptScreen) + { + gameJson["displayMode"] = "desktop"; + } + // 将配置写回到文件夹 gameJson.ToJson(writer); File.WriteAllText(filePath, writer.TextWriter.ToString()); } } + /// + /// 更新game.js + /// + private static void GameJsPlugins() + { + var filePath = Path.Combine(config.ProjectConf.DST, miniGameDir, "game.js"); + + string content = File.ReadAllText(filePath, Encoding.UTF8); + + Regex regex = new Regex(@"^import .*;$", RegexOptions.Multiline); + MatchCollection matches = regex.Matches(content); + + int lastIndex = 0; + if (matches.Count > 0) + { + lastIndex = matches[matches.Count - 1].Index + matches[matches.Count - 1].Length; + } + + bool changed = false; + StringBuilder sb = new StringBuilder(content); + if (config.ProjectConf.needCheckUpdate) + { + sb.Insert(lastIndex, Environment.NewLine + "import './plugins/check-update';"); + changed = true; + } + else + { + File.Delete(Path.Combine(config.ProjectConf.DST, miniGameDir, "plugins", "check-update.js")); + } + if (config.CompileOptions.autoAdaptScreen) + { + sb.Insert(lastIndex, Environment.NewLine + "import './plugins/screen-adapter';"); + changed = true; + } + else + { + File.Delete(Path.Combine(config.ProjectConf.DST, miniGameDir, "plugins", "screen-adapter.js")); + } + + if (changed) + { + File.WriteAllText(filePath, sb.ToString(), Encoding.UTF8); + } + else + { + Directory.Delete(Path.Combine(config.ProjectConf.DST, miniGameDir, "plugins"), true); + } + } + private static void ModifySDKFile() { @@ -1189,6 +1303,26 @@ namespace WeChatWASM return ret.ToString(); } + /// + /// 生成Unitynamespace下的bootconfig + /// + private static string GenerateBootInfo() + { + StringBuilder sb = new StringBuilder(); + // 添加player-connection-ip信息 + var host = Dns.GetHostEntry(""); + foreach (var ip in host.AddressList) + { + if (ip.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + sb.Append($"player-connection-ip={ip.ToString()}"); + break; + } + } + + return sb.ToString(); + } + public static void ModifyWeChatConfigs(bool isFromConvert = false) { UnityEngine.Debug.LogFormat("[Converter] Starting to modify configs"); @@ -1206,6 +1340,8 @@ namespace WeChatWASM var customUnicodeRange = GetCustomUnicodeRange(config.FontOptions.CustomUnicode); Debug.Log("customUnicodeRange: " + customUnicodeRange); + var boolConfigInfo = GenerateBootInfo(); + Rule[] replaceArrayList = ReplaceRules.GenRules(new string[] { config.ProjectConf.projectName == string.Empty ? "webgl" : config.ProjectConf.projectName, config.ProjectConf.Appid, @@ -1232,7 +1368,6 @@ namespace WeChatWASM config.ProjectConf.texturesPath, config.ProjectConf.needCacheTextures ? "true" : "false", config.ProjectConf.loadingBarWidth.ToString(), - config.ProjectConf.needCheckUpdate ? "true" : "false", GetColorSpace(), config.ProjectConf.disableHighPerformanceFallback ? "true" : "false", config.SDKOptions.PreloadWXFont ? "true" : "false", @@ -1245,6 +1380,7 @@ namespace WeChatWASM config.ProjectConf.IOSDevicePixelRatio.ToString(), UseIL2CPP ? "" : "/framework", UseIL2CPP ? "false" : "true", + config.CompileOptions.brotliMT ? "true" : "false", // FontOptions config.FontOptions.CJK_Unified_Ideographs ? "true" : "false", config.FontOptions.C0_Controls_and_Basic_Latin ? "true" : "false", @@ -1265,6 +1401,7 @@ namespace WeChatWASM config.FontOptions.Geometric_Shapes ? "true" : "false", config.FontOptions.Mathematical_Operators ? "true" : "false", customUnicodeRange, + boolConfigInfo, }); List replaceList = new List(replaceArrayList); @@ -1439,7 +1576,7 @@ namespace WeChatWASM { if (Regex.IsMatch(text, rule) == false) { - Debug.LogWarning($"UnMatched {file} rule: {rule}"); + Debug.Log($"UnMatched {file} rule: {rule}"); return true; } return false; diff --git a/Editor/WXEditorSettingHelper.cs b/Editor/WXEditorSettingHelper.cs index 11f5072a..a188dc15 100644 --- a/Editor/WXEditorSettingHelper.cs +++ b/Editor/WXEditorSettingHelper.cs @@ -189,9 +189,11 @@ namespace WeChatWASM 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代码分包请勿用多线程出包上线"); EditorGUILayout.EndVertical(); } @@ -448,9 +450,11 @@ namespace WeChatWASM 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); this.setData("autoUploadFirstBundle", true); // font options @@ -516,9 +520,11 @@ namespace WeChatWASM 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"); // font options config.FontOptions.CJK_Unified_Ideographs = this.getDataCheckbox("CJK_Unified_Ideographs"); diff --git a/Editor/WXPluginVersion.cs b/Editor/WXPluginVersion.cs index d4edd00c..173d2680 100644 --- a/Editor/WXPluginVersion.cs +++ b/Editor/WXPluginVersion.cs @@ -2,7 +2,7 @@ { public class WXPluginVersion { - public static string pluginVersion = "202405201546"; // 这一行不要改他，导出的时候会自动替换 + public static string pluginVersion = "202408200401"; // 这一行不要改他，导出的时候会自动替换 } public class WXPluginConf diff --git a/Editor/wx-editor.dll b/Editor/wx-editor.dll index 0f4ef4e8..1c88402a 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 afded842..c71aba3f 100644 --- a/Editor/wx-editor.xml +++ b/Editor/wx-editor.xml @@ -598,6 +598,11 @@ CustomNodePath + + + 是否自适应屏幕尺寸变化 + + 是否显示最佳实践检测弹框 @@ -623,6 +628,11 @@ 是否使用iOS高性能Plus + + + 是否使用brotli多线程压缩 + + 基本汉字 [0x4e00, 0x9fff] https://www.unicode.org/charts/PDF/U4E00.pdf diff --git a/Editor/wx-editor.xml.meta b/Editor/wx-editor.xml.meta index 71f9a73e..6f1c9288 100644 --- a/Editor/wx-editor.xml.meta +++ b/Editor/wx-editor.xml.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 0cda44e1ff8554403b79bdbe0c3cb27c -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +guid: 1719462b86bf92b2183f2a29654d14bc +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/README.md b/README.md index 3fdc3e8d..2b1903f9 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# 微信小游戏团结引擎SDK(Beta) +# 微信小游戏Unity/团结引擎SDK -有关微信SDK的最新特性与使用请阅读 [Unity WebGL 微信小游戏适配方案](https://github.com/wechat-miniprogram/minigame-unity-webgl-transform)。 +有关微信SDK的最新特性与使用请阅读 [Unity WebGL 微信小游戏适配方案](https://wechat-miniprogram.github.io/minigame-unity-webgl-transform/)。 ## 安装指南 -使用[团结引擎](https://unity.cn/tuanjie/tuanjieyinqing)创建/打开游戏工程， +使用Unity引擎或[团结引擎](https://unity.cn/tuanjie/tuanjieyinqing)创建/打开游戏工程， Unity Editor 菜单栏 `Window` - `Package Manager` - `右上 + 按钮` - `Add package from git URL...` 输入本仓库Git资源地址即可。 如：`https://github.com/wechat-miniprogram/minigame-tuanjie-transform-sdk.git` @@ -12,4 +12,4 @@ Unity Editor 菜单栏 `Window` - `Package Manager` - `右上 + 按钮` - `Add p ## 常见问题 #### 1.游戏工程可以导出但在微信开发者工具运行提示报错： -常见的情况是发生在如空项目或游戏代码中从未使用WXSDK的任何Runtime能力时，团结引擎导出项目将微信Runtime包裁剪，解决办法是在游戏合理位置增加对WXSDK的使用即可。 \ No newline at end of file +常见的情况是发生在如空项目或游戏代码中从未使用WXSDK的任何Runtime能力时，团结引擎导出项目将微信Runtime包裁剪，解决办法是在游戏合理位置增加对WXSDK的使用即可。 diff --git a/Runtime/Plugins.meta b/Runtime/Plugins.meta index 29585205..53b88058 100644 --- a/Runtime/Plugins.meta +++ b/Runtime/Plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 94947178245104ceeb7a69d3c706bb5e +guid: 286898b0c16c642bd8c6d58655b56db7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/Plugins/SDK-Call-JS-Old.jslib b/Runtime/Plugins/SDK-Call-JS-Old.jslib index a6a58a2a..4161b453 100755 --- a/Runtime/Plugins/SDK-Call-JS-Old.jslib +++ b/Runtime/Plugins/SDK-Call-JS-Old.jslib @@ -996,5 +996,8 @@ mergeInto(LibraryManager.library, { }, WX_RegisterOnBLECharacteristicValueChangeCallback: function(callback) { window.WXWASMSDK.WX_RegisterOnBLECharacteristicValueChangeCallback(callback); + }, + WX_SetDevicePixelRatio: function(ratio) { + window.devicePixelRatio = ratio; } }); diff --git a/Runtime/Plugins/WXAssetBundle.jslib b/Runtime/Plugins/WXAssetBundle.jslib index 2abb3645..8f4b711f 100644 --- a/Runtime/Plugins/WXAssetBundle.jslib +++ b/Runtime/Plugins/WXAssetBundle.jslib @@ -249,6 +249,7 @@ var WXAssetBundleLibrary = { if(WXFS._url2path.has(url)){ return WXFS._url2path.get(url); } + url = url.replaceAll(' ', '%20') if(url.startsWith('/vfs_streamingassets/')){ var path = url.replace('/vfs_streamingassets/', wx.env.USER_DATA_PATH + "/__GAME_FILE_CACHE/StreamingAssets/"); } diff --git a/Runtime/Plugins/wx-runtime.dll b/Runtime/Plugins/wx-runtime.dll index 70f9fffe..8bf9e84b 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 bcf910c3..88f72f01 100644 --- a/Runtime/Plugins/wx-runtime.xml +++ b/Runtime/Plugins/wx-runtime.xml @@ -8200,6 +8200,11 @@ 分区 ID + + + 其他参数 + + 错误信息 @@ -9726,6 +9731,11 @@ 用户态签名 + + + 其他参数 + + 接口调用结束的回调函数（调用成功、失败都会执行） diff --git a/Runtime/Plugins/wx-runtime.xml.meta b/Runtime/Plugins/wx-runtime.xml.meta index e5eaf2fe..215621fb 100644 --- a/Runtime/Plugins/wx-runtime.xml.meta +++ b/Runtime/Plugins/wx-runtime.xml.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: fd1801a03e40d488f98590b17dbf7add -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +guid: a059cf8813f306b3aab52c161b8307af +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/WXBase.cs b/Runtime/WXBase.cs index 3c2ab519..589bc7ee 100644 --- a/Runtime/WXBase.cs +++ b/Runtime/WXBase.cs @@ -1081,6 +1081,13 @@ namespace WeChatWASM WXSDKManagerHandler.Instance.OffGyroscopeChange(result); } #endregion + /// + /// 设置分辨率 + /// + public static void SetDevicePixelRatio(double ratio) + { + WXSDKManagerHandler.Instance.SetDevicePixelRatio(ratio); + } } } #endif diff --git a/Runtime/wechat-default/check-version.js b/Runtime/wechat-default/check-version.js index 66791684..73f554b6 100644 --- a/Runtime/wechat-default/check-version.js +++ b/Runtime/wechat-default/check-version.js @@ -106,6 +106,16 @@ if (isIOS && typeof $IOS_DEVICE_PIXEL_RATIO === 'number' && $IOS_DEVICE_PIXEL_RA // @ts-ignore window.devicePixelRatio = $IOS_DEVICE_PIXEL_RATIO; } +else if (isPc) { + try { + if (window.devicePixelRatio < 2) { + window.devicePixelRatio = 2; + } + } + catch (e) { + console.warn(e); + } +} export default () => new Promise((resolve) => { if (!isDevtools) { if (isPcInvalid diff --git a/Runtime/wechat-default/check-version.js.meta b/Runtime/wechat-default/check-version.js.meta index 58547a04..f9c0db89 100644 --- a/Runtime/wechat-default/check-version.js.meta +++ b/Runtime/wechat-default/check-version.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 05119e4932ef446569de011979b4417f +guid: 72d6dce4f8fc2897d45ce801d61a4dc2 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/data-package/game.js.meta b/Runtime/wechat-default/data-package/game.js.meta index bb0f2564..a3ec106f 100644 --- a/Runtime/wechat-default/data-package/game.js.meta +++ b/Runtime/wechat-default/data-package/game.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 435472adc520c44878c473c1b4deca5b +guid: a2d4f5bdedb1bc3b95c91a779ba77ec6 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/events.js.meta b/Runtime/wechat-default/events.js.meta index ea4fc7bb..1c0ff687 100644 --- a/Runtime/wechat-default/events.js.meta +++ b/Runtime/wechat-default/events.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: ff1f6b1ebcea741a382474726c1f1bc6 +guid: 59cfd066f14f854efa857ecb2fadcf4f DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/game.js b/Runtime/wechat-default/game.js index 0592e059..74a5bd10 100644 --- a/Runtime/wechat-default/game.js +++ b/Runtime/wechat-default/game.js @@ -1,41 +1,13 @@ // @ts-nocheck -/* eslint-disable no-prototype-builtins */ -/* eslint-disable no-unused-vars */ -/* eslint-disable no-undef */ import './weapp-adapter'; import './events'; -import 'texture-config.js'; +import './texture-config'; import unityNamespace from './unity-namespace'; import '.$DOTNET_RUNTIME_FOLD/$GAME_NAME.wasm.framework.unityweb'; -import './unity-sdk/index.js'; +import './unity-sdk/index'; import checkVersion from './check-version'; import { launchEventType, scaleMode } from './plugin-config'; import { preloadWxCommonFont } from './unity-sdk/font/index'; -function checkUpdate() { - const updateManager = wx.getUpdateManager(); - updateManager.onCheckForUpdate(() => { - // 请求完新版本信息的回调 - // console.log(res.hasUpdate) - }); - updateManager.onUpdateReady(() => { - wx.showModal({ - title: '更新提示', - content: '新版本已经准备好，是否重启应用？', - success(res) { - if (res.confirm) { - // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启 - updateManager.applyUpdate(); - } - }, - }); - }); - updateManager.onUpdateFailed(() => { - // 新版本下载失败 - }); -} -if ($NEED_CHECK_UPDATE) { - checkUpdate(); -} const managerConfig = { DATA_FILE_MD5: '$DATA_MD5', CODE_FILE_MD5: '$CODE_MD5', diff --git a/Runtime/wechat-default/game.js.meta b/Runtime/wechat-default/game.js.meta index d364c524..d9a29457 100644 --- a/Runtime/wechat-default/game.js.meta +++ b/Runtime/wechat-default/game.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: a3647ec3535f043b4874bd1e4902b5cb +guid: 7ec0c02137f9d2e4044b68f37374cd7d DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/game.json b/Runtime/wechat-default/game.json index 50dd1e7e..4ae3eaeb 100644 --- a/Runtime/wechat-default/game.json +++ b/Runtime/wechat-default/game.json @@ -23,7 +23,7 @@ ], "plugins": { "UnityPlugin": { - "version": "1.2.52", + "version": "1.2.57", "provider": "wxe5a48f1ed5f544b7", "contexts": [ { diff --git a/Runtime/wechat-default/game.json.meta b/Runtime/wechat-default/game.json.meta index c2ea9572..2b13e930 100644 --- a/Runtime/wechat-default/game.json.meta +++ b/Runtime/wechat-default/game.json.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 6480b84fe5c08499b96ecfd14b571455 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +guid: 4a9ed3cdd5ee4249a9a0e9d362af10f1 +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/images/background.jpg.meta b/Runtime/wechat-default/images/background.jpg.meta index 3cc36c73..69f093a8 100644 --- a/Runtime/wechat-default/images/background.jpg.meta +++ b/Runtime/wechat-default/images/background.jpg.meta @@ -1,144 +1,7 @@ fileFormatVersion: 2 -guid: f11bd791d63e2499cbe460d7e5803fb4 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WeixinMiniGame - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: +guid: e1e18f34ba2da9dc774aaa9f71b6c65d +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/images/unity_logo.png.meta b/Runtime/wechat-default/images/unity_logo.png.meta index 0329e686..c3423893 100644 --- a/Runtime/wechat-default/images/unity_logo.png.meta +++ b/Runtime/wechat-default/images/unity_logo.png.meta @@ -1,144 +1,7 @@ fileFormatVersion: 2 -guid: f26a9393e088f41b6a49e805795fddf5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WeixinMiniGame - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: +guid: 018bde0dd2339559e0356d0d2b9de69e +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/open-data/data/index.js.meta b/Runtime/wechat-default/open-data/data/index.js.meta index 10524f3c..508f0b3b 100644 --- a/Runtime/wechat-default/open-data/data/index.js.meta +++ b/Runtime/wechat-default/open-data/data/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: a4cb63bdb425c47e4af76c4170999613 +guid: a68c82a0213815cacd975d33bf6afd9b DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/open-data/data/utils.js.meta b/Runtime/wechat-default/open-data/data/utils.js.meta index 091ac872..0a7a9ce1 100644 --- a/Runtime/wechat-default/open-data/data/utils.js.meta +++ b/Runtime/wechat-default/open-data/data/utils.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: acc4b1615609a41f9b2cbdc3feb71905 +guid: 0fa0f0271021426b2080ded743c8b0bf DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/open-data/index.js.meta b/Runtime/wechat-default/open-data/index.js.meta index ceb898e4..c3348fab 100644 --- a/Runtime/wechat-default/open-data/index.js.meta +++ b/Runtime/wechat-default/open-data/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: d3962d6b201894a86948da9464b92d4d +guid: 8d11e31e7caca540fdc766f871122c80 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/open-data/loading.js.meta b/Runtime/wechat-default/open-data/loading.js.meta index 635468ae..6a76bb3a 100644 --- a/Runtime/wechat-default/open-data/loading.js.meta +++ b/Runtime/wechat-default/open-data/loading.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 27fbd5d50c5d6422c957187a2afc24e0 +guid: 7cb5c1387d3b2acb3ce5356ce57380e6 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 e26f9ffa..4d5f35d3 100644 --- a/Runtime/wechat-default/open-data/render/image/avatar.png.meta +++ b/Runtime/wechat-default/open-data/render/image/avatar.png.meta @@ -1,144 +1,7 @@ fileFormatVersion: 2 -guid: 0c67156f6decf42e8b7099ffe0659082 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WeixinMiniGame - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: +guid: 02a12edbd7b0f6ee4ba77232630ca383 +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 1a73bbb9..a73c028e 100644 --- a/Runtime/wechat-default/open-data/render/image/button1.png.meta +++ b/Runtime/wechat-default/open-data/render/image/button1.png.meta @@ -1,144 +1,7 @@ fileFormatVersion: 2 -guid: 1a30276f73a964a7f82b1937b1725b6e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WeixinMiniGame - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: +guid: 59779c16150d1f382b45ba4866e7dd1c +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 56db77d4..0aa927d7 100644 --- a/Runtime/wechat-default/open-data/render/image/button2.png.meta +++ b/Runtime/wechat-default/open-data/render/image/button2.png.meta @@ -1,144 +1,7 @@ fileFormatVersion: 2 -guid: 9d406606916af467fa6b664494627996 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WeixinMiniGame - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: +guid: 2532269bcf252fcee88ecba03de5d72d +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 2507a4e3..ed6e5bc9 100644 --- a/Runtime/wechat-default/open-data/render/image/button3.png.meta +++ b/Runtime/wechat-default/open-data/render/image/button3.png.meta @@ -1,144 +1,7 @@ fileFormatVersion: 2 -guid: 5b33baa67bb424e7c9a5fa419a2835c3 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WeixinMiniGame - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: +guid: edf0798181946fe765cffbfa275107b8 +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 d55ec143..681d0b97 100644 --- a/Runtime/wechat-default/open-data/render/image/loading.png.meta +++ b/Runtime/wechat-default/open-data/render/image/loading.png.meta @@ -1,144 +1,7 @@ fileFormatVersion: 2 -guid: 80a3785ce89b94198b5a8d3a1b6555ed -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WeixinMiniGame - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: +guid: 4f35c0f99890aa7167a8b793ef796f7b +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 300e5182..499b4cb3 100644 --- a/Runtime/wechat-default/open-data/render/image/nameBg.png.meta +++ b/Runtime/wechat-default/open-data/render/image/nameBg.png.meta @@ -1,144 +1,7 @@ fileFormatVersion: 2 -guid: 5c79e70448f114430b266084f7ff4eb5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WeixinMiniGame - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: +guid: e7f5cdaff48140433dfab80dcc60ff50 +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 c797d830..edd79e8e 100644 --- a/Runtime/wechat-default/open-data/render/image/rankAvatar.png.meta +++ b/Runtime/wechat-default/open-data/render/image/rankAvatar.png.meta @@ -1,144 +1,7 @@ fileFormatVersion: 2 -guid: 0e5a54e76d06a4d63a03ddedfe554e1f -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WeixinMiniGame - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: +guid: e20c703a4afeffbc151a8529e610628f +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 b875164c..530a071e 100644 --- a/Runtime/wechat-default/open-data/render/image/rankBg.png.meta +++ b/Runtime/wechat-default/open-data/render/image/rankBg.png.meta @@ -1,144 +1,7 @@ fileFormatVersion: 2 -guid: 92fd29be46ea84b598688cdcb242253f -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WeixinMiniGame - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: +guid: f2d4bf3f9e7cca52022c9916a0bc805a +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 ef2fb73c..d89fa70a 100644 --- a/Runtime/wechat-default/open-data/render/image/shareBg.png.meta +++ b/Runtime/wechat-default/open-data/render/image/shareBg.png.meta @@ -1,144 +1,7 @@ fileFormatVersion: 2 -guid: 54572bdcec2774d758b6ed702e4637c9 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WeixinMiniGame - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: +guid: 9fb683a8d8682a682df92d7d4b57bccd +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 2d03e629..6ef84a56 100644 --- a/Runtime/wechat-default/open-data/render/image/shareBg2.png.meta +++ b/Runtime/wechat-default/open-data/render/image/shareBg2.png.meta @@ -1,144 +1,7 @@ fileFormatVersion: 2 -guid: ff571ffe598334e6380475afda67ae31 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WeixinMiniGame - maxTextureSize: 2048 - maxPlaceholderSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: +guid: d13bcdff7663b0186343ad1cd5f01351 +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 181c7e4c..84a596d0 100644 --- a/Runtime/wechat-default/open-data/render/styles/friendRank.js.meta +++ b/Runtime/wechat-default/open-data/render/styles/friendRank.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 56fa82b7d9a354dbd8d1fd5eaae7e78a +guid: aa6c5025c4f439deebc67f3c201ce3fe DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 ce9bcf1e..c4988707 100644 --- a/Runtime/wechat-default/open-data/render/styles/tips.js.meta +++ b/Runtime/wechat-default/open-data/render/styles/tips.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: e5af5635271514ef4ab86b21b9ba5dc9 +guid: 473696906e6decf639a7b151b55b06d0 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 b2d9a465..0a69266a 100644 --- a/Runtime/wechat-default/open-data/render/tpls/friendRank.js.meta +++ b/Runtime/wechat-default/open-data/render/tpls/friendRank.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: fb7e30b3c4b6c4212b332c88044848e8 +guid: a7633767ecff0c165078c8a39a65f57d DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 e7b6b2d2..8474fc67 100644 --- a/Runtime/wechat-default/open-data/render/tpls/tips.js.meta +++ b/Runtime/wechat-default/open-data/render/tpls/tips.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: bbec498359f7f4ca2a1a26a176faf9ac +guid: 3e974b94f0607e60e2ed654660c28197 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/plugin-config.js.meta b/Runtime/wechat-default/plugin-config.js.meta index b5cc7b5e..ec1e871b 100644 --- a/Runtime/wechat-default/plugin-config.js.meta +++ b/Runtime/wechat-default/plugin-config.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 1d97a5d7ed8174cc7a628f8380a5283d +guid: 7fd5bda63363df9354b79c947a54c9dc DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/plugins.meta b/Runtime/wechat-default/plugins.meta new file mode 100644 index 00000000..aaccbe7d --- /dev/null +++ b/Runtime/wechat-default/plugins.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7138171c522f8ed3db234e0cec8a4379 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/plugins/check-update.js b/Runtime/wechat-default/plugins/check-update.js new file mode 100644 index 00000000..51b01311 --- /dev/null +++ b/Runtime/wechat-default/plugins/check-update.js @@ -0,0 +1,23 @@ +function checkUpdate() { + const updateManager = wx.getUpdateManager(); + updateManager.onCheckForUpdate(() => { + // 请求完新版本信息的回调 + // console.log(res.hasUpdate) + }); + updateManager.onUpdateReady(() => { + wx.showModal({ + title: '更新提示', + content: '新版本已经准备好，是否重启应用？', + success(res) { + if (res.confirm) { + // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启 + updateManager.applyUpdate(); + } + }, + }); + }); + updateManager.onUpdateFailed(() => { + // 新版本下载失败 + }); +} +checkUpdate(); diff --git a/Runtime/wechat-default/plugins/check-update.js.meta b/Runtime/wechat-default/plugins/check-update.js.meta new file mode 100644 index 00000000..bd716efd --- /dev/null +++ b/Runtime/wechat-default/plugins/check-update.js.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b2f277527f24b913e7191f7a03bfda7d +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/plugins/screen-adapter.js b/Runtime/wechat-default/plugins/screen-adapter.js new file mode 100644 index 00000000..71cf7c4d --- /dev/null +++ b/Runtime/wechat-default/plugins/screen-adapter.js @@ -0,0 +1,9 @@ +wx.onWindowResize((res) => { + window.innerWidth = res.windowWidth; + window.innerHeight = res.windowHeight; +}); +wx.onDeviceOrientationChange(() => { + const info = wx.getWindowInfo ? wx.getWindowInfo() : wx.getSystemInfoSync(); + window.innerWidth = info.screenWidth; + window.innerHeight = info.screenHeight; +}); diff --git a/Runtime/wechat-default/plugins/screen-adapter.js.meta b/Runtime/wechat-default/plugins/screen-adapter.js.meta new file mode 100644 index 00000000..a4ddfb0c --- /dev/null +++ b/Runtime/wechat-default/plugins/screen-adapter.js.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6ec5bc93a18bd82ab155bb0f188c2330 +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/project.config.json b/Runtime/wechat-default/project.config.json index 0b452859..dab2f3b3 100644 --- a/Runtime/wechat-default/project.config.json +++ b/Runtime/wechat-default/project.config.json @@ -33,7 +33,7 @@ "packNpmRelationList": [] }, "compileType": "game", - "libVersion": "3.2.5", + "libVersion": "3.5.1", "appid": "$APP_ID", "projectname": "$PROJECT_NAME", "simulatorType": "wechat", diff --git a/Runtime/wechat-default/project.config.json.meta b/Runtime/wechat-default/project.config.json.meta index cf38f3ee..ce493cda 100644 --- a/Runtime/wechat-default/project.config.json.meta +++ b/Runtime/wechat-default/project.config.json.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: fda5392b565b244f0bdcec1edf96e35c -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +guid: 62e052f5b55673e931795d2d026560aa +DefaultImporter: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/texture-config.js.meta b/Runtime/wechat-default/texture-config.js.meta index 3d5ac6b4..a5278daa 100644 --- a/Runtime/wechat-default/texture-config.js.meta +++ b/Runtime/wechat-default/texture-config.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 4cc131493bdec41b790b77ed89457fa2 +guid: 455e8dee47c748b7f399c53bac8a19f5 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-namespace.js b/Runtime/wechat-default/unity-namespace.js index f4bd7f2f..34f32e00 100644 --- a/Runtime/wechat-default/unity-namespace.js +++ b/Runtime/wechat-default/unity-namespace.js @@ -49,6 +49,10 @@ const unityNamespace = { enableRenderAnalysisLog: $ENABLE_RENDER_ANALYSIS_LOG, // 是否dotnet runtime useDotnetRuntime: $USE_DOTNET_RUNTIME, + // 是否用了多线程brotli压缩 + useBrotliMT: $USE_BROTLI_MT, + // Boot config配置，包含例如wait-for-native-debugger、player-connection-ip等信息 + bootConfig: '$BOOT_CONFIG_INFO', }; // 最佳实践检测配置 unityNamespace.monitorConfig = { diff --git a/Runtime/wechat-default/unity-namespace.js.meta b/Runtime/wechat-default/unity-namespace.js.meta index 32cebb92..c8097260 100644 --- a/Runtime/wechat-default/unity-namespace.js.meta +++ b/Runtime/wechat-default/unity-namespace.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: e50550b55959e4ded8e1a2977028dfa2 +guid: 16e3f2377b457ce84bab2c0dc79372ad DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta index 6e551f87..3c6a502d 100644 --- a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: d4d56a44877ad4a3babdb131836876ab +guid: 7915839ff66cc08534f380f28d421a23 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta b/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta index e0810310..d45f4e56 100644 --- a/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 606fbc4806db74cfbba5f32301ff1389 +guid: ad0c2af65d2aaa61039b1a91f60c965e DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/ad.js.meta b/Runtime/wechat-default/unity-sdk/ad.js.meta index 2c72371a..44ac0484 100644 --- a/Runtime/wechat-default/unity-sdk/ad.js.meta +++ b/Runtime/wechat-default/unity-sdk/ad.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 4892061c79de84a4dbb09abe4c57ea1a +guid: 4ca24a076f21f26128fcda26c99ff736 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/audio/common.js.meta b/Runtime/wechat-default/unity-sdk/audio/common.js.meta index 7615549d..578c5ebc 100644 --- a/Runtime/wechat-default/unity-sdk/audio/common.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/common.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 14bc274c564d84ad799dc7989377e1ec +guid: b9a20da3800ed88e020b6a62126c4702 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/audio/const.js.meta b/Runtime/wechat-default/unity-sdk/audio/const.js.meta index 0991261a..533ac42a 100644 --- a/Runtime/wechat-default/unity-sdk/audio/const.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/const.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 14b86ab72af784956a01a666b4f4fb56 +guid: ac82fe9291b4bfbf76796bc4d7098c9e DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/audio/index.js.meta b/Runtime/wechat-default/unity-sdk/audio/index.js.meta index ad4b677c..24a0a431 100644 --- a/Runtime/wechat-default/unity-sdk/audio/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 0fe48499b9d2743feab35384f1643c0f +guid: 0020cf35611516ccea666c36102ebf84 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 5b3aae41..7fb1ed53 100644 --- a/Runtime/wechat-default/unity-sdk/audio/inner-audio.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/inner-audio.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: bfe1478455ae94714a1f9dbbe3425983 +guid: 6ac05f55130b3aa93cd6ef326374a2e8 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/audio/store.js b/Runtime/wechat-default/unity-sdk/audio/store.js index 4a3301c9..f33b3e60 100644 --- a/Runtime/wechat-default/unity-sdk/audio/store.js +++ b/Runtime/wechat-default/unity-sdk/audio/store.js @@ -18,7 +18,8 @@ export const WEBAudio = { audioWebSupport: 0, bufferSourceNodeLength: 0, audioBufferLength: 0, - isMute: false, + isMute: false, + FAKEMOD_SAMPLERATE: 44100, }; export const audios = {}; diff --git a/Runtime/wechat-default/unity-sdk/audio/store.js.meta b/Runtime/wechat-default/unity-sdk/audio/store.js.meta index 7d9103a2..b269b1cd 100644 --- a/Runtime/wechat-default/unity-sdk/audio/store.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/store.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: ed4d2ec5dcf374ac2affa757875540af +guid: 52cfb592dc9faceedd5a4aaa660d1f3e DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/audio/unity-audio.js b/Runtime/wechat-default/unity-sdk/audio/unity-audio.js index 5cb579aa..4afc7c74 100644 --- a/Runtime/wechat-default/unity-sdk/audio/unity-audio.js +++ b/Runtime/wechat-default/unity-sdk/audio/unity-audio.js @@ -1,4 +1,4 @@ -import { isAndroid, isPc, webAudioNeedResume, isSupportBufferURL, isSupportPlayBackRate, isSupportInnerAudio } from '../../check-version'; +import { isAndroid, isPc, webAudioNeedResume, isSupportBufferURL, isSupportPlayBackRate, isSupportInnerAudio, } from '../../check-version'; import { WEBAudio, unityAudioVolume } from './store'; import { TEMP_DIR_PATH } from './const'; import { createInnerAudio, destroyInnerAudio, printErrMsg, resumeWebAudio } from './utils'; @@ -16,7 +16,7 @@ function jsAudioCreateUncompressedSoundClip(buffer, error, length) { }, getLength() { if (!this.buffer) { - console.log('Trying to get length of sound which is not loaded.'); + return 0; } const sampleRateRatio = 44100 / this.buffer.sampleRate; @@ -157,6 +157,7 @@ export class AudioChannelInstance { loopStart = 0; loopEnd = 0; deleyTime = 0; + deleyOffset = 0; constructor(callback, userData) { if (WEBAudio.audioContext) { this.gain = WEBAudio.audioContext.createGain(); @@ -292,6 +293,7 @@ export class AudioChannelInstance { this.source.mediaElement.onCanplay(fn); this.source.mediaElement.loop = this.loop; this.deleyTime = startTime; + this.deleyOffset = startOffset; this.source.start(startTime, startOffset); this.source.playbackStartTime = startTime - startOffset / this.source.playbackRateValue; } @@ -395,7 +397,7 @@ export class AudioChannelInstance { return; } if (source.mediaElement) { - source._pauseMediaElement(); + source._pauseMediaElement?.(); return; } if (source.isPausedMockNode) { @@ -426,8 +428,9 @@ export class AudioChannelInstance { return; } if (this.source.mediaElement) { - this.source.start(this.deleyTime); + this.source.start(this.deleyTime, this.deleyOffset); delete this.deleyTime; + delete this.deleyOffset; return; } const pausedSource = this.source; @@ -664,12 +667,12 @@ export class AudioChannelInstance { this.source.playTimeout = setTimeout(() => { if (typeof this.source !== 'undefined') { delete this.source.playTimeout; - this.source._startPlayback(offset || 0); + this.source._startPlayback?.(offset || 0); } }, startDelayMS); } else { - this.source._startPlayback(offset); + this.source._startPlayback?.(offset); } }; const stop = (stopTime) => { @@ -879,7 +882,10 @@ export default { clearTimeout(webAutoResumeTicker); webAutoResumeTicker = null; } - WEBAudio.audioContext?.suspend(); + + if (!GameGlobal.isIOSHighPerformanceMode) { + WEBAudio.audioContext?.suspend(); + } }); wx.onShow(() => { WEBAudio.audioContext?.resume(); @@ -1172,4 +1178,29 @@ export default { buffer[(metaData >> 2) + 1] = soundClip.getFrequency() ?? 0; return true; }, + _JS_Sound_GetAudioBufferSampleRate(soundInstance) { + if (WEBAudio.audioWebEnabled === 0) { + return WEBAudio.FAKEMOD_SAMPLERATE; + } + const audioInstance = WEBAudio.audioInstances[soundInstance]; + if (!audioInstance) { + return WEBAudio.FAKEMOD_SAMPLERATE; + } + + const buffer = audioInstance.buffer + ? audioInstance.buffer + : audioInstance.source + ? audioInstance.source?.buffer + : null; + if (!buffer) { + return WEBAudio.FAKEMOD_SAMPLERATE; + } + return buffer.sampleRate; + }, + _JS_Sound_GetAudioContextSampleRate() { + if (WEBAudio.audioWebEnabled === 0 || !WEBAudio.audioContext) { + return WEBAudio.FAKEMOD_SAMPLERATE; + } + return WEBAudio.audioContext.sampleRate; + }, }; 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 5e7a391e..6ff2d036 100644 --- a/Runtime/wechat-default/unity-sdk/audio/unity-audio.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/unity-audio.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: f74b00c92b70d47388595c2ce7895870 +guid: e3304f73e6fd57ceed8d59be6fefc04a DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/audio/utils.js.meta b/Runtime/wechat-default/unity-sdk/audio/utils.js.meta index cd02e3cc..4e7c781f 100644 --- a/Runtime/wechat-default/unity-sdk/audio/utils.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/utils.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: dfbff99166a524346b9814ab73abf9f0 +guid: 99543aed462d8c06b7ed83009a04cf79 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/authorize.js.meta b/Runtime/wechat-default/unity-sdk/authorize.js.meta index ad4e933b..0934e77f 100644 --- a/Runtime/wechat-default/unity-sdk/authorize.js.meta +++ b/Runtime/wechat-default/unity-sdk/authorize.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 18885ed1499a248c3bb6b03ea576bb95 +guid: 37d6c89cb9a832b610c5c23cb3f808c0 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta b/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta index 9ea1623f..5f51608b 100644 --- a/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 905f249c0cc5a4843ab252d21c5c4d87 +guid: 1c6f77f8b5f01b8c19a73d84cf0b780c DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/camera.js.meta b/Runtime/wechat-default/unity-sdk/camera.js.meta index 35dfb81b..b6e4cc40 100644 --- a/Runtime/wechat-default/unity-sdk/camera.js.meta +++ b/Runtime/wechat-default/unity-sdk/camera.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: d974db8bdfa3f42a9a2e9bcf969d84c4 +guid: f817a176c576ff473ef5d3444e8c2643 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/canvas-context.js.meta b/Runtime/wechat-default/unity-sdk/canvas-context.js.meta index df52cbc6..9ef2bf9f 100644 --- a/Runtime/wechat-default/unity-sdk/canvas-context.js.meta +++ b/Runtime/wechat-default/unity-sdk/canvas-context.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 42c02e0b5b17d4e829a9a10d8a2a6a21 +guid: 68f8f465fdafa7882b0af50892a53c33 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/canvas.js.meta b/Runtime/wechat-default/unity-sdk/canvas.js.meta index 0c7f2965..e613c7ca 100644 --- a/Runtime/wechat-default/unity-sdk/canvas.js.meta +++ b/Runtime/wechat-default/unity-sdk/canvas.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 9fa7d124608be490ca6a3428d57528e5 +guid: b8b705a1320c936bd0ea596851bba410 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/chat.js.meta b/Runtime/wechat-default/unity-sdk/chat.js.meta index 02f2093c..0f14c3e2 100644 --- a/Runtime/wechat-default/unity-sdk/chat.js.meta +++ b/Runtime/wechat-default/unity-sdk/chat.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: c8a8b77d4bbac4e3888ec674529e11dc +guid: e3380dcf693977eacbdb98eb9bd1df40 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/cloud.js.meta b/Runtime/wechat-default/unity-sdk/cloud.js.meta index f27d7c4b..5e27c860 100644 --- a/Runtime/wechat-default/unity-sdk/cloud.js.meta +++ b/Runtime/wechat-default/unity-sdk/cloud.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: b9605aacfd8af41debdee366f750f8a6 +guid: 5fa4b26864e64bd3c5c7c1c830e75fb5 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/conf.js.meta b/Runtime/wechat-default/unity-sdk/conf.js.meta index 3e403329..eea2d9db 100644 --- a/Runtime/wechat-default/unity-sdk/conf.js.meta +++ b/Runtime/wechat-default/unity-sdk/conf.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: da8e7048699bf4cc8b6f41cb16fe334a +guid: 0ed5cfbc1cb1dca5dfd9f4d41870b25e DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/file-info.js.meta b/Runtime/wechat-default/unity-sdk/file-info.js.meta index d7711157..0ad8eebf 100644 --- a/Runtime/wechat-default/unity-sdk/file-info.js.meta +++ b/Runtime/wechat-default/unity-sdk/file-info.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: bd7507f8187c448da9616f8f6a9eb1a0 +guid: 1c11ec3d27960784cf9d6ad75dfeaeb1 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/fix.js.meta b/Runtime/wechat-default/unity-sdk/fix.js.meta index 0d8a8ba5..59f563f9 100644 --- a/Runtime/wechat-default/unity-sdk/fix.js.meta +++ b/Runtime/wechat-default/unity-sdk/fix.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: c63adb4a8e2514d9b9885c4aa2a0cbf7 +guid: 181613de8694f03f69975420d9883673 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 c1197530..4f3676f5 100644 --- a/Runtime/wechat-default/unity-sdk/font/fix-cmap.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/fix-cmap.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: ec8d4a607c81445a99ae09c705b65688 +guid: 1b8b0d6e0bfc3c0bd2dff08c6831167c DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/font/index.js.meta b/Runtime/wechat-default/unity-sdk/font/index.js.meta index 63c894b9..551ed519 100644 --- a/Runtime/wechat-default/unity-sdk/font/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: ea8a0c353750c410cab0936854f81cbb +guid: 82cd05553adbf694a7aa41d15dfc513d DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 27b5eec1..5ef4edd8 100644 --- a/Runtime/wechat-default/unity-sdk/font/read-metrics.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/read-metrics.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 8b3472b0663be42058673f219ba7c752 +guid: f880f376a130f0bcb740b0607ef4e9c2 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file 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 07452145..663e7c03 100644 --- a/Runtime/wechat-default/unity-sdk/font/split-sc.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/split-sc.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 6610d5d93d7454297b8998f71f37f038 +guid: 52282aba774f8ca0eb45671280e17e55 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/font/util.js.meta b/Runtime/wechat-default/unity-sdk/font/util.js.meta index 4150c6a3..500315cc 100644 --- a/Runtime/wechat-default/unity-sdk/font/util.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/util.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 371d4bdefafae49b0a8d71814138685d +guid: 877cf45afb634b8db9d49507494e2a7e DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/fs.js.meta b/Runtime/wechat-default/unity-sdk/fs.js.meta index 88ecf939..9cf3fe4d 100644 --- a/Runtime/wechat-default/unity-sdk/fs.js.meta +++ b/Runtime/wechat-default/unity-sdk/fs.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: bc26813651442418095392d62f7b9a78 +guid: 76ce4625fec95a9195dc1cf7920d1614 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/game-club.js.meta b/Runtime/wechat-default/unity-sdk/game-club.js.meta index 39c40cdf..ea5fd636 100644 --- a/Runtime/wechat-default/unity-sdk/game-club.js.meta +++ b/Runtime/wechat-default/unity-sdk/game-club.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: f50e12d5c0bd84b48885c1ab657ecee8 +guid: cfff2eb80fb5091fc25f37502518c47d DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/game-recorder.js.meta b/Runtime/wechat-default/unity-sdk/game-recorder.js.meta index 2956c163..b29c3929 100644 --- a/Runtime/wechat-default/unity-sdk/game-recorder.js.meta +++ b/Runtime/wechat-default/unity-sdk/game-recorder.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: d8fdb20ac77c341b3bc1a512598f6c3d +guid: 122eb78360a34f4b62123b4f8fdb37aa DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta b/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta index 0675e922..0ab54ecc 100644 --- a/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 0534cfa6c61d34967bb9b688117fc67e +guid: 79341585e29028a8971f7b605b72b556 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/index.js.meta b/Runtime/wechat-default/unity-sdk/index.js.meta index e61200fc..7fb94c06 100644 --- a/Runtime/wechat-default/unity-sdk/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 51ca999f27a634bf08069257d0e7c4ea +guid: 482d406ceb182221a298dd3880d4e941 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/logger.js.meta b/Runtime/wechat-default/unity-sdk/logger.js.meta index 91f18821..a7deabd8 100644 --- a/Runtime/wechat-default/unity-sdk/logger.js.meta +++ b/Runtime/wechat-default/unity-sdk/logger.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 38a46d2ce8c3047b6b22da7b5941ec53 +guid: b74bb48a82089f1cf9d6b0013340a9b3 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta b/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta index 80d06f5d..71a0d49c 100644 --- a/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 8dce204398ea4443b80bf2394d305870 +guid: 0ba9a2529e567edb67dd295f6e2828e0 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/module-helper.js.meta b/Runtime/wechat-default/unity-sdk/module-helper.js.meta index 8727e3ac..9b607e6d 100644 --- a/Runtime/wechat-default/unity-sdk/module-helper.js.meta +++ b/Runtime/wechat-default/unity-sdk/module-helper.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: b77ed7414cc4e4be881fdcb326f8176a +guid: 5155261f77084bf5ae78c491e36a94e5 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/open-data.js.meta b/Runtime/wechat-default/unity-sdk/open-data.js.meta index 1f663d72..7b912618 100644 --- a/Runtime/wechat-default/unity-sdk/open-data.js.meta +++ b/Runtime/wechat-default/unity-sdk/open-data.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: e3ecf86e5052a4f1f9831e85ad266af3 +guid: fe5c372c88c446bf5c9f9b2c05b122bf DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/recorder.js.meta b/Runtime/wechat-default/unity-sdk/recorder.js.meta index 0ed37c2f..1457bc9d 100644 --- a/Runtime/wechat-default/unity-sdk/recorder.js.meta +++ b/Runtime/wechat-default/unity-sdk/recorder.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 8c8afd2e722164fc8a9f9b0380fb6e4a +guid: 22123e9efab710435dadd47cfe7157c7 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/resType.js.meta b/Runtime/wechat-default/unity-sdk/resType.js.meta index 42e8fb41..be8e4409 100644 --- a/Runtime/wechat-default/unity-sdk/resType.js.meta +++ b/Runtime/wechat-default/unity-sdk/resType.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: e499ef4df8c884251955fee266d54d94 +guid: cfcdd546b700155e56cc2afcaa07350c DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta index 68acf7be..5d4642eb 100644 --- a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta +++ b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 56d8b06fa95f74fd99ae9e3cd851f435 +guid: 5ccdd03466101f6b24ca385f549ef3fc DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/response.js.meta b/Runtime/wechat-default/unity-sdk/response.js.meta index 871397f3..d2a0f31a 100644 --- a/Runtime/wechat-default/unity-sdk/response.js.meta +++ b/Runtime/wechat-default/unity-sdk/response.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: b011de2adf8f0418dab7cc120ebf8849 +guid: 68e60b198ef194d7222fddf27177459d DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/sdk.js.meta b/Runtime/wechat-default/unity-sdk/sdk.js.meta index c88821f2..5c47a07e 100644 --- a/Runtime/wechat-default/unity-sdk/sdk.js.meta +++ b/Runtime/wechat-default/unity-sdk/sdk.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 237f6900b784d4465aee34ebe634686a +guid: 449796eedaab4f6d12d8491eb190833a DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/share.js.meta b/Runtime/wechat-default/unity-sdk/share.js.meta index 7a28f9ca..331ec81a 100644 --- a/Runtime/wechat-default/unity-sdk/share.js.meta +++ b/Runtime/wechat-default/unity-sdk/share.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: d4a91dd81da6342b0a5c27faba1e599f +guid: 267b414dc43724f9eaf93998a280eea1 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/storage.js.meta b/Runtime/wechat-default/unity-sdk/storage.js.meta index ede4e623..6af60127 100644 --- a/Runtime/wechat-default/unity-sdk/storage.js.meta +++ b/Runtime/wechat-default/unity-sdk/storage.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 19721331942cc46c28076f002631a65d +guid: 8c778aedeecfbb21cb038be88a129acf DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/texture.js.meta b/Runtime/wechat-default/unity-sdk/texture.js.meta index f64fd79a..a9317262 100644 --- a/Runtime/wechat-default/unity-sdk/texture.js.meta +++ b/Runtime/wechat-default/unity-sdk/texture.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 2a592ab199716489e98f8f4d3c189cec +guid: 21d691e0a177db364324720d7d2f7d13 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/touch/index.js b/Runtime/wechat-default/unity-sdk/touch/index.js index 129036b6..8af18b71 100644 --- a/Runtime/wechat-default/unity-sdk/touch/index.js +++ b/Runtime/wechat-default/unity-sdk/touch/index.js @@ -5,8 +5,8 @@ let wxOnTouchMoveCallback; let wxOnTouchStartCallback; function handleTouchEvent(res, callback) { const dataPtr = convertOnTouchStartListenerResultToPointer({ - touches: res.touches.map(v => formatTouchEvent(v)), - changedTouches: res.changedTouches.map(v => formatTouchEvent(v)), + touches: res.touches.map(v => formatTouchEvent(v, res.type)), + changedTouches: res.changedTouches.map(v => formatTouchEvent(v, res.type, 1)), timeStamp: parseInt(res.timeStamp.toString(), 10), }); GameGlobal.Module.dynCall_viii(callback, dataPtr, res.touches.length, res.changedTouches.length); diff --git a/Runtime/wechat-default/unity-sdk/touch/index.js.meta b/Runtime/wechat-default/unity-sdk/touch/index.js.meta index 55f2561e..a604d4c2 100644 --- a/Runtime/wechat-default/unity-sdk/touch/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/touch/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: f72e25340936b47a6b655015f1f9fedb +guid: 2a74cf64213865271f278be1bbea199a DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/upload-file.js.meta b/Runtime/wechat-default/unity-sdk/upload-file.js.meta index 3cba1021..5c1a5c39 100644 --- a/Runtime/wechat-default/unity-sdk/upload-file.js.meta +++ b/Runtime/wechat-default/unity-sdk/upload-file.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: da62eb7d0352f4accada56424535160a +guid: 4113e56ad4acab776f82de9ca331cce4 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/userinfo.js.meta b/Runtime/wechat-default/unity-sdk/userinfo.js.meta index 01ef3e33..ef3348af 100644 --- a/Runtime/wechat-default/unity-sdk/userinfo.js.meta +++ b/Runtime/wechat-default/unity-sdk/userinfo.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 2b5756b6a9fec4d81aa79d8e9c4f7c67 +guid: 64bc43b8f50c44a6582c5137a8014a02 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/util.js.meta b/Runtime/wechat-default/unity-sdk/util.js.meta index 408677e9..aa73c5ad 100644 --- a/Runtime/wechat-default/unity-sdk/util.js.meta +++ b/Runtime/wechat-default/unity-sdk/util.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 10cf12ac77e32422387708f9400bbb6c +guid: 614cab92ac43e964196807b3ac90e160 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/utils.js b/Runtime/wechat-default/unity-sdk/utils.js index b4754512..054b88f1 100644 --- a/Runtime/wechat-default/unity-sdk/utils.js +++ b/Runtime/wechat-default/unity-sdk/utils.js @@ -12,6 +12,7 @@ function realUid(length = 20, char = true) { return id.join(''); } const identifierCache = []; +const clearIdTicker = {}; const tempCacheObj = {}; const typeMap = { array: [], @@ -30,36 +31,39 @@ const interfaceTypeMap = { object: 'object', }; export const uid = () => realUid(20, true); -export function formatIdentifier(identifier) { - if (identifier >= 0 && Math.abs(identifier) < 2147483648) { - return Math.round(identifier); +export function formatIdentifier(identifier, eventType, changed) { + if (changed && clearIdTicker[identifier]) { + clearTimeout(clearIdTicker[identifier]); + delete clearIdTicker[identifier]; } - - for (const key in identifierCache) { - if (identifierCache[key] && identifierCache[key].key === identifier) { - return identifierCache[key].value; + let id = identifierCache.indexOf(identifier); + if (id <= -1) { + for (let key = 0; key < identifierCache.length; key++) { + if (identifierCache[key] === null) { + identifierCache[key] = identifier; + id = key; + break; + } } } - let value = parseInt(`${Math.random() * 2147483648}`, 10); - - while (identifierCache.some(v => v.value === value)) { - value += 1; + if (id <= -1) { + identifierCache.push(identifier); + id = identifierCache.length - 1; } - identifierCache.push({ - key: identifier, - value, - }); - if (identifierCache.length > 30) { - identifierCache.shift(); + if (changed && (eventType === 'touchend' || eventType === 'touchcancel')) { + clearIdTicker[identifier] = setTimeout(() => { + identifierCache[id] = null; + delete clearIdTicker[identifier]; + }, 50); } - return value; + return id; } -export function formatTouchEvent(v) { +export function formatTouchEvent(v, type, changed) { return { clientX: v.clientX * window.devicePixelRatio, clientY: (window.innerHeight - v.clientY) * window.devicePixelRatio, force: v.force, - identifier: formatIdentifier(v.identifier), + identifier: formatIdentifier(v.identifier, type, changed), pageX: v.pageX * window.devicePixelRatio, pageY: (window.innerHeight - v.pageY) * window.devicePixelRatio, }; diff --git a/Runtime/wechat-default/unity-sdk/utils.js.meta b/Runtime/wechat-default/unity-sdk/utils.js.meta index 3eb52820..a3eee6f5 100644 --- a/Runtime/wechat-default/unity-sdk/utils.js.meta +++ b/Runtime/wechat-default/unity-sdk/utils.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 9a0b8773056414be49a235fb9bc53e76 +guid: 72f8b388ea688ddd5c5f90650e41340c DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/video.js.meta b/Runtime/wechat-default/unity-sdk/video.js.meta index e1fe93b3..9e616220 100644 --- a/Runtime/wechat-default/unity-sdk/video.js.meta +++ b/Runtime/wechat-default/unity-sdk/video.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: b79d19668fe724a8aabc415175ec43c7 +guid: 1fb5363532853f0cae64dd2d18aeeef7 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/unity-sdk/video/index.js.meta b/Runtime/wechat-default/unity-sdk/video/index.js.meta index 833da469..7fdf253f 100644 --- a/Runtime/wechat-default/unity-sdk/video/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/video/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 723d81245b32646d6a7444ff137d7a05 +guid: a16a7bc4911996b8b83b49bf08f4afc5 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/wasmcode/game.js.meta b/Runtime/wechat-default/wasmcode/game.js.meta index a0bf3208..a4f158a5 100644 --- a/Runtime/wechat-default/wasmcode/game.js.meta +++ b/Runtime/wechat-default/wasmcode/game.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 4d105d3a93b7c487db4dd2aba03e97b4 +guid: d66e18696fbb68262e0656f7ef5695eb DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/weapp-adapter.js b/Runtime/wechat-default/weapp-adapter.js index 411d3910..10dc9aaf 100644 --- a/Runtime/wechat-default/weapp-adapter.js +++ b/Runtime/wechat-default/weapp-adapter.js @@ -1186,16 +1186,18 @@ const isWK = false; this.stopPropagation = _util.noop; this.type = type; }; - function formatTouchEvent(v) { - v.identifier = formatIdentifier(v.identifier); - return v; + function formatTouchEvent(v, type, changed) { + return { + ...v, + identifier: formatIdentifier(v.identifier, type, changed) + }; } function touchEventHandlerFactory(type) { return function (event) { const touchEvent = new TouchEvent(type); - touchEvent.touches = event.touches.map(v => formatTouchEvent(v)); - touchEvent.targetTouches = Array.prototype.slice.call(event.touches).map(v => formatTouchEvent(v)); - touchEvent.changedTouches = event.changedTouches.map(v => formatTouchEvent(v)); + touchEvent.touches = event.touches.map(v => formatTouchEvent(v, event.type)); + touchEvent.targetTouches = Array.prototype.slice.call(event.touches).map(v => formatTouchEvent(v, event.type)); + touchEvent.changedTouches = event.changedTouches.map(v => formatTouchEvent(v, event.type, 1)); touchEvent.timeStamp = event.timeStamp; _document2.default.dispatchEvent(touchEvent); }; diff --git a/Runtime/wechat-default/weapp-adapter.js.meta b/Runtime/wechat-default/weapp-adapter.js.meta index 5331ad04..e6427ee2 100644 --- a/Runtime/wechat-default/weapp-adapter.js.meta +++ b/Runtime/wechat-default/weapp-adapter.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 61fff0a7caa9646faa5546859d2c8a30 +guid: f5a74eb5249c5850909df5137399217b DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/Runtime/wechat-default/workers/response/index.js.meta b/Runtime/wechat-default/workers/response/index.js.meta index 289650ae..3283325f 100644 --- a/Runtime/wechat-default/workers/response/index.js.meta +++ b/Runtime/wechat-default/workers/response/index.js.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 737631a0abed74a70af42b73df05810c +guid: 1b58ed04ec942a2c30461b37131996e7 DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +externalObjects: {} +userData: +assetBundleName: +assetBundleVariant: \ No newline at end of file diff --git a/package.json b/package.json index 650163cc..95f8d62e 100644 --- a/package.json +++ b/package.json @@ -1,14 +1 @@ -{ - "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 +{"name":"com.qq.weixin.minigame","displayName":"WXSDK","description":"WeChat Mini Game Tuanjie Engine Adapter SDK Package.","version":"v0.1.18","unity":"2019.4","unityRelease":"29f1","keywords":["Tuanjie","WX"],"dependencies":{}}