From b4396090cf6c6cc15a04cf3d4d4a41b257902d42 Mon Sep 17 00:00:00 2001 From: rainhong Date: Mon, 9 Sep 2024 16:32:47 +0800 Subject: [PATCH] Auto-publish. --- .DS_Store.meta | 2 +- Editor/WXEditorSettingHelper.cs | 50 ++---------------- Editor/WXPluginVersion.cs | 2 +- Editor/wx-editor.dll | Bin 229376 -> 229376 bytes Runtime/.DS_Store.meta | 2 +- Runtime/Plugins/wx-perf.dll | Bin 54784 -> 54784 bytes Runtime/Plugins/wx-runtime-editor.dll | Bin 285696 -> 285696 bytes Runtime/Plugins/wx-runtime.dll | Bin 286208 -> 286208 bytes Runtime/wechat-default/check-version.js.meta | 2 +- .../wechat-default/data-package/game.js.meta | 2 +- Runtime/wechat-default/events.js.meta | 2 +- Runtime/wechat-default/game.js.meta | 2 +- Runtime/wechat-default/game.json.meta | 2 +- .../wechat-default/images/background.jpg.meta | 2 +- .../wechat-default/images/unity_logo.png.meta | 2 +- .../open-data/data/index.js.meta | 2 +- .../open-data/data/utils.js.meta | 2 +- .../wechat-default/open-data/index.js.meta | 2 +- .../wechat-default/open-data/loading.js.meta | 2 +- .../open-data/render/image/avatar.png.meta | 2 +- .../open-data/render/image/button1.png.meta | 2 +- .../open-data/render/image/button2.png.meta | 2 +- .../open-data/render/image/button3.png.meta | 2 +- .../open-data/render/image/loading.png.meta | 2 +- .../open-data/render/image/nameBg.png.meta | 2 +- .../render/image/rankAvatar.png.meta | 2 +- .../open-data/render/image/rankBg.png.meta | 2 +- .../open-data/render/image/shareBg.png.meta | 2 +- .../open-data/render/image/shareBg2.png.meta | 2 +- .../render/styles/friendRank.js.meta | 2 +- .../open-data/render/styles/tips.js.meta | 2 +- .../open-data/render/tpls/friendRank.js.meta | 2 +- .../open-data/render/tpls/tips.js.meta | 2 +- Runtime/wechat-default/plugin-config.js.meta | 2 +- .../plugins/check-update.js.meta | 2 +- .../plugins/screen-adapter.js.meta | 2 +- .../wechat-default/project.config.json.meta | 2 +- Runtime/wechat-default/texture-config.js.meta | 2 +- .../wechat-default/unity-namespace.js.meta | 2 +- .../unity-sdk/TCPSocket/index.js.meta | 2 +- .../unity-sdk/UDPSocket/index.js.meta | 2 +- Runtime/wechat-default/unity-sdk/ad.js.meta | 2 +- .../unity-sdk/audio/common.js.meta | 2 +- .../unity-sdk/audio/const.js.meta | 2 +- .../unity-sdk/audio/index.js.meta | 2 +- .../unity-sdk/audio/inner-audio.js.meta | 2 +- .../unity-sdk/audio/store.js.meta | 2 +- .../unity-sdk/audio/unity-audio.js.meta | 2 +- .../unity-sdk/audio/utils.js.meta | 2 +- .../unity-sdk/authorize.js.meta | 2 +- .../unity-sdk/bluetooth/index.js.meta | 2 +- .../wechat-default/unity-sdk/camera.js.meta | 2 +- .../unity-sdk/canvas-context.js.meta | 2 +- .../wechat-default/unity-sdk/canvas.js.meta | 2 +- Runtime/wechat-default/unity-sdk/chat.js.meta | 2 +- .../wechat-default/unity-sdk/cloud.js.meta | 2 +- Runtime/wechat-default/unity-sdk/conf.js.meta | 2 +- .../unity-sdk/file-info.js.meta | 2 +- Runtime/wechat-default/unity-sdk/fix.js.meta | 2 +- .../unity-sdk/font/fix-cmap.js.meta | 2 +- .../unity-sdk/font/index.js.meta | 2 +- .../unity-sdk/font/read-metrics.js.meta | 2 +- .../unity-sdk/font/split-sc.js.meta | 2 +- .../unity-sdk/font/util.js.meta | 2 +- Runtime/wechat-default/unity-sdk/fs.js.meta | 2 +- .../unity-sdk/game-club.js.meta | 2 +- .../unity-sdk/game-recorder.js.meta | 2 +- .../unity-sdk/gyroscope/index.js.meta | 2 +- .../wechat-default/unity-sdk/index.js.meta | 2 +- .../wechat-default/unity-sdk/logger.js.meta | 2 +- .../unity-sdk/mobileKeyboard/index.js.meta | 2 +- .../unity-sdk/module-helper.js.meta | 2 +- .../unity-sdk/open-data.js.meta | 2 +- .../wechat-default/unity-sdk/recorder.js.meta | 2 +- .../wechat-default/unity-sdk/resType.js.meta | 2 +- .../unity-sdk/resTypeOther.js.meta | 2 +- .../wechat-default/unity-sdk/response.js.meta | 2 +- Runtime/wechat-default/unity-sdk/sdk.js.meta | 2 +- .../wechat-default/unity-sdk/share.js.meta | 2 +- .../wechat-default/unity-sdk/storage.js.meta | 2 +- .../wechat-default/unity-sdk/texture.js.meta | 2 +- .../unity-sdk/touch/index.js.meta | 2 +- .../unity-sdk/upload-file.js.meta | 2 +- .../wechat-default/unity-sdk/userinfo.js.meta | 2 +- Runtime/wechat-default/unity-sdk/util.js.meta | 2 +- .../wechat-default/unity-sdk/utils.js.meta | 2 +- .../wechat-default/unity-sdk/video.js.meta | 2 +- .../unity-sdk/video/index.js.meta | 2 +- Runtime/wechat-default/wasmcode/game.js.meta | 2 +- Runtime/wechat-default/weapp-adapter.js.meta | 2 +- .../workers/response/index.js.meta | 2 +- 91 files changed, 91 insertions(+), 131 deletions(-) diff --git a/.DS_Store.meta b/.DS_Store.meta index 01362909..8f4b4123 100644 --- a/.DS_Store.meta +++ b/.DS_Store.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 73a34af70c50d0e97ed264ff0ecafaa0 +guid: 3b2dd6a1de786bd7728e8b0b134e04a6 DefaultImporter: externalObjects: {} userData: diff --git a/Editor/WXEditorSettingHelper.cs b/Editor/WXEditorSettingHelper.cs index 2b5b09f7..b8edcf6e 100644 --- a/Editor/WXEditorSettingHelper.cs +++ b/Editor/WXEditorSettingHelper.cs @@ -18,8 +18,6 @@ namespace WeChatWASM public class WXSettingsHelper { - public static string projectRootPath; - public WXSettingsHelper() { Type weixinMiniGamePackageHelpersType = Type.GetType("UnityEditor.WeixinPackageHelpers,UnityEditor"); @@ -52,17 +50,11 @@ namespace WeChatWASM //loadData(); foldInstantGame = WXConvertCore.IsInstantGameAutoStreaming(); - - projectRootPath = System.IO.Path.GetFullPath(Application.dataPath + "/../"); - - _dstCache = config.ProjectConf.DST; } //private static WXEditorScriptObject config = UnityUtil.GetEditorConf(); private static bool m_EnablePerfTool = false; - private static string _dstCache; - public void OnFocus() { loadData(); @@ -115,7 +107,7 @@ namespace WeChatWASM { if (!formInputData[targetDst].Trim().Equals(string.Empty)) { - EditorUtility.RevealInFinder(GetAbsolutePath(formInputData[targetDst])); + EditorUtility.RevealInFinder(formInputData[targetDst]); } GUIUtility.ExitGUI(); } @@ -430,7 +422,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", _dstCache); + this.setData("dst", config.ProjectConf.DST); this.setData("bundleHashLength", config.ProjectConf.bundleHashLength.ToString()); this.setData("bundlePathIdentifier", config.ProjectConf.bundlePathIdentifier); this.setData("bundleExcludeExtensions", config.ProjectConf.bundleExcludeExtensions); @@ -503,8 +495,7 @@ namespace WeChatWASM config.ProjectConf.compressDataPackage = this.getDataCheckbox("compressDataPackage"); config.ProjectConf.VideoUrl = this.getDataInput("videoUrl"); config.ProjectConf.Orientation = (WXScreenOritation)this.getDataPop("orientation"); - _dstCache = this.getDataInput("dst"); - config.ProjectConf.DST = GetAbsolutePath(_dstCache); + config.ProjectConf.DST = this.getDataInput("dst"); config.ProjectConf.bundleHashLength = int.Parse(this.getDataInput("bundleHashLength")); config.ProjectConf.bundlePathIdentifier = this.getDataInput("bundlePathIdentifier"); config.ProjectConf.bundleExcludeExtensions = this.getDataInput("bundleExcludeExtensions"); @@ -736,38 +727,7 @@ 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 7a0151d1..8615b899 100644 --- a/Editor/WXPluginVersion.cs +++ b/Editor/WXPluginVersion.cs @@ -2,7 +2,7 @@ { public class WXPluginVersion { - public static string pluginVersion = "202409090817"; // 这一行不要改他，导出的时候会自动替换 + public static string pluginVersion = "202409090832"; // 这一行不要改他，导出的时候会自动替换 } public class WXPluginConf diff --git a/Editor/wx-editor.dll b/Editor/wx-editor.dll index 0cd89137a25ab6800333d8c27da276ee962f942f..b1fdf5756636536beb08f151c06c0c50b69350ec 100644 GIT binary patch delta 604 zcma*jO=uHA7zW_)`{JeuCa!Hn6Z}hwiV0JZyir-_8+F=)dH$fIro`C&oVSrE>rn@9WM5|1v*5sPOQsU2E@wS*tuM!Go!-N6|09ZkyOdtPkP zeca&dO>*%&4=+iT#fv3+xa|($R6>I@ID|FO;cB3(GL9fh-GZq^7Rz`NC1F$wX%ao9 zQctIp?4C|5m3tajD~}F$Hz)C&(x!YHmMbOnp$nKm4^U^vW6B@4`QJcqeX+Gd7l*v6<~T6xb9 z3%h(J6kGki=@YTMnatS*(`1=UKF2J}c394_T;^pAXE<%Aaw)ICmy5n==6{;Eu-DI0xDJ8pRqlnRpF$yYzQUuMR7Nr&y zle8N(Vyhy|#R}?45j;p8#X~_)EqD`(h>EwK{5WXwq>~}uy*%D;-kbkSxg0K+!#A(e zx~G+TP{+ACy{q6GcC1Qg+8@KlHWg-MJ<2{-X$@{*KdUquQ*m~^3Oi)|4UOLFIjpEq zW49)0JT@!`uevl{g^QY|hvA?dY>t4 zcw7U8zrRjP)KSFfpaQ$-5Os?4AwEA%UlcU>{X6uzwRI1k>+6I9zjBw{{qz<1;x{T` zbXf!wB*X=Te?9y3oqBlb2R%_}1$cagPQ>|x)u98}Ynn#V&)HesF_NC1^1PhxWF1%c zQ>LG`jI`|ySo~Kcbaq>>n@hTOdb_P#mesGPeBabv*Ao;=e!pY6R(gO<=R@7j|7>0o c|AZsYTNVnBivI1lk$V@OO;q@DKD5^S3+}Rw=l}o! diff --git a/Runtime/.DS_Store.meta b/Runtime/.DS_Store.meta index 4571a52c..310a92c6 100644 --- a/Runtime/.DS_Store.meta +++ b/Runtime/.DS_Store.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d1c5b523ce6d78e33bdf6bbe6a5bf6ea +guid: 8f94246915c78b06bd372dc806858a4c DefaultImporter: externalObjects: {} userData: diff --git a/Runtime/Plugins/wx-perf.dll b/Runtime/Plugins/wx-perf.dll index 4f137a1fe16cca60f180623d02230d6501360750..2962bb6b3c6338abe2b074da6f6a5d73f83654ec 100644 GIT binary patch delta 37 vcmV+=0NVe6tOJ0o1CWRUm9nvlmcbBe66ANx&Z19?wq!74o?!X2Fv8FiQaloS delta 37 vcmV+=0NVe6tOJ0o1CWRUFR!tRmcbC>mzEo3T7N*THaf)a?KrrzFv8FiLMIW_ diff --git a/Runtime/Plugins/wx-runtime-editor.dll b/Runtime/Plugins/wx-runtime-editor.dll index 20026f08f1d9d0304c8a392c937c27ca66d86e92..7435bfb0cb24ea5b55f6b7490b20bdd090d87645 100644 GIT binary patch delta 1122 zcma)4e@K;Q6n@WnulJ^M%WJN1PSZ?E>SI?w@4bq*ZtCq?N}1Hn3Mv%AT5}SyW&5S; z5;OfH9ot^4MT{|*;63t%Snsc-;25K~Fg#4`Y2soqVP z51nds6K-=xU>_flwYWRgE+Q(o3UeW%Dyz65LWiob$q5bWK^>Ozn%8z>Kd`iR;Sr|# z-I$kfVu@We5SL*GcThb#G+X=e06ME->U9vwNxw4=lII{UgY+DjcmssrKFQb*FBwlJ z|H*ifn%~CN;M@XFvp_6Nnr0lLZ=3bZ3ivo1M47#VaR9orUE;Ikvy7M2_&c1S7OwAI zB3wy#7>8+X3yw>8i!u<quItd<6FZ_|?r;oQ2)$+EM(D-In(;k6rrW11!^g|3hq( z+*Q|(K8UK5nk>53j^F6ngU7Ii-G|3;8@q2tFp|ga`E%IIw7Gw7-<8T&@j^Rawb<}nXP2m0KZ}X->n!1hC zPFP9fkFZ8(Hh#u*eO~30xd3gNETSj4RA>I-sdmZnD?Zfnmr3kmYWWQ(c(i5;NtXCw z2*zyZa!?5ICBIIsthkEKeY+P|390(qv$(P-@Ep$~$C#ML4306YDMm|Y_}-b-bCWY` z=C>v%=}D(CuLkM)D+C+Au<1XrD+OAWYmv-UrxImWyrz4J@{uhr<|#wHSSYjq!&2@P zS^h5&%N@XdpSt8OXr-TA(ue$#($gfAru%_Yibhc>bD8x`!T;w$he1+}}B_$O_p~4W|t&?A$$~BA4f{I{;QC{Hj8AV>V zX_TA6Vj~nZgC0*P=<$Yvs&_^%_xz8>kHn#8i3_HF9NDN22mVT1_xE~wF(XqB`~wHX BQ@#KI delta 1121 zcma)4aY&SB7=NGVJ?~O?)Ht zt_V$Gy0Ps=LmITP6BB z@EDWzDi)=kUT+ue#AU?69b}?Z`O|Rota2|n&`5;zjEHF;fS511R8a^lh5wLeKPC!qAOMH@fmhrwyyuk^M z!i@v#g)8G0;~m=3j0p+dlzRks*}$TvW4Ir{Qe*Gn5=7PYR{WaX=6A7(UHa@j3}~J{ zj#0^7b!})uTy<+o()Bhxr)LkJz-D&up1|GgK7SHV7O{IVhP_NX2bM=pX-d-Y05%}I zMd!IUu39xE>HG6Is2OVa2#UPd@X(Fybd@4p!5O_MYq z#|0<6Oo>^n)tQYSF-MUwY)!vT};it;0%w}&Lc^` z1s7o47TbhEh|l?TYBiEl@#Sw*DV3J3zx|q0Nh*JYXOUyfEMP9jSkjcB4U2s5yq4w3 z#ceBFGc)w0(^yfH^yqg48^5rHKd~zd`ju;q%u{{oGCx(*RJxqCrNj#5s>iEk!GBoF zoh5_+0cQ;K>~C3R6RY^bkPFD&xb$_YoIJ5cHg zmwHUY3~l!qB|*1o1j7E15%O17giKGkvN)`;P7cyko&2J&&h}l48?s z1WUtVqtv^-!dL7Mh1{lB^)AY1eE*~Ieer^AzxCIb$9JB)v+BZIAN4&!j~8WD<3Hgy BU`+r3 diff --git a/Runtime/Plugins/wx-runtime.dll b/Runtime/Plugins/wx-runtime.dll index 932df71b3e2ffb7f27ef7dab01970a88a5571fcb..2dd358bbb356c5fe1661590061ed75771dcd7c92 100644 GIT binary patch delta 47 zcmZqJBiOJHz+W}P$u D@*)&$ delta 47 zcmV+~0MP${yb*xB5s-)iB(H&rg^B@%iUPHY13LE*oisYAJi-G