com.typhoon.unitysdk 1.0.94 → 1.0.95

package/Editor/ApplyTool.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using UnityEditor;
 using UnityEngine;
 
@@ -38,11 +40,26 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static void SaveAllChannelConfig()
         {
+            // var classTypes = UniEditor.GetSubClassTypes(typeof(ISaveConfigPipeline));
+            // foreach (var classType in classTypes)
+            // {
+            //     var guids = AssetDatabase.FindAssets($"t:{classType.FullName}", new[] { "Assets" });
+            //     foreach (var guid in guids)
+            //     {
+            //         var path = AssetDatabase.GUIDToAssetPath(guid);
+            //         if (!string.IsNullOrEmpty(path))
+            //         {
+            //             var asset = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(path);
+            //             (asset as ISaveConfigPipeline)?.SaveConfig();
+            //         }
+            //     }
+            // }
             VivoMiniConfig.Default.Save();
             WxMiniConfig.Default.Save();
             DouyinConfig.Default.Save();
             VariablePreset.Default.Save();
             OppoMiniConfig.Default.Save();
+            ChinaAndroidConfig.Default.Save();
         }
 
         /// <summary>

package/Editor/ChinaAndroidConfig.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    public static class ChinaAndroidConfigGUIDrawer
+    {
+        public static Dictionary<string, Func<ChinaAndroidConfig, bool>> OverrideDrawGUIFunc =
+            new Dictionary<string, Func<ChinaAndroidConfig, bool>>()
+            {
+                { "m_Script", DrawProperty_m_Script },
+                { $"{nameof(Orientation)}", DrawProperty_Orientation },
+            };
+
+        private static bool DrawProperty_Orientation(ChinaAndroidConfig arg)
+        {
+            var txt = arg.Orientation == ChinaAndroidConfig.ScreenOrientation.Portrait ? "竖屏" : "横屏";
+            GUILayout.Label("横竖屏模式", Styles.BoldLabel);
+            if (GUILayout.Button(txt, "PopUp"))
+            {
+                var menu = new GenericMenu();
+                menu.AddItem(new GUIContent("竖屏"), arg.Orientation == ChinaAndroidConfig.ScreenOrientation.Portrait,
+                    () =>
+                    {
+                        arg.Orientation = ChinaAndroidConfig.ScreenOrientation.Portrait;
+                        arg.Save();
+                    });
+                menu.AddItem(new GUIContent("横屏"), arg.Orientation == ChinaAndroidConfig.ScreenOrientation.Landscape,
+                    () =>
+                    {
+                        arg.Orientation = ChinaAndroidConfig.ScreenOrientation.Landscape;
+                        arg.Save();
+                    });
+                menu.ShowAsContext();
+            }
+
+            return true;
+        }
+
+        private static bool DrawProperty_m_Script(ChinaAndroidConfig arg)
+        {
+            var tmpEnable = GUI.enabled;
+            GUI.enabled = true;
+            GUILayout.Space(6);
+            GUIDrawer.DrawKeynotes("①需要Unity 2019.3+ 或以上，即新版 android 目录结构");
+            GUIDrawer.DrawKeynotes("②剔除第三方SDK,避免与渠道冲突或不兼容");
+            GUILayout.Space(6);
+            GUI.enabled = tmpEnable;
+            return true;
+        }
+
+
+        /*绘制GUI*/
+        public static void DrawGUI()
+        {
+            var config = ChinaAndroidConfig.Default;
+            GUIDrawer.DrawProperty(config, (property) =>
+            {
+                if (OverrideDrawGUIFunc.TryGetValue(property, out var match))
+                {
+                    return match.Invoke(config);
+                }
+
+                return false;
+            });
+        }
+    }
+
+    public class ChinaAndroidConfig : ScriptableObject
+    {
+        private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/ChinaAndroidConfig.asset";
+
+        private static ChinaAndroidConfig _instance = null;
+
+        public static ChinaAndroidConfig Default
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = AssetDatabase.LoadAssetAtPath<ChinaAndroidConfig>(ConfigPath);
+                }
+
+                if (_instance == null)
+                {
+                    _instance = CreateInstance<ChinaAndroidConfig>();
+                    var folder = Path.GetDirectoryName(ConfigPath);
+                    if (!Directory.Exists(folder))
+                    {
+                        Directory.CreateDirectory(folder);
+                        AssetDatabase.Refresh();
+                    }
+
+                    AssetDatabase.CreateAsset(_instance, ConfigPath);
+                }
+
+                return _instance;
+            }
+        }
+
+        /// <summary>
+        /// 横竖屏模式
+        /// </summary>
+        public enum ScreenOrientation
+        {
+            Portrait,
+            Landscape,
+        }
+
+        [Header("横竖屏模式")] public ScreenOrientation Orientation = ScreenOrientation.Portrait;
+
+        [LabelOverride("保留导出工程")] public bool KeepProj = false;
+
+        public void Save()
+        {
+            EditorUtility.SetDirty(this);
+            AssetDatabase.SaveAssets();
+        }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
+    }
+}

package/Editor/ChinaAndroidConfig.cs.meta

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

package/Editor/DouyinConfig.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using UnityEditor;
 using UnityEngine;
-using UnityEngine.Serialization;
 
 namespace TyphoonUnitySDK
 {
@@ -95,7 +94,7 @@ namespace TyphoonUnitySDK
     /// <summary>
     /// 抖音小游戏配置
     /// </summary>
-    public class DouyinConfig : ScriptableObject
+    public class DouyinConfig : ScriptableObject, ISaveConfigPipeline
     {
         private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/DouyinConfig.asset";
         public static string INIPath = ".typhoon/unitysdk/douyin.ini";
@@ -139,5 +138,10 @@ namespace TyphoonUnitySDK
             EditorUtility.SetDirty(this);
             AssetDatabase.SaveAssets();
         }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
     }
 }

package/Editor/ExportModule.cs

@@ -20,7 +20,7 @@ namespace TyphoonUnitySDK
             {
                 // "Assets/Plugins/Android/libs/sdk_plug-release.aar",
                 // "Assets/Plugins/Android/libs/unity_app-release.aar",
-                // "Assets/Plugins/Android/libs/unity_launcher-release.aar",
+                "Assets/Plugins/Android/libs/lib-union-sdk.aar",
                 "Assets/Plugins/Android/AndroidManifest.xml",
                 "Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid",
             };

package/Editor/ISaveConfigPipeline.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    /// <summary>
+    /// 配置保存管线
+    /// </summary>
+    public interface ISaveConfigPipeline
+    {
+        void SaveConfig();
+    }
+}

package/Editor/ISaveConfigPipeline.cs.meta

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

package/Editor/OppoMiniConfig.cs

@@ -470,7 +470,7 @@ namespace TyphoonUnitySDK
     /// <summary>
     /// oppo mini 参数
     /// </summary>
-    public class OppoMiniConfig : ScriptableObject
+    public class OppoMiniConfig : ScriptableObject, ISaveConfigPipeline
     {
         private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/OppoMiniConfig.asset";
 
@@ -539,5 +539,10 @@ namespace TyphoonUnitySDK
             EditorUtility.SetDirty(this);
             AssetDatabase.SaveAssets();
         }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
     }
 }

package/Editor/PublishResult.cs

@@ -1,7 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
 namespace TyphoonUnitySDK
 {
     /// <summary>
@@ -9,6 +5,11 @@ namespace TyphoonUnitySDK
     /// </summary>
     public class PublishResult
     {
+        /// <summary>
+        /// 是否成功
+        /// </summary>
+        public bool IsSuccess = false;
+
         /// <summary>
         /// 发布设置
         /// </summary>
@@ -19,6 +20,12 @@ namespace TyphoonUnitySDK
         /// </summary>
         public string AndroidProj;
 
+        /// <summary>
+        /// 导出的AndroidAPK
+        /// </summary>
+        public string AndroidApk;
+
+
         /// <summary>
         /// 导出的微信工程
         /// </summary>

package/Editor/PublishSetting.cs

@@ -105,6 +105,10 @@ public AndroidSdkVersions MinApiVersion = AndroidSdkVersions.AndroidApiLevel22;
 
         /*oppo小游戏拓展配置*/
         public bool OppoMiniGUIFoldout = true;
+        
+        //国内安卓拓展配置
+        public bool ChinaAndroidGUIFoldout = true;
+        
 
 
         //使用配置

package/Editor/PublishSettingGUIDrawer.cs

@@ -54,8 +54,27 @@ namespace TyphoonUnitySDK
                 { nameof(PublishSetting.DouyinGUIFoldout), DrawProperty_DouyinGUIFoldout },
                 { nameof(PublishSetting.VivoMiniGUIFoldout), DrawProperty_VivoMiniGUIFoldout },
                 { nameof(PublishSetting.OppoMiniGUIFoldout), DrawProperty_OppoMiniGUIFoldout },
+                { nameof(PublishSetting.ChinaAndroidGUIFoldout), DrawProperty_ChinaAndroidGUIFoldout },
             };
 
+        private static bool DrawProperty_ChinaAndroidGUIFoldout(PublishSetting arg)
+        {
+            if (arg.Channel != AppChannel.ChinaAndroid)
+            {
+                return true;
+            }
+
+            GUILayout.Space(10);
+            arg.ChinaAndroidGUIFoldout =
+                GUIDrawer.DrawFoldout("国内Android", arg.ChinaAndroidGUIFoldout, GUILayout.Height(26));
+            if (arg.ChinaAndroidGUIFoldout)
+            {
+                ChinaAndroidConfigGUIDrawer.DrawGUI();
+            }
+
+            return true;
+        }
+
         private static bool DrawProperty_WebglDataCaching(PublishSetting arg)
         {
             if (arg.BuildTarget != BuildTarget.WebGL)

package/Editor/VariablePreset.cs

@@ -10,7 +10,7 @@ namespace TyphoonUnitySDK
     /// 变量预设
     /// 用于自定义工具内的变量名
     /// </summary>
-    public class VariablePreset : ScriptableObject
+    public class VariablePreset : ScriptableObject, ISaveConfigPipeline
     {
         private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/VariablePreset.asset";
 
@@ -148,7 +148,6 @@ namespace TyphoonUnitySDK
             {
                 Presets[index].VariableValue = value;
             }
-
         }
 
         public void Save()
@@ -156,5 +155,10 @@ namespace TyphoonUnitySDK
             EditorUtility.SetDirty(this);
             AssetDatabase.SaveAssets();
         }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
     }
 }

package/Editor/VivoMiniConfig.cs

@@ -429,7 +429,7 @@ namespace TyphoonUnitySDK
     /// <summary>
     /// vivo mini 参数
     /// </summary>
-    public class VivoMiniConfig : ScriptableObject
+    public class VivoMiniConfig : ScriptableObject, ISaveConfigPipeline
     {
         private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/VivoMiniConfig.asset";
 
@@ -500,5 +500,10 @@ namespace TyphoonUnitySDK
             EditorUtility.SetDirty(this);
             AssetDatabase.SaveAssets();
         }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
     }
 }

package/Editor/WxMiniConfig.cs

@@ -206,7 +206,7 @@ namespace TyphoonUnitySDK
     /// <summary>
     /// 微信小游戏配置
     /// </summary>
-    public class WxMiniConfig : ScriptableObject
+    public class WxMiniConfig : ScriptableObject, ISaveConfigPipeline
     {
         private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/WxMiniConfig.asset";
 
@@ -273,5 +273,10 @@ namespace TyphoonUnitySDK
             EditorUtility.SetDirty(this);
             AssetDatabase.SaveAssets();
         }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
     }
 }

package/Runtime/TyphoonSdkCallback.cs

@@ -34,21 +34,21 @@ namespace TyphoonUnitySDK
             SessionItem.Invoke(sessionId, data);
         }
 
-        public void Update()
-        {
-            switch (AppConfig.Channel)
-            {
-                case AppChannel.ChinaAndroid:
-                    if (Input.GetKeyDown(KeyCode.Escape))
-                    {
-                        if (SdkLite.Instance.IsSupportQuitWithKeep())
-                        {
-                            SdkLite.Instance.QuitWithKeep();
-                        }
-                    }
-
-                    break;
-            }
-        }
+        // public void Update()
+        // {
+        //     switch (AppConfig.Channel)
+        //     {
+        //         case AppChannel.ChinaAndroid:
+        //             if (Input.GetKeyDown(KeyCode.Escape))
+        //             {
+        //                 if (SdkLite.Instance.IsSupportQuitWithKeep())
+        //                 {
+        //                     SdkLite.Instance.QuitWithKeep();
+        //                 }
+        //             }
+        //
+        //             break;
+        //     }
+        // }
     }
 }

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

@@ -1,3 +1,4 @@
+Assets/Plugins/Android/libs/lib-union-sdk.aar
 Assets/Plugins/Android/AndroidManifest.xml
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/ChinaAndroidSdk.cs

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.94","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":"2.0.0"}],"version_log":"## [1.0.94] - 2024-01-25\r\n\r\n### 新增\n* 更新vivo app sdk\r\n\r\n","major_flag":false,"write_time_stamp":1706194439000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.95","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":"2.0.0"}],"version_log":"## [1.0.94] - 2024-01-25\r\n\r\n### 新增\n* 更新vivo app sdk\r\n\r\n","major_flag":false,"write_time_stamp":1706850595000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}