Auto-publish WXSDK.

CHANGELOG.md

@@ -6,6 +6,12 @@ Removed - 删除功能/接口
 Fixed - 修复问题
 Others - 其他 
 -->
+## 2024-4-26 【普通更新】
+### Fixed
+* 普通：修复Unity2018/2019的兼容
+* 普通：兼容Windows 1.0.4版本template问题
+* 普通：修复Android平台导出时的
+
 ## 2024-4-17 【普通更新】
 ### Feature
 * 普通：编译参数增加ERROR_ON_UNDEFINED_SYMBOLS

Editor/WXConvertCore.cs

@@ -18,12 +18,11 @@ namespace WeChatWASM
 
         static WXConvertCore()
         {
-            Init();
+            // Init();
         }
 
         public static void Init()
         {
-            //config = UnityUtil.GetEditorConf();
             SDKFilePath = Path.Combine(UnityUtil.GetWxSDKRootPath(), "Runtime", "wechat-default", "unity-sdk", "index.js");
             string templateHeader = "PROJECT:";
 #if TUANJIE_2022_3_OR_NEWER

Editor/WXExtDef.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using UnityEngine;
 using UnityEditor;
 using UnityEditor.Build;
@@ -109,6 +110,36 @@ namespace WeChatWASM
             {
                 return WXConvertCore.UseIL2CPP;
             });
+            WXExtEnvDef.RegisterAction("UnityUtil.GetWxSDKRootPath", (args) => {
+#if UNITY_2018
+                return Path.Combine(Application.dataPath, "WX-WASM-SDK-V2");
+#else
+                var packageInfo = UnityEditor.PackageManager.PackageInfo.FindForAssembly(typeof(WXExtEnvDef).Assembly);
+                if (packageInfo == null)
+                {
+                    return Path.Combine(Application.dataPath, "WX-WASM-SDK-V2");
+                }
+                string packagePath = packageInfo.assetPath;
+                if (packageInfo.name == "WXSDK")
+                {
+                    packagePath += "/Resources";
+                }
+                DirectoryInfo dir = new DirectoryInfo(packagePath);
+                return dir.FullName;
+#endif
+            });
+            WXExtEnvDef.RegisterAction("UnityUtil.IsAssets", (args) => {
+#if UNITY_2018
+                return true;
+#else
+                var packageInfo = UnityEditor.PackageManager.PackageInfo.FindForAssembly(typeof(WXExtEnvDef).Assembly);
+                if (packageInfo == null)
+                {
+                    return true;
+                }
+                return false;
+#endif
+            });
         }
     }
 }

Editor/WXPluginVersion.cs

@@ -2,7 +2,7 @@
 {
     public class WXPluginVersion
     {
-        public static string pluginVersion = "202404171424"; // 这一行不要改他，导出的时候会自动替换
+        public static string pluginVersion = "202404261957"; // 这一行不要改他，导出的时候会自动替换
     }
 
     public class WXPluginConf

Runtime/Plugins/wx-runtime-editor.dll.meta

@@ -12,7 +12,7 @@ PluginImporter:
   validateReferences: 1
   platformData:
   - first:
-      : Any
+      '': Any
     second:
       enabled: 0
       settings:
@@ -60,7 +60,7 @@ PluginImporter:
     second:
       enabled: 0
       settings:
-        CPU: AnyCPU
+        CPU: x86_64
   - first:
       Standalone: LinuxUniversal
     second:

Runtime/Plugins/wx-runtime.dll.meta

@@ -12,7 +12,7 @@ PluginImporter:
   validateReferences: 1
   platformData:
   - first:
-      : Any
+      '': Any
     second:
       enabled: 0
       settings:
@@ -61,7 +61,7 @@ PluginImporter:
     second:
       enabled: 0
       settings:
-        CPU: AnyCPU
+        CPU: x86_64
   - first:
       Standalone: LinuxUniversal
     second:
@@ -91,11 +91,6 @@ PluginImporter:
     second:
       enabled: 1
       settings: {}
-  - first:
-      WeixinMiniGame: WeixinMiniGame
-    second:
-      enabled: 1
-      settings: {}
   - first:
       Windows Store Apps: WindowsStoreApps
     second:

Runtime/WebAES.cs

@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+#if UNITY_WEBGL || WEIXINMINIGAME || UNITY_EDITOR
+using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 using AOT;
@@ -106,3 +107,4 @@ namespace WeChatWASM
         }
     }
 }
+#endif

Runtime/WebMD5.cs

@@ -1,4 +1,5 @@
-using System;
+#if UNITY_WEBGL || WEIXINMINIGAME || UNITY_EDITOR
+using System;
 using System.Runtime.InteropServices;
 
 namespace WeChatWASM
@@ -29,3 +30,4 @@ namespace WeChatWASM
         } 
     }
 }
+#endif

package.json

@@ -1 +1 @@
-{"name":"com.qq.weixin.minigame","displayName":"WXSDK","description":"WeChat Mini Game Tuanjie Engine Adapter SDK Package.","version":"0.1.8","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.9","unity":"2019.4","unityRelease":"29f1","keywords":["Tuanjie","WX"],"dependencies":{}}