com.typhoon.unitysdk 1.0.20 → 1.0.23

package/Editor/ApplyTool.cs

@@ -25,6 +25,8 @@ namespace TyphoonUnitySDK
             { AppChannel.ChinaAndroid, new ApplyChinaAndroid() },
             { AppChannel.Test, new ApplyTest() },
             { AppChannel.WxMini, new ApplyWxMini() },
+            { AppChannel.DouyinAndroid, new ApplyDouyinAndroidOrIOS() },
+            { AppChannel.DouyinIOS, new ApplyDouyinAndroidOrIOS() },
         };
 
 
@@ -67,12 +69,14 @@ namespace TyphoonUnitySDK
                 //保存所有配置
                 setting.Save();
                 WxMiniConfig.Default.Save();
+                DouyinConfig.Default.Save();
                 InvokeOnApplyStart(setting);
                 if (!Applies.TryGetValue(setting.Channel, out var match))
                 {
                     Debug.LogError($"未处理Apply:{setting.Channel}");
                     return;
                 }
+
                 match.Apply(setting);
                 InvokeOnApplyEnd(setting);
             }
@@ -248,6 +252,12 @@ namespace TyphoonUnitySDK
             AppConfigAsset.Instance.Version = setting.VersionString;
             AppConfigAsset.Instance.VersionType = setting.VersionType;
             AppConfigAsset.Instance.PublishTime = DateTime.Now.ToString("yyyyMMddHHmmss");
+
+            //写入抖音小游戏参数
+            AppConfigAsset.Instance.DouyinVideoId = DouyinConfig.Default.VideoId;
+            AppConfigAsset.Instance.DouyinIntersId = DouyinConfig.Default.IntersId;
+            AppConfigAsset.Instance.DouyinBannerId = DouyinConfig.Default.BannerId;
+
             EditorUtility.SetDirty(AppConfigAsset.Instance);
             AssetDatabase.SaveAssets();
         }
@@ -364,6 +374,7 @@ namespace TyphoonUnitySDK
             "Assets/Typhoon_Gen/TyphoonSDK/Runtime",
             "Assets/WX-WASM-SDK-V2",
             "Assets/WebGLTemplates",
+            "Assets/Plugins/ByteGame",
         };
 
 
@@ -423,5 +434,25 @@ namespace TyphoonUnitySDK
                 AssetDatabase.Refresh();
             }
         }
+
+        /*抖音android,IOS*/
+        public class ApplyDouyinAndroidOrIOS : IApply
+        {
+            public void Apply(PublishSetting setting)
+            {
+                Debug.Log($"导入... {UniEditor.PackagePath_Douyin}");
+                ImportUnityPackage(UniEditor.PackagePath_Douyin);
+                var manifest_path = $"{UniEditor.PackagePath_Douyin}.manifest";
+                Debug.Log($"读取资源清单...{manifest_path}");
+                var manifest = ReadManifest(manifest_path);
+                Debug.Log($"清理多余文件...");
+                foreach (var folder in MaybeFolder)
+                {
+                    ClearFilesInDirectory(folder, manifest);
+                }
+
+                AssetDatabase.Refresh();
+            }
+        }
     }
 }

package/Editor/DouyinConfig.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace TyphoonUnitySDK
+{
+    /*抖音小游戏配置GUI绘制*/
+    public static class DouyinConfigGUIDrawer
+    {
+        public static Dictionary<string, Func<DouyinConfig, bool>> OverrideDrawGUIFunc =
+            new Dictionary<string, Func<DouyinConfig, bool>>()
+            {
+                { "m_Script", DrawProperty_m_Script },
+                { nameof(DouyinConfig.AppId), DrawProperty_AppId },
+                { nameof(DouyinConfig.VideoId), DrawProperty_VideoId },
+                { nameof(DouyinConfig.IntersId), DrawProperty_IntersId },
+                { nameof(DouyinConfig.ApkName), DrawProperty_ApkName },
+            };
+
+
+        private static bool DrawProperty_ApkName(DouyinConfig arg)
+        {
+            arg.ApkName = EditorGUILayout.TextField("apk文件名", arg.ApkName);
+            return true;
+        }
+
+
+        private static bool DrawProperty_IntersId(DouyinConfig arg)
+        {
+            arg.IntersId = EditorGUILayout.TextField("插页广告ID", arg.IntersId);
+            return true;
+        }
+
+        private static bool DrawProperty_VideoId(DouyinConfig arg)
+        {
+            arg.VideoId = EditorGUILayout.TextField("视频广告ID", arg.VideoId);
+            return true;
+        }
+
+        private static bool DrawProperty_AppId(DouyinConfig arg)
+        {
+            arg.AppId = EditorGUILayout.TextField("AppId", arg.AppId);
+            return true;
+        }
+
+
+        private static bool DrawProperty_m_Script(DouyinConfig arg)
+        {
+            var tmpEnable = GUI.enabled;
+            GUI.enabled = true;
+            GUILayout.Space(6);
+            GUIDrawer.DrawKeynotes("①仅支持Unity版本：2019.4.35(逐步放弃)，2021.3.14（最优，支持ASTC压缩，可减少Webgl运行消耗）");
+            GUIDrawer.DrawKeynotes("    详细以官方文档地址为准,链接如下：");
+            var url = "https://bytedance.feishu.cn/docx/doxcnTTjZHp8J6HzdrSbWu1aK5b";
+            GUIDrawer.DrawUrlLink($"        {url}", () => Application.OpenURL(url));
+            GUIDrawer.DrawKeynotes("②需要接入录屏分享功能");
+            GUIDrawer.DrawKeynotes("③使用指定广告图标，链接如下:");
+            url = "https://developer.open-douyin.com/docs/resource/zh-CN/mini-game/operation1/advertise/norms";
+            GUIDrawer.DrawUrlLink($"        {url}", () => Application.OpenURL(url));
+            GUILayout.Space(6);
+            GUI.enabled = tmpEnable;
+            return true;
+        }
+
+
+        /*绘制GUI*/
+        public static void DrawGUI()
+        {
+            var config = DouyinConfig.Default;
+            GUIDrawer.DrawProperty(config, (property) =>
+            {
+                if (OverrideDrawGUIFunc.TryGetValue(property, out var match))
+                {
+                    return match.Invoke(config);
+                }
+
+                return false;
+            });
+        }
+    }
+
+    /// <summary>
+    /// 抖音小游戏配置
+    /// </summary>
+    public class DouyinConfig : ScriptableObject
+    {
+        private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/DouyinConfig.asset";
+
+        private static DouyinConfig _instance = null;
+
+        public static DouyinConfig Default
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = AssetDatabase.LoadAssetAtPath<DouyinConfig>(ConfigPath);
+                }
+
+                if (_instance == null)
+                {
+                    _instance = CreateInstance<DouyinConfig>();
+                    var folder = Path.GetDirectoryName(ConfigPath);
+                    if (!Directory.Exists(folder))
+                    {
+                        Directory.CreateDirectory(folder);
+                        AssetDatabase.Refresh();
+                    }
+
+                    AssetDatabase.CreateAsset(_instance, ConfigPath);
+                }
+
+                return _instance;
+            }
+        }
+
+        public string AppId;
+        public string IntersId;
+        public string VideoId;
+        public string BannerId;
+        public string ApkName;
+
+        public void Save()
+        {
+            EditorUtility.SetDirty(this);
+            AssetDatabase.SaveAssets();
+        }
+    }
+}

package/Editor/{WxMiniConfigWindow.cs.meta → DouyinConfig.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 626f103db7d4f5c448f0dc4ec4c9637b
+guid: 6541c4cf3db3d32469c4be23b33aa379
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Editor/ExportModule.cs

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

package/Editor/GUIDrawer.cs

@@ -29,6 +29,23 @@ namespace TyphoonUnitySDK
         }
 
 
+        private static GUIStyle _linkstyle = null;
+
+        private static GUIStyle LinkStyle
+        {
+            get
+            {
+                if (_linkstyle == null)
+                {
+                    _linkstyle = new GUIStyle(Styles.rlabel_italic);
+                    _linkstyle.normal.textColor = new Color(0.02f, 0.49f, 0.84f, 1f);
+                }
+
+                return _linkstyle;
+            }
+        }
+
+
         /// <summary>
         /// 绘制GUI属性
         /// </summary>
@@ -76,7 +93,21 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static void DrawKeynotes(string content, params GUILayoutOption[] option)
         {
+            StyleTooltip.normal.textColor = EditorGUIUtility.isProSkin
+                ? new Color(0.47f, 0.8f, 1f, 1f)
+                : new Color(0.04f, 0.31f, 0.57f, 1f);
             GUILayout.TextArea(content, StyleTooltip, option);
         }
+
+        /// <summary>
+        /// 绘制关键提示
+        /// </summary>
+        public static void DrawUrlLink(string content, Action handler, params GUILayoutOption[] option)
+        {
+            if (GUILayout.Button(new GUIContent(content, "跳转..."), LinkStyle, option))
+            {
+                handler?.Invoke();
+            }
+        }
     }
 }

package/Editor/PublishProcess.cs

@@ -8,7 +8,9 @@ namespace TyphoonUnitySDK
         Apk,
         IOS,
         Webgl,
-        ChinaAndroidAAR,
-        WxMini, //微信
+        ChinaAndroidAAR,//国内android
+        WxMini, //微信小游戏
+        DouyinAndroid,//抖音android
+        DouyinIOS,//抖音ios
     }
 }

package/Editor/PublishResult.cs

@@ -18,5 +18,10 @@ namespace TyphoonUnitySDK
         /// 导出的微信工程
         /// </summary>
         public string WxMiniProj;
+
+        /// <summary>
+        /// 抖音发布APK输出工程
+        /// </summary>
+        public string DouyinApkOutPath;
     }
 }

package/Editor/PublishSetting.cs

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

package/Editor/PublishSettingGUIDrawer.cs

@@ -48,8 +48,27 @@ namespace TyphoonUnitySDK
                 { nameof(PublishSetting.PresetModifyEnable), DrawProperty_PresetModifyEnable },
                 { nameof(PublishSetting.PresetModify), DrawProperty_PresetModify },
                 { nameof(PublishSetting.WxMiniGUIFoldout), DrawProperty_WxMiniGUIFoldout },
+                { nameof(PublishSetting.DouyinGUIFoldout), DrawProperty_DouyinGUIFoldout },
             };
 
+        /*绘制抖音小游戏GUI*/
+        private static bool DrawProperty_DouyinGUIFoldout(PublishSetting arg)
+        {
+            if (arg.Channel != AppChannel.DouyinAndroid && arg.Channel != AppChannel.DouyinIOS)
+            {
+                return true;
+            }
+
+            GUILayout.Space(10);
+            arg.DouyinGUIFoldout = GUIDrawer.DrawFoldout("抖音小游戏", arg.DouyinGUIFoldout, GUILayout.Height(26));
+            if (arg.DouyinGUIFoldout)
+            {
+                DouyinConfigGUIDrawer.DrawGUI();
+            }
+
+            return true;
+        }
+
         /*绘制微信GUI*/
         private static bool DrawProperty_WxMiniGUIFoldout(PublishSetting arg)
         {

package/Editor/PublishTool.cs

@@ -22,7 +22,10 @@ namespace TyphoonUnitySDK
         public static Dictionary<PublishProcess, string> PublicClasses = new Dictionary<PublishProcess, string>()
         {
             { PublishProcess.ChinaAndroidAAR, "TyphoonUnitySDK.PublishChinaAndroidAAR" },
-            { PublishProcess.WxMini, "TyphoonUnitySDK.PublishWxMini" }
+            { PublishProcess.WxMini, "TyphoonUnitySDK.PublishWxMini" },
+            { PublishProcess.DouyinAndroid, "TyphoonUnitySDK.PublishDouyinAndroid" },
+            { PublishProcess.DouyinIOS, "TyphoonUnitySDK.PublishDouyinIOS" }
+            
         };
 
         /// <summary>

package/Editor/PublishVivoBatSettingInspector.cs

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

package/Editor/PublishWindow.cs

@@ -16,8 +16,8 @@ namespace TyphoonUnitySDK
             // AppChannel.WxMini,
             AppChannel.VivoMini,
             AppChannel.OppoMini,
-            AppChannel.DouyinAndroid,
-            AppChannel.DouyinIOS,
+            // AppChannel.DouyinAndroid,
+            // AppChannel.DouyinIOS,
         };
 
         private static bool IsLocked(PublishSetting setting)
@@ -286,6 +286,7 @@ namespace TyphoonUnitySDK
                     EditorUtility.SetDirty(_select);
                     //保存其它配置
                     WxMiniConfig.Default.Save();
+                    DouyinConfig.Default.Save();
                     AssetDatabase.SaveAssets();
                 }
 

package/Editor/Texture/sdk_white4x4.png.meta

@@ -0,0 +1,144 @@
+fileFormatVersion: 2
+guid: ba1cda5949ba4524c8ee711b47d1fa6a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/UniEditor.cs

@@ -34,6 +34,12 @@ namespace TyphoonUnitySDK
         public static string PackagePath_WxMini = $"{PathRoot}/Sources~/Package/WxMini.unitypackage";
 
 
+        /// <summary>
+        /// 抖音小游戏 资源包
+        /// </summary>
+        public static string PackagePath_Douyin = $"{PathRoot}/Sources~/Package/Douyin.unitypackage";
+
+
         /// <summary>
         /// 开启Addressable模块支持
         /// </summary>

package/Runtime/AppConfig.cs

@@ -24,5 +24,21 @@ namespace TyphoonUnitySDK
         /// 发布时间
         /// </summary>
         public static string PublishTime => AppConfigAsset.Instance.PublishTime;
+
+
+        /// <summary>
+        /// [抖音小游戏]视频广告ID
+        /// </summary>
+        public static string DouyinVideoId = AppConfigAsset.Instance.DouyinVideoId;
+
+        /// <summary>
+        /// [抖音小游戏]插页广告ID
+        /// </summary>
+        public static string DouyinIntersId => AppConfigAsset.Instance.DouyinIntersId;
+
+        /// <summary>
+        /// [抖音小游戏]BannerID
+        /// </summary>
+        public static string DouyinBannerId => AppConfigAsset.Instance.DouyinBannerId;
     }
 }

package/Runtime/AppConfigAsset.cs

@@ -44,7 +44,10 @@ namespace TyphoonUnitySDK
 
         [Tooltip("版本类型")] public VersionType VersionType = VersionType.Release;
 
-        [FormerlySerializedAs("PublishTimeString")] [Tooltip("发布时间")]
-        public string PublishTime = "19700101000000";
+        [Tooltip("发布时间")] public string PublishTime = "19700101000000";
+
+        [Tooltip("[抖音小游戏]视频广告ID")] public string DouyinVideoId;
+        [Tooltip("[抖音小游戏]插页广告ID")] public string DouyinIntersId;
+        [Tooltip("[抖音小游戏]Banner广告ID")] public string DouyinBannerId;
     }
 }

package/Runtime/BaseSdk.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace TyphoonUnitySDK
@@ -69,10 +70,50 @@ namespace TyphoonUnitySDK
         {
         }
 
-        /*打印日志*/
-        protected void Log(string log)
+
+        #region 录屏分享（抖音小游戏）
+
+        /*是否支持录屏分享*/
+        public virtual bool CanRecordGame()
+        {
+            return false;
+        }
+
+        /*开始录屏*/
+        public virtual void StartRecordGame(bool isRecordAudio = true, int maxRecordTimeSec = 600,
+            Action onStart = null,
+            Action<string> onError = null, Action<string> onComplete = null)
+        {
+            onError?.Invoke("not support");
+        }
+
+        /*停止录屏*/
+        public virtual void StopRecordGame(Action<string> complete = null, Action<string> onError = null,
+            List<TimeClip> clips = null, bool autoMerge = true)
+        {
+            onError?.Invoke("not support");
+        }
+
+        /*获取录屏时长*/
+        public virtual float GetRecordDuration()
+        {
+            return 0;
+        }
+
+        /*是否可分享录屏*/
+        public virtual bool CanShareRecordGame()
         {
-            SdkDebug.Log(log);
+            return false;
         }
+
+        /*分享录屏*/
+        public virtual void ShareRecordGame(string title, List<string> topics, Action success,
+            Action<string> fail = null,
+            Action cancel = null)
+        {
+            fail?.Invoke("not support");
+        }
+
+        #endregion
     }
 }