From 405b18d878fdc00ca072243ac98487e8a4a5779a Mon Sep 17 00:00:00 2001 From: juncong lee Date: Fri, 12 Dec 2025 16:22:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=B1=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=BC=80=E5=B1=8F=E6=B7=BB=E5=8A=A0=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E6=89=93=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/BigoAds/Scripts/Api/BigoAdSdk.cs | 1 + .../res/values/crashlytics_build_id.xml | 2 +- Assets/Plugins/Android/efsdk_res.aar | Bin 541798 -> 541798 bytes Assets/Plugins/Android/mainTemplate.gradle | 12 +-- Assets/Script/Common/FileParse/FileParse.cs | 1 - .../SDKManager/AdjustManager/AdjustManager.cs | 2 - .../AdmobAdsManager/AdmobAdsManager.cs | 8 ++ .../AdsSDKManager/AdsSplashManager.cs | 32 +++++--- .../Events/AdsEvents/AdsActionEvents.cs | 4 +- Assets/Script/Utils/LoggerUtils.cs | 1 - .../AndroidResolverDependencies.xml | 2 + UserSettings/Layouts/default-2022.dwlt | 76 +++++++++--------- 12 files changed, 79 insertions(+), 62 deletions(-) diff --git a/Assets/BigoAds/Scripts/Api/BigoAdSdk.cs b/Assets/BigoAds/Scripts/Api/BigoAdSdk.cs index c248141..a630cc7 100644 --- a/Assets/BigoAds/Scripts/Api/BigoAdSdk.cs +++ b/Assets/BigoAds/Scripts/Api/BigoAdSdk.cs @@ -1,5 +1,6 @@ using BigoAds.Scripts.Common; using BigoAds.Scripts.Api.Constant; +using System; namespace BigoAds.Scripts.Api { diff --git a/Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml b/Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml index a0c264c..317d5cc 100644 --- a/Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml +++ b/Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml @@ -1 +1 @@ -99079be3-a6d1-458f-9555-9127e5f23f51 +11bce6fa-2fca-4ea8-b4fa-16e19bb0cafb diff --git a/Assets/Plugins/Android/efsdk_res.aar b/Assets/Plugins/Android/efsdk_res.aar index 87bae0dc9f49d9c25c5e528b457054be0d7b0b45..78ccc80a1514ba9a3b92bd6947b5e969ff8da2da 100644 GIT binary patch delta 58 zcmaFXq4=yrkvG7bnMH(wfq{eJZ$nQbZ!0fjD=$+kFLNs|ODivHD=%9sFZ)(r4i$T5 Mp!{|ddk!O30MgtKJpcdz delta 58 zcmaFXq4=yrkvG7bnMH(wfq{b|sWrKgx0RQ%m6xfNm${XfrInYpm6xrRmwhWQhl)Kj MP=33KJ%(jsonData); if (configItems.Length == 0 || configItems == null) { - return new SplashConfigItem() { firstcold_splash_switch = 0, cold_splash_switch = 1, hot_splash_switch = 1, hot_timegap = 30, loadtime = 15 }; + return new SplashConfigItem() { firstcold_splash_switch = 1, cold_splash_switch = 1, hot_splash_switch = 1, hot_timegap = 30, loadtime = 2 }; } else { return configItems[0]; } - } [System.Serializable] diff --git a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs index e9e5bd3..5e9cec9 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs @@ -182,13 +182,15 @@ namespace WZ LoggerUtils.Debug("[actionevent] TrackAdFailToShow:"+JsonMapper.ToJson(dic)); } - public static void TrackAdPosition(AdsType adFormat, string pos) + public static void TrackAdPosition(AdsType adFormat, string pos, string backgroundTime = "0", string splashSwitch = "") { AdPlayCountManager.IncrementAdsActionCount(adFormat, AdPlayCountManager.ADPOSITION_COUNT_SUFFIX); var eventName = "ad_position"; var dic = new Dictionary { { "ad_format", adFormat.ToString()}, { "position", pos}, + { "backgroundTime", backgroundTime}, + {"splashSwitch",splashSwitch}, { "number",AdPlayCountManager.GetAdsActionCount(adFormat,AdPlayCountManager.ADPOSITION_COUNT_SUFFIX)} }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); diff --git a/Assets/Script/Utils/LoggerUtils.cs b/Assets/Script/Utils/LoggerUtils.cs index 4deb8b1..6214d62 100644 --- a/Assets/Script/Utils/LoggerUtils.cs +++ b/Assets/Script/Utils/LoggerUtils.cs @@ -1,6 +1,5 @@ using System.Collections; using System.Collections.Generic; -using Unity.VisualScripting; using UnityEngine; namespace WZ diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index 6fc7f61..6fc4547 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -49,6 +49,8 @@ com.thinkup.sdk:debugger-ui:1.1.1 com.unity3d.ads:unity-ads:4.14.0 com.vungle:vungle-ads:7.5.0 + io.github.kwainetwork:adApi:1.2.15 + io.github.kwainetwork:adImpl:1.2.15 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 6144cba..56ad093 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 + x: -1 y: 65 width: 1470 height: 891 @@ -120,7 +120,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 24 + controlID: 15 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -141,12 +141,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 831 + width: 971 height: 841 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 25 + controlID: 16 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -165,8 +165,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 831 - height: 185.5 + width: 971 + height: 319.5 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 12} @@ -191,9 +191,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 185.5 - width: 831 - height: 655.5 + y: 319.5 + width: 971 + height: 521.5 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 14} @@ -217,12 +217,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 831 + x: 971 y: 0 - width: 212 + width: 183 height: 841 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -243,12 +243,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1043 + x: 1154 y: 0 - width: 427 + width: 316 height: 841 - m_MinSize: {x: 641, y: 601} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 640, y: 580} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 11} @@ -296,7 +296,7 @@ MonoBehaviour: m_CachedPref: 226 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 24842 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 @@ -323,10 +323,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 + x: -1 y: 95 - width: 830 - height: 164.5 + width: 970 + height: 298.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1013,10 +1013,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 280.5 - width: 830 - height: 634.5 + x: -1 + y: 414.5 + width: 970 + height: 500.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1073,7 +1073,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: da400000 m_LastClickedID: 16602 - m_ExpandedIDs: 00000000846c0000866c0000886c00008a6c00008c6c00008e6c0000906c0000926c0000946c0000966c0000986c00009a6c00009c6c00009e6c0000a06c0000a26c0000a46c0000a66c0000a86c0000aa6c0000ac6c0000ae6c0000 + m_ExpandedIDs: 000000003e6b0000406b0000426b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1101,7 +1101,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000846c0000866c0000886c00008a6c00008c6c00008e6c0000906c0000926c0000946c0000966c0000986c00009a6c00009e6c0000a06c0000a26c0000a46c0000a66c0000a86c0000aa6c0000ac6c0000ae6c0000 + m_ExpandedIDs: ffffffff000000003e6b0000426b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1153,7 +1153,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 186.5} m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 82 @@ -1177,10 +1177,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 280.5 - width: 611 - height: 634.5 + x: -1 + y: 414.5 + width: 970 + height: 500.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1211,9 +1211,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 831 + x: 970 y: 95 - width: 210 + width: 181 height: 820 m_SerializedDataModeController: m_DataMode: 0 @@ -1228,9 +1228,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 2a6d00002c6d00002e6d0000306d0000326d0000346d0000366d0000386d00003a6d00003c6d00003e6d0000406d0000426d0000446d0000466d00009c6c00006a6d00006c6d00006e6d0000706d0000 + m_SelectedIDs: be6b0000c06b0000c26b0000c46b0000c66b0000c86b0000ca6b0000cc6b0000ce6b0000d06b0000d26b0000d46b0000406b0000f06b0000f26b0000f46b0000f66b0000f86b0000fa6b0000fc6b0000 m_LastClickedID: 0 - m_ExpandedIDs: 2efbffff + m_ExpandedIDs: 22fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1274,9 +1274,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1043 + x: 1153 y: 95 - width: 426 + width: 315 height: 820 m_SerializedDataModeController: m_DataMode: 0