com.typhoon.unitysdk 1.0.24 → 1.0.25

package/Editor/ApplyTool.cs

@@ -46,19 +46,19 @@ namespace TyphoonUnitySDK
                     case BuildTarget.Android:
                     {
                         ModifyAndroidPlayerSetting(setting);
-                        UniEditor.LogInfo("//TODO//根据发布模式导入更换资源包");
+                        Debug.Log($"<color=#3ac9f3>根据发布模式导入更换资源包</color>");
                     }
                         break;
                     case BuildTarget.iOS:
                     {
                         ModifyIOSSetting(setting);
-                        UniEditor.LogInfo("//TODO//根据发布模式导入更换资源包");
+                        Debug.Log($"<color=#3ac9f3>//TODO//根据发布模式导入更换资源包</color>");
                     }
                         break;
                     case BuildTarget.WebGL:
                     {
                         ModifyWebglSetting(setting);
-                        UniEditor.LogInfo("//TODO//根据发布模式导入更换资源包");
+                        Debug.Log($"<color=#3ac9f3>//TODO//根据发布模式导入更换资源包</color>");
                     }
                         break;
                     default:
@@ -142,7 +142,7 @@ namespace TyphoonUnitySDK
             AddressableSupport.ModifyAAProfileAndVariables(setting);
             //写入App config
             WriteAppConfig(setting);
-            UniEditor.LogInfo("//TODO//导入资源包...");
+            Debug.Log($"<color=#3ac9f3>//TODO//导入资源包...</color>");
         }
 
         /// <summary>
@@ -157,7 +157,7 @@ namespace TyphoonUnitySDK
             AddressableSupport.ModifyAAProfileAndVariables(setting);
             //写入App config
             WriteAppConfig(setting);
-            UniEditor.LogInfo("//TODO//导入资源包...");
+            Debug.Log($"<color=#3ac9f3>//TODO//导入资源包...</color>");
         }
 
         /// <summary>
@@ -196,7 +196,7 @@ namespace TyphoonUnitySDK
             AddressableSupport.ModifyAAProfileAndVariables(setting);
             //写入App config
             WriteAppConfig(setting);
-            UniEditor.LogInfo("//TODO//导入资源包...");
+            Debug.Log($"<color=#3ac9f3>//TODO//导入资源包...</color>");
         }
 
         /// <summary>

package/Editor/ExportModule.cs

@@ -255,6 +255,27 @@ namespace TyphoonUnitySDK
         }
 
 
+        [MenuItem("TyphoonSDK/开发者/导出-Toast.unitypackage")]
+        public static void ExportToastModule()
+        {
+            var manifest = new List<string>()
+            {
+                "Assets/Typhoon_Gen/TyphoonSDK/Toast",
+            };
+            if (!MakeSureExport(manifest))
+            {
+                return;
+            }
+
+            if (!CheckMissFiles(manifest))
+            {
+                return;
+            }
+
+            ExportUnityPackage(manifest, UniEditor.PackagePath_Toast, out var detail);
+        }
+
+
         /// <summary>
         /// 导出UnityPackage
         /// </summary>

package/Editor/Preferences.cs

@@ -27,20 +27,17 @@ namespace TyphoonUnitySDK
                     _instance = CreateInstance<Preferences>();
                     UniEditor.CreateDirIfNotExist(Path.GetDirectoryName(AssetPath));
                     AssetDatabase.CreateAsset(_instance, AssetPath);
-                    UniEditor.LogInfo($"生成:{AssetPath}");
+                    Debug.Log($"<color=#3ac9f3>生成:{AssetPath}</color>");
                 }
 
                 return _instance;
             }
         }
 
-        [Header("检查拓展Addressable开关")]
-        /*检查Addressable Plug安装*/
-        public bool CheckInstallAddressablePlug = true;
-        
+
+        public bool CheckAddressableSupport = true;
+
+
         [Header("gradle目录")] public string GradlePath = string.Empty;
-        
-        
-        
     }
 }

package/Editor/PreferencesWindow.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using UnityEditor;
 using UnityEngine;
-using Object = UnityEngine.Object;
 
 namespace TyphoonUnitySDK
 {
@@ -58,21 +57,8 @@ namespace TyphoonUnitySDK
             area.x += 4;
             area.height = rect.yMax - area.yMin - 4;
             GUILayout.BeginArea(area);
-
             _scroll = GUILayout.BeginScrollView(_scroll);
-            _preferenceFoldout = GUIDrawer.DrawFoldout("偏好设置", _preferenceFoldout, GUILayout.Height(26));
-            if (_preferenceFoldout)
-            {
-                DrawPreferencesPropertyGUI(Preferences.Default);
-            }
-
-            GUILayout.Space(10);
-            _wxMiniConfigFoldout = GUIDrawer.DrawFoldout("微信小游戏", _wxMiniConfigFoldout, GUILayout.Height(26));
-            if (_wxMiniConfigFoldout)
-            {
-                WxMiniConfigGUIDrawer.DrawWxMiniConfig();
-            }
-
+            DrawPreferencesPropertyGUI(Preferences.Default);
             GUILayout.EndScrollView();
             GUILayout.EndArea();
             Repaint();
@@ -84,11 +70,29 @@ namespace TyphoonUnitySDK
         public static Dictionary<string, Func<Preferences, bool>> OverrideDrawGUIPreferences =
             new Dictionary<string, Func<Preferences, bool>>()
             {
-                { "m_Script", (s) => true },
-                { nameof(Preferences.CheckInstallAddressablePlug), DrawProperty_CheckInstallAddressablePlug },
+                { "m_Script", DrawProperty_mScript },
+                { nameof(Preferences.CheckAddressableSupport), DrawProperty_CheckAddressableSupport },
                 { nameof(Preferences.GradlePath), DrawProperty_GradlePath },
             };
 
+        private static bool DrawProperty_CheckAddressableSupport(Preferences arg)
+        {
+            GUILayout.Space(10);
+            Preferences.Default.CheckAddressableSupport =
+                GUILayout.Toggle(Preferences.Default.CheckAddressableSupport, "检查Addressable支持");
+            return true;
+        }
+
+        private static bool DrawProperty_mScript(Preferences arg)
+        {
+            var temEnable = GUI.enabled;
+            GUI.enabled = true;
+            GUIDrawer.DrawKeynotes("使用须知:");
+            GUIDrawer.DrawKeynotes("①工具对Addressable有支持,从菜单：'TyphoonSDK/安装拓展...' 中导入");
+            GUI.enabled = temEnable;
+            return true;
+        }
+
 
         /*绘制GUI*/
         public static void DrawPreferencesPropertyGUI(Preferences preferences)
@@ -104,16 +108,9 @@ namespace TyphoonUnitySDK
             });
         }
 
-        private static bool DrawProperty_CheckInstallAddressablePlug(Preferences arg)
-        {
-            arg.CheckInstallAddressablePlug =
-                GUILayout.Toggle(arg.CheckInstallAddressablePlug, "自动检查Addressabled Supoort");
-            return true;
-        }
-
-
         private static bool DrawProperty_GradlePath(Preferences preferences)
         {
+            GUILayout.Space(5);
             if (!UniEditor.GradleIsMatch())
             {
                 GUILayout.BeginHorizontal();

package/Editor/PublishVivoBatSetting.cs

@@ -13,9 +13,11 @@ namespace TyphoonUnitySDK
         public string GameName;
         public Texture Icon;
         public string PackageName;
+        public int TargetSdkVersion = 32;
         public string AppId;
         public string PrivacyPolicyYNoteUrl;
 
+
         [Header("签名相关")] public string KeystoreName;
         public string KeystorePassword;
         public string KeyAliasName;
@@ -36,6 +38,7 @@ namespace TyphoonUnitySDK
         public int VersionCode = 1000000;
         private static string PATH = "Assets/Editor/PublishVivoBatSetting.asset";
 
+
         public static PublishVivoBatSetting _default = null;
 
         public static PublishVivoBatSetting Default

package/Editor/PublishVivoBatSettingInspector.cs

@@ -219,7 +219,7 @@ android {{
 
     defaultConfig {{
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion {Setting.TargetSdkVersion}
         versionCode {Setting.VersionCode}
         versionName '{Setting.Version}'
         applicationId '{Setting.PackageName}'

package/Editor/PublishVivoBatSettingWindow.cs

@@ -36,7 +36,7 @@ namespace TyphoonUnitySDK
         }
 
 
-        protected  void OnGUI()
+        protected void OnGUI()
         {
             var rect = new Rect(0, 0, position.width, position.height);
             var area = rect;
@@ -51,7 +51,7 @@ namespace TyphoonUnitySDK
             rectSave.x -= 4;
             GUILayout.Space(36);
             Editor.OnInspectorGUI();
-            if (GUI.Button(rectSave, new GUIContent("保存配置", EditorIcons.icon_save), Styles.rbutton_bold))
+            if (GUI.Button(rectSave, new GUIContent("保存配置", EditorIcons.icon_save)))
             {
                 EditorUtility.SetDirty(PublishVivoBatSetting.Default);
                 AssetDatabase.SaveAssets();

package/Editor/PublishWindow.cs

@@ -85,6 +85,9 @@ namespace TyphoonUnitySDK
                     }
                 }
             }
+
+            //检查一些事情
+            UniEditor.CheckSomethingsOnPublishWindowShow();
         }
 
         protected void OnGUI()
@@ -348,21 +351,21 @@ namespace TyphoonUnitySDK
 
                 if (clickApply)
                 {
-                    UniEditor.LogInfo($"应用...{_select}");
+                    Debug.Log($"<color=#3ac9f3>应用...{_select}</color>");
                     _select.Apply();
-                    UniEditor.LogInfo($"应用完毕");
+                    Debug.Log($"<color=#3ac9f3>应用完毕</color>");
                 }
 
                 if (clickBuildAA)
                 {
-                    UniEditor.LogInfo("构建AA...");
+                    Debug.Log($"<color=#3ac9f3>构建AA...</color>");
                     AddressableSupport.BuildAASource(_select);
-                    UniEditor.LogInfo("构建AA结束");
+                    Debug.Log($"<color=#3ac9f3>构建AA结束</color>");
                 }
 
                 if (clickPublish)
                 {
-                    UniEditor.LogInfo("//TODO//点击了发布");
+                    Debug.Log($"<color=#3ac9f3>发布...</color>");
                     _select.Publish();
                 }
 

package/Editor/UniEditor.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Text;
 using UnityEditor;
 using UnityEngine;
-using Object = UnityEngine.Object;
 
 namespace TyphoonUnitySDK
 {
@@ -40,6 +39,12 @@ namespace TyphoonUnitySDK
         public static string PackagePath_Douyin = $"{PathRoot}/Sources~/Package/Douyin.unitypackage";
 
 
+        /// <summary>
+        /// Toast模块
+        /// </summary>
+        public static string PackagePath_Toast = $"{PathRoot}/Sources~/Package/Toast.unitypackage";
+
+
         /// <summary>
         /// 开启Addressable模块支持
         /// </summary>
@@ -84,17 +89,17 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static void ImportPackage(string path, bool interactive = true)
         {
-            LogInfo($"导入----{path}");
+            Debug.Log($"<color=#3ac9f3>导入----{path}</color>");
             AssetDatabase.ImportPackage(path, interactive);
         }
 
-        /// <summary>
-        /// 日志输出
-        /// </summary>
-        public static void LogInfo(string content)
-        {
-            Debug.Log($"<color=#3ac9f3>{content}</color>");
-        }
+        // /// <summary>
+        // /// 日志输出
+        // /// </summary>
+        // public static void LogInfo(string content)
+        // {
+        //     Debug.Log($"<color=#3ac9f3>{content}</color>");
+        // }
 
         /// <summary>
         /// 清理宏定义
@@ -230,7 +235,6 @@ namespace TyphoonUnitySDK
             return result;
         }
 
-
         /// <summary>
         /// 是否安装了Addressable
         /// </summary>
@@ -251,18 +255,19 @@ namespace TyphoonUnitySDK
         }
 
 
-        [MenuItem("TyphoonSDK/安装/Addressable 支持", priority = 100)]
+        [MenuItem("TyphoonSDK/安装拓展/Addressable 支持", priority = 100)]
         public static void InstallAddressableSupport()
         {
             AppendScriptingDefineSymbol(DEFINE_TYPHOON_ADDRESSABLE_NAME);
             AssetDatabase.Refresh();
             AssetDatabase.SaveAssets();
+            Debug.Log("Addressable 支持,安装成功!");
         }
 
-        [MenuItem("TyphoonSDK/安装/Addressable 支持", true)]
+        [MenuItem("TyphoonSDK/安装拓展/Addressable 支持", true)]
         public static bool InstallAddressableSupportValid()
         {
-            return HasAddressable();
+            return HasAddressable() && !HasAddressableSupport();
         }
 
         [MenuItem("TyphoonSDK/卸载/Addressable 支持", priority = 100)]
@@ -273,6 +278,7 @@ namespace TyphoonUnitySDK
                 ClearScriptingDefineSymbol(DEFINE_TYPHOON_ADDRESSABLE_NAME);
                 AssetDatabase.Refresh();
                 AssetDatabase.SaveAssets();
+                Debug.Log("Addressable 支持,卸载完毕!");
             });
         }
 
@@ -285,6 +291,12 @@ namespace TyphoonUnitySDK
             return false;
         }
 
+        [MenuItem("TyphoonSDK/安装拓展/Toast模块", priority = 100)]
+        public static void InstallToast()
+        {
+            AssetDatabase.ImportPackage(UniEditor.PackagePath_Toast, true);
+        }
+
 
         /// <summary>
         /// 弹出二次提示窗口
@@ -515,5 +527,15 @@ namespace TyphoonUnitySDK
 
             File.WriteAllText(path, sb.ToString());
         }
+
+
+        /*发布窗口打开时触发一些事情*/
+        public static void CheckSomethingsOnPublishWindowShow()
+        {
+            if (Preferences.Default.CheckAddressableSupport && HasAddressable() && !HasAddressableSupport())
+            {
+                ShowMessageBox("检查到Addressable,是否添加拓展[Addressable支持],可从选项中关闭", InstallAddressableSupport);
+            }
+        }
     }
 }

package/Runtime/SimulateRecordGame.cs

@@ -75,7 +75,7 @@ namespace TyphoonUnitySDK
                 return;
             }
 
-            GUIMessageBox.Instance.Show("请选择分享返回结果", "成功返回", "失败返回", () => success?.Invoke(),
+            UnityGUIMessageBox.Instance.Show("请选择分享返回结果", "成功返回", "失败返回", () => success?.Invoke(),
                 () => fail?.Invoke());
         }
     }

package/Runtime/{GUIMessageBox.cs → UnityGUIMessageBox.cs}

@@ -4,7 +4,10 @@ using UnityEngine;
 
 namespace TyphoonUnitySDK
 {
-    public class GUIMessageBox : MonoSingleton<GUIMessageBox>
+    /// <summary>
+    /// 只能在Unity中调用
+    /// </summary>
+    internal class UnityGUIMessageBox : MonoSingleton<UnityGUIMessageBox>
     {
         private const float HOLD_TIME = 1.3F;
         public bool IsShow = false;

package/Runtime/ximaiti.otf.meta

@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: cc71c8df38c4cbc488bf89567ae58dc9
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - ZiZhiQuXiMaiTi
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,11 @@
+Assets/Typhoon_Gen/TyphoonSDK/Toast
+Assets/Typhoon_Gen/TyphoonSDK/Toast/Resources.meta
+Assets/Typhoon_Gen/TyphoonSDK/Toast/Runtime.meta
+Assets/Typhoon_Gen/TyphoonSDK/Toast/Toast_White.png
+Assets/Typhoon_Gen/TyphoonSDK/Toast/Toast_White.png.meta
+Assets/Typhoon_Gen/TyphoonSDK/Toast/ximaiti SDF.asset
+Assets/Typhoon_Gen/TyphoonSDK/Toast/ximaiti SDF.asset.meta
+Assets/Typhoon_Gen/TyphoonSDK/Toast/Resources/TYPHOON_SDK_TOAST_CANVAS.prefab
+Assets/Typhoon_Gen/TyphoonSDK/Toast/Resources/TYPHOON_SDK_TOAST_CANVAS.prefab.meta
+Assets/Typhoon_Gen/TyphoonSDK/Toast/Runtime/Toast.cs
+Assets/Typhoon_Gen/TyphoonSDK/Toast/Runtime/Toast.cs.meta

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.24","description":"unity端个汇总渠道的sdk,统一接口,一键发布","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"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.25","description":"unity端个汇总渠道的sdk,统一接口,一键发布","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"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}

package/Editor/InstallModule.cs

@@ -1,38 +0,0 @@
-using UnityEditor;
-
-namespace TyphoonUnitySDK
-{
-    [InitializeOnLoad]
-    public class InstallModule
-    {
-        static InstallModule()
-        {
-#if !TYPHOON_ADDRESSABLE
-            if (Preferences.Default.CheckInstallAddressablePlug)
-            {
-                if (UniEditor.HasAddressable())
-                {
-                    var complex =
-                        UniEditor.ShowMessageBoxComplex("推荐补充Addressable拓展功能,安装?\n\r可从'TyphoonSDK/选项'中关闭检查", null,
-                            null);
-                    switch (complex)
-                    {
-                        case ComplexType.Yes:
-                            UniEditor.InstallAddressableSupport();
-                            break;
-                        case ComplexType.No:
-                            break;
-                        case ComplexType.Alt:
-                        {
-                            Preferences.Default.CheckInstallAddressablePlug = false;
-                            EditorUtility.SetDirty(Preferences.Default);
-                            AssetDatabase.SaveAssets();
-                        }
-                            break;
-                    }
-                }
-            }
-#endif
-        }
-    }
-}

package/Editor/InstallModule.cs.meta

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