升级sdk 版本

.gitignore

@@ -9,6 +9,7 @@ Build/
 AssetBundle/
 UserSettings/
 
+
 # Uncomment this line if you wish to ignore the asset store tools plugin
 # [Aa]ssets/AssetStoreTools*
 
@@ -55,3 +56,4 @@ sysinfo.txt
 # Crashlytics generated file
 crashlytics-build.properties
 .DS_Store
+.vscode/

Assets/AnyThinkPlugin/AnyThinkAds/Api/ATCallbackInfo.cs

@@ -40,6 +40,16 @@ namespace AnyThinkAds.Api
         public readonly int abtest_id;
 
         public readonly string reward_custom_data;
+        public readonly int placement_type;
+        public readonly string shared_placement_id;
+        public readonly string bid_floor;
+        public readonly int dismiss_type;
+        public readonly int ad_source_type;
+        public readonly string ad_source_custom_ext;
+        public readonly string network_name;
+        public readonly string show_custom_ext;
+        public readonly string e_c;
+        public readonly int s_id;
 
         private string callbackJson;
 
@@ -94,6 +104,16 @@ namespace AnyThinkAds.Api
 
                 reward_custom_data = jsonData.ContainsKey("reward_custom_data") ? (string)jsonData["reward_custom_data"] : "";
 
+                placement_type = int.Parse(jsonData.ContainsKey("placement_type") ? jsonData["placement_type"].ToString() : "0");
+                shared_placement_id = jsonData.ContainsKey("shared_placement_id") ? jsonData["shared_placement_id"].ToString() : "";
+                bid_floor = jsonData.ContainsKey("bid_floor") ? jsonData["bid_floor"].ToString() : "";
+                dismiss_type = int.Parse(jsonData.ContainsKey("dismiss_type") ? jsonData["dismiss_type"].ToString() : "0");
+                ad_source_type = int.Parse(jsonData.ContainsKey("ad_source_type") ? jsonData["ad_source_type"].ToString() : "0");
+                ad_source_custom_ext = jsonData.ContainsKey("ad_source_custom_ext") ? jsonData["ad_source_custom_ext"].ToString() : "";
+                network_name = jsonData.ContainsKey("network_name") ? jsonData["network_name"].ToString() : "";
+                show_custom_ext = jsonData.ContainsKey("show_custom_ext") ? jsonData["show_custom_ext"].ToString() : "";
+                e_c = jsonData.ContainsKey("e_c") ? jsonData["e_c"].ToString() : "";
+                s_id = int.Parse(jsonData.ContainsKey("s_id") ? jsonData["s_id"].ToString() : "0");
             }
             catch (System.Exception e) {
                 System.Console.WriteLine("Exception caught: {0}", e);
@@ -150,6 +170,16 @@ namespace AnyThinkAds.Api
             dataDictionary.Add("custom_rule", custom_rule);
             dataDictionary.Add("ext_info", ext_info);
             dataDictionary.Add("reward_custom_data", reward_custom_data);
+            dataDictionary.Add("placement_type", placement_type);
+            dataDictionary.Add("shared_placement_id", shared_placement_id);
+            dataDictionary.Add("bid_floor", bid_floor);
+            dataDictionary.Add("dismiss_type", dismiss_type);
+            dataDictionary.Add("ad_source_type", ad_source_type);
+            dataDictionary.Add("ad_source_custom_ext", ad_source_custom_ext);
+            dataDictionary.Add("network_name", network_name);
+            dataDictionary.Add("show_custom_ext", show_custom_ext);
+            dataDictionary.Add("e_c", e_c);
+            dataDictionary.Add("s_id", s_id);
 
             return dataDictionary;
         }

Assets/AnyThinkPlugin/AnyThinkAds/Platform/iOS/Internal/C/ATSplashAdWrapper.m

@@ -69,11 +69,7 @@
     }
     NSString *defaultAdSourceConfig = extra[@"default_adSource_config"];
     NSLog(@"ATSplashAdWrapper::extra = %@", extra);
-    [[ATAdManager sharedManager] loadADWithPlacementID:placementID
+    [[ATAdManager  sharedManager] loadADWithPlacementID:placementID extra:extra delegate:self containerView:nil];
-                                                 extra:extra
-                                              delegate:self
-                                         containerView:nil
-                                 defaultAdSourceConfig:defaultAdSourceConfig];
 }
 
 

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/baidu/Baidu_MobAds_SDK-release_v9.37.aar.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 18ec4e5b1e69a419e8b51660fd87e10b
+guid: 76ac3b69f465f4b7d946b3f0df2a3d8d
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/csj/ads-sdk-pro-6.4.1.1.aar.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0fc816117918a447bbf4042bd0eaa0e8
+guid: 84e928ce9a03c451382a9bbadf2de1b5
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.603.1473.aar.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 40ffcabb87095443db42156bfb4b5c50
+guid: 23e424a0879774c0d9be59057061c712
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/network_data.json

@@ -1 +1 @@
-{"name":"gdt","version":"4.602.1472","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/Android/China/mediation/gdt"}
+{"name":"gdt","version":"4.603.1473","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/Android/China/mediation/gdt"}

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.69.4-publishRelease-982111dc06.aar.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 21f56453deec64c93ab4f2de70416598
+guid: 9efd0b28f0b6145b999c511961746e94
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/network_data.json

@@ -1 +1 @@
-{"name":"kuaishou","version":"3.3.69","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/Android/China/mediation/kuaishou"}
+{"name":"kuaishou","version":"3.3.69.4","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/Android/China/mediation/kuaishou"}

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.34_h1.aar.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 65ba4f4c0c9574f5694e8e3789af3a20
+guid: be4b35e05f4464a3a9d47e5a421f2c46
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/anythink_network_mobrain_mix_plus.aar.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: 968bcc6a91a6a5543bc7e455ada1b7ef
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/open_ad_sdk_6.6.0.7.aar.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: d1114d7069dbda64c88d1e55a8139d2a
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/iOS.meta

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

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China.meta

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

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core.meta

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

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor.meta

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

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor/Dependencies.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+        <dependencies>
+            <iosPods>
+                <iosPod name="AnyThinkiOS" version="" />
+            </iosPods>
+        </dependencies>

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor/Dependencies.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4fc1bcc62310548f4a6bddd58180eef9
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AnyThinkPlugin/Resources/json/2.1.3/plugin_hot_fix_data.json

@@ -1,7 +1,7 @@
 {
     "status": 1, 
-    "file_name": "AnyThinkHotFixPlugin_1.0.1.unitypackage", 
+    "file_name": "AnyThinkHotFixPlugin_1.0.2.unitypackage", 
-    "hot_fix_version": "1.0.1", 
+    "hot_fix_version": "1.0.2", 
-    "download_url": "https://topon-sdk-release.oss-cn-hangzhou.aliyuncs.com/Unity_Release/plugin/2.1.3/hotfix/1.0.1/AnyThinkHotFixPlugin_1.0.1.unitypackage", 
+    "download_url": "https://topon-sdk-release.oss-cn-hangzhou.aliyuncs.com/Unity_Release/plugin/2.1.3/hotfix/1.0.2/AnyThinkHotFixPlugin_1.0.2.unitypackage", 
     "plugin_version": "2.1.3"
 }

Assets/AnyThinkPlugin/Resources/json/2.1.3/plugin_setting_data.json

@@ -1 +1 @@
-{"curCountry":1,"china":{"android_version":"6.4.12","ios_version":"","androidXSetting":1,"country":1,"android_admob_app_id":"","ios_admob_app_id":""},"nonchina":{"android_version":"","ios_version":"","androidXSetting":0,"country":2,"android_admob_app_id":"","ios_admob_app_id":""}}
+{"curCountry":1,"china":{"android_version":"6.4.17","ios_version":"6.3.68","androidXSetting":1,"country":1,"android_admob_app_id":"","ios_admob_app_id":""},"nonchina":{"android_version":"","ios_version":"","androidXSetting":0,"country":2,"android_admob_app_id":"","ios_admob_app_id":""}}

Packages/manifest.json

@@ -1,8 +1,9 @@
 {
   "dependencies": {
-    "com.foldcc.cc-framework.commercialization" : "http://private.lightyears.ltd:18640/foldcc/CC-Framework.Commercialization.git#1.0.9",
+    "com.foldcc.cc-framework.commercialization": "http://private.lightyears.ltd:18640/foldcc/CC-Framework.Commercialization.git#1.0.9",
     "com.unity.collab-proxy": "1.17.6",
     "com.unity.feature.2d": "1.0.0",
+    "com.unity.ide.cursor": "http://private.lightyears.ltd:18650/foldcc/com.unity.ide.cursor.git",
     "com.unity.ide.rider": "3.0.16",
     "com.unity.ide.visualstudio": "2.0.16",
     "com.unity.ide.vscode": "1.2.5",

Packages/packages-lock.json

@@ -131,6 +131,15 @@
         "com.unity.2d.tilemap.extras": "2.2.3"
       }
     },
+    "com.unity.ide.cursor": {
+      "version": "http://private.lightyears.ltd:18650/foldcc/com.unity.ide.cursor.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {
+        "com.unity.test-framework": "1.1.9"
+      },
+      "hash": "2c0153a9bab1abc783e5599fa2d2cc3c69d5e389"
+    },
     "com.unity.ide.rider": {
       "version": "3.0.16",
       "depth": 0,