com.typhoon.unitysdk 1.1.1 → 1.1.2

package/CHANGELOG.md

@@ -1,7 +1,13 @@
 # 更新日志
+## [1.1.2] - 2024-11-13
+
+### 新增
+* 重新调整google模块的发布
+
+
 ## [1.1.1] - 2024-10-30
 
-### 修复
+### 修复
 * 修复iniconfig value 参数问题
 
 

package/Editor/ApplyTool.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+using System.Reflection;
 using UnityEditor;
 using UnityEngine;
 
@@ -32,6 +31,7 @@ namespace TyphoonUnitySDK
             { AppChannel.GooglePlay, new ApplyGooglePlay() },
             { AppChannel.VivoMini, new ApplyVivoMini() },
             { AppChannel.OppoMini, new ApplyOppoMini() },
+            { AppChannel.KuaiShouWebgl, new ApplyKuaiShouWebgl() },
         };
 
 
@@ -211,6 +211,7 @@ namespace TyphoonUnitySDK
                 PlayerSettings.WebGL.compressionFormat = setting.CompressionFormat;
             }
 
+
             if (setting.OverrideWebglTemplate)
             {
                 switch (setting.WebglTemplate)
@@ -224,9 +225,15 @@ namespace TyphoonUnitySDK
                 }
             }
 
+            if (setting.OverrideLightEncoding)
+            {
+                SetWebGLLightmapEncoding(BuildTargetGroup.WebGL, setting.LightmapEncoding);
+            }
+
             PlayerSettings.WebGL.exceptionSupport = setting.ExceptionSupport;
             PlayerSettings.WebGL.debugSymbols = setting.WebglDebugSymbols;
             PlayerSettings.WebGL.dataCaching = setting.WebglDataCaching;
+            // PlayerSettings.lightmapEncoding = LightmapEncodingQuality.Normal;
 
             //覆写AA参数
             AddressableSupport.ModifyAAProfileAndVariables(setting);
@@ -440,6 +447,19 @@ namespace TyphoonUnitySDK
             AssetDatabase.SaveAssets();
         }
 
+        public static void SetWebGLLightmapEncoding(BuildTargetGroup group, LightmapEncoding encoding)
+        {
+            var typeLightEncodingQ = EditorKit.GetType("UnityEditor.LightmapEncodingQuality");
+            var method = EditorKit.GetMethod(typeof(PlayerSettings), "SetLightmapEncodingQualityForPlatformGroup",
+                BindingFlags.Static | BindingFlags.NonPublic);
+            method.Invoke(null, new object[]
+            {
+                group,
+                Enum.Parse(typeLightEncodingQ, $"{encoding.ToString()}")
+            });
+            Debug.Log($"重写Lightmap Encoding :{group} - {encoding}");
+        }
+
 
         //可能出现的文件夹
         public static string[] MaybeFolder = new[]
@@ -450,6 +470,8 @@ namespace TyphoonUnitySDK
             "Assets/WebGLTemplates",
             "Assets/Plugins/ByteGame",
             "Assets/VIVO-GAME-SDK",
+            "Assets/KS-WASM-SDK",
+            "Assets/Plugins/KSWASM",
         };
 
 
@@ -631,5 +653,33 @@ namespace TyphoonUnitySDK
                 AssetDatabase.SaveAssets();
             }
         }
+
+
+        public class ApplyKuaiShouWebgl : IApply
+        {
+            public void Apply(PublishSetting setting)
+            {
+                var pack = UniEditor.PackagePath_KuaiShouWebgl;
+                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();
+                // //关联隐私政策
+                // Debug.Log(
+                //     $"关联oppo隐私政策长图到 AppConfigAsset.Instance.PrivacyPolicyImage={OppoMiniConfig.Default.PrivacyPolicyImage}");
+                // AppConfigAsset.Instance.PrivacyImage = OppoMiniConfig.Default.PrivacyPolicyImage;
+                EditorUtility.SetDirty(AppConfigAsset.Instance);
+                AssetDatabase.SaveAssets();
+            }
+        }
     }
 }

package/Editor/EditorIcons.cs

@@ -7,152 +7,128 @@ namespace TyphoonUnitySDK
     {
         private static string _folderPath = null;
         private static string FolderPath => _folderPath ?? $"{UniEditor.PathRoot}/Editor/Texture";
+        private static Texture __age_12 = null;
+        public static Texture age_12 =>
+            __age_12 ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/age_12.png");
+        private static Texture __age_16 = null;
+        public static Texture age_16 =>
+            __age_16 ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/age_16.png");
+        private static Texture __age_8 = null;
+        public static Texture age_8 =>
+            __age_8 ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/age_8.png");
+        private static Texture __black_32x32 = null;
+        public static Texture black_32x32 =>
+            __black_32x32
+            ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/black_32x32.png");
         private static Texture __dark_active = null;
-
         public static Texture dark_active =>
             __dark_active
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/dark_active.png");
-
         private static Texture __dark_hover = null;
-
         public static Texture dark_hover =>
             __dark_hover ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/dark_hover.png");
-
         private static Texture __dark_normal = null;
-
         public static Texture dark_normal =>
             __dark_normal
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/dark_normal.png");
-
         private static Texture __icon_android = null;
-
         public static Texture icon_android =>
             __icon_android
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_android.png");
-
         private static Texture __icon_arrow_right = null;
-
         public static Texture icon_arrow_right =>
             __icon_arrow_right
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_arrow_right.png");
-
         private static Texture __icon_douyin = null;
-
         public static Texture icon_douyin =>
             __icon_douyin
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_douyin.png");
-
         private static Texture __icon_download = null;
-
         public static Texture icon_download =>
             __icon_download
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_download.png");
-
         private static Texture __icon_drop_arrow = null;
-
         public static Texture icon_drop_arrow =>
             __icon_drop_arrow
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_drop_arrow.png");
-
         private static Texture __icon_error = null;
-
         public static Texture icon_error =>
             __icon_error ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_error.png");
-
         private static Texture __icon_extension = null;
-
         public static Texture icon_extension =>
             __icon_extension
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_extension.png");
-
         private static Texture __icon_googleplay = null;
-
         public static Texture icon_googleplay =>
             __icon_googleplay
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_googleplay.png");
-
         private static Texture __icon_html5 = null;
-
         public static Texture icon_html5 =>
             __icon_html5 ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_html5.png");
-
         private static Texture __icon_import = null;
-
         public static Texture icon_import =>
             __icon_import
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_import.png");
-
         private static Texture __icon_ios = null;
-
         public static Texture icon_ios =>
             __icon_ios ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_ios.png");
-
+        private static Texture __icon_kuaishou = null;
+        public static Texture icon_kuaishou =>
+            __icon_kuaishou
+            ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_kuaishou.png");
         private static Texture __icon_oppo = null;
-
         public static Texture icon_oppo =>
             __icon_oppo ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_oppo.png");
-
         private static Texture __icon_refresh = null;
-
         public static Texture icon_refresh =>
             __icon_refresh
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_refresh.png");
-
         private static Texture __icon_save = null;
-
         public static Texture icon_save =>
             __icon_save ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_save.png");
-
         private static Texture __icon_search = null;
-
         public static Texture icon_search =>
             __icon_search
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_search.png");
-
         private static Texture __icon_success = null;
-
         public static Texture icon_success =>
             __icon_success
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_success.png");
-
         private static Texture __icon_variable = null;
-
         public static Texture icon_variable =>
             __icon_variable
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_variable.png");
-
         private static Texture __icon_vivo = null;
-
         public static Texture icon_vivo =>
             __icon_vivo ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_vivo.png");
-
         private static Texture __icon_wechat = null;
-
         public static Texture icon_wechat =>
             __icon_wechat
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_wechat.png");
-
         private static Texture __light_active = null;
-
         public static Texture light_active =>
             __light_active
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/light_active.png");
-
         private static Texture __light_hover = null;
-
         public static Texture light_hover =>
             __light_hover
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/light_hover.png");
-
         private static Texture __light_normal = null;
-
         public static Texture light_normal =>
             __light_normal
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/light_normal.png");
-
+        private static Texture __sdk_white4x4 = null;
+        public static Texture sdk_white4x4 =>
+            __sdk_white4x4
+            ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/sdk_white4x4.png");
+        private static Texture __sidebar_1 = null;
+        public static Texture sidebar_1 =>
+            __sidebar_1 ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/sidebar_1.png");
+        private static Texture __sidebar_2 = null;
+        public static Texture sidebar_2 =>
+            __sidebar_2 ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/sidebar_2.png");
         private static Texture __tex_select = null;
-
         public static Texture tex_select =>
             __tex_select ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/tex_select.png");
     }
-}
+}

package/Editor/EditorKit.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    public class EditorKit
+    {
+        public static MethodInfo GetMethod(Type type, string methodName, BindingFlags bindingFlags)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            if (string.IsNullOrEmpty(methodName))
+            {
+                throw new ArgumentNullException(nameof(methodName));
+            }
+
+            MethodInfo methodInfo = type.GetMethod(methodName, bindingFlags);
+
+            if (methodInfo == null)
+            {
+                throw new InvalidOperationException($"Method '{methodName}' not found in type '{type.FullName}'.");
+            }
+
+            return methodInfo;
+        }
+
+
+        public static Type GetType(string fullName)
+        {
+            var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+            foreach (var assembly in assemblies)
+            {
+                var type = assembly.GetType(fullName);
+                if (type != null)
+                {
+                    return type;
+                }
+            }
+
+            throw new Exception($"找不到 type :{fullName}");
+        }
+
+        //设置属性
+        public static void SetPlayerSettingProperty(Type type, string propertyName, object value)
+        {
+            PropertyInfo propertyInfo = type.GetProperty(propertyName,
+                BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
+            if (propertyInfo != null)
+            {
+                propertyInfo.SetValue(null, value, null);
+            }
+            else
+            {
+                Debug.LogError($"Property '{propertyName}' not found in PlayerSettings.");
+            }
+        }
+
+
+     
+    }
+}

package/Editor/EditorKit.cs.meta

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

package/Editor/ExportModule.cs

@@ -88,6 +88,8 @@ namespace TyphoonUnitySDK
             var manifest = new List<string>()
             {
                 "Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay",
+                "Assets/Plugins/Android/libs/lib-union-sdk.aar",
+                "Assets/Plugins/Android/AndroidManifest.xml",
             };
             if (!MakeSureExport(manifest))
             {
@@ -146,6 +148,30 @@ namespace TyphoonUnitySDK
         }
 
 
+        [MenuItem("TyphoonSDK/开发者/导出-KuaiShouWebgl.unitypackage")]
+        public static void ExportKuaiShouWebgl()
+        {
+            var manifest = new List<string>()
+            {
+                "Assets/KS-WASM-SDK",
+                "Assets/WebGLTemplates",
+                "Assets/Plugins/KSWASM",
+                "Assets/Typhoon_Gen/TyphoonSDK/Runtime/KuaiShouWebgl",
+            };
+            if (!MakeSureExport(manifest))
+            {
+                return;
+            }
+
+            if (!CheckMissFiles(manifest))
+            {
+                return;
+            }
+
+            ExportUnityPackage(manifest, UniEditor.PackagePath_KuaiShouWebgl, out var detail);
+        }
+
+
         /// <summary>
         /// 导出清单文件到模块
         /// </summary>

package/Editor/KuaiShouWebglConfig.cs

@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Alphaleonis.Win32.Filesystem;
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    public static class KuaiShouWebglConfigGUIDrawer
+    {
+        public static Dictionary<string, Func<KuaiShouWebglConfig, bool>> OverrideDrawGUIConfig =
+            new Dictionary<string, Func<KuaiShouWebglConfig, bool>>()
+            {
+                { "m_Script", DrawProperty_m_Script },
+                { nameof(KuaiShouWebglConfig.AppId), DrawProperty_AppId },
+                { nameof(KuaiShouWebglConfig.CDN), DrawProperty_CDN },
+                { nameof(KuaiShouWebglConfig.VersionName), DrawProperty_VersionName },
+                { nameof(KuaiShouWebglConfig.VersionCode), DrawProperty_VersionCode },
+            };
+
+        private static bool DrawProperty_CDN(KuaiShouWebglConfig 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(KuaiShouWebglConfig arg)
+        {
+            arg.AppId = EditorGUILayout.TextField("appid (问运营)", arg.AppId);
+            return true;
+        }
+
+        private static bool DrawProperty_m_Script(KuaiShouWebglConfig arg)
+        {
+            var tmpEnable = GUI.enabled;
+            GUI.enabled = true;
+            GUILayout.Space(6);
+            GUIDrawer.DrawKeynotes("①支持Unity版本：2022.3.17f(推荐，支持ASTC压缩，坑最少)");
+            GUIDrawer.DrawKeynotes("②需要隐私协议，适龄提醒，详情问运营同学");
+            GUIDrawer.DrawKeynotes("③webgl不支持多线程，修改代码进行适配");
+            GUILayout.Space(6);
+            GUI.enabled = tmpEnable;
+            return true;
+        }
+
+        private static bool DrawProperty_VersionName(KuaiShouWebglConfig arg)
+        {
+            GUILayout.Space(10);
+            GUILayout.Label("版本信息", Styles.BoldLabel);
+            arg.VersionName = EditorGUILayout.TextField("版本名", arg.VersionName);
+            return true;
+        }
+
+        private static bool DrawProperty_VersionCode(KuaiShouWebglConfig 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 = KuaiShouWebglConfig.Default;
+            GUIDrawer.DrawProperty(config, (property) =>
+            {
+                if (OverrideDrawGUIConfig.TryGetValue(property, out var match))
+                {
+                    return match.Invoke(config);
+                }
+
+                return false;
+            });
+        }
+    }
+
+    public class KuaiShouWebglConfig : ScriptableObject, ISaveConfigPipeline
+    {
+        private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/KuaiShouWebglConfig.asset";
+
+        private static KuaiShouWebglConfig _instance = null;
+
+        public static KuaiShouWebglConfig Default
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = AssetDatabase.LoadAssetAtPath<KuaiShouWebglConfig>(ConfigPath);
+                }
+
+                if (_instance == null)
+                {
+                    _instance = CreateInstance<KuaiShouWebglConfig>();
+                    var folder = Path.GetDirectoryName(ConfigPath);
+                    if (!Directory.Exists(folder))
+                    {
+                        Directory.CreateDirectory(folder);
+                        AssetDatabase.Refresh();
+                    }
+
+                    AssetDatabase.CreateAsset(_instance, ConfigPath);
+                }
+
+                return _instance;
+            }
+        }
+
+        public string AppId;                     //appid
+        public string CDN = "https://xxx.xx.xx"; //cdn
+        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/KuaiShouWebglConfig.cs.meta

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

package/Editor/LightmapEncoding.cs

@@ -0,0 +1,12 @@
+namespace TyphoonUnitySDK
+{
+    /// <summary>
+    /// 转换到Unity UnityEditor.LightmapEncodingQuality
+    /// </summary>
+    public enum LightmapEncoding
+    {
+        Low,
+        Normal,
+        High,
+    }
+}

package/Editor/LightmapEncoding.cs.meta

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

package/Editor/PublishProcess.cs

@@ -15,5 +15,6 @@ namespace TyphoonUnitySDK
         GooglePlay,      //google play
         VivoMini,        //vivo小游戏
         OppoMini,        //oppo小游戏
+        KuaiShouWebgl,   //快手WEBGL
     }
 }

package/Editor/PublishSetting.cs

@@ -49,8 +49,8 @@ namespace TyphoonUnitySDK
 
         public ManagedStrippingLevel StrippingLevel = ManagedStrippingLevel.Low;
 
-#if UNITY_2021
-public AndroidSdkVersions MinApiVersion = AndroidSdkVersions.AndroidApiLevel22;
+#if UNITY_2021_1_OR_NEWER
+        public AndroidSdkVersions MinApiVersion = AndroidSdkVersions.AndroidApiLevel22;
 #else
         public AndroidSdkVersions MinApiVersion = AndroidSdkVersions.AndroidApiLevel19;
 #endif
@@ -79,9 +79,13 @@ public AndroidSdkVersions MinApiVersion = AndroidSdkVersions.AndroidApiLevel22;
         public WebGLExceptionSupport ExceptionSupport = WebGLExceptionSupport.FullWithoutStacktrace;
         public bool WebglDataCaching = true;
         public bool WebglDebugSymbols = false;
+        public bool OverrideLightEncoding = false;
+        public LightmapEncoding LightmapEncoding = LightmapEncoding.High;
 
 
-        [FormerlySerializedAs("EnableAASupport")] [FormerlySerializedAs("EnableAddressableSupport")] [Header("AA相关")]
+        [FormerlySerializedAs("EnableAASupport")]
+        [FormerlySerializedAs("EnableAddressableSupport")]
+        [Header("AA相关")]
         /*AA相关*/
         public bool AASupportEnable = false;
 
@@ -105,10 +109,12 @@ public AndroidSdkVersions MinApiVersion = AndroidSdkVersions.AndroidApiLevel22;
 
         /*oppo小游戏拓展配置*/
         public bool OppoMiniGUIFoldout = true;
-        
+
         //国内安卓拓展配置
         public bool ChinaAndroidGUIFoldout = true;
-        
+
+        //快手小游戏webgl
+        public bool KuaishouWebglGUIFoldout = true;
 
 
         //使用配置

package/Editor/PublishSettingGUIDrawer.cs

@@ -55,6 +55,7 @@ namespace TyphoonUnitySDK
                 { nameof(PublishSetting.VivoMiniGUIFoldout), DrawProperty_VivoMiniGUIFoldout },
                 { nameof(PublishSetting.OppoMiniGUIFoldout), DrawProperty_OppoMiniGUIFoldout },
                 { nameof(PublishSetting.ChinaAndroidGUIFoldout), DrawProperty_ChinaAndroidGUIFoldout },
+                { nameof(PublishSetting.KuaishouWebglGUIFoldout), DrawProperty_KuaiShouWebglGUIFoldout },
             };
 
         private static bool DrawProperty_ChinaAndroidGUIFoldout(PublishSetting arg)
@@ -180,6 +181,24 @@ namespace TyphoonUnitySDK
         }
 
 
+        private static bool DrawProperty_KuaiShouWebglGUIFoldout(PublishSetting arg)
+        {
+            if (arg.Channel != AppChannel.KuaiShouWebgl)
+            {
+                return true;
+            }
+
+            GUILayout.Space(10);
+            arg.OppoMiniGUIFoldout = GUIDrawer.DrawFoldout("快手小游戏-webgl", arg.OppoMiniGUIFoldout, GUILayout.Height(26));
+            if (arg.OppoMiniGUIFoldout)
+            {
+                KuaiShouWebglConfigGUIDrawer.DrawGUI();
+            }
+
+            return true;
+        }
+
+
         /// <summary>
         /// 绘制GUI
         /// </summary>

package/Editor/PublishWindow.cs

@@ -48,6 +48,8 @@ namespace TyphoonUnitySDK
                     return EditorIcons.icon_vivo;
                 case AppChannel.OppoMini:
                     return EditorIcons.icon_oppo;
+                case AppChannel.KuaiShouWebgl:
+                    return EditorIcons.icon_kuaishou;
             }
 
             return null;

package/Editor/Texture/icon_kuaishou.png.meta

@@ -0,0 +1,166 @@
+fileFormatVersion: 2
+guid: 0c1d06acea265684189729009a924063
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/UniEditor.cs

@@ -63,6 +63,11 @@ namespace TyphoonUnitySDK
         public static string PackagePath_OppoMini = $"{PathRoot}/Sources~/Package/OppoMini.unitypackage";
 
 
+        /// <summary>
+        /// 快手webgl模式资源包
+        /// </summary>
+        public static string PackagePath_KuaiShouWebgl = $"{PathRoot}/Sources~/Package/KuaiShouWebgl.unitypackage";
+
         /// <summary>
         /// Toast模块
         /// </summary>

package/Runtime/AppChannel.cs

@@ -51,5 +51,10 @@ namespace TyphoonUnitySDK
         /// oppo小游戏
         /// </summary>
         OppoMini = 9,
+
+        /// <summary>
+        /// 快手webgl
+        /// </summary>
+        KuaiShouWebgl = 10,
     }
 }

package/Runtime/SDKHttpClient.cs

@@ -33,7 +33,11 @@ namespace TyphoonUnitySDK
             Action<string> fail, Dictionary<string, string> header, int timeOut)
         {
             var uri = new Uri(url);
-            using (UnityWebRequest www = UnityWebRequest.Post(uri, data))
+#if UNITY_2022_2_OR_NEWER
+            using (UnityWebRequest www = UnityWebRequest.PostWwwForm(uri, data))
+#else
+           using (UnityWebRequest www = UnityWebRequest.Post(uri, data))
+#endif
             {
                 try
                 {

package/Sources~/Package/GooglePlay.unitypackage.manifest

@@ -4,3 +4,5 @@ Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/GooglePlaySdk.cs
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/GooglePlaySdk.cs.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Editor/PublishGooglePlay.cs
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Editor/PublishGooglePlay.cs.meta
+Assets/Plugins/Android/libs/lib-union-sdk.aar
+Assets/Plugins/Android/AndroidManifest.xml

package/Sources~/Package/KuaiShouWebgl.unitypackage.manifest

@@ -0,0 +1,36 @@
+Assets/KS-WASM-SDK
+Assets/KS-WASM-SDK/Editor.meta
+Assets/KS-WASM-SDK/link.xml
+Assets/KS-WASM-SDK/link.xml.meta
+Assets/KS-WASM-SDK/package.json
+Assets/KS-WASM-SDK/package.json.meta
+Assets/KS-WASM-SDK/Editor/KSUnityConvertTools.dll
+Assets/KS-WASM-SDK/Editor/KSUnityConvertTools.dll.meta
+Assets/WebGLTemplates
+Assets/WebGLTemplates/ks.meta
+Assets/WebGLTemplates/ks/game.js
+Assets/WebGLTemplates/ks/game.js.meta
+Assets/WebGLTemplates/ks/game.json
+Assets/WebGLTemplates/ks/game.json.meta
+Assets/WebGLTemplates/ks/kwaiApiAdapter.js
+Assets/WebGLTemplates/ks/kwaiApiAdapter.js.meta
+Assets/WebGLTemplates/ks/project.config.json
+Assets/WebGLTemplates/ks/project.config.json.meta
+Assets/Plugins/KSWASM
+Assets/Plugins/KSWASM/js.jslib
+Assets/Plugins/KSWASM/js.jslib.meta
+Assets/Plugins/KSWASM/KSUnityOpenSDK.dll
+Assets/Plugins/KSWASM/KSUnityOpenSDK.dll.meta
+Assets/Plugins/KSWASM/link.xml
+Assets/Plugins/KSWASM/link.xml.meta
+Assets/Plugins/KSWASM/OpenSdk.jslib
+Assets/Plugins/KSWASM/OpenSdk.jslib.meta
+Assets/Plugins/KSWASM/RakNet.jslib
+Assets/Plugins/KSWASM/RakNet.jslib.meta
+Assets/Plugins/KSWASM/SoGameOpenSdk.jslib
+Assets/Plugins/KSWASM/SoGameOpenSdk.jslib.meta
+Assets/Plugins/KSWASM/UDPSocket.jslib
+Assets/Plugins/KSWASM/UDPSocket.jslib.meta
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/KuaiShouWebgl
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/KuaiShouWebgl/KuaiShouWebglSdk.cs
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/KuaiShouWebgl/KuaiShouWebglSdk.cs.meta

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.1.1","description":"","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"3.2.0"}],"version_log":"## [1.1.1] - 2024-10-30\r\n\r\n### 修复\n* 修复iniconfig value 参数问题\r\n\r\n","major_flag":false,"write_time_stamp":1730275396000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"3.2.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.1.2","description":"","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"3.2.0"}],"version_log":"## [1.1.2] - 2024-11-13\r\n\r\n### 新增\n* 重新调整google模块的发布\r\n\r\n","major_flag":false,"write_time_stamp":1731473731000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"3.2.0"}}