From 1070111cf39f7c74841d0bf122634c237b686803 Mon Sep 17 00:00:00 2001 From: juncong lee Date: Tue, 2 Sep 2025 17:14:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=95=E4=BE=8B=E7=B1=BB=E7=BB=A7?= =?UTF-8?q?=E6=89=BF=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Script/Common/FileParse/FileParse.cs | 2 +- .../Script/Common/FileParse/FileParse.cs.meta | 11 ++++++++++- .../Common/FileParse/XXTEA/XXTEA.cs.meta | 11 ++++++++++- Assets/Script/Common/IAdService.cs.meta | 11 ++++++++++- Assets/Script/Common/StaticValue.cs.meta | 11 ++++++++++- .../SDKManager/AdjustManager/AdjustManager.cs | 2 +- .../SDKManager/AdjustManager/AdjustNetwork.cs | 2 +- .../AdjustManager/AdjustTrackEvent.cs | 2 +- .../AdmobAdsManager/AdmobAdsManager.cs | 2 +- .../AdmobAdsManager/AdmobAdsManager.cs.meta | 11 ++++++++++- .../AdmobBannerAdManager.cs.meta | 11 ++++++++++- .../AdmobInterstitialAdManager.cs.meta | 11 ++++++++++- .../AdmobNativeAdManager.cs.meta | 11 ++++++++++- .../AdmobRewardedAdManager.cs.meta | 11 ++++++++++- .../AdmobSplashAdManager.cs.meta | 11 ++++++++++- .../AdmobAdsManager/Utils/AdmobTools.cs.meta | 11 ++++++++++- .../SDKManager/AdsSDKManager/AdsSDKManager.cs | 8 ++++++-- .../AdsSDKManager/AdsSplashManager.cs.meta | 11 ++++++++++- .../BigoAdsManager/BigoAdsManager.cs | 2 +- .../BigoAdsManager/BigoAdsManager.cs.meta | 11 ++++++++++- .../BigoRewardedAdManager.cs.meta | 11 ++++++++++- .../AdsSDKManager/Constant/AdsType.cs.meta | 11 ++++++++++- .../Constant/BannerAlignType.cs.meta | 11 ++++++++++- .../AdsSDKManager/Constant/IvType.cs.meta | 11 ++++++++++- .../Constant/PlatformType.cs.meta | 11 ++++++++++- .../Events/AdsEvents/AdsActionEvents.cs | 10 +++++++++- .../Events/AdsEvents/AdsActionEvents.cs.meta | 11 ++++++++++- .../Events/AdsEvents/AdsKeyEvents.cs | 2 +- .../Events/AdsEvents/AdsKeyEvents.cs.meta | 11 ++++++++++- .../KwaiAdsManager/KwaiAdsManager.cs | 6 +++--- .../MaxAdsManager/MaxAdsManager.cs | 2 +- .../MaxAdsManager/MaxAdsManager.cs.meta | 11 ++++++++++- .../TpnAdsManager/TpnAdsManager.cs | 2 +- .../TpnAdsManager/TpnAdsManager.cs.meta | 11 ++++++++++- .../AdsSDKManager/Utils/AdConfigParser.cs.meta | 11 ++++++++++- .../Utils/AdPlayCountManager.cs.meta | 11 ++++++++++- .../AdsSDKManager/Utils/AdsBidResult.cs | 16 +++++++--------- .../AdsSDKManager/Utils/AdsBidResult.cs.meta | 11 ++++++++++- .../AdsSDKManager/Utils/BidPlatformManager.cs | 2 +- .../Utils/BidPlatformManager.cs.meta | 11 ++++++++++- .../AdsSDKManager/Utils/ThreadUtils.cs.meta | 11 ++++++++++- Assets/Script/SDKManager/AppSDKManager.cs | 18 +++++++----------- .../SDKManager/EFSdkManager/EFSdkManager.cs | 2 +- .../FireBaseAnalyticsManager.cs | 2 +- .../FireBaseRemoteConfigManager.cs | 2 +- .../FirebaseManager/FireBaseSDKManager.cs | 2 +- .../SDKManager/ShuShuMangage/ShuShuEvent.cs | 2 +- .../SDKManager/ShuShuMangage/ShuShuMangage.cs | 2 +- Assets/Script/Utils/DataUtils.cs.meta | 11 ++++++++++- Assets/Script/Utils/LoggerUtils.cs | 8 ++++---- Assets/Script/Utils/LoggerUtils.cs.meta | 11 ++++++++++- Assets/Script/Utils/PlayerPrefsUtils.cs.meta | 11 ++++++++++- Assets/Script/Utils/SingletonBase.cs.meta | 11 ++++++++++- Assets/Script/Utils/TimerUtils.cs.meta | 11 ++++++++++- 54 files changed, 372 insertions(+), 78 deletions(-) diff --git a/Assets/Script/Common/FileParse/FileParse.cs b/Assets/Script/Common/FileParse/FileParse.cs index 6d82b91..534bb57 100644 --- a/Assets/Script/Common/FileParse/FileParse.cs +++ b/Assets/Script/Common/FileParse/FileParse.cs @@ -114,7 +114,7 @@ namespace WZ for (int i = 0; i < _configs.Length; i++) { string valueTemp = _configs[i].Value.ToString(); - LoggerUtils.Debug("[FileParse] ParseConfigsInner key" + _configs[i].Key + "value:" + valueTemp); + //LoggerUtils.Debug("[FileParse] ParseConfigsInner key" + _configs[i].Key + "value:" + valueTemp); if (_configs[i].Key.ToLower() == KEY_Admob_CollapsibleBannerId.ToLower()) { diff --git a/Assets/Script/Common/FileParse/FileParse.cs.meta b/Assets/Script/Common/FileParse/FileParse.cs.meta index be428cc..e6c9fba 100644 --- a/Assets/Script/Common/FileParse/FileParse.cs.meta +++ b/Assets/Script/Common/FileParse/FileParse.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: bd74719ba6cd94424a20539116ebabff \ No newline at end of file +guid: bd74719ba6cd94424a20539116ebabff +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Common/FileParse/XXTEA/XXTEA.cs.meta b/Assets/Script/Common/FileParse/XXTEA/XXTEA.cs.meta index b7061a6..d4284e9 100644 --- a/Assets/Script/Common/FileParse/XXTEA/XXTEA.cs.meta +++ b/Assets/Script/Common/FileParse/XXTEA/XXTEA.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 1db01a1175e3f451bbf15da2925e759a \ No newline at end of file +guid: 1db01a1175e3f451bbf15da2925e759a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Common/IAdService.cs.meta b/Assets/Script/Common/IAdService.cs.meta index 6be5b9e..5b79fc6 100644 --- a/Assets/Script/Common/IAdService.cs.meta +++ b/Assets/Script/Common/IAdService.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 8c783da4d1e92421e875e007d834b039 \ No newline at end of file +guid: 8c783da4d1e92421e875e007d834b039 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Common/StaticValue.cs.meta b/Assets/Script/Common/StaticValue.cs.meta index 234c56c..f3d5355 100644 --- a/Assets/Script/Common/StaticValue.cs.meta +++ b/Assets/Script/Common/StaticValue.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 34aa20abb977944f29d68bb385e84b01 \ No newline at end of file +guid: 34aa20abb977944f29d68bb385e84b01 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs index b68e231..a1f00b9 100644 --- a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs +++ b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs @@ -5,7 +5,7 @@ using Unity.VisualScripting; using UnityEngine; using WZ; -public class AdjustManager : NormalSingleton +public class AdjustManager : D_MonoSingleton { private string appToken = "cap3ypurzegw"; // 替换为你的实际App Token private AdjustEnvironment environment = AdjustEnvironment.Sandbox; // 测试用Sandbox，发布用Production diff --git a/Assets/Script/SDKManager/AdjustManager/AdjustNetwork.cs b/Assets/Script/SDKManager/AdjustManager/AdjustNetwork.cs index 3181f61..4b77b7d 100644 --- a/Assets/Script/SDKManager/AdjustManager/AdjustNetwork.cs +++ b/Assets/Script/SDKManager/AdjustManager/AdjustNetwork.cs @@ -4,7 +4,7 @@ using System.Collections; using UnityEngine; using WZ; -public class AdjustNetwork : NormalSingleton +public class AdjustNetwork : D_MonoSingleton { private const string KEY_USER_NETWORK = "KEY_USER_NETWORK"; diff --git a/Assets/Script/SDKManager/AdjustManager/AdjustTrackEvent.cs b/Assets/Script/SDKManager/AdjustManager/AdjustTrackEvent.cs index 5bd99f1..8ec74e0 100644 --- a/Assets/Script/SDKManager/AdjustManager/AdjustTrackEvent.cs +++ b/Assets/Script/SDKManager/AdjustManager/AdjustTrackEvent.cs @@ -4,7 +4,7 @@ using Newtonsoft.Json; using WZ; -public class AdjustTrackEvent : NormalSingleton +public class AdjustTrackEvent : D_MonoSingleton { /// /// adjust事件上报 diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs index dfb0dbb..de87e80 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs @@ -8,7 +8,7 @@ using UnityEngine; namespace WZ { - public class AdmobAdsManager : NormalSingleton, IAdService + public class AdmobAdsManager : D_MonoSingleton, IAdService { public string ClientName => "Admob"; public PlatformType Platfrom => PlatformType.Admob; diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs.meta index b308fc5..43d084b 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 7b60d6c8a08c64629a3ae1a20bb7acbc \ No newline at end of file +guid: 7b60d6c8a08c64629a3ae1a20bb7acbc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobBannerAdManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobBannerAdManager.cs.meta index 9c1be83..33ad649 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobBannerAdManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobBannerAdManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 64f1fb952d2214082b5d90c7c1b114f5 \ No newline at end of file +guid: 64f1fb952d2214082b5d90c7c1b114f5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobInterstitialAdManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobInterstitialAdManager.cs.meta index 2a476a8..9a57681 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobInterstitialAdManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobInterstitialAdManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 836d77072fa604c0480097316bb1aabe \ No newline at end of file +guid: 836d77072fa604c0480097316bb1aabe +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobNativeAdManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobNativeAdManager.cs.meta index bf4541e..75ea961 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobNativeAdManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobNativeAdManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 5421cfa6befcb4e48a4361180aa3c8ff \ No newline at end of file +guid: 5421cfa6befcb4e48a4361180aa3c8ff +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobRewardedAdManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobRewardedAdManager.cs.meta index 46664d2..5388776 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobRewardedAdManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobRewardedAdManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 8a66ed9c6ea4e42e5a057855d6888b3c \ No newline at end of file +guid: 8a66ed9c6ea4e42e5a057855d6888b3c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobSplashAdManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobSplashAdManager.cs.meta index 6eb262f..cde97ff 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobSplashAdManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobSplashAdManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 137bc68f35e5e4e9383ffd94f745c1bd \ No newline at end of file +guid: 137bc68f35e5e4e9383ffd94f745c1bd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/Utils/AdmobTools.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/Utils/AdmobTools.cs.meta index b42d2cb..faa141c 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/Utils/AdmobTools.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/Utils/AdmobTools.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 3a7b10d4700bc4808b22cd6be81314e8 \ No newline at end of file +guid: 3a7b10d4700bc4808b22cd6be81314e8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs index cc9532f..e18f3de 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace WZ { - public class AdsSDKManager : NormalSingleton + public class AdsSDKManager : D_MonoSingleton { private List _adNetworks = new List(); // 是否有激励视频或者插屏广告在展示 @@ -27,7 +27,7 @@ namespace WZ public void InitSDK(Action action) { OnSplashAdCloseCallback = action; - // 初始化广告平台状态 + // 初始化广告平台状态，用于竞价失败后刷新 BidPlatformManager.Instance.InitializePlatformStates(AdConfigParser.GetAdExpireInSec()); InitializeAdNetworks(); } @@ -65,12 +65,14 @@ namespace WZ /// public void ShowRewardAd(string _adPos, Action _rewardCallback = null, Action _showFailedCallback = null) { + LoggerUtils.Debug("ShowRewardAd _adPos:"+_adPos+" ready:"+IsRewardAdReady()); AdsActionEvents.TrackAdPosition(AdsType.Rewarded, _adPos); if (!IsRewardAdReady()) { _showFailedCallback?.Invoke(); return; } + AdsSDKManager.Instance.otherAdsOnShow = true; PlatformType result = GetBestPlatformType(false); BidPlatformManager.Instance.RecordBidSuccess(result, AdsType.Rewarded); if (result == PlatformType.AppLovin) @@ -121,6 +123,7 @@ namespace WZ _closeCallback = null; return; } + AdsSDKManager.Instance.otherAdsOnShow = true; PlatformType result = GetBestPlatformType(true); BidPlatformManager.Instance.RecordBidSuccess(result, AdsType.Interstitial); if (result == PlatformType.AppLovin) @@ -219,6 +222,7 @@ namespace WZ { if (isInterstitial) { + LoggerUtils.Debug("yangwu max price"); AdPriceInfo priceInfo = new AdPriceInfo( maxPrice: MaxAdsManager.Instance.GetInterstitialRevenue(), admobPrice: AdmobAdsManager.Instance.GetInterstitialRevenue(), diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdsSplashManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/AdsSplashManager.cs.meta index 97634fd..a93fe36 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdsSplashManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/AdsSplashManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: ad8d5f86e3dbf4c9986fcd1981e0be68 \ No newline at end of file +guid: ad8d5f86e3dbf4c9986fcd1981e0be68 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs index 2b9a721..d4b1cf1 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace WZ { - public class BigoAdsManager : NormalSingleton, IAdService + public class BigoAdsManager : D_MonoSingleton, IAdService { public string ClientName => "Bigo"; public PlatformType Platfrom => PlatformType.Bigo; diff --git a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs.meta index e92ae5e..3ced32b 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 32bd7a6ecbc5e48da929eb774391fe49 \ No newline at end of file +guid: 32bd7a6ecbc5e48da929eb774391fe49 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs.meta index af78faf..06b8ae6 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: c2a850afd5e804d71a3bda35898ee218 \ No newline at end of file +guid: c2a850afd5e804d71a3bda35898ee218 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/Constant/AdsType.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/Constant/AdsType.cs.meta index 1e50856..b16c184 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Constant/AdsType.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/Constant/AdsType.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 1f8a13277f03d457ca5d5d19a6426b28 \ No newline at end of file +guid: 1f8a13277f03d457ca5d5d19a6426b28 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/Constant/BannerAlignType.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/Constant/BannerAlignType.cs.meta index 46ac1a0..760f78d 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Constant/BannerAlignType.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/Constant/BannerAlignType.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: b8695a5a6cc14411892084d89818fdbe \ No newline at end of file +guid: b8695a5a6cc14411892084d89818fdbe +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/Constant/IvType.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/Constant/IvType.cs.meta index b07734f..a6b2218 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Constant/IvType.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/Constant/IvType.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: d0e4c55fdbb5b436f944b08b198aca51 \ No newline at end of file +guid: d0e4c55fdbb5b436f944b08b198aca51 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/Constant/PlatformType.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/Constant/PlatformType.cs.meta index 291a091..5ef60e8 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Constant/PlatformType.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/Constant/PlatformType.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: f0206a38823ea41d3af8ac3dad0e3381 \ No newline at end of file +guid: f0206a38823ea41d3af8ac3dad0e3381 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs index 604e0f0..77756b0 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using AnyThinkAds.ThirdParty.LitJson; using Firebase.Analytics; using UnityEngine; @@ -23,6 +24,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); + LoggerUtils.Debug("[actionevent] TrackAdClicked"+JsonMapper.ToJson(dic)); } public static void TrackAdClosed(PlatformType adPlatform, string adSource, string adUnitName, AdsType adFormat, string posotion, double value) @@ -41,11 +43,11 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); + LoggerUtils.Debug("[actionevent] TrackAdClosed"+JsonMapper.ToJson(dic)); } public static void TrackAdStartLoad(PlatformType adPlatform, string adSource, string adUnitName, AdsType adFormat) { - AdsSDKManager.Instance.otherAdsOnShow = true; var eventName = "ad_start_load"; var dic = new Dictionary { { "ad_platform", adPlatform.ToString()}, @@ -54,6 +56,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); + LoggerUtils.Debug("[actionevent] TrackAdStartLoad"+JsonMapper.ToJson(dic)); } public static void TrackAdLoaded(PlatformType adPlatform, string adSource, string adUnitName, AdsType adFormat, double loadTime) @@ -69,6 +72,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); + LoggerUtils.Debug("[actionevent] TrackAdLoaded"+JsonMapper.ToJson(dic)); } public static void TrackAdFailToLoad(PlatformType adPlatform, string adSource, string adUnitName, AdsType adFormat, double loadTime, string reason) { @@ -84,6 +88,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); + LoggerUtils.Debug("[actionevent] TrackAdFailToLoad"+JsonMapper.ToJson(dic)); } public static void TrackAdFailToShow(PlatformType adPlatform, AdsType adFormat, string reason, string pos) @@ -99,6 +104,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); + LoggerUtils.Debug("[actionevent] TrackAdFailToShow"+JsonMapper.ToJson(dic)); } public static void TrackAdPosition(AdsType adFormat, string pos) @@ -111,6 +117,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); + LoggerUtils.Debug("[actionevent] TrackAdPosition"+JsonMapper.ToJson(dic)); } public static void TrackAdImpression(PlatformType adPlatform, string adSource, string adUnitName, AdsType adFormat, string posotion, double value) @@ -128,6 +135,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); + LoggerUtils.Debug("[actionevent] TrackAdImpression"+JsonMapper.ToJson(dic)); } } } \ No newline at end of file diff --git a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs.meta index 4df6b10..02e04af 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 119ab55aa6c4f47b4b70af88ad977987 \ No newline at end of file +guid: 119ab55aa6c4f47b4b70af88ad977987 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsKeyEvents.cs b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsKeyEvents.cs index 6b59108..c237ca2 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsKeyEvents.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsKeyEvents.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace WZ { - public class AdsKeyEvents : NormalSingleton + public class AdsKeyEvents : D_MonoSingleton { private List _adCountData = new List(); private List _adFPUData = new List(); diff --git a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsKeyEvents.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsKeyEvents.cs.meta index 553d094..34b311c 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsKeyEvents.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsKeyEvents.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: d9c7ae999fc264fa6ad5106900a2b381 \ No newline at end of file +guid: d9c7ae999fc264fa6ad5106900a2b381 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs index b0b7f76..02f51d1 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs @@ -8,15 +8,15 @@ using UnityEngine; namespace WZ { - public class KwaiAdsManager : NormalSingleton, IAdService + public class KwaiAdsManager : D_MonoSingleton, IAdService { //目前都是测试id private string _appId = ""; private string _token = ""; public string _rewardAdUnitId = ""; public string _interstitialAdUnitId = ""; - public double _rewardAdRevenue = 0; - public double _interstitiaAdRevenue = 0; + public double _rewardAdRevenue = -1; + public double _interstitiaAdRevenue = -1; private IRewardAdController _rewardAdController; private IInterstitialAdController _interstitialAdController; public string _rvPos; diff --git a/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs index 4bdf260..0233720 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs @@ -8,7 +8,7 @@ using UnityEngine; namespace WZ { - public class MaxAdsManager : NormalSingleton, IAdService + public class MaxAdsManager : D_MonoSingleton, IAdService { public string ClientName => "AppLovin"; public PlatformType Platfrom => PlatformType.AppLovin; diff --git a/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs.meta index d04692b..8fd2c97 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: cfac40dd2d010471d9cefd15bd2e7fcb \ No newline at end of file +guid: cfac40dd2d010471d9cefd15bd2e7fcb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs index 1136d96..8c6c264 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs @@ -9,7 +9,7 @@ using UnityEngine; namespace WZ { - public class TpnAdsManager : NormalSingleton, IAdService + public class TpnAdsManager : D_MonoSingleton, IAdService { public string ClientName => "Topon"; public PlatformType Platfrom => PlatformType.Topon; diff --git a/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs.meta index 0450d4c..c9cbbe0 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: fb96ca447b9164f92ad5f7fa33f7263f \ No newline at end of file +guid: fb96ca447b9164f92ad5f7fa33f7263f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/Utils/AdConfigParser.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/Utils/AdConfigParser.cs.meta index 09e555a..3bd0b0c 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Utils/AdConfigParser.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/Utils/AdConfigParser.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: c1122fdef681d4e25898cbff43f3cff7 \ No newline at end of file +guid: c1122fdef681d4e25898cbff43f3cff7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/Utils/AdPlayCountManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/Utils/AdPlayCountManager.cs.meta index be129b0..b542b67 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Utils/AdPlayCountManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/Utils/AdPlayCountManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 251647f5afc7f4b58af8b52aa55f9d2c \ No newline at end of file +guid: 251647f5afc7f4b58af8b52aa55f9d2c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/Utils/AdsBidResult.cs b/Assets/Script/SDKManager/AdsSDKManager/Utils/AdsBidResult.cs index 847a2bf..5682a36 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Utils/AdsBidResult.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/Utils/AdsBidResult.cs @@ -31,16 +31,15 @@ namespace WZ private static object m_kwaiObj = "m_kwaiObj"; public static PlatformType GetPlatformType(AdPriceInfo priceInfo) { -#if UNITY_ANDROID && !UNITY_EDITOR +#if UNITY_ANDROID && UNITY_EDITOR using (AndroidJavaClass unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer")) { AndroidJavaObject activity = unityPlayer.GetStatic("currentActivity"); - AndroidJavaObject toponCustomContentInfo = new AndroidJavaObject("com.anythink.core.api.ATCustomContentInfo", priceInfo.ToponAdUnitId, m_toponObj); - AndroidJavaObject admobCustomContentInfo = new AndroidJavaObject("com.anythink.core.api.ATCustomContentInfo", priceInfo.AdmobPrice * 1000, m_admobObj); - AndroidJavaObject maxCustomContentInfo = new AndroidJavaObject("com.anythink.core.api.ATCustomContentInfo", priceInfo.MaxPrice * 1000, m_maxObj); - AndroidJavaObject bigoCustomContentInfo = new AndroidJavaObject("com.anythink.core.api.ATCustomContentInfo", priceInfo.BigoPrice * 1000, m_bigoObj); - AndroidJavaObject kwaiCustomContentInfo = new AndroidJavaObject("com.anythink.core.api.ATCustomContentInfo", priceInfo.KwaiPrice * 1000, m_kwaiObj); - + AndroidJavaObject toponCustomContentInfo = new AndroidJavaObject("com.thinkup.core.api.TUCustomContentInfo", priceInfo.ToponAdUnitId, m_toponObj); + AndroidJavaObject admobCustomContentInfo = new AndroidJavaObject("com.thinkup.core.api.TUCustomContentInfo", priceInfo.AdmobPrice * 1000, m_admobObj); + AndroidJavaObject maxCustomContentInfo = new AndroidJavaObject("com.thinkup.core.api.TUCustomContentInfo", priceInfo.MaxPrice * 1000, m_maxObj); + AndroidJavaObject bigoCustomContentInfo = new AndroidJavaObject("com.thinkup.core.api.TUCustomContentInfo", priceInfo.BigoPrice * 1000, m_bigoObj); + AndroidJavaObject kwaiCustomContentInfo = new AndroidJavaObject("com.thinkup.core.api.TUCustomContentInfo", priceInfo.KwaiPrice * 1000, m_kwaiObj); AndroidJavaObject atCustomContentInfoList = new AndroidJavaObject("java.util.ArrayList"); atCustomContentInfoList.Call("add", toponCustomContentInfo); @@ -48,8 +47,7 @@ namespace WZ atCustomContentInfoList.Call("add", maxCustomContentInfo); atCustomContentInfoList.Call("add", bigoCustomContentInfo); atCustomContentInfoList.Call("add", kwaiCustomContentInfo); - - AndroidJavaClass sdkGlobalSetting = new AndroidJavaClass("com.anythink.core.api.ATSDKGlobalSetting"); + AndroidJavaClass sdkGlobalSetting = new AndroidJavaClass("com.thinkup.core.api.TUSDKGlobalSetting"); AndroidJavaObject maxPriceCustomContentInfo = sdkGlobalSetting.CallStatic("customContentReviewResult", atCustomContentInfoList); string customContentString = maxPriceCustomContentInfo.Get("customContentString"); diff --git a/Assets/Script/SDKManager/AdsSDKManager/Utils/AdsBidResult.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/Utils/AdsBidResult.cs.meta index 0ff9962..a65c26f 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Utils/AdsBidResult.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/Utils/AdsBidResult.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 9f4bb1420fa8442e7961c82f0f49e483 \ No newline at end of file +guid: 9f4bb1420fa8442e7961c82f0f49e483 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/Utils/BidPlatformManager.cs b/Assets/Script/SDKManager/AdsSDKManager/Utils/BidPlatformManager.cs index 483def6..b45304a 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Utils/BidPlatformManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/Utils/BidPlatformManager.cs @@ -92,7 +92,7 @@ namespace WZ return expiredAdTypes; } } - public class BidPlatformManager : NormalSingleton + public class BidPlatformManager : D_MonoSingleton { private Dictionary _platformStates = new Dictionary(); private int _bidExpireInSec = -1; diff --git a/Assets/Script/SDKManager/AdsSDKManager/Utils/BidPlatformManager.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/Utils/BidPlatformManager.cs.meta index 00cd42f..e71df63 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Utils/BidPlatformManager.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/Utils/BidPlatformManager.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 8b14631fb6b6547ee9890a43a8ecb2a7 \ No newline at end of file +guid: 8b14631fb6b6547ee9890a43a8ecb2a7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdsSDKManager/Utils/ThreadUtils.cs.meta b/Assets/Script/SDKManager/AdsSDKManager/Utils/ThreadUtils.cs.meta index fa0460a..fdc01ba 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Utils/ThreadUtils.cs.meta +++ b/Assets/Script/SDKManager/AdsSDKManager/Utils/ThreadUtils.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: b1a8b2d9a81c545768a7085cbd43f3d5 \ No newline at end of file +guid: b1a8b2d9a81c545768a7085cbd43f3d5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AppSDKManager.cs b/Assets/Script/SDKManager/AppSDKManager.cs index db140b1..aa4ae7f 100644 --- a/Assets/Script/SDKManager/AppSDKManager.cs +++ b/Assets/Script/SDKManager/AppSDKManager.cs @@ -20,7 +20,7 @@ public class AppSDKManager : D_MonoSingleton AdmobAdsManager.Instance.Initialize(); AdjustManager.Instance.Init(); ShuShuMangage.Instance.Init(); - AdsSDKManager.Instance.InitSDK(null); + AdsSDKManager.Instance.InitSDK(action); EFSdkManager.Instance.Init(); } @@ -38,18 +38,14 @@ public class AppSDKManager : D_MonoSingleton public void ShowRewardAd(string position, Action callback = null) { - bool isRewardAdReady = AdsSDKManager.Instance.IsRewardAdReady(); - if (isRewardAdReady) + AdsSDKManager.Instance.ShowRewardAd(position, (isReward, revenue) => { - AdsSDKManager.Instance.ShowRewardAd(position, (isReward, revenue) => + if (isReward) { - if (isReward) - { - //callback?.Invoke(); - callback?.Invoke(true, revenue); - } - }); - } + //callback?.Invoke(); + callback?.Invoke(true, revenue); + } + }); } public void ShowInterstitial(string position, IvType ivadType = IvType.IV1, Action callback = null) { diff --git a/Assets/Script/SDKManager/EFSdkManager/EFSdkManager.cs b/Assets/Script/SDKManager/EFSdkManager/EFSdkManager.cs index 5f9f1fe..f8cdfcd 100644 --- a/Assets/Script/SDKManager/EFSdkManager/EFSdkManager.cs +++ b/Assets/Script/SDKManager/EFSdkManager/EFSdkManager.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace WZ { - public class EFSdkManager : NormalSingleton + public class EFSdkManager : D_MonoSingleton { private const string KEY_OKSPIN_SHOW_COUNT = "OKSPIN_SHOW_COUNT"; diff --git a/Assets/Script/SDKManager/FirebaseManager/FireBaseAnalyticsManager.cs b/Assets/Script/SDKManager/FirebaseManager/FireBaseAnalyticsManager.cs index 088d15b..e9f1d3a 100644 --- a/Assets/Script/SDKManager/FirebaseManager/FireBaseAnalyticsManager.cs +++ b/Assets/Script/SDKManager/FirebaseManager/FireBaseAnalyticsManager.cs @@ -11,7 +11,7 @@ namespace WZ /// /// Firebase analytics事件上报 /// - public class FireBaseAnalyticsManager : NormalSingleton + public class FireBaseAnalyticsManager : D_MonoSingleton { private const string KEY_SUPER_PROPERTIES = "KEY_SUPER_PROPERTIES"; diff --git a/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs b/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs index 987c1b9..ead9b2b 100644 --- a/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs +++ b/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs @@ -6,7 +6,7 @@ using UnityEngine; namespace WZ { - public class FireBaseRemoteConfigManager : NormalSingleton + public class FireBaseRemoteConfigManager : D_MonoSingleton { public void FetchRemoteConfig() { diff --git a/Assets/Script/SDKManager/FirebaseManager/FireBaseSDKManager.cs b/Assets/Script/SDKManager/FirebaseManager/FireBaseSDKManager.cs index b873fa3..d393067 100644 --- a/Assets/Script/SDKManager/FirebaseManager/FireBaseSDKManager.cs +++ b/Assets/Script/SDKManager/FirebaseManager/FireBaseSDKManager.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace WZ { - public class FireBaseSDKManager : NormalSingleton + public class FireBaseSDKManager : D_MonoSingleton { public void Init() { diff --git a/Assets/Script/SDKManager/ShuShuMangage/ShuShuEvent.cs b/Assets/Script/SDKManager/ShuShuMangage/ShuShuEvent.cs index 6060af6..3b993f1 100644 --- a/Assets/Script/SDKManager/ShuShuMangage/ShuShuEvent.cs +++ b/Assets/Script/SDKManager/ShuShuMangage/ShuShuEvent.cs @@ -4,7 +4,7 @@ using ThinkingData.Analytics; namespace WZ { - public class ShuShuEvent : NormalSingleton + public class ShuShuEvent : D_MonoSingleton { /// /// 设置用户属性 diff --git a/Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs b/Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs index 43fadc2..a7d00bb 100644 --- a/Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs +++ b/Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs @@ -4,7 +4,7 @@ using ThinkingData.Analytics; using UnityEngine; namespace WZ { - public class ShuShuMangage : NormalSingleton + public class ShuShuMangage : D_MonoSingleton { private const string appid = "80f6819a81c743cbad667ecf242f3133"; private const string server = "https://global-receiver-ta.thinkingdata.cn"; diff --git a/Assets/Script/Utils/DataUtils.cs.meta b/Assets/Script/Utils/DataUtils.cs.meta index 362c570..6e90055 100644 --- a/Assets/Script/Utils/DataUtils.cs.meta +++ b/Assets/Script/Utils/DataUtils.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: be1bd83cd48f44fa59b93f7ee10ec4fc \ No newline at end of file +guid: be1bd83cd48f44fa59b93f7ee10ec4fc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Utils/LoggerUtils.cs b/Assets/Script/Utils/LoggerUtils.cs index b065da7..0fcd763 100644 --- a/Assets/Script/Utils/LoggerUtils.cs +++ b/Assets/Script/Utils/LoggerUtils.cs @@ -18,25 +18,25 @@ namespace WZ public static void Debug(object message, Object context = null) { if (!_enabled) return; - Log($"[DEBUG] {message}", context); + Log($"[DEBUG][WZSDK] {message}", context); } public static void Info(object message, Object context = null) { if (!!_enabled) return; - Log($"[INFO] {message}", context); + Log($"[INFO][WZSDK] {message}", context); } public static void Warning(object message, Object context = null) { if (!_enabled) return; - Log($"[WARNING] {message}", context); + Log($"[WARNING][WZSDK] {message}", context); } public static void Error(object message, Object context = null) { if (!!_enabled) return; - Log($"[ERROR] {message}", context); + Log($"[ERROR][WZSDK] {message}", context); } private static void Log(string message, Object context = null) diff --git a/Assets/Script/Utils/LoggerUtils.cs.meta b/Assets/Script/Utils/LoggerUtils.cs.meta index 1fe5299..c43e0fa 100644 --- a/Assets/Script/Utils/LoggerUtils.cs.meta +++ b/Assets/Script/Utils/LoggerUtils.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 7e6c7794484654e39acf594e7200206a \ No newline at end of file +guid: 7e6c7794484654e39acf594e7200206a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Utils/PlayerPrefsUtils.cs.meta b/Assets/Script/Utils/PlayerPrefsUtils.cs.meta index 487d1c2..c5ddd7f 100644 --- a/Assets/Script/Utils/PlayerPrefsUtils.cs.meta +++ b/Assets/Script/Utils/PlayerPrefsUtils.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: b2572c2555e654d5aad4a845312b20e9 \ No newline at end of file +guid: b2572c2555e654d5aad4a845312b20e9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Utils/SingletonBase.cs.meta b/Assets/Script/Utils/SingletonBase.cs.meta index 78681d5..061d7c1 100644 --- a/Assets/Script/Utils/SingletonBase.cs.meta +++ b/Assets/Script/Utils/SingletonBase.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: eb54f82607e0946e4ac5cbfb0ca49967 \ No newline at end of file +guid: eb54f82607e0946e4ac5cbfb0ca49967 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Utils/TimerUtils.cs.meta b/Assets/Script/Utils/TimerUtils.cs.meta index a7a8229..09b0d49 100644 --- a/Assets/Script/Utils/TimerUtils.cs.meta +++ b/Assets/Script/Utils/TimerUtils.cs.meta @@ -1,2 +1,11 @@ fileFormatVersion: 2 -guid: 6e18cf88978e94ad4bd074b3a427bbc9 \ No newline at end of file +guid: 6e18cf88978e94ad4bd074b3a427bbc9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 79ad7c8950b2785f4e668fdb08ee19616fdb8227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=89=E5=B3=B0?= Date: Tue, 2 Sep 2025 17:36:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=84=E7=A7=8Did=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SDKManager/AdjustManager/AdjustManager.cs | 30 ++++++++ Assets/Script/SDKManager/AppSDKManager.cs | 77 +++++++++++++++++-- 2 files changed, 100 insertions(+), 7 deletions(-) diff --git a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs index a1f00b9..3a61a86 100644 --- a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs +++ b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs @@ -12,6 +12,9 @@ public class AdjustManager : D_MonoSingleton private long startTime = 0; + private string Adid; + private string Gdid; + public void Init() { //开始计时 @@ -28,6 +31,10 @@ public class AdjustManager : D_MonoSingleton // 初始化Adjust SDK Adjust.InitSdk(config); + //id + LoadAdid(); + LoadGaid(); + //计时3分钟 AppSDKManager.Instance.Coroutine(AdjustNetwork.Instance.SetOrganic3Min()); @@ -50,5 +57,28 @@ public class AdjustManager : D_MonoSingleton return startTime; } + private void LoadGaid() + { + Adjust.GetGoogleAdId(googleAdId => { + Gdid = googleAdId; + }); + } + public string GetGdid() + { + return Gdid; + } + + private void LoadAdid() + { + Adjust.GetAdid(adid => + { + Adid = adid; + }); + } + + public string GetAdid() + { + return Adid; + } } diff --git a/Assets/Script/SDKManager/AppSDKManager.cs b/Assets/Script/SDKManager/AppSDKManager.cs index dc7a1a4..ed13776 100644 --- a/Assets/Script/SDKManager/AppSDKManager.cs +++ b/Assets/Script/SDKManager/AppSDKManager.cs @@ -1,9 +1,11 @@ using System; using System.Collections; using System.Collections.Generic; +using AdjustSdk; using EFSDK; using Firebase.RemoteConfig; using Newtonsoft.Json; +using ThinkingAnalytics; using UnityEngine; using WZ; @@ -564,38 +566,99 @@ public class AppSDKManager : D_MonoSingleton return AdjustNetwork.Instance.InOrganic(); } - public string GetGaid() + public string GetGaid() { - return null; + if (Application.isEditor) + { + return "gaid"; + } + return AdjustManager.Instance.GetGdid(); } public string GetAndroidId() { - return null; + if (Application.isEditor) + { + return "androidid"; + } + string androidId = "unknown"; + try + { + using (AndroidJavaClass unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer")) + using (AndroidJavaObject currentActivity = unityPlayer.GetStatic("currentActivity")) + using (AndroidJavaClass settingsSecure = new AndroidJavaClass("android.provider.Settings$Secure")) + { + // 调用 Settings.Secure.getString() 方法获取 ANDROID_ID + androidId = settingsSecure.CallStatic( + "getString", + currentActivity.Call("getContentResolver"), + "android_id" + ); + } + } + catch (System.Exception e) + { + LoggerUtils.Error("获取 Android ID 出错: " + e.Message); + } + return androidId; } public string GetAdid() { - return null; + if (Application.isEditor) + { + return "adid"; + } + return AdjustManager.Instance.GetAdid(); } public string GetUserAgent() { - return null; + if (Application.isEditor) + { + return "GetUserAgent"; + } + try + { + // 获取Java的System类 + using (AndroidJavaClass systemClass = new AndroidJavaClass("java.lang.System")) + { + // 调用System.getProperty("http.agent")方法 + string httpAgent = systemClass.CallStatic("getProperty", "http.agent"); + return httpAgent; + } + } + catch (System.Exception e) + { + Debug.LogError("获取http.agent失败: " + e.Message); + return null; + } } public string GetSSAccountId() { + if (Application.isEditor) + { + return "GetSSAccountId"; + } return null; } public string GetSSDistinctId() { - return null; + if (Application.isEditor) + { + return "GetSSDistinctId"; + } + return ThinkingAnalyticsAPI.GetDistinctId();; } public string GetSSSuperProperties() { - return null; + if (Application.isEditor) + { + return "GetSSSuperProperties"; + } + return ThinkingAnalyticsAPI.GetSuperProperties().ToString(); } } From 638ef146fd293e90e3c81b12c184a0f9609dca95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=89=E5=B3=B0?= Date: Tue, 2 Sep 2025 17:50:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=95=B0=E6=95=B0=E5=92=8Cadjustsdk?= =?UTF-8?q?=E7=9A=84id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Script/SDKManager/AdjustManager/AdjustManager.cs | 3 +-- Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs index 3a61a86..2f9020a 100644 --- a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs +++ b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs @@ -7,7 +7,6 @@ using WZ; public class AdjustManager : D_MonoSingleton { - private string appToken = "cap3ypurzegw"; // 替换为你的实际App Token private AdjustEnvironment environment = AdjustEnvironment.Sandbox; // 测试用Sandbox，发布用Production private long startTime = 0; @@ -20,7 +19,7 @@ public class AdjustManager : D_MonoSingleton //开始计时 startTime = TimeUtils.GetLocalTimestamp(); - AdjustConfig config = new AdjustConfig(appToken, environment); + AdjustConfig config = new AdjustConfig(StaticValue.AdjustToken, environment); // 设置归因变更回调函数 config.AttributionChangedDelegate = AttributionChangedDelegate; diff --git a/Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs b/Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs index a7d00bb..169d977 100644 --- a/Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs +++ b/Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs @@ -6,13 +6,10 @@ namespace WZ { public class ShuShuMangage : D_MonoSingleton { - private const string appid = "80f6819a81c743cbad667ecf242f3133"; - private const string server = "https://global-receiver-ta.thinkingdata.cn"; - public void Init() { // 初始化SDK - TDAnalytics.Init(appid, server); + TDAnalytics.Init(StaticValue.TDAppID, StaticValue.TDServerURL); //开启自动采集事件 TDAnalytics.EnableAutoTrack(TDAutoTrackEventType.AppInstall | TDAutoTrackEventType.AppStart | TDAutoTrackEventType.AppEnd); //如果用户已登录，可以设置用户的账号ID作为身份唯一标识 From 6774b4af7ac214f5c0e88b574b4d2621fb71ff40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=89=E5=B3=B0?= Date: Tue, 2 Sep 2025 18:06:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Native=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Script/SDKManager/AppSDKManager.cs | 103 +++++++++++++++++++++- 1 file changed, 100 insertions(+), 3 deletions(-) diff --git a/Assets/Script/SDKManager/AppSDKManager.cs b/Assets/Script/SDKManager/AppSDKManager.cs index ed13776..ceb2f18 100644 --- a/Assets/Script/SDKManager/AppSDKManager.cs +++ b/Assets/Script/SDKManager/AppSDKManager.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using AdjustSdk; using EFSDK; using Firebase.RemoteConfig; +using GoogleMobileAds.Api; using Newtonsoft.Json; using ThinkingAnalytics; using UnityEngine; @@ -134,22 +135,118 @@ public class AppSDKManager : D_MonoSingleton public bool IsNativeFullReady() { - return false; + var adUnitId = StaticValue.AdmobFullNativeId; + return AdsSDKManager.Instance.IsNativeAdReady(adUnitId); } - public void ShowFullNative(string position, Action callback = null) + public void ShowFullNative(RectTransform rectTransform, Camera pCom = null, string position = "") { + if (!IsNativeFullReady()) + { + return; + } + var adUnitId = StaticValue.AdmobFullNativeId; + var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle + { + TemplateId = NativeTemplateId.Medium, + MainBackgroundColor = Color.white + }, rectTransform, pCom); + + AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition); } - public void ShowNative(RectTransform rectTransform, Camera camera = null, string position = "") + public void HideFullNative() { + var adUnitId = StaticValue.AdmobFullNativeId; + AdsSDKManager.Instance.RemoveNativeAd(adUnitId); + } + + public bool IsNativeReady() + { + var adUnitId = StaticValue.AdmobNativeId; + return AdsSDKManager.Instance.IsNativeAdReady(adUnitId); + } + + public void ShowNative(RectTransform rectTransform, Camera pCom = null, string position = "") + { + if (!IsNativeReady()) + { + return; + } + var adUnitId = StaticValue.AdmobNativeId; + var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle + { + TemplateId = NativeTemplateId.Medium, + MainBackgroundColor = Color.white + }, rectTransform, pCom); + + AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition); } public void HideNative() { + var adUnitId = StaticValue.AdmobNativeId; + AdsSDKManager.Instance.RemoveNativeAd(adUnitId); + } + + public bool IsSmallNativeReady() + { + var adUnitId = StaticValue.AdmobSmallNativeId; + return AdsSDKManager.Instance.IsNativeAdReady(adUnitId); + } + + public void ShowSmallNative(RectTransform rectTransform, Camera pCom = null, string position = "") + { + if (!IsSmallNativeReady()) + { + return; + } + var adUnitId = StaticValue.AdmobSmallNativeId; + var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle + { + TemplateId = NativeTemplateId.Medium, + MainBackgroundColor = Color.white + }, rectTransform, pCom); + + AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition); + } + + public void HideSmallNative() + { + var adUnitId = StaticValue.AdmobSmallNativeId; + AdsSDKManager.Instance.RemoveNativeAd(adUnitId); + } + + public bool IsMinddleNativeReady() + { + var adUnitId = StaticValue.AdmobMinddleNativeId; + return AdsSDKManager.Instance.IsNativeAdReady(adUnitId); + } + + public void ShowMinddleNative(RectTransform rectTransform, Camera pCom = null, string position = "") + { + if (!IsSmallNativeReady()) + { + return; + } + + var adUnitId = StaticValue.AdmobMinddleNativeId; + var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle + { + TemplateId = NativeTemplateId.Medium, + MainBackgroundColor = Color.white + }, rectTransform, pCom); + + AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition); + } + + public void HideMinddleNative() + { + var adUnitId = StaticValue.AdmobMinddleNativeId; + AdsSDKManager.Instance.RemoveNativeAd(adUnitId); } #endregion