com.typhoon.unitysdk 1.0.16 → 1.0.18

package/Editor/ApplyTool.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using UnityEditor;
+using UnityEditor.VersionControl;
 using UnityEngine;
 
 namespace TyphoonUnitySDK
@@ -35,6 +36,8 @@ namespace TyphoonUnitySDK
             var done = SwitchPlatformTo(setting.BuildTarget);
             if (done)
             {
+                //写入apply 历史
+                UniEditor.WriteApplyHistory(setting);
                 //修改参数
                 switch (setting.BuildTarget)
                 {
@@ -300,14 +303,67 @@ namespace TyphoonUnitySDK
         }
 
 
+        public static void ImportUnityPackage(string package)
+        {
+            AssetDatabase.ImportPackage(package, false);
+        }
+
+
+        /*读取清单*/
+        public static HashSet<string> ReadManifest(string path)
+        {
+            if (!File.Exists(path))
+            {
+                return new HashSet<string>();
+            }
+
+            var contents = File.ReadAllLines(path);
+            var result = new HashSet<string>();
+            foreach (var e in contents)
+            {
+                if (!string.IsNullOrEmpty(e))
+                {
+                    result.Add(e);
+                }
+            }
+
+            return result;
+        }
+
+
+        /// <summary>
+        /// 清理文件夹,保留文件
+        /// </summary>
+        public static void ClearFilesInDirectory(string folder, HashSet<string> keep)
+        {
+            if (Directory.Exists(folder))
+            {
+                var files = Directory.GetFiles(folder, "*", SearchOption.AllDirectories);
+                foreach (var element in files)
+                {
+                    var path = UniEditor.FullPathToAssetPath(element);
+                    if (keep.Contains(path))
+                    {
+                        continue;
+                    }
+
+                    File.Delete(path);
+                }
+            }
+        }
+
         public class ApplyChinaAndroid : IApply
         {
             public void Apply(PublishSetting setting)
             {
-                //删除文件夹
-                UniEditor.TryDeleteFolder("Assets/Plugins/Android");
-                UniEditor.TryDeleteFolder("Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid");
-                ImportModule("ChinaAndroid");
+                Debug.Log($"导入... {UniEditor.PackagePath_ChinaAndroid}");
+                ImportUnityPackage(UniEditor.PackagePath_ChinaAndroid);
+                var manifest_path = $"{UniEditor.PackagePath_ChinaAndroid}.manifest";
+                Debug.Log($"读取资源清单...{manifest_path}");
+                var manifest = ReadManifest(manifest_path);
+                Debug.Log($"清理多余文件...");
+                ClearFilesInDirectory("Assets/Plugins/Android", manifest);
+                ClearFilesInDirectory("Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid", manifest);
                 AssetDatabase.Refresh();
             }
         }

package/Editor/ExportModule.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using Sirenix.Utilities.Editor;
 using UnityEditor;
 using UnityEngine;
 
@@ -16,7 +17,7 @@ namespace TyphoonUnitySDK
         /// <summary>
         /// 导出ChinaAndroid模块
         /// </summary>
-        [MenuItem("TyphoonSDK/开发者/导出-ChinaAndroid")]
+        [MenuItem("TyphoonSDK/开发者/导出-ChinaAndroid.unitypackage")]
         public static void ExportChinaAndroid()
         {
             var manifest = new List<string>()
@@ -38,7 +39,7 @@ namespace TyphoonUnitySDK
                 return;
             }
 
-            ExportManifestToModule(manifest, "ChinaAndroid");
+            ExportUnityPackage(manifest, UniEditor.PackagePath_ChinaAndroid, out var detail);
         }
 
 
@@ -148,7 +149,7 @@ namespace TyphoonUnitySDK
             }
 
             var toFolder =
-                $"_TyphoonBackUp/{Path.GetFileNameWithoutExtension(folderRoot)}-{DateTime.Now.ToString("yyyyMMddhhmmss")}";
+                $".typhoonbackup/{Path.GetFileNameWithoutExtension(folderRoot)}-{DateTime.Now.ToString("yyyyMMddhhmmss")}";
             Debug.Log($"备份{folderRoot}-->{toFolder}");
             UniEditor.CopyFolder(folderRoot, toFolder);
         }
@@ -173,15 +174,14 @@ namespace TyphoonUnitySDK
                 UniEditor.CopyFolder(source, dest);
             }
         }
-        
-        
-        
+
+
         [MenuItem("TyphoonSDK/开发者/导出-常用打包配置.unitypackage")]
         public static void ExportUnityPackage()
         {
             var path = UniEditor.PackagePath_PublishSetting;
             var backup =
-                $"_TyphoonBackUp/{Path.GetFileNameWithoutExtension(path)}-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Path.GetExtension(path)}";
+                $".typhoonbackup/{Path.GetFileNameWithoutExtension(path)}-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Path.GetExtension(path)}";
             var dir = Path.GetDirectoryName(backup);
             UniEditor.CreateDirIfNotExist(dir);
 
@@ -205,7 +205,8 @@ namespace TyphoonUnitySDK
             Debug.Log($"导出项：{guids.Length}");
             AssetDatabase.SaveAssets();
             //Assets/Typhoon_Gen/TyphoonSDK/Editor/常用打包配置
-            AssetDatabase.ExportPackage("Assets/Typhoon_Gen/TyphoonSDK/Editor/常用打包配置", path, ExportPackageOptions.Recurse);
+            AssetDatabase.ExportPackage("Assets/Typhoon_Gen/TyphoonSDK/Editor/常用打包配置", path,
+                ExportPackageOptions.Recurse);
             AssetDatabase.Refresh();
             if (File.Exists(path))
             {
@@ -213,6 +214,78 @@ namespace TyphoonUnitySDK
                 EditorUtility.RevealInFinder(path);
             }
         }
-        
+
+
+        /// <summary>
+        /// 导出UnityPackage
+        /// </summary>
+        /// <param name="source">资源文件或文件夹路径</param>
+        /// <param name="savePath">保存的unitypackage路径</param>
+        /// <param name="manifest">导出的详细资源清单</param>
+        public static void ExportUnityPackage(List<string> source, string savePath, out HashSet<string> manifest)
+        {
+            manifest = new HashSet<string>();
+            //遍历获取所有的文件和文件夹
+            foreach (var path in source)
+            {
+                manifest.Add(ToUnityPath(path));
+                if (Directory.Exists(path))
+                {
+                    var files = Directory.GetFiles(path, "*", SearchOption.AllDirectories);
+                    foreach (var e in files)
+                    {
+                        manifest.Add(ToUnityPath(e));
+                    }
+                }
+            }
+
+
+            var backup =
+                $".typhoonbackup/{Path.GetFileNameWithoutExtension(savePath)}-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Path.GetExtension(savePath)}";
+            var manifestPath = $"{savePath}.manifest";
+            var manifest_backup = $"{backup}.manifest";
+            var dir = Path.GetDirectoryName(backup);
+            UniEditor.CreateDirIfNotExist(dir);
+            //备份unitypackage
+            if (File.Exists(savePath))
+            {
+                Debug.Log($"备份：{savePath}-->{backup}");
+                File.Copy(savePath, backup, true);
+            }
+
+            //备份清单
+            if (File.Exists(manifestPath))
+            {
+                Debug.Log($"备份：{manifestPath}-->{manifest_backup}");
+                File.Copy(manifestPath, manifest_backup, true);
+            }
+
+            AssetDatabase.SaveAssets();
+            dir = Path.GetDirectoryName(savePath);
+            UniEditor.CreateDirIfNotExist(dir);
+            AssetDatabase.SaveAssets();
+            Debug.Log($"导出:{savePath}");
+            AssetDatabase.ExportPackage(source.ToArray(), savePath, ExportPackageOptions.Recurse);
+            //导出清单
+            Debug.Log($"导出清单:{manifestPath}");
+            var sb = new StringBuilder();
+            foreach (var element in manifest)
+            {
+                sb.AppendLine(element);
+            }
+            File.WriteAllText(manifestPath, sb.ToString());
+            AssetDatabase.Refresh();
+            if (File.Exists(savePath))
+            {
+                Debug.Log("导出成功");
+                EditorUtility.RevealInFinder(savePath);
+            }
+        }
+
+
+        public static string ToUnityPath(string path)
+        {
+            return UniEditor.FullPathToAssetPath(path);
+        }
     }
 }

package/Editor/PublishWindow.cs

@@ -74,11 +74,21 @@ namespace TyphoonUnitySDK
         private void OnEnable()
         {
             ReloadSettings();
+            if (UniEditor.TryGetApplyHistory(out var match))
+            {
+                foreach (var setting in PublishSettings)
+                {
+                    if (setting.name == match)
+                    {
+                        _select = setting;
+                        break;
+                    }
+                }
+            }
         }
 
-        protected  void OnGUI()
+        protected void OnGUI()
         {
-            
             var temEnable = GUI.enabled;
             if (EditorApplication.isPlaying)
             {
@@ -122,24 +132,26 @@ namespace TyphoonUnitySDK
             rectToolbar.height = 22;
             GUILayout.BeginArea(rectToolbar);
             GUILayout.BeginHorizontal();
-            GUILayout.Label("发布配置", Styles.rbold_label,GUILayout.Width(110));
+            GUILayout.Label("发布配置", Styles.rbold_label, GUILayout.Width(110));
             GUILayout.Space(1);
             if (GUILayout.Button(new GUIContent(EditorIcons.icon_import, "导入常用配置"), Styles.rbutton,
-                    GUILayout.Width(40),GUILayout.Height(20)))
+                    GUILayout.Width(40), GUILayout.Height(20)))
             {
                 UniEditor.ImportPackage(UniEditor.PackagePath_PublishSetting);
             }
+
             GUILayout.Space(1);
             if (GUILayout.Button(new GUIContent(EditorIcons.icon_refresh, "刷新"), Styles.rbutton,
-                    GUILayout.Width(40),GUILayout.Height(20)))
+                    GUILayout.Width(40), GUILayout.Height(20)))
             {
                 ReloadSettings();
                 Repaint();
             }
+
             GUILayout.Space(1);
 
             if (GUILayout.Button(new GUIContent(EditorIcons.icon_extension, "更多"), Styles.rbutton,
-                    GUILayout.Width(40),GUILayout.Height(20)))
+                    GUILayout.Width(40), GUILayout.Height(20)))
             {
                 var menu = new GenericMenu();
                 menu.AddItem(new GUIContent("导入常用配置"), false,
@@ -153,13 +165,14 @@ namespace TyphoonUnitySDK
             rectSearch.y = rectToolbar.yMax;
             rectSearch.height = 22;
             InputTxtSearchSetting = GUI.TextField(rectSearch, InputTxtSearchSetting);
-            if(string.IsNullOrEmpty(InputTxtSearchSetting)){
-                GUI.Label(rectSearch,"搜索...",Styles.rlabel_italic);
+            if (string.IsNullOrEmpty(InputTxtSearchSetting))
+            {
+                GUI.Label(rectSearch, "搜索...", Styles.rlabel_italic);
             }
 
             /*绘制菜单栏*/
             var rectPos = rectLeftMenu;
-            rectPos.y = rectSearch.yMax+4;
+            rectPos.y = rectSearch.yMax + 4;
             rectPos.height = rectLeftMenu.yMax - rectPos.y;
             GUILayout.BeginArea(rectPos);
             rectPos.x = 0;
@@ -206,7 +219,7 @@ namespace TyphoonUnitySDK
                         var lockRect = rectItem;
                         lockRect.width = 60;
                         lockRect.x = rectItem.xMax - lockRect.width;
-                        GUI.Label(lockRect,"未开放",Styles.rlabel_italic);
+                        GUI.Label(lockRect, "未开放", Styles.rlabel_italic);
                     }
                 }
 
@@ -241,7 +254,7 @@ namespace TyphoonUnitySDK
             rectContent.height -= 8;
             rectContent.width -= 8;
             rectContent.center = rect.center;
-          
+
             if (_select == null)
             {
                 var tipRect = rectContent;
@@ -370,5 +383,6 @@ namespace TyphoonUnitySDK
 
             PublishSettings = hash;
         }
+        
     }
 }

package/Editor/UniEditor.cs

@@ -22,11 +22,22 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static string PackagePath_PublishSetting = $"{PathRoot}/Sources~/Package/常用打包配置.unitypackage";
 
+        /// <summary>
+        /// China Android 资源包
+        /// </summary>
+        public static string PackagePath_ChinaAndroid = $"{PathRoot}/Sources~/Package/ChinaAndroid.unitypackage";
+
+
         /// <summary>
         /// 开启Addressable模块支持
         /// </summary>
         public static readonly string DEFINE_TYPHOON_ADDRESSABLE_NAME = "TYPHOON_ADDRESSABLE";
 
+        /// <summary>
+        /// apply历史记录
+        /// </summary>
+        public static readonly string APPLY_HISTORY = "Temp/typhoon_apply_history.txt";
+
 
         /// <summary>
         /// 插件包根目录
@@ -324,14 +335,13 @@ namespace TyphoonUnitySDK
             {
                 return path;
             }
-
             path = Path.GetFullPath(path);
             path = path.Replace("\\", "/");
             var pp = Path.GetDirectoryName(Application.dataPath);
             pp = pp.Replace("\\", "/");
             pp += "/";
-            Debug.Log(pp);
-            Debug.Log(path);
+            // Debug.Log(pp);
+            // Debug.Log(path);
             return path.Replace(pp, "");
         }
 
@@ -447,5 +457,35 @@ namespace TyphoonUnitySDK
             return !string.IsNullOrEmpty(Preferences.Default.GradlePath) &&
                    File.Exists($"{Preferences.Default.GradlePath}/gradle");
         }
+
+
+        /// <summary>
+        /// 尝试获取apply历史记录
+        /// </summary>
+        public static bool TryGetApplyHistory(out string match)
+        {
+            match = default;
+            if (File.Exists(APPLY_HISTORY))
+            {
+                match = File.ReadAllText(APPLY_HISTORY);
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// 写入apply历史记录
+        /// </summary>
+        public static void WriteApplyHistory(PublishSetting setting)
+        {
+            var dir = Path.GetDirectoryName(APPLY_HISTORY);
+            if (!Directory.Exists(dir))
+            {
+                Directory.CreateDirectory(dir);
+            }
+
+            File.WriteAllText(APPLY_HISTORY, setting.name);
+        }
     }
 }

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

@@ -0,0 +1,13 @@
+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/AndroidManifest.xml
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/ChinaAndroidSdk.cs
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/ChinaAndroidSdk.cs.meta
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Editor.meta
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Resources.meta
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Editor/PublishChinaAndroidAAR.cs
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Editor/PublishChinaAndroidAAR.cs.meta
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Resources/TYPHOON_SDK_CHINA_ANDROID.prefab
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Resources/TYPHOON_SDK_CHINA_ANDROID.prefab.meta

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.16","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.18","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/Sources~/ChinaAndroid/Assets/Plugins/Android/AndroidManifest.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.typhoon.unity_launcher">
-    <application
-            android:icon="@mipmap/app_icon"
-            android:label="@string/app_name">
-        <activity
-                android:name="com.typhoon.unity_launcher.SplashActivity"
-                android:exported="true"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

package/Sources~/ChinaAndroid/Assets/Plugins/Android/AndroidManifest.xml.meta

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

package/Sources~/ChinaAndroid/Assets/Plugins/Android/libs/sdk_plug-release.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 5f94d89077b170a4381c90f201c26655
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Sources~/ChinaAndroid/Assets/Plugins/Android/libs/unity_app-release.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 3e00c1a6fc73e2b48860f75842aa381e
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Sources~/ChinaAndroid/Assets/Plugins/Android/libs/unity_launcher-release.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: ab28817e8c6ab0947a6b8454f8e576da
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Sources~/ChinaAndroid/Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/ChinaAndroidSdk.cs

@@ -1,154 +0,0 @@
-using System;
-
-namespace TyphoonUnitySDK
-{
-    /// <summary>
-    /// 国内安卓
-    /// </summary>
-    public class ChinaAndroidSdk : BaseSdk
-    {
-        public TyphoonSdkCallback CallbackInstance;
-        public AndroidInstance AndroidInstance;
-        //初始化
-        public override void OnCreate()
-        {
-            Log("on create china android sdk ...");
-            DontDestroyOnLoad(gameObject);
-            //创建回调
-            CallbackInstance = TyphoonSdkCallback.CreateInstance();
-            CallbackInstance.gameObject.name = "TYPHOON_SDK_CALL_BACK";
-            CallbackInstance.Initialize();
-            DontDestroyOnLoad(CallbackInstance.gameObject);
-            //创建android实例
-            AndroidInstance = AndroidInstance.CreateInstance();
-            AndroidInstance.gameObject.name = "TYPHOON_SDK_ANDROID_INSTANCE";
-            AndroidInstance.Initialize();
-            DontDestroyOnLoad(AndroidInstance.gameObject);
-            Log("on create china android sdk success");
-        }
-
-        #region 初始化SDK
-
-        public override void InitSdk(Action success, Action<string> fail)
-        {
-            AndroidInstance.CallWithSession(new SessionItem("initSdk", null, (res) =>
-            {
-                if (res == "ok")
-                {
-                    success?.Invoke();
-                }
-                else
-                {
-                    fail?.Invoke(res);
-                }
-            }));
-        }
-
-        #endregion
-
-        #region 登录
-
-        public override void Login(Action success, Action<string> fail)
-        {
-            AndroidInstance.CallWithSession(new SessionItem("login", null, (res) =>
-            {
-                if (res == "ok")
-                {
-                    success?.Invoke();
-                }
-                else
-                {
-                    fail?.Invoke(res);
-                }
-            }));
-        }
-
-        #endregion
-
-        #region 退出游戏
-
-        public override bool IsSupportExitGame()
-        {
-            return AndroidInstance.CallReturn<bool>("isSupportExitGame");
-        }
-
-        public override void ExitGame()
-        {
-            AndroidInstance.Call("exitGame");
-        }
-
-        #endregion
-
-        #region Banner
-
-        public override void ShowBanner(string scene, BannerPosition position)
-        {
-            AndroidInstance.Call("showBanner", scene, ((int)position));
-        }
-
-        public override void HideBanner(string scene)
-        {
-            AndroidInstance.Call("hideBanner", scene);
-        }
-
-        #endregion
-
-        #region 视频广告
-
-        public override void ShowVideo(string scene, Action success, Action<string> fail)
-        {
-            AndroidInstance.CallWithSession(new SessionItem("showVideo", new { scene = scene }, (res) =>
-            {
-                if (res == "ok")
-                {
-                    Log($"show video success scene:{scene}");
-                    success?.Invoke();
-                }
-                else
-                {
-                    Log($"show video fail {res} scene:{scene}");
-                    fail?.Invoke(res);
-                }
-            }));
-        }
-
-        #endregion
-
-        #region 插页广告
-
-        public override void ShowInters(string scene)
-        {
-            AndroidInstance.Call("showInters", scene);
-        }
-
-        #endregion
-
-        #region 悬浮ICON
-
-        public override void ShowFloatIcon(string scene, float screenXP, float screenYP)
-        {
-            AndroidInstance.Call("showFloatIcon", scene, screenXP, screenYP);
-        }
-
-        public override void HideFloatIcon(string scene)
-        {
-            AndroidInstance.Call("hideFloatIcon", scene);
-        }
-
-        #endregion
-
-        #region 原生模板
-
-        public override void ShowNative(string scene)
-        {
-            AndroidInstance.Call("showNative", scene);
-        }
-
-        public override void HideNative(string scene)
-        {
-            AndroidInstance.Call("hideNative", scene);
-        }
-
-        #endregion
-    }
-}

package/Sources~/ChinaAndroid/Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/ChinaAndroidSdk.cs.meta

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

package/Sources~/ChinaAndroid/Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Editor/PublishChinaAndroidAAR.cs

@@ -1,56 +0,0 @@
-using System;
-using System.IO;
-using UnityEditor;
-using UnityEditor.Android;
-using UnityEngine;
-
-namespace TyphoonUnitySDK
-{
-    /// <summary>
-    /// 发布流程-ChinaAndroidAAR
-    /// </summary>
-    public class PublishChinaAndroidAAR : IPublish
-    {
-        public PublishResult Publish(PublishSetting setting)
-        {
-            PublishResult result = new PublishResult();
-            //切换到工程模式
-            PublishTool.SwitchToProject();
-
-            if (!UniEditor.GradleIsMatch())
-            {
-                UniEditor.ShowMessageBox($"未配置gradle,去配置？", PreferencesWindow.Open);
-                return result;
-            }
-
-            var path = $".typhoonoutput/china_android_{DateTime.Now.ToString("yyyyMMddHHmmss")}";
-            if (!UniEditor.IsAsciiPath(path))
-            {
-                UniEditor.ShowMessageBox($"路径不符合要求，不支持中文路径：\n当前：{path}", null);
-                return result;
-            }
-
-
-            UniEditor.TryDeleteFolder("Assets/Plugins/Android");
-            AssetDatabase.Refresh();
-
-            PublishTool.InvokeOnPublishStart(setting);
-            //导出前执行
-            BuildPipeline.BuildPlayer(EditorBuildSettings.scenes, path, BuildTarget.Android, BuildOptions.None);
-            if (!Directory.Exists(path))
-            {
-                return result;
-            }
-
-            Debug.Log($"发布完成 {path}");
-            EditorUtility.RevealInFinder(path);
-            //生成发布bat
-            var gradle = Preferences.Default.GradlePath;
-            var publish_bat = $"{path}/publish.bat";
-            File.WriteAllText(publish_bat, $"{gradle}\\gradle assembleRelease --max-workers=8");
-            result.AndroidProj = path;
-            PublishTool.InvokeOnPublishEnd(setting, result);
-            return result;
-        }
-    }
-}

package/Sources~/ChinaAndroid/Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Editor/PublishChinaAndroidAAR.cs.meta

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

package/Sources~/ChinaAndroid/Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Editor.meta

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

package/Sources~/ChinaAndroid/Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Resources/TYPHOON_SDK_CHINA_ANDROID.prefab

@@ -1,45 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &9093766737953046255
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2274013749723012757}
-  - component: {fileID: 7218307239069338908}
-  m_Layer: 0
-  m_Name: TYPHOON_SDK_CHINA_ANDROID
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2274013749723012757
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9093766737953046255}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7218307239069338908
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9093766737953046255}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 740e1dabb1ce501408c63b39e066a580, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

package/Sources~/ChinaAndroid/Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Resources/TYPHOON_SDK_CHINA_ANDROID.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 6140310cc30ddbe45a698fbf0e5e06ae
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Sources~/ChinaAndroid/Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Resources.meta

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

package/Sources~/ChinaAndroid/Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid.meta

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