com.typhoon.unitysdk 1.1.3 → 1.1.5

package/CHANGELOG.md

@@ -1,7 +1,19 @@
 # 更新日志
+## [1.1.5] - 2025-08-05
+
+### 新增
+* 新增微游渠道
+
+
+## [1.1.4] - 2024-12-06
+
+### 修复
+* unity 测试适配广告不传参数时报错
+
+
 ## [1.1.3] - 2024-11-25
 
-### 修复
+### 修复
 * 修复签名设置bug
 
 

package/Editor/ApplyTool.cs

@@ -32,6 +32,7 @@ namespace TyphoonUnitySDK
             { AppChannel.VivoMini, new ApplyVivoMini() },
             { AppChannel.OppoMini, new ApplyOppoMini() },
             { AppChannel.KuaiShouWebgl, new ApplyKuaiShouWebgl() },
+            { AppChannel.MiniGame, new ApplyMiniGame() },
         };
 
 
@@ -60,6 +61,8 @@ namespace TyphoonUnitySDK
             VariablePreset.Default.Save();
             OppoMiniConfig.Default.Save();
             ChinaAndroidConfig.Default.Save();
+            KuaiShouWebglConfig.Default.Save();
+            MiniGameWebglConfig.Default.Save();
         }
 
         /// <summary>
@@ -121,7 +124,6 @@ namespace TyphoonUnitySDK
             PlayerSettings.SetScriptingBackend(BuildTargetGroup.Android, setting.ScriptingImplementation);
             PlayerSettings.stripEngineCode = setting.StripEngineCode;
             PlayerSettings.SetManagedStrippingLevel(BuildTargetGroup.Android, setting.StrippingLevel);
-
             if (!string.IsNullOrWhiteSpace(setting.PackageName))
             {
                 PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.Android, setting.PackageName);
@@ -142,7 +144,6 @@ namespace TyphoonUnitySDK
             PlayerSettings.Android.keyaliasName = setting.KeyAliasName;
             PlayerSettings.Android.keyaliasPass = setting.KeyAliasPassword;
 #endif
-
             PlayerSettings.Android.targetArchitectures = 0;
             if (setting.ArmV7)
             {
@@ -162,7 +163,6 @@ namespace TyphoonUnitySDK
             PlayerSettings.Android.minSdkVersion = setting.MinApiVersion;
             PlayerSettings.Android.targetSdkVersion = setting.TargetApiVersion;
 
-
             //覆写GraphicsAPI
             if (setting.GraphicsAPIs.Length > 0)
             {
@@ -209,9 +209,9 @@ namespace TyphoonUnitySDK
             if (setting.OverrideWebglCompressionFormat)
             {
                 PlayerSettings.WebGL.compressionFormat = setting.CompressionFormat;
+                PlayerSettings.WebGL.decompressionFallback = setting.DecompressionFallback;
             }
 
-
             if (setting.OverrideWebglTemplate)
             {
                 switch (setting.WebglTemplate)
@@ -222,6 +222,10 @@ namespace TyphoonUnitySDK
                     case WebGlTemplate.Minimal:
                         PlayerSettings.WebGL.template = "APPLICATION:Minimal";
                         break;
+                    case WebGlTemplate.MiniGame:
+                        PlayerSettings.WebGL.template = "MiniGame";
+                        AssetDatabase.ImportAsset("Assets/WebGLTemplates/MiniGame", ImportAssetOptions.ForceUpdate);
+                        break;
                 }
             }
 
@@ -230,16 +234,27 @@ namespace TyphoonUnitySDK
                 SetWebGLLightmapEncoding(BuildTargetGroup.WebGL, setting.LightmapEncoding);
             }
 
+            if (setting.CanEditWebglCanvasSize())
+            {
+                PlayerSettings.defaultWebScreenWidth = setting.WebGLCanvasWidth;
+                PlayerSettings.defaultWebScreenHeight = setting.WebGLCanvasHeight;
+            }
+
             PlayerSettings.WebGL.exceptionSupport = setting.ExceptionSupport;
             PlayerSettings.WebGL.debugSymbols = setting.WebglDebugSymbols;
             PlayerSettings.WebGL.dataCaching = setting.WebglDataCaching;
+
             // PlayerSettings.lightmapEncoding = LightmapEncodingQuality.Normal;
 
             //覆写AA参数
             AddressableSupport.ModifyAAProfileAndVariables(setting);
             //写入App config
             WriteAppConfig(setting);
+            AssetDatabase.Refresh();
+            AssetDatabase.SaveAssets();
+            EditorApplication.ExecuteMenuItem("File/Save Project");
             // Debug.Log($"<color=#3ac9f3>//TODO//导入资源包...</color>");
+            Debug.Log("Current WebGL Template: " + PlayerSettings.WebGL.template);
         }
 
         /// <summary>
@@ -275,7 +290,6 @@ namespace TyphoonUnitySDK
                             return EditorUserBuildSettings.SwitchActiveBuildTargetAsync(BuildTargetGroup.WebGL,
                                 buildTarget);
                         }
-
                         default:
                             throw new Exception($"未处理的类型:{buildTarget}");
                     }
@@ -300,7 +314,6 @@ namespace TyphoonUnitySDK
             AppConfigAsset.Instance.DouyinVideoId = DouyinConfig.Default.VideoId;
             AppConfigAsset.Instance.DouyinIntersId = DouyinConfig.Default.IntersId;
             AppConfigAsset.Instance.DouyinBannerId = DouyinConfig.Default.BannerId;
-
             EditorUtility.SetDirty(AppConfigAsset.Instance);
             AssetDatabase.SaveAssets();
         }
@@ -655,6 +668,7 @@ namespace TyphoonUnitySDK
         }
 
 
+        /*kuai shou*/
         public class ApplyKuaiShouWebgl : IApply
         {
             public void Apply(PublishSetting setting)
@@ -681,5 +695,29 @@ namespace TyphoonUnitySDK
                 AssetDatabase.SaveAssets();
             }
         }
+
+        /*mini game*/
+        public class ApplyMiniGame : IApply
+        {
+            public void Apply(PublishSetting setting)
+            {
+                var pack = UniEditor.PackagePath_MiniGame;
+                Debug.Log($"导入... {pack}");
+                ImportUnityPackage(pack);
+                var manifest_path = $"{pack}.manifest";
+                Debug.Log($"读取资源清单...{manifest_path}");
+                var manifest = ReadManifest(manifest_path);
+                Debug.Log($"清理多余文件...");
+                foreach (var folder in MaybeFolder)
+                {
+                    ClearFilesInDirectory(folder, manifest);
+                }
+
+                ReimportScript(manifest);
+                AssetDatabase.Refresh();
+                EditorUtility.SetDirty(AppConfigAsset.Instance);
+                AssetDatabase.SaveAssets();
+            }
+        }
     }
 }

package/Editor/CheckPayCallBack/CheckCallBackScript.cs

@@ -0,0 +1,24 @@
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    public static class CheckCallBackScript
+    {
+        private const string TEMPLATE_PAY_CALL_BACK_FILE =
+            "Assets/com.typhoon.unitysdk/Editor/CheckPayCallBack/OnPayCallBack.template";
+
+        [InitializeOnLoadMethod]
+        public static void OnInitialize()
+        {
+            var path = "Assets/Typhoon_Gen/TyphoonSDK/OnPayCallback.cs";
+            if (!File.Exists(path))
+            {
+                File.Copy(TEMPLATE_PAY_CALL_BACK_FILE, path, true);
+                Debug.Log($"生成 {path}");
+                AssetDatabase.Refresh();
+            }
+        }
+    }
+}

package/Editor/CheckPayCallBack/CheckCallBackScript.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9cb71c4b3ec12b044a70dcc2a94bf845
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/CheckPayCallBack/OnPayCallBack.template

@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Scripting;
+namespace TyphoonUnitySDK
+{   
+    [Preserve]
+    public class OnPayCallBack : IOnPayCallback
+    {
+        /// <summary>
+        /// 支付回调
+        /// </summary>
+        /// <param name="product">商品id</param>
+        /// <param name="state">true=支付成功，可发货</param>
+        /// <param name="extraInfo">拓展信息</param>
+        public void OnPayCallback(string product, bool state, PayCallBackExtraInfo extraInfo)
+        {
+            if (!state)
+            {
+                //支付失败无法进行发货
+                return;
+            }
+            //TODO//支付成功,进行发货，商品ID=product
+        }
+    }
+}

package/Editor/CheckPayCallBack/OnPayCallBack.template.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a26c177baedbd39439d3c138293a1489
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/CheckPayCallBack.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8071b310b4ebd4f428b10234720da11c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/EditorIcons.cs

@@ -76,6 +76,10 @@ namespace TyphoonUnitySDK
         public static Texture icon_kuaishou =>
             __icon_kuaishou
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_kuaishou.png");
+        private static Texture __icon_minigame = null;
+        public static Texture icon_minigame =>
+            __icon_minigame
+            ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_minigame.png");
         private static Texture __icon_oppo = null;
         public static Texture icon_oppo =>
             __icon_oppo ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_oppo.png");

package/Editor/EditorKit.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 5945480f0f58ae842a093a2536428362
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 5945480f0f58ae842a093a2536428362
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/ExportModule.cs

@@ -24,7 +24,6 @@ namespace TyphoonUnitySDK
                 "Assets/Plugins/Android/AndroidManifest.xml",
                 "Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid",
             };
-
             if (!MakeSureExport(manifest))
             {
                 return;
@@ -171,6 +170,27 @@ namespace TyphoonUnitySDK
             ExportUnityPackage(manifest, UniEditor.PackagePath_KuaiShouWebgl, out var detail);
         }
 
+        [MenuItem("TyphoonSDK/开发者/导出-MiniGame.unitypackage")]
+        public static void ExporMiniGame()
+        {
+            var manifest = new List<string>()
+            {
+                "Assets/Typhoon_Gen/TyphoonSDK/Runtime/MiniGame",
+                "Assets/WebGLTemplates",
+            };
+            if (!MakeSureExport(manifest))
+            {
+                return;
+            }
+
+            if (!CheckMissFiles(manifest))
+            {
+                return;
+            }
+
+            ExportUnityPackage(manifest, UniEditor.PackagePath_MiniGame, out var detail);
+        }
+
 
         /// <summary>
         /// 导出清单文件到模块
@@ -313,7 +333,6 @@ namespace TyphoonUnitySDK
                 $".typhoonbackup/{Path.GetFileNameWithoutExtension(path)}-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Path.GetExtension(path)}";
             var dir = Path.GetDirectoryName(backup);
             UniEditor.CreateDirIfNotExist(dir);
-
             if (File.Exists(path))
             {
                 Debug.Log($"备份：{path}-->{backup}");
@@ -389,7 +408,6 @@ namespace TyphoonUnitySDK
                 }
             }
 
-
             var backup =
                 $".typhoonbackup/{Path.GetFileNameWithoutExtension(savePath)}-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Path.GetExtension(savePath)}";
             var manifestPath = $"{savePath}.manifest";

package/Editor/KuaiShouWebglConfig.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 8a6c0147c4cb1dc4db7b7e244cd740aa
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 8a6c0147c4cb1dc4db7b7e244cd740aa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/LightmapEncoding.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: f5dd898cf3a800f409e7b9f04c0368fc
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: f5dd898cf3a800f409e7b9f04c0368fc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/MiniGameWebglConfig.cs

@@ -0,0 +1,172 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    public static class MiniGameWebglConfigGUIDrawer
+    {
+        public static Dictionary<string, Func<MiniGameWebglConfig, bool>> OverrideDrawGUIConfig =
+            new Dictionary<string, Func<MiniGameWebglConfig, bool>>()
+            {
+                { "m_Script", DrawProperty_m_Script },
+                { nameof(MiniGameWebglConfig.VersionName), DrawProperty_VersionName },
+                { nameof(MiniGameWebglConfig.VersionCode), DrawProperty_VersionCode },
+            };
+
+
+        // private static bool DrawProperty_CDN(MiniGameWebglConfig arg)
+        // {
+        //     GUILayout.Space(10);
+        //     GUILayout.BeginHorizontal();
+        //     arg.CDN = EditorGUILayout.TextField("CDN地址 (后台配白名单)", arg.CDN);
+        //     GUILayout.EndHorizontal();
+        //     GUIDrawer.DrawKeynotes("支持与自定义变量，版本号拼接，填入'[版本号]'或'[变量名]'使用");
+        //     GUIDrawer.DrawKeynotes($"最终地址：{arg.GetFinalCDN()}");
+        //     return true;
+        // }
+
+        // private static bool DrawProperty_AppId(MiniGameWebglConfig arg)
+        // {
+        //     arg.AppId = EditorGUILayout.TextField("appid (问运营)", arg.AppId);
+        //     return true;
+        // }
+
+        private static bool DrawProperty_m_Script(MiniGameWebglConfig arg)
+        {
+            var tmpEnable = GUI.enabled;
+            GUI.enabled = true;
+            GUILayout.Space(6);
+            GUIDrawer.DrawKeynotes("①支持Unity版本：2021.3.x,2021.3.40f(推荐，支持ASTC压缩，坑最少)");
+            GUIDrawer.DrawKeynotes("②webgl不支持多线程，修改代码进行适配");
+            GUIDrawer.DrawKeynotes("③若打包出错，手动设置PlayerSettings下webgl模板设置为Default，非Minimal");
+            GUILayout.Space(6);
+            GUI.enabled = tmpEnable;
+            return true;
+        }
+
+        private static bool DrawProperty_VersionName(MiniGameWebglConfig arg)
+        {
+            GUILayout.Space(10);
+            GUILayout.Label("版本信息", Styles.BoldLabel);
+            arg.VersionName = EditorGUILayout.TextField("版本名", arg.VersionName);
+            return true;
+        }
+
+        private static bool DrawProperty_VersionCode(MiniGameWebglConfig arg)
+        {
+            arg.VersionCode = EditorGUILayout.IntField("版本号", arg.VersionCode);
+            GUILayout.Label("", GUILayout.Height(24));
+            var last = GUILayoutUtility.GetLastRect();
+            var rectBtn = last;
+            rectBtn.width = 120;
+            rectBtn.y += 2;
+            rectBtn.x = last.xMax - rectBtn.width;
+            rectBtn.x -= 2;
+            if (GUI.Button(rectBtn, "自动版本号", Styles.Square.BtnBlue))
+            {
+                arg.VersionCode += 1;
+                try
+                {
+                    var elements = arg.VersionName.Split('.').ToList();
+                    var num = int.Parse(elements.Last());
+                    num += 1;
+                    elements[elements.Count - 1] = num.ToString();
+                    var versionName = new StringBuilder();
+                    for (var i = 0; i < elements.Count; i++)
+                    {
+                        var e = elements[i];
+                        versionName.Append(e);
+                        if (i != elements.Count - 1)
+                        {
+                            versionName.Append(".");
+                        }
+                    }
+
+                    arg.VersionName = versionName.ToString();
+                }
+                catch (Exception e)
+                {
+                    arg.VersionName = "0.0.1";
+                }
+
+                GUI.FocusControl("");
+            }
+
+            return true;
+        }
+
+        public static void DrawGUI()
+        {
+            var config = MiniGameWebglConfig.Default;
+            GUIDrawer.DrawProperty(config, (property) =>
+            {
+                if (OverrideDrawGUIConfig.TryGetValue(property, out var match))
+                {
+                    return match.Invoke(config);
+                }
+
+                return false;
+            });
+        }
+    }
+
+    public class MiniGameWebglConfig : ScriptableObject, ISaveConfigPipeline
+    {
+        private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/MinigameWebglConfig.asset";
+
+        private static MiniGameWebglConfig _instance = null;
+
+        public static MiniGameWebglConfig Default
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = AssetDatabase.LoadAssetAtPath<MiniGameWebglConfig>(ConfigPath);
+                }
+
+                if (_instance == null)
+                {
+                    _instance = CreateInstance<MiniGameWebglConfig>();
+                    var folder = Path.GetDirectoryName(ConfigPath);
+                    if (!Directory.Exists(folder))
+                    {
+                        Directory.CreateDirectory(folder);
+                        AssetDatabase.Refresh();
+                    }
+
+                    AssetDatabase.CreateAsset(_instance, ConfigPath);
+                }
+
+                return _instance;
+            }
+        }
+
+
+        public string VersionName = "0.0.1"; //版本名
+        public int VersionCode = 1;          //版本号
+
+
+        // public string GetFinalCDN()
+        // {
+        //     var result = CDN.Replace("[版本号]", VersionCode.ToString());
+        //     return VariablePreset.Default.ParserToString(result);
+        // }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
+
+        public void Save()
+        {
+            EditorUtility.SetDirty(this);
+            AssetDatabase.SaveAssets();
+        }
+    }
+}

package/Editor/MiniGameWebglConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 48bccf40f6fa38148b22ac7ef01bf661
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/PublishProcess.cs

@@ -16,5 +16,6 @@ namespace TyphoonUnitySDK
         VivoMini,        //vivo小游戏
         OppoMini,        //oppo小游戏
         KuaiShouWebgl,   //快手WEBGL
+        MiniGame,        //微游
     }
 }

package/Editor/PublishSetting.cs

@@ -30,6 +30,7 @@ namespace TyphoonUnitySDK
     {
         Default,
         Minimal,
+        MiniGame,
     }
 
 
@@ -39,7 +40,8 @@ namespace TyphoonUnitySDK
     [CreateAssetMenu]
     public class PublishSetting : ScriptableObject
     {
-        [Header("基础")] public BuildTarget BuildTarget;
+        [Header("基础")]
+        public BuildTarget BuildTarget;
 
         public GraphicsDeviceType[] GraphicsAPIs;
         public ScriptingImplementation ScriptingImplementation = ScriptingImplementation.IL2CPP;
@@ -59,23 +61,27 @@ namespace TyphoonUnitySDK
         public bool ArmV64 = true;
 
 
-        [Header("渠道包名信息")] public AppChannel Channel = AppChannel.Test;
+        [Header("渠道包名信息")]
+        public AppChannel Channel = AppChannel.Test;
         public PublishProcess PublishProcess = PublishProcess.Apk;
         public string PackageName = "com.rgame.app";
         public string VersionString = "1.0.0";
         public VersionType VersionType = VersionType.Release;
 
 
-        [Header("签名")] public bool EnableSignature = false;
+        [Header("签名")]
+        public bool EnableSignature = false;
         public string KeystoreName;
         public string KeystorePassword;
         public string KeyAliasName;
         public string KeyAliasPassword;
 
-        [Header("Webgl")] public bool OverrideWebglTemplate = false;
+        [Header("Webgl")]
+        public bool OverrideWebglTemplate = false;
         public WebGlTemplate WebglTemplate = WebGlTemplate.Minimal;
         public bool OverrideWebglCompressionFormat = false;
         public WebGLCompressionFormat CompressionFormat = WebGLCompressionFormat.Disabled;
+        public bool DecompressionFallback = false;
         public WebGLExceptionSupport ExceptionSupport = WebGLExceptionSupport.FullWithoutStacktrace;
         public bool WebglDataCaching = true;
         public bool WebglDebugSymbols = false;
@@ -98,6 +104,12 @@ namespace TyphoonUnitySDK
         public bool PresetModifyEnable = false;
         public List<VariableModify> PresetModify = new List<VariableModify>();
 
+        //webgl 画布宽度
+        public int WebGLCanvasWidth = 960;
+        //webgl 画布高度
+        public int WebGLCanvasHeight = 600;
+
+
         /*微信拓展配置*/
         public bool WxMiniGUIFoldout = true;
 
@@ -115,6 +127,8 @@ namespace TyphoonUnitySDK
 
         //快手小游戏webgl
         public bool KuaishouWebglGUIFoldout = true;
+        //mini gmae webgl
+        public bool MiniGameGUIFoldout = true;
 
 
         //使用配置
@@ -138,6 +152,20 @@ namespace TyphoonUnitySDK
             return UniEditor.HasAddressableSupport() & AASupportEnable;
         }
 
+        /// <summary>
+        /// 是否支持调整画布大小
+        /// </summary>
+        public bool CanEditWebglCanvasSize()
+        {
+            switch (Channel)
+            {
+                case AppChannel.MiniGame:
+                    return true;
+            }
+
+            return false;
+        }
+
         /*保存*/
         public void Save()
         {