com.typhoon.unitysdk 1.0.26 → 1.0.28

package/Editor/ApplyTool.cs

@@ -27,6 +27,7 @@ namespace TyphoonUnitySDK
             { AppChannel.WxMini, new ApplyWxMini() },
             { AppChannel.DouyinAndroid, new ApplyDouyinAndroidOrIOS() },
             { AppChannel.DouyinIOS, new ApplyDouyinAndroidOrIOS() },
+            { AppChannel.GooglePlay, new ApplyGooglePlay() },
         };
 
 
@@ -38,8 +39,7 @@ namespace TyphoonUnitySDK
             var done = SwitchPlatformTo(setting.BuildTarget);
             if (done)
             {
-                //写入apply 历史
-                UniEditor.WriteApplyHistory(setting);
+            
                 //修改参数
                 switch (setting.BuildTarget)
                 {
@@ -454,5 +454,25 @@ namespace TyphoonUnitySDK
                 AssetDatabase.Refresh();
             }
         }
+
+        /*google play*/
+        public class ApplyGooglePlay : IApply
+        {
+            public void Apply(PublishSetting setting)
+            {
+                Debug.Log($"导入... {UniEditor.PackagePath_GooglePlay}");
+                ImportUnityPackage(UniEditor.PackagePath_GooglePlay);
+                var manifest_path = $"{UniEditor.PackagePath_GooglePlay}.manifest";
+                Debug.Log($"读取资源清单...{manifest_path}");
+                var manifest = ReadManifest(manifest_path);
+                Debug.Log($"清理多余文件...");
+                foreach (var folder in MaybeFolder)
+                {
+                    ClearFilesInDirectory(folder, manifest);
+                }
+
+                AssetDatabase.Refresh();
+            }
+        }
     }
 }

package/Editor/ExportModule.cs

@@ -82,6 +82,26 @@ namespace TyphoonUnitySDK
             ExportUnityPackage(manifest, UniEditor.PackagePath_Douyin, out var detail);
         }
 
+        [MenuItem("TyphoonSDK/开发者/导出-GooglePlay.unitypackage")]
+        public static void ExportGooglePlay()
+        {
+            var manifest = new List<string>()
+            {
+                "Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay",
+            };
+            if (!MakeSureExport(manifest))
+            {
+                return;
+            }
+
+            if (!CheckMissFiles(manifest))
+            {
+                return;
+            }
+
+            ExportUnityPackage(manifest, UniEditor.PackagePath_GooglePlay, out var detail);
+        }
+
         /// <summary>
         /// 导出清单文件到模块
         /// </summary>

package/Editor/InspectorWindow.cs

@@ -0,0 +1,36 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    public class InspectorWindow : EditorWindow
+    {
+        private static Editor _bindEditor;
+
+        public static void Open(Editor editor, string title = null)
+        {
+            _bindEditor = editor;
+            var win = GetWindow<InspectorWindow>();
+            win.Show();
+
+            if (title == null)
+            {
+                title = _bindEditor.target.name;
+            }
+
+            win.titleContent = new GUIContent(title);
+        }
+
+        private void OnGUI()
+        {
+            if (_bindEditor == null)
+            {
+                Close();
+            }
+            else
+            {
+                _bindEditor.OnInspectorGUI();
+            }
+        }
+    }
+}

package/Editor/InspectorWindow.cs.meta

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

package/Editor/PreferencesWindow.cs

@@ -8,11 +8,6 @@ namespace TyphoonUnitySDK
 {
     public class PreferencesWindow : EditorWindow
     {
-        private static bool _preferenceFoldout = false;
-
-        private static bool _wxMiniConfigFoldout = false;
-
-
         private static Vector2 _scroll;
 
         [MenuItem("TyphoonSDK/选项", priority = 10000)]
@@ -24,7 +19,6 @@ namespace TyphoonUnitySDK
             win.Show();
         }
 
-
         protected void OnGUI()
         {
             var rect = new Rect(0, 0, position.width, position.height);

package/Editor/PublishProcess.cs

@@ -12,5 +12,6 @@ namespace TyphoonUnitySDK
         WxMini, //微信小游戏
         DouyinAndroid,//抖音android
         DouyinIOS,//抖音ios
+        GooglePlay,//google play
     }
 }

package/Editor/PublishTool.cs

@@ -24,7 +24,8 @@ namespace TyphoonUnitySDK
             { PublishProcess.ChinaAndroidAAR, "TyphoonUnitySDK.PublishChinaAndroidAAR" },
             { PublishProcess.WxMini, "TyphoonUnitySDK.PublishWxMini" },
             { PublishProcess.DouyinAndroid, "TyphoonUnitySDK.PublishDouyinAndroid" },
-            { PublishProcess.DouyinIOS, "TyphoonUnitySDK.PublishDouyinIOS" }
+            { PublishProcess.DouyinIOS, "TyphoonUnitySDK.PublishDouyinIOS" },
+            { PublishProcess.GooglePlay, "TyphoonUnitySDK.PublishGooglePlay" }
             
         };
 

package/Editor/PublishWindow.cs

@@ -11,7 +11,7 @@ namespace TyphoonUnitySDK
         private static HashSet<AppChannel> _LockChannel = new HashSet<AppChannel>()
         {
             AppChannel.ChinaIOS,
-            AppChannel.GooglePlay,
+            // AppChannel.GooglePlay,
             AppChannel.SeaIOS,
             // AppChannel.WxMini,
             AppChannel.VivoMini,
@@ -47,8 +47,6 @@ namespace TyphoonUnitySDK
                     return EditorIcons.icon_vivo;
                 case AppChannel.OppoMini:
                     return EditorIcons.icon_oppo;
-                default:
-                    return null;
             }
 
             return null;
@@ -221,7 +219,14 @@ namespace TyphoonUnitySDK
 
                     if (GUI.Button(rectItem, new GUIContent(setting.name, GetLogo(setting.Channel)), style))
                     {
+                        var change = _select != setting;
                         _select = setting;
+                        //写入apply 历史
+                        if (change)
+                        {
+                            // Debug.Log("写入历史");
+                            UniEditor.WriteApplyHistory(setting);
+                        }
                     }
 
                     if (_LockChannel.Contains(setting.Channel))
@@ -335,7 +340,6 @@ namespace TyphoonUnitySDK
                 rectNextBtn.x -= 2;
                 rectNextBtn.x -= rectNextBtn.width;
                 bool clickBuildAA = false;
-                var index = 0;
                 if (UniEditor.HasAddressableSupport())
                 {
                     clickBuildAA = GUI.Button(rectNextBtn, "构建AA", Styles.rbutton_bold);

package/Editor/{PublishVivoBatSettingInspector.cs → TempPublish/PublishVivoBatSettingInspector.cs}

@@ -129,6 +129,7 @@ namespace TyphoonUnitySDK
 
         /*修改config.java*/
         public void WriteConfigJava()
+        
         {
             var config =
                 $@"package com.typhoon.vivo_union;

package/Editor/{PublishVivoBatSettingWindow.cs → TempPublish/PublishVivoBatSettingWindow.cs}

@@ -35,7 +35,6 @@ namespace TyphoonUnitySDK
             }
         }
 
-
         protected void OnGUI()
         {
             var rect = new Rect(0, 0, position.width, position.height);

package/Editor/TempPublish/TempPublishGooglePlay.cs

@@ -0,0 +1,62 @@
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    public class TempPublishGooglePlay : ScriptableObject
+    {
+        private static string PATH = "Assets/Editor/TempPublishGooglePlay.asset";
+        
+        [Header("android发布项目路径")]
+        public string AndroidPublishProj;
+        
+        [Header("基础设置")]
+        public bool DebugMode=false;
+        public bool Portrait = true;
+        
+        [Header("包名设置")]
+        public string PackageName;
+        public string GameName;
+        public int Version;
+        public string VersionName;
+        public Texture Icon;
+        
+        [Header("firebase")] 
+        public TextAsset GoogleServiceJson;
+
+        [Header("Admob")] 
+        public string AdmobAppId;
+        public string IntersId;
+        public string VideoId;
+        public string BannerId;
+        public string NativeId;
+        
+
+        public static TempPublishGooglePlay _default = null;
+
+        public static TempPublishGooglePlay Default
+        {
+            get
+            {
+                if (_default == null)
+                {
+                    _default = AssetDatabase.LoadAssetAtPath<TempPublishGooglePlay>(PATH);
+                }
+
+                if (_default == null)
+                {
+                    UniEditor.CreateDirIfNotExist(Path.GetDirectoryName(PATH));
+                    _default = CreateInstance<TempPublishGooglePlay>();
+                    AssetDatabase.CreateAsset(_default, PATH);
+                    AssetDatabase.Refresh();
+                }
+
+                return _default;
+            }
+        }
+
+        
+
+    }
+}

package/Editor/TempPublish/TempPublishGooglePlay.cs.meta

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

package/Editor/TempPublish/TempPublishGooglePlayEditor.cs

@@ -0,0 +1,415 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    [CustomEditor(typeof(TempPublishGooglePlay))]
+    public class TempPublishGooglePlayEditor : Editor
+    {
+        [MenuItem("临时发布/发布google play")]
+        private static void Open()
+        {
+            InspectorWindow.Open(
+                Editor.CreateEditor(TempPublishGooglePlay.Default, typeof(TempPublishGooglePlayEditor)));
+        }
+
+        private TempPublishGooglePlay Target => target as TempPublishGooglePlay;
+
+        class ProjInfo
+        {
+            public string Path;
+            public long BuildTime;
+
+            public ProjInfo(string path, long buildTime)
+            {
+                Path = path;
+                BuildTime = buildTime;
+            }
+        }
+
+        public override void OnInspectorGUI()
+        {
+            base.OnInspectorGUI();
+            if (GUILayout.Button("保存配置", GUILayout.Height(44)))
+            {
+                EditorUtility.SetDirty(Target);
+                AssetDatabase.SaveAssets();
+            }
+
+            if (GUILayout.Button("一键发布", GUILayout.Height(44)))
+            {
+                UniEditor.ShowMessageBox("发布？", Publish);
+            }
+        }
+
+
+        private bool TryGetNearestUnityProj(out string path)
+        {
+            path = default;
+            var dir = $".typhoonoutput";
+            var directories = Directory.GetDirectories(dir);
+            var matches = new List<ProjInfo>();
+
+            foreach (var element in directories)
+            {
+                Debug.Log(element);
+                var name = Path.GetFileName(element);
+                Debug.Log(name);
+                if (name.StartsWith("google_play_"))
+                {
+                    var timeString = name.Replace("google_play_", "");
+                    if (long.TryParse(timeString, out var time))
+                    {
+                        Debug.Log($"加入：{element}");
+                        matches.Add(new ProjInfo(element, time));
+                    }
+                }
+            }
+
+            matches.Sort((a, b) => b.BuildTime.CompareTo(a.BuildTime));
+            if (matches.Count > 0)
+            {
+                path = matches.First().Path;
+                return true;
+            }
+
+            return false;
+        }
+
+
+        private void Publish()
+        {
+            if (!TryGetNearestUnityProj(out var unityProj))
+            {
+                UniEditor.ShowMessageBox("找不到匹配项目可以发布", null);
+                return;
+            }
+
+            if (!Directory.Exists(Target.AndroidPublishProj))
+            {
+                UniEditor.ShowMessageBox("AndroidPublishProj不可为空", null);
+                return;
+            }
+
+            Debug.Log("注入到打包工程...");
+            WriteAndroidManifestXml();
+            WriteGoogleServiceJson();
+            WriteConfigJava();
+            WriteIcon();
+            WriteUnityLibrary(unityProj);
+            WriteBuildGradle();
+            WriteStringsXml();
+            Debug.Log("处理完毕...");
+        }
+
+
+        private void WriteAndroidManifestXml()
+        {
+            var path = $@"{Target.AndroidPublishProj}\gplay\src\main\AndroidManifest.xml";
+            Debug.Log($"写入:{path}");
+            var android_manifest_xml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
+<manifest xmlns:android=""http://schemas.android.com/apk/res/android""
+    package=""com.typhoon.gplay"">
+
+    <application
+        android:name="".App""
+        android:icon=""@mipmap/app_icon""
+        android:label=""@string/app_name""
+        android:hardwareAccelerated=""true""
+        >
+        <!--admob应用id-->
+        <meta-data
+            android:name=""com.google.android.gms.ads.APPLICATION_ID""
+            android:value=""{Target.AdmobAppId}""/>
+
+        <activity
+            android:name="".LauncherActivity""
+            android:exported=""true""
+            android:configChanges=""mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection|density""
+            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>
+    <uses-permission android:name=""android.permission.INTERNET"" />
+    <uses-permission android:name=""android.permission.VIBRATE"" />
+</manifest>";
+
+            File.WriteAllText(path, android_manifest_xml);
+        }
+
+
+        private void WriteGoogleServiceJson()
+        {
+            var path = $@"{Target.AndroidPublishProj}\gplay\google-services.json";
+
+            if (Target.GoogleServiceJson != null)
+            {
+                Debug.Log($"写入：{path}");
+                var from = AssetDatabase.GetAssetPath(Target.GoogleServiceJson);
+                File.Copy(from, path, true);
+            }
+            else
+            {
+                if (File.Exists(path))
+                {
+                    Debug.Log($"删除：{path}");
+                    File.Delete(path);
+                }
+            }
+        }
+
+
+        private void WriteConfigJava()
+        {
+            var path = $@"{Target.AndroidPublishProj}\gplay\src\main\java\com\typhoon\gplay\Config.java";
+            var java = $@"package com.typhoon.gplay;
+
+/*打包配置*/
+public class Config {{
+
+
+    /*启动进入demo测试页/游戏场景*/
+    public static boolean LAUNCHER_DEMO = false;
+
+    /*Debug 模式开关*/
+    public static boolean DEBUG_MODE = {Target.DebugMode.ToString().ToLower()};
+
+    /*竖屏模式为true,横屏模式为false*/
+    public static boolean ORIENTATION_PORTRAIT = {Target.Portrait.ToString().ToLower()};;
+
+    /*admob插页*/
+    public static String ADMOB_INTERS_UNIT = ""{Target.IntersId}"";
+    /*admob激励视频*/
+    public static String ADMOB_VIDEO_UNIT = ""{Target.VideoId}"";
+    /*admob banner*/
+    public static String ADMOB_BANNER_UNIT = """";
+    /*admob 原生广告*/
+    public static String ADMOB_NATIVE_UNIT = """";
+
+}}
+";
+            Debug.Log($"写入：{path}");
+            File.WriteAllText(path, java);
+        }
+
+
+        private void WriteIcon()
+        {
+            var path = $@"{Target.AndroidPublishProj}\gplay\src\main\res\mipmap-mdpi\app_icon.png";
+            if (Target.Icon != null)
+            {
+                var from = AssetDatabase.GetAssetPath(Target.Icon);
+                Debug.Log($"写入：{path}");
+                File.Copy(from, path, true);
+            }
+        }
+
+        private void WriteUnityLibrary(string unityProj)
+        {
+            
+            var androidUnityLib = $@"{Target.AndroidPublishProj}\unityLibrary";
+            var unityLib = $"{unityProj}/unityLibrary";
+            if (Directory.Exists(unityLib))
+            {
+                Debug.Log("更换unitylib");
+                Directory.Delete(androidUnityLib,true);
+                UniEditor.CopyFolder(unityLib,androidUnityLib);
+            }
+
+            var xmlPath = $@"{androidUnityLib}\src\main\AndroidManifest.xml";
+            var xml = File.ReadAllText(xmlPath);
+            xml = xml.Replace("<intent-filter>", "");
+            xml = xml.Replace("<action android:name=\"android.intent.action.MAIN\" />", "");
+            xml = xml.Replace("<category android:name=\"android.intent.category.LAUNCHER\" />", "");
+            xml = xml.Replace("</intent-filter>", "");
+            Debug.Log($"写入:{xmlPath}");
+            File.WriteAllText(xmlPath, xml);
+            
+            // var xmlAndroid = $"{androidUnityLib}/src/main/AndroidManifest.xml";
+            // var xmlUnity = $"{unityLib}/src/main/AndroidManifest.xml";
+            //
+            // var map = new (string androidPath, string unityPath)[]
+            // {
+            //     //{unityProj}\unityLibrary
+            //     ($"{androidUnityLib}/libs", $"{unityLib}/libs"),
+            //     ($"{androidUnityLib}/src/main/assets", $"{unityLib}/src/main/assets"),
+            //     ($"{androidUnityLib}/src/main/java", $"{unityLib}/src/main/java"),
+            //     ($"{androidUnityLib}/src/main/jniLibs", $"{unityLib}/src/main/jniLibs"),
+            //   
+            // };
+            //
+            //
+            // foreach (var e in map)
+            // {
+            //     UniEditor.TryDeleteFolder(e.androidPath);
+            //     UniEditor.CopyFolder(e.unityPath, e.androidPath);
+            //     Debug.Log($"写入:{e.androidPath} ");
+            // }
+            //
+            // File.Copy(xmlUnity, xmlAndroid, true);
+            // Debug.Log($"复制:{xmlUnity}-->{xmlAndroid} ");
+            // var xmlPath = $@"{androidUnityLib}\src\main\AndroidManifest.xml";
+            // var xml = File.ReadAllText(xmlPath);
+            // xml = xml.Replace("<intent-filter>", "");
+            // xml = xml.Replace("<action android:name=\"android.intent.action.MAIN\" />", "");
+            // xml = xml.Replace("<category android:name=\"android.intent.category.LAUNCHER\" />", "");
+            // xml = xml.Replace("</intent-filter>", "");
+            // File.WriteAllText(xmlPath, xml);
+            // Debug.Log($"写入:{xmlPath}");
+            //
+            // var gradle = $@"{Target.AndroidPublishProj}\unityLibrary\build.gradle";
+            // var gradle_from = $"{unityLib}/build.gradle";
+            // Debug.Log($"写入:{gradle}");
+            // File.Copy(gradle_from,gradle,true);
+        }
+
+        private void WriteBuildGradle()
+        {
+            var path = $@"{Target.AndroidPublishProj}\gplay\build.gradle";
+            var gradle = $@"import java.text.SimpleDateFormat
+
+apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
+android {{
+    compileSdkVersion 33
+    buildToolsVersion '30.0.3'
+
+
+    compileOptions {{
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }}
+
+    /*签名配置*/
+    signingConfigs {{
+        release {{
+            def signDir = rootProject.file('sign')
+            keyAlias 'key0'
+            keyPassword '123456798'
+            storeFile file(signDir.getAbsolutePath() + '/fishing.jks')
+            storePassword '123456798'
+        }}
+
+        debug {{
+            def signDir = rootProject.file('sign')
+            keyAlias 'key0'
+            keyPassword '123456798'
+            storeFile file(signDir.getAbsolutePath() + '/fishing.jks')
+            storePassword '123456798'
+        }}
+    }}
+
+
+    defaultConfig {{
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode {Target.Version}
+        versionName '{Target.VersionName}'
+        applicationId '{Target.PackageName}'
+        consumerProguardFiles ""consumer-rules.pro""
+        ndk {{
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
+        }}
+    }}
+
+
+    //发布的包名
+    applicationVariants.all {{ variant ->
+        variant.outputs.all {{
+            def formattedDate = new SimpleDateFormat(""yyyyMMdd_HHmmss"").format(new Date())
+            def versionName = variant.versionName
+            def buildType = variant.buildType.name
+            def appName = variant.applicationId
+            outputFileName = ""${{appName}}_v${{versionName}}_${{buildType}}_${{formattedDate}}.apk""
+        }}
+    }}
+
+
+    sourceSets {{
+        main {{
+            jniLibs.srcDirs = ['libs']
+        }}
+    }}
+
+    aaptOptions {{
+        noCompress = ['.unity3d', '.ress', '.resource', '.obb', 'aa/catalog.json', 'aa/settings.json', 'aa/AddressablesLink/link.xml', '.bundle']
+        ignoreAssetsPattern = ""!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~""
+    }}
+
+    lintOptions {{
+        abortOnError false
+    }}
+
+    buildTypes {{
+        debug {{
+            minifyEnabled false
+            useProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', getDefaultProguardFile('proguard-android-optimize.txt')
+            signingConfig signingConfigs.debug
+            jniDebuggable true
+        }}
+        release {{
+            minifyEnabled false
+            useProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', getDefaultProguardFile('proguard-android-optimize.txt')
+            signingConfig signingConfigs.release
+
+        }}
+    }}
+
+    packagingOptions {{
+        doNotStrip '*/armeabi-v7a/*.so'
+        doNotStrip '*/arm64-v8a/*.so'
+    }}
+
+
+    bundle {{
+        language {{
+            enableSplit = false
+        }}
+        density {{
+            enableSplit = false
+        }}
+        abi {{
+            enableSplit = true
+        }}
+    }}
+
+}}
+
+dependencies {{
+    api fileTree(includes: ['*.jar', '*.aar'], dir: 'libs')
+    api project(':sdk_plug')
+    api project(':unity_app')
+    api platform('com.google.firebase:firebase-bom:32.2.3')
+    api 'com.google.firebase:firebase-analytics:21.3.0'
+    api 'com.google.android.gms:play-services-ads:21.3.0'
+}}";
+
+
+            Debug.Log($"写入:{path}");
+            File.WriteAllText(path, gradle);
+        }
+
+
+        private void WriteStringsXml()
+        {
+            var path = $@"{Target.AndroidPublishProj}\gplay\src\main\res\values\strings.xml";
+            var xml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
+<resources>
+  <string name=""app_name"">{Target.GameName}</string>
+  <string name=""game_view_content_description"">Game view</string>
+</resources>";
+            Debug.Log($"写入：{path}");
+            File.WriteAllText(path, xml);
+        }
+    }
+}

package/Editor/TempPublish/TempPublishGooglePlayEditor.cs.meta

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

package/Editor/{SkinsTexture.asset.meta → TempPublish.meta}

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: b483135a891a1bc4ea22f8cd1bc29431
-NativeFormatImporter:
+guid: 83630f12d2533a84cbd3a97b9503d2f4
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
-  mainObjectFileID: 11400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

package/Editor/UniEditor.cs

@@ -39,6 +39,11 @@ namespace TyphoonUnitySDK
         public static string PackagePath_Douyin = $"{PathRoot}/Sources~/Package/Douyin.unitypackage";
 
 
+        /// <summary>
+        /// google play资源包
+        /// </summary>
+        public static string PackagePath_GooglePlay = $"{PathRoot}/Sources~/Package/GooglePlay.unitypackage";
+
         /// <summary>
         /// Toast模块
         /// </summary>
@@ -53,7 +58,7 @@ namespace TyphoonUnitySDK
         /// <summary>
         /// apply历史记录
         /// </summary>
-        public static readonly string APPLY_HISTORY = "Temp/typhoon_apply_history.txt";
+        public static readonly string APPLY_HISTORY = ".typhoon/typhoon_sdk_apply_history.txt";
 
 
         /// <summary>
@@ -399,7 +404,7 @@ namespace TyphoonUnitySDK
                 sb.Append($".{current}");
                 return sb.ToString();
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 Debug.LogError("无法识别版本号格式");
             }

package/Runtime/BaseSdk.cs

@@ -39,6 +39,14 @@ namespace TyphoonUnitySDK
         {
         }
 
+
+        /*获取激励视频标记*/
+        public virtual bool GetVideoFlag()
+        {
+            return true;
+        }
+
+
         /*展示视频广告*/
         public virtual void ShowVideo(string scene, Action success, Action<string> fail)
         {

package/Runtime/Interface.cs

@@ -56,6 +56,7 @@ namespace TyphoonUnitySDK
     /*视频广告*/
     public interface IVideoAD
     {
+        bool GetVideoFlag();
         void ShowVideo(string scene, Action success, Action<string> fail);
     }
 

package/Runtime/SdkTestInUnity.cs

@@ -14,6 +14,7 @@ public class SdkTestInUnity : ScriptableObject
     [Header("开启交互式测试")] public bool OpenInteractive = true;
     [Header("交互式测试悬停关闭检测时间")] public float InteractiveHoldCloseTime = 1.2f;
     [Header("视频广告回调")] public bool ShowVideoResult = true;
+    [Header("视频广告flag")] public bool GetVideoFlagResult = true;
 
 
     private static SdkTestInUnity _instance = null;

package/Runtime/TyphoonSdk.cs

@@ -18,6 +18,7 @@ namespace TyphoonUnitySDK
             { AppChannel.WxMini, "TYPHOON_SDK_WX_MINI" }, //微信小游戏
             { AppChannel.DouyinAndroid, "TYPHOON_SDK_DOUYIN_MINI" }, //抖音小游戏
             { AppChannel.DouyinIOS, "TYPHOON_SDK_DOUYIN_MINI" }, //抖音小游戏
+            { AppChannel.GooglePlay, "TYPHOON_SDK_GOOGLE_PLAY" }, //GooglePlay
         };
 
         private ISdk _sdk;
@@ -139,6 +140,20 @@ namespace TyphoonUnitySDK
 
         #region 视频广告
 
+        /// <summary>
+        /// 获取视频广告加载标记
+        /// </summary>
+        public bool GetVideoFlag()
+        {
+            Log($"GetVideoFlag...");
+#if UNITY_EDITOR
+            return SdkTestInUnity.Instance.GetVideoFlagResult;
+#endif
+            var flag = _sdk.GetVideoFlag();
+            Log($"get video flag : {flag}");
+            return flag;
+        }
+
         /// <summary>
         /// 视频广告
         /// </summary>

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

@@ -0,0 +1,9 @@
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Editor.meta
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/GooglePlaySdk.cs
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/GooglePlaySdk.cs.meta
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Resources.meta
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Editor/PublishGooglePlay.cs
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Editor/PublishGooglePlay.cs.meta
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Resources/TYPHOON_SDK_GOOGLE_PLAY.prefab
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Resources/TYPHOON_SDK_GOOGLE_PLAY.prefab.meta

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.26","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"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.28","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"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}

package/Editor/SkinsTexture.asset

@@ -1,133 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b4b13ba135089db49ac6aa3f0aa8e564, type: 3}
-  m_Name: SkinsTexture
-  m_EditorClassIdentifier: 
-  Texture2D:
-  - Name: box@2x
-    Texture2D: {fileID: 0}
-  - Name: btn act@2x
-    Texture2D: {fileID: 0}
-  - Name: btn on@2x
-    Texture2D: {fileID: 0}
-  - Name: btn onact@2x
-    Texture2D: {fileID: 0}
-  - Name: btn@2x
-    Texture2D: {fileID: 0}
-  - Name: btn_active
-    Texture2D: {fileID: 0}
-  - Name: btn_blue_active
-    Texture2D: {fileID: 0}
-  - Name: btn_blue_hover
-    Texture2D: {fileID: 0}
-  - Name: btn_blue_normal
-    Texture2D: {fileID: 0}
-  - Name: btn_green_active
-    Texture2D: {fileID: 0}
-  - Name: btn_green_hover
-    Texture2D: {fileID: 0}
-  - Name: btn_green_normal
-    Texture2D: {fileID: 0}
-  - Name: btn_hover
-    Texture2D: {fileID: 0}
-  - Name: btn_normal
-    Texture2D: {fileID: 0}
-  - Name: btn_yellow_active
-    Texture2D: {fileID: 0}
-  - Name: btn_yellow_hover
-    Texture2D: {fileID: 0}
-  - Name: btn_yellow_normal
-    Texture2D: {fileID: 0}
-  - Name: buttonpulldown act@2x
-    Texture2D: {fileID: 0}
-  - Name: buttonpulldown@2x
-    Texture2D: {fileID: 0}
-  - Name: PopupWindowOff
-    Texture2D: {fileID: 0}
-  - Name: PopupWindowOff@2x
-    Texture2D: {fileID: 0}
-  - Name: PopupWindowOn
-    Texture2D: {fileID: 0}
-  - Name: PopupWindowOn@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll horiz left act@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll horiz left@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll horiz right act@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll horiz right@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll horiz thumb@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll horiz@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll vert down act@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll vert down@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll vert thumb@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll vert up act@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll vert up@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll vert@2x
-    Texture2D: {fileID: 0}
-  - Name: search focused@2x
-    Texture2D: {fileID: 0}
-  - Name: search@2x
-    Texture2D: {fileID: 0}
-  - Name: searchCancelButton@2x
-    Texture2D: {fileID: 0}
-  - Name: searchCancelButtonActive@2x
-    Texture2D: {fileID: 0}
-  - Name: searchCancelButtonOff@2x
-    Texture2D: {fileID: 0}
-  - Name: slider horiz@2x
-    Texture2D: {fileID: 0}
-  - Name: slider thumb act@2x
-    Texture2D: {fileID: 0}
-  - Name: slider thumb focus@2x
-    Texture2D: {fileID: 0}
-  - Name: slider thumb@2x
-    Texture2D: {fileID: 0}
-  - Name: slider vert@2x
-    Texture2D: {fileID: 0}
-  - Name: TextField focused@2x
-    Texture2D: {fileID: 0}
-  - Name: TextField@2x
-    Texture2D: {fileID: 0}
-  - Name: toggle act@2x
-    Texture2D: {fileID: 0}
-  - Name: toggle focus@2x
-    Texture2D: {fileID: 0}
-  - Name: toggle on act@2x
-    Texture2D: {fileID: 0}
-  - Name: toggle on focus@2x
-    Texture2D: {fileID: 0}
-  - Name: toggle on@2x
-    Texture2D: {fileID: 0}
-  - Name: toggle@2x
-    Texture2D: {fileID: 0}
-  - Name: toolbar button act on@2x
-    Texture2D: {fileID: 0}
-  - Name: toolbar button act@2x
-    Texture2D: {fileID: 0}
-  - Name: toolbar button on@2x
-    Texture2D: {fileID: 0}
-  - Name: toolbar button@2x
-    Texture2D: {fileID: 0}
-  - Name: toolbar popup@2x
-    Texture2D: {fileID: 0}
-  - Name: toolbar pulldown@2x
-    Texture2D: {fileID: 0}