com.typhoon.unitysdk 1.1.23 → 1.1.26

package/Editor/YandexGamesConfig.cs

@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    public static class YandexGamesConfigGUIDrawer
+    {
+        public static Dictionary<string, Func<YandexGamesConfig, bool>> OverrideDrawGUIFunc =
+            new Dictionary<string, Func<YandexGamesConfig, bool>>()
+            {
+                { "m_Script", DrawProperty_m_Script },
+                { "PackageVersion", DrawProperty_PackageVersion },
+            };
+
+
+        private static bool DrawProperty_m_Script(YandexGamesConfig arg)
+        {
+            var tmpEnable = GUI.enabled;
+            GUI.enabled = true;
+            GUILayout.Space(6);
+            GUIDrawer.DrawKeynotes("①支持Unity 2021.3.18+ , 2022.3+ , 2023.2+ , Unity 6");
+            GUIDrawer.DrawKeynotes("②剔除第三方SDK,避免与渠道冲突或不兼容");
+            GUIDrawer.DrawKeynotes("③先应用后再打包，避免参数写入失败");
+            GUILayout.Space(6);
+            GUI.enabled = tmpEnable;
+            return true;
+        }
+
+        public static bool DrawProperty_PackageVersion(YandexGamesConfig arg)
+        {
+            GUILayout.BeginHorizontal();
+            GUILayout.Label("Package Version", GUILayout.Width(218));
+            arg.PackageVersion = EditorGUILayout.TextField("", arg.PackageVersion);
+            if (GUILayout.Button("自动版本号", GUILayout.Width(100)))
+            {
+                arg.PackageVersion = UniEditor.AutoVersionSting(arg.PackageVersion);
+                EditorUtility.SetDirty(arg);
+                GUI.FocusControl("");
+            }
+
+            GUILayout.EndHorizontal();
+            return true;
+        }
+
+
+        /*绘制GUI*/
+        public static void DrawGUI()
+        {
+            var config = YandexGamesConfig.Default;
+            GUIDrawer.DrawProperty(config, (property) =>
+            {
+                if (OverrideDrawGUIFunc.TryGetValue(property, out var match))
+                {
+                    return match.Invoke(config);
+                }
+
+                return false;
+            });
+        }
+    }
+
+    public class YandexGamesConfig : ScriptableObject
+    {
+        private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/YandexGamesConfig.asset";
+
+        private static YandexGamesConfig _instance = null;
+
+        public static YandexGamesConfig Default
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = AssetDatabase.LoadAssetAtPath<YandexGamesConfig>(ConfigPath);
+                }
+
+                if (_instance == null)
+                {
+                    _instance = CreateInstance<YandexGamesConfig>();
+                    var folder = Path.GetDirectoryName(ConfigPath);
+                    if (!Directory.Exists(folder))
+                    {
+                        Directory.CreateDirectory(folder);
+                        AssetDatabase.Refresh();
+                    }
+
+                    AssetDatabase.CreateAsset(_instance, ConfigPath);
+                }
+
+                return _instance;
+            }
+        }
+
+
+        [LabelOverride("插页广告展示最小间隔(秒)（>=0）", 220)]
+        public int IntersInterval = 45;
+
+        [LabelOverride("激励视频播放后跳过下一次插页广告", 220)]
+        public bool SkipIntersAfterShowRewardFlag = true;
+
+        [LabelOverride("Product Icon", 220)]
+        public Texture2D ProductIcon;
+
+        [LabelOverride("Product Name (非中文)", 220)]
+        public string ProductName = string.Empty;
+
+        [LabelOverride("Company Name (非中文)", 220)]
+        public string CompanyName = string.Empty;
+
+        public string PackageVersion = "1.0.0";
+
+        [LabelOverride("导出目录 (非中文,可选)", 220)]
+        public string ExportPath = "";
+
+
+        public void Save()
+        {
+            EditorUtility.SetDirty(this);
+            AssetDatabase.SaveAssets();
+        }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
+    }
+}

package/Editor/{EditorKit.cs.meta → YandexGamesConfig.cs.meta}

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

package/Runtime/AppChannel.cs

@@ -65,9 +65,17 @@ namespace TyphoonUnitySDK
         /// 喜中游
         /// </summary>
         XiZhongYou = 12,
+        
         /// <summary>
         /// 华为鸿蒙
         /// </summary>
         HuaweiHarmony = 13,
+        
+        
+        /// <summary>
+        /// YandexGames
+        /// </summary>
+        YandexGames = 14,
+        
     }
 }

package/Runtime/BaseSdk.cs

@@ -346,5 +346,12 @@ namespace TyphoonUnitySDK
         }
 
         #endregion
+
+        public virtual SystemLanguage GetSystemLanguage()
+        {
+            SdkDebug.Log(
+                $"[BaseSdk] GetSystemLanguage... return Application.systemLanguage:{Application.systemLanguage}");
+            return Application.systemLanguage;
+        }
     }
 }

package/Runtime/GamePauser.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
+using UnityEngine.EventSystems;
 
 /// <summary>
 /// 游戏暂停器
@@ -11,6 +13,8 @@ public class GamePauser
     private float TimeScaleBeforePause { get; set; }
     private bool AudioListenerStateBeforePause { get; set; }
 
+    private Dictionary<EventSystem, bool> DictEventSystemState { get; set; }
+
     /// <summary>
     /// 新增暂停标记
     /// </summary>
@@ -66,8 +70,11 @@ public class GamePauser
         IsPaused = true;
         TimeScaleBeforePause = Time.timeScale;
         AudioListenerStateBeforePause = AudioListener.pause;
+        var systems = Object.FindObjectsByType<EventSystem>(
+            FindObjectsSortMode.None);
         Time.timeScale = 0f;
         AudioListener.pause = true;
+        DictEventSystemState = systems.ToDictionary(e => e, e => e.enabled);
     }
 
     private void Resume()
@@ -80,5 +87,14 @@ public class GamePauser
         IsPaused = false;
         Time.timeScale = TimeScaleBeforePause;
         AudioListener.pause = AudioListenerStateBeforePause;
+        foreach (var pair in DictEventSystemState)
+        {
+            if (pair.Key == null)
+            {
+                continue;
+            }
+
+            pair.Key.enabled = pair.Value;
+        }
     }
 }

package/Runtime/Interface.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using UnityEngine;
 
 namespace TyphoonUnitySDK
 {
@@ -8,7 +9,7 @@ namespace TyphoonUnitySDK
     /// </summary>
     public interface ISdk : IOnCreate, IInitSdk, ILogin, IExitGame, IBannerAD, IVideoAD, IIntersAD, IFloatIconAD,
         INativeAD, IRecordGame, IHttpGet, IHttpPost, ISideBarReturn, IShowToast, ITrack, IQuitGameWithKeep,
-        IRequestProductInfosAsync, IPay
+        IRequestProductInfosAsync, IPay,IGetSystemLanguage
     {
     }
 
@@ -191,7 +192,6 @@ namespace TyphoonUnitySDK
 
     #endregion
 
-
     #region ShowToast
 
     /// <summary>
@@ -213,7 +213,6 @@ namespace TyphoonUnitySDK
 
     #endregion
 
-
     #region 退出挽留
 
     public interface IQuitGameWithKeep
@@ -259,4 +258,13 @@ namespace TyphoonUnitySDK
     }
 
     #endregion
+
+    #region 获取系统语言
+
+    public interface IGetSystemLanguage
+    {
+        SystemLanguage GetSystemLanguage();
+    }
+
+    #endregion
 }

package/Runtime/LabelOverride.cs

@@ -58,7 +58,7 @@ namespace TyphoonUnitySDK
                 }
                 catch (System.Exception ex)
                 {
-                    Debug.LogException(ex);
+                    // Debug.LogException(ex);
                 }
             }
 

package/Runtime/SdkLite.cs

@@ -37,6 +37,7 @@ namespace TyphoonUnitySDK
             OnHide?.Invoke();
         }
 
+
         #region 生命周期
 
         /// <summary>
@@ -53,6 +54,19 @@ namespace TyphoonUnitySDK
             MiniGameLifecycle = lifecycle;
         }
 
+        /// <summary>
+        /// YandexGames渠道生命周期相关函数
+        /// </summary>
+        public static IYandexGamesLifecycle YandexGamesLifecycle { get; set; }
+
+        /// <summary>
+        /// 覆盖YandexGames生命周期
+        /// </summary>
+        public static void OverrideYandexGamesLifecycle(IYandexGamesLifecycle lifecycle)
+        {
+            YandexGamesLifecycle = lifecycle;
+        }
+
         #endregion
 
         /*绑定SDK实例*/
@@ -69,6 +83,7 @@ namespace TyphoonUnitySDK
             { AppChannel.MiniGame, "TyphoonUnitySDK.MiniGameSdk" },           //微游
             { AppChannel.XiZhongYou, "TyphoonUnitySDK.XiZhongYouSdk" },       //喜中游
             { AppChannel.HuaweiHarmony, "TyphoonUnitySDK.HuaweiHarmonySdk" }, //华为鸿蒙
+            { AppChannel.YandexGames, "TyphoonUnitySDK.YandexGamesSdk" },     //YandexGames
         };
 
         //支付回调类名
@@ -960,5 +975,22 @@ namespace TyphoonUnitySDK
         }
 
         #endregion
+
+        #region 系统语言
+
+        public virtual SystemLanguage GetSystemLanguage()
+        {
+#if UNITY_EDITOR
+            if (SdkTestInUnity.Instance.UseTestSystemLanguageFlag)
+            {
+                return SdkTestInUnity.Instance.SystemLanguage;
+            }
+
+            return Application.systemLanguage;
+#endif
+            return _sdk.GetSystemLanguage();
+        }
+
+        #endregion
     }
 }

package/Runtime/SdkTestInUnity.cs

@@ -12,6 +12,13 @@ using UnityEditor;
 public class SdkTestInUnity : ScriptableObject
 {
     private const string ASSET_PATH = "Assets/Typhoon_Gen/TyphoonSDK/Editor/SdkTestInUnity.asset";
+
+    [Header("系统语言")]
+    [LabelOverride("使用测试参数")]
+    public bool UseTestSystemLanguageFlag = false;
+    [LabelOverride("系统语言")]
+    public SystemLanguage SystemLanguage = SystemLanguage.English;
+
     [Header("登录")]
     [LabelOverride("登录回调")]
     public bool LoginResult = true;

package/Runtime/YandexGamesLifecycle.cs

@@ -0,0 +1,41 @@
+namespace TyphoonUnitySDK
+{
+    public interface IYandexGamesLifecycle
+    {
+        void OnPauseGame(bool isPaused);
+        void OnCloseAnyAdv();
+        void OnOpenAnyAdv();
+    }
+
+    /// <summary>
+    /// yandex games 生命周期
+    /// </summary>
+    public class YandexGamesLifecycle : IYandexGamesLifecycle
+    {
+        private GamePauser GamePauser { get; } = new GamePauser();
+        private const string TAG_ON_PAUSE_GAME = "TAG_ON_PAUSE_GAME";
+        private const string TAG_ANY_ADV = "TAG_ANY_ADV";
+
+        public void OnPauseGame(bool isPaused)
+        {
+            if (isPaused)
+            {
+                GamePauser.AddPauseTag(TAG_ON_PAUSE_GAME);
+            }
+            else
+            {
+                GamePauser.RemovePauseTag(TAG_ON_PAUSE_GAME);
+            }
+        }
+
+        public void OnCloseAnyAdv()
+        {
+            GamePauser.RemovePauseTag(TAG_ANY_ADV);
+        }
+
+        public void OnOpenAnyAdv()
+        {
+            GamePauser.AddPauseTag(TAG_ANY_ADV);
+        }
+    }
+}

package/Runtime/YandexGamesLifecycle.cs.meta

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