com.typhoon.unitysdk 1.0.33 → 1.0.35

package/Editor/PluginModuleInstaller.cs.meta

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

package/Editor/PublishSetting.cs

@@ -96,6 +96,9 @@ public AndroidSdkVersions MinApiVersion = AndroidSdkVersions.AndroidApiLevel22;
         /*抖音小游戏拓展配置*/
         public bool DouyinGUIFoldout = true;
 
+        /*vivo小游戏拓展配置*/
+        public bool VivoMiniGUIFoldout = true;
+
 
         //使用配置
         public virtual void Apply()

package/Editor/PublishSettingGUIDrawer.cs

@@ -49,8 +49,26 @@ namespace TyphoonUnitySDK
                 { nameof(PublishSetting.PresetModify), DrawProperty_PresetModify },
                 { nameof(PublishSetting.WxMiniGUIFoldout), DrawProperty_WxMiniGUIFoldout },
                 { nameof(PublishSetting.DouyinGUIFoldout), DrawProperty_DouyinGUIFoldout },
+                { nameof(PublishSetting.VivoMiniGUIFoldout), DrawProperty_VivoMiniGUIFoldout },
             };
 
+        private static bool DrawProperty_VivoMiniGUIFoldout(PublishSetting arg)
+        {
+            if (arg.Channel != AppChannel.VivoMini)
+            {
+                return true;
+            }
+
+            GUILayout.Space(10);
+            arg.DouyinGUIFoldout = GUIDrawer.DrawFoldout("vivo小游戏", arg.DouyinGUIFoldout, GUILayout.Height(26));
+            if (arg.DouyinGUIFoldout)
+            {
+                VivoMiniConfigGUIDrawer.DrawGUI();
+            }
+
+            return true;
+        }
+
         /*绘制抖音小游戏GUI*/
         private static bool DrawProperty_DouyinGUIFoldout(PublishSetting arg)
         {
@@ -81,7 +99,7 @@ namespace TyphoonUnitySDK
             arg.WxMiniGUIFoldout = GUIDrawer.DrawFoldout("微信小游戏", arg.WxMiniGUIFoldout, GUILayout.Height(26));
             if (arg.WxMiniGUIFoldout)
             {
-                WxMiniConfigGUIDrawer.DrawWxMiniConfig();
+                WxMiniConfigGUIDrawer.DrawGUI();
             }
 
             return true;

package/Editor/PublishWindow.cs

@@ -14,7 +14,7 @@ namespace TyphoonUnitySDK
             // AppChannel.GooglePlay,
             AppChannel.SeaIOS,
             // AppChannel.WxMini,
-            AppChannel.VivoMini,
+            // AppChannel.VivoMini,
             AppChannel.OppoMini,
             // AppChannel.DouyinAndroid,
             // AppChannel.DouyinIOS,

package/Editor/UniEditor.cs

@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
 using UnityEditor;
 using UnityEngine;
+using Debug = UnityEngine.Debug;
 
 namespace TyphoonUnitySDK
 {
@@ -44,6 +46,12 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static string PackagePath_GooglePlay = $"{PathRoot}/Sources~/Package/GooglePlay.unitypackage";
 
+        /// <summary>
+        /// vivo mini 资源包
+        /// </summary>
+        public static string PackagePath_VivoMini = $"{PathRoot}/Sources~/Package/VivoMini.unitypackage";
+
+
         /// <summary>
         /// Toast模块
         /// </summary>
@@ -61,6 +69,23 @@ namespace TyphoonUnitySDK
         public static readonly string APPLY_HISTORY = ".typhoon/typhoon_sdk_apply_history.txt";
 
 
+        /// <summary>
+        /// 获取windows用户名文件夹
+        /// </summary>
+        public static string GetWindowsUserFolder()
+        {
+            string userFolder = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+            return userFolder;
+        }
+
+        /// <summary>
+        /// 获取Windows用户名
+        /// </summary>
+        public static string GetWindowsUserName()
+        {
+            return Environment.UserName;
+        }
+
         /// <summary>
         /// 插件包根目录
         /// </summary>
@@ -98,13 +123,6 @@ namespace TyphoonUnitySDK
             AssetDatabase.ImportPackage(path, interactive);
         }
 
-        // /// <summary>
-        // /// 日志输出
-        // /// </summary>
-        // public static void LogInfo(string content)
-        // {
-        //     Debug.Log($"<color=#3ac9f3>{content}</color>");
-        // }
 
         /// <summary>
         /// 清理宏定义
@@ -485,5 +503,144 @@ namespace TyphoonUnitySDK
 
             File.WriteAllText(path, sb.ToString());
         }
+
+        /// <summary>
+        /// 创建openssl签名
+        /// </summary>
+        public static void CreateOpensslKeystore()
+        {
+            if (!PluginModuleInstaller.IsInstallOpenssl())
+            {
+                ShowMessageBox("缺少openssl,去安装?", () => { PluginModuleInstaller.InstallOpensslAsync(); });
+            }
+            else
+            {
+                var pluginInfo = PluginModuleInstaller.GetPluginInfo(PluginModuleInstaller.PluginNames.Openssl);
+                //删除旧签名文件
+                var private_pem = $"{pluginInfo.RootPath}/bin/private.pem";
+                var certificate_pem = $"{pluginInfo.RootPath}/bincertificate.pem";
+                if (File.Exists(private_pem))
+                {
+                    File.Delete(private_pem);
+                }
+
+                if (File.Exists(certificate_pem))
+                {
+                    File.Delete(certificate_pem);
+                }
+
+                //创建签名批处理执行文件
+                var bat = $"sign/create-sign.bat";
+                CreateDirIfNotExist(Path.GetDirectoryName(bat));
+                var code = File.ReadAllText($"{PathRoot}/Editor/bats/create-sign.bat");
+                var bin = $"{pluginInfo.RootPath}/bin";
+                bin = bin.Replace("/", "\\");
+                var conf = $"{pluginInfo.RootPath}/openssl.cnf";
+                conf = conf.Replace("/", "\\");
+                code = code.Replace("$OPENSSL_BIN$", bin);
+                code = code.Replace("$OPENSSL_CONF$", conf);
+                File.WriteAllText(bat, code);
+                if (!File.Exists(bat))
+                {
+                    throw new Exception($"创建{bat}失败");
+                }
+                else
+                {
+                    RunBat(bat);
+                    // if (File.Exists(private_pem) && File.Exists(certificate_pem))
+                    // {
+                    //     var private_pem_to = $"sign/{Path.GetFileName(private_pem)}";
+                    //     var certificate_pem_to = $"sign/{Path.GetFileName(certificate_pem)}";
+                    //     File.Copy(private_pem, private_pem_to, true);
+                    //     File.Copy(certificate_pem, certificate_pem_to, true);
+                    //     Debug.Log("生成成功");
+                    // }
+                    // else
+                    // {
+                    //     throw new Exception($"生成失败，找不到：{private_pem} 或 {certificate_pem}");
+                    // }
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 执行批处理
+        /// </summary>
+        public static void RunBat(string path, string args = "", Action complete = null)
+        {
+            // var bat = Path.GetFullPath(path);
+            // var dir = Path.GetDirectoryName(bat);
+            // using (Process p = new Process())
+            // {
+            //     p.StartInfo.FileName = bat;
+            //     p.StartInfo.Arguments = args;
+            //     p.StartInfo.CreateNoWindow = false;
+            //     p.StartInfo.UseShellExecute = false;
+            //     p.StartInfo.RedirectStandardOutput = true;
+            //     p.StartInfo.WorkingDirectory = dir;
+            //     p.Start();
+            //     p.WaitForExit();
+            //     UnityEngine.Debug.Log(p.StandardOutput.ReadToEnd());
+            //     p.Close();
+            //     complete?.Invoke();
+            // }
+
+
+            using (var process = Process.Start("explorer", $"\"{Path.GetFullPath(path)}\" {args}"))
+            {
+            }
+        }
+
+
+        /// <summary>
+        /// 执行批处理
+        /// </summary>
+        public static void Run(string batPath, params string[] args)
+        {
+            //获取批处理
+            if (!File.Exists(batPath))
+            {
+                throw new Exception($"丢失 {batPath}");
+            }
+
+            string inputArg = string.Empty;
+            if (args != null)
+            {
+                StringBuilder sb = new StringBuilder();
+                foreach (var element in args)
+                {
+                    sb.Append(element);
+                    sb.Append(',');
+                }
+
+                inputArg = sb.ToString();
+                if (inputArg.EndsWith(","))
+                {
+                    inputArg.Remove(inputArg.Length - 1, 1);
+                }
+            }
+
+            FileInfo info = new FileInfo(batPath);
+            batPath = info.FullName;
+            try
+            {
+                using (Process proc = new Process())
+                {
+                    proc.StartInfo.FileName = batPath;
+                    proc.StartInfo.WorkingDirectory = info.Directory.FullName;
+                    if (inputArg.Length > 0)
+                    {
+                        proc.StartInfo.Arguments = inputArg;
+                    }
+
+                    proc.Start();
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("Exception Occurred :{0},{1}", ex.Message, ex.StackTrace.ToString());
+            }
+        }
     }
 }

package/Editor/VivoMiniConfig.cs

@@ -0,0 +1,301 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    /*微信小游戏配置GUI绘制*/
+    public static class VivoMiniConfigGUIDrawer
+    {
+        //微信小游戏进阶设置
+        private static bool _wxMiniConfigAdvanceFoldout = false;
+
+        public static Dictionary<string, Func<VivoMiniConfig, bool>> OverrideDrawGUIConfig =
+            new Dictionary<string, Func<VivoMiniConfig, bool>>()
+            {
+                { "m_Script", DrawProperty_m_Script },
+                { nameof(VivoMiniConfig.PackageName), DrawProperty_PackageName },
+                { nameof(VivoMiniConfig.GameName), DrawProperty_GameName },
+                { nameof(VivoMiniConfig.GameIcon), DrawProperty_GameIcon },
+                { nameof(VivoMiniConfig.LoadBackground), DrawProperty_LoadBackground },
+                { nameof(VivoMiniConfig.ScreenOrientation), DrawProperty_ScreenOrientation },
+                { nameof(VivoMiniConfig.LimitFps), DrawProperty_LimitFps },
+                { nameof(VivoMiniConfig.FrameRate), DrawProperty_FrameRate },
+                { nameof(VivoMiniConfig.VersionName), DrawProperty_VersionName },
+                { nameof(VivoMiniConfig.VersionCode), DrawProperty_VersionCode },
+                { nameof(VivoMiniConfig.CDN), DrawProperty_CDN },
+                { nameof(VivoMiniConfig.PrivatePem), DrawProperty_PrivatePem },
+                { nameof(VivoMiniConfig.CertificatePem), DrawProperty_CertificatePem },
+            };
+
+        private static bool DrawProperty_CertificatePem(VivoMiniConfig arg)
+        {
+            GUILayout.BeginHorizontal();
+            arg.CertificatePem = EditorGUILayout.TextField("certificate.pem", arg.CertificatePem);
+            if (GUILayout.Button("选择", GUILayout.Width(60)))
+            {
+                var file = EditorUtility.OpenFilePanel("请选择certificate.pem", Application.dataPath, ".pem");
+                arg.CertificatePem = file;
+            }
+
+            GUILayout.EndHorizontal();
+            GUIDrawer.DrawKeynotes("温馨提示：签名文件记得做好备份，后续上架需要保持签名一致");
+            GUILayout.Label("", GUILayout.Height(26));
+            var last = GUILayoutUtility.GetLastRect();
+            var center = last.center;
+            var btnNewRect = last;
+            btnNewRect.width = 100;
+            btnNewRect.height -= 4;
+            btnNewRect.center = center;
+            btnNewRect.x = last.xMax - btnNewRect.width - 2;
+            if (GUI.Button(btnNewRect, "创建签名", Styles.rbutton_bold))
+            {
+                //创建openssl 签名
+                UniEditor.CreateOpensslKeystore();
+            }
+
+            return true;
+        }
+
+        private static bool DrawProperty_PrivatePem(VivoMiniConfig arg)
+        {
+            GUILayout.Space(10);
+
+            GUILayout.Label("签名", Styles.rbold_title);
+            GUILayout.BeginHorizontal();
+            arg.PrivatePem = EditorGUILayout.TextField("private.pem", arg.PrivatePem);
+            if (GUILayout.Button("选择", GUILayout.Width(60)))
+            {
+                var file = EditorUtility.OpenFilePanel("请选择private.pem", Application.dataPath, ".pem");
+                arg.PrivatePem = file;
+            }
+
+            GUILayout.EndHorizontal();
+            return true;
+        }
+
+        private static bool DrawProperty_VersionCode(VivoMiniConfig arg)
+        {
+            arg.VersionCode = EditorGUILayout.IntField("版本号", arg.VersionCode);
+            GUILayout.Label("", GUILayout.Height(24));
+            var last = GUILayoutUtility.GetLastRect();
+            var rectBtn = last;
+            rectBtn.width = 120;
+            rectBtn.y += 2;
+            rectBtn.x = last.xMax - rectBtn.width;
+            rectBtn.x -= 2;
+            if (GUI.Button(rectBtn, "自动版本号", Styles.rbutton_bold))
+            {
+                arg.VersionCode += 1;
+                try
+                {
+                    var elements = arg.VersionName.Split('.').ToList();
+                    var num = int.Parse(elements.Last());
+                    num += 1;
+                    elements[elements.Count - 1] = num.ToString();
+                    var versionName = new StringBuilder();
+                    for (var i = 0; i < elements.Count; i++)
+                    {
+                        var e = elements[i];
+                        versionName.Append(e);
+                        if (i != elements.Count - 1)
+                        {
+                            versionName.Append(".");
+                        }
+                    }
+
+                    arg.VersionName = versionName.ToString();
+                }
+                catch (Exception e)
+                {
+                    arg.VersionName = "0.0.1";
+                }
+
+                GUI.FocusControl("");
+            }
+
+            return true;
+        }
+
+        private static bool DrawProperty_VersionName(VivoMiniConfig arg)
+        {
+            GUILayout.Space(10);
+            GUILayout.Label("版本信息", Styles.rbold_title);
+            arg.VersionName = EditorGUILayout.TextField("版本名", arg.VersionName);
+            return true;
+        }
+
+        private static bool DrawProperty_FrameRate(VivoMiniConfig arg)
+        {
+            if (!arg.LimitFps)
+            {
+                return true;
+            }
+
+            arg.FrameRate = EditorGUILayout.IntSlider("目标FPS", arg.FrameRate, 30, 60);
+            return true;
+        }
+
+        private static bool DrawProperty_LimitFps(VivoMiniConfig arg)
+        {
+            GUILayout.BeginHorizontal();
+            GUILayout.Label("限制帧率（偶发动画抖动可降低帧率到30）", GUILayout.Width(260));
+            GUIDrawer.DrawPopUpToggle(arg.LimitFps, (b) => { arg.LimitFps = b; });
+            GUILayout.EndHorizontal();
+            return true;
+        }
+
+        private static bool DrawProperty_LoadBackground(VivoMiniConfig arg)
+        {
+            arg.LoadBackground =
+                (Texture)EditorGUILayout.ObjectField("加载背景(可选)", arg.LoadBackground, typeof(Texture), false);
+            return true;
+        }
+
+        private static bool DrawProperty_GameIcon(VivoMiniConfig arg)
+        {
+            arg.GameIcon =
+                (Texture)EditorGUILayout.ObjectField("游戏ICON (<100K)(可选)", arg.GameIcon, typeof(Texture), false);
+            return true;
+        }
+
+        private static bool DrawProperty_GameName(VivoMiniConfig arg)
+        {
+            arg.GameName = EditorGUILayout.TextField("游戏名 (问运营)", arg.GameName);
+            return true;
+        }
+
+        private static bool DrawProperty_PackageName(VivoMiniConfig arg)
+        {
+            arg.PackageName = EditorGUILayout.TextField("包名 (问运营)", arg.PackageName);
+            return true;
+        }
+
+        private static bool DrawProperty_m_Script(VivoMiniConfig arg)
+        {
+            var tmpEnable = GUI.enabled;
+            GUI.enabled = true;
+            GUILayout.Space(6);
+            GUIDrawer.DrawKeynotes("①支持Unity版本：2019，2020，2021(推荐，支持ASTC压缩，坑最少)");
+            GUIDrawer.DrawKeynotes("②需要隐私协议，适龄提醒，详情问运营同学");
+            GUIDrawer.DrawKeynotes("③webgl不支持多线程，修改代码进行适配");
+            GUILayout.Space(6);
+            GUI.enabled = tmpEnable;
+            return true;
+        }
+
+        private static bool DrawProperty_CDN(VivoMiniConfig arg)
+        {
+            GUILayout.Space(10);
+            GUILayout.BeginHorizontal();
+            arg.CDN = EditorGUILayout.TextField("CDN地址 (后台配白名单)", arg.CDN);
+            GUILayout.EndHorizontal();
+            GUIDrawer.DrawKeynotes("支持与自定义变量，版本号拼接，填入'[版本号]'或'[变量名]'使用");
+            GUIDrawer.DrawKeynotes($"最终地址：{arg.GetFinalCDN()}");
+            return true;
+        }
+
+        private static bool DrawProperty_ScreenOrientation(VivoMiniConfig arg)
+        {
+            GUILayout.BeginHorizontal();
+            GUILayout.Label("屏幕朝向", GUILayout.Width(146));
+            if (GUILayout.Button(arg.ScreenOrientation == Orientation.Portrait ? "竖屏" : "横屏", "PopUp"))
+            {
+                var menu = new GenericMenu();
+                menu.AddItem(new GUIContent("竖屏"), false, () =>
+                {
+                    arg.ScreenOrientation = Orientation.Portrait;
+                    arg.Save();
+                });
+                menu.AddItem(new GUIContent("横屏"), false, () =>
+                {
+                    arg.ScreenOrientation = Orientation.Landscape;
+                    arg.Save();
+                });
+                menu.ShowAsContext();
+            }
+
+            GUILayout.EndHorizontal();
+            return true;
+        }
+
+        public static void DrawGUI()
+        {
+            var config = VivoMiniConfig.Default;
+            GUIDrawer.DrawProperty(config, (property) =>
+            {
+                if (OverrideDrawGUIConfig.TryGetValue(property, out var match))
+                {
+                    return match.Invoke(config);
+                }
+
+                return false;
+            });
+        }
+    }
+
+    /// <summary>
+    /// vivo mini 参数
+    /// </summary>
+    public class VivoMiniConfig : ScriptableObject
+    {
+        private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/VivoMiniConfig.asset";
+
+        private static VivoMiniConfig _instance = null;
+
+        public static VivoMiniConfig Default
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = AssetDatabase.LoadAssetAtPath<VivoMiniConfig>(ConfigPath);
+                }
+
+                if (_instance == null)
+                {
+                    _instance = CreateInstance<VivoMiniConfig>();
+                    var folder = Path.GetDirectoryName(ConfigPath);
+                    if (!Directory.Exists(folder))
+                    {
+                        Directory.CreateDirectory(folder);
+                        AssetDatabase.Refresh();
+                    }
+
+                    AssetDatabase.CreateAsset(_instance, ConfigPath);
+                }
+
+                return _instance;
+            }
+        }
+
+        public string PackageName = ""; //包名
+        public string GameName = ""; //游戏名
+        public Texture GameIcon; //logo
+        public Texture LoadBackground; //加载背景
+        public Orientation ScreenOrientation = Orientation.Portrait; //屏幕朝向
+        public bool LimitFps = false;
+        public int FrameRate = 60;
+        public string PrivatePem = "";
+        public string CertificatePem = "";
+        public string VersionName = "0.0.1"; //版本名
+        public int VersionCode = 1; //版本号
+        public string CDN = "https://xxx.xx.xx";
+
+        public string GetFinalCDN()
+        {
+            var result = CDN.Replace("[版本号]", VersionCode.ToString());
+            return VariablePreset.Default.ParserToString(result);
+        }
+
+        public void Save()
+        {
+            EditorUtility.SetDirty(this);
+            AssetDatabase.SaveAssets();
+        }
+    }
+}

package/Editor/VivoMiniConfig.cs.meta

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

package/Editor/WxMiniConfig.cs

@@ -47,7 +47,7 @@ namespace TyphoonUnitySDK
             var tmpEnable = GUI.enabled;
             GUI.enabled = true;
             GUILayout.Space(6);
-            GUIDrawer.DrawKeynotes("①推荐Unity版本：2019，2020，2021");
+            GUIDrawer.DrawKeynotes("①支持Unity版本：2019，2020，2021(推荐，支持ASTC压缩，坑最少)");
             GUIDrawer.DrawKeynotes("②为EventSystem加上WxMiniTouchInputSupport组件，用于支持多点触控");
             GUILayout.Space(6);
             GUI.enabled = tmpEnable;
@@ -66,6 +66,7 @@ namespace TyphoonUnitySDK
 
         private static bool DrawProperty_CDN(WxMiniConfig arg)
         {
+            GUILayout.Space(10);
             GUILayout.BeginHorizontal();
             arg.CDN = EditorGUILayout.TextField("CDN地址 (后台配白名单)", arg.CDN);
             GUILayout.EndHorizontal();
@@ -127,17 +128,17 @@ namespace TyphoonUnitySDK
         {
             GUILayout.BeginHorizontal();
             GUILayout.Label("屏幕朝向", GUILayout.Width(146));
-            if (GUILayout.Button(arg.ScreenOrientation == WxMiniConfig.Orientation.Portrait ? "竖屏" : "横屏", "PopUp"))
+            if (GUILayout.Button(arg.ScreenOrientation == Orientation.Portrait ? "竖屏" : "横屏", "PopUp"))
             {
                 var menu = new GenericMenu();
                 menu.AddItem(new GUIContent("竖屏"), false, () =>
                 {
-                    arg.ScreenOrientation = WxMiniConfig.Orientation.Portrait;
+                    arg.ScreenOrientation = Orientation.Portrait;
                     arg.Save();
                 });
                 menu.AddItem(new GUIContent("横屏"), false, () =>
                 {
-                    arg.ScreenOrientation = WxMiniConfig.Orientation.Landscape;
+                    arg.ScreenOrientation = Orientation.Landscape;
                     arg.Save();
                 });
                 menu.ShowAsContext();
@@ -160,7 +161,7 @@ namespace TyphoonUnitySDK
             return true;
         }
 
-        public static void DrawWxMiniConfig()
+        public static void DrawGUI()
         {
             var config = WxMiniConfig.Default;
             GUIDrawer.DrawProperty(config, (property) =>
@@ -235,23 +236,11 @@ namespace TyphoonUnitySDK
         }
 
 
-        /// <summary>
-        /// 朝向
-        /// </summary>
-        public enum Orientation
-        {
-            //横屏
-            Portrait,
-
-            //竖屏
-            Landscape,
-
-            LandscapeLeft,
-            LandscapeRight,
-        }
-
         [Header("基础设置")] public string AppId = "";
         public string ProjectName = "";
+        [Header("广告参数(不填不开启)")] public string BannerAdUnit = "";
+        public string IntersAdUnit = "";
+        public string VideoAdUnit = "";
         public string CDN = "https://xxx.xxx.xxx";
         public Orientation ScreenOrientation = Orientation.Portrait;
         public int MemorySize = 256;