diff --git a/CHANGELOG.md b/CHANGELOG.md index e10a8861f..2f9307a82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,7 @@ Removed - 删除功能/接口 Fixed - 修复问题 Others - 其他 --> -## 2024-8-28 【预发布】 -PackageManager(git URL): https://github.com/wechat-miniprogram/minigame-tuanjie-transform-sdk.git#pre-v0.1.19 +## 2024-10-8 【重要更新】 ### Feature * 普通: UDPSocket.write适配 * 普通: 部分JS API接口更新 @@ -15,6 +14,11 @@ PackageManager(git URL): https://github.com/wechat-miniprogram/minigame-tuanjie- ### Fixed * 普通: 修复.net8 OnApplicationFocus/Pause适配 * 普通: 修复插件自动调节dpr后,获取不到实际dpr +* 普通:修复音频设置timeSamples不生效 +* 重要: 修复iOS18微信系统字体丢失 +* 重要:修复10S17.5以上音频退后台无法恢复 +* 重要:修复音频PC端异常循环播 +* 重要: 修复游戏圈文案默认显示'打开游戏圈'的问题 ## 2024-8-13 【重要更新】 ### Feature diff --git a/Editor/WXConvertCore.cs b/Editor/WXConvertCore.cs index 93005d908..275d48474 100644 --- a/Editor/WXConvertCore.cs +++ b/Editor/WXConvertCore.cs @@ -1432,10 +1432,10 @@ namespace WeChatWASM } catch (Exception e) { - Debug.LogWarning("[可选]生成Boot info 失败!错误:" + e.Message); + Debug.LogWarning("[可选]生成Boot info 失败!错误:" + e.Message); } - + return sb.ToString(); } diff --git a/Editor/WXEditorSettingHelper.cs b/Editor/WXEditorSettingHelper.cs index b8edcf6eb..c14a3c06e 100644 --- a/Editor/WXEditorSettingHelper.cs +++ b/Editor/WXEditorSettingHelper.cs @@ -18,6 +18,8 @@ namespace WeChatWASM public class WXSettingsHelper { + public static string projectRootPath; + public WXSettingsHelper() { Type weixinMiniGamePackageHelpersType = Type.GetType("UnityEditor.WeixinPackageHelpers,UnityEditor"); @@ -50,11 +52,17 @@ namespace WeChatWASM //loadData(); foldInstantGame = WXConvertCore.IsInstantGameAutoStreaming(); + + projectRootPath = System.IO.Path.GetFullPath(Application.dataPath + "/../"); + + _dstCache = ""; } - //private static WXEditorScriptObject config = UnityUtil.GetEditorConf(); + private static WXEditorScriptObject config; private static bool m_EnablePerfTool = false; + private static string _dstCache; + public void OnFocus() { loadData(); @@ -101,13 +109,13 @@ namespace WeChatWASM formInputData[targetDst] = ""; } EditorGUILayout.LabelField(string.Empty, GUILayout.Width(10)); - GUILayout.Label("导出路径", GUILayout.Width(140)); + GUILayout.Label(new GUIContent("导出路径(?)", "支持输入相对于项目根目录的相对路径,如:wxbuild"), GUILayout.Width(140)); formInputData[targetDst] = GUILayout.TextField(formInputData[targetDst], GUILayout.MaxWidth(EditorGUIUtility.currentViewWidth - 270)); if (GUILayout.Button(new GUIContent("打开"), GUILayout.Width(40))) { if (!formInputData[targetDst].Trim().Equals(string.Empty)) { - EditorUtility.RevealInFinder(formInputData[targetDst]); + EditorUtility.RevealInFinder(GetAbsolutePath(formInputData[targetDst])); } GUIUtility.ExitGUI(); } @@ -290,8 +298,8 @@ namespace WeChatWASM EditorGUILayout.BeginHorizontal(); if (GUILayout.Button(new GUIContent("更多配置项"), GUILayout.Width(100), GUILayout.Height(25))) { - var config = AssetDatabase.LoadAssetAtPath("Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset"); - Selection.activeObject = config; + var minigameConfig = AssetDatabase.LoadAssetAtPath("Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset"); + Selection.activeObject = minigameConfig; GUIUtility.ExitGUI(); } if (GUILayout.Button(new GUIContent("WebGL转小游戏(不常用)"), GUILayout.Width(150), GUILayout.Height(25))) @@ -380,7 +388,8 @@ namespace WeChatWASM { // SDKFilePath = Path.Combine(Application.dataPath, "WX-WASM-SDK-V2", "Runtime", "wechat-default", "unity-sdk", "index.js"); SDKFilePath = Path.Combine(UnityUtil.GetWxSDKRootPath(), "Runtime", "wechat-default", "unity-sdk", "index.js"); - var config = UnityUtil.GetEditorConf(); + config = UnityUtil.GetEditorConf(); + _dstCache = config.ProjectConf.DST; // Instant Game if (WXConvertCore.IsInstantGameAutoStreaming()) @@ -422,7 +431,7 @@ namespace WeChatWASM this.setData("compressDataPackage", config.ProjectConf.compressDataPackage); this.setData("videoUrl", config.ProjectConf.VideoUrl); this.setData("orientation", (int)config.ProjectConf.Orientation); - this.setData("dst", config.ProjectConf.DST); + this.setData("dst", _dstCache); this.setData("bundleHashLength", config.ProjectConf.bundleHashLength.ToString()); this.setData("bundlePathIdentifier", config.ProjectConf.bundlePathIdentifier); this.setData("bundleExcludeExtensions", config.ProjectConf.bundleExcludeExtensions); @@ -495,7 +504,8 @@ namespace WeChatWASM config.ProjectConf.compressDataPackage = this.getDataCheckbox("compressDataPackage"); config.ProjectConf.VideoUrl = this.getDataInput("videoUrl"); config.ProjectConf.Orientation = (WXScreenOritation)this.getDataPop("orientation"); - config.ProjectConf.DST = this.getDataInput("dst"); + _dstCache = this.getDataInput("dst"); + config.ProjectConf.DST = GetAbsolutePath(_dstCache); config.ProjectConf.bundleHashLength = int.Parse(this.getDataInput("bundleHashLength")); config.ProjectConf.bundlePathIdentifier = this.getDataInput("bundlePathIdentifier"); config.ProjectConf.bundleExcludeExtensions = this.getDataInput("bundleExcludeExtensions"); @@ -727,7 +737,38 @@ namespace WeChatWASM } } } + + public static bool IsAbsolutePath(string path) + { + // 检查是否为空或空白 + if (string.IsNullOrWhiteSpace(path)) + { + return false; + } + + // 在 Windows 上,检查驱动器字母或网络路径 + if (Application.platform == RuntimePlatform.WindowsEditor && Path.IsPathRooted(path)) + { + return true; + } + + // 在 Unix/Linux 和 macOS 上,检查是否以 '/' 开头 + if (Application.platform == RuntimePlatform.OSXEditor && path.StartsWith("/")) + { + return true; + } + + return false; // 否则为相对路径 + } + + public static string GetAbsolutePath(string path) + { + if (IsAbsolutePath(path)) + { + return path; + } + + return Path.Combine(projectRootPath, path); + } } - - } diff --git a/Editor/WXPluginVersion.cs b/Editor/WXPluginVersion.cs index 2e262508c..420512f07 100644 --- a/Editor/WXPluginVersion.cs +++ b/Editor/WXPluginVersion.cs @@ -2,7 +2,7 @@ { public class WXPluginVersion { - public static string pluginVersion = "202410080706"; // 这一行不要改他,导出的时候会自动替换 + public static string pluginVersion = "202410101117"; // 这一行不要改他,导出的时候会自动替换 } public class WXPluginConf diff --git a/Editor/wx-editor.dll b/Editor/wx-editor.dll index 599a94c0e..d28085609 100644 Binary files a/Editor/wx-editor.dll and b/Editor/wx-editor.dll differ diff --git a/Editor/wx-editor.xml.meta b/Editor/wx-editor.xml.meta index 4597a66ba..58a3b494a 100644 --- a/Editor/wx-editor.xml.meta +++ b/Editor/wx-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b1f260667675a9a7d0a655237a4c3430 +guid: 5fac5595894223b50f9fc68c56c9e96f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/SDK-Call-JS-Old.jslib b/Runtime/Plugins/SDK-Call-JS-Old.jslib index f8675ae22..0f1908282 100755 --- a/Runtime/Plugins/SDK-Call-JS-Old.jslib +++ b/Runtime/Plugins/SDK-Call-JS-Old.jslib @@ -30,7 +30,7 @@ mergeInto(LibraryManager.library, { GameGlobal.memprofiler = emscriptenMemoryProfiler GameGlobal.memprofiler.onDump = function () { var fs = wx.getFileSystemManager(); - var allocation_used=GameGlobal.memprofiler.allocationsAtLoc; + var allocation_used = GameGlobal.memprofiler.allocationsAtLoc; if (typeof allocation_used === "undefined") allocation_used=GameGlobal.memprofiler.allocationSiteStatistics; var calls = []; for (var i in allocation_used) { @@ -995,13 +995,13 @@ mergeInto(LibraryManager.library, { var sdk = _WXPointer_stringify_adaptor(sdkName); var func = _WXPointer_stringify_adaptor(functionName); var formattedArgs = JSON.parse(_WXPointer_stringify_adaptor(args)); - GameGlobal[sdk][func](...formattedArgs); + GameGlobal[sdk][func].apply(GameGlobal[sdk], formattedArgs); }, WX_CallJSFunctionWithReturn: function (sdkName, functionName, args) { var sdk = _WXPointer_stringify_adaptor(sdkName); var func = _WXPointer_stringify_adaptor(functionName); var formattedArgs = JSON.parse(_WXPointer_stringify_adaptor(args)); - var res = GameGlobal[sdk][func](...formattedArgs); + var res = GameGlobal[sdk][func].apply(GameGlobal[sdk], formattedArgs); var resStr = JSON.stringify(res); var bufferSize = lengthBytesUTF8(resStr || '') + 1; var buffer = _malloc(bufferSize); diff --git a/Runtime/Plugins/wx-perf.dll b/Runtime/Plugins/wx-perf.dll index 6afd8452a..671bfa11e 100644 Binary files a/Runtime/Plugins/wx-perf.dll and b/Runtime/Plugins/wx-perf.dll differ diff --git a/Runtime/Plugins/wx-runtime-editor.dll b/Runtime/Plugins/wx-runtime-editor.dll index cdff2a318..6cf26e18f 100644 Binary files a/Runtime/Plugins/wx-runtime-editor.dll and b/Runtime/Plugins/wx-runtime-editor.dll differ diff --git a/Runtime/Plugins/wx-runtime-editor.xml.meta b/Runtime/Plugins/wx-runtime-editor.xml.meta index 6e0f8dc8e..46ec264ea 100644 --- a/Runtime/Plugins/wx-runtime-editor.xml.meta +++ b/Runtime/Plugins/wx-runtime-editor.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 57aa93b43d006f13c8e05e350d6cd32f +guid: 67898c3a6fa50ff285b422af9e2d550d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/wx-runtime.dll b/Runtime/Plugins/wx-runtime.dll index 92fc12df8..b83f44839 100644 Binary files a/Runtime/Plugins/wx-runtime.dll and b/Runtime/Plugins/wx-runtime.dll differ diff --git a/Runtime/Plugins/wx-runtime.xml.meta b/Runtime/Plugins/wx-runtime.xml.meta index ad82ab242..60fa3e221 100644 --- a/Runtime/Plugins/wx-runtime.xml.meta +++ b/Runtime/Plugins/wx-runtime.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fa414b40926610979325ff6d05eada8c +guid: 2dc94a95f54ccc8279acbf4fd11438e3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/WXRuntimeExtDef.cs b/Runtime/WXRuntimeExtDef.cs index 069c718b6..5137e5aa6 100644 --- a/Runtime/WXRuntimeExtDef.cs +++ b/Runtime/WXRuntimeExtDef.cs @@ -7,7 +7,7 @@ namespace WeChatWASM { public class WXRuntimeExtDef { - [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSplashScreen)] + [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] static void OnWXRuntimeExtDefLoadRuntimeMethod() { Init(); diff --git a/Runtime/wechat-default/check-version.js.meta b/Runtime/wechat-default/check-version.js.meta index 2ba2786ac..0a5f504cd 100644 --- a/Runtime/wechat-default/check-version.js.meta +++ b/Runtime/wechat-default/check-version.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 44a7e1e416ef5132a57ccfa3939eca38 +guid: ebd882cd3c826e6eadcf62e23d54f19b DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/data-package/game.js.meta b/Runtime/wechat-default/data-package/game.js.meta index 9c26ad31c..c091ae759 100644 --- a/Runtime/wechat-default/data-package/game.js.meta +++ b/Runtime/wechat-default/data-package/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a8c126ddc61c8cc6ed296c38f7f1e957 +guid: d86ad6de6c17765b70876d120cdd20c3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/events.js.meta b/Runtime/wechat-default/events.js.meta index 5be2c1cc1..68784092c 100644 --- a/Runtime/wechat-default/events.js.meta +++ b/Runtime/wechat-default/events.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 98eb2eb98064d124aae821b0310bacf2 +guid: f35b4bcbe80fccb78230fe66165dbb18 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.js.meta b/Runtime/wechat-default/game.js.meta index 8c18f2417..20463353c 100644 --- a/Runtime/wechat-default/game.js.meta +++ b/Runtime/wechat-default/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d7844e1d7d7626fe49436142ee66a9e6 +guid: 509de1a212fdc1abd7b3175a4d603390 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/game.json.meta b/Runtime/wechat-default/game.json.meta index ddc4e86ba..ebe4bba69 100644 --- a/Runtime/wechat-default/game.json.meta +++ b/Runtime/wechat-default/game.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 277f37fd525363bcd0ac1e76c7190146 +guid: ab977e7528dd2cbe7ec93326dd7ed8fa DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/background.jpg.meta b/Runtime/wechat-default/images/background.jpg.meta index cbc7d33e8..4de6e5ada 100644 --- a/Runtime/wechat-default/images/background.jpg.meta +++ b/Runtime/wechat-default/images/background.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f7065a76a20ec762f47e6af22bd76d9 +guid: 9fd793350e5da62dd8fe8957e1509b64 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/images/unity_logo.png.meta b/Runtime/wechat-default/images/unity_logo.png.meta index 90be6ff12..e38b5ba9f 100644 --- a/Runtime/wechat-default/images/unity_logo.png.meta +++ b/Runtime/wechat-default/images/unity_logo.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c01ed2e5319c00de34c7913548e1b60 +guid: ea42f7abd8914b4292eba71ddcfaac6f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/data/index.js.meta b/Runtime/wechat-default/open-data/data/index.js.meta index 6b8c6122c..fdedd7f5f 100644 --- a/Runtime/wechat-default/open-data/data/index.js.meta +++ b/Runtime/wechat-default/open-data/data/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3d4add50de1d58ec65ecc3bec54d3de1 +guid: 5f0094804806b5c4be6afda3cb358b63 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/data/utils.js.meta b/Runtime/wechat-default/open-data/data/utils.js.meta index 8613ace77..626b01652 100644 --- a/Runtime/wechat-default/open-data/data/utils.js.meta +++ b/Runtime/wechat-default/open-data/data/utils.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 471715336cf16bf9aa11245d6cb64343 +guid: a0e0e7a1cb238bcc9087706a8bf87d72 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/index.js.meta b/Runtime/wechat-default/open-data/index.js.meta index 1e4d8e5a3..a38bf9f87 100644 --- a/Runtime/wechat-default/open-data/index.js.meta +++ b/Runtime/wechat-default/open-data/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dc92d9012b6b5518e4ee161dd9ee324f +guid: 492f0c6e53ebdd5ae894cb9c8f5b03e0 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/loading.js.meta b/Runtime/wechat-default/open-data/loading.js.meta index b685d2542..fd698ecfc 100644 --- a/Runtime/wechat-default/open-data/loading.js.meta +++ b/Runtime/wechat-default/open-data/loading.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e408a2e1dafb6b88fe6fea613212ccdc +guid: 8746d909e43fd9667a125d29054b41f3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/avatar.png.meta b/Runtime/wechat-default/open-data/render/image/avatar.png.meta index df58c1fca..355e34266 100644 --- a/Runtime/wechat-default/open-data/render/image/avatar.png.meta +++ b/Runtime/wechat-default/open-data/render/image/avatar.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fca653978f3fe1e0541ebe4d81db4271 +guid: c72428786b23bc703ac8fd8036ca944f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/button1.png.meta b/Runtime/wechat-default/open-data/render/image/button1.png.meta index 3057fb3fa..de98a5ccf 100644 --- a/Runtime/wechat-default/open-data/render/image/button1.png.meta +++ b/Runtime/wechat-default/open-data/render/image/button1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac9029b2e489f669e74be2600ee58343 +guid: d94bded9ead037022e990c154e1bbb94 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/button2.png.meta b/Runtime/wechat-default/open-data/render/image/button2.png.meta index e9164f6dc..4964ac24e 100644 --- a/Runtime/wechat-default/open-data/render/image/button2.png.meta +++ b/Runtime/wechat-default/open-data/render/image/button2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f0bd9aa7e524c03c5dd7d51bc605a57a +guid: c19d61b9a41af1cc75a36f578ab72997 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/button3.png.meta b/Runtime/wechat-default/open-data/render/image/button3.png.meta index e8f9c54de..fb3cd8cdc 100644 --- a/Runtime/wechat-default/open-data/render/image/button3.png.meta +++ b/Runtime/wechat-default/open-data/render/image/button3.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bcc0d1cce30fa211c0684b1cab7aa4ab +guid: 91e625f9af0ae752568d45d2f93d4219 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/loading.png.meta b/Runtime/wechat-default/open-data/render/image/loading.png.meta index 78c7bf080..ebbf39848 100644 --- a/Runtime/wechat-default/open-data/render/image/loading.png.meta +++ b/Runtime/wechat-default/open-data/render/image/loading.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 423a761412c9bb3c2fa7e3b745917f8c +guid: a089d716f244ee248d49d1c48cfd9702 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/nameBg.png.meta b/Runtime/wechat-default/open-data/render/image/nameBg.png.meta index bb89c2dae..4e5245b8b 100644 --- a/Runtime/wechat-default/open-data/render/image/nameBg.png.meta +++ b/Runtime/wechat-default/open-data/render/image/nameBg.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e9f20942a9f85ab47412b9fce3937954 +guid: 811423bad3b2de6069fcdc49dd02b96d DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/rankAvatar.png.meta b/Runtime/wechat-default/open-data/render/image/rankAvatar.png.meta index 71f723e2f..8deeb5413 100644 --- a/Runtime/wechat-default/open-data/render/image/rankAvatar.png.meta +++ b/Runtime/wechat-default/open-data/render/image/rankAvatar.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0b69c585d2010389e4455b910717079f +guid: 4642dd163f1afa756a6791fcddbd8573 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/rankBg.png.meta b/Runtime/wechat-default/open-data/render/image/rankBg.png.meta index 2c98b6db6..1fdd9f069 100644 --- a/Runtime/wechat-default/open-data/render/image/rankBg.png.meta +++ b/Runtime/wechat-default/open-data/render/image/rankBg.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 21a2b3bbc3c4c4394354fe38eaebe2f1 +guid: 44fad17947a9ba506ff72965a061015a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/shareBg.png.meta b/Runtime/wechat-default/open-data/render/image/shareBg.png.meta index 1b8c75bfc..0d3392878 100644 --- a/Runtime/wechat-default/open-data/render/image/shareBg.png.meta +++ b/Runtime/wechat-default/open-data/render/image/shareBg.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4d933c70f2eadac74f8f05b07b3265f5 +guid: 9369d8a183183142fa183088bd3e36a8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/image/shareBg2.png.meta b/Runtime/wechat-default/open-data/render/image/shareBg2.png.meta index 194007edd..051e0878e 100644 --- a/Runtime/wechat-default/open-data/render/image/shareBg2.png.meta +++ b/Runtime/wechat-default/open-data/render/image/shareBg2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a044c9fb8bcc674808b1922fc08d517a +guid: aee3ad5cbb8692ab05076f8378513b8f DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/styles/friendRank.js.meta b/Runtime/wechat-default/open-data/render/styles/friendRank.js.meta index 94a477f66..3b97761bc 100644 --- a/Runtime/wechat-default/open-data/render/styles/friendRank.js.meta +++ b/Runtime/wechat-default/open-data/render/styles/friendRank.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e05acefc59d97fe85f2d4c5db3ad919e +guid: 356c3bd096aaf8bf23f1652448ccde9e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/styles/tips.js.meta b/Runtime/wechat-default/open-data/render/styles/tips.js.meta index 74da28f8b..b09226a84 100644 --- a/Runtime/wechat-default/open-data/render/styles/tips.js.meta +++ b/Runtime/wechat-default/open-data/render/styles/tips.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d49e7b1725866a315e43d17ef34ffe02 +guid: 52bee2c08198be28c87eeea525b4b9b1 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/tpls/friendRank.js.meta b/Runtime/wechat-default/open-data/render/tpls/friendRank.js.meta index 7b81e76ad..eae610caa 100644 --- a/Runtime/wechat-default/open-data/render/tpls/friendRank.js.meta +++ b/Runtime/wechat-default/open-data/render/tpls/friendRank.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9fa840e35fcb24b74a5d7ba50fb15c61 +guid: 7dbec4a6f262a7807fb3442a8e282da4 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/open-data/render/tpls/tips.js.meta b/Runtime/wechat-default/open-data/render/tpls/tips.js.meta index 9c1875645..855d2c360 100644 --- a/Runtime/wechat-default/open-data/render/tpls/tips.js.meta +++ b/Runtime/wechat-default/open-data/render/tpls/tips.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dbc5a57b21ae6ff0474262aa85d04a9f +guid: c407d5f62cdfb883292cfaa1d57e0362 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugin-config.js.meta b/Runtime/wechat-default/plugin-config.js.meta index 66e06cc42..5cc17df43 100644 --- a/Runtime/wechat-default/plugin-config.js.meta +++ b/Runtime/wechat-default/plugin-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 582c265cbb4802baaeb8b4951551027d +guid: e72180d5d6cf8c9f913f6dfb65661437 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/check-update.js.meta b/Runtime/wechat-default/plugins/check-update.js.meta index cc8d1e301..454719467 100644 --- a/Runtime/wechat-default/plugins/check-update.js.meta +++ b/Runtime/wechat-default/plugins/check-update.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5b3878e7fa96b761a24d659858f80a57 +guid: 002e25c1f6886dd694c6837fcc226e6c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/plugins/screen-adapter.js.meta b/Runtime/wechat-default/plugins/screen-adapter.js.meta index 44a5c80fd..370d84936 100644 --- a/Runtime/wechat-default/plugins/screen-adapter.js.meta +++ b/Runtime/wechat-default/plugins/screen-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ad740f946e41fcc1eb2a431f058be6d7 +guid: fbe5f4d6c11c7e5deec645c65d79f273 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/project.config.json.meta b/Runtime/wechat-default/project.config.json.meta index 1243eabe1..ef55db55b 100644 --- a/Runtime/wechat-default/project.config.json.meta +++ b/Runtime/wechat-default/project.config.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 70169de3f7f88310e8a581b1d4ee7cd5 +guid: 818861678b01be1037e65d4d61d595e0 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/texture-config.js.meta b/Runtime/wechat-default/texture-config.js.meta index c40a03811..c7e191f2f 100644 --- a/Runtime/wechat-default/texture-config.js.meta +++ b/Runtime/wechat-default/texture-config.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d92d43031458152693c68d32566ca073 +guid: fad379e544f109d9ec8dc5828de469a5 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-namespace.js b/Runtime/wechat-default/unity-namespace.js index e3b1002b5..92365ce43 100644 --- a/Runtime/wechat-default/unity-namespace.js +++ b/Runtime/wechat-default/unity-namespace.js @@ -1,6 +1,4 @@ // @ts-nocheck -/* eslint-disable no-unused-vars */ -/* eslint-disable no-undef */ const unityNamespace = { canvas: GameGlobal.canvas, // cache width @@ -138,6 +136,7 @@ function bindGloblException() { }); // 上报初始信息 function printSystemInfo(appBaseInfo, deviceInfo) { + // eslint-disable-next-line @typescript-eslint/naming-convention const { version, SDKVersion } = appBaseInfo; const { platform, system } = deviceInfo; unityNamespace.version = version; diff --git a/Runtime/wechat-default/unity-namespace.js.meta b/Runtime/wechat-default/unity-namespace.js.meta index 84c2a2f77..c7270aab9 100644 --- a/Runtime/wechat-default/unity-namespace.js.meta +++ b/Runtime/wechat-default/unity-namespace.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 11aed45104c833a22c3f244a3d1e3591 +guid: b2d6fe35d161d52675e945b7b1337a4c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta index d373ceb00..a540aae5e 100644 --- a/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/TCPSocket/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8be8a5e031b65ccdd4964fac6fadd791 +guid: 99eb9510bf678bf963669a4749f91871 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta b/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta index 36579b4a1..f36b9c24e 100644 --- a/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/UDPSocket/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 37c799c396873071f6eb977f96c2abd5 +guid: c5a1ef9d2ce334140f76d46aeaeb32c2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/ad.js.meta b/Runtime/wechat-default/unity-sdk/ad.js.meta index 260e8d90f..b592bd615 100644 --- a/Runtime/wechat-default/unity-sdk/ad.js.meta +++ b/Runtime/wechat-default/unity-sdk/ad.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 37e21b438d686abe321627746a8a0ea4 +guid: 80d082b29b64400e1adfc5493243db9c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/common.js.meta b/Runtime/wechat-default/unity-sdk/audio/common.js.meta index a0aacb84d..417994ced 100644 --- a/Runtime/wechat-default/unity-sdk/audio/common.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/common.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8f1ec5dc506b985667e29b95461c737d +guid: 717a8076f2465922c308bb349446c5de DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/const.js.meta b/Runtime/wechat-default/unity-sdk/audio/const.js.meta index 293a3f8cd..9678cac51 100644 --- a/Runtime/wechat-default/unity-sdk/audio/const.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/const.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 288b902e490b8deeb4f5a9fbacdbdd94 +guid: a42f6d69f3d9ba6fd31d8ac4284357f9 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/index.js.meta b/Runtime/wechat-default/unity-sdk/audio/index.js.meta index 7ce544a67..abbaeba46 100644 --- a/Runtime/wechat-default/unity-sdk/audio/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 97555a13c2ad9d2a5028a2045a4a1a49 +guid: 2288028ed2072aedac0b7ec4a6c41600 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/inner-audio.js.meta b/Runtime/wechat-default/unity-sdk/audio/inner-audio.js.meta index b5d93cec1..aa66ade02 100644 --- a/Runtime/wechat-default/unity-sdk/audio/inner-audio.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/inner-audio.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e7ab8fe88edbd8067c59fe238e64a70 +guid: db2a912fd6f5d42270c51b7052811748 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/store.js.meta b/Runtime/wechat-default/unity-sdk/audio/store.js.meta index 78c23f3e9..d53eee6f6 100644 --- a/Runtime/wechat-default/unity-sdk/audio/store.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/store.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 328cd64e28047419abd725446a57bd03 +guid: cd6eab62ac3ac9f190b50b1bc621afcc DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/unity-audio.js.meta b/Runtime/wechat-default/unity-sdk/audio/unity-audio.js.meta index bb1b96df0..2beacb75b 100644 --- a/Runtime/wechat-default/unity-sdk/audio/unity-audio.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/unity-audio.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 02d563b4452e1007500b8f1a82ad59c6 +guid: da5174bc14a7e662876ced8d10ec237e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/audio/utils.js.meta b/Runtime/wechat-default/unity-sdk/audio/utils.js.meta index 325a88361..ea7f920bf 100644 --- a/Runtime/wechat-default/unity-sdk/audio/utils.js.meta +++ b/Runtime/wechat-default/unity-sdk/audio/utils.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d8d8260bbc052f164588d3e5683220b5 +guid: 3af49286dc6d9967ccc772266944ac42 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/authorize.js.meta b/Runtime/wechat-default/unity-sdk/authorize.js.meta index ab4e930b8..b4d71e7ee 100644 --- a/Runtime/wechat-default/unity-sdk/authorize.js.meta +++ b/Runtime/wechat-default/unity-sdk/authorize.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c21bc9b30537e30c57d58da5f12d5aa1 +guid: 7af1f88483447ed246b1cd77a71d50e8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta b/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta index 654a1c977..6ddc86eb2 100644 --- a/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/bluetooth/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 79c014c85810762878fb9fba6d6db4f6 +guid: 39060ee92dc9dc5d507b1ab6326d3113 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/camera.js.meta b/Runtime/wechat-default/unity-sdk/camera.js.meta index dd0110c4e..d0e72091e 100644 --- a/Runtime/wechat-default/unity-sdk/camera.js.meta +++ b/Runtime/wechat-default/unity-sdk/camera.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c2c4c40648ddc3e939370bd89d3508f9 +guid: 185a749e3968175dbce69f9ea46d9675 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/canvas-context.js.meta b/Runtime/wechat-default/unity-sdk/canvas-context.js.meta index bf064230a..488089aef 100644 --- a/Runtime/wechat-default/unity-sdk/canvas-context.js.meta +++ b/Runtime/wechat-default/unity-sdk/canvas-context.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 48e1f02e9b0b91f9c537510dd6b54716 +guid: b750c6e5e8ac2f8ff984fe3c0c9f5cd2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/canvas.js.meta b/Runtime/wechat-default/unity-sdk/canvas.js.meta index bf4a37cc3..fdcec90e4 100644 --- a/Runtime/wechat-default/unity-sdk/canvas.js.meta +++ b/Runtime/wechat-default/unity-sdk/canvas.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cc598f0b5a617250e913512b28f32801 +guid: 21c993941d72c6865ef6b49b1d68b068 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/chat.js.meta b/Runtime/wechat-default/unity-sdk/chat.js.meta index 74cbaadc4..37d0e7f37 100644 --- a/Runtime/wechat-default/unity-sdk/chat.js.meta +++ b/Runtime/wechat-default/unity-sdk/chat.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 42abf1423fd47313211d9aef0fc5d845 +guid: 3961e33f1ce8b6a627bb2b1e620070b0 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/cloud.js.meta b/Runtime/wechat-default/unity-sdk/cloud.js.meta index 771895690..1cea11583 100644 --- a/Runtime/wechat-default/unity-sdk/cloud.js.meta +++ b/Runtime/wechat-default/unity-sdk/cloud.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 05cd7b2d8a5c623ddede1517790281bc +guid: 586bb4da3e4e75c43f754c35fe9ffb00 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/conf.js.meta b/Runtime/wechat-default/unity-sdk/conf.js.meta index fa5242eee..e630faca2 100644 --- a/Runtime/wechat-default/unity-sdk/conf.js.meta +++ b/Runtime/wechat-default/unity-sdk/conf.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b6624fa1bb3493bc3f3e4f05984deee4 +guid: 86d1916914f33a587476d588b503bfa2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/file-info.js.meta b/Runtime/wechat-default/unity-sdk/file-info.js.meta index 0060c5289..41d050f59 100644 --- a/Runtime/wechat-default/unity-sdk/file-info.js.meta +++ b/Runtime/wechat-default/unity-sdk/file-info.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 21b69774392f14c148c8bea5c247b378 +guid: 5667b25079909abab89294e8eea5964a DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fix.js.meta b/Runtime/wechat-default/unity-sdk/fix.js.meta index 889e2c41b..97f03f4e6 100644 --- a/Runtime/wechat-default/unity-sdk/fix.js.meta +++ b/Runtime/wechat-default/unity-sdk/fix.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 665edb287fe85eacb5c0e2947f80101e +guid: 60ac02e2913cd8637a96d8e0bf31d553 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font/fix-cmap.js.meta b/Runtime/wechat-default/unity-sdk/font/fix-cmap.js.meta index 6ca04875e..b114808a9 100644 --- a/Runtime/wechat-default/unity-sdk/font/fix-cmap.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/fix-cmap.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7b3701d66ad840d6ce5fba1ce2c225d5 +guid: e2a784dd123ed0cca16bd8860ba709fb DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font/index.js b/Runtime/wechat-default/unity-sdk/font/index.js index 800648f74..4e6dd111f 100644 --- a/Runtime/wechat-default/unity-sdk/font/index.js +++ b/Runtime/wechat-default/unity-sdk/font/index.js @@ -89,81 +89,94 @@ const fontOptions = { }, CustomUnicodeRange: $CustomUnicodeRange, }; - -function handleGetFontData(config, forceLoad = false) { +function handleGetFontData(config, forceFallback) { + const canGetWxCommonFont = !!GameGlobal.manager?.font?.getCommonFont; + if (!config && !canGetWxCommonFont) { return Promise.reject('invalid usage'); } // eslint-disable-next-line @typescript-eslint/no-misused-promises - if (!getFontPromise || forceLoad) { + if (!getFontPromise || forceFallback) { getFontPromise = new Promise((resolve, reject) => { - if (!canGetWxCommonFont && !!config) { + + if ((!canGetWxCommonFont || forceFallback) && !!config) { const xhr = new GameGlobal.unityNamespace.UnityLoader.UnityCache.XMLHttpRequest(); - xhr.open('GET', config.fallbackUrl, true); - xhr.responseType = 'arraybuffer'; + xhr.open('GET', config.fallbackUrl, true); + xhr.responseType = 'arraybuffer'; xhr.onload = () => { + if ((xhr.status === 200 || xhr.status === 0) && xhr.response) { - const notoFontData = xhr.response; - fontDataCache = notoFontData; - isReadFromCache = xhr.isReadFromCache; - resolve(); + const notoFontData = xhr.response; + fontDataCache = notoFontData; + isReadFromCache = xhr.isReadFromCache; + resolve(); } }; - xhr.onerror = reject; - xhr.send(); + xhr.onerror = reject; + xhr.send(); return; } - let unicodeRange = []; + let unicodeRange = []; Object.keys(fontOptions).forEach((key) => { if (fontOptions[key].include) { - unicodeRange.push(fontOptions[key].unicodeRange); + unicodeRange.push(fontOptions[key].unicodeRange); } }); - unicodeRange = unicodeRange.concat(fontOptions.CustomUnicodeRange); + unicodeRange = unicodeRange.concat(fontOptions.CustomUnicodeRange); + GameGlobal.manager.font.getCommonFont({ success(fontData) { if (isIOS) { fixCmapTable(fontData); } + if (isAndroid) { const tempData = splitTTCToBufferOnlySC(fontData); if (tempData) { - fontData = tempData; + fontData = tempData; } } - fontDataCache = fontData; - resolve(); + fontDataCache = fontData; + resolve(); }, - fail: reject, - }, unicodeRange); + fail: reject, + }, unicodeRange); }); } - return getFontPromise; + return getFontPromise; } -function WXGetFontRawData(conf, callbackId) { - const config = formatJsonStr(conf); - const loadFromRemote = !GameGlobal.manager?.font?.getCommonFont; - GameGlobal.manager.TimeLogger.timeStart('WXGetFontRawData'); - handleGetFontData(config).then(() => { +function WXGetFontRawData(conf, callbackId, forceFallback = false) { + const config = formatJsonStr(conf); + const loadFromRemote = !GameGlobal.manager?.font?.getCommonFont; + GameGlobal.manager.TimeLogger.timeStart('WXGetFontRawData'); + + handleGetFontData(config, forceFallback).then(() => { if (fontDataCache) { - GameGlobal.manager.font.reportGetFontCost(GameGlobal.manager.TimeLogger.timeEnd('WXGetFontRawData'), { loadFromRemote, isReadFromCache, preloadWXFont: GameGlobal.unityNamespace.preloadWXFont }); - const { ascent, descent, lineGap, unitsPerEm } = readMetrics(fontDataCache) || {}; - tempCacheObj[callbackId] = fontDataCache; - moduleHelper.send('GetFontRawDataCallback', JSON.stringify({ callbackId, type: 'success', res: JSON.stringify({ byteLength: fontDataCache.byteLength, ascent, descent, lineGap, unitsPerEm }) })); - GameGlobal.manager.Logger.pluginLog(`[font] load font from ${loadFromRemote ? `network, url=${config.fallbackUrl}` : 'local'}`); - fontDataCache = null; + GameGlobal.manager.font.reportGetFontCost(GameGlobal.manager.TimeLogger.timeEnd('WXGetFontRawData'), { loadFromRemote: forceFallback || loadFromRemote, isReadFromCache, preloadWXFont: GameGlobal.unityNamespace.preloadWXFont }); + const { ascent, descent, lineGap, unitsPerEm } = readMetrics(fontDataCache) || {}; + tempCacheObj[callbackId] = fontDataCache; + moduleHelper.send('GetFontRawDataCallback', JSON.stringify({ callbackId, type: 'success', res: JSON.stringify({ byteLength: fontDataCache.byteLength, ascent, descent, lineGap, unitsPerEm }) })); + GameGlobal.manager.Logger.pluginLog(`[font] load font from ${forceFallback || loadFromRemote ? `network, url=${config.fallbackUrl}` : 'local'}`); + + fontDataCache = null; } else { GameGlobal.manager.Logger.pluginError('[font] load font error: empty content'); } }) .catch((err) => { - GameGlobal.manager.Logger.pluginError('[font] load font error: ', err); + if (err.errmsg === 'no support font' && forceFallback === false) { + + WXGetFontRawData(conf, callbackId, true); + } + else { + GameGlobal.manager.Logger.pluginError('[font] load font error: ', err); + } }); } function WXShareFontBuffer(buffer, offset, callbackId) { diff --git a/Runtime/wechat-default/unity-sdk/font/index.js.meta b/Runtime/wechat-default/unity-sdk/font/index.js.meta index 994742a80..d3881b76b 100644 --- a/Runtime/wechat-default/unity-sdk/font/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 20ba3d24ca45406882d87c30309e072b +guid: 2d28821d3607bc193a0033d02fb7fadf DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font/read-metrics.js.meta b/Runtime/wechat-default/unity-sdk/font/read-metrics.js.meta index 06c4e255c..e1ff359fc 100644 --- a/Runtime/wechat-default/unity-sdk/font/read-metrics.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/read-metrics.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d7a76d71627b5e97314fcf3cb54ef8fe +guid: 4cab12438d0711a09c78c043d8161ff3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font/split-sc.js.meta b/Runtime/wechat-default/unity-sdk/font/split-sc.js.meta index 4da06e288..78a95fe8b 100644 --- a/Runtime/wechat-default/unity-sdk/font/split-sc.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/split-sc.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a125bd5351b97f74e3b5f349e4053d5 +guid: eb375f62fc3570c809acf9bb6ac0dbf8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/font/util.js.meta b/Runtime/wechat-default/unity-sdk/font/util.js.meta index 347a58913..25ac79ccd 100644 --- a/Runtime/wechat-default/unity-sdk/font/util.js.meta +++ b/Runtime/wechat-default/unity-sdk/font/util.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1ce1e19c6a89d0be31c757f1e5ab0a03 +guid: 0c9fe8260963dbecea9dfd6e3ca5bb61 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/fs.js.meta b/Runtime/wechat-default/unity-sdk/fs.js.meta index 7e8d96900..c9754f41a 100644 --- a/Runtime/wechat-default/unity-sdk/fs.js.meta +++ b/Runtime/wechat-default/unity-sdk/fs.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7706abe8371bf5bcdcc88b6e24259b86 +guid: 275089b85c9c0f8b7861515eeeb61f06 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/game-club.js b/Runtime/wechat-default/unity-sdk/game-club.js index e13b54b5f..95376fa2a 100644 --- a/Runtime/wechat-default/unity-sdk/game-club.js +++ b/Runtime/wechat-default/unity-sdk/game-club.js @@ -25,6 +25,10 @@ export default { config.type = typeEnum[config.type]; // @ts-ignore config.icon = iconEnum[config.icon]; + + if (!config.text) { + config.text = ''; + } const id = uid(); gameClubButtonList[id] = wx.createGameClubButton(config); return id; diff --git a/Runtime/wechat-default/unity-sdk/game-club.js.meta b/Runtime/wechat-default/unity-sdk/game-club.js.meta index f0136877c..008d4f552 100644 --- a/Runtime/wechat-default/unity-sdk/game-club.js.meta +++ b/Runtime/wechat-default/unity-sdk/game-club.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 43b8eb5313337c61950a44b41eb6d72b +guid: e690cf9e9ebccbc20a6c0a9d59f3df90 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/game-recorder.js.meta b/Runtime/wechat-default/unity-sdk/game-recorder.js.meta index f2781bcbb..3af053fb9 100644 --- a/Runtime/wechat-default/unity-sdk/game-recorder.js.meta +++ b/Runtime/wechat-default/unity-sdk/game-recorder.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0f7a23834543a8c77d2d1790d0801fec +guid: 80766c8723ce705a865586e3943e27c2 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta b/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta index 264daac58..8ee718e55 100644 --- a/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/gyroscope/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 38646574248504f5b7d734483adf66ba +guid: d0ae7819e22f7e2888c4962253bc3c11 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/index.js.meta b/Runtime/wechat-default/unity-sdk/index.js.meta index 3c0e85674..2811d9b54 100644 --- a/Runtime/wechat-default/unity-sdk/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1b18c50ea896e41cd31100e6e88e5d71 +guid: 1cc790c843e7519152d2b51da51980f8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/logger.js.meta b/Runtime/wechat-default/unity-sdk/logger.js.meta index 7a0dcc5dd..61d56ee5d 100644 --- a/Runtime/wechat-default/unity-sdk/logger.js.meta +++ b/Runtime/wechat-default/unity-sdk/logger.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0ae7d52d9bf63f0d07f717fc90c83d62 +guid: 37a85413738478f0ba914fb6a55a8c28 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js b/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js index 8396583d8..55cc9d874 100644 --- a/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js +++ b/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/naming-convention */ let FrameworkData = null; const keyboardSetting = { value: '', @@ -13,6 +14,7 @@ const keyboardConfirmlistener = function (res) { keyboardSetting.value = res.value; _JS_MobileKeyboard_Hide(false); }; +// eslint-disable-next-line @typescript-eslint/no-unused-vars const keyboardCompletelistener = function (res) { removeKeyboardListeners(); }; @@ -87,6 +89,7 @@ function _JS_MobileKeyboard_SetText(text) { } keyboardSetting.value = FrameworkData.UTF8ToString(text); } +// eslint-disable-next-line @typescript-eslint/no-unused-vars function _JS_MobileKeyboard_SetTextSelection(start, length) { } @@ -99,7 +102,7 @@ function _JS_MobileKeyboard_Show(text, keyboardType, autocorrection, multiline, mobile_input_hide_delay = null; } if (hasExistingMobileInput) { - if (keyboardSetting.multiple != !!multiline) { + if (keyboardSetting.multiple !== !!multiline) { _JS_MobileKeyboard_Hide(false); return; } diff --git a/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta b/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta index bf7d7d28e..8d6d9c7c5 100644 --- a/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/mobileKeyboard/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 78208776132b56e2d5f9d2343b943056 +guid: 0e7bbb431167c8d21920b50adeaf94c3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/module-helper.js.meta b/Runtime/wechat-default/unity-sdk/module-helper.js.meta index 4090b151a..fe83505f1 100644 --- a/Runtime/wechat-default/unity-sdk/module-helper.js.meta +++ b/Runtime/wechat-default/unity-sdk/module-helper.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 05566ffda7a016ee34212dd4403ea1ce +guid: 535b97d69db838fa243000b68ac9c280 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/open-data.js b/Runtime/wechat-default/unity-sdk/open-data.js index c9443ab08..f52c7f458 100644 --- a/Runtime/wechat-default/unity-sdk/open-data.js +++ b/Runtime/wechat-default/unity-sdk/open-data.js @@ -22,7 +22,12 @@ function hookUnityRender() { if (!textureObject) { textureObject = gl.createTexture(); gl.bindTexture(gl.TEXTURE_2D, textureObject); - gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, getSharedCanvas()); + if (GameGlobal.unityNamespace.unityColorSpace === 'Linear') { + gl.texImage2D(gl.TEXTURE_2D, 0, gl.SRGB8_ALPHA8, gl.RGBA, gl.UNSIGNED_BYTE, getSharedCanvas()); + } + else { + gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, getSharedCanvas()); + } gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR); gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR); gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE); @@ -31,7 +36,12 @@ function hookUnityRender() { else { gl.bindTexture(gl.TEXTURE_2D, textureObject); - gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, getSharedCanvas()); + if (GameGlobal.unityNamespace.unityColorSpace === 'Linear') { + gl.texImage2D(gl.TEXTURE_2D, 0, gl.SRGB8_ALPHA8, gl.RGBA, gl.UNSIGNED_BYTE, getSharedCanvas()); + } + else { + gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, getSharedCanvas()); + } } GL.textures[textureId] = textureObject; timerId = requestAnimationFrame(hookUnityRender); diff --git a/Runtime/wechat-default/unity-sdk/open-data.js.meta b/Runtime/wechat-default/unity-sdk/open-data.js.meta index c00a9d514..cacb629b5 100644 --- a/Runtime/wechat-default/unity-sdk/open-data.js.meta +++ b/Runtime/wechat-default/unity-sdk/open-data.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e00b2bc56897cf34fe0e5e9f01cf859f +guid: 8451f9e741ab6084784221fc3fb7b258 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/recorder.js.meta b/Runtime/wechat-default/unity-sdk/recorder.js.meta index 697901b28..6a89d1903 100644 --- a/Runtime/wechat-default/unity-sdk/recorder.js.meta +++ b/Runtime/wechat-default/unity-sdk/recorder.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 883a5927606cd035636ce9cde6826013 +guid: 9544a53304b177128b29a4263c154242 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resType.js.meta b/Runtime/wechat-default/unity-sdk/resType.js.meta index d468d85eb..0fe3f2bf8 100644 --- a/Runtime/wechat-default/unity-sdk/resType.js.meta +++ b/Runtime/wechat-default/unity-sdk/resType.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 63c39eca6eea7ffde1d6df27a9a7b091 +guid: 513c9fd06a80a818996ad7a43d684da3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta index 267bab2cc..10dac7a7b 100644 --- a/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta +++ b/Runtime/wechat-default/unity-sdk/resTypeOther.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 831e033db393e20865c9af9e9bd6fae1 +guid: 138b31a586d41b198418818a20c611a4 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/response.js.meta b/Runtime/wechat-default/unity-sdk/response.js.meta index fab4e421a..06c97de33 100644 --- a/Runtime/wechat-default/unity-sdk/response.js.meta +++ b/Runtime/wechat-default/unity-sdk/response.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac3f128015ad7b912c5304514cb63ff5 +guid: 22c3d6c142be91eb41dcc6a5871f12e3 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/sdk.js.meta b/Runtime/wechat-default/unity-sdk/sdk.js.meta index d7c271365..6b06fdd52 100644 --- a/Runtime/wechat-default/unity-sdk/sdk.js.meta +++ b/Runtime/wechat-default/unity-sdk/sdk.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 79267e7b3197ac6f478019c75e75193a +guid: 4d2b3324d18233fdf3675a864071ff58 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/share.js.meta b/Runtime/wechat-default/unity-sdk/share.js.meta index 6ff3bb3d5..e4318d697 100644 --- a/Runtime/wechat-default/unity-sdk/share.js.meta +++ b/Runtime/wechat-default/unity-sdk/share.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 68db380480c460248d3fcc94e5980401 +guid: 2be181bc8e1934edb2dd5dd5454cc72e DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/storage.js.meta b/Runtime/wechat-default/unity-sdk/storage.js.meta index a488cff54..fc069bf29 100644 --- a/Runtime/wechat-default/unity-sdk/storage.js.meta +++ b/Runtime/wechat-default/unity-sdk/storage.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5ff8df7518d27555ad16c33efe1053bc +guid: 130cb9cb196ebb140658474808f2d1af DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/texture.js.meta b/Runtime/wechat-default/unity-sdk/texture.js.meta index bd4423a06..1da7180e5 100644 --- a/Runtime/wechat-default/unity-sdk/texture.js.meta +++ b/Runtime/wechat-default/unity-sdk/texture.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ba07f9e0fcb6ea38cd2a170a36b7cfa4 +guid: 5ce68999fe328cba6dd2715078a47d41 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/touch/index.js.meta b/Runtime/wechat-default/unity-sdk/touch/index.js.meta index 22c103565..0e0a3fc5f 100644 --- a/Runtime/wechat-default/unity-sdk/touch/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/touch/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c43d006a718a052cf9a79756a059cb9f +guid: 25ccaebfa1bfa4d08f1a060b04409cf8 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/upload-file.js.meta b/Runtime/wechat-default/unity-sdk/upload-file.js.meta index 7ba93a199..90ee5d8c1 100644 --- a/Runtime/wechat-default/unity-sdk/upload-file.js.meta +++ b/Runtime/wechat-default/unity-sdk/upload-file.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6c63b2187c1e68183683fb9915b3e7c3 +guid: eb1d07f847d9dc9e6346812fca8345d6 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/userinfo.js.meta b/Runtime/wechat-default/unity-sdk/userinfo.js.meta index 75405bb23..9f2637d6e 100644 --- a/Runtime/wechat-default/unity-sdk/userinfo.js.meta +++ b/Runtime/wechat-default/unity-sdk/userinfo.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 443b7ad0bfb906dc992f60a98d382673 +guid: de10ead5334711ab9c5651ff44903015 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/util.js.meta b/Runtime/wechat-default/unity-sdk/util.js.meta index a7ae13427..b1b9325f9 100644 --- a/Runtime/wechat-default/unity-sdk/util.js.meta +++ b/Runtime/wechat-default/unity-sdk/util.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a65298b6e7a184b5929029919a93ec95 +guid: 18a61a8d29fcff3e03536e2672beb805 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/utils.js.meta b/Runtime/wechat-default/unity-sdk/utils.js.meta index ac2efd856..131ffc9d8 100644 --- a/Runtime/wechat-default/unity-sdk/utils.js.meta +++ b/Runtime/wechat-default/unity-sdk/utils.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 807c4219d420de8a473cbf5219f8f539 +guid: 1cb8023e7f80f4f8ed228288d85a2328 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video.js.meta b/Runtime/wechat-default/unity-sdk/video.js.meta index 7a530d9f8..713638274 100644 --- a/Runtime/wechat-default/unity-sdk/video.js.meta +++ b/Runtime/wechat-default/unity-sdk/video.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b2117f3150e02282fe0820cf4260be04 +guid: 0787bf5ed4e4baf4cf0383953f231d06 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/unity-sdk/video/index.js.meta b/Runtime/wechat-default/unity-sdk/video/index.js.meta index a894e68cc..62bf61321 100644 --- a/Runtime/wechat-default/unity-sdk/video/index.js.meta +++ b/Runtime/wechat-default/unity-sdk/video/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0bcc64f8d742efdde00a537553db1b67 +guid: f4c9f0176a340fe1005f5fdab1e26b54 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/wasmcode/game.js.meta b/Runtime/wechat-default/wasmcode/game.js.meta index edd15cab3..f1d81f6af 100644 --- a/Runtime/wechat-default/wasmcode/game.js.meta +++ b/Runtime/wechat-default/wasmcode/game.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ed5eccc8123e9750b0c795f4493438ef +guid: e5196ba0c07aaa615463ea6a011506fe DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/weapp-adapter.js.meta b/Runtime/wechat-default/weapp-adapter.js.meta index 3ddad53f9..bba53e3fd 100644 --- a/Runtime/wechat-default/weapp-adapter.js.meta +++ b/Runtime/wechat-default/weapp-adapter.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0b5db98a5dfa7901396e46810a193e49 +guid: 7dc53d57b223acd84ba872663f2eb614 DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/wechat-default/workers/response/index.js.meta b/Runtime/wechat-default/workers/response/index.js.meta index 7ff41b86d..ae9c3a9fc 100644 --- a/Runtime/wechat-default/workers/response/index.js.meta +++ b/Runtime/wechat-default/workers/response/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 837ec9cafe5fda438bf18308df2f6cdc +guid: 5eb4894660f22e26132a3aaaffa93454 DefaultImporter: externalObjects: {} userData: diff --git a/WebGLTemplates/WXTemplate/index.html b/WebGLTemplates/WXTemplate/index.html index 2d4378230..d450eecc6 100644 --- a/WebGLTemplates/WXTemplate/index.html +++ b/WebGLTemplates/WXTemplate/index.html @@ -375,7 +375,8 @@ WX_CloudDownloadFile() {}, WX_CloudGetTempFileURL() {}, WX_CloudDeleteFile() {}, - + WX_CloudCDN() {}, + WXLaunchOperaBridge() {}, WX_AddCard(conf, callbackId){}, WX_AuthPrivateMessage(conf, callbackId){}, WX_Authorize(conf, callbackId){}, diff --git a/WebGLTemplates/WXTemplate2020/index.html b/WebGLTemplates/WXTemplate2020/index.html index 402a7573d..a114e0db3 100644 --- a/WebGLTemplates/WXTemplate2020/index.html +++ b/WebGLTemplates/WXTemplate2020/index.html @@ -447,7 +447,8 @@ WX_CloudDownloadFile() {}, WX_CloudGetTempFileURL() {}, WX_CloudDeleteFile() {}, - + WX_CloudCDN() {}, + WXLaunchOperaBridge() {}, WX_AddCard(conf, callbackId){}, WX_AuthPrivateMessage(conf, callbackId){}, WX_Authorize(conf, callbackId){}, diff --git a/WebGLTemplates/WXTemplate2022/index.html b/WebGLTemplates/WXTemplate2022/index.html index 9bdb3d71e..72adfa2ad 100755 --- a/WebGLTemplates/WXTemplate2022/index.html +++ b/WebGLTemplates/WXTemplate2022/index.html @@ -524,7 +524,8 @@ WX_CloudDownloadFile() {}, WX_CloudGetTempFileURL() {}, WX_CloudDeleteFile() {}, - + WX_CloudCDN() {}, + WXLaunchOperaBridge() {}, WX_AddCard(conf, callbackId){}, WX_AuthPrivateMessage(conf, callbackId){}, WX_Authorize(conf, callbackId){}, diff --git a/package.json b/package.json index 3d5a630c3..c77d01e67 100644 --- a/package.json +++ b/package.json @@ -1 +1 @@ -{"name":"com.qq.weixin.minigame","displayName":"WXSDK","description":"WeChat Mini Game Tuanjie Engine Adapter SDK Package.","version":"0.1.19","unity":"2019.4","unityRelease":"29f1","keywords":["Tuanjie","WX"],"dependencies":{}} +{"name":"com.qq.weixin.minigame","displayName":"WXSDK","description":"WeChat Mini Game Tuanjie Engine Adapter SDK Package.","version":"0.1.20","unity":"2019.4","unityRelease":"29f1","keywords":["Tuanjie","WX"],"dependencies":{}}