com.typhoon.unitysdk 1.0.34 → 1.0.36

package/Editor/dll/XGameDotNetZip.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 9fb5c535314e7c5469ecbc923f1b27b4
+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/Editor/dll.meta

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

package/Runtime/AndroidInstance.cs

@@ -33,7 +33,7 @@ namespace TyphoonUnitySDK
         {
             SdkDebug.Log($"CallWithSession {session.MethodName} {session.SendData}");
             //避免为空
-            var data = session.SendData.ToJson();
+            var data = session.SendData.ToXJson();
             data = data ?? "";
             AndroidJavaObject?.Call("receiveSessionFromUnity", session.MethodName, session.SessionId, data);
         }

package/Runtime/BaseSdk.cs

@@ -9,15 +9,41 @@ namespace TyphoonUnitySDK
     /// </summary>
     public abstract class BaseSdk : ISdk
     {
+        private SDKHttpClient _sdkHttpClient = null;
+
+        public SDKHttpClient SDKHttpClient
+        {
+            get
+            {
+                if (_sdkHttpClient == null)
+                {
+                    _sdkHttpClient = SDKHttpClient.CreateInstance();
+                    GameObject.DontDestroyOnLoad(_sdkHttpClient.gameObject);
+                }
+
+                return _sdkHttpClient;
+            }
+        }
+
         /*OnCreate*/
         public abstract void OnCreate();
 
+        #region 初始化
+
         /*初始化SDK*/
         public abstract void InitSdk(Action success, Action<string> fail);
 
+        #endregion
+
+        #region 登录
+
         /*登录*/
         public abstract void Login(Action success, Action<string> fail);
 
+        #endregion
+
+        #region 退出游戏
+
         /*是否支持退出游戏*/
         public virtual bool IsSupportExitGame()
         {
@@ -29,6 +55,10 @@ namespace TyphoonUnitySDK
         {
         }
 
+        #endregion
+
+        #region Banner
+
         /*展示banner*/
         public virtual void ShowBanner(string scene, BannerPosition position)
         {
@@ -39,6 +69,9 @@ namespace TyphoonUnitySDK
         {
         }
 
+        #endregion
+
+        #region 视频广告
 
         /*获取激励视频标记*/
         public virtual bool GetVideoFlag()
@@ -53,11 +86,19 @@ namespace TyphoonUnitySDK
             success?.Invoke();
         }
 
+        #endregion
+
+        #region 插页广告
+
         /*展示插页*/
         public virtual void ShowInters(string scene)
         {
         }
 
+        #endregion
+
+        #region 悬浮ICON
+
         /*展示悬浮ICON*/
         public virtual void ShowFloatIcon(string scene, float screenXP, float screenYP)
         {
@@ -68,6 +109,10 @@ namespace TyphoonUnitySDK
         {
         }
 
+        #endregion
+
+        #region 原生广告
+
         /*展示原生广告*/
         public virtual void ShowNative(string scene)
         {
@@ -78,6 +123,7 @@ namespace TyphoonUnitySDK
         {
         }
 
+        #endregion
 
         #region 录屏分享（抖音小游戏）
 
@@ -123,5 +169,23 @@ namespace TyphoonUnitySDK
         }
 
         #endregion
+
+        #region Http请求
+
+        public virtual void HttpPost(string url, string data, Action<HttpPostSuccessResult> success,
+            Action<string> fail,
+            Dictionary<string, string> header = null, int timeOut = 60)
+        {
+            SDKHttpClient.Post(url, data, success, fail, header, timeOut);
+        }
+
+
+        public virtual void HttpGet(string url, Action<HttpGetSuccessResult> success, Action<string> fail,
+            Dictionary<string, string> header, int timeOut)
+        {
+            SDKHttpClient.Get(url, success, fail, header, timeOut);
+        }
+
+        #endregion
     }
 }

package/Runtime/Extension.cs

@@ -7,12 +7,18 @@ namespace TyphoonUnitySDK
     /// </summary>
     public static partial class Extension
     {
-        public static T ToObject<T>(this string json)
+        /// <summary>
+        /// 从json到object
+        /// </summary>
+        public static T ToXObject<T>(this string json)
         {
             return JsonConvert.DeserializeObject<T>(json);
         }
 
-        public static string ToJson(this object obj)
+        /// <summary>
+        /// 从object到json
+        /// </summary>
+        public static string ToXJson(this object obj)
         {
             var json = JsonConvert.SerializeObject(obj);
             return json;

package/Runtime/HttpGetSuccessResult.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine.Scripting;
+
+namespace TyphoonUnitySDK
+{
+    //成功返回的数据项
+    [Preserve]
+    [Serializable]
+    public struct HttpGetSuccessResult
+    {
+        public string Data;
+        public Dictionary<string, string> Header;
+        public long StatusCode;
+
+        public HttpGetSuccessResult(string data, Dictionary<string, string> header, long statusCode)
+        {
+            Data = data;
+            Header = header;
+            StatusCode = statusCode;
+        }
+    }
+}

package/Runtime/HttpGetSuccessResult.cs.meta

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

package/Runtime/HttpPostSuccessResult.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine.Scripting;
+
+namespace TyphoonUnitySDK
+{
+    /// <summary>
+    /// post 返回的数据
+    /// </summary>
+    [Preserve]
+    [Serializable]
+    public struct HttpPostSuccessResult
+    {
+        //数据
+        public string Data;
+
+        //请求头
+        public Dictionary<string, string> Header;
+
+        //状态码
+        public long StateCode;
+
+        public HttpPostSuccessResult(string data, Dictionary<string, string> header, long stateCode)
+        {
+            Data = data;
+            Header = header;
+            StateCode = stateCode;
+        }
+    }
+}

package/Runtime/HttpPostSuccessResult.cs.meta

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

package/Runtime/Interface.cs

@@ -7,7 +7,7 @@ namespace TyphoonUnitySDK
     /// SDK全功能接口
     /// </summary>
     public interface ISdk : IOnCreate, IInitSdk, ILogin, IExitGame, IBannerAD, IVideoAD, IIntersAD, IFloatIconAD,
-        INativeAD, IRecordGame
+        INativeAD, IRecordGame, IHttpGet, IHttpPost
     {
     }
 
@@ -114,7 +114,6 @@ namespace TyphoonUnitySDK
 
     #endregion
 
-
     #region 录屏分享（抖音小游戏）
 
     /*录屏分享（抖音）*/
@@ -145,4 +144,24 @@ namespace TyphoonUnitySDK
     }
 
     #endregion
+
+    #region Http Post
+
+    public interface IHttpPost
+    {
+        void HttpPost(string url, string data, Action<HttpPostSuccessResult> success, Action<string> fail,
+            Dictionary<string, string> header, int timeOut);
+    }
+
+    #endregion
+
+    #region Http Get
+
+    public interface IHttpGet
+    {
+        void HttpGet(string url, Action<HttpGetSuccessResult> success, Action<string> fail,
+            Dictionary<string, string> header, int timeOut);
+    }
+
+    #endregion
 }

package/Runtime/SDKHttpClient.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine;
+using UnityEngine.Networking;
+using UnityEngine.Scripting;
+
+namespace TyphoonUnitySDK
+{
+    /// <summary>
+    /// 通用HTTP请求
+    /// </summary>
+    [Preserve]
+    public class SDKHttpClient : MonoBehaviour
+    {
+        public static SDKHttpClient CreateInstance()
+        {
+            return new GameObject(nameof(SDKHttpClient)).AddComponent<SDKHttpClient>();
+        }
+
+        /// <summary>
+        /// post 请求
+        /// </summary>
+        public void Post(string url, string postData, Action<HttpPostSuccessResult> success, Action<string> fail,
+            Dictionary<string, string> header = null, int timeOut = 60)
+        {
+            //默认走unity 的post
+            StartCoroutine(IEUnityHttpPost(url, postData, success, fail, header, timeOut));
+        }
+
+        private IEnumerator IEUnityHttpPost(string url, string data, Action<HttpPostSuccessResult> success,
+            Action<string> fail, Dictionary<string, string> header, int timeOut)
+        {
+            var uri = new Uri(url);
+            using (UnityWebRequest www = UnityWebRequest.Post(uri, data))
+            {
+                byte[] bodyRaw = Encoding.UTF8.GetBytes(data);
+                www.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
+                www.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
+                if (timeOut > 0)
+                {
+                    www.timeout = timeOut;
+                }
+
+                if (header != null)
+                {
+                    foreach (var item in header)
+                    {
+                        www.SetRequestHeader(item.Key, item.Value);
+                    }
+                }
+
+                yield return www.SendWebRequest();
+                if (www.isNetworkError || www.isHttpError)
+                {
+                    //错误
+                    fail?.Invoke(www.error);
+                }
+                else
+                {
+                    //成功
+                    var resultData = new HttpPostSuccessResult(www.downloadHandler.text, www.GetResponseHeaders(),
+                        www.responseCode);
+                    success?.Invoke(resultData);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// get 请求
+        /// </summary>
+        public void Get(string url, Action<HttpGetSuccessResult> success, Action<string> fail,
+            Dictionary<string, string> header = null, int timeOut = 60)
+        {
+            StartCoroutine(IEUnityHttpGet(url, success, fail, header, timeOut));
+        }
+
+
+        private IEnumerator IEUnityHttpGet(string url, Action<HttpGetSuccessResult> success, Action<string> fail,
+            Dictionary<string, string> header, int timeOut)
+        {
+            var uri = new Uri(url);
+            using (UnityWebRequest www = UnityWebRequest.Get(uri))
+            {
+                //设置请求头
+                if (header != null)
+                {
+                    foreach (var kv in header)
+                    {
+                        www.SetRequestHeader(kv.Key, kv.Value);
+                    }
+                }
+
+                //设置超时
+                if (timeOut > 0)
+                {
+                    www.timeout = timeOut;
+                }
+
+                www.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
+                yield return www.SendWebRequest();
+                if (www.isNetworkError || www.isHttpError)
+                {
+                    //失败
+                    fail?.Invoke(www.error);
+                }
+                else
+                {
+                    //成功
+                    var resultData = new HttpGetSuccessResult(www.downloadHandler.text, www.GetResponseHeaders(),
+                        www.responseCode);
+                    success?.Invoke(resultData);
+                }
+            }
+        }
+    }
+}

package/Runtime/SDKHttpClient.cs.meta

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

package/Runtime/TyphoonSdk.cs

@@ -19,10 +19,27 @@ namespace TyphoonUnitySDK
             { AppChannel.DouyinAndroid, "TyphoonUnitySDK.DouyinSdk" }, //抖音小游戏
             { AppChannel.DouyinIOS, "TyphoonUnitySDK.DouyinSdk" }, //抖音小游戏
             { AppChannel.GooglePlay, "TyphoonUnitySDK.GooglePlaySdk" }, //GooglePlay
+            { AppChannel.VivoMini, "TyphoonUnitySDK.VivoMiniSdk" }, //Vivo小游戏
         };
 
         private ISdk _sdk;
 
+        private SDKHttpClient _sdkHttpClient = null;
+
+        public SDKHttpClient SDKHttpClient
+        {
+            get
+            {
+                if (_sdkHttpClient == null)
+                {
+                    _sdkHttpClient = SDKHttpClient.CreateInstance();
+                    GameObject.DontDestroyOnLoad(_sdkHttpClient.gameObject);
+                }
+
+                return _sdkHttpClient;
+            }
+        }
+
         protected override void Init()
         {
             base.Init();
@@ -542,5 +559,31 @@ namespace TyphoonUnitySDK
         }
 
         #endregion
+
+        #region Http请求
+
+        public virtual void HttpPost(string url, string data, Action<HttpPostSuccessResult> success,
+            Action<string> fail,
+            Dictionary<string, string> header = null, int timeOut = 60)
+        {
+#if UNITY_EDITOR
+            SDKHttpClient.Post(url, data, success, fail, header, timeOut);
+            return;
+#endif
+            _sdk?.HttpPost(url, data, success, fail, header, timeOut);
+        }
+
+
+        public virtual void HttpGet(string url, Action<HttpGetSuccessResult> success, Action<string> fail,
+            Dictionary<string, string> header = null, int timeOut = 60)
+        {
+#if UNITY_EDITOR
+            SDKHttpClient.Get(url, success, fail, header, timeOut);
+            return;
+#endif
+            _sdk?.HttpGet(url, success, fail, header, timeOut);
+        }
+
+        #endregion
     }
 }

package/Runtime/TyphoonSdkCallback.cs

@@ -36,12 +36,18 @@ namespace TyphoonUnitySDK
 
         public void Update()
         {
-            if (Input.GetKeyDown(KeyCode.Escape))
+            switch (AppConfig.Channel)
             {
-                if (TyphoonSdk.Instance.IsSupportExitGame())
-                {
-                    TyphoonSdk.Instance.ExitGame();
-                }
+                case AppChannel.ChinaAndroid:
+                    if (Input.GetKeyDown(KeyCode.Escape))
+                    {
+                        if (TyphoonSdk.Instance.IsSupportExitGame())
+                        {
+                            TyphoonSdk.Instance.ExitGame();
+                        }
+                    }
+
+                    break;
             }
         }
     }