From 88918b86910ee5cc914377ddf5b985c40a31fc12 Mon Sep 17 00:00:00 2001 From: juncong lee Date: Wed, 22 Oct 2025 13:55:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8topon=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96kwai=E5=B9=BF=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/extensions.json | 5 ++ .vscode/launch.json | 10 ++++ .vscode/settings.json | 56 ++++++++++++++++++ .../Scripts/Platform/Android/KwaiAdSDKInit.cs | 6 +- Assets/Plugins/Android/efsdk_res.aar | Bin 473696 -> 473702 bytes .../KwaiAdsManager/KwaiAdsManager.cs | 44 ++++++++++---- Assets/Script/SDKManager/RushSDKManager.cs | 2 +- Assets/Script/Version/Version.md | 16 ++++- 8 files changed, 123 insertions(+), 16 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..ddb6ff8 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "visualstudiotoolsforunity.vstuc" + ] +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..da60e25 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,10 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Unity", + "type": "vstuc", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..df392cf --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,56 @@ +{ + "files.exclude": { + "**/.DS_Store": true, + "**/.git": true, + "**/.gitmodules": true, + "**/*.booproj": true, + "**/*.pidb": true, + "**/*.suo": true, + "**/*.user": true, + "**/*.userprefs": true, + "**/*.unityproj": true, + "**/*.dll": true, + "**/*.exe": true, + "**/*.pdf": true, + "**/*.mid": true, + "**/*.midi": true, + "**/*.wav": true, + "**/*.gif": true, + "**/*.ico": true, + "**/*.jpg": true, + "**/*.jpeg": true, + "**/*.png": true, + "**/*.psd": true, + "**/*.tga": true, + "**/*.tif": true, + "**/*.tiff": true, + "**/*.3ds": true, + "**/*.3DS": true, + "**/*.fbx": true, + "**/*.FBX": true, + "**/*.lxo": true, + "**/*.LXO": true, + "**/*.ma": true, + "**/*.MA": true, + "**/*.obj": true, + "**/*.OBJ": true, + "**/*.asset": true, + "**/*.cubemap": true, + "**/*.flare": true, + "**/*.mat": true, + "**/*.meta": true, + "**/*.prefab": true, + "**/*.unity": true, + "build/": true, + "Build/": true, + "Library/": true, + "library/": true, + "obj/": true, + "Obj/": true, + "ProjectSettings/": true, + "temp/": true, + "Temp/": true + }, + "dotnet.defaultSolution": "SDK_UnityMoney.sln", + "git.ignoreLimitWarning": true +} \ No newline at end of file diff --git a/Assets/KwaiAds/Scripts/Platform/Android/KwaiAdSDKInit.cs b/Assets/KwaiAds/Scripts/Platform/Android/KwaiAdSDKInit.cs index 98a3f23..19a7ac5 100644 --- a/Assets/KwaiAds/Scripts/Platform/Android/KwaiAdSDKInit.cs +++ b/Assets/KwaiAds/Scripts/Platform/Android/KwaiAdSDKInit.cs @@ -4,6 +4,7 @@ using BigoAds.Scripts.Platforms.Android; using KwaiAds.Scripts.Api; using KwaiAds.Scripts.Common; using UnityEngine; +using WZ; namespace KwaiAds.Scripts.Platforms.Android { @@ -126,7 +127,10 @@ namespace KwaiAds.Scripts.Platforms.Android { AndroidJavaObject contextObject = currentActivity.Call("getApplicationContext"); Debug.Log("Android Context: " + contextObject.Call("toString")); - kwaiAdSdkClass.CallStatic("init", contextObject, sdkConfigBuilder.Call("build")); + if (!KwaiAdsManager.UseToponInitKwai()) + { + kwaiAdSdkClass.CallStatic("init", contextObject, sdkConfigBuilder.Call("build")); + } } else { diff --git a/Assets/Plugins/Android/efsdk_res.aar b/Assets/Plugins/Android/efsdk_res.aar index b3f599a35bdcd1bc6eee190a2567341c26fe67c8..d902701bce1b3f5afcee5fbadaec55f45324dbb0 100644 GIT binary patch delta 1111 zcmaFxMdsNT8SwybW)=|!1_llW)xN-J-s?h2=|En?L~+>^zGed+miK#@o-%%1Dyqfx z^YpbHs!b|l=Ng}jhZ-E8In^v>$``@xzZ177DWBSN-NZjH)7M?;v8&OU_qg?dEd&;{OdDO1*ogWi7nHx-0%M|8(0>MybioYC;?arilhg zsmA8p3qlzu^8$s0*^`r!jgnGQK_bn((`(cj1wbkVjg!nwj0`PP^$POR8T)k$E=|8! zz$iRDI46f%T6teCvkM|Jaqiwi>4iueO!XC^Z; z+yG)Jpnr=}i}h2A63Y{la#HmZjZ=&*%uJ1p+cS=`ZqGQ%wmf-qwU5Ab=43`ejzp6b z(^N}Sv&~C=YQm<^FMzm-!_3SeH8suD6zbM%=ImhgLhPo-W)_y_#+$tt+v|apE3zk< zCK(wSCvVRWWo+T)`_ZWsoy%1mHd~c}VVdf6#$-kjcGHxUl*A;nji=VCPWP{4l;ucC zF-uIb06M6ojuD8NfS4JGS+i4$w%)77Xf9=!#)!0phY-z{pWYHUCOFnwBJJDgl|VCuuVcLmHf7 zQXuX|q!x5{zgUc+5t5QX8ucW1okWv{B`b(SL8-_Q)uHPI*ii!lmcBqaD!`kS4HRs= PKscM3fnlo|JCFweWu!Tj delta 1102 zcmaF%Mdra58R-CTW)=|!1_llWj{>XcdSkuLR3NV&h=r#=Fk=_XH0^cdYB1nodB4x; zSHm-f4zIWIPCZduat&;M)O5d)Nf*23>XVqN`&Rb+65(Y}PbJPg8`tH-;AQO|^1IU8 zlIawqxOUAslU&yce0M6$N)xZIlb-SG;*af?B9_dFoR*FGGJlr;V+6TkdZQ(~*u+i3 z?1?GniH4~u+ohKd?GFXmuc=PAo5sX3y@#1e04!&o zWMq(LV6lBGGgD32^n2+LVRM5NGt)E^lkMyoO!j({Pk0JQNCG`plv=ExQj}Ppn3R*M zpO|csmSS$Q`J?B#&`B~pN|*{#EltymO%3%5^3oambqg*{7sy~zp3W=C&bc{SCRcZ| zKcB$#084h3=~2^|_}I)X(=1F)w&zV_YT-qdVz)@PFfy}D-kv{=sToy{mm}FM#oW{& zEeRyq&O80YNhVp2WQ*h!3*$tS_O~aQfS4JGS%8>z``eRj=iMgnpU)$S;o8(BLsN@n z!_?-d^S3{p&$v7p#SOe1X%@!DW{HVuAbYBL#Tl7I7_h|t^mAtHCezz3*#$JDfB}X8 z(|}CW;4^^6)^t`Yb_F!mnQG{&VUajJ$^t`mp$~>?XtYj$iK$wAF}iA4Y)?OB&aR*a z3K;}wxQMPA67ACkE!ahk&3|moo}$aZ&=16@`ij&U(fkWd4bv9_odk+@K1th9G&M<( zG?0R%=4BGP8faobQZuyxO${tfOy6h8u9x6ghb|3G9-xF7;EjmMADv3kMf?G=Gm{w^ uZU8Z=k4%rUqWTDyVh}DdX4PazRRc>k5UW_(Kmp4Ogfp2L7&e-*19<>|y+5A- diff --git a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs index f8bd91e..d4486f8 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs @@ -47,19 +47,35 @@ namespace WZ { KwaiFloorIvManager.Instance.InitializeWithFloors(); } - - var useToponKwai = RushSDKManager.Instance.GetRemoteConfigStr("use_topon_kwai","1").Equals("1"); - LoggerUtils.Debug("KwaiAdsManager Initialize start" + _appId + " token:" + _token + " rewardAdUnitId:" + _rewardAdUnitId + " interstitialAdUnitId:" + _interstitialAdUnitId+ " useToponKwai:" + useToponKwai); - if (useToponKwai) + LoggerUtils.Debug("KwaiAdsManager Initialize start" + _appId + " token:" + _token + " rewardAdUnitId:" + _rewardAdUnitId + " interstitialAdUnitId:" + _interstitialAdUnitId + " useToponKwai:" + UseToponInitKwai()); + + if (UseToponInitKwai()) { - _initialized = true; - LoadInterstitial(); - LoadRewarded(); + if (!string.IsNullOrEmpty(_appId) && !string.IsNullOrEmpty(_token)) + { + ToponKwaiUtils.InitSDK(_appId, _token, (res, msg) => + { + LoggerUtils.Debug("KwaiAdsManager is init topon" + ToponKwaiUtils.IsInit() + " res:" + res.ToString() + " msg:" + msg); + if (res) + { + var kwaiAdConfig = new KwaiAds.Scripts.Api.KwaiAdConfig.Builder() + .SetAppId(_appId) + .SetToken(_token) + .SetDebugLog(false) + .Build(); + + KwaiAds.Scripts.Api.KwaiAdsSdk.Initialize(kwaiAdConfig, new InitResultCallbackImpl()); + _initialized = true; + LoadInterstitial(); + LoadRewarded(); + } + }); + } } else { - LoggerUtils.Debug("KwaiAdsManager RefreshAdsData" + _appId + " token:" + _token + " rewardAdUnitId:" + _rewardAdUnitId + " interstitialAdUnitId:" + _interstitialAdUnitId+ " init:" + _initialized); + LoggerUtils.Debug("KwaiAdsManager RefreshAdsData" + _appId + " token:" + _token + " rewardAdUnitId:" + _rewardAdUnitId + " interstitialAdUnitId:" + _interstitialAdUnitId + " init:" + _initialized); if (string.IsNullOrEmpty(_appId) || string.IsNullOrEmpty(_token) || _initialized) return; var kwaiAdConfig = new KwaiAds.Scripts.Api.KwaiAdConfig.Builder() .SetAppId(_appId) @@ -67,11 +83,15 @@ namespace WZ .SetDebugLog(false) .Build(); - KwaiAds.Scripts.Api.KwaiAdsSdk.Initialize(kwaiAdConfig, new InitResultCallbackImpl()); - _initialized = true; - } + KwaiAds.Scripts.Api.KwaiAdsSdk.Initialize(kwaiAdConfig, new InitResultCallbackImpl()); + _initialized = true; + } + } + + public static bool UseToponInitKwai() + { + return RushSDKManager.Instance.GetRemoteConfigStr("use_topon_kwai", "1").Equals("1"); } - public void RefreshAdsData() { diff --git a/Assets/Script/SDKManager/RushSDKManager.cs b/Assets/Script/SDKManager/RushSDKManager.cs index 0687d1c..ba96df6 100644 --- a/Assets/Script/SDKManager/RushSDKManager.cs +++ b/Assets/Script/SDKManager/RushSDKManager.cs @@ -21,7 +21,7 @@ public class RushSDKManager : D_MonoSingleton public static string GetSDKVersion() { - return "1.0.4.9"; + return "1.0.5.0"; } protected override void Initialized() { diff --git a/Assets/Script/Version/Version.md b/Assets/Script/Version/Version.md index f8662ac..4d1bfb6 100644 --- a/Assets/Script/Version/Version.md +++ b/Assets/Script/Version/Version.md @@ -1,3 +1,17 @@ +# Version 1.0.5.0 2025.10.2 + +## Bugs + +- None + +## Known issues + +- None + +## Changelog + +- 修复topon初始化kwai广告后，kwai广告加载失败问题 + # Version 1.0.4.9 2025.10.20 ## Bugs @@ -12,8 +26,6 @@ - 修复EFSDK事件上报 -# Version 1.0.4.9 2025.10.20 - # Version 1.0.4.7 2025.10.17 ## Bugs