com.typhoon.unitysdk 1.1.3 → 1.1.5

package/Editor/UniEditor.cs

@@ -68,6 +68,13 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static string PackagePath_KuaiShouWebgl = $"{PathRoot}/Sources~/Package/KuaiShouWebgl.unitypackage";
 
+
+        /// <summary>
+        /// minigame webgl模式资源包
+        /// </summary>
+        public static string PackagePath_MiniGame = $"{PathRoot}/Sources~/Package/MiniGame.unitypackage";
+
+
         /// <summary>
         /// Toast模块
         /// </summary>
@@ -146,7 +153,6 @@ namespace TyphoonUnitySDK
         public static void ClearScriptingDefineSymbol(params string[] removes)
         {
             var currentTarget = EditorUserBuildSettings.selectedBuildTargetGroup;
-
             if (currentTarget == BuildTargetGroup.Unknown)
             {
                 return;
@@ -154,10 +160,8 @@ namespace TyphoonUnitySDK
 
             var definesString = PlayerSettings.GetScriptingDefineSymbolsForGroup(currentTarget).Trim();
             var defines = definesString.Split(';');
-
             bool changed = false;
             definesString = string.Empty;
-
             foreach (var define in removes)
             {
                 if (defines.Contains(define))
@@ -192,7 +196,6 @@ namespace TyphoonUnitySDK
         public static void AppendScriptingDefineSymbol(params string[] append)
         {
             var currentTarget = EditorUserBuildSettings.selectedBuildTargetGroup;
-
             if (currentTarget == BuildTargetGroup.Unknown)
             {
                 return;
@@ -200,9 +203,7 @@ namespace TyphoonUnitySDK
 
             var definesString = PlayerSettings.GetScriptingDefineSymbolsForGroup(currentTarget).Trim();
             var defines = definesString.Split(';');
-
             bool changed = false;
-
             foreach (var define in append)
             {
                 if (defines.Contains(define) == false)
@@ -236,7 +237,6 @@ namespace TyphoonUnitySDK
             foreach (var element in assemblies)
             {
                 var type = element.GetType(typeName);
-
                 if (type != null)
                 {
                     return type;
@@ -520,7 +520,6 @@ namespace TyphoonUnitySDK
         public static bool IsAsciiPath(string path)
         {
             byte[] bytes = Encoding.ASCII.GetBytes(path);
-
             foreach (byte b in bytes)
             {
                 if (b > 127) // 非ASCII字符的值大于127
@@ -1001,7 +1000,6 @@ namespace TyphoonUnitySDK
                 }
             }
 
-
             if (map.TryGetValue("version_log", out var out_version_log))
             {
                 changelog = out_version_log.ToString();
@@ -1077,7 +1075,6 @@ namespace TyphoonUnitySDK
                 try
                 {
                     HttpResponseMessage response = await client.GetAsync(url);
-
                     response.EnsureSuccessStatusCode();
                     string content = await response.Content.ReadAsStringAsync();
                     if (response.IsSuccessStatusCode)

package/Runtime/AppChannel.cs

@@ -56,5 +56,9 @@ namespace TyphoonUnitySDK
         /// 快手webgl
         /// </summary>
         KuaiShouWebgl = 10,
+        /// <summary>
+        /// 微游
+        /// </summary>
+        MiniGame = 11,
     }
 }

package/Runtime/BaseSdk.cs

@@ -25,9 +25,17 @@ namespace TyphoonUnitySDK
             }
         }
 
-        /*OnCreate*/
+        protected IOnPayCallback PayCallback { get; set; }
+
         public abstract void OnCreate();
 
+        /*OnCreate*/
+        public void OnCreate(IOnPayCallback payCallback)
+        {
+            PayCallback = payCallback;
+            OnCreate();
+        }
+
         #region 初始化
 
         /*初始化SDK*/
@@ -280,5 +288,63 @@ namespace TyphoonUnitySDK
         }
 
         #endregion
+
+        #region 请求商品信息
+
+        public virtual void RequestProductInfosAsync(Action<List<IapProductInfo>> success, Action<string> fail)
+        {
+            SdkDebug.Log($"[BaseSdk] RequestProductInfosAsync 默认返回true ");
+            SdkLite.Instance.WaitTo(1, () =>
+            {
+                success?.Invoke(new List<IapProductInfo>()
+                {
+                    new IapProductInfo()
+                    {
+                        desc = "商品1 描述...",
+                        display_price = "$0.99",
+                        name = "商品1",
+                        id = "iap.product.test",
+                        type = 1,
+                    },
+                    new IapProductInfo()
+                    {
+                        desc = "订阅1 描述...",
+                        display_price = "$0.99",
+                        name = "订阅1",
+                        id = "iap.product.test.sub",
+                        type = 2,
+                    }
+                });
+            });
+        }
+
+        #endregion
+
+        #region 内购
+
+        public virtual void Pay(string productId, int price, string productName, string productDesc)
+        {
+            SdkDebug.Log(
+                $"[BaseSdk] Pay 默认触发支付成功, productId: {productId}, price:{price}, productName :{productName} ,productDesc:{productDesc} ");
+            SdkLite.Instance.WaitTo(1, () =>
+            {
+                PayCallback?.OnPayCallback(productId, true, new PayCallBackExtraInfo()
+                {
+                    order_id = Guid.NewGuid().ToString(),
+                });
+            });
+        }
+
+        public virtual void RequestOrders()
+        {
+            SdkDebug.Log($"[BaseSdk] 请求补单 空实现");
+        }
+
+        public virtual void ReceivePayCallBackResult(PayCallBackResult result)
+        {
+            SdkDebug.Log($"[BaseSdk] ReceivePayCallBackResult {result.ToXJson()}");
+        }
+
+        #endregion
     }
 }

package/Runtime/Extension.cs

@@ -61,7 +61,5 @@ namespace TyphoonUnitySDK
 
             return bool.Parse(obj.ToString());
         }
-        
-        
     }
 }

package/Runtime/IapProductType.cs

@@ -0,0 +1,8 @@
+namespace TyphoonUnitySDK
+{
+    public enum IapProductType
+    {
+        Item = 1,
+        Subscribe = 2,
+    }
+}

package/Runtime/IapProductType.cs.meta

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

package/Runtime/Interface.cs

@@ -7,7 +7,8 @@ namespace TyphoonUnitySDK
     /// SDK全功能接口
     /// </summary>
     public interface ISdk : IOnCreate, IInitSdk, ILogin, IExitGame, IBannerAD, IVideoAD, IIntersAD, IFloatIconAD,
-        INativeAD, IRecordGame, IHttpGet, IHttpPost, ISideBarReturn, IShowToast, ITrack,IQuitGameWithKeep
+        INativeAD, IRecordGame, IHttpGet, IHttpPost, ISideBarReturn, IShowToast, ITrack, IQuitGameWithKeep,
+        IRequestProductInfosAsync, IPay
     {
     }
 
@@ -15,7 +16,7 @@ namespace TyphoonUnitySDK
 
     public interface IOnCreate
     {
-        void OnCreate();
+        void OnCreate(IOnPayCallback payCallback);
     }
 
     #endregion
@@ -225,4 +226,37 @@ namespace TyphoonUnitySDK
     }
 
     #endregion
+
+    #region 请求商品信息
+
+    public interface IRequestProductInfosAsync
+    {
+        void RequestProductInfosAsync(Action<List<IapProductInfo>> success, Action<string> fail);
+    }
+
+    #endregion
+
+    #region 内购
+
+    public interface IPay
+    {
+        //支付
+        void Pay(string productId, int price, string productName, string productDesc);
+
+        //请求补单
+        void RequestOrders();
+
+        void ReceivePayCallBackResult(PayCallBackResult result);
+    }
+
+    #endregion
+
+    #region 支付回调
+
+    public interface IOnPayCallback
+    {
+        void OnPayCallback(string product, bool state, PayCallBackExtraInfo extraInfo);
+    }
+
+    #endregion
 }

package/Runtime/LabelOverride.cs

@@ -9,13 +9,21 @@ namespace TyphoonUnitySDK
 
     public class LabelOverride : PropertyAttribute
     {
-        public string label;
+        public string Label;
+        public int? LabelWidth;
 
         public LabelOverride(string label)
         {
-            this.label = label;
+            Label = label;
         }
 
+        public LabelOverride(string label, int labelWidth)
+        {
+            Label = label;
+            LabelWidth = labelWidth;
+        }
+
+
 #if UNITY_EDITOR
         [CustomPropertyDrawer(typeof(LabelOverride))]
         public class ThisPropertyDrawer : PropertyDrawer
@@ -25,20 +33,28 @@ namespace TyphoonUnitySDK
                 try
                 {
                     var propertyAttribute = this.attribute as LabelOverride;
+                    var labelWidth = propertyAttribute.LabelWidth;
                     if (IsItBloodyArrayTho(property) == false)
                     {
-                        label.text = propertyAttribute.label;
+                        label.text = propertyAttribute.Label;
                     }
                     else
                     {
                         Debug.LogWarningFormat(
                             "{0}(\"{1}\") doesn't support arrays ",
                             typeof(LabelOverride).Name,
-                            propertyAttribute.label
+                            propertyAttribute.Label
                         );
                     }
 
+                    var defaultWidth = EditorGUIUtility.labelWidth;
+                    if (labelWidth != null)
+                    {
+                        EditorGUIUtility.labelWidth = labelWidth.Value;
+                    }
+
                     EditorGUI.PropertyField(position, property, label);
+                    EditorGUIUtility.labelWidth = defaultWidth;
                 }
                 catch (System.Exception ex)
                 {

package/Runtime/PayCallBackExtraInfo.cs

@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    //支付回调拓展数据
+    public class PayCallBackExtraInfo
+    {
+        public string order_id; //订单号
+    }
+}

package/Runtime/PayCallBackExtraInfo.cs.meta

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

package/Runtime/PayCallBackResult.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace TyphoonUnitySDK
+{
+    [Serializable]
+    public class PayCallBackResult
+    {
+        public List<PayResultItem> items = new List<PayResultItem>();
+    }
+
+    [Serializable]
+    public class PayResultItem
+    {
+        public string product_id;          //商品ID
+        public bool state;                 //支付状态
+        public PayCallBackExtraInfo extra; //拓展信息
+    }
+}

package/Runtime/PayCallBackResult.cs.meta

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

package/Runtime/RequestProductInfoResult.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine.Scripting;
+
+namespace TyphoonUnitySDK
+{
+    [Preserve]
+    [Serializable]
+    public class RequestProductInfoResult
+    {
+        public bool state;
+        public List<IapProductInfo> infos;
+        public string failMsg;
+
+        [Preserve]
+        public RequestProductInfoResult()
+        {
+        }
+    }
+
+    [Preserve]
+    [Serializable]
+    public class IapProductInfo
+    {
+        public string id;
+        public string name;
+        public string desc;
+        public string display_price;
+        public int type; //(1:一般消耗品，2:订阅项)
+        public IapProductType GetProductType() => (IapProductType)type;
+
+        [Preserve]
+        public IapProductInfo()
+        {
+        }
+    }
+}

package/Runtime/RequestProductInfoResult.cs.meta

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

package/Runtime/SDKInteractiveUI.cs

@@ -37,7 +37,6 @@ namespace TyphoonUnitySDK
         public NativeView Native = new NativeView();
         public FloatIconView FloatIcon = new FloatIconView();
         public InteractiveSources Sources;
-        public GUISkin Skin;
 
         public class UIStyles
         {
@@ -101,8 +100,6 @@ namespace TyphoonUnitySDK
         {
             base.Init();
             DontDestroyOnLoad(gameObject);
-            Skin =
-                AssetDatabase.LoadAssetAtPath<GUISkin>($"{PathRoot}/Editor/Skin.guiskin");
             var path = $"{PathRoot}/Editor/InteractiveSources.asset";
             Sources =
                 AssetDatabase.LoadAssetAtPath<InteractiveSources>(path);
@@ -130,7 +127,7 @@ namespace TyphoonUnitySDK
 
         public void ShowVideo(Action success, Action<string> fail)
         {
-            Video.Show(success, () => fail("fail"));
+            Video.Show(success, () => fail?.Invoke("fail"));
         }
 
 
@@ -576,8 +573,6 @@ namespace TyphoonUnitySDK
         {
 #if UNITY_EDITOR
 
-            var skin = GUI.skin;
-            GUI.skin = Skin;
             var mode = GetMode();
             var rect = new Rect(0, 0, Screen.width, Screen.height);
             Banner.OnGUI(rect, mode);
@@ -585,7 +580,6 @@ namespace TyphoonUnitySDK
             Native.OnGUI(rect, mode);
             Inters.OnGUI(rect, mode);
             Video.OnGUI(rect, mode);
-            GUI.skin = skin;
 #endif
         }
 

package/Runtime/SdkDebug.cs

@@ -10,7 +10,7 @@ namespace TyphoonUnitySDK
     public class SdkDebug
     {
         public static bool IsDebug = false;
-        public static string Prefix = "[TYPHOON] ";
+        public static string Prefix = "[typhoon-from-unity] ";
 
 #if UNITY_EDITOR
         public static string BlueHex => UnityEditor.EditorGUIUtility.isProSkin ? "26ade9" : "092415";

package/Runtime/SdkLite.cs

@@ -48,10 +48,14 @@ namespace TyphoonUnitySDK
             { AppChannel.GooglePlay, "TyphoonUnitySDK.GooglePlaySdk" },     //GooglePlay
             { AppChannel.VivoMini, "TyphoonUnitySDK.VivoMiniSdk" },         //Vivo小游戏
             { AppChannel.OppoMini, "TyphoonUnitySDK.OppoMiniSdk" },         //Oppo小游戏
+            { AppChannel.MiniGame, "TyphoonUnitySDK.MiniGameSdk" },         //微游
         };
 
-        private ISdk _sdk;
+        //支付回调类名
+        public const string PAY_CALL_BACK_CLASS_NAME = "TyphoonUnitySDK.OnPayCallBack";
 
+        private ISdk _sdk;
+        private IOnPayCallback _payCallBackInUnity;
         private SDKHttpClient _sdkHttpClient = null;
 
         public SDKHttpClient SDKHttpClient
@@ -61,7 +65,7 @@ namespace TyphoonUnitySDK
                 if (_sdkHttpClient == null)
                 {
                     _sdkHttpClient = SDKHttpClient.CreateInstance();
-                    GameObject.DontDestroyOnLoad(_sdkHttpClient.gameObject);
+                    DontDestroyOnLoad(_sdkHttpClient.gameObject);
                 }
 
                 return _sdkHttpClient;
@@ -83,6 +87,8 @@ namespace TyphoonUnitySDK
         {
 #if UNITY_EDITOR
             SimulateOnShow.Instance.Build();
+            Debug.Log("[TYPHOON SDK]  初始话完毕 可从‘TyphoonSDK/模拟测试’ 可调整参数返回");
+            _payCallBackInUnity = CreateOnPayCallbackInstance();
             return;
 #endif
             //动态日志开启android端调试日志
@@ -97,7 +103,9 @@ namespace TyphoonUnitySDK
 
                 var instance = Activator.CreateInstance(type);
                 _sdk = instance as ISdk;
-                _sdk.OnCreate();
+                Log("创建---- pay call back");
+                _sdk.OnCreate(CreateOnPayCallbackInstance());
+                Log("创建完毕---- pay call back");
             }
             else
             {
@@ -106,6 +114,15 @@ namespace TyphoonUnitySDK
         }
 
 
+        private IOnPayCallback CreateOnPayCallbackInstance()
+        {
+            var type = GetType(PAY_CALL_BACK_CLASS_NAME);
+            Log($"pay call back type : {type}");
+            var instance = Activator.CreateInstance(type);
+            Log($"pay call back instance : {instance}");
+            return (IOnPayCallback)instance;
+        }
+
         // 反射获取type
         private Type GetType(string typeName)
         {
@@ -177,7 +194,6 @@ namespace TyphoonUnitySDK
             success?.Invoke();
             return;
 #endif
-
             _sdk.InitSdk(success, fail);
         }
 
@@ -205,7 +221,6 @@ namespace TyphoonUnitySDK
 
             return;
 #endif
-
             _sdk.Login(success, fail);
         }
 
@@ -323,7 +338,6 @@ namespace TyphoonUnitySDK
 
             return;
 #endif
-
             _sdk.ShowVideo(scene, success, fail);
         }
 
@@ -370,7 +384,6 @@ namespace TyphoonUnitySDK
 
             return;
 #endif
-
             _sdk.ShowBanner(scene, position);
         }
 
@@ -426,7 +439,6 @@ namespace TyphoonUnitySDK
 
             return;
 #endif
-
             _sdk.HideNative(scene);
         }
 
@@ -450,7 +462,6 @@ namespace TyphoonUnitySDK
 
             return;
 #endif
-
             _sdk.ShowFloatIcon(scene, spx, spy);
         }
 
@@ -518,7 +529,6 @@ namespace TyphoonUnitySDK
             }
 
             result += $"_{AppConfig.PublishTime}";
-
             switch (AppConfig.VersionType)
             {
                 case VersionType.Base:
@@ -805,7 +815,6 @@ namespace TyphoonUnitySDK
                 }
 
                 fail?.Invoke("not support");
-                Debug.Log($"<color=#{SdkDebug.BlueHex}> [SDK模拟] 导航到侧边栏-回调结果==false,可从'TyphoonSDK/模拟测试'修改</color>");
             }
 
             return;
@@ -825,11 +834,6 @@ namespace TyphoonUnitySDK
                 case AppChannel.DouyinAndroid:
                 case AppChannel.DouyinIOS:
                 {
-                    if (!SdkTestInUnity.Instance.IsEnterFromSideBar)
-                    {
-                        Debug.Log($"<color=#{SdkDebug.BlueHex}> [SDK模拟] 侧边栏进入标记==false,可从'TyphoonSDK/模拟测试'修改</color>");
-                    }
-
                     return SdkTestInUnity.Instance.IsEnterFromSideBar;
                 }
             }
@@ -875,7 +879,7 @@ namespace TyphoonUnitySDK
             {
                 //开启日志
                 Debug.Log(
-                    $"<color=#{SdkDebug.BlueHex}> [SDK模拟] Track [eventName]:{eventName} [map]:{map.ToXJson()} 可从'TyphoonSDK/模拟测试'中修改</color>");
+                    $"<color=#{SdkDebug.BlueHex}> 【事件上报日志】 Track [eventName]:{eventName} [map]:{map.ToXJson()} 可从'TyphoonSDK/模拟测试'中修改</color>");
             }
 
             return;
@@ -899,5 +903,45 @@ namespace TyphoonUnitySDK
         }
 
         #endregion
+
+        #region 请求商品信息
+
+        public virtual void RequestProductInfosAsync(Action<List<IapProductInfo>> success, Action<string> fail)
+        {
+#if UNITY_EDITOR
+            WaitTo(SdkTestInUnity.Instance.RequestProductInfoResultDelay, () =>
+            {
+                if (SdkTestInUnity.Instance.RequestProductInfoResult)
+                {
+                    success?.Invoke(SdkTestInUnity.Instance.ProductInfos);
+                }
+                else
+                {
+                    fail?.Invoke("测试参数返回为false");
+                }
+            });
+            return;
+#endif
+            _sdk.RequestProductInfosAsync(success, fail);
+        }
+
+        #endregion
+
+        #region 内购
+
+        public virtual void Pay(string productId, int price, string productName, string productDesc)
+        {
+#if UNITY_EDITOR
+            _payCallBackInUnity.OnPayCallback(productId, SdkTestInUnity.Instance.PayResultFlag,
+                new PayCallBackExtraInfo()
+                {
+                    order_id = Guid.NewGuid().ToString(),
+                });
+            return;
+#endif
+            _sdk.Pay(productId, price, productName, productDesc);
+        }
+
+        #endregion
     }
 }