Merge pull request #50 from VirtueSky/dev

Dev
VirtueSky · Feb 24, 2025 · 313fb58 · 313fb58
2 parents 3365aa7 + f2f2afe
commit 313fb58
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@
 ### 1: Download the repository and drop it into folder `Assets`
 ### 2: Add the line below to `Packages/manifest.json`
 
-for version `3.2.9`
+for version `3.3.0`
 ```csharp
-"com.virtuesky.sunflower":"/~https://github.com/VirtueSky/sunflower.git#3.2.9",
+"com.virtuesky.sunflower":"/~https://github.com/VirtueSky/sunflower.git#3.3.0",
 ```
 
 ## Includes modules

diff --git a/VirtueSky/Advertising/Editor/AdSettingEditor.cs b/VirtueSky/Advertising/Editor/AdSettingEditor.cs
@@ -19,7 +19,6 @@ public class AdSettingEditor : Editor
         private SerializedProperty _maxBannerVariable;
         private SerializedProperty _maxInterVariable;
         private SerializedProperty _maxRewardVariable;
-        private SerializedProperty _maxRewardInterVariable;
         private SerializedProperty _maxAppOpenVariable;
 
 
@@ -29,6 +28,7 @@ public class AdSettingEditor : Editor
         private SerializedProperty _admobRewardInterVariable;
         private SerializedProperty _admobAppOpenVariable;
         private SerializedProperty _admobNativeOverlayVariable;
+        private SerializedProperty _autoTrackingAdImpressionAdmob;
         private SerializedProperty _admobEnableTestMode;
         private SerializedProperty _enableGDPR;
         private SerializedProperty _enableGDPRTestMode;
@@ -56,7 +56,6 @@ void Initialize()
             _maxBannerVariable = serializedObject.FindProperty("maxBannerVariable");
             _maxInterVariable = serializedObject.FindProperty("maxInterVariable");
             _maxRewardVariable = serializedObject.FindProperty("maxRewardVariable");
-            _maxRewardInterVariable = serializedObject.FindProperty("maxRewardInterVariable");
             _maxAppOpenVariable = serializedObject.FindProperty("maxAppOpenVariable");
 
             _admobBannerVariable = serializedObject.FindProperty("admobBannerVariable");
@@ -65,6 +64,7 @@ void Initialize()
             _admobRewardInterVariable = serializedObject.FindProperty("admobRewardInterVariable");
             _admobAppOpenVariable = serializedObject.FindProperty("admobAppOpenVariable");
             _admobNativeOverlayVariable = serializedObject.FindProperty("admobNativeOverlayVariable");
+            _autoTrackingAdImpressionAdmob = serializedObject.FindProperty("autoTrackingAdImpressionAdmob");
             _admobEnableTestMode = serializedObject.FindProperty("admobEnableTestMode");
             _admobDevicesTest = serializedObject.FindProperty("admobDevicesTest");
             _enableGDPR = serializedObject.FindProperty("enableGDPR");
@@ -263,6 +263,7 @@ void SetupAdmob()
             }
 
             EditorGUILayout.EndHorizontal();
+            EditorGUILayout.PropertyField(_autoTrackingAdImpressionAdmob);
             EditorGUILayout.PropertyField(_admobEnableTestMode);
             EditorGUILayout.PropertyField(_admobDevicesTest);
             GUI.enabled = false;

diff --git a/VirtueSky/Advertising/Runtime/General/AdClient.cs b/VirtueSky/Advertising/Runtime/General/AdClient.cs
@@ -1,3 +1,5 @@
+using VirtueSky.Tracking;
+
 namespace VirtueSky.Ads
 {
     public abstract class AdClient
@@ -8,6 +10,7 @@ public abstract class AdClient
         public void SetupAdSetting(AdSetting _adSetting)
         {
             this.adSetting = _adSetting;
+            FirebaseAnalyticTrackingRevenue.autoTrackAdImpressionAdmob = adSetting.AutoTrackingAdImpressionAdmob;
         }
 
         public abstract void Initialize();

diff --git a/VirtueSky/Advertising/Runtime/General/AdSetting.cs b/VirtueSky/Advertising/Runtime/General/AdSetting.cs
@@ -56,6 +56,12 @@ public AdNetwork CurrentAdNetwork
         [SerializeField] private AdmobRewardInterVariable admobRewardInterVariable;
         [SerializeField] private AdmobAppOpenVariable admobAppOpenVariable;
         [SerializeField] private AdmobNativeOverlayVariable admobNativeOverlayVariable;
+
+        [Tooltip(
+             "If you enable and connect admob with firebase, ad_impression will be automatically tracked. If you disable and disconnect admob with firebase, ad_impression will be tracked manually."),
+         SerializeField]
+        private bool autoTrackingAdImpressionAdmob = true;
+
         [SerializeField] private bool admobEnableTestMode;
         [SerializeField] private List<string> admobDevicesTest;
         public AdmobBannerVariable AdmobBannerVariable => admobBannerVariable;
@@ -65,6 +71,7 @@ public AdNetwork CurrentAdNetwork
         public AdmobAppOpenVariable AdmobAppOpenVariable => admobAppOpenVariable;
         public AdmobNativeOverlayVariable AdmobNativeOverlayVariable => admobNativeOverlayVariable;
         public bool AdmobEnableTestMode => admobEnableTestMode;
+        public bool AutoTrackingAdImpressionAdmob => autoTrackingAdImpressionAdmob;
 
         public List<string> AdmobDevicesTest => admobDevicesTest;
 

diff --git a/VirtueSky/ControlPanel/ConstantPackage.cs b/VirtueSky/ControlPanel/ConstantPackage.cs
@@ -2,7 +2,7 @@
 {
     public class ConstantPackage
     {
-        public const string VersionSunflower = "3.2.9";
+        public const string VersionSunflower = "3.3.0";
         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/VirtueSky/Tracking/Runtime/FirebaseAnalyticTracking/FirebaseAnalyticTrackingRevenue.cs b/VirtueSky/Tracking/Runtime/FirebaseAnalyticTracking/FirebaseAnalyticTrackingRevenue.cs
@@ -8,6 +8,7 @@ namespace VirtueSky.Tracking
     public struct FirebaseAnalyticTrackingRevenue
     {
         public static Action OnTracked;
+        public static bool autoTrackAdImpressionAdmob;
 
         public static void FirebaseAnalyticTrackRevenue(double value, string network, string unitId,
             string format, string currentAdSettingNetwork)
@@ -17,7 +18,10 @@ public static void FirebaseAnalyticTrackRevenue(double value, string network, st
             switch (currentAdSettingNetwork.ToLower())
             {
                 case "admob":
-                    return;
+                    if (autoTrackAdImpressionAdmob) return;
+                    ad_platform = "Admob";
+                    break;
+
                 case "max":
                     ad_platform = "AppLovin";
                     break;

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "com.virtuesky.sunflower",
   "displayName": "Sunflower",
   "description": "Core ScriptableObject Architecture for building Unity games",
-  "version": "3.2.9",
+  "version": "3.3.0",
   "unity": "2022.3",
   "category": "virtuesky",
   "license": "MIT",