Merge pull request #16 from wolf-org/dev

Dev
unity-package · Sep 16, 2024 · 9ad4aac · 9ad4aac
2 parents c42a575 + 922b32d
commit 9ad4aac
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 11 deletions.
diff --git a/Module/Advertising/Editor/AdSettingsEditor.cs b/Module/Advertising/Editor/AdSettingsEditor.cs
@@ -14,7 +14,6 @@ public class AdSettingsEditor : Editor
         private SerializedProperty _adNetwork;
 
         private SerializedProperty _sdkKey;
-        private SerializedProperty _applovinEnableAgeRestrictedUser;
         private SerializedProperty _maxBannerAdUnit;
         private SerializedProperty _maxInterstitialAdUnit;
         private SerializedProperty _maxRewardAdUnit;
@@ -47,7 +46,6 @@ void Initialize()
             _adLoadingInterval = serializedObject.FindProperty("adLoadingInterval");
             _adNetwork = serializedObject.FindProperty("adNetwork");
             _sdkKey = serializedObject.FindProperty("sdkKey");
-            _applovinEnableAgeRestrictedUser = serializedObject.FindProperty("applovinEnableAgeRestrictedUser");
             _maxBannerAdUnit = serializedObject.FindProperty("maxBannerAdUnit");
             _maxInterstitialAdUnit = serializedObject.FindProperty("maxInterstitialAdUnit");
             _maxRewardAdUnit = serializedObject.FindProperty("maxRewardAdUnit");
@@ -123,7 +121,6 @@ void DrawMax()
             GUILayout.Space(5);
             EditorGUILayout.PropertyField(_sdkKey);
             GUILayout.Space(5);
-            EditorGUILayout.PropertyField(_applovinEnableAgeRestrictedUser);
             EditorGUILayout.PropertyField(_maxBannerAdUnit);
             EditorGUILayout.PropertyField(_maxInterstitialAdUnit);
             EditorGUILayout.PropertyField(_maxRewardAdUnit);

diff --git a/Module/Advertising/Runtime/General/AdSettings.cs b/Module/Advertising/Runtime/General/AdSettings.cs
@@ -24,15 +24,14 @@ public class AdSettings : ScriptableSettings<AdSettings>
         #region Max
 
         [TextArea, SerializeField] private string sdkKey;
-        [SerializeField] private bool applovinEnableAgeRestrictedUser;
         [SerializeField] private MaxBannerAdUnit maxBannerAdUnit;
         [SerializeField] private MaxInterstitialAdUnit maxInterstitialAdUnit;
         [SerializeField] private MaxRewardAdUnit maxRewardAdUnit;
         [SerializeField] private MaxRewardedInterstitialAdUnit maxRewardedInterstitialAdUnit;
         [SerializeField] private MaxAppOpenAdUnit maxAppOpenAdUnit;
 
         public string SdkKey => Instance.sdkKey;
-        public bool ApplovinEnableAgeRestrictedUser => Instance.applovinEnableAgeRestrictedUser;
+
         public MaxBannerAdUnit MaxBannerAdUnit => Instance.maxBannerAdUnit;
         public MaxInterstitialAdUnit MaxInterstitialAdUnit => Instance.maxInterstitialAdUnit;
         public MaxRewardAdUnit MaxRewardAdUnit => Instance.maxRewardAdUnit;

diff --git a/Module/Advertising/Runtime/Max/MaxAdClient.cs b/Module/Advertising/Runtime/Max/MaxAdClient.cs
@@ -9,7 +9,6 @@ public override void Initialize()
 #if VIRTUESKY_ADS && VIRTUESKY_APPLOVIN
             MaxSdk.SetSdkKey(adSettings.SdkKey);
             MaxSdk.InitializeSdk();
-            MaxSdk.SetIsAgeRestrictedUser(adSettings.ApplovinEnableAgeRestrictedUser);
             adSettings.MaxBannerAdUnit.Init();
             adSettings.MaxInterstitialAdUnit.Init();
             adSettings.MaxRewardAdUnit.Init();

diff --git a/Module/ControlPanel/ConstantPackage.cs b/Module/ControlPanel/ConstantPackage.cs
@@ -2,7 +2,7 @@
 {
     public class ConstantPackage
     {
-        public const string VersionUnityCommon = "1.3.5";
+        public const string VersionUnityCommon = "1.3.6";
         public const string PackageNameInAppPurchase = "com.unity.purchasing";
         public const string MaxVersionInAppPurchase = "4.12.2";
         public const string PackageNameNewtonsoftJson = "com.unity.nuget.newtonsoft-json";

diff --git a/Module/Utils/Editor/UnityPackage/Note_Package.txt b/Module/Utils/Editor/UnityPackage/Note_Package.txt
@@ -1,4 +1,4 @@
-- Version Max Sdk: 6.6.3
+- Version Max Sdk: 7.0.0
 - Version Admob Sdk: v9.2.0
 - Version IronSource Sdk: v8.1.0
 - Version Google Game Play Service: v11.01
diff --git a/Module/Utils/Editor/UnityPackage/max-sdk.unitypackage b/Module/Utils/Editor/UnityPackage/max-sdk.unitypackage
diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@
 ### 1: Download the repo and drop it into folder `Assets`
 ### 2: Add the line below to `Packages/manifest.json`
 
-for version `1.3.5`
+for version `1.3.6`
 ```csharp
-"com.wolf-org.sunflower2":"https://github.com/wolf-org/sunflower_2.git#1.3.5",
+"com.wolf-org.sunflower2":"https://github.com/wolf-org/sunflower_2.git#1.3.6",
 ```
 
 ## Includes modules

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "com.wolf-org.sunflower2",
   "displayName": "Sunflower2",
   "description": "Core singleton for building Unity games ",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "unity": "2022.3",
   "category": "virtuesky",
   "license": "MIT",