fix：1、删除上一个sdk，更换新的。2、删除了max广告

Assets/ASMhQ45fSDK.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 08b49ba194f43487398896a722dc111a
+guid: a2320132f2f584e4db70a243fb355189
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/ASMhQ45fSDK/Demo/ASMhQ45fSDKDemo.cs

@@ -2,16 +2,16 @@
 using System.Collections;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using ZrZYFo6bYXYM71YyLSDK;
+using ASMhQ45fSDK;
 using UnityEngine;
 using UnityEngine.UI;
 using Random = UnityEngine.Random;
 
-public class ZrZYFo6bYXYM71YyLSDKDemo : MonoBehaviour
+public class ASMhQ45fSDKDemo : MonoBehaviour
 {
     public void ShowReward()
     {
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.ShowRewardVideo("TAG", b =>
+        ASMhQ45fSDKUTILITY.Instance.ShowRewardVideo("TAG", b =>
         {
             Debug.LogError($"reward result = {b}");
         },(() =>
@@ -22,7 +22,7 @@ public class ZrZYFo6bYXYM71YyLSDKDemo : MonoBehaviour
 
     public void ShowInter()
     {
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.ShowInter("TAG", () =>
+        ASMhQ45fSDKUTILITY.Instance.ShowInter("TAG", () =>
         {
             Debug.LogError("inter hide");
         });
@@ -30,7 +30,7 @@ public class ZrZYFo6bYXYM71YyLSDKDemo : MonoBehaviour
 
     public void ShowAdmobInter()
     {
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.ShowAdmobInter("TAG", () =>
+        ASMhQ45fSDKUTILITY.Instance.ShowAdmobInter("TAG", () =>
         {
             Debug.LogError("inter hide");
         });
@@ -38,33 +38,33 @@ public class ZrZYFo6bYXYM71YyLSDKDemo : MonoBehaviour
 
     public void ShowSplash()
     {
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.ShowSplash();
+        ASMhQ45fSDKUTILITY.Instance.ShowSplash();
     }
 
     public void CheckReward(Image btnImg)
     {
-        var isReady = ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.IsVideoReady();
+        var isReady = ASMhQ45fSDKUTILITY.Instance.IsVideoReady();
         btnImg.color = isReady ? Color.green : Color.white;
         Debug.Log($"Reward : {isReady}");
     }
 
     public void CheckInter(Image btnImg)
     {
-        var isReady = ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.IsInterReady();
+        var isReady = ASMhQ45fSDKUTILITY.Instance.IsInterReady();
         btnImg.color = isReady ? Color.green : Color.white;
         Debug.Log($"Inter : {isReady}");
     }
 
     public void CheckSplash(Image btnImg)
     {
-        var isReady = ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.IsSplashReady();
+        var isReady = ASMhQ45fSDKUTILITY.Instance.IsSplashReady();
         btnImg.color = isReady ? Color.green : Color.white;
         Debug.Log($"Splash : {isReady}");
     }
 
     public void Track()
     {
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.Track("test", new Dictionary<string, string>()
+        ASMhQ45fSDKUTILITY.Instance.Track("test", new Dictionary<string, string>()
         {
             {"evt1", "1"},
             {"evt2", "2"},
@@ -83,13 +83,13 @@ public class ZrZYFo6bYXYM71YyLSDKDemo : MonoBehaviour
     public void GetCountryCode()
     {
 
-        var code = ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.GetCountryCode();
+        var code = ASMhQ45fSDKUTILITY.Instance.GetCountryCode();
         Debug.Log($"country : {code}");
     }
 
     public void ShowH5()
     {
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.H5.ShowH5((() =>
+        ASMhQ45fSDKUTILITY.Instance.H5.ShowH5((() =>
         {
             Debug.Log("H5 close");
         }), () =>
@@ -100,17 +100,17 @@ public class ZrZYFo6bYXYM71YyLSDKDemo : MonoBehaviour
 
     public void ShowH5(RectTransform rectTransform)
     {
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.H5.ShowH5(rectTransform);
+        ASMhQ45fSDKUTILITY.Instance.H5.ShowH5(rectTransform);
     }
 
     public void HideH5()
     {
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.H5.HideH5();
+        ASMhQ45fSDKUTILITY.Instance.H5.HideH5();
     }
 
     public void CheckShowH5(Image btnImg)
     {
-        var show = ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.H5.IsShowH5();
+        var show = ASMhQ45fSDKUTILITY.Instance.H5.IsShowH5();
         btnImg.color = show ? Color.green : Color.red;
         Debug.Log($"CheckShowH5 : {show}");
     }
@@ -118,7 +118,7 @@ public class ZrZYFo6bYXYM71YyLSDKDemo : MonoBehaviour
     private int _level = 1;
     public void TrackLevel()
     {
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.TrackLevelUp(_level);
+        ASMhQ45fSDKUTILITY.Instance.TrackLevelUp(_level);
         if (Random.Range(0, 100) < 50)
         {
             _level++;
@@ -128,7 +128,7 @@ public class ZrZYFo6bYXYM71YyLSDKDemo : MonoBehaviour
     private string withDrawSceneId = "";
     public void GetWithDrawConfigs()
     {
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.GetWithDrawConfigs(((b, s) =>
+        ASMhQ45fSDKUTILITY.Instance.GetWithDrawConfigs(((b, s) =>
         {
             Debug.Log($"GetWithDrawConfigs result : {b}, data : {s}");
             if (b)
@@ -168,7 +168,7 @@ public class ZrZYFo6bYXYM71YyLSDKDemo : MonoBehaviour
             taxNo = "99999999999";
         }
         if (payIndex == 3) payCode = PaymentTypeCode.MERCADOPAGO;
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.CreateWithDrawOrder(withDrawSceneId, payCode, payAccount, accountType, "testName", taxNo, b =>
+        ASMhQ45fSDKUTILITY.Instance.CreateWithDrawOrder(withDrawSceneId, payCode, payAccount, accountType, "testName", taxNo, b =>
         {
             Debug.Log($"CreateWithDrawOrder result : {b}");
         });
@@ -179,7 +179,7 @@ public class ZrZYFo6bYXYM71YyLSDKDemo : MonoBehaviour
 
     public void GetWithDrawOrders()
     {
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.GetWithDrawOrders(((b, s) =>
+        ASMhQ45fSDKUTILITY.Instance.GetWithDrawOrders(((b, s) =>
         {
             Debug.Log($"GetWithDrawOrders result : {b}, data : {s}");
             if (b)
@@ -211,7 +211,7 @@ public class ZrZYFo6bYXYM71YyLSDKDemo : MonoBehaviour
 
     private void Init()
     {
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.RegistIosParam((i =>
+        ASMhQ45fSDKUTILITY.Instance.RegistIosParam((i =>
         {
             Debug.Log($"ios ab param : {i}");
         }));
@@ -221,11 +221,11 @@ public class ZrZYFo6bYXYM71YyLSDKDemo : MonoBehaviour
             Debug.Log($"************* game config result : {result}, config : {config}");
         }
 
-        ZrZYFo6bYXYM71YyLSDKCONTROLLER.Instance.Init(null, "app_config", GameConfig);
+        ASMhQ45fSDKUTILITY.Instance.Init(null, "app_config", GameConfig);
     }
 
     public static string GetSdkVersion()
     {
-        return ZrZYFo6bYXYM71YyLSDKCONTROLLER.SdkVersion;
+        return ASMhQ45fSDKUTILITY.SdkVersion;
     }
 }

Assets/ASMhQ45fSDK/Editor/ASMhQ45fSDKConfigEditor.cs

@@ -2,13 +2,13 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using ZrZYFo6bYXYM71YyLSDK;
+using ASMhQ45fSDK;
 using UnityEditor;
 using UnityEngine;
 
-public class ZrZYFo6bYXYM71YyLSDKConfigEditor : EditorWindow
+public class ASMhQ45fSDKConfigEditor : EditorWindow
 {
-    private static ZrZYFo6bYXYM71YyLSDKConfigEditor _view;
+    private static ASMhQ45fSDKConfigEditor _view;
 
 private int _emptyKwInterIdCount = 1;
 private int _emptyKwVideoIdCount = 1;
@@ -25,7 +25,7 @@ public static void ShowWin()
         return;
     }
 
-    var win = GetWindow<ZrZYFo6bYXYM71YyLSDKConfigEditor>();
+    var win = GetWindow<ASMhQ45fSDKConfigEditor>();
     win.minSize = new Vector2(790, 872);
     _view = win;
     RemoveExtraEmptyStrings(SDKConfig.KwaiInterUnitId, _view._emptyKwInterIdCount);
@@ -34,6 +34,12 @@ public static void ShowWin()
     RemoveExtraEmptyStrings(SDKConfig.BigoVideoUnitId, _view._emptyBigoVideoIdCount);
     win.Show();
 
+    #region topon
+
+    _view.loadPluginData();
+
+    #endregion
+
     }
 
     static void CloseView()
@@ -48,6 +54,33 @@ private void OnGUI()
     EditorUtility.SetDirty(SDKConfig.Instance);
 }
 
+#region Topon
+private AnyThink.Scripts.IntegrationManager.Editor.ATEditorCoroutine loadDataCoroutine;
+private AnyThink.Scripts.IntegrationManager.Editor.PluginData pluginData;
+private bool pluginDataLoadFailed;
+private void loadPluginData()
+{
+    if (loadDataCoroutine != null)
+    {
+        loadDataCoroutine.Stop();
+    }
+    loadDataCoroutine = AnyThink.Scripts.IntegrationManager.Editor.ATEditorCoroutine.startCoroutine(AnyThink.Scripts.IntegrationManager.Editor.ATIntegrationManager.Instance.loadPluginData(data =>
+    {
+        if (data == null)
+        {
+            pluginDataLoadFailed = true;
+        }
+        else
+        {
+            ATLog.log("loadNetworksData() >>> pluginData: " + data);
+            pluginData = data;
+            pluginDataLoadFailed = false;
+        }
+    }));
+}
+
+#endregion
+
     private void DrawWindow()
 {
     TextLabel("基础配置");
@@ -69,29 +102,47 @@ private void DrawWindow()
 
     #region MAX
 
-    EditorGUILayout.BeginVertical("frameBox");
-    TextLabel("MAX", Color.cyan);
-    SDKConfig.Instance.maxAppKey = DrawTextField("MaxSdkKey", SDKConfig.Instance.maxAppKey);
-    SDKConfig.Instance.videoUnitId = DrawTextField("激励视频 ID", SDKConfig.Instance.videoUnitId);
-    SDKConfig.Instance.interUnitId = DrawTextField("插屏 ID", SDKConfig.Instance.interUnitId);
-    SDKConfig.Instance.bannerUnitId = DrawTextField("Banner ID", SDKConfig.Instance.bannerUnitId);
-    SDKConfig.Instance.splashUnitId = DrawTextField("开屏 ID", SDKConfig.Instance.splashUnitId);
-    EditorGUILayout.EndVertical();
+    // EditorGUILayout.BeginVertical("frameBox");
+    // TextLabel("MAX", Color.cyan);
+    // SDKConfig.Instance.maxAppKey = DrawTextField("MaxSdkKey", SDKConfig.Instance.maxAppKey);
+    // SDKConfig.Instance.videoUnitId = DrawTextField("激励视频 ID", SDKConfig.Instance.videoUnitId);
+    // SDKConfig.Instance.interUnitId = DrawTextField("插屏 ID", SDKConfig.Instance.interUnitId);
+    // SDKConfig.Instance.bannerUnitId = DrawTextField("Banner ID", SDKConfig.Instance.bannerUnitId);
+    // SDKConfig.Instance.splashUnitId = DrawTextField("开屏 ID", SDKConfig.Instance.splashUnitId);
+    // EditorGUILayout.EndVertical();
 
-    AppLovinSettings.Instance.SdkKey = SDKConfig.Instance.maxAppKey;
+    // AppLovinSettings.Instance.SdkKey = SDKConfig.Instance.maxAppKey;
 
     #endregion
 
 
         #region Topon
 
-        // EditorGUILayout.BeginVertical("frameBox");
-        // TextLabel("Topon", Color.cyan);
-        // SDKConfig.Instance.toponAppId = DrawTextField("AppId", SDKConfig.Instance.toponAppId);
-        // SDKConfig.Instance.toponAppkey = DrawTextField("Appkey", SDKConfig.Instance.toponAppkey);
-        // SDKConfig.Instance.toponVideoUnitId = DrawTextField("激励视频 ID", SDKConfig.Instance.toponVideoUnitId);
-        // SDKConfig.Instance.toponInterUnitId = DrawTextField("插屏 ID", SDKConfig.Instance.toponInterUnitId);
-        // EditorGUILayout.EndVertical();
+        EditorGUILayout.BeginVertical("frameBox");
+        TextLabel("Topon", Color.cyan);
+        SDKConfig.Instance.toponAppId = DrawTextField("AppId", SDKConfig.Instance.toponAppId);
+        SDKConfig.Instance.toponAppkey = DrawTextField("Appkey", SDKConfig.Instance.toponAppkey);
+        SDKConfig.Instance.toponVideoUnitId = DrawTextField("激励视频 ID", SDKConfig.Instance.toponVideoUnitId);
+        SDKConfig.Instance.toponInterUnitId = DrawTextField("插屏 ID", SDKConfig.Instance.toponInterUnitId);
+        EditorGUILayout.EndVertical();
+        //AnyThink.Scripts.IntegrationManager.Editor.ATIntegrationManager.Instance.setAdmobAppidByOs(pluginData, );
+        var integrationManager = AnyThink.Scripts.IntegrationManager.Editor.ATIntegrationManager.Instance;
+        bool isAdmobInstalledForAndroid = integrationManager.isAdmobInstalled(AnyThink.Scripts.IntegrationManager.Editor.ATConfig.OS_ANDROID);
+        bool isAdmobInstalledForIos = integrationManager.isAdmobInstalled(AnyThink.Scripts.IntegrationManager.Editor.ATConfig.OS_IOS);
+
+        if (isAdmobInstalledForAndroid || isAdmobInstalledForIos)
+        {
+            if (isAdmobInstalledForAndroid)
+            {
+                var androidAdmobAppId = "ca-app-pub-3940256099942544~3347511713";
+                integrationManager.setAdmobAppidByOs(pluginData, AnyThink.Scripts.IntegrationManager.Editor.ATConfig.OS_ANDROID, androidAdmobAppId);
+            }
+            if (isAdmobInstalledForIos)
+            {
+                var iosAdmobAppId = "ca-app-pub-3940256099942544~1458002511";
+                integrationManager.setAdmobAppidByOs(pluginData, AnyThink.Scripts.IntegrationManager.Editor.ATConfig.OS_IOS, iosAdmobAppId);
+            }
+        }
 
         #endregion
 
@@ -204,7 +255,7 @@ private void DrawWindow()
     GUILayout.EndHorizontal();
 
 
-    var sdkVersion = ZrZYFo6bYXYM71YyLSDKCONTROLLER.SdkVersion;
+    var sdkVersion = ASMhQ45fSDKUTILITY.SdkVersion;
     GUI.Label(new Rect(10, position.height - 40, 400, 40), "@version: " + sdkVersion);
 
     EditorPrefs.SetString("sdk_version", sdkVersion);
@@ -371,20 +422,20 @@ private static readonly Dictionary<string, string> parameterPatterns = new Dicti
         {"AF Apple Appid",  @"(?i)app\s*id(?:\s+id)*\s*[=:]*\s*([^\n]*)"},
         
         // MAX (兼容多种格式)
-        { "MAX 激励视频", @"MAX参数[\s\S]*?激励视频\*?\s*([^\n]+)" },
-        { "MAX 插屏", @"MAX参数[\s\S]*?插屏\*?\s*([^\n]+)" },
+        { "MAX 激励视频", @"MAX参数(?:-[^\s]+)?[\s\S]*?(?:激励视频|激励1|激励2|客户端激励|bidding激励广告位ID|激励)\s*[""\r\n]*([^""\s\r\n]+)"},
+        { "MAX 插屏", @"MAX参数(?:-[^\s]+)?[\s\S]*?(?:插屏|插屏1|插屏2|客户端插屏|bidding插屏广告位ID)\s*[""\r\n]*([^""\s\r\n]+)" },
         { "MAX SDK Key", @"MAX参数[\s\S]*?SDK key\*?\s*([^\n]+)" },
         { "MAX ad review key", @"MAX参数[\s\S]*?ad review key\*?\s*([^\n]+)" },
         
         // BIGO (兼容多种格式)
         { "BIGO 应用ID", @"BIGO参数[\s\S]*?(?:应用ID|appid)\s*([^\n]+)" },
-        { "BIGO 激励", @"BIGO参数[\s\S]*?(?:激励|客户端激励|bidding激励广告位ID)\s*([^\n]+)" },
-        { "BIGO 插屏", @"BIGO参数[\s\S]*?(?:插屏|客户端插屏|bidding插屏广告位ID)\s*([^\n]+)" },
+        { "BIGO 激励", @"BIGO参数[\s\S]*?(?:激励|激励1|激励2|客户端激励|bidding激励广告位ID)\s*([^\n]+)" },
+        { "BIGO 插屏", @"BIGO参数[\s\S]*?(?:插屏|插屏1|插屏2|客户端插屏|bidding插屏广告位ID)\s*([^\n]+)" },
         
         // Kwai (兼容多种格式)
         { "Kwai 应用ID", @"kwai参数[\s\S]*?(?:应用ID|appid)\s*([^\n]+)" },
-        { "Kwai 激励", @"kwai参数[\s\S]*?(?:激励1|激励2|客户端激励|bidding激励广告位ID)\s*([^\n]+)" },
-        { "Kwai 插屏", @"kwai参数[\s\S]*?(?:插屏1|插屏2|客户端插屏|bidding插屏广告位ID)\s*([^\n]+)" },
+        { "Kwai 激励", @"kwai参数[\s\S]*?(?:激励|激励1|激励2|客户端激励|bidding激励广告位ID)\s*([^\n]+)" },
+        { "Kwai 插屏", @"kwai参数[\s\S]*?(?:插屏|插屏1|插屏2|客户端插屏|bidding插屏广告位ID)\s*([^\n]+)" },
         
         // Admob (兼容多种格式)
         { "Admob 应用ID", @"admob参数[\s\S]*?(?:应用ID|App ID)\s*([^\n]+)" },
@@ -400,10 +451,11 @@ private static readonly Dictionary<string, string> parameterPatterns = new Dicti
         { "FB txt", @"fb参数[\s\S]*?txt\s*([^\n]+)" },
         
         // Topon (兼容多种格式)
-        { "Topon ID", @"Topon[\s\S]*?ID\s*([^\n]+)" },
-        { "Topon KEY", @"Topon[\s\S]*?KEY\s*([^\n]+)" },
-        { "Topon 激励", @"Topon[\s\S]*?激励\s*([^\n]+)" },
-        { "Topon 插屏", @"Topon[\s\S]*?插屏\s*([^\n]+)" }
+        // Topon (兼容多种格式)
+        { "Topon ID", @"(?i)topon[\s\S]*?ID[\t\s]+([^\r\n]+)" },
+        { "Topon KEY", @"(?i)topon[\s\S]*?(?:App Key|KEY)[\t\s]+([^\r\n]+)" },
+        { "Topon 激励", @"(?i)topon[\s\S]*?激励[\t\s]+([^\r\n]+)" },
+        { "Topon 插屏", @"(?i)topon[\s\S]*?插屏[\t\s]+([^\r\n]+)" }
     };
 
 private void ParseClipboard()

Assets/ASMhQ45fSDK/Editor/ASMhQ45fSDKConfigEditor.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 89548df3126253b44a047c2d3abd05bf
+guid: f717ff4d02845a84e881bb8a38f0bc6d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/ASMhQ45fSDK/Plugins/ASMhQ45fSDK.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bd50114c97422154fadef6b82b2adc00
+guid: d98edee58b36f0048b7a696b5da283d0
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/ASMhQ45fSDK/Scripts/Config/SDKConfig.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace ZrZYFo6bYXYM71YyLSDK
+namespace ASMhQ45fSDK
 {
     [System.Serializable]
     public class SDKConfig : ScriptableObject

Assets/ASMhQ45fSDK/Scripts/Config/Utils/AssetUtils.cs

@@ -8,7 +8,7 @@ using System.Collections.Generic;
 using UnityEditor;
 #endif
 
-namespace ZrZYFo6bYXYM71YyLSDK
+namespace ASMhQ45fSDK
 {
     public static class AssetUtils
     {

Assets/ASMhQ45fSDK/ThirdParty/AppsFlyer.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c71ab799cbfcb5a46ac36980dd8fa32a
+guid: 6ce04f7adf3833347beabc1f05c117cd
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/ASMhQ45fSDK/ThirdParty/AppsFlyer/Mac.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a58f887bc4d1a194db8cc3750b88ee2d
+guid: fddd3da8ac49d2343a36639cc952313a
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/ASMhQ45fSDK/ThirdParty/AppsFlyer/Mac/AppsFlyerBundle.bundle.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 496f3a37ca3f40d47bae5718b309eaa8
+guid: 89f3c63786553694baf52526f080ddac
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2