From e0277cd02b6a5b445082810f26cc858d3b74c1af Mon Sep 17 00:00:00 2001 From: huyfei Date: Fri, 12 Jan 2024 17:26:22 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E9=80=BB=E8=BE=91=EF=BC=8C=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=201.0.3=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/GuruCore/Runtime/Ads/ADService.cs | 8 ++-- Runtime/GuruCore/Runtime/Ads/ADServiceBase.cs | 16 ++++--- .../Plugins/Android/SDKRes.androidlib.meta | 3 ++ .../SDKRes.androidlib/AndroidManifest.xml | 6 +++ .../AndroidManifest.xml.meta | 3 ++ .../SDKRes.androidlib/project.properties | 2 + .../SDKRes.androidlib/project.properties.meta | 3 ++ .../Android/SDKRes.androidlib/res.meta | 3 ++ .../Android/SDKRes.androidlib/res/xml.meta | 3 ++ .../res/xml/network_security_config.xml | 43 +++++++++++++++++++ .../res/xml/network_security_config.xml.meta | 3 ++ package.json | 2 +- 12 files changed, 82 insertions(+), 13 deletions(-) create mode 100644 Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib.meta create mode 100644 Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/AndroidManifest.xml create mode 100644 Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/AndroidManifest.xml.meta create mode 100644 Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/project.properties create mode 100644 Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/project.properties.meta create mode 100644 Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res.meta create mode 100644 Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res/xml.meta create mode 100644 Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res/xml/network_security_config.xml create mode 100644 Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res/xml/network_security_config.xml.meta diff --git a/Runtime/GuruCore/Runtime/Ads/ADService.cs b/Runtime/GuruCore/Runtime/Ads/ADService.cs index b9a34c7..105db8a 100644 --- a/Runtime/GuruCore/Runtime/Ads/ADService.cs +++ b/Runtime/GuruCore/Runtime/Ads/ADService.cs @@ -65,15 +65,13 @@ namespace Guru _asyncLoader.OnInterstitialRequestOver = (success, firstLoad) => { Debug.Log($"--- [Amazon] Async IV response, success:{success} -> OnLoadMaxIV"); - if (success && firstLoad) OnLoadMaxIV(); + // if (success && firstLoad) OnLoadMaxIV(); }; - _asyncLoader.OnRewardRequestOver = (success,firstLoad) => + _asyncLoader.OnRewardRequestOver = (success, firstLoad) => { Debug.Log($"--- [Amazon] Async RV response, success:{success} > OnLoadMaxRV"); - if (success && firstLoad) OnLoadMaxRV(); + // if (success && firstLoad) OnLoadMaxRV(); }; - - } #endif diff --git a/Runtime/GuruCore/Runtime/Ads/ADServiceBase.cs b/Runtime/GuruCore/Runtime/Ads/ADServiceBase.cs index b8fef1c..152090e 100644 --- a/Runtime/GuruCore/Runtime/Ads/ADServiceBase.cs +++ b/Runtime/GuruCore/Runtime/Ads/ADServiceBase.cs @@ -216,12 +216,13 @@ namespace Guru OnLoadBads(); // Banners are automatically sized to 320x50 on phones and 728x90 on tablets // You may use the utility method `MaxSdkUtils.isTablet()` to help with view sizing adjustments - MaxSdk.CreateBanner(GetBannerID(), MaxSdkBase.BannerPosition.BottomCenter); - MaxSdk.SetBannerExtraParameter(GetBannerID(), "adaptive_banner", "false"); + var id = GetBannerID(); + MaxSdk.CreateBanner(id, MaxSdkBase.BannerPosition.BottomCenter); + MaxSdk.SetBannerExtraParameter(id, "adaptive_banner", "false"); // Set background or background color for banners to be fully functional - MaxSdk.SetBannerBackgroundColor(GetBannerID(), _backColor); + MaxSdk.SetBannerBackgroundColor(id, _backColor); // Analytics.ADBadsLoad(GetBannerID()); - Analytics.ADBadsLoad(AdParams.Build(GetBannerID())); + Analytics.ADBadsLoad(AdParams.Build(id)); } public void OnLoadBads() @@ -293,7 +294,9 @@ namespace Guru protected void LoadMaxInterstitial() { OnLoadIads(); - MaxSdk.LoadInterstitial(GetInterstitialID()); + var id = GetInterstitialID(); + Analytics.ADIadsLoad(AdParams.Build(id)); + MaxSdk.LoadInterstitial(id); } public void OnLoadIads() @@ -430,8 +433,7 @@ namespace Guru { OnLoadRads(); var id = GetRewardedVideoID(); - // Analytics.ADRadsLoad(id); - Analytics.ADIadsClose(AdParams.Build(id)); + Analytics.ADRadsLoad(AdParams.Build(id)); // 上报打点 MaxSdk.LoadRewardedAd(id); } diff --git a/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib.meta b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib.meta new file mode 100644 index 0000000..148bc99 --- /dev/null +++ b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 88708d2eeaaa4876b3614577593049ef +timeCreated: 1705049907 \ No newline at end of file diff --git a/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/AndroidManifest.xml b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/AndroidManifest.xml new file mode 100644 index 0000000..533a08a --- /dev/null +++ b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/AndroidManifest.xml.meta b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/AndroidManifest.xml.meta new file mode 100644 index 0000000..9fa1edb --- /dev/null +++ b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/AndroidManifest.xml.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c18726788fef4db9be1733b0329f1067 +timeCreated: 1705049907 \ No newline at end of file diff --git a/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/project.properties b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/project.properties new file mode 100644 index 0000000..37b95ed --- /dev/null +++ b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/project.properties @@ -0,0 +1,2 @@ +target=android-9 +android.library=true \ No newline at end of file diff --git a/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/project.properties.meta b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/project.properties.meta new file mode 100644 index 0000000..68b744f --- /dev/null +++ b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/project.properties.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 07d108573d1a417f8132f546c1b06a68 +timeCreated: 1705049907 \ No newline at end of file diff --git a/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res.meta b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res.meta new file mode 100644 index 0000000..fb901e8 --- /dev/null +++ b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 41d8e4b1f70e46f09190dd0877324f73 +timeCreated: 1705049907 \ No newline at end of file diff --git a/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res/xml.meta b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res/xml.meta new file mode 100644 index 0000000..3ea3b81 --- /dev/null +++ b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res/xml.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5c888f8eb1754ea3b54790aa1cc1fa60 +timeCreated: 1705049907 \ No newline at end of file diff --git a/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res/xml/network_security_config.xml b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res/xml/network_security_config.xml new file mode 100644 index 0000000..df87d79 --- /dev/null +++ b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res/xml/network_security_config.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + 127.0.0.1 + + + amazon-adsystem.com + + + cdn-creatives-akamai-prd.unityads.unity3d.com + cdn-creatives-akamaistls-prd.unityads.unity3d.com + cdn-creatives-akamaistls-re-prd.unityads.unity3d.com + cdn-creatives-geocdn-prd.unityads.unity3d.com + cdn-creatives-prd.unityads.unity3d.com + cdn-creatives-highwinds-prd.unityads.unity3d.com + cdn-creatives-tencent-prd.unityads.unitychina.cn + cdn-store-icons-akamai-prd.unityads.unity3d.com + cdn-store-icons-highwinds-prd.unityads.unity3d.com + cdn-store-icons-tencent-prd.unityads.unitychina.cn + cdn-creatives-akamaistls-prd.acquire.unity3dusercontent.com + unityads.unity3d.com + unityads.unitychina.cn + + + + + + + + \ No newline at end of file diff --git a/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res/xml/network_security_config.xml.meta b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res/xml/network_security_config.xml.meta new file mode 100644 index 0000000..bcb8bd2 --- /dev/null +++ b/Runtime/GuruCore/Runtime/Plugins/Android/SDKRes.androidlib/res/xml/network_security_config.xml.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 986e002a4cff46229b401c3710ac1ff0 +timeCreated: 1705049907 \ No newline at end of file diff --git a/package.json b/package.json index 463d010..bcc11aa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.guru.unity.sdk.core", "displayName": "Guru SDK Core", - "version": "1.0.0", + "version": "1.0.3", "description": "Guru SDK core for Unity developers", "unity": "2021.3", "author":{