com.typhoon.unitysdk 1.0.36 → 1.0.38

package/Editor/ToolBox/CompressTextureTool/XCompressTool.cs.meta

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

package/Editor/ToolBox/CompressTextureTool.meta

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

package/Editor/ToolBox.meta

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

package/Editor/UniEditor.cs

@@ -641,11 +641,48 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static string ToUnityRelativePath(string path)
         {
+            if (string.IsNullOrEmpty(path))
+            {
+                return "";
+            }
+
             return Path.GetFullPath(path).Replace("/", "\\").Replace(
                     $"{Path.GetDirectoryName(Application.dataPath)}\\", "")
                 .Replace("\\", "/");
         }
 
+
+        /// <summary>
+        /// 反射获取有效的枚举
+        /// </summary>
+        public static T[] GetValidEnumValues<T>() where T : Enum
+        {
+            var type = typeof(T);
+            var match = new HashSet<string>();
+            var names = Enum.GetNames(typeof(T));
+            foreach (var element in names)
+            {
+                var fieldInfo = type.GetField(element);
+                // 检查特性是否废弃
+                if (fieldInfo.GetCustomAttributes(typeof(ObsoleteAttribute), false).Length > 0)
+                {
+                    continue;
+                }
+                else
+                {
+                    match.Add(fieldInfo.Name);
+                }
+            }
+
+            List<T> result = new List<T>();
+            foreach (var value in match)
+            {
+                result.Add((T)Enum.Parse(typeof(T), value));
+            }
+
+            return result.ToArray();
+        }
+
         // /// <summary>
         // /// 执行批处理
         // /// </summary>

package/Editor/VivoMiniConfig.cs

@@ -13,6 +13,7 @@ namespace TyphoonUnitySDK
     {
         //微信小游戏进阶设置
         private static bool _wxMiniConfigAdvanceFoldout = false;
+        private static Vector2 _scrollPrivacyPolicy;
 
         public static Dictionary<string, Func<VivoMiniConfig, bool>> OverrideDrawGUIConfig =
             new Dictionary<string, Func<VivoMiniConfig, bool>>()
@@ -40,8 +41,43 @@ namespace TyphoonUnitySDK
                 { nameof(VivoMiniConfig.VideoEnable), DrawProperty_VideoEnable },
                 { nameof(VivoMiniConfig.VideoPosId), DrawProperty_VideoPosId },
                 { nameof(VivoMiniConfig.VideoResetIntersCool), DrawProperty_VideoResetIntersCool },
+                { nameof(VivoMiniConfig.PrivacyPolicyFile), DrawProperty_PrivacyPolicy },
+                { nameof(VivoMiniConfig.AgeLevel), DrawProperty_AgeLevel },
             };
 
+        private static bool DrawProperty_AgeLevel(VivoMiniConfig arg)
+        {
+            GUILayout.Space(3);
+            GUILayout.BeginHorizontal();
+            GUILayout.Label("适龄提醒", GUILayout.Width(146));
+            if (GUILayout.Button(arg.AgeLevel.ToString(), "PopUp"))
+            {
+                var menu = new GenericMenu();
+                var options = UniEditor.GetValidEnumValues<AgeLevel>();
+                foreach (var option in options)
+                {
+                    menu.AddItem(new GUIContent(option.ToString()), false, () => { arg.AgeLevel = option; });
+                }
+
+                menu.ShowAsContext();
+            }
+
+            GUILayout.EndHorizontal();
+            return true;
+        }
+
+        private static bool DrawProperty_PrivacyPolicy(VivoMiniConfig arg)
+        {
+            GUILayout.Space(10);
+            GUILayout.Label("隐私政策", Styles.rbold_title);
+            GUILayout.BeginHorizontal();
+            GUILayout.Label("文案", GUILayout.Width(146));
+            arg.PrivacyPolicyFile =
+                EditorGUILayout.ObjectField(arg.PrivacyPolicyFile, typeof(TextAsset), false) as TextAsset;
+            GUILayout.EndHorizontal();
+            return true;
+        }
+
         private static bool DrawProperty_VideoResetIntersCool(VivoMiniConfig arg)
         {
             if (!arg.VideoEnable)
@@ -160,7 +196,10 @@ namespace TyphoonUnitySDK
             if (GUILayout.Button("选择", GUILayout.Width(60)))
             {
                 var file = EditorUtility.OpenFilePanel("请选择certificate.pem", Application.dataPath, "pem");
-                arg.CertificatePem = UniEditor.ToUnityRelativePath(file);
+                if (!string.IsNullOrEmpty(file))
+                {
+                    arg.CertificatePem = UniEditor.ToUnityRelativePath(file);
+                }
             }
 
             GUILayout.EndHorizontal();
@@ -192,8 +231,11 @@ namespace TyphoonUnitySDK
             if (GUILayout.Button("选择", GUILayout.Width(60)))
             {
                 var file = EditorUtility.OpenFilePanel("请选择private.pem", Application.dataPath, "pem");
-                //尝试转成相对路径
-                arg.PrivatePem = UniEditor.ToUnityRelativePath(file);
+                if (!string.IsNullOrEmpty(file))
+                {
+                    //尝试转成相对路径
+                    arg.PrivatePem = UniEditor.ToUnityRelativePath(file);
+                }
             }
 
             GUILayout.EndHorizontal();
@@ -274,7 +316,7 @@ namespace TyphoonUnitySDK
         private static bool DrawProperty_LoadBackground(VivoMiniConfig arg)
         {
             arg.LoadBackground =
-                (Texture)EditorGUILayout.ObjectField("加载背景(可选,默认纯黑)", arg.LoadBackground, typeof(Texture), false);
+                (Texture)EditorGUILayout.ObjectField("加载背景(推荐512*1024)", arg.LoadBackground, typeof(Texture), false);
             return true;
         }
 
@@ -421,6 +463,10 @@ namespace TyphoonUnitySDK
         public int VideoResetIntersCool = 40; //播放视频广告后x秒后不弹出插页广告,-1为不控制[number]
         public string VideoPosId = ""; //插屏广告位ID[string]
 
+        public TextAsset PrivacyPolicyFile; //隐私协议
+
+        public AgeLevel AgeLevel = AgeLevel.Age8; //适龄提醒
+
         public string GetFinalCDN()
         {
             var result = CDN.Replace("[版本号]", VersionCode.ToString());

package/Editor/dll/PNGCompressor.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 5809016988dc98846879befde3bf92bf
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/AgeLevel.cs

@@ -0,0 +1,12 @@
+namespace TyphoonUnitySDK
+{
+    /// <summary>
+    /// 适龄提醒 
+    /// </summary>
+    public enum AgeLevel
+    {
+        Age8 = 8,
+        Age12 = 12,
+        Age16 = 16,
+    }
+}

package/Runtime/AgeLevel.cs.meta

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

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.36","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.38","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"}}