*fix refactor naming advertising

Editor/Advertising/MaxManager.cs

@@ -840,8 +840,8 @@ public void Load()
 #if PANCAKE_MAX_ENABLE
             EditorCoroutine.Start(Instance.LoadPluginData(_ =>
             {
-                Settings.MaxSettings.editorListNetwork = _.MediatedNetworks;
-                foreach (var mediationNetwork in Settings.MaxSettings.editorListNetwork.ToList())
+                AdSettings.MaxSettings.editorListNetwork = _.MediatedNetworks;
+                foreach (var mediationNetwork in AdSettings.MaxSettings.editorListNetwork.ToList())
                 {
                     if (!mediationNetwork.Name.Equals("ADCOLONY_NETWORK") &&
                         !mediationNetwork.Name.Equals("CHARTBOOST_NETWORK") &&
@@ -854,11 +854,11 @@ public void Load()
                         !mediationNetwork.Name.Equals("UNITY_NETWORK") &&
                         !mediationNetwork.Name.Equals("VUNGLE_NETWORK"))
                     {
-                        Settings.MaxSettings.editorListNetwork.Remove(mediationNetwork);
+                        AdSettings.MaxSettings.editorListNetwork.Remove(mediationNetwork);
                     }
                 }
 
-                LoadPluginDataExtend(_ => { Settings.MaxSettings.editorListNetwork.AddRange(_); });
+                LoadPluginDataExtend(_ => { AdSettings.MaxSettings.editorListNetwork.AddRange(_); });
             }));
 #endif
         }

Editor/Advertising/SettingsEditor.cs

@@ -372,9 +372,9 @@ public override void OnInspectorGUI()
                             EditorGUILayout.PropertyField(ApplovinProperties.enableRequestAdAfterHidden.property, ApplovinProperties.enableRequestAdAfterHidden.content);
                             EditorGUILayout.PropertyField(ApplovinProperties.enableMaxAdReview.property, ApplovinProperties.enableMaxAdReview.content);
 #if PANCAKE_MAX_ENABLE
-                            AppLovinSettings.Instance.QualityServiceEnabled = Settings.MaxSettings.EnableMaxAdReview;
-                            AppLovinSettings.Instance.ConsentFlowEnabled = Settings.AdSettings.EnableGDPR;
-                            AppLovinSettings.Instance.ConsentFlowPrivacyPolicyUrl = Settings.AdSettings.PrivacyPolicyUrl;
+                            AppLovinSettings.Instance.QualityServiceEnabled = AdSettings.MaxSettings.EnableMaxAdReview;
+                            AppLovinSettings.Instance.ConsentFlowEnabled = AdSettings.AdCommonSettings.EnableGDPR;
+                            AppLovinSettings.Instance.ConsentFlowPrivacyPolicyUrl = AdSettings.AdCommonSettings.PrivacyPolicyUrl;
 #endif
                             EditorGUILayout.Space();
                             EditorGUI.indentLevel++;

Editor/LevelEditor/LevelEditor.cs

@@ -629,6 +629,7 @@ private void TryFakeRender(SceneView sceneView)
                         _previewPickupObject.layer = LayerMask.NameToLayer("Ignore Raycast");
                     }
 
+#pragma warning disable CS8321
                     void SetPosition2()
                     {
                         var rendererAttach = _currentPickObject?.pickedObject.GetComponentInChildren<Renderer>();
@@ -637,6 +638,7 @@ void SetPosition2()
                         if (rendererOther == null) return;
                         _previewPickupObject.transform.position = GetSpawnPosition(rendererAttach, rendererOther, raycastHit.Value);
                     }
+#pragma warning restore CS8321
 
                     void SetPosition()
                     {

Runtime/Advertising/Runtime/Impl/Admob/Admob.cs

@@ -7,7 +7,7 @@ public static class Admob
     {
         internal static void SetupDeviceTest()
         {
-            var configuration = new RequestConfiguration.Builder().SetTestDeviceIds(Settings.AdmobSettings.DevicesTest).build();
+            var configuration = new RequestConfiguration.Builder().SetTestDeviceIds(AdSettings.AdmobSettings.DevicesTest).build();
             MobileAds.SetRequestConfiguration(configuration);
         }
 
@@ -17,7 +17,7 @@ internal static AdRequest CreateRequest()
             // targetting setting
             // extra options
             // consent
-            if (Settings.AdSettings.EnableGDPR) builder.AddExtra("npa", GDPRHelper.GetValueGDPR().ToString());
+            if (AdSettings.AdCommonSettings.EnableGDPR) builder.AddExtra("npa", GDPRHelper.GetValueGDPR().ToString());
 
             return builder.Build();
         }

Runtime/Advertising/Runtime/Impl/Admob/AdmobAdClient.cs

@@ -59,8 +59,8 @@ protected override void InternalInit()
             {
                 RuntimeHelper.RunOnMainThread(() =>
                 {
-                    if (Settings.AdmobSettings.EnableTestMode) Admob.SetupDeviceTest();
-                    if (Settings.AdSettings.EnableGDPR) ShowConsentForm();
+                    if (AdSettings.AdmobSettings.EnableTestMode) Admob.SetupDeviceTest();
+                    if (AdSettings.AdCommonSettings.EnableGDPR) ShowConsentForm();
                     isInitialized = true;
                 });
             });

Runtime/Advertising/Runtime/Impl/Admob/AdmobAppOpenLoader.cs

@@ -32,7 +32,7 @@ internal override bool IsReady()
             ;
         }
 
-        public AdmobAppOpenLoader() { unit = Settings.AdmobSettings.AppOpenAdUnit; }
+        public AdmobAppOpenLoader() { unit = AdSettings.AdmobSettings.AppOpenAdUnit; }
 
         internal override void Load() { AppOpenAd.LoadAd(unit.Id, ((AdmobAppOpenUnit) unit).orientation, Admob.CreateRequest(), OnAdLoadCallback); }
 

Runtime/Advertising/Runtime/Impl/Admob/AdmobBannerLoader.cs

@@ -19,7 +19,7 @@ public class AdmobBannerLoader : AdLoader<AdUnit>
         public event Action<AdmobBannerLoader, object, AdValueEventArgs> OnPaidEvent = delegate { };
 
 
-        public AdmobBannerLoader() { unit = Settings.AdmobSettings.BannerAdUnit; }
+        public AdmobBannerLoader() { unit = AdSettings.AdmobSettings.BannerAdUnit; }
 
         internal override void Load()
         {

Runtime/Advertising/Runtime/Impl/Admob/AdmobBannerUnit.cs

@@ -35,7 +35,7 @@ public AdSize ConvertSize()
                 case EBannerSize.FullBanner: return AdSize.IABBanner;
                 case EBannerSize.Leaderboard: return AdSize.Leaderboard;
                 case EBannerSize.SmartBanner:
-                    return Settings.AdmobSettings.UseAdaptiveBanner
+                    return AdSettings.AdmobSettings.UseAdaptiveBanner
                         ? AdSize.GetCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(AdSize.FullWidth)
                         : AdSize.SmartBanner;
                 default:

Runtime/Advertising/Runtime/Impl/Admob/AdmobInterstitialLoader.cs

@@ -20,7 +20,7 @@ public class AdmobInterstitialLoader : AdLoader<AdUnit>
         public event Action<AdmobInterstitialLoader, object, EventArgs> OnRecordImpressionEvent = delegate { };
         public event Action<AdmobInterstitialLoader, object, AdValueEventArgs> OnPaidEvent = delegate { };
 
-        public AdmobInterstitialLoader() { unit = Settings.AdmobSettings.InterstitialAdUnit; }
+        public AdmobInterstitialLoader() { unit = AdSettings.AdmobSettings.InterstitialAdUnit; }
 
         internal override void Load()
         {

Runtime/Advertising/Runtime/Impl/Admob/AdmobRewardedInterstitialLoader.cs

@@ -21,7 +21,7 @@ public class AdmobRewardedInterstitialLoader : AdLoader<AdUnit>
         public event Action<AdmobRewardedInterstitialLoader, object, EventArgs> OnClosedEvent = delegate { };
         public event Action<AdmobRewardedInterstitialLoader, Reward> OnRewardEvent = delegate { };
 
-        public AdmobRewardedInterstitialLoader() { unit = Settings.AdmobSettings.RewardedInterstitialAdUnit; }
+        public AdmobRewardedInterstitialLoader() { unit = AdSettings.AdmobSettings.RewardedInterstitialAdUnit; }
 
         internal override bool IsReady() { return _rewardedInterstitialAd != null; }
 

Runtime/Advertising/Runtime/Impl/Admob/AdmobRewardedLoader.cs

@@ -22,7 +22,7 @@ public class AdmobRewardedLoader : AdLoader<AdUnit>
         public event Action<AdmobRewardedLoader, object, EventArgs> OnClosedEvent = delegate { };
         public event Action<AdmobRewardedLoader, object, Reward> OnRewardEvent = delegate { };
 
-        public AdmobRewardedLoader() { unit = Settings.AdmobSettings.RewardedAdUnit; }
+        public AdmobRewardedLoader() { unit = AdSettings.AdmobSettings.RewardedAdUnit; }
 
         internal override bool IsReady() { return _rewardedAd != null && _rewardedAd.IsLoaded(); }
 

Runtime/Advertising/Runtime/Impl/Advertising.cs

@@ -125,7 +125,7 @@ public static void Initialize()
             isInitialized = true;
             AutoLoadingAdMode = AdSettings.AdCommonSettings.AutoLoadingAd;
 #if PANCAKE_ADMOB_ENABLE
-            if (Settings.AdSettings.CurrentNetwork == EAdNetwork.Admob) RegisterAppStateChange();
+            if (AdSettings.AdCommonSettings.CurrentNetwork == EAdNetwork.Admob) RegisterAppStateChange();
 #endif
         }
 

Runtime/Advertising/Runtime/Impl/Applovin/ApplovinAdClient.cs

@@ -156,11 +156,11 @@ internal void InvokeRewardedAdReceivedReward(MaxSdkBase.Reward reward)
         protected override void InternalInit()
         {
 #if PANCAKE_MAX_ENABLE
-            MaxSdk.SetSdkKey(Settings.MaxSettings.SdkKey);
-            if (Settings.AdSettings.EnableGDPR) MaxSdkCallbacks.OnSdkInitializedEvent += OnSdkInitializedEvent;
+            MaxSdk.SetSdkKey(AdSettings.MaxSettings.SdkKey);
+            if (AdSettings.AdCommonSettings.EnableGDPR) MaxSdkCallbacks.OnSdkInitializedEvent += OnSdkInitializedEvent;
 
             MaxSdk.InitializeSdk();
-            MaxSdk.SetIsAgeRestrictedUser(Settings.MaxSettings.EnableAgeRestrictedUser);
+            MaxSdk.SetIsAgeRestrictedUser(AdSettings.MaxSettings.EnableAgeRestrictedUser);
 #endif
 
             _banner = new ApplovinBannerLoader(this);
@@ -198,56 +198,56 @@ private void OnSdkInitializedEvent(MaxSdkBase.SdkConfiguration configuration)
         protected override void InternalShowBannerAd()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.BannerAdUnit.Id)) return;
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.BannerAdUnit.Id)) return;
             if (_isBannerDestroyed)
             {
-                MaxSdk.CreateBanner(Settings.MaxSettings.BannerAdUnit.Id, Settings.MaxSettings.BannerAdUnit.ConvertPosition());
+                MaxSdk.CreateBanner(AdSettings.MaxSettings.BannerAdUnit.Id, AdSettings.MaxSettings.BannerAdUnit.ConvertPosition());
                 _isBannerDestroyed = false;
             }
 
-            MaxSdk.ShowBanner(Settings.MaxSettings.BannerAdUnit.Id);
+            MaxSdk.ShowBanner(AdSettings.MaxSettings.BannerAdUnit.Id);
 #endif
         }
 
         protected override void InternalHideBannerAd()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.BannerAdUnit.Id)) return;
-            MaxSdk.HideBanner(Settings.MaxSettings.BannerAdUnit.Id);
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.BannerAdUnit.Id)) return;
+            MaxSdk.HideBanner(AdSettings.MaxSettings.BannerAdUnit.Id);
 #endif
         }
 
         protected override void InternalDestroyBannerAd()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.BannerAdUnit.Id)) return;
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.BannerAdUnit.Id)) return;
             _isBannerDestroyed = true;
-            MaxSdk.DestroyBanner(Settings.MaxSettings.BannerAdUnit.Id);
+            MaxSdk.DestroyBanner(AdSettings.MaxSettings.BannerAdUnit.Id);
 #endif
         }
 
         protected override void InternalLoadInterstitialAd()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.InterstitialAdUnit.Id)) return;
-            MaxSdk.LoadInterstitial(Settings.MaxSettings.InterstitialAdUnit.Id);
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.InterstitialAdUnit.Id)) return;
+            MaxSdk.LoadInterstitial(AdSettings.MaxSettings.InterstitialAdUnit.Id);
 #endif
         }
 
         protected override void InternalShowInterstitialAd()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.InterstitialAdUnit.Id)) return;
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.InterstitialAdUnit.Id)) return;
             R.isShowingAd = true;
-            MaxSdk.ShowInterstitial(Settings.MaxSettings.InterstitialAdUnit.Id);
+            MaxSdk.ShowInterstitial(AdSettings.MaxSettings.InterstitialAdUnit.Id);
 #endif
         }
 
         protected override bool InternalIsInterstitialAdReady()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.InterstitialAdUnit.Id)) return false;
-            return MaxSdk.IsInterstitialReady(Settings.MaxSettings.InterstitialAdUnit.Id);
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.InterstitialAdUnit.Id)) return false;
+            return MaxSdk.IsInterstitialReady(AdSettings.MaxSettings.InterstitialAdUnit.Id);
 #else
             return false;
 #endif
@@ -256,26 +256,26 @@ protected override bool InternalIsInterstitialAdReady()
         protected override void InternalLoadRewardedAd()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.RewardedAdUnit.Id)) return;
-            MaxSdk.LoadRewardedAd(Settings.MaxSettings.RewardedAdUnit.Id);
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.RewardedAdUnit.Id)) return;
+            MaxSdk.LoadRewardedAd(AdSettings.MaxSettings.RewardedAdUnit.Id);
 #endif
         }
 
         protected override void InternalShowRewardedAd()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.RewardedAdUnit.Id)) return;
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.RewardedAdUnit.Id)) return;
             _isRewardedCompleted = false;
             R.isShowingAd = true;
-            MaxSdk.ShowRewardedAd(Settings.MaxSettings.RewardedAdUnit.Id);
+            MaxSdk.ShowRewardedAd(AdSettings.MaxSettings.RewardedAdUnit.Id);
 #endif
         }
 
         protected override bool InternalIsRewardedAdReady()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.RewardedAdUnit.Id)) return false;
-            return MaxSdk.IsRewardedAdReady(Settings.MaxSettings.RewardedAdUnit.Id);
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.RewardedAdUnit.Id)) return false;
+            return MaxSdk.IsRewardedAdReady(AdSettings.MaxSettings.RewardedAdUnit.Id);
 #else
             return false;
 #endif
@@ -284,25 +284,25 @@ protected override bool InternalIsRewardedAdReady()
         protected override void InternalLoadRewardedInterstitialAd()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.RewardedInterstitialAdUnit.Id)) return;
-            MaxSdk.LoadRewardedInterstitialAd(Settings.MaxSettings.RewardedInterstitialAdUnit.Id);
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.RewardedInterstitialAdUnit.Id)) return;
+            MaxSdk.LoadRewardedInterstitialAd(AdSettings.MaxSettings.RewardedInterstitialAdUnit.Id);
 #endif
         }
 
         protected override void InternalShowRewardedInterstitialAd()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.RewardedInterstitialAdUnit.Id)) return;
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.RewardedInterstitialAdUnit.Id)) return;
             R.isShowingAd = true;
-            MaxSdk.ShowRewardedInterstitialAd(Settings.MaxSettings.RewardedInterstitialAdUnit.Id);
+            MaxSdk.ShowRewardedInterstitialAd(AdSettings.MaxSettings.RewardedInterstitialAdUnit.Id);
 #endif
         }
 
         protected override bool InternalIsRewardedInterstitialAdReady()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.RewardedInterstitialAdUnit.Id)) return false;
-            return MaxSdk.IsRewardedInterstitialAdReady(Settings.MaxSettings.RewardedInterstitialAdUnit.Id);
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.RewardedInterstitialAdUnit.Id)) return false;
+            return MaxSdk.IsRewardedInterstitialAdReady(AdSettings.MaxSettings.RewardedInterstitialAdUnit.Id);
 #else
             return false;
 #endif
@@ -311,24 +311,24 @@ protected override bool InternalIsRewardedInterstitialAdReady()
         protected override void InternalLoadAppOpenAd()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.AppOpenAdUnit.Id)) return;
-            MaxSdk.LoadAppOpenAd(Settings.MaxSettings.AppOpenAdUnit.Id);
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.AppOpenAdUnit.Id)) return;
+            MaxSdk.LoadAppOpenAd(AdSettings.MaxSettings.AppOpenAdUnit.Id);
 #endif
         }
 
         protected override void InternalShowAppOpenAd()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.AppOpenAdUnit.Id)) return;
-            MaxSdk.ShowAppOpenAd(Settings.MaxSettings.AppOpenAdUnit.Id);
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.AppOpenAdUnit.Id)) return;
+            MaxSdk.ShowAppOpenAd(AdSettings.MaxSettings.AppOpenAdUnit.Id);
 #endif
         }
 
         protected override bool InternalIsAppOpenAdReady()
         {
 #if PANCAKE_MAX_ENABLE
-            if (string.IsNullOrEmpty(Settings.MaxSettings.AppOpenAdUnit.Id)) return false;
-            return MaxSdk.IsAppOpenAdReady(Settings.MaxSettings.AppOpenAdUnit.Id);
+            if (string.IsNullOrEmpty(AdSettings.MaxSettings.AppOpenAdUnit.Id)) return false;
+            return MaxSdk.IsAppOpenAdReady(AdSettings.MaxSettings.AppOpenAdUnit.Id);
 #else
             return false;
 #endif

Runtime/Advertising/Runtime/Impl/Applovin/ApplovinBannerLoader.cs

@@ -22,10 +22,10 @@ private void Initialized()
             MaxSdkCallbacks.Banner.OnAdLoadFailedEvent += OnAdLoadFailed;
             MaxSdkCallbacks.Banner.OnAdCollapsedEvent += OnAdCollapsed;
             MaxSdkCallbacks.Banner.OnAdRevenuePaidEvent += OnAdRevenuePaid;
-            MaxSdk.CreateBanner(Settings.MaxSettings.BannerAdUnit.Id, Settings.MaxSettings.BannerAdUnit.ConvertPosition());
-            if (Settings.MaxSettings.BannerAdUnit.useAdaptiveBanner)
+            MaxSdk.CreateBanner(AdSettings.MaxSettings.BannerAdUnit.Id, AdSettings.MaxSettings.BannerAdUnit.ConvertPosition());
+            if (AdSettings.MaxSettings.BannerAdUnit.useAdaptiveBanner)
             {
-                MaxSdk.SetBannerExtraParameter(Settings.MaxSettings.BannerAdUnit.Id, "adaptive_banner", "true");
+                MaxSdk.SetBannerExtraParameter(AdSettings.MaxSettings.BannerAdUnit.Id, "adaptive_banner", "true");
             }
 #endif
         }

Runtime/Advertising/Runtime/Impl/Applovin/ApplovinInterstitialLoader.cs

@@ -32,7 +32,7 @@ private void OnAdHidden(string unit, MaxSdkBase.AdInfo info)
         {
             R.isShowingAd = false;
             _client.InvokeInterstitialAdHidden();
-            if (Settings.MaxSettings.EnableRequestAdAfterHidden) _client.LoadInterstitialAd();
+            if (AdSettings.MaxSettings.EnableRequestAdAfterHidden) _client.LoadInterstitialAd();
         }
 
         private void OnAdDisplayed(string unit, MaxSdkBase.AdInfo info) { _client.InvokeInterstitialAdDisplay(); }

Runtime/Advertising/Runtime/Impl/Applovin/ApplovinRewardedInterstitialLoader.cs

@@ -45,7 +45,7 @@ private void OnAdHidden(string unit, MaxSdkBase.AdInfo info)
         {
             R.isShowingAd = false;
             _client.InvokeRewardedInterstitialAdHidden();
-            if (Settings.MaxSettings.EnableRequestAdAfterHidden) _client.LoadRewardedInterstitialAd();
+            if (AdSettings.MaxSettings.EnableRequestAdAfterHidden) _client.LoadRewardedInterstitialAd();
         }
 
         private void OnAdDisplayed(string unit, MaxSdkBase.AdInfo info) { _client.InvokeRewardedInterstitialAdDisplay(); }

Runtime/Advertising/Runtime/Impl/Applovin/ApplovinRewardedLoader.cs

@@ -47,7 +47,7 @@ private void OnAdHidden(string unit, MaxSdkBase.AdInfo info)
         {
             R.isShowingAd = false;
             _client.InvokeRewardedAdHidden();
-            if (Settings.MaxSettings.EnableRequestAdAfterHidden) _client.LoadRewardedAd();
+            if (AdSettings.MaxSettings.EnableRequestAdAfterHidden) _client.LoadRewardedAd();
         }
 
         private void OnAdDisplayed(string unit, MaxSdkBase.AdInfo info) { _client.InvokeRewardedAdDisplay(); }

Runtime/Advertising/Runtime/Impl/IronSource/IronSourceAppOpenLoader.cs

@@ -24,7 +24,7 @@ public IronSourceAppOpenLoader(IronSourceAdClient client)
         {
             _client = client;
 #if PANCAKE_IRONSOURCE_ENABLE && PANCAKE_ADMOB_ENABLE
-            unit = Settings.IronSourceSettings.AppOpenAdUnit;
+            unit = AdSettings.IronSourceSettings.AppOpenAdUnit;
 #endif
         }
 #if PANCAKE_IRONSOURCE_ENABLE && PANCAKE_ADMOB_ENABLE