h5sdk提交

Assets/AppsFlyer/AFAdRevenueData.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+
+namespace AppsFlyerSDK
+{
+    public enum MediationNetwork : ulong
+    {      
+        GoogleAdMob = 1,
+        IronSource = 2,
+        ApplovinMax = 3,
+        Fyber = 4,
+        Appodeal = 5,
+        Admost = 6,
+        Topon = 7,
+        Tradplus = 8,
+        Yandex = 9,
+        ChartBoost = 10,
+        Unity = 11,
+        ToponPte = 12,
+        Custom = 13,
+        DirectMonetization = 14
+    }
+
+    public static class AdRevenueScheme
+    {
+        /**
+        * code ISO 3166-1 format
+        */
+        public const string COUNTRY = "country";
+
+        /**
+        * ID of the ad unit for the impression
+        */
+        public const string AD_UNIT = "ad_unit";
+
+        /**
+        * Format of the ad
+        */
+        public const string AD_TYPE = "ad_type";
+
+        /**
+        * ID of the ad placement for the impression
+        */
+        public const string PLACEMENT = "placement";
+    }
+
+    /// <summary>
+    // Data class representing ad revenue information.
+    //
+    // @property monetizationNetwork The name of the network that monetized the ad.
+    // @property mediationNetwork An instance of MediationNetwork representing the mediation service used.
+    // @property currencyIso4217Code The ISO 4217 currency code describing the currency of the revenue.
+    // @property eventRevenue The amount of revenue generated by the ad.
+    /// </summary>
+    public class AFAdRevenueData
+    {
+        public string monetizationNetwork { get; private set; }
+        public MediationNetwork mediationNetwork { get; private set; }
+        public string currencyIso4217Code { get; private set; }
+        public double eventRevenue { get; private set; }
+
+        public AFAdRevenueData(string monetization, MediationNetwork mediation, string currency, double revenue)
+        {
+            monetizationNetwork = monetization;
+            mediationNetwork = mediation;
+            currencyIso4217Code = currency;
+            eventRevenue = revenue;
+        }
+    }
+
+}

Assets/AppsFlyer/AFAdRevenueData.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f50146027f5719447af5e0f720a16cbd
+guid: 49e1906ae949e4bfea400bd1da9f7e39
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/AppsFlyer/AFPurchaseDetailsAndroid.cs

@@ -10,24 +10,19 @@ namespace AppsFlyerSDK
     }
 
     /// <summary>
-    // 
+    /// Purchase details class matching Android SDK AFPurchaseDetails
     /// </summary>
     public class AFPurchaseDetailsAndroid
-
     {
         public AFPurchaseType purchaseType { get; private set; }
         public string purchaseToken { get; private set; }
         public string productId { get; private set; }
-        public string price { get; private set; }
-        public string currency { get; private set; }
 
-        public AFPurchaseDetailsAndroid(AFPurchaseType type, String purchaseToken, String productId, String price, String currency)
+        public AFPurchaseDetailsAndroid(AFPurchaseType type, String purchaseToken, String productId)
         {
             this.purchaseType = type;
             this.purchaseToken = purchaseToken;
             this.productId = productId;
-            this.price = price;
-            this.currency = currency;
         }
 
     }

Assets/AppsFlyer/AFSDKPurchaseDetailsIOS.cs

@@ -4,26 +4,33 @@ using System.Collections.Generic;
 namespace AppsFlyerSDK
 {
     /// <summary>
-    // 
+    /// Purchase type enum matching iOS SDK AFSDKPurchaseType
+    /// </summary>
+    public enum AFSDKPurchaseType
+    {
+        Subscription,
+        OneTimePurchase
+    }
+
+    /// <summary>
+    /// Purchase details class matching iOS SDK AFSDKPurchaseDetails
     /// </summary>
     public class AFSDKPurchaseDetailsIOS
     {
         public string productId { get; private set; }
-        public string price { get; private set; }
-        public string currency { get; private set; }
         public string transactionId { get; private set; }
+        public AFSDKPurchaseType purchaseType { get; private set; }
 
-        private AFSDKPurchaseDetailsIOS(string productId, string price, string currency, string transactionId)
+        private AFSDKPurchaseDetailsIOS(string productId, string transactionId, AFSDKPurchaseType purchaseType)
         {
             this.productId = productId;
-            this.price = price;
-            this.currency = currency;
             this.transactionId = transactionId;
+            this.purchaseType = purchaseType;
         }
 
-        public static AFSDKPurchaseDetailsIOS Init(string productId, string price, string currency, string transactionId)
+        public static AFSDKPurchaseDetailsIOS Init(string productId, string transactionId, AFSDKPurchaseType purchaseType)
         {
-            return new AFSDKPurchaseDetailsIOS(productId, price, currency, transactionId);
+            return new AFSDKPurchaseDetailsIOS(productId, transactionId, purchaseType);
         }
     }
 

Assets/AppsFlyer/AppsFlyer.cs

@@ -6,14 +6,14 @@ namespace AppsFlyerSDK
 {
     public class AppsFlyer : MonoBehaviour
     {
-        public static readonly string kAppsFlyerPluginVersion = "6.14.5";
+        public static readonly string kAppsFlyerPluginVersion = "6.17.91";
         public static string CallBackObjectName = null;
         private static EventHandler onRequestResponse;
         private static EventHandler onInAppResponse;
         private static EventHandler onDeepLinkReceived;
         public static IAppsFlyerNativeBridge instance = null;
         public delegate void unityCallBack(string message);
-        public static string currType = "USD";
+
 
         /// <summary>
         /// Initialize the AppsFlyer SDK with your devKey and appID.
@@ -317,7 +317,6 @@ namespace AppsFlyerSDK
                 instance.setCurrencyCode(currencyCode);
 #else
 #endif
-                if(currencyCode!="")   currType = currencyCode;
         }
         }
 
@@ -333,6 +332,19 @@ namespace AppsFlyerSDK
             }
         }
 
+        /// <summary>
+        /// Logs ad revenue data along with additional parameters if provided.
+        /// </summary>
+        /// <param name = "adRevenueData" >instance of AFAdRevenueData containing ad revenue information.</param>
+        /// <param name = "additionalParameters" >An optional map of additional parameters to be logged with ad revenue data. This can be null if there are no additional parameters.</param>
+        public static void logAdRevenue(AFAdRevenueData adRevenueData, Dictionary<string, string> additionalParameters)
+        {
+            if (instance != null)
+            {
+                instance.logAdRevenue(adRevenueData, additionalParameters);
+            }
+        }
+
         /// <summary>
         /// Manually record the location of the user.
         /// </summary>
@@ -756,6 +768,11 @@ namespace AppsFlyerSDK
             }
         }
 
+        /// <summary>
+        /// [Deprecated] Validates an in-app purchase on iOS.
+        /// Use the V2 overload with AFSDKPurchaseDetailsIOS instead.
+        /// </summary>
+        [System.Obsolete("This method is deprecated. Use validateAndSendInAppPurchase(AFSDKPurchaseDetailsIOS details, Dictionary<string, string> purchaseAdditionalDetails, MonoBehaviour gameObject) instead.")]
         public static void validateAndSendInAppPurchase(string productIdentifier, string price, string currency, string transactionId, Dictionary<string, string> additionalParameters, MonoBehaviour gameObject)
         {
             if (instance != null && instance is IAppsFlyerIOSBridge)
@@ -765,16 +782,23 @@ namespace AppsFlyerSDK
             }
         }
 
-        // V2 
-        public static void validateAndSendInAppPurchase(AFSDKPurchaseDetailsIOS details, Dictionary<string, string> extraEventValues, MonoBehaviour gameObject)
+        /// <summary>
+        /// Validates an in-app purchase on iOS using the V2 API.
+        /// </summary>
+        public static void validateAndSendInAppPurchase(AFSDKPurchaseDetailsIOS details, Dictionary<string, string> purchaseAdditionalDetails, MonoBehaviour gameObject)
         {
             if (instance != null && instance is IAppsFlyerIOSBridge)
             {
                 IAppsFlyerIOSBridge appsFlyeriOSInstance = (IAppsFlyerIOSBridge)instance;
-                appsFlyeriOSInstance.validateAndSendInAppPurchase(details, extraEventValues, gameObject);
+                appsFlyeriOSInstance.validateAndSendInAppPurchase(details, purchaseAdditionalDetails, gameObject);
             }
         }
 
+        /// <summary>
+        /// [Deprecated] Validates an in-app purchase on Android.
+        /// Use the V2 overload with AFPurchaseDetailsAndroid instead.
+        /// </summary>
+        [System.Obsolete("This method is deprecated. Use validateAndSendInAppPurchase(AFPurchaseDetailsAndroid details, Dictionary<string, string> purchaseAdditionalDetails, MonoBehaviour gameObject) instead.")]
         public static void validateAndSendInAppPurchase(string publicKey, string signature, string purchaseData, string price, string currency, Dictionary<string, string> additionalParameters, MonoBehaviour gameObject)
         {
             if (instance != null && instance is IAppsFlyerAndroidBridge)
@@ -784,13 +808,15 @@ namespace AppsFlyerSDK
             }
         }
 
-        // V2
-        public static void validateAndSendInAppPurchase(AFPurchaseDetailsAndroid details, Dictionary<string, string> additionalParameters, MonoBehaviour gameObject)
+        /// <summary>
+        /// Validates an in-app purchase on Android using the V2 API.
+        /// </summary>
+        public static void validateAndSendInAppPurchase(AFPurchaseDetailsAndroid details, Dictionary<string, string> purchaseAdditionalDetails, MonoBehaviour gameObject)
         {
             if (instance != null && instance is IAppsFlyerAndroidBridge)
             {
                 IAppsFlyerAndroidBridge appsFlyerAndroidInstance = (IAppsFlyerAndroidBridge)instance;
-                appsFlyerAndroidInstance.validateAndSendInAppPurchase(details, additionalParameters, gameObject);
+                appsFlyerAndroidInstance.validateAndSendInAppPurchase(details, purchaseAdditionalDetails, gameObject);
             }
         }
 

Assets/AppsFlyer/AppsFlyerAndroid.cs

@@ -398,7 +398,23 @@ namespace AppsFlyerSDK
         public void setConsentData(AppsFlyerConsent appsFlyerConsent)
         {
 #if !UNITY_EDITOR
-            appsFlyerAndroid.CallStatic("setConsentData", appsFlyerConsent.isUserSubjectToGDPR, appsFlyerConsent.hasConsentForDataUsage, appsFlyerConsent.hasConsentForAdsPersonalization);
+           string isUserSubjectToGDPR = appsFlyerConsent.isUserSubjectToGDPR?.ToString().ToLower() ?? "null";
+           string hasConsentForDataUsage = appsFlyerConsent.hasConsentForDataUsage?.ToString().ToLower() ?? "null";
+           string hasConsentForAdsPersonalization = appsFlyerConsent.hasConsentForAdsPersonalization?.ToString().ToLower() ?? "null";
+           string hasConsentForAdStorage = appsFlyerConsent.hasConsentForAdStorage?.ToString().ToLower() ?? "null";
+
+           appsFlyerAndroid.CallStatic("setConsentData", isUserSubjectToGDPR, hasConsentForDataUsage, hasConsentForAdsPersonalization, hasConsentForAdStorage);
+#endif
+        }
+
+        /// <summary>
+        /// Logs ad revenue data along with additional parameters if provided.
+        /// <param name = "adRevenueData" >instance of AFAdRevenueData containing ad revenue information.</param>
+        /// <param name = "additionalParameters" >An optional map of additional parameters to be logged with ad revenue data. This can be null if there are no additional parameters.</param>
+        public void logAdRevenue(AFAdRevenueData adRevenueData, Dictionary<string, string> additionalParameters)
+        {
+#if !UNITY_EDITOR
+            appsFlyerAndroid.CallStatic("logAdRevenue", adRevenueData.monetizationNetwork, getMediationNetwork(adRevenueData.mediationNetwork), adRevenueData.currencyIso4217Code, adRevenueData.eventRevenue, convertDictionaryToJavaMap(additionalParameters));
 #endif
         }
 
@@ -468,7 +484,7 @@ namespace AppsFlyerSDK
         }
 
         /// <summary>
-        /// API for server verification of in-app purchases.
+        /// [Deprecated] API for server verification of in-app purchases - please use V2 with AFPurchaseDetailsAndroid instead.
         /// An af_purchase event with the relevant values will be automatically sent if the validation is successful.
         /// </summary>
         /// <param name="publicKey">License Key obtained from the Google Play Console.</param>
@@ -477,6 +493,7 @@ namespace AppsFlyerSDK
         /// <param name="price">Purchase price, should be derived from <code>skuDetails.getStringArrayList("DETAILS_LIST")</code></param>
         /// <param name="currency">Purchase currency, should be derived from <code>skuDetails.getStringArrayList("DETAILS_LIST")</code></param>
         /// <param name="additionalParameters">additionalParameters Freehand parameters to be sent with the purchase (if validated).</param>
+        [System.Obsolete("This method is deprecated. Use validateAndSendInAppPurchase(AFPurchaseDetailsAndroid details, Dictionary<string, string> purchaseAdditionalDetails, MonoBehaviour gameObject) instead.")]
         public void validateAndSendInAppPurchase(string publicKey, string signature, string purchaseData, string price, string currency, Dictionary<string, string> additionalParameters, MonoBehaviour gameObject)
         {
 #if !UNITY_EDITOR
@@ -485,15 +502,15 @@ namespace AppsFlyerSDK
         }
 
         /// <summary>
-        /// API for server verification of in-app purchases.
+        /// V2 - API for server verification of in-app purchases.
         /// An af_purchase event with the relevant values will be automatically sent if the validation is successful.
         /// </summary>
         /// <param name="details">AFPurchaseDetailsAndroid instance.</param>
-        /// <param name="additionalParameters">additionalParameters Freehand parameters to be sent with the purchase (if validated).</param>
-        public void validateAndSendInAppPurchase(AFPurchaseDetailsAndroid details, Dictionary<string, string> additionalParameters, MonoBehaviour gameObject)
+        /// <param name="purchaseAdditionalDetails">purchaseAdditionalDetails Freehand parameters to be sent with the purchase (if validated).</param>
+        public void validateAndSendInAppPurchase(AFPurchaseDetailsAndroid details, Dictionary<string, string> purchaseAdditionalDetails, MonoBehaviour gameObject)
         {
 #if !UNITY_EDITOR
-           appsFlyerAndroid.CallStatic("validateAndTrackInAppPurchaseV2", (int)details.purchaseType, details.purchaseToken, details.productId, details.price, details.currency, convertDictionaryToJavaMap(additionalParameters), gameObject ? gameObject.name : null);
+           appsFlyerAndroid.CallStatic("validateAndTrackInAppPurchaseV2", (int)details.purchaseType, details.purchaseToken, details.productId, convertDictionaryToJavaMap(purchaseAdditionalDetails), gameObject ? gameObject.name : null);
 #endif
         }
 
@@ -749,6 +766,65 @@ namespace AppsFlyerSDK
             return emailsCryptType;
         }
 
+        /// <summary>
+        /// Internal Helper Method.
+        /// </summary>
+        private static AndroidJavaObject getMediationNetwork(MediationNetwork mediationNetwork)
+        {
+            AndroidJavaClass mediationNetworkEnumClass = new AndroidJavaClass("com.appsflyer.MediationNetwork");
+            AndroidJavaObject mediationNetworkObject;
+
+            switch (mediationNetwork)
+            {
+                case MediationNetwork.IronSource:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("IRONSOURCE");
+                    break;
+                case MediationNetwork.ApplovinMax:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("APPLOVIN_MAX");
+                    break;
+                case MediationNetwork.GoogleAdMob:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("GOOGLE_ADMOB");
+                    break;
+                case MediationNetwork.Fyber:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("FYBER");
+                    break;
+                case MediationNetwork.Appodeal:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("APPODEAL");
+                    break;
+                case MediationNetwork.Admost:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("ADMOST");
+                    break;
+                case MediationNetwork.Topon:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("TOPON");
+                    break;
+                case MediationNetwork.Tradplus:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("TRADPLUS");
+                    break;
+                case MediationNetwork.Yandex:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("YANDEX");
+                    break;
+                case MediationNetwork.ChartBoost:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("CHARTBOOST");
+                    break;
+                case MediationNetwork.Unity:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("UNITY");
+                    break;
+                case MediationNetwork.ToponPte:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("TOPON_PTE");
+                    break;
+                case MediationNetwork.Custom:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("CUSTOM_MEDIATION");
+                    break;
+                case MediationNetwork.DirectMonetization:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("DIRECT_MONETIZATION_NETWORK");
+                    break;
+                default:
+                    mediationNetworkObject = mediationNetworkEnumClass.GetStatic<AndroidJavaObject>("NONE");
+                    break;
+        }
+        return mediationNetworkObject;
+        }
+
         /// <summary>
         /// Internal Helper Method.
         /// </summary>
@@ -771,9 +847,6 @@ namespace AppsFlyerSDK
             return map;
         }
     }
-
 #endif
 
-
-
 }

Assets/AppsFlyer/AppsFlyerConsent.cs

@@ -10,26 +10,45 @@ namespace AppsFlyerSDK
     // This class should be used to notify and record the user's applicability
     // under GDPR, their general consent to data usage, and their consent to personalized
     // advertisements based on user data.
- 
-    // Note that the consent for data usage and ads personalization pair is only applicable when the user is
-    // subject to GDPR guidelines. Therefore, the following factory methods should be used accordingly:
-    // - Use [forGDPRUser] when the user is subject to GDPR.
-    // - Use [forNonGDPRUser] when the user is not subject to GDPR.
     
-    // @property isUserSubjectToGDPR Indicates whether GDPR regulations apply to the user (true if the user is
-    //  a  subject of GDPR). It also serves as a flag for compliance with relevant aspects of DMA regulations.
-    // @property hasConsentForDataUsage Indicates whether the user has consented to the use of their data for advertising
-    //  purposes under both GDPR and DMA guidelines (true if the user has consented, nullable if not subject to GDPR).
-    // @property hasConsentForAdsPersonalization Indicates whether the user has consented to the use of their data for
-    //  personalized advertising within the boundaries of GDPR and DMA rules (true if the user has consented to
-    //  personalized ads, nullable if not subject to GDPR).
+    /// ## Properties:
+    /// - `isUserSubjectToGDPR` (optional) - Indicates whether GDPR regulations apply to the user. 
+    ///   This may also serve as a general compliance flag for other regional regulations.
+    /// - `hasConsentForDataUsage` (optional) - Indicates whether the user consents to the processing 
+    ///   of their data for advertising purposes.
+    /// - `hasConsentForAdsPersonalization` (optional) - Indicates whether the user consents to the 
+    ///   use of their data for personalized advertising.
+    /// - `hasConsentForAdStorage` (optional) - Indicates whether the user consents to ad-related storage access.
+    ///
+    /// **Usage Example:**
+    /// ```csharp
+    /// var consent = new AppsFlyerConsent(
+    ///     isUserSubjectToGDPR: true, 
+    ///     hasConsentForDataUsage: true, 
+    ///     hasConsentForAdsPersonalization: false, 
+    ///     hasConsentForAdStorage: true
+    /// );
+    /// **Deprecated APIs:**
+    /// - `ForGDPRUser(...)` and `ForNonGDPRUser(...)` should no longer be used.
+    /// - Use `new AppsFlyerConsent(...)` instead with relevant consent fields.
+    ///
     /// </summary>
     public class AppsFlyerConsent
     {
-        public bool isUserSubjectToGDPR { get; private set; }
-        public bool hasConsentForDataUsage { get; private set; }
-        public bool hasConsentForAdsPersonalization { get; private set; }
+        public bool? isUserSubjectToGDPR { get; private set; }
+        public bool? hasConsentForDataUsage { get; private set; }
+        public bool? hasConsentForAdsPersonalization { get; private set; }
+        public bool? hasConsentForAdStorage { get; private set; }
 
+        public AppsFlyerConsent( bool? isUserSubjectToGDPR = null, bool? hasConsentForDataUsage = null, bool? hasConsentForAdsPersonalization = null, bool? hasConsentForAdStorage = null)
+        {
+            this.isUserSubjectToGDPR = isUserSubjectToGDPR;
+            this.hasConsentForDataUsage = hasConsentForDataUsage;
+            this.hasConsentForAdsPersonalization = hasConsentForAdsPersonalization;
+            this.hasConsentForAdStorage = hasConsentForAdStorage;
+        }
+
+        [Obsolete("Use the new constructor with optional booleans instead.")]
         private AppsFlyerConsent(bool isGDPR, bool hasForDataUsage, bool hasForAdsPersonalization)
         {
             isUserSubjectToGDPR = isGDPR;
@@ -37,15 +56,16 @@ namespace AppsFlyerSDK
             hasConsentForAdsPersonalization = hasForAdsPersonalization;
         }
 
+        [Obsolete("Use new AppsFlyerConsent(...) instead.")]
         public static AppsFlyerConsent ForGDPRUser(bool hasConsentForDataUsage, bool hasConsentForAdsPersonalization)
         {
             return new AppsFlyerConsent(true, hasConsentForDataUsage, hasConsentForAdsPersonalization);
         }
 
+        [Obsolete("Use new AppsFlyerConsent(...) instead.")]
         public static AppsFlyerConsent ForNonGDPRUser()
         {
-            return new AppsFlyerConsent(false, false, false);
+            return new AppsFlyerConsent(false);
         }
     }
-
 }

Assets/AppsFlyer/AppsFlyerPurchaseConnector.cs

@@ -0,0 +1,426 @@
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using UnityEngine;
+using System;
+
+namespace AppsFlyerSDK
+{
+
+        public interface IAppsFlyerPurchaseRevenueDataSource
+        {
+                Dictionary<string, object> PurchaseRevenueAdditionalParametersForProducts(HashSet<object> products, HashSet<object> transactions);
+        }
+
+        public interface IAppsFlyerPurchaseRevenueDataSourceStoreKit2
+        {
+                Dictionary<string, object> PurchaseRevenueAdditionalParametersStoreKit2ForProducts(HashSet<object> products, HashSet<object> transactions);
+        }
+
+        public class AppsFlyerPurchaseRevenueBridge : MonoBehaviour
+        {
+                        #if UNITY_IOS && !UNITY_EDITOR
+[DllImport("__Internal")]
+private static extern void RegisterUnityPurchaseRevenueParamsCallback(Func<string, string, string> callback);
+
+[DllImport("__Internal")]
+private static extern void RegisterUnityPurchaseRevenueParamsCallbackSK2(Func<string, string, string> callback);
+#endif
+                
+                private static IAppsFlyerPurchaseRevenueDataSource _dataSource;
+                private static IAppsFlyerPurchaseRevenueDataSourceStoreKit2 _dataSourceSK2;
+
+                public static void RegisterDataSource(IAppsFlyerPurchaseRevenueDataSource dataSource)
+                {
+                        _dataSource = dataSource;
+        #if UNITY_IOS && !UNITY_EDITOR
+                        RegisterUnityPurchaseRevenueParamsCallback(GetAdditionalParameters);
+        #elif UNITY_ANDROID && !UNITY_EDITOR
+                        using (AndroidJavaClass jc = new AndroidJavaClass("com.appsflyer.unity.PurchaseRevenueBridge"))
+                        {
+                                jc.CallStatic("setUnityBridge", new UnityPurchaseRevenueBridgeProxy());
+                        }
+        #endif
+                }
+
+                public static void RegisterDataSourceStoreKit2(IAppsFlyerPurchaseRevenueDataSourceStoreKit2 dataSource)
+                {
+                #if UNITY_IOS && !UNITY_EDITOR
+                        _dataSourceSK2 = dataSource;
+                        RegisterUnityPurchaseRevenueParamsCallbackSK2(GetAdditionalParametersSK2);
+                #endif
+                }
+
+                public static Dictionary<string, object> GetAdditionalParametersForAndroid(HashSet<object> products, HashSet<object> transactions)
+                {
+                        return _dataSource?.PurchaseRevenueAdditionalParametersForProducts(products, transactions)
+                        ?? new Dictionary<string, object>();
+                }
+
+        #if UNITY_IOS && !UNITY_EDITOR
+                [AOT.MonoPInvokeCallback(typeof(Func<string, string, string>))]
+                public static string GetAdditionalParameters(string productsJson, string transactionsJson)
+                {
+                        try
+                        {
+                                HashSet<object> products = new HashSet<object>();
+                                HashSet<object> transactions = new HashSet<object>();
+
+                                if (!string.IsNullOrEmpty(productsJson))
+                                {
+                                var dict = AFMiniJSON.Json.Deserialize(productsJson) as Dictionary<string, object>;
+                                if (dict != null)
+                                {
+                                        if (dict.TryGetValue("products", out var productsObj) && productsObj is List<object> productList)
+                                        products = new HashSet<object>(productList);
+
+                                        if (dict.TryGetValue("transactions", out var transactionsObj) && transactionsObj is List<object> transactionList)
+                                        transactions = new HashSet<object>(transactionList);
+                                }
+                                }
+
+                                var parameters = _dataSource?.PurchaseRevenueAdditionalParametersForProducts(products, transactions)
+                                                ?? new Dictionary<string, object>();
+                                return AFMiniJSON.Json.Serialize(parameters);
+                        }
+                        catch (Exception e)
+                        {
+                                Debug.LogError($"[AppsFlyer] Exception in GetAdditionalParameters: {e}");
+                                return "{}";
+                        }
+                }
+        #endif
+
+        #if UNITY_IOS && !UNITY_EDITOR
+                [AOT.MonoPInvokeCallback(typeof(Func<string, string, string>))]
+                public static string GetAdditionalParametersSK2(string productsJson, string transactionsJson)
+                {
+                        try
+                        {
+                                HashSet<object> products = new HashSet<object>();
+                                HashSet<object> transactions = new HashSet<object>();
+
+                                if (!string.IsNullOrEmpty(productsJson))
+                                {
+                                        var dict = AFMiniJSON.Json.Deserialize(productsJson) as Dictionary<string, object>;
+                                        if (dict != null && dict.TryGetValue("products", out var productsObj) && productsObj is List<object> productList)
+                                                products = new HashSet<object>(productList);
+                                }
+                                if (!string.IsNullOrEmpty(transactionsJson))
+                                {
+                                        var dict = AFMiniJSON.Json.Deserialize(transactionsJson) as Dictionary<string, object>;
+                                        if (dict != null && dict.TryGetValue("transactions", out var transactionsObj) && transactionsObj is List<object> transactionList)
+                                                transactions = new HashSet<object>(transactionList);
+                                }
+
+                                var parameters = _dataSourceSK2?.PurchaseRevenueAdditionalParametersStoreKit2ForProducts(products, transactions)
+                                                ?? new Dictionary<string, object>();
+                                return AFMiniJSON.Json.Serialize(parameters);
+                        }
+                        catch (Exception e)
+                        {
+                                Debug.LogError($"[AppsFlyer] Exception in GetAdditionalParametersSK2: {e}");
+                                return "{}";
+                        }
+                }
+        #endif
+        }
+
+        public class UnityPurchaseRevenueBridgeProxy : AndroidJavaProxy
+        {
+                public UnityPurchaseRevenueBridgeProxy() : base("com.appsflyer.unity.PurchaseRevenueBridge$UnityPurchaseRevenueBridge") { }
+
+                public string getAdditionalParameters(string productsJson, string transactionsJson)
+                {
+                        try
+                        {
+                                // Create empty sets if JSON is null or empty
+                                HashSet<object> products = new HashSet<object>();
+                                HashSet<object> transactions = new HashSet<object>();
+
+                                // Only try to parse if we have valid JSON
+                                if (!string.IsNullOrEmpty(productsJson))
+                                {
+                                        try
+                                        {
+                                                // First try to parse as a simple array
+                                                var parsedProducts = AFMiniJSON.Json.Deserialize(productsJson);
+                                                if (parsedProducts is List<object> productList)
+                                                {
+                                                        products = new HashSet<object>(productList);
+                                                }
+                                                else if (parsedProducts is Dictionary<string, object> dict)
+                                                {
+                                                        if (dict.ContainsKey("events") && dict["events"] is List<object> eventsList)
+                                                        {
+                                                                products = new HashSet<object>(eventsList);
+                                                        }
+                                                        else
+                                                        {
+                                                                // If it's a dictionary but doesn't have events, add the whole dict
+                                                                products.Add(dict);
+                                                        }
+                                                }
+                                        }
+                                        catch (Exception e)
+                                        {
+                                                Debug.LogError($"Error parsing products JSON: {e.Message}\nJSON: {productsJson}");
+                                        }
+                                }
+
+                                if (!string.IsNullOrEmpty(transactionsJson))
+                                {
+                                        try
+                                        {
+                                                // First try to parse as a simple array
+                                                var parsedTransactions = AFMiniJSON.Json.Deserialize(transactionsJson);
+                                                if (parsedTransactions is List<object> transactionList)
+                                                {
+                                                        transactions = new HashSet<object>(transactionList);
+                                                }
+                                                else if (parsedTransactions is Dictionary<string, object> dict)
+                                                {
+                                                        if (dict.ContainsKey("events") && dict["events"] is List<object> eventsList)
+                                                        {
+                                                                transactions = new HashSet<object>(eventsList);
+                                                        }
+                                                        else
+                                                        {
+                                                                // If it's a dictionary but doesn't have events, add the whole dict
+                                                                transactions.Add(dict);
+                                                        }
+                                                }
+                                        }
+                                        catch (Exception e)
+                                        {
+                                                Debug.LogError($"Error parsing transactions JSON: {e.Message}\nJSON: {transactionsJson}");
+                                        }
+                                }
+
+                                var parameters = AppsFlyerPurchaseRevenueBridge.GetAdditionalParametersForAndroid(products, transactions);
+                                return AFMiniJSON.Json.Serialize(parameters);
+                        }
+                        catch (Exception e)
+                        {
+                                Debug.LogError($"Error in getAdditionalParameters: {e.Message}\nProducts JSON: {productsJson}\nTransactions JSON: {transactionsJson}");
+                                return "{}";
+                        }
+                }
+        }
+
+    
+        public class AppsFlyerPurchaseConnector : MonoBehaviour {
+
+        private static AppsFlyerPurchaseConnector instance;
+        private Dictionary<string, object> pendingParameters;
+        private Action<Dictionary<string, object>> pendingCallback;
+
+        public static AppsFlyerPurchaseConnector Instance
+        {
+            get
+            {
+                if (instance == null)
+                {
+                    GameObject go = new GameObject("AppsFlyerPurchaseConnector");
+                    instance = go.AddComponent<AppsFlyerPurchaseConnector>();
+                    DontDestroyOnLoad(go);
+                }
+                return instance;
+            }
+        }
+
+        private void Awake()
+        {
+            if (instance == null)
+            {
+                instance = this;
+                DontDestroyOnLoad(gameObject);
+            }
+            else
+            {
+                Destroy(gameObject);
+            }
+        }
+
+#if UNITY_ANDROID && !UNITY_EDITOR
+        private static AndroidJavaClass appsFlyerAndroidConnector = new AndroidJavaClass("com.appsflyer.unity.AppsFlyerAndroidWrapper");
+#endif
+
+        public static void init(MonoBehaviour unityObject, Store s) {
+#if UNITY_IOS && !UNITY_EDITOR
+                _initPurchaseConnector(unityObject.name);
+#elif UNITY_ANDROID && !UNITY_EDITOR
+                int store = mapStoreToInt(s);
+                appsFlyerAndroidConnector.CallStatic("initPurchaseConnector", unityObject ? unityObject.name : null, store);
+#endif
+        }
+
+        public static void build() {
+#if UNITY_IOS && !UNITY_EDITOR
+        //not for iOS
+#elif UNITY_ANDROID && !UNITY_EDITOR
+                appsFlyerAndroidConnector.CallStatic("build");
+
+#else
+#endif
+        }
+
+        public static void startObservingTransactions() {
+#if UNITY_IOS && !UNITY_EDITOR
+                _startObservingTransactions();
+#elif UNITY_ANDROID && !UNITY_EDITOR
+                appsFlyerAndroidConnector.CallStatic("startObservingTransactions");
+#else 
+#endif
+        }
+
+        public static void stopObservingTransactions() {
+#if UNITY_IOS && !UNITY_EDITOR
+                _stopObservingTransactions();
+#elif UNITY_ANDROID && !UNITY_EDITOR
+                appsFlyerAndroidConnector.CallStatic("stopObservingTransactions");
+#else
+#endif
+        }
+
+        public static void setIsSandbox(bool isSandbox) {
+#if UNITY_IOS && !UNITY_EDITOR
+                _setIsSandbox(isSandbox);
+#elif UNITY_ANDROID && !UNITY_EDITOR
+                appsFlyerAndroidConnector.CallStatic("setIsSandbox", isSandbox);
+#else
+#endif
+        }
+
+        public static void setPurchaseRevenueValidationListeners(bool enableCallbacks) {
+#if UNITY_IOS && !UNITY_EDITOR
+                _setPurchaseRevenueDelegate();
+#elif UNITY_ANDROID && !UNITY_EDITOR
+                appsFlyerAndroidConnector.CallStatic("setPurchaseRevenueValidationListeners", enableCallbacks);
+#else
+#endif
+        }
+
+        public static void setAutoLogPurchaseRevenue(params AppsFlyerAutoLogPurchaseRevenueOptions[] autoLogPurchaseRevenueOptions) {
+#if UNITY_IOS && !UNITY_EDITOR
+                int option = 0;
+                foreach (AppsFlyerAutoLogPurchaseRevenueOptions op in autoLogPurchaseRevenueOptions) {
+                        option = option | (int)op;
+                }
+                _setAutoLogPurchaseRevenue(option);
+#elif UNITY_ANDROID && !UNITY_EDITOR
+                if (autoLogPurchaseRevenueOptions.Length == 0) {
+                        return;
+                }
+                foreach (AppsFlyerAutoLogPurchaseRevenueOptions op in autoLogPurchaseRevenueOptions) {
+                        switch(op) {
+                                case AppsFlyerAutoLogPurchaseRevenueOptions.AppsFlyerAutoLogPurchaseRevenueOptionsDisabled:
+                                        break;
+                                case AppsFlyerAutoLogPurchaseRevenueOptions.AppsFlyerAutoLogPurchaseRevenueOptionsAutoRenewableSubscriptions:
+                                        appsFlyerAndroidConnector.CallStatic("setAutoLogSubscriptions", true);
+                                        break;
+                                case AppsFlyerAutoLogPurchaseRevenueOptions.AppsFlyerAutoLogPurchaseRevenueOptionsInAppPurchases:
+                                        appsFlyerAndroidConnector.CallStatic("setAutoLogInApps", true);
+                                        break;
+                                default:
+                                        break;
+                        }
+                }
+#else
+#endif
+        }
+
+        public static void setPurchaseRevenueDataSource(IAppsFlyerPurchaseRevenueDataSource dataSource)
+        {
+#if UNITY_IOS && !UNITY_EDITOR
+
+                if (dataSource != null)
+                {
+                        _setPurchaseRevenueDataSource(dataSource.GetType().Name);
+                        AppsFlyerPurchaseRevenueBridge.RegisterDataSource(dataSource);
+                }
+#elif UNITY_ANDROID && !UNITY_EDITOR
+                if (dataSource != null)
+                {
+                        AppsFlyerPurchaseRevenueBridge.RegisterDataSource(dataSource);
+                }
+#endif
+        }
+
+
+        public static void setPurchaseRevenueDataSourceStoreKit2(IAppsFlyerPurchaseRevenueDataSourceStoreKit2 dataSourceSK2)
+        {
+#if UNITY_IOS && !UNITY_EDITOR
+                if (dataSourceSK2 != null)
+                {
+                        AppsFlyerPurchaseRevenueBridge.RegisterDataSourceStoreKit2(dataSourceSK2);
+                        _setPurchaseRevenueDataSource("AppsFlyerObjectScript_StoreKit2");
+                }
+#endif
+        }
+
+
+        private static int mapStoreToInt(Store s) {
+                switch(s) {
+                        case(Store.GOOGLE):
+                                return 0;
+                        default:
+                                return -1;
+                }
+        }
+
+        public static void setStoreKitVersion(StoreKitVersion storeKitVersion) {
+#if UNITY_IOS && !UNITY_EDITOR
+                _setStoreKitVersion((int)storeKitVersion);
+#elif UNITY_ANDROID && !UNITY_EDITOR
+                // Android doesn't use StoreKit
+#else
+#endif
+        }
+
+        public static void logConsumableTransaction(string transactionJson) {
+#if UNITY_IOS && !UNITY_EDITOR
+                _logConsumableTransaction(transactionJson);
+#elif UNITY_ANDROID && !UNITY_EDITOR
+                // Android doesn't use StoreKit
+#else
+#endif
+        }
+
+#if UNITY_IOS && !UNITY_EDITOR
+
+    [DllImport("__Internal")]
+    private static extern void _startObservingTransactions();
+    [DllImport("__Internal")]
+    private static extern void _stopObservingTransactions();
+    [DllImport("__Internal")]
+    private static extern void _setIsSandbox(bool isSandbox);
+    [DllImport("__Internal")]
+    private static extern void _setPurchaseRevenueDelegate();
+    [DllImport("__Internal")]
+    private static extern void _setPurchaseRevenueDataSource(string dataSourceName);
+    [DllImport("__Internal")]
+    private static extern void _setAutoLogPurchaseRevenue(int option);
+    [DllImport("__Internal")]
+    private static extern void _initPurchaseConnector(string objectName);
+    [DllImport("__Internal")]
+    private static extern void _setStoreKitVersion(int storeKitVersion);
+    [DllImport("__Internal")]
+    private static extern void _logConsumableTransaction(string transactionJson);
+
+#endif
+        }
+    public enum Store {
+    GOOGLE = 0
+    }
+    public enum AppsFlyerAutoLogPurchaseRevenueOptions
+    {
+        AppsFlyerAutoLogPurchaseRevenueOptionsDisabled = 0,
+        AppsFlyerAutoLogPurchaseRevenueOptionsAutoRenewableSubscriptions = 1 << 0,
+        AppsFlyerAutoLogPurchaseRevenueOptionsInAppPurchases = 1 << 1
+    }
+
+    public enum StoreKitVersion {
+        SK1 = 0,
+        SK2 = 1
+    }
+}

Assets/AppsFlyer/AppsFlyerPurchaseConnector.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 86095972906765341b733b3d3407250c
+guid: 0636ea07d370d437183f3762280c08ce
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/AppsFlyer/AppsFlyeriOS.cs

@@ -215,7 +215,24 @@ public void startSDK(bool shouldCallback, string CallBackObjectName)
         public void setConsentData(AppsFlyerConsent appsFlyerConsent)
         {
 #if !UNITY_EDITOR
-            _setConsentData(appsFlyerConsent.isUserSubjectToGDPR, appsFlyerConsent.hasConsentForDataUsage, appsFlyerConsent.hasConsentForAdsPersonalization);
+           string isUserSubjectToGDPR = appsFlyerConsent.isUserSubjectToGDPR?.ToString().ToLower() ?? "null";
+           string hasConsentForDataUsage = appsFlyerConsent.hasConsentForDataUsage?.ToString().ToLower() ?? "null";
+           string hasConsentForAdsPersonalization = appsFlyerConsent.hasConsentForAdsPersonalization?.ToString().ToLower() ?? "null";
+           string hasConsentForAdStorage = appsFlyerConsent.hasConsentForAdStorage?.ToString().ToLower() ?? "null";
+
+           _setConsentData(isUserSubjectToGDPR, hasConsentForDataUsage, hasConsentForAdsPersonalization, hasConsentForAdStorage);
+#endif
+         }
+
+        /// <summary>
+        /// Logs ad revenue data along with additional parameters if provided.
+        /// </summary>
+        /// <param name = "adRevenueData" >instance of AFAdRevenueData containing ad revenue information.</param>
+        /// <param name = "additionalParameters" >An optional map of additional parameters to be logged with ad revenue data. This can be null if there are no additional parameters.</param>
+        public void logAdRevenue(AFAdRevenueData adRevenueData, Dictionary<string, string> additionalParameters)
+        {
+#if !UNITY_EDITOR
+            _logAdRevenue(adRevenueData.monetizationNetwork, adRevenueData.mediationNetwork, adRevenueData.currencyIso4217Code, adRevenueData.eventRevenue, AFMiniJSON.Json.Serialize(additionalParameters));
 #endif
          }
 
@@ -318,13 +335,14 @@ public void startSDK(bool shouldCallback, string CallBackObjectName)
         }
 
         /// <summary>
-        ///  To send and validate in app purchases you can call this method from the processPurchase method - please use v2.
+        /// [Deprecated] To send and validate in app purchases - please use V2 with AFSDKPurchaseDetailsIOS instead.
         /// </summary>
         /// <param name="productIdentifier">The product identifier.</param>
         /// <param name="price">The product price.</param>
         /// <param name="currency">The product currency.</param>
         /// <param name="transactionId">The purchase transaction Id.</param>
         /// <param name="additionalParameters">The additional param, which you want to receive it in the raw reports.</param>
+        [System.Obsolete("This method is deprecated. Use validateAndSendInAppPurchase(AFSDKPurchaseDetailsIOS details, Dictionary<string, string> purchaseAdditionalDetails, MonoBehaviour gameObject) instead.")]
         public void validateAndSendInAppPurchase(string productIdentifier, string price, string currency, string transactionId, Dictionary<string, string> additionalParameters, MonoBehaviour gameObject)
         {
 #if !UNITY_EDITOR
@@ -333,15 +351,14 @@ public void startSDK(bool shouldCallback, string CallBackObjectName)
         }
 
         /// <summary>
-        ///  V2
-        ///  To send and validate in app purchases you can call this method from the processPurchase method.
+        /// V2 - To send and validate in app purchases you can call this method from the processPurchase method.
         /// </summary>
         /// <param name="details">The AFSDKPurchaseDetailsIOS instance.</param>
-        /// <param name="extraEventValues">The extra params, which you want to receive it in the raw reports.</param>
-        public void validateAndSendInAppPurchase(AFSDKPurchaseDetailsIOS details, Dictionary<string, string> extraEventValues, MonoBehaviour gameObject)
+        /// <param name="purchaseAdditionalDetails">The additional params, which you want to receive it in the raw reports.</param>
+        public void validateAndSendInAppPurchase(AFSDKPurchaseDetailsIOS details, Dictionary<string, string> purchaseAdditionalDetails, MonoBehaviour gameObject)
         {
 #if !UNITY_EDITOR
-            _validateAndSendInAppPurchaseV2(details.productId, details.price, details.currency, details.transactionId, AFMiniJSON.Json.Serialize(extraEventValues), gameObject ? gameObject.name : null);
+            _validateAndSendInAppPurchaseV2(details.productId, details.transactionId, (int)details.purchaseType, AFMiniJSON.Json.Serialize(purchaseAdditionalDetails), gameObject ? gameObject.name : null);
 #endif
         }
 
@@ -748,7 +765,14 @@ public void startSDK(bool shouldCallback, string CallBackObjectName)
 #elif UNITY_STANDALONE_OSX
         [DllImport("AppsFlyerBundle")]
 #endif
-        private static extern void _setConsentData(bool isUserSubjectToGDPR, bool hasConsentForDataUsage, bool hasConsentForAdsPersonalization);
+        private static extern void _setConsentData(string isUserSubjectToGDPR, string hasConsentForDataUsage, string hasConsentForAdsPersonalization, string hasConsentForAdStorage);
+
+#if UNITY_IOS
+    [DllImport("__Internal")]
+#elif UNITY_STANDALONE_OSX
+        [DllImport("AppsFlyerBundle")]
+#endif
+        private static extern void _logAdRevenue(string monetizationNetwork, MediationNetwork mediationNetwork, string currencyIso4217Code, double eventRevenue, string additionalParameters);
 
 #if UNITY_IOS
     [DllImport("__Internal")]
@@ -819,7 +843,7 @@ public void startSDK(bool shouldCallback, string CallBackObjectName)
 #elif UNITY_STANDALONE_OSX
         [DllImport("AppsFlyerBundle")]
 #endif
-        private static extern void _validateAndSendInAppPurchaseV2(string product, string price, string currency, string transactionId, string extraEventValues, string objectName);
+        private static extern void _validateAndSendInAppPurchaseV2(string product, string transactionId, int purchaseType, string purchaseAdditionalDetails, string objectName);
 
 #if UNITY_IOS
     [DllImport("__Internal")]

Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml

@@ -2,17 +2,15 @@
 <dependencies>
 
   <androidPackages>
-    <androidPackage spec="com.appsflyer:af-android-sdk:6.14.2">
-    </androidPackage>
-    <androidPackage spec="com.appsflyer:unity-wrapper:6.14.5">
-    </androidPackage>
-    <androidPackage spec="com.android.installreferrer:installreferrer:2.1">
-    </androidPackage>
+    <androidPackage spec="com.appsflyer:af-android-sdk:6.17.6"></androidPackage>
+    <androidPackage spec="com.appsflyer:unity-wrapper:6.17.91"></androidPackage>
+    <androidPackage spec="com.android.installreferrer:installreferrer:2.1"></androidPackage>
+    <androidPackage spec="com.appsflyer:purchase-connector:2.2.0"></androidPackage>
   </androidPackages>
 
   <iosPods>
-    <iosPod name="AppsFlyerFramework" version="6.14.5" minTargetSdk="12.0">
-    </iosPod>
+    <iosPod name="AppsFlyerFramework" version="6.17.9" minTargetSdk="12.0"></iosPod>
+    <iosPod name="PurchaseConnector" version="6.17.9" minTargetSdk="12.0"></iosPod>
   </iosPods>
 
 </dependencies>

Assets/AppsFlyer/Editor/AppsFlyerObjectEditor.cs

@@ -31,7 +31,7 @@ public class AppsFlyerObjectEditor : Editor
     {
         serializedObject.Update();
 
-        GUILayout.Box((Texture)AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath(AssetDatabase.FindAssets("appsflyer_logo")[0]), typeof(Texture)), new GUILayoutOption[] { GUILayout.Width(600) });
+        DrawLogo();
 
         EditorGUILayout.Separator();
         EditorGUILayout.HelpBox("Set your devKey and appID to init the AppsFlyer SDK and start tracking. You must modify these fields and provide:\ndevKey - Your application devKey provided by AppsFlyer.\nappId - For iOS only. Your iTunes Application ID.\nUWP app id - For UWP only. Your application app id \nMac OS app id - For MacOS app only.", MessageType.Info);
@@ -80,5 +80,25 @@ public class AppsFlyerObjectEditor : Editor
         serializedObject.ApplyModifiedProperties();
     }
 
+    private void DrawLogo()
+    {
+        var guids = AssetDatabase.FindAssets("appsflyer_logo");
+        if (guids.Length == 0) return;
+
+        Texture logo = (Texture)AssetDatabase.LoadAssetAtPath(
+            AssetDatabase.GUIDToAssetPath(guids[0]),
+            typeof(Texture));
+
+        if (logo == null) return;
+
+        float maxWidth = Mathf.Min(200, EditorGUIUtility.currentViewWidth - 40);
+        float aspect = (float)logo.height / logo.width;
+        float height = maxWidth * aspect;
+
+        Rect rect = GUILayoutUtility.GetRect(maxWidth, height, GUILayout.ExpandWidth(false));
+        rect.x = (EditorGUIUtility.currentViewWidth - maxWidth) * 0.5f;
+        rect.width = maxWidth;
+        GUI.DrawTexture(rect, logo, ScaleMode.ScaleToFit);
+    }
 
 }

Assets/AppsFlyer/IAppsFlyerAndroidBridge.cs

@@ -22,7 +22,7 @@ namespace AppsFlyerSDK
         string getAttributionId();
         void handlePushNotifications();
         void validateAndSendInAppPurchase(string publicKey, string signature, string purchaseData, string price, string currency, Dictionary<string, string> additionalParameters, MonoBehaviour gameObject);
-        void validateAndSendInAppPurchase(AFPurchaseDetailsAndroid details, Dictionary<string, string> additionalParameters, MonoBehaviour gameObject);
+        void validateAndSendInAppPurchase(AFPurchaseDetailsAndroid details, Dictionary<string, string> purchaseAdditionalDetails, MonoBehaviour gameObject);
         void setCollectOaid(bool isCollect);
         void setDisableAdvertisingIdentifiers(bool disable);
         void setDisableNetworkData(bool disable);

Assets/AppsFlyer/IAppsFlyerIOSBridge.cs

@@ -14,7 +14,7 @@ namespace AppsFlyerSDK
 		void setUseReceiptValidationSandbox(bool useReceiptValidationSandbox);
 		void setUseUninstallSandbox(bool useUninstallSandbox);
 		void validateAndSendInAppPurchase(string productIdentifier, string price, string currency, string transactionId, Dictionary<string, string> additionalParameters, MonoBehaviour gameObject);
-		void validateAndSendInAppPurchase(AFSDKPurchaseDetailsIOS details, Dictionary<string, string> extraEventValues, MonoBehaviour gameObject);
+		void validateAndSendInAppPurchase(AFSDKPurchaseDetailsIOS details, Dictionary<string, string> purchaseAdditionalDetails, MonoBehaviour gameObject);
 		void registerUninstall(byte[] deviceToken);
 		void handleOpenUrl(string url, string sourceApplication, string annotation);
 		void waitForATTUserAuthorizationWithTimeoutInterval(int timeoutInterval);

Assets/AppsFlyer/IAppsFlyerNativeBridge.cs

@@ -43,6 +43,8 @@ namespace AppsFlyerSDK
 
         void setConsentData(AppsFlyerConsent appsFlyerConsent);
 
+        void logAdRevenue(AFAdRevenueData adRevenueData, Dictionary<string, string> additionalParameters);
+
         void setMinTimeBetweenSessions(int seconds);
 
         void setHost(string hostPrefixName, string hostName);

Assets/AppsFlyer/IAppsFlyerPurchaseValidation.cs

@@ -0,0 +1,8 @@
+namespace AppsFlyerSDK
+{
+    public interface IAppsFlyerPurchaseValidation
+    {
+        void didReceivePurchaseRevenueValidationInfo(string validationInfo);
+        void didReceivePurchaseRevenueError(string error);
+    }
+}

Assets/AppsFlyer/IAppsFlyerPurchaseValidation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 732a41d0c60b8514c8d9f4e847905146
+guid: 7c60f499ae0d048b1be8ffd6878a184c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/AppsFlyer/Mac/AppsFlyerBundle.bundle/Contents/Info.plist

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>20G417</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>AppsFlyerBundle</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.appsflyer.support.two.AppsFlyerBundle</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>AppsFlyerBundle</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>13A1030d</string>
-	<key>DTPlatformName</key>
-	<string>macosx</string>
-	<key>DTPlatformVersion</key>
-	<string>12.0</string>
-	<key>DTSDKBuild</key>
-	<string>21A344</string>
-	<key>DTSDKName</key>
-	<string>macosx12.0</string>
-	<key>DTXcode</key>
-	<string>1310</string>
-	<key>DTXcodeBuild</key>
-	<string>13A1030d</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>11.6</string>
-	<key>NSHumanReadableCopyright</key>
-	<string></string>
-</dict>
-</plist>

Assets/AppsFlyer/Mac/AppsFlyerBundle.bundle/Contents/_CodeSignature/CodeResources

@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict/>
-	<key>files2</key>
-	<dict/>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.h

@@ -1,22 +0,0 @@
-//
-//  AFUnityUtils.h
-//
-//  Created by Andrii H. and Dmitry O. on 16 Oct 2023
-//
-
-#if __has_include(<AppsFlyerLib/AppsFlyerLib.h>)
-#import <AppsFlyerLib/AppsFlyerLib.h>
-#else
-#import "AppsFlyerLib.h"
-#endif
-
-static NSString* stringFromChar(const char *str);
-static NSDictionary* dictionaryFromJson(const char *jsonString);
-static const char* stringFromdictionary(NSDictionary* dictionary);
-static NSArray<NSString*> *NSArrayFromCArray(int length, const char **arr);
-static char* getCString(const char* string);
-static AppsFlyerLinkGenerator* generatorFromDictionary(NSDictionary* dictionary, AppsFlyerLinkGenerator*  generator);
-static EmailCryptType emailCryptTypeFromInt(int emailCryptTypeInt);
-static NSString* stringFromDeepLinkResultStatus(AFSDKDeepLinkResultStatus deepLinkResult);
-static NSString* stringFromDeepLinkResultError(AppsFlyerDeepLinkResult *result);
-

Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.mm

@@ -1,145 +0,0 @@
-//
-//  AFUnityUtils.mm
-//  Unity-iPhone
-//
-//  Created by Jonathan Wesfield on 24/07/2019.
-//
-
-#import "AFUnityUtils.h"
-
-static NSString* stringFromChar(const char *str) {
-    return str ? [NSString stringWithUTF8String:str] : nil;
-}
-
-static NSDictionary* dictionaryFromJson(const char *jsonString) {
-    if(jsonString){
-        NSData *jsonData = [[NSData alloc] initWithBytes:jsonString length:strlen(jsonString)];
-        NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:jsonData options:kNilOptions error:nil];
-        return dictionary;
-    }
-    
-    return nil;
-}
-
-static const char* stringFromdictionary(NSDictionary* dictionary) {
-    if(dictionary){
-        NSError * err;
-        NSData * jsonData = [NSJSONSerialization  dataWithJSONObject:dictionary options:0 error:&err];
-        NSString * myString = [[NSString alloc] initWithData:jsonData   encoding:NSUTF8StringEncoding];
-        return [myString UTF8String];
-    }
-
-    return nil;
-}
-
-static NSDictionary* dictionaryFromNSError(NSError* error) {
-    if(error){
-            NSInteger code = [error code];
-            NSString *localizedDescription = [error localizedDescription];
-            
-            NSDictionary *errorDictionary = @{
-                @"code" : @(code) ?: @(-1),
-                @"localizedDescription" : localizedDescription,
-            };
-        return  errorDictionary;
-    }
-
-    return nil;
-}
-
-
-static NSArray<NSString*> *NSArrayFromCArray(int length, const char **arr) {
-    NSMutableArray<NSString *> *res = [[NSMutableArray alloc] init];
-    for(int i = 0; i < length; i++) {
-        if (arr[i]) {
-            [res addObject:[NSString stringWithUTF8String:arr[i]]];
-        }
-    }
-    
-    return res;
-}
-
-static char* getCString(const char* string){
-    if (string == NULL){
-        return NULL;
-    }
-    
-    char* res = (char*)malloc(strlen(string) + 1);
-    strcpy(res, string);
-    
-    return res;
-}
-
-static AppsFlyerLinkGenerator* generatorFromDictionary(NSDictionary* dictionary, AppsFlyerLinkGenerator*  generator) {
-    
-    NSArray* generatorKeys = @[@"channel", @"customerID", @"campaign", @"referrerName", @"referrerImageUrl", @"deeplinkPath", @"baseDeeplink", @"brandDomain"];
-    
-    NSMutableDictionary* mutableDictionary = [dictionary mutableCopy];
-    
-    [generator setChannel:[dictionary objectForKey: @"channel"]];
-    [generator setReferrerCustomerId:[dictionary objectForKey: @"customerID"]];
-    [generator setCampaign:[dictionary objectForKey: @"campaign"]];
-    [generator setReferrerName:[dictionary objectForKey: @"referrerName"]];
-    [generator setReferrerImageURL:[dictionary objectForKey: @"referrerImageUrl"]];
-    [generator setDeeplinkPath:[dictionary objectForKey: @"deeplinkPath"]];
-    [generator setBaseDeeplink:[dictionary objectForKey: @"baseDeeplink"]];
-    [generator setBrandDomain:[dictionary objectForKey: @"brandDomain"]];
-
-
-    [mutableDictionary removeObjectsForKeys:generatorKeys];
-    
-    [generator addParameters:mutableDictionary];
-    
-    return generator;
-}
-
-static EmailCryptType emailCryptTypeFromInt(int emailCryptTypeInt){
-    
-    EmailCryptType emailCryptType;
-    switch (emailCryptTypeInt){
-        case 1:
-            emailCryptType = EmailCryptTypeSHA256;
-            break;
-        default:
-            emailCryptType = EmailCryptTypeNone;
-            break;
-    }
-
-    return emailCryptType;
-}
-
-static NSString* stringFromDeepLinkResultStatus(AFSDKDeepLinkResultStatus deepLinkResult){
-    NSString* result;
-    switch (deepLinkResult){
-        case AFSDKDeepLinkResultStatusFound:
-            result = @"FOUND";
-            break;
-        case AFSDKDeepLinkResultStatusFailure:
-            result = @"ERROR";
-            break;
-        case AFSDKDeepLinkResultStatusNotFound:
-            result = @"NOT_FOUND";
-            break;
-        default:
-            result = @"ERROR";
-            break;
-    }
-    
-    return result;
-}
-
-static NSString* stringFromDeepLinkResultError(AppsFlyerDeepLinkResult *result){
-    NSString* res;
-    
-    if (result && result.error){
-        if ([[result.error userInfo][NSUnderlyingErrorKey] code] == -1001) {
-            res = @"TIMEOUT";
-       } else if ([[result.error userInfo][NSUnderlyingErrorKey] code] == -1009) {
-           res = @"NETWORK";
-       }
-    }
-    
-    res = @"UNKNOWN";
-    
-    return res;
-}

Assets/AppsFlyer/Plugins/iOS/AppsFlyer+AppController.m

@@ -1,164 +0,0 @@
-//
-//  AppsFlyer+AppController.m
-//  Unity-iPhone
-//
-//  Created by Jonathan Wesfield on 24/07/2019.
-//
-
-#import <objc/runtime.h>
-#import "UnityAppController.h"
-#import "AppsFlyeriOSWrapper.h"
-#if __has_include(<AppsFlyerLib/AppsFlyerLib.h>)
-#import <AppsFlyerLib/AppsFlyerLib.h>
-#else
-#import "AppsFlyerLib.h"
-#endif
-
-
-@implementation UnityAppController (AppsFlyerSwizzledAppController)
-
-static BOOL didEnteredBackGround __unused;
-static IMP __original_applicationDidBecomeActive_Imp __unused;
-static IMP __original_applicationDidEnterBackground_Imp __unused;
-static IMP __original_didReceiveRemoteNotification_Imp __unused;
-static IMP __original_continueUserActivity_Imp __unused;
-static IMP __original_openUrl_Imp __unused;
-
-
-+ (void)load {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-
-#if !AFSDK_SHOULD_SWIZZLE
-
-        id swizzleFlag = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"AppsFlyerShouldSwizzle"];
-        BOOL shouldSwizzle = swizzleFlag ? [swizzleFlag boolValue] : NO;
-        
-        if(shouldSwizzle){
-            
-            Method method1 = class_getInstanceMethod([self class], @selector(applicationDidBecomeActive:));
-            __original_applicationDidBecomeActive_Imp = method_setImplementation(method1, (IMP)__swizzled_applicationDidBecomeActive);
-                    
-            Method method2 = class_getInstanceMethod([self class], @selector(applicationDidEnterBackground:));
-            __original_applicationDidEnterBackground_Imp = method_setImplementation(method2, (IMP)__swizzled_applicationDidEnterBackground);
-            
-           
-            Method method3 = class_getInstanceMethod([self class], @selector(didReceiveRemoteNotification:));
-            __original_didReceiveRemoteNotification_Imp = method_setImplementation(method3, (IMP)__swizzled_didReceiveRemoteNotification);
-            
-           
-            Method method4 = class_getInstanceMethod([self class], @selector(application:openURL:options:));
-            __original_openUrl_Imp = method_setImplementation(method4, (IMP)__swizzled_openURL);
-            
-            if (_AppsFlyerdelegate == nil) {
-                _AppsFlyerdelegate = [[AppsFlyeriOSWarpper alloc] init];
-            }
-           
-            [self swizzleContinueUserActivity:[self class]];
-        }
-#elif AFSDK_SHOULD_SWIZZLE
-        Method method1 = class_getInstanceMethod([self class], @selector(applicationDidBecomeActive:));
-        __original_applicationDidBecomeActive_Imp = method_setImplementation(method1, (IMP)__swizzled_applicationDidBecomeActive);
-                    
-        Method method2 = class_getInstanceMethod([self class], @selector(applicationDidEnterBackground:));
-        __original_applicationDidEnterBackground_Imp = method_setImplementation(method2, (IMP)__swizzled_applicationDidEnterBackground);
-            
-           
-        Method method3 = class_getInstanceMethod([self class], @selector(didReceiveRemoteNotification:));
-        __original_didReceiveRemoteNotification_Imp = method_setImplementation(method3, (IMP)__swizzled_didReceiveRemoteNotification);
-            
-           
-        Method method4 = class_getInstanceMethod([self class], @selector(application:openURL:options:));
-        __original_openUrl_Imp = method_setImplementation(method4, (IMP)__swizzled_openURL);
-            
-        if (_AppsFlyerdelegate == nil) {
-            _AppsFlyerdelegate = [[AppsFlyeriOSWarpper alloc] init];
-        }
-           
-        [self swizzleContinueUserActivity:[self class]];
-
-#endif
-
-
-    });
-}
-
-+(void)swizzleContinueUserActivity:(Class)class {
-    
-    SEL originalSelector = @selector(application:continueUserActivity:restorationHandler:);
-    
-    Method defaultMethod = class_getInstanceMethod(class, originalSelector);
-    Method swizzledMethod = class_getInstanceMethod(class, @selector(__swizzled_continueUserActivity));
-    
-    BOOL isMethodExists = !class_addMethod(class, originalSelector, method_getImplementation(swizzledMethod), method_getTypeEncoding(swizzledMethod));
-    
-    if (isMethodExists) {
-        __original_continueUserActivity_Imp = method_setImplementation(defaultMethod, (IMP)__swizzled_continueUserActivity);
-    } else {
-        class_replaceMethod(class, originalSelector, (IMP)__swizzled_continueUserActivity, method_getTypeEncoding(swizzledMethod));
-    }
-}
-
-BOOL __swizzled_continueUserActivity(id self, SEL _cmd, UIApplication* application, NSUserActivity* userActivity, void (^restorationHandler)(NSArray*)) {
-    NSLog(@"swizzled continueUserActivity");
-    [[AppsFlyerAttribution shared] continueUserActivity:userActivity restorationHandler:restorationHandler];
-    
-    if(__original_continueUserActivity_Imp){
-        return ((BOOL(*)(id, SEL, UIApplication*, NSUserActivity*, void (^)(NSArray*)))__original_continueUserActivity_Imp)(self, _cmd, application, userActivity, NULL);
-    }
-    
-    return YES;
-}
-
-
-
-void __swizzled_applicationDidBecomeActive(id self, SEL _cmd, UIApplication* launchOptions) {
-    NSLog(@"swizzled applicationDidBecomeActive");
-    [[AppsFlyerLib shared] setDelegate:_AppsFlyerdelegate];
-
-    if(didEnteredBackGround && AppsFlyeriOSWarpper.didCallStart == YES){
-        [[AppsFlyerLib shared] start];
-    }
-    
-    if(__original_applicationDidBecomeActive_Imp){
-        ((void(*)(id,SEL, UIApplication*))__original_applicationDidBecomeActive_Imp)(self, _cmd, launchOptions);
-    }
-}
-
-
-void __swizzled_applicationDidEnterBackground(id self, SEL _cmd, UIApplication* application) {
-    NSLog(@"swizzled applicationDidEnterBackground");
-    didEnteredBackGround = YES;
-    if(__original_applicationDidEnterBackground_Imp){
-        ((void(*)(id,SEL, UIApplication*))__original_applicationDidEnterBackground_Imp)(self, _cmd, application);
-    }
-}
-
-
-BOOL __swizzled_didReceiveRemoteNotification(id self, SEL _cmd, UIApplication* application, NSDictionary* userInfo,void (^UIBackgroundFetchResult)(void) ) {
-    NSLog(@"swizzled didReceiveRemoteNotification");
-    
-    [[AppsFlyerLib shared] handlePushNotification:userInfo];
-    
-    if(__original_didReceiveRemoteNotification_Imp){
-        return ((BOOL(*)(id, SEL, UIApplication*, NSDictionary*, int(UIBackgroundFetchResult)))__original_didReceiveRemoteNotification_Imp)(self, _cmd, application, userInfo, nil);
-    }
-    return YES;
-}
-
-
-
-BOOL __swizzled_openURL(id self, SEL _cmd, UIApplication* application, NSURL* url, NSDictionary * options) {
-    NSLog(@"swizzled openURL");
-    [[AppsFlyerAttribution shared] handleOpenUrl:url options:options];
-    if(__original_openUrl_Imp){
-        return ((BOOL(*)(id, SEL, UIApplication*, NSURL*, NSDictionary*))__original_openUrl_Imp)(self, _cmd, application, url, options);
-    }
-    return NO;
-}
-
-
-@end
-
-
-

Assets/AppsFlyer/Plugins/iOS/AppsFlyerAppController.mm

@@ -1,131 +0,0 @@
-//
-//  AppsFlyerAppController.mm
-//  Unity-iPhone
-//
-//  Created by Jonathan Wesfield on 30/07/2019.
-//
-
-#import <Foundation/Foundation.h>
-#import "UnityAppController.h"
-#import "AppDelegateListener.h"
-#import "AppsFlyeriOSWrapper.h"
-#if __has_include(<AppsFlyerLib/AppsFlyerLib.h>)
-#import <AppsFlyerLib/AppsFlyerLib.h>
-#else
-#import "AppsFlyerLib.h"
-#endif
-#import <objc/message.h>
-
-/**
- Note if you would like to use method swizzeling see AppsFlyer+AppController.m
- If you are using swizzeling then comment out the method that is being swizzeled in AppsFlyerAppController.mm
- Only use swizzeling if there are conflicts with other plugins that needs to be resolved.
-*/
-
-
-@interface AppsFlyerAppController : UnityAppController <AppDelegateListener>
-{
-    BOOL didEnteredBackGround;
-}
-@end
-
-@implementation AppsFlyerAppController
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        
-        id swizzleFlag = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"AppsFlyerShouldSwizzle"];
-        BOOL shouldSwizzle = swizzleFlag ? [swizzleFlag boolValue] : NO;
-        
-        if(!shouldSwizzle){
-            UnityRegisterAppDelegateListener(self);
-        }
-    }
-    return self;
-}
-
-- (void)didFinishLaunching:(NSNotification*)notification {
-    NSLog(@"got didFinishLaunching = %@",notification.userInfo);
-
-
-    if (_AppsFlyerdelegate == nil) {
-        _AppsFlyerdelegate = [[AppsFlyeriOSWarpper alloc] init];
-    }
-    [[AppsFlyerLib shared] setDelegate:_AppsFlyerdelegate];
-
-    if (notification.userInfo[@"url"]) {
-        [self onOpenURL:notification];
-    }
-}
-
--(void)didBecomeActive:(NSNotification*)notification {
-    NSLog(@"got didBecomeActive(out) = %@", notification.userInfo);
-    if (didEnteredBackGround == YES && AppsFlyeriOSWarpper.didCallStart == YES) {
-        [[AppsFlyerLib shared] start];
-        didEnteredBackGround = NO;
-    }
-}
-
-- (void)didEnterBackground:(NSNotification*)notification {
-    NSLog(@"got didEnterBackground = %@", notification.userInfo);
-    didEnteredBackGround = YES;
-}
-
-- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray *))restorationHandler {
-    [[AppsFlyerAttribution shared] continueUserActivity:userActivity restorationHandler:restorationHandler];
-    return YES;
-}
-
-
-- (void)onOpenURL:(NSNotification*)notification {
-    NSLog(@"got onOpenURL = %@", notification.userInfo);
-    NSURL *url = notification.userInfo[@"url"];
-    NSString *sourceApplication = notification.userInfo[@"sourceApplication"];
-    
-    if (sourceApplication == nil) {
-        sourceApplication = @"";
-    }
-    
-    if (url != nil) {
-        [[AppsFlyerAttribution shared] handleOpenUrl:url sourceApplication:sourceApplication annotation:nil];
-    }
-    
-}
-
-- (void)didReceiveRemoteNotification:(NSNotification*)notification {
-    NSLog(@"got didReceiveRemoteNotification = %@", notification.userInfo);
-    [[AppsFlyerLib shared] handlePushNotification:notification.userInfo];
-}
-
-@end
-
-#if !(AFSDK_SHOULD_SWIZZLE)
-
-IMPL_APP_CONTROLLER_SUBCLASS(AppsFlyerAppController)
-
-#endif
-/**
-Note if you would not like to use IMPL_APP_CONTROLLER_SUBCLASS you can replace it with the code below.
- <code>
- +(void)load
- {
- [AppsFlyerAppController plugin];
- }
- 
- // Singleton accessor.
- + (AppsFlyerAppController *)plugin
- {
- static AppsFlyerAppController *sharedInstance = nil;
- static dispatch_once_t onceToken;
- 
- dispatch_once(&onceToken, ^{
- 
- sharedInstance = [[AppsFlyerAppController alloc] init];
- });
- 
- return sharedInstance;
- }
-</code>
- **/

Assets/AppsFlyer/Plugins/iOS/AppsFlyerAttribution.h

@@ -1,34 +0,0 @@
-//
-//  AppsFlyerAttribution.h
-//  UnityFramework
-//
-//  Created by Margot Guetta on 11/04/2021.
-//
-
-#ifndef AppsFlyerAttribution_h
-#define AppsFlyerAttribution_h
-#endif /* AppsFlyerAttribution_h */
-#if __has_include(<AppsFlyerLib/AppsFlyerLib.h>)
-#import <AppsFlyerLib/AppsFlyerLib.h>
-#else
-#import "AppsFlyerLib.h"
-#endif
-
-
-@interface AppsFlyerAttribution : NSObject
-@property NSUserActivity*_Nullable  userActivity;
-@property (nonatomic, copy) void (^ _Nullable restorationHandler)(NSArray *_Nullable );
-@property NSURL * _Nullable url;
-@property NSDictionary * _Nullable options;
-@property NSString* _Nullable sourceApplication;
-@property id _Nullable annotation;
-@property BOOL isBridgeReady;
-
-+ (AppsFlyerAttribution *_Nullable)shared;
-- (void) continueUserActivity: (NSUserActivity*_Nullable) userActivity restorationHandler: (void (^_Nullable)(NSArray * _Nullable))restorationHandler;
-- (void) handleOpenUrl:(NSURL*_Nullable)url options:(NSDictionary*_Nullable) options;
-- (void) handleOpenUrl: (NSURL *_Nonnull)url sourceApplication:(NSString*)sourceApplication annotation:(id)annotation;
-
-@end
-
-static NSString * _Nullable const AF_BRIDGE_SET = @"bridge is set";

Assets/AppsFlyer/Plugins/iOS/AppsFlyerAttribution.h.meta

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

Assets/AppsFlyer/Plugins/iOS/AppsFlyerAttribution.m

@@ -1,86 +0,0 @@
-//
-//  NSObject+AppsFlyerAttribution.m
-//  UnityFramework
-//
-//  Created by Margot Guetta on 11/04/2021.
-//
-
-#import <Foundation/Foundation.h>
-#import "AppsFlyerAttribution.h"
-
-@implementation AppsFlyerAttribution
-
-+ (id)shared {
-    static AppsFlyerAttribution *shared = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        shared = [[self alloc] init];
-    });
-    return shared;
-}
-
-- (id)init {
-    if (self = [super init]) {
-        self.options = nil;
-        self.restorationHandler = nil;
-        self.url = nil;
-        self.userActivity = nil;
-        self.annotation = nil;
-        self.sourceApplication = nil;
-        self.isBridgeReady = NO;
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(receiveBridgeReadyNotification:)
-                                                     name:AF_BRIDGE_SET
-                                                   object:nil];
-  }
-  return self;
-}
-
-- (void) continueUserActivity: (NSUserActivity*_Nullable) userActivity restorationHandler: (void (^_Nullable)(NSArray * _Nullable))restorationHandler{
-    if(self.isBridgeReady == YES){
-        [[AppsFlyerLib shared] continueUserActivity:userActivity restorationHandler:restorationHandler];
-    }else{
-        [AppsFlyerAttribution shared].userActivity = userActivity;
-        [AppsFlyerAttribution shared].restorationHandler = restorationHandler;
-    }
-}
-
-- (void) handleOpenUrl:(NSURL *)url options:(NSDictionary *)options{
-    if(self.isBridgeReady == YES){
-        [[AppsFlyerLib shared] handleOpenUrl:url options:options];
-    }else{
-        [AppsFlyerAttribution shared].url = url;
-        [AppsFlyerAttribution shared].options = options;
-    }
-}
-
-- (void) handleOpenUrl:(NSURL *)url sourceApplication:(NSString*)sourceApplication annotation:(id)annotation{
-    if(self.isBridgeReady == YES){
-        [[AppsFlyerLib shared] handleOpenURL:url sourceApplication:sourceApplication withAnnotation:annotation];
-    }else{
-        [AppsFlyerAttribution shared].url = url;
-        [AppsFlyerAttribution shared].sourceApplication = sourceApplication;
-        [AppsFlyerAttribution shared].annotation = annotation;
-    }
-
-}
-
-- (void) receiveBridgeReadyNotification:(NSNotification *) notification
-{
-    NSLog (@"AppsFlyer Debug: handle deep link");
-    if(self.url && self.sourceApplication){
-        [[AppsFlyerLib shared] handleOpenURL:self.url sourceApplication:self.sourceApplication withAnnotation:self.annotation];
-        self.url = nil;
-        self.sourceApplication = nil;
-        self.annotation = nil;
-    }else if(self.options && self.url){
-        [[AppsFlyerLib shared] handleOpenUrl:self.url options:self.options];
-        self.options = nil;
-        self.url = nil;
-    }else if(self.userActivity){
-        [[AppsFlyerLib shared] continueUserActivity:self.userActivity restorationHandler:nil];
-        self.userActivity = nil;
-        self.restorationHandler = nil;
-    }
-}
-@end

Assets/AppsFlyer/Plugins/iOS/AppsFlyeriOSWrapper.h

@@ -1,50 +0,0 @@
-//
-//  AppsFlyeriOSWarpper.h
-//  Unity-iPhone
-//
-//  Created by Jonathan Wesfield on 24/07/2019.
-//
-
-#import "AFUnityUtils.mm"
-#import "UnityAppController.h"
-#import "AppsFlyerAttribution.h"
-#if __has_include(<AppsFlyerLib/AppsFlyerLib.h>)
-#import <AppsFlyerLib/AppsFlyerLib.h>
-#else
-#import "AppsFlyerLib.h"
-#endif
-
-@interface AppsFlyeriOSWarpper : NSObject <AppsFlyerLibDelegate, AppsFlyerDeepLinkDelegate>
-+ (BOOL) didCallStart;
-+ (void) setDidCallStart:(BOOL)val;
-@end
-
-
-static AppsFlyeriOSWarpper *_AppsFlyerdelegate;
-static const int kPushNotificationSize = 32;
-
-static NSString* ConversionDataCallbackObject = @"AppsFlyerObject";
-
-static const char* VALIDATE_CALLBACK = "didFinishValidateReceipt";
-static const char* VALIDATE_ERROR_CALLBACK = "didFinishValidateReceiptWithError";
-static const char* GCD_CALLBACK = "onConversionDataSuccess";
-static const char* GCD_ERROR_CALLBACK = "onConversionDataFail";
-static const char* OAOA_CALLBACK = "onAppOpenAttribution";
-static const char* OAOA_ERROR_CALLBACK = "onAppOpenAttributionFailure";
-static const char* GENERATE_LINK_CALLBACK = "onInviteLinkGenerated";
-static const char* OPEN_STORE_LINK_CALLBACK = "onOpenStoreLinkGenerated";
-static const char* START_REQUEST_CALLBACK = "requestResponseReceived";
-static const char* IN_APP_RESPONSE_CALLBACK = "inAppResponseReceived";
-static const char* ON_DEEPLINKING = "onDeepLinking";
-static const char* VALIDATE_AND_LOG_V2_CALLBACK = "onValidateAndLogComplete";
-static const char* VALIDATE_AND_LOG_V2_ERROR_CALLBACK = "onValidateAndLogFailure";
-
-
-static NSString* validateObjectName = @"";
-static NSString* openStoreObjectName = @"";
-static NSString* generateInviteObjectName = @"";
-static NSString* validateAndLogObjectName = @"";
-static NSString* startRequestObjectName = @"";
-static NSString* inAppRequestObjectName = @"";
-static NSString* onDeeplinkingObjectName = @"";
-

Assets/AppsFlyer/Plugins/iOS/AppsFlyeriOSWrapper.h.meta

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

Assets/AppsFlyer/Plugins/iOS/AppsFlyeriOSWrapper.mm

@@ -1,370 +0,0 @@
-//
-//  AppsFlyeriOSWarpper.mm
-//  Unity-iPhone
-//
-//  Created by Jonathan Wesfield on 24/07/2019.
-//
-
-#import "AppsFlyeriOSWrapper.h"
-
-
-static void unityCallBack(NSString* objectName, const char* method, const char* msg) {
-    if(objectName){
-        UnitySendMessage([objectName UTF8String], method, msg);
-    }
-}
-
-extern "C" {
- 
-    const void _startSDK(bool shouldCallback, const char* objectName) {
-        [[AppsFlyerLib shared] setPluginInfoWith: AFSDKPluginUnity
-                                pluginVersion:@"6.14.5"
-                                additionalParams:nil];
-        startRequestObjectName = stringFromChar(objectName);
-        AppsFlyeriOSWarpper.didCallStart = YES;
-        [AppsFlyerAttribution shared].isBridgeReady = YES;
-        [[NSNotificationCenter defaultCenter] postNotificationName:AF_BRIDGE_SET object: [AppsFlyerAttribution shared]];
-        [[AppsFlyerLib shared] startWithCompletionHandler:^(NSDictionary<NSString *,id> *dictionary, NSError *error) {
-            if(shouldCallback){
-                if (error) {
-                    NSDictionary *callbackDictionary = @{@"statusCode":[NSNumber numberWithLong:[error code]]};
-                    unityCallBack(startRequestObjectName, START_REQUEST_CALLBACK, stringFromdictionary(callbackDictionary));
-                    return;
-                }
-                if (dictionary) {
-                    unityCallBack(startRequestObjectName, START_REQUEST_CALLBACK, stringFromdictionary(dictionary));
-                    return;
-                }
-            }
-        }];
-    }
-    
-    const void _setCustomerUserID (const char* customerUserID) {
-        [[AppsFlyerLib shared] setCustomerUserID:stringFromChar(customerUserID)];
-    }
-
-    const void _setAdditionalData (const char* customData) {
-        [[AppsFlyerLib shared] setAdditionalData:dictionaryFromJson(customData)];
-    }
-
-    const void _setAppsFlyerDevKey (const char* appsFlyerDevKey) {
-        [AppsFlyerLib shared].appsFlyerDevKey = stringFromChar(appsFlyerDevKey);
-    }
-
-    const void _setAppleAppID (const char* appleAppID) {
-        [AppsFlyerLib shared].appleAppID = stringFromChar(appleAppID);
-    }
-
-    const void _setCurrencyCode (const char* currencyCode) {
-        [[AppsFlyerLib shared] setCurrencyCode:stringFromChar(currencyCode)];
-    }
-
-    const void _setDisableCollectAppleAdSupport (bool disableAdvertisingIdentifier) {
-       [AppsFlyerLib shared].disableAdvertisingIdentifier = disableAdvertisingIdentifier;
-    }
-
-    const void _setIsDebug (bool isDebug) {
-        [AppsFlyerLib shared].isDebug = isDebug;
-    }
-
-    const void _setShouldCollectDeviceName (bool shouldCollectDeviceName) {
-        [AppsFlyerLib shared].shouldCollectDeviceName = shouldCollectDeviceName;
-    }
-
-    const void _setAppInviteOneLinkID (const char*  appInviteOneLinkID) {
-        [[AppsFlyerLib shared] setAppInviteOneLink:stringFromChar(appInviteOneLinkID)];
-    }
-
-    const void _setDeepLinkTimeout (long  deepLinkTimeout) {
-        [AppsFlyerLib shared].deepLinkTimeout = deepLinkTimeout;
-    }
-
-    const void _anonymizeUser (bool anonymizeUser) {
-        [AppsFlyerLib shared].anonymizeUser = anonymizeUser;
-    }
-
-    const void _enableTCFDataCollection (bool shouldCollectTcfData) {
-       [[AppsFlyerLib shared] enableTCFDataCollection:shouldCollectTcfData];
-    }
-
-    const void _setConsentData(bool isUserSubjectToGDPR, bool hasConsentForDataUsage, bool hasConsentForAdsPersonalization) {
-        AppsFlyerConsent *consentData = nil;
-        if (isUserSubjectToGDPR) {
-            consentData = [[AppsFlyerConsent alloc] initForGDPRUserWithHasConsentForDataUsage:hasConsentForDataUsage hasConsentForAdsPersonalization:hasConsentForAdsPersonalization];
-        } else {
-            consentData = [[AppsFlyerConsent alloc] initNonGDPRUser];
-        }
-       [[AppsFlyerLib shared] setConsentData:consentData];
-    }
-
-    const void _setDisableCollectIAd (bool disableCollectASA) {
-        [AppsFlyerLib shared].disableCollectASA = disableCollectASA;
-    }
-    
-    const void _setUseReceiptValidationSandbox (bool useReceiptValidationSandbox) {
-        [AppsFlyerLib shared].useReceiptValidationSandbox = useReceiptValidationSandbox;
-    }
-    
-    const void _setUseUninstallSandbox (bool useUninstallSandbox) {
-        [AppsFlyerLib shared].useUninstallSandbox = useUninstallSandbox;
-    }
-
-    const void _setResolveDeepLinkURLs (int length, const char **resolveDeepLinkURLs) {
-        if(length > 0 && resolveDeepLinkURLs) {
-            [[AppsFlyerLib shared] setResolveDeepLinkURLs:NSArrayFromCArray(length, resolveDeepLinkURLs)];
-        }
-    }
-
-    const void _setOneLinkCustomDomains (int length, const char **oneLinkCustomDomains) {
-        if(length > 0 && oneLinkCustomDomains) {
-            [[AppsFlyerLib shared] setOneLinkCustomDomains:NSArrayFromCArray(length, oneLinkCustomDomains)];
-        }
-    }
-
-    const void _afSendEvent (const char* eventName, const char* eventValues, bool shouldCallback, const char* objectName) {
-        inAppRequestObjectName = stringFromChar(objectName);
-        [[AppsFlyerLib shared] logEventWithEventName:stringFromChar(eventName) eventValues:dictionaryFromJson(eventValues) completionHandler:^(NSDictionary<NSString *,id> *dictionary, NSError *error) {
-                if(shouldCallback){
-                    if (error) {
-                        NSDictionary *callbackDictionary = @{@"statusCode":[NSNumber numberWithLong:[error code]]};
-                        unityCallBack(inAppRequestObjectName, IN_APP_RESPONSE_CALLBACK, stringFromdictionary(callbackDictionary));
-                        return;
-                    }
-                    if (dictionary) {
-                        unityCallBack(inAppRequestObjectName, IN_APP_RESPONSE_CALLBACK, stringFromdictionary(dictionary));
-                        return;
-                    }
-                }
-        }];
-    }
-
-    const void _recordLocation (double longitude, double latitude) {
-        [[AppsFlyerLib shared] logLocation:longitude latitude:latitude];
-    }
-
-    const char* _getAppsFlyerId () {
-        return getCString([[[AppsFlyerLib shared] getAppsFlyerUID] UTF8String]);
-    }
-
-    const void _registerUninstall (unsigned char* deviceToken) {
-        if(deviceToken){
-            NSData* tokenData = [NSData dataWithBytes:(const void *)deviceToken length:sizeof(unsigned char)*kPushNotificationSize];
-            [[AppsFlyerLib shared] registerUninstall:tokenData];
-        }
-    }
-
-    const void _handlePushNotification (const char* pushPayload) {
-        [[AppsFlyerLib shared] handlePushNotification:dictionaryFromJson(pushPayload)];
-    }
-
-    const char* _getSDKVersion () {
-        return getCString([[[AppsFlyerLib shared] getSDKVersion] UTF8String]);
-    }
-
-    const void _setHost (const char* host, const char* hostPrefix) {
-        [[AppsFlyerLib shared] setHost:stringFromChar(host) withHostPrefix:stringFromChar(hostPrefix)];
-    }
-
-    const void _setMinTimeBetweenSessions (int minTimeBetweenSessions) {
-        [AppsFlyerLib shared].minTimeBetweenSessions = minTimeBetweenSessions;
-    }
-
-    const void _stopSDK (bool isStopped) {
-        [AppsFlyerLib shared].isStopped = isStopped;
-    }
-
-    const BOOL _isSDKStopped () {
-        return [AppsFlyerLib shared].isStopped;
-    }
-
-    const void _handleOpenUrl(const char *url, const char *sourceApplication, const char *annotation) {
-        [[AppsFlyerLib shared] handleOpenURL:[NSURL URLWithString:stringFromChar(url)] sourceApplication:stringFromChar(sourceApplication) withAnnotation:stringFromChar(annotation)];    }
-
-    const void _recordCrossPromoteImpression (const char* appID, const char* campaign, const char* parameters) {
-        [AppsFlyerCrossPromotionHelper logCrossPromoteImpression:stringFromChar(appID) campaign:stringFromChar(campaign) parameters:dictionaryFromJson(parameters)];    }
-    
-    const void _attributeAndOpenStore (const char* appID, const char* campaign, const char* parameters, const char* objectName) {
-
-        openStoreObjectName = stringFromChar(objectName);
-
-        [AppsFlyerCrossPromotionHelper
-         logAndOpenStore:stringFromChar(appID)
-         campaign:stringFromChar(campaign)
-         parameters:dictionaryFromJson(parameters)
-         openStore:^(NSURLSession * _Nonnull urlSession, NSURL * _Nonnull clickURL) {
-            unityCallBack(openStoreObjectName, OPEN_STORE_LINK_CALLBACK, [clickURL.absoluteString UTF8String]);
-        }];
-    }
-    
-    const void _generateUserInviteLink (const char* parameters, const char* objectName) {
-
-        generateInviteObjectName = stringFromChar(objectName);
-
-        [AppsFlyerShareInviteHelper generateInviteUrlWithLinkGenerator:^AppsFlyerLinkGenerator * _Nonnull(AppsFlyerLinkGenerator * _Nonnull generator) {
-            return generatorFromDictionary(dictionaryFromJson(parameters), generator);
-        } completionHandler:^(NSURL * _Nullable url) {
-            unityCallBack(generateInviteObjectName, GENERATE_LINK_CALLBACK, [url.absoluteString UTF8String]);
-        }];
-    }
-    
-    const void _recordInvite (const char* channel, const char* parameters) {
-        [AppsFlyerShareInviteHelper logInvite:stringFromChar(channel) parameters:dictionaryFromJson(parameters)];
-    }
-    
-    const void _setUserEmails (int emailCryptTypeInt , int length, const char **userEmails) {
-        if(length > 0 && userEmails) {
-            [[AppsFlyerLib shared] setUserEmails:NSArrayFromCArray(length, userEmails) withCryptType:emailCryptTypeFromInt(emailCryptTypeInt)];
-        }
-    }
-
-    const void _setPhoneNumber (const char* phoneNumber) {
-        [[AppsFlyerLib shared] setPhoneNumber:stringFromChar(phoneNumber)];
-    }
-
-    const void _setSharingFilterForAllPartners () {
-        [[AppsFlyerLib shared] setSharingFilterForAllPartners];
-    }
-
-    const void _setSharingFilter (int length, const char **partners) {
-        if(length > 0 && partners) {
-            [[AppsFlyerLib shared] setSharingFilter:NSArrayFromCArray(length, partners)];
-        }
-    }
-
-    const void _setSharingFilterForPartners (int length, const char **partners) {
-        if(length > 0 && partners) {
-            [[AppsFlyerLib shared] setSharingFilterForPartners:NSArrayFromCArray(length, partners)];
-        } else {
-            [[AppsFlyerLib shared] setSharingFilterForPartners:nil];
-        }
-    }
-    
-    const void _validateAndSendInAppPurchase (const char* productIdentifier, const char* price, const char* currency, const char* transactionId, const char* additionalParameters, const char* objectName) {
-
-        validateObjectName = stringFromChar(objectName);
-
-        [[AppsFlyerLib shared]
-         validateAndLogInAppPurchase:stringFromChar(productIdentifier)
-         price:stringFromChar(price)
-         currency:stringFromChar(currency)
-         transactionId:stringFromChar(transactionId)
-         additionalParameters:dictionaryFromJson(additionalParameters)
-         success:^(NSDictionary *result){
-                 unityCallBack(validateObjectName, VALIDATE_CALLBACK, stringFromdictionary(result));
-         } failure:^(NSError *error, id response) {
-            if(response && [response isKindOfClass:[NSDictionary class]]) {
-                 NSDictionary* value = (NSDictionary*)response;
-                 unityCallBack(validateObjectName, VALIDATE_ERROR_CALLBACK, stringFromdictionary(value));
-             } else {
-                 unityCallBack(validateObjectName, VALIDATE_ERROR_CALLBACK, error ? [[error localizedDescription] UTF8String] : "error");
-             }
-         }];
-    }
-
-    const void _validateAndSendInAppPurchaseV2 (const char* product, const char* price, const char* currency, const char* transactionId, const char* extraEventValues, const char* objectName) {
-
-        validateAndLogObjectName = stringFromChar(objectName);
-        AFSDKPurchaseDetails *details = [[AFSDKPurchaseDetails alloc] initWithProductId:stringFromChar(product) price:stringFromChar(price) currency:stringFromChar(currency) transactionId:stringFromChar(transactionId)];
-
-        [[AppsFlyerLib shared]
-         validateAndLogInAppPurchase:details
-         extraEventValues:dictionaryFromJson(extraEventValues)
-         completionHandler:^(AFSDKValidateAndLogResult * _Nullable result) {
-            if (result.status == AFSDKValidateAndLogStatusSuccess) {
-                unityCallBack(validateAndLogObjectName, VALIDATE_AND_LOG_V2_CALLBACK, stringFromdictionary(result.result));
-            } else if (result.status == AFSDKValidateAndLogStatusFailure) {
-                 unityCallBack(validateAndLogObjectName, VALIDATE_AND_LOG_V2_CALLBACK, stringFromdictionary(result.errorData));
-            } else {
-                unityCallBack(validateAndLogObjectName, VALIDATE_AND_LOG_V2_ERROR_CALLBACK, stringFromdictionary(dictionaryFromNSError(result.error)));
-            }
-        }];
-         
-    }
-    
-    const void _getConversionData(const char* objectName) {
-        if (_AppsFlyerdelegate == nil) {
-            _AppsFlyerdelegate = [[AppsFlyeriOSWarpper alloc] init];
-        }
-        ConversionDataCallbackObject = stringFromChar(objectName);
-        [[AppsFlyerLib shared] setDelegate:_AppsFlyerdelegate];
-    }
-
-    const void _waitForATTUserAuthorizationWithTimeoutInterval (int timeoutInterval) {
-       [[AppsFlyerLib shared] waitForATTUserAuthorizationWithTimeoutInterval:timeoutInterval];
-    }
-
-    const void _disableSKAdNetwork (bool isDisabled) {
-        [AppsFlyerLib shared].disableSKAdNetwork = isDisabled;
-    }
-
-    const void _addPushNotificationDeepLinkPath (int length, const char **paths) {
-        if(length > 0 && paths) {
-            [[AppsFlyerLib shared] addPushNotificationDeepLinkPath:NSArrayFromCArray(length, paths)];
-        }
-    }
-
-    const void _subscribeForDeepLink (const char* objectName) {
-
-        onDeeplinkingObjectName = stringFromChar(objectName);
-        
-        if (_AppsFlyerdelegate == nil) {
-            _AppsFlyerdelegate = [[AppsFlyeriOSWarpper alloc] init];
-        }
-        [[AppsFlyerLib shared] setDeepLinkDelegate:_AppsFlyerdelegate];
-    }
-
-    const void _setCurrentDeviceLanguage(const char* language) {
-        [[AppsFlyerLib shared] setCurrentDeviceLanguage:stringFromChar(language)];
-    }
-
-    const void _setPartnerData(const char* partnerId, const char* partnerInfo) {
-        [[AppsFlyerLib shared] setPartnerDataWithPartnerId: stringFromChar(partnerId) partnerInfo:dictionaryFromJson(partnerInfo)];
-    }
-
-    const void _disableIDFVCollection(bool isDisabled) {
-        [AppsFlyerLib shared].disableIDFVCollection = isDisabled;
-    }
-
-}
-
-@implementation AppsFlyeriOSWarpper
-
-static BOOL didCallStart;
-+ (BOOL) didCallStart
-{ @synchronized(self) { return didCallStart; } }
-+ (void) setDidCallStart:(BOOL)val
-{ @synchronized(self) { didCallStart = val; } }
-
-- (void)onConversionDataSuccess:(NSDictionary *)installData {
-    unityCallBack(ConversionDataCallbackObject, GCD_CALLBACK, stringFromdictionary(installData));
-}
-
-- (void)onConversionDataFail:(NSError *)error {
-    unityCallBack(ConversionDataCallbackObject, GCD_ERROR_CALLBACK, [[error localizedDescription] UTF8String]);
-}
-
-- (void)onAppOpenAttribution:(NSDictionary *)attributionData {
-    unityCallBack(ConversionDataCallbackObject, OAOA_CALLBACK, stringFromdictionary(attributionData));
-}
-
-- (void)onAppOpenAttributionFailure:(NSError *)error {
-    unityCallBack(ConversionDataCallbackObject, OAOA_ERROR_CALLBACK, [[error localizedDescription] UTF8String]);
-}
-
-- (void)didResolveDeepLink:(AppsFlyerDeepLinkResult *)result{
-    
-    NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
-    
-    [dict setValue:stringFromDeepLinkResultError(result) forKey:@"error"];
-    [dict setValue:stringFromDeepLinkResultStatus(result.status) forKey:@"status"];
-    
-    if(result && result.deepLink){
-        [dict setValue:result.deepLink.description forKey:@"deepLink"];
-        [dict setValue:@(result.deepLink.isDeferred) forKey:@"is_deferred"];
-    }
-    
-    unityCallBack(onDeeplinkingObjectName, ON_DEEPLINKING, stringFromdictionary(dict));
-}
-
-@end
-

Assets/AppsFlyer/Plugins/iOS/AppsFlyeriOSWrapper.mm.meta

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

Assets/AppsFlyer/ProductPurchase.cs

@@ -0,0 +1,184 @@
+#nullable enable
+
+using System.Collections;
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+
+[System.Serializable]
+public class InAppPurchaseValidationResult : EventArgs
+{
+    public bool success;
+    public ProductPurchase? productPurchase;
+    public ValidationFailureData? failureData;
+    public string? token;
+}
+
+[System.Serializable]
+public class ProductPurchase
+{
+    public string? kind;
+    public string? purchaseTimeMillis;
+    public int purchaseState;
+    public int consumptionState;
+    public string? developerPayload;
+    public string? orderId;
+    public int purchaseType;
+    public int acknowledgementState;
+    public string? purchaseToken;
+    public string? productId;
+    public int quantity;
+    public string? obfuscatedExternalAccountId;
+    public string? obfuscatedExternalProfil;
+    public string? regionCode;
+}
+
+[System.Serializable]
+public class ValidationFailureData
+{
+    public int status;
+    public string? description;
+}
+
+[System.Serializable]
+public class SubscriptionValidationResult
+{
+    public bool success;
+    public SubscriptionPurchase? subscriptionPurchase;
+    public ValidationFailureData? failureData;
+    public string? token;
+}
+
+[System.Serializable]
+public class SubscriptionPurchase
+{
+    public string? acknowledgementState;
+    public CanceledStateContext? canceledStateContext;
+    public ExternalAccountIdentifiers? externalAccountIdentifiers;
+    public string? kind;
+    public string? latestOrderId;
+    public List<SubscriptionPurchaseLineItem>? lineItems;
+    public string? linkedPurchaseToken;
+    public PausedStateContext? pausedStateContext;
+    public string? regionCode;
+    public string? startTime;
+    public SubscribeWithGoogleInfo? subscribeWithGoogleInfo;
+    public string? subscriptionState;
+    public TestPurchase? testPurchase;
+}
+
+[System.Serializable]
+public class CanceledStateContext
+{
+    public DeveloperInitiatedCancellation? developerInitiatedCancellation;
+    public ReplacementCancellation? replacementCancellation;
+    public SystemInitiatedCancellation? systemInitiatedCancellation;
+    public UserInitiatedCancellation? userInitiatedCancellation;
+
+}
+
+[System.Serializable]
+public class ExternalAccountIdentifiers
+{
+    public string? externalAccountId;
+    public string? obfuscatedExternalAccountId;
+    public string? obfuscatedExternalProfileId;
+}
+
+[System.Serializable]
+public class SubscriptionPurchaseLineItem
+{
+    public AutoRenewingPlan? autoRenewingPlan;
+    public DeferredItemReplacement? deferredItemReplacement;
+    public string? expiryTime;
+    public OfferDetails? offerDetails;
+    public PrepaidPlan? prepaidPlan;
+    public string? productId;
+}
+
+[System.Serializable]
+public class PausedStateContext
+{
+    public string? autoResumeTime;
+}
+
+[System.Serializable]
+public class SubscribeWithGoogleInfo
+{
+    public string? emailAddress;
+    public string? familyName;
+    public string? givenName;
+    public string? profileId;
+    public string? profileName;
+}
+
+[System.Serializable]
+public class TestPurchase{}
+
+[System.Serializable]
+public class DeveloperInitiatedCancellation{}
+
+[System.Serializable]
+public class ReplacementCancellation{}
+
+[System.Serializable]
+public class SystemInitiatedCancellation{}
+
+[System.Serializable]
+public class UserInitiatedCancellation
+{
+    public CancelSurveyResult? cancelSurveyResult;
+    public string? cancelTime;
+}
+
+[System.Serializable]
+public class AutoRenewingPlan
+{
+    public string? autoRenewEnabled;
+    public SubscriptionItemPriceChangeDetails? priceChangeDetails;
+}
+
+[System.Serializable]
+public class DeferredItemReplacement
+{
+    public string? productId;
+}
+
+[System.Serializable]
+public class OfferDetails
+{
+    public List<string>? offerTags;
+    public string? basePlanId;
+    public string? offerId;
+}
+
+[System.Serializable]
+public class PrepaidPlan
+{
+    public string? allowExtendAfterTime;
+}
+
+[System.Serializable]
+public class CancelSurveyResult
+{
+    public string? reason;
+    public string? reasonUserInput;
+}
+
+[System.Serializable]
+public class SubscriptionItemPriceChangeDetails
+{
+    public string? expectedNewPriceChargeTime;
+    public Money? newPrice;
+    public string? priceChangeMode;
+    public string? priceChangeState;
+}
+
+[System.Serializable]
+ public class Money
+ {
+    public string? currencyCode;
+    public long nanos;
+    public long units;
+ }
+   

Assets/AppsFlyer/ProductPurchase.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c1fb9f17f3368af48ba71961c88b0719
+guid: 9a1435104a69d4c8ebcc6f237cc29a54
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/AppsFlyer/package.json

@@ -2,7 +2,7 @@
 	"name": "appsflyer-unity-plugin",
 	"displayName": "AppsFlyer",
 	"description": "AppsFlyer Unity plugin",
-	"version": "6.14.4",
+	"version": "6.17.91",
 	"unity": "2019.4",
 	"license": "MIT"
   }

Assets/BingoBrain/BingoScene.cs

@@ -3,6 +3,12 @@ using UnityEngine;
 using BingoBrain.Asset;
 using BingoBrain.HotFix;
 using Unity.VisualScripting;
+using DontConfuse;
+using FairyGUI;
+using DG.Tweening;
+
+
+
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
@@ -24,6 +30,9 @@ namespace BingoBrain
 
         protected override void OnSwhSceCompl(object param = null)
         {
+#if UNITY_EDITOR||BingoBrainRelease
+            GameObject.Find("IngameDebugConsole").SetActive(false);
+#endif
             StartUpAppProcess();
         }
 
@@ -39,8 +48,8 @@ namespace BingoBrain
         {
             CtrlDispatcher.Instance.AddListener(CtrlMsg.Login_Succeed, OnLoginSucceed);
             // #if !UNITY_EDITOR && UNITY_ANDROID
-                         MaxADKit.Init();
-                         Debug.Log("init");
+            MaxADKit.Init();
+            Debug.Log("init");
             // #endif
             OnInitAsset();
             AppDispatcher.Instance.AddListener(CsjInfoC.UI_LoadingInitAsset, OnInitAsset);
@@ -56,15 +65,15 @@ namespace BingoBrain
             AppDispatcher.Instance.Dispatch(CsjInfoC.AppManagerRegister);
             AppDispatcher.Instance.Dispatch(CsjInfoC.InitUIMgr);
             AppDispatcher.Instance.AddListener(CsjInfoC.LoginInit, OnLoadingComplete);
-            PreferencesMgr.Instance.InitPreferences();
-            NetworkDispatcher.Instance.Dispatch(ExternalInfo.GetConfig);//quxiaozhushi
-            NetworkDispatcher.Instance.AddListener(NetworkMsg.Start,ShowScene);//quxiaozhushi
+            //   PreferencesMgr.Instance.InitPreferences();
+            //   NetworkDispatcher.Instance.Dispatch(ExternalInfo.GetConfig);//quxiaozhushi
+            //   NetworkDispatcher.Instance.AddListener(NetworkMsg.Start, ShowScene);//quxiaozhushi
         }
 
         private void OnLoadingComplete(object param = null)
         {
             CtrlDispatcher.Instance.Dispatch(CtrlMsg.Game_StartReady);
-            TimerHelper.mEasy.AddTimer(0.1f, () =>
+            DOVirtual.DelayedCall(0.1f, () =>
             {
                 Audio.Instance.InitDefaultButtonClickSound(DoConst.UIButtonDefault);
                 ModuleBoardk.Instance.AllModuleGameStart();
@@ -72,13 +81,44 @@ namespace BingoBrain
                 SaveingPotHelper.CheckSaveingPot();
                 SaveingPotHelper.TestingClearTime();
                 // HideLoadingUI();
-            });
-        }
+                if (GameHelper.IsGiftSwitch())
+                {
+                    WebviewManager.Instance.SetFullScreen();
+                    int flyswitch = ConfigSystem.GetConfig<CommonModel>().flyswitch;
+                    int propswitch = ConfigSystem.GetConfig<CommonModel>().propswitch;
 
+                    int offset_y = ConfigSystem.GetConfig<CommonModel>().WVOffset[0];
+                    int offset_y1 = ConfigSystem.GetConfig<CommonModel>().WVOffset[1];
+                    Debug.Log("barry offset_y: " + offset_y + " offset_y1: " + offset_y1);
+                    float top_offset = 150;//fgui中的顶部信息的高度
+                    float buttom_offset = 0;
+                    if (Screen.safeArea.y != 0)
+                    {//刘海屏
+                        top_offset += Screen.safeArea.y;
+                    }
+                    WebviewManager.Instance.SetOffset(offset_y, offset_y1);
+                    WebviewManager.Instance.SetPadding(0, top_offset / GRoot.inst.height, 0, buttom_offset / GRoot.inst.height);
+
+                    WebviewManager.Instance.RefreshUrl();
+                    // Debug.Log($"flyswitch==1 ------ {flyswitch == 1}");
+                    // Debug.Log($"propswitch==1 ------ {propswitch == 1}");
+                    WebviewManager.Instance.setFlyBtnTag(flyswitch == 1);
+                    WebviewManager.Instance.setRewardBtnTag(propswitch == 1);
+                    WebviewManager.Instance.SetDarkThough(true);
+                    WebviewManager.Instance.ShowH5View(false);
+                    WebviewManager.Instance.SetBtn(ConfigSystem.GetConfig<CommonModel>().propCoord[0], ConfigSystem.GetConfig<CommonModel>().propCoord[1], 60, 60);
+                }
+            });
+            SaveingPotHelper.ResetHistory();
+        }
+        private bool isopen = false;
         private void ShowScene(object a = null)
         {
+            if (isopen) return;
             UICtrlDispatcher.Instance.Dispatch(SkinInfo.EnterBingoUI_Open);
             GameHelper.PostFunnelLogin("enterButtonShow");
+            isopen = true;
+            LoginSystem_sdk.Instance.RequestLogin();
         }
 
         public override void Dispose()

Assets/BingoBrain/FGUI/Package/ACommon/btn_102.cs

@@ -8,8 +8,8 @@ namespace FGUI.ACommon
     public partial class btn_102 : GButton
     {
         public Controller gift;
-        public GGraph gp_hand;
         public GImage load_icon;
+        public GGraph gp_hand;
         public const string URL = "ui://pmf3wbjilbaa8";
 
         public static btn_102 CreateInstance()
@@ -22,8 +22,8 @@ namespace FGUI.ACommon
             base.ConstructFromXML(xml);
 
             gift = GetControllerAt(0);
-            gp_hand = (GGraph)GetChildAt(0);
-            load_icon = (GImage)GetChildAt(3);
+            load_icon = (GImage)GetChildAt(1);
+            gp_hand = (GGraph)GetChildAt(2);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/ACommon/btn_green_vid.cs

@@ -8,6 +8,7 @@ namespace FGUI.ACommon
     public partial class btn_green_vid : GButton
     {
         public Controller cont_button;
+        public GImage img_saveingpot;
         public const string URL = "ui://pmf3wbjia9pgfg";
 
         public static btn_green_vid CreateInstance()
@@ -20,6 +21,7 @@ namespace FGUI.ACommon
             base.ConstructFromXML(xml);
 
             cont_button = GetControllerAt(0);
+            img_saveingpot = (GImage)GetChildAt(3);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/ACommon/btn_hall_h5.cs

@@ -8,6 +8,7 @@ namespace FGUI.ACommon
     public partial class btn_hall_h5 : GButton
     {
         public GTextField number_text;
+        public GTextField lab_time;
         public const string URL = "ui://pmf3wbjimfb0pif";
 
         public static btn_hall_h5 CreateInstance()
@@ -19,7 +20,8 @@ namespace FGUI.ACommon
         {
             base.ConstructFromXML(xml);
 
-            number_text = (GTextField)GetChildAt(3);
+            number_text = (GTextField)GetChildAt(2);
+            lab_time = (GTextField)GetChildAt(3);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/ACommon/com_avatar.cs

@@ -20,7 +20,7 @@ namespace FGUI.ACommon
         {
             base.ConstructFromXML(xml);
 
-            loader_flag = (GLoader)GetChildAt(2);
+            loader_flag = (GLoader)GetChildAt(1);
             text_name = (GTextField)GetChildAt(3);
         }
     }

Assets/BingoBrain/FGUI/Package/ACommon/com_broadcast1.cs

@@ -7,9 +7,9 @@ namespace FGUI.ACommon
 {
     public partial class com_broadcast1 : GComponent
     {
-        public GButton btn_record;
         public com_broadcast_text1 broad_cast_text;
         public GGroup broad;
+        public GButton btn_record;
         public GGroup group_;
         public Transition t0;
         public Transition t1;
@@ -24,9 +24,9 @@ namespace FGUI.ACommon
         {
             base.ConstructFromXML(xml);
 
-            btn_record = (GButton)GetChildAt(0);
-            broad_cast_text = (com_broadcast_text1)GetChildAt(1);
-            broad = (GGroup)GetChildAt(2);
+            broad_cast_text = (com_broadcast_text1)GetChildAt(0);
+            broad = (GGroup)GetChildAt(1);
+            btn_record = (GButton)GetChildAt(2);
             group_ = (GGroup)GetChildAt(3);
             t0 = GetTransitionAt(0);
             t1 = GetTransitionAt(1);

Assets/BingoBrain/FGUI/Package/ACommon/com_broadcast_text1.cs

@@ -7,9 +7,7 @@ namespace FGUI.ACommon
 {
     public partial class com_broadcast_text1 : GComponent
     {
-        public GGraph bg_panel;
         public GRichTextField cast_text;
-        public GRichTextField hide_text;
         public GButton btn_broad;
         public const string URL = "ui://pmf3wbjiez6k22";
 
@@ -22,10 +20,8 @@ namespace FGUI.ACommon
         {
             base.ConstructFromXML(xml);
 
-            bg_panel = (GGraph)GetChildAt(0);
             cast_text = (GRichTextField)GetChildAt(1);
-            hide_text = (GRichTextField)GetChildAt(2);
-            btn_broad = (GButton)GetChildAt(3);
+            btn_broad = (GButton)GetChildAt(2);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/ACommon/com_currency.cs

@@ -7,10 +7,11 @@ namespace FGUI.ACommon
 {
     public partial class com_currency : GComponent
     {
+        public com_avatar com_avatar;
         public GButton settings;
         public btn_101 btn_coin;
         public btn_102 btn_cash;
-        public com_avatar com_avatar;
+        public GGroup top_group;
         public const string URL = "ui://pmf3wbjiaxgih3";
 
         public static com_currency CreateInstance()
@@ -22,10 +23,11 @@ namespace FGUI.ACommon
         {
             base.ConstructFromXML(xml);
 
-            settings = (GButton)GetChildAt(0);
-            btn_coin = (btn_101)GetChildAt(1);
-            btn_cash = (btn_102)GetChildAt(2);
-            com_avatar = (com_avatar)GetChildAt(3);
+            com_avatar = (com_avatar)GetChildAt(1);
+            settings = (GButton)GetChildAt(2);
+            btn_coin = (btn_101)GetChildAt(3);
+            btn_cash = (btn_102)GetChildAt(4);
+            top_group = (GGroup)GetChildAt(5);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/ACommon/com_di.cs

@@ -8,11 +8,11 @@ namespace FGUI.ACommon
     public partial class com_di : GComponent
     {
         public Controller gift;
-        public btn_main btn_main;
+        public btn_fight btn_main;
         public btn_h5 btn_shop;
-        public btn_todo btn_tab_redem;
+        public btn_todo btn_fight;
         public btn_hall btn_hall;
-        public btn_fight btn_fight;
+        public btn_main btn_tab_redem;
         public const string URL = "ui://pmf3wbjiokk5gf";
 
         public static com_di CreateInstance()
@@ -25,11 +25,11 @@ namespace FGUI.ACommon
             base.ConstructFromXML(xml);
 
             gift = GetControllerAt(0);
-            btn_main = (btn_main)GetChildAt(1);
+            btn_main = (btn_fight)GetChildAt(1);
             btn_shop = (btn_h5)GetChildAt(2);
-            btn_tab_redem = (btn_todo)GetChildAt(3);
+            btn_fight = (btn_todo)GetChildAt(3);
             btn_hall = (btn_hall)GetChildAt(4);
-            btn_fight = (btn_fight)GetChildAt(7);
+            btn_tab_redem = (btn_main)GetChildAt(7);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/Common_01.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 96a328019e42349aabc478b546b8605e
+guid: 26ad4d79e34cc744ca9c152664f2d3eb
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs

@@ -0,0 +1,26 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace FGUI.Common_01
+{
+    public class Common_01Binder
+    {
+        public static void BindAll()
+        {
+            UIObjectFactory.SetPackageItemExtension(btn_watchAd.URL, typeof(btn_watchAd));
+            UIObjectFactory.SetPackageItemExtension(com_broadcast_text1.URL, typeof(com_broadcast_text1));
+            UIObjectFactory.SetPackageItemExtension(btn_get.URL, typeof(btn_get));
+            UIObjectFactory.SetPackageItemExtension(com_adcoming.URL, typeof(com_adcoming));
+            UIObjectFactory.SetPackageItemExtension(wheel.URL, typeof(wheel));
+            UIObjectFactory.SetPackageItemExtension(item_wheel.URL, typeof(item_wheel));
+            UIObjectFactory.SetPackageItemExtension(wheel_.URL, typeof(wheel_));
+            UIObjectFactory.SetPackageItemExtension(com_broadcast_new.URL, typeof(com_broadcast_new));
+            UIObjectFactory.SetPackageItemExtension(broadcast_top.URL, typeof(broadcast_top));
+            UIObjectFactory.SetPackageItemExtension(broadcast_topitem.URL, typeof(broadcast_topitem));
+            UIObjectFactory.SetPackageItemExtension(com_tips.URL, typeof(com_tips));
+            UIObjectFactory.SetPackageItemExtension(btn_saveingpot.URL, typeof(btn_saveingpot));
+            UIObjectFactory.SetPackageItemExtension(btn_yellow.URL, typeof(btn_yellow));
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a9caa22ae0e13144193de7eab59a62ec
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/broadcast_top.cs

@@ -0,0 +1,35 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class broadcast_top : GComponent
+    {
+        public broadcast_topitem item_0;
+        public broadcast_topitem item_1;
+        public broadcast_topitem item_2;
+        public Transition t1;
+        public Transition t2;
+        public Transition t3;
+        public const string URL = "ui://o9974uc5rdgq9b";
+
+        public static broadcast_top CreateInstance()
+        {
+            return (broadcast_top)UIPackage.CreateObject("Common_01", "broadcast_top");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            item_0 = (broadcast_topitem)GetChildAt(0);
+            item_1 = (broadcast_topitem)GetChildAt(1);
+            item_2 = (broadcast_topitem)GetChildAt(2);
+            t1 = GetTransitionAt(0);
+            t2 = GetTransitionAt(1);
+            t3 = GetTransitionAt(2);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/broadcast_top.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9eda1f3f8ab03d6448a9719cb6d2a128
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/broadcast_topitem.cs

@@ -0,0 +1,27 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class broadcast_topitem : GComponent
+    {
+        public GTextField text_1;
+        public Transition t0;
+        public const string URL = "ui://o9974uc5rdgq9c";
+
+        public static broadcast_topitem CreateInstance()
+        {
+            return (broadcast_topitem)UIPackage.CreateObject("Common_01", "broadcast_topitem");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            text_1 = (GTextField)GetChildAt(1);
+            t0 = GetTransitionAt(0);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/broadcast_topitem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 07a17015e5df63d45b79b4c917b9cb63
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/btn_get.cs

@@ -0,0 +1,27 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class btn_get : GButton
+    {
+        public Controller state;
+        public GImage img_saveingpot;
+        public const string URL = "ui://o9974uc5cphly";
+
+        public static btn_get CreateInstance()
+        {
+            return (btn_get)UIPackage.CreateObject("Common_01", "btn_get");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            state = GetControllerAt(0);
+            img_saveingpot = (GImage)GetChildAt(2);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/btn_get.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ec1f800220e8668419ba72a8077fdcc8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/btn_saveingpot.cs

@@ -0,0 +1,27 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class btn_saveingpot : GButton
+    {
+        public GImage img;
+        public GTextField lab_time;
+        public const string URL = "ui://o9974uc5rj3b4h";
+
+        public static btn_saveingpot CreateInstance()
+        {
+            return (btn_saveingpot)UIPackage.CreateObject("Common_01", "btn_saveingpot");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            img = (GImage)GetChildAt(0);
+            lab_time = (GTextField)GetChildAt(1);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/btn_saveingpot.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 389a12f42dad1724fb9f0ff17aea3b26
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/btn_watchAd.cs

@@ -0,0 +1,37 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class btn_watchAd : GButton
+    {
+        public Controller buy_state;
+        public Controller can_buy;
+        public Controller buy_type;
+        public GTextField btn_text;
+        public GTextField watch;
+        public GImage ad_icon;
+        public GImage img_saveingpot;
+        public const string URL = "ui://o9974uc5b7ax1h";
+
+        public static btn_watchAd CreateInstance()
+        {
+            return (btn_watchAd)UIPackage.CreateObject("Common_01", "btn_watchAd");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            buy_state = GetControllerAt(0);
+            can_buy = GetControllerAt(1);
+            buy_type = GetControllerAt(2);
+            btn_text = (GTextField)GetChildAt(3);
+            watch = (GTextField)GetChildAt(4);
+            ad_icon = (GImage)GetChildAt(5);
+            img_saveingpot = (GImage)GetChildAt(7);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/btn_watchAd.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d76da7f9b5a99d0468735a491ed16058
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/btn_yellow.cs

@@ -0,0 +1,25 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class btn_yellow : GButton
+    {
+        public GImage img_saveingpot;
+        public const string URL = "ui://o9974uc5sebx9";
+
+        public static btn_yellow CreateInstance()
+        {
+            return (btn_yellow)UIPackage.CreateObject("Common_01", "btn_yellow");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            img_saveingpot = (GImage)GetChildAt(2);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/btn_yellow.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1ffeb680974e89d4db508a4fd7bddaa4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/com_adcoming.cs

@@ -0,0 +1,31 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class com_adcoming : GComponent
+    {
+        public GTextField money_text;
+        public GTextField time_text;
+        public btn_get btn_removead;
+        public Transition t0;
+        public const string URL = "ui://o9974uc5jobfas";
+
+        public static com_adcoming CreateInstance()
+        {
+            return (com_adcoming)UIPackage.CreateObject("Common_01", "com_adcoming");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            money_text = (GTextField)GetChildAt(2);
+            time_text = (GTextField)GetChildAt(3);
+            btn_removead = (btn_get)GetChildAt(4);
+            t0 = GetTransitionAt(0);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/com_adcoming.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 97c802e2348ba0d4cb14b62dc2233b15
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_new.cs

@@ -0,0 +1,33 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class com_broadcast_new : GComponent
+    {
+        public GTextField text_0;
+        public GTextField text_1;
+        public GTextField text_2;
+        public GTextField text_3;
+        public Transition t1;
+        public const string URL = "ui://o9974uc5r8lg9a";
+
+        public static com_broadcast_new CreateInstance()
+        {
+            return (com_broadcast_new)UIPackage.CreateObject("Common_01", "com_broadcast_new");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            text_0 = (GTextField)GetChildAt(1);
+            text_1 = (GTextField)GetChildAt(3);
+            text_2 = (GTextField)GetChildAt(5);
+            text_3 = (GTextField)GetChildAt(7);
+            t1 = GetTransitionAt(0);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_new.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: de12be8b96f957d4e8e24e791f217564
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs

@@ -0,0 +1,29 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class com_broadcast_text1 : GComponent
+    {
+        public GRichTextField cast_text;
+        public GRichTextField show_text;
+        public Transition t0;
+        public const string URL = "ui://o9974uc5cgqg1o";
+
+        public static com_broadcast_text1 CreateInstance()
+        {
+            return (com_broadcast_text1)UIPackage.CreateObject("Common_01", "com_broadcast_text1");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            cast_text = (GRichTextField)GetChildAt(0);
+            show_text = (GRichTextField)GetChildAt(1);
+            t0 = GetTransitionAt(0);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a2199a860c777e8459ffda38e438d0c1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/com_tips.cs

@@ -0,0 +1,29 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class com_tips : GComponent
+    {
+        public GTextField title;
+        public btn_yellow btn_relog;
+        public GTextField content;
+        public const string URL = "ui://o9974uc5re5l1i";
+
+        public static com_tips CreateInstance()
+        {
+            return (com_tips)UIPackage.CreateObject("Common_01", "com_tips");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            title = (GTextField)GetChildAt(1);
+            btn_relog = (btn_yellow)GetChildAt(2);
+            content = (GTextField)GetChildAt(3);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/com_tips.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b7f2065cca1cfba40b08ecee02f32bd7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/item_wheel.cs

@@ -0,0 +1,33 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class item_wheel : GComponent
+    {
+        public Controller type;
+        public GImage img_light;
+        public GTextField text_rate;
+        public Transition show;
+        public Transition hide;
+        public const string URL = "ui://o9974uc5r8lg4r";
+
+        public static item_wheel CreateInstance()
+        {
+            return (item_wheel)UIPackage.CreateObject("Common_01", "item_wheel");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            type = GetControllerAt(0);
+            img_light = (GImage)GetChildAt(3);
+            text_rate = (GTextField)GetChildAt(4);
+            show = GetTransitionAt(0);
+            hide = GetTransitionAt(1);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/item_wheel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 44cb91a8b3c2ddb488dd2d0ed3966804
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/wheel.cs

@@ -0,0 +1,27 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class wheel : GComponent
+    {
+        public wheel_ wheel_;
+        public Transition t0;
+        public const string URL = "ui://o9974uc5r8lg4q";
+
+        public static wheel CreateInstance()
+        {
+            return (wheel)UIPackage.CreateObject("Common_01", "wheel");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            wheel_ = (wheel_)GetChildAt(0);
+            t0 = GetTransitionAt(0);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/wheel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6d7a09222df377e41b68061af00cca0f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/Common_01/wheel_.cs

@@ -0,0 +1,43 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.Common_01
+{
+    public partial class wheel_ : GComponent
+    {
+        public item_wheel item_0;
+        public item_wheel item_1;
+        public item_wheel item_2;
+        public item_wheel item_3;
+        public item_wheel item_4;
+        public item_wheel item_5;
+        public item_wheel item_6;
+        public item_wheel item_7;
+        public Transition t0;
+        public Transition t1;
+        public const string URL = "ui://o9974uc5r8lg4t";
+
+        public static wheel_ CreateInstance()
+        {
+            return (wheel_)UIPackage.CreateObject("Common_01", "wheel_");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            item_0 = (item_wheel)GetChildAt(2);
+            item_1 = (item_wheel)GetChildAt(3);
+            item_2 = (item_wheel)GetChildAt(4);
+            item_3 = (item_wheel)GetChildAt(5);
+            item_4 = (item_wheel)GetChildAt(6);
+            item_5 = (item_wheel)GetChildAt(7);
+            item_6 = (item_wheel)GetChildAt(8);
+            item_7 = (item_wheel)GetChildAt(9);
+            t0 = GetTransitionAt(0);
+            t1 = GetTransitionAt(1);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/Common_01/wheel_.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5e7ca7ec6f1e0684a96f69d1284c54a6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/JBingoPlay/JBingoPlayBinder.cs

@@ -19,6 +19,7 @@ namespace FGUI.JBingoPlay
             UIObjectFactory.SetPackageItemExtension(com_playcard.URL, typeof(com_playcard));
             UIObjectFactory.SetPackageItemExtension(com_play.URL, typeof(com_play));
             UIObjectFactory.SetPackageItemExtension(com_morecard.URL, typeof(com_morecard));
+            UIObjectFactory.SetPackageItemExtension(btn_cancel.URL, typeof(btn_cancel));
             UIObjectFactory.SetPackageItemExtension(com_broadcast1.URL, typeof(com_broadcast1));
             UIObjectFactory.SetPackageItemExtension(com_broadcast_text1.URL, typeof(com_broadcast_text1));
             UIObjectFactory.SetPackageItemExtension(com_prop.URL, typeof(com_prop));

Assets/BingoBrain/FGUI/Package/JBingoPlay/btn_cancel.cs

@@ -0,0 +1,25 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.JBingoPlay
+{
+    public partial class btn_cancel : GButton
+    {
+        public GRichTextField text_no;
+        public const string URL = "ui://qrqjiu5sogc9pio";
+
+        public static btn_cancel CreateInstance()
+        {
+            return (btn_cancel)UIPackage.CreateObject("JBingoPlay", "btn_cancel");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            text_no = (GRichTextField)GetChildAt(0);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/JBingoPlay/btn_cancel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5ddbced06607cd645b073c2167d4d546
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/JBingoPlay/com_boxdown.cs

@@ -9,8 +9,8 @@ namespace FGUI.JBingoPlay
     {
         public Controller com_GiftSwitch;
         public Controller gift;
-        public GImage icon_102;
         public GProgressBar pb_box;
+        public GImage icon_102;
         public GTextField text_aNum;
         public const string URL = "ui://qrqjiu5sy0npfv";
 
@@ -25,8 +25,8 @@ namespace FGUI.JBingoPlay
 
             com_GiftSwitch = GetControllerAt(0);
             gift = GetControllerAt(1);
-            icon_102 = (GImage)GetChildAt(0);
-            pb_box = (GProgressBar)GetChildAt(1);
+            pb_box = (GProgressBar)GetChildAt(0);
+            icon_102 = (GImage)GetChildAt(2);
             text_aNum = (GTextField)GetChildAt(5);
         }
     }

Assets/BingoBrain/FGUI/Package/JBingoPlay/com_end.cs

@@ -7,7 +7,7 @@ namespace FGUI.JBingoPlay
 {
     public partial class com_end : GComponent
     {
-        public GTextField txt_title;
+        public Controller gift;
         public com_endpop com_endPop;
         public btn_playagain btn_playagain;
         public GButton btn_home;
@@ -23,10 +23,10 @@ namespace FGUI.JBingoPlay
         {
             base.ConstructFromXML(xml);
 
-            txt_title = (GTextField)GetChildAt(2);
-            com_endPop = (com_endpop)GetChildAt(3);
-            btn_playagain = (btn_playagain)GetChildAt(4);
-            btn_home = (GButton)GetChildAt(5);
+            gift = GetControllerAt(0);
+            com_endPop = (com_endpop)GetChildAt(2);
+            btn_playagain = (btn_playagain)GetChildAt(3);
+            btn_home = (GButton)GetChildAt(4);
             fx_enter = GetTransitionAt(0);
         }
     }

Assets/BingoBrain/FGUI/Package/JBingoPlay/com_endpop.cs

@@ -30,8 +30,8 @@ namespace FGUI.JBingoPlay
             gift = GetControllerAt(2);
             text_coin = (GTextField)GetChildAt(2);
             text_cash = (GTextField)GetChildAt(3);
-            title = (GTextField)GetChildAt(4);
-            txt = (GTextField)GetChildAt(5);
+            title = (GTextField)GetChildAt(5);
+            txt = (GTextField)GetChildAt(6);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/JBingoPlay/com_leavegame.cs

@@ -7,11 +7,11 @@ namespace FGUI.JBingoPlay
 {
     public partial class com_leavegame : GComponent
     {
+        public GTextField title;
         public GTextField text;
         public GButton btn_leave;
         public GButton btn_stay;
         public GButton closeButton;
-        public GTextField txt_title;
         public const string URL = "ui://qrqjiu5srbhou";
 
         public static com_leavegame CreateInstance()
@@ -23,11 +23,11 @@ namespace FGUI.JBingoPlay
         {
             base.ConstructFromXML(xml);
 
-            text = (GTextField)GetChildAt(2);
-            btn_leave = (GButton)GetChildAt(3);
-            btn_stay = (GButton)GetChildAt(4);
-            closeButton = (GButton)GetChildAt(5);
-            txt_title = (GTextField)GetChildAt(6);
+            title = (GTextField)GetChildAt(2);
+            text = (GTextField)GetChildAt(3);
+            btn_leave = (GButton)GetChildAt(4);
+            btn_stay = (GButton)GetChildAt(5);
+            closeButton = (GButton)GetChildAt(6);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/JBingoPlay/com_morecard.cs

@@ -7,10 +7,10 @@ namespace FGUI.JBingoPlay
 {
     public partial class com_morecard : GComponent
     {
+        public GTextField txt_title;
         public GButton closeButton;
         public GButton btn_more;
         public GTextField text_cardnum;
-        public GTextField txt_title;
         public const string URL = "ui://qrqjiu5sn5d5fk";
 
         public static com_morecard CreateInstance()
@@ -22,10 +22,10 @@ namespace FGUI.JBingoPlay
         {
             base.ConstructFromXML(xml);
 
-            closeButton = (GButton)GetChildAt(2);
-            btn_more = (GButton)GetChildAt(4);
-            text_cardnum = (GTextField)GetChildAt(5);
-            txt_title = (GTextField)GetChildAt(6);
+            txt_title = (GTextField)GetChildAt(2);
+            closeButton = (GButton)GetChildAt(3);
+            btn_more = (GButton)GetChildAt(5);
+            text_cardnum = (GTextField)GetChildAt(7);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/JBingoPlay/com_play.cs

@@ -13,6 +13,7 @@ namespace FGUI.JBingoPlay
         public GGraph right_bottom;
         public com_prop com_prop;
         public com_AddBall com_AddBall;
+        public GButton btn_close;
         public GButton btn_coin;
         public GButton btn_cash;
         public com_carddi com_carddi;
@@ -20,8 +21,9 @@ namespace FGUI.JBingoPlay
         public GGraph spine_parent;
         public com_CallNum com_CallNum;
         public com_ball com_ballleft;
-        public GButton btn_close;
+        public GGroup group_;
         public GButton btn_ballon;
+        public GButton btn_pal;
         public GGraph zhezhao;
         public Transition fx_readygo;
         public Transition fx_gameover;
@@ -42,16 +44,18 @@ namespace FGUI.JBingoPlay
             right_bottom = (GGraph)GetChildAt(3);
             com_prop = (com_prop)GetChildAt(4);
             com_AddBall = (com_AddBall)GetChildAt(5);
-            btn_coin = (GButton)GetChildAt(6);
-            btn_cash = (GButton)GetChildAt(7);
-            com_carddi = (com_carddi)GetChildAt(8);
-            btn_star = (btn_star)GetChildAt(9);
-            spine_parent = (GGraph)GetChildAt(10);
-            com_CallNum = (com_CallNum)GetChildAt(11);
-            com_ballleft = (com_ball)GetChildAt(12);
-            btn_close = (GButton)GetChildAt(13);
-            btn_ballon = (GButton)GetChildAt(14);
-            zhezhao = (GGraph)GetChildAt(15);
+            btn_close = (GButton)GetChildAt(6);
+            btn_coin = (GButton)GetChildAt(7);
+            btn_cash = (GButton)GetChildAt(8);
+            com_carddi = (com_carddi)GetChildAt(9);
+            btn_star = (btn_star)GetChildAt(10);
+            spine_parent = (GGraph)GetChildAt(11);
+            com_CallNum = (com_CallNum)GetChildAt(12);
+            com_ballleft = (com_ball)GetChildAt(13);
+            group_ = (GGroup)GetChildAt(14);
+            btn_ballon = (GButton)GetChildAt(15);
+            btn_pal = (GButton)GetChildAt(16);
+            zhezhao = (GGraph)GetChildAt(17);
             fx_readygo = GetTransitionAt(0);
             fx_gameover = GetTransitionAt(1);
         }

Assets/BingoBrain/FGUI/Package/JBingoPlay/com_playcard.cs

@@ -20,8 +20,8 @@ namespace FGUI.JBingoPlay
         public btn_card btn_card8;
         public btn_card btn_card9;
         public GButton btn_collect;
-        public GRichTextField text_no;
         public GButton btn_video;
+        public btn_cancel text_no;
         public Transition fx_show;
         public Transition fx_pick;
         public const string URL = "ui://qrqjiu5slbaa0";
@@ -48,8 +48,8 @@ namespace FGUI.JBingoPlay
             btn_card8 = (btn_card)GetChildAt(9);
             btn_card9 = (btn_card)GetChildAt(10);
             btn_collect = (GButton)GetChildAt(11);
-            text_no = (GRichTextField)GetChildAt(12);
-            btn_video = (GButton)GetChildAt(13);
+            btn_video = (GButton)GetChildAt(12);
+            text_no = (btn_cancel)GetChildAt(13);
             fx_show = GetTransitionAt(0);
             fx_pick = GetTransitionAt(1);
         }

Assets/BingoBrain/FGUI/Package/JBingoPlay/com_prop.cs

@@ -22,8 +22,8 @@ namespace FGUI.JBingoPlay
             base.ConstructFromXML(xml);
 
             cont_prop = GetControllerAt(0);
-            img_prg = (GImage)GetChildAt(5);
-            gh_effect = (GGraph)GetChildAt(6);
+            img_prg = (GImage)GetChildAt(4);
+            gh_effect = (GGraph)GetChildAt(5);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/JBingoPlay/com_propInfo.cs

@@ -20,8 +20,8 @@ namespace FGUI.JBingoPlay
         {
             base.ConstructFromXML(xml);
 
-            title = (GTextField)GetChildAt(2);
-            closeButton = (GButton)GetChildAt(3);
+            title = (GTextField)GetChildAt(1);
+            closeButton = (GButton)GetChildAt(2);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/JLoading/JLoadingBinder.cs

@@ -8,6 +8,7 @@ namespace FGUI.JLoading
     {
         public static void BindAll()
         {
+            UIObjectFactory.SetPackageItemExtension(com_login_a.URL, typeof(com_login_a));
             UIObjectFactory.SetPackageItemExtension(btn_box.URL, typeof(btn_box));
             UIObjectFactory.SetPackageItemExtension(com_loading.URL, typeof(com_loading));
         }

Assets/BingoBrain/FGUI/Package/JLoading/com_login_a.cs

@@ -0,0 +1,27 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.JLoading
+{
+    public partial class com_login_a : GComponent
+    {
+        public GTextField text_uid;
+        public Transition t0;
+        public const string URL = "ui://pc0wa25bdz5j6";
+
+        public static com_login_a CreateInstance()
+        {
+            return (com_login_a)UIPackage.CreateObject("JLoading", "com_login_a");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            text_uid = (GTextField)GetChildAt(2);
+            t0 = GetTransitionAt(0);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/JLoading/com_login_a.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2460f67faae178d4f99ce59e600b8b3b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/JMain/JMainBinder.cs

@@ -8,7 +8,9 @@ namespace FGUI.JMain
     {
         public static void BindAll()
         {
-            UIObjectFactory.SetPackageItemExtension(makeup.URL, typeof(makeup));
+            UIObjectFactory.SetPackageItemExtension(com_pal.URL, typeof(com_pal));
+            UIObjectFactory.SetPackageItemExtension(item_pal.URL, typeof(item_pal));
+            UIObjectFactory.SetPackageItemExtension(btn_pal.URL, typeof(btn_pal));
             UIObjectFactory.SetPackageItemExtension(btn_question.URL, typeof(btn_question));
             UIObjectFactory.SetPackageItemExtension(com_faq.URL, typeof(com_faq));
             UIObjectFactory.SetPackageItemExtension(com_list_main.URL, typeof(com_list_main));
@@ -19,12 +21,7 @@ namespace FGUI.JMain
             UIObjectFactory.SetPackageItemExtension(btn_add.URL, typeof(btn_add));
             UIObjectFactory.SetPackageItemExtension(btn_minus.URL, typeof(btn_minus));
             UIObjectFactory.SetPackageItemExtension(com_cardnum.URL, typeof(com_cardnum));
-            UIObjectFactory.SetPackageItemExtension(btn_taks.URL, typeof(btn_taks));
-            UIObjectFactory.SetPackageItemExtension(btn_wheel.URL, typeof(btn_wheel));
-            UIObjectFactory.SetPackageItemExtension(btn_signin.URL, typeof(btn_signin));
-            UIObjectFactory.SetPackageItemExtension(com_mainplay.URL, typeof(com_mainplay));
-            UIObjectFactory.SetPackageItemExtension(com_mainplayitem.URL, typeof(com_mainplayitem));
-            UIObjectFactory.SetPackageItemExtension(btn_switch.URL, typeof(btn_switch));
+            UIObjectFactory.SetPackageItemExtension(btn_petty.URL, typeof(btn_petty));
         }
     }
 }

Assets/BingoBrain/FGUI/Package/JMain/btn_pal.cs

@@ -0,0 +1,25 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.JMain
+{
+    public partial class btn_pal : GButton
+    {
+        public GTextField lab_time;
+        public const string URL = "ui://qw9x6rf3dz5jpix";
+
+        public static btn_pal CreateInstance()
+        {
+            return (btn_pal)UIPackage.CreateObject("JMain", "btn_pal");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            lab_time = (GTextField)GetChildAt(1);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/JMain/btn_pal.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8df9026b5e978de4e820114b10b88d07
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/JMain/btn_petty.cs

@@ -0,0 +1,27 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+using FairyGUI.Utils;
+
+namespace FGUI.JMain
+{
+    public partial class btn_petty : GButton
+    {
+        public GGroup kuang;
+        public Transition t0;
+        public const string URL = "ui://qw9x6rf3uaj0pin";
+
+        public static btn_petty CreateInstance()
+        {
+            return (btn_petty)UIPackage.CreateObject("JMain", "btn_petty");
+        }
+
+        public override void ConstructFromXML(XML xml)
+        {
+            base.ConstructFromXML(xml);
+
+            kuang = (GGroup)GetChildAt(2);
+            t0 = GetTransitionAt(0);
+        }
+    }
+}

Assets/BingoBrain/FGUI/Package/JMain/btn_petty.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 76b1e8a1581e7444a8900307e0980e35
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/FGUI/Package/JMain/btn_signin.cs

@@ -1,25 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-using FairyGUI.Utils;
-
-namespace FGUI.JMain
-{
-    public partial class btn_signin : GButton
-    {
-        public GImage image_red;
-        public const string URL = "ui://qw9x6rf3tnddpjh";
-
-        public static btn_signin CreateInstance()
-        {
-            return (btn_signin)UIPackage.CreateObject("JMain", "btn_signin");
-        }
-
-        public override void ConstructFromXML(XML xml)
-        {
-            base.ConstructFromXML(xml);
-
-            image_red = (GImage)GetChildAt(4);
-        }
-    }
-}

Assets/BingoBrain/FGUI/Package/JMain/btn_taks.cs

@@ -1,25 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-using FairyGUI.Utils;
-
-namespace FGUI.JMain
-{
-    public partial class btn_taks : GButton
-    {
-        public GImage image_red;
-        public const string URL = "ui://qw9x6rf3tnddpjd";
-
-        public static btn_taks CreateInstance()
-        {
-            return (btn_taks)UIPackage.CreateObject("JMain", "btn_taks");
-        }
-
-        public override void ConstructFromXML(XML xml)
-        {
-            base.ConstructFromXML(xml);
-
-            image_red = (GImage)GetChildAt(4);
-        }
-    }
-}

Assets/BingoBrain/FGUI/Package/JMain/btn_wheel.cs

@@ -1,25 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-using FairyGUI.Utils;
-
-namespace FGUI.JMain
-{
-    public partial class btn_wheel : GButton
-    {
-        public GImage image_red;
-        public const string URL = "ui://qw9x6rf3tnddpjg";
-
-        public static btn_wheel CreateInstance()
-        {
-            return (btn_wheel)UIPackage.CreateObject("JMain", "btn_wheel");
-        }
-
-        public override void ConstructFromXML(XML xml)
-        {
-            base.ConstructFromXML(xml);
-
-            image_red = (GImage)GetChildAt(4);
-        }
-    }
-}

Assets/BingoBrain/FGUI/Package/JMain/com_firstreward.cs

@@ -13,7 +13,7 @@ namespace FGUI.JMain
         public GTextField txt_title;
         public GButton closeButton;
         public GTextField text_num;
-        public GComponent btn_get;
+        public GButton btn_get;
         public GImage img_gold;
         public GTextField end_point;
         public const string URL = "ui://qw9x6rf3ngxz38";
@@ -30,12 +30,12 @@ namespace FGUI.JMain
             state = GetControllerAt(0);
             spine_parent = (GGraph)GetChildAt(0);
             btn_getreward = (GButton)GetChildAt(1);
-            txt_title = (GTextField)GetChildAt(3);
-            closeButton = (GButton)GetChildAt(4);
-            text_num = (GTextField)GetChildAt(5);
-            btn_get = (GComponent)GetChildAt(6);
-            img_gold = (GImage)GetChildAt(7);
-            end_point = (GTextField)GetChildAt(9);
+            txt_title = (GTextField)GetChildAt(4);
+            closeButton = (GButton)GetChildAt(5);
+            text_num = (GTextField)GetChildAt(6);
+            btn_get = (GButton)GetChildAt(7);
+            img_gold = (GImage)GetChildAt(8);
+            end_point = (GTextField)GetChildAt(10);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/JMain/com_main.cs

@@ -10,23 +10,18 @@ namespace FGUI.JMain
         public Controller gift;
         public Controller type;
         public GGraph gp_fx;
-        public GButton btn_play;
         public com_cardnum com_cardnum;
         public com_playnum com_cards;
         public com_cardplaytext com_cardplay;
         public GButton btn_ballon;
         public GButton btn_set;
-        public makeup makeup;
         public GButton btn_admin;
         public btn_question btn_question;
-        public btn_signin btn_sign;
-        public btn_taks btn_task;
-        public btn_wheel btn_wheel;
-        public com_mainplay com_mainplay;
-        public GButton settings;
-        public GButton btn_coin;
-        public GButton btn_cash;
-        public GComponent com_avatar;
+        public GButton btn_saveingpot;
+        public btn_petty btn_petty;
+        public GButton btn_play;
+        public GButton btn_wb;
+        public btn_pal btn_pal;
         public const string URL = "ui://qw9x6rf3lbaa0";
 
         public static com_main CreateInstance()
@@ -40,24 +35,19 @@ namespace FGUI.JMain
 
             gift = GetControllerAt(0);
             type = GetControllerAt(1);
-            gp_fx = (GGraph)GetChildAt(1);
-            btn_play = (GButton)GetChildAt(2);
-            com_cardnum = (com_cardnum)GetChildAt(3);
-            com_cards = (com_playnum)GetChildAt(4);
-            com_cardplay = (com_cardplaytext)GetChildAt(5);
-            btn_ballon = (GButton)GetChildAt(6);
-            btn_set = (GButton)GetChildAt(7);
-            makeup = (makeup)GetChildAt(8);
-            btn_admin = (GButton)GetChildAt(9);
-            btn_question = (btn_question)GetChildAt(10);
-            btn_sign = (btn_signin)GetChildAt(11);
-            btn_task = (btn_taks)GetChildAt(12);
-            btn_wheel = (btn_wheel)GetChildAt(13);
-            com_mainplay = (com_mainplay)GetChildAt(14);
-            settings = (GButton)GetChildAt(15);
-            btn_coin = (GButton)GetChildAt(16);
-            btn_cash = (GButton)GetChildAt(17);
-            com_avatar = (GComponent)GetChildAt(18);
+            gp_fx = (GGraph)GetChildAt(0);
+            com_cardnum = (com_cardnum)GetChildAt(6);
+            com_cards = (com_playnum)GetChildAt(7);
+            com_cardplay = (com_cardplaytext)GetChildAt(8);
+            btn_ballon = (GButton)GetChildAt(9);
+            btn_set = (GButton)GetChildAt(10);
+            btn_admin = (GButton)GetChildAt(11);
+            btn_question = (btn_question)GetChildAt(12);
+            btn_saveingpot = (GButton)GetChildAt(13);
+            btn_petty = (btn_petty)GetChildAt(14);
+            btn_play = (GButton)GetChildAt(15);
+            btn_wb = (GButton)GetChildAt(16);
+            btn_pal = (btn_pal)GetChildAt(17);
         }
     }
 }