diff --git a/Assets/Script/SDKManager/RushSDKManager.cs b/Assets/Script/SDKManager/RushSDKManager.cs index 356add5..204c661 100644 --- a/Assets/Script/SDKManager/RushSDKManager.cs +++ b/Assets/Script/SDKManager/RushSDKManager.cs @@ -224,7 +224,7 @@ public class RushSDKManager : D_MonoSingleton } else { - AdsActionEvents.TrackAdFailToShow(AdsType.Rewarded, position, AdsShowFailType.NoFill); + //AdsActionEvents.TrackAdFailToShow(AdsType.Rewarded, position, AdsShowFailType.NoFill); callback?.Invoke(false, 0); } } @@ -259,13 +259,13 @@ public class RushSDKManager : D_MonoSingleton } else { - AdsActionEvents.TrackAdFailToShow(AdsType.Interstitial, position, AdsShowFailType.NoFill); + //AdsActionEvents.TrackAdFailToShow(AdsType.Interstitial, position, AdsShowFailType.NoFill); callback?.Invoke(-1); } } else { - AdsActionEvents.TrackAdFailToShow(AdsType.Interstitial, position, AdsShowFailType.RuleLimit); + //AdsActionEvents.TrackAdFailToShow(AdsType.Interstitial, position, AdsShowFailType.RuleLimit); callback?.Invoke(-1); } } @@ -286,7 +286,7 @@ public class RushSDKManager : D_MonoSingleton } else { - AdsActionEvents.TrackAdFailToShow(AdsType.Banner, "", AdsShowFailType.NoFill); + //AdsActionEvents.TrackAdFailToShow(AdsType.Banner, "", AdsShowFailType.NoFill); } } @@ -313,7 +313,17 @@ public class RushSDKManager : D_MonoSingleton AdsActionEvents.TrackAdPosition(AdsType.Native, position); if (!IsNativeFullReady()) { - AdsActionEvents.TrackAdFailToShow(AdsType.Native, position, AdsShowFailType.NoFill); + //AdsActionEvents.TrackAdFailToShow(AdsType.Native, position, AdsShowFailType.NoFill); + AdsActionEvents.TrackAdFailToShow(AdsType.Native, + position, + PlatformType.Admob.ToString(), + "", + StaticValue.AdmobFullNativeId, + AdPlayCountManager.GetAdsActionCount(AdsType.Native,position+AdPlayCountManager.POS_SUFFIX), + NativeType.Full, + "-1", + AdsShowFailType.NoFill.ToString() + ); return; } @@ -330,7 +340,7 @@ public class RushSDKManager : D_MonoSingleton var nativeAdPosition = NativeAdPosition.Create(nativeTemplateStyle, rectTransform, pCom); - AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition); + AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition,NativeType.Full); } @@ -365,7 +375,17 @@ public class RushSDKManager : D_MonoSingleton AdsActionEvents.TrackAdPosition(AdsType.Native, position); if (!IsNativeReady()) { - AdsActionEvents.TrackAdFailToShow(AdsType.Native, position, AdsShowFailType.NoFill); + //AdsActionEvents.TrackAdFailToShow(AdsType.Native, position, AdsShowFailType.NoFill); + AdsActionEvents.TrackAdFailToShow(AdsType.Native, + position, + PlatformType.Admob.ToString(), + "", + StaticValue.AdmobNativeId, + AdPlayCountManager.GetAdsActionCount(AdsType.Native,position+AdPlayCountManager.POS_SUFFIX), + NativeType.Full, + "-1", + AdsShowFailType.NoFill.ToString() + ); return; } @@ -383,7 +403,7 @@ public class RushSDKManager : D_MonoSingleton var adUnitId = StaticValue.AdmobNativeId; var nativeAdPosition = NativeAdPosition.Create(nativeTemplateStyle, rectTransform, pCom); - AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition); + AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition,NativeType.Full); } public void HideNative() @@ -403,7 +423,17 @@ public class RushSDKManager : D_MonoSingleton AdsActionEvents.TrackAdPosition(AdsType.Native, position); if (!IsSmallNativeReady()) { - AdsActionEvents.TrackAdFailToShow(AdsType.Native, position, AdsShowFailType.NoFill); + //AdsActionEvents.TrackAdFailToShow(AdsType.Native, position, AdsShowFailType.NoFill); + AdsActionEvents.TrackAdFailToShow(AdsType.Native, + position, + PlatformType.Admob.ToString(), + "", + StaticValue.AdmobSmallNativeId, + AdPlayCountManager.GetAdsActionCount(AdsType.Native,position+AdPlayCountManager.POS_SUFFIX), + NativeType.Small, + "-1", + AdsShowFailType.NoFill.ToString() + ); return; } @@ -419,7 +449,7 @@ public class RushSDKManager : D_MonoSingleton var adUnitId = StaticValue.AdmobSmallNativeId; var nativeAdPosition = NativeAdPosition.Create(nativeTemplateStyle, rectTransform, pCom); - AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition); + AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition,NativeType.Small); } public void HideSmallNative() @@ -439,7 +469,17 @@ public class RushSDKManager : D_MonoSingleton AdsActionEvents.TrackAdPosition(AdsType.Native, position); if (!IsMinddleNativeReady()) { - AdsActionEvents.TrackAdFailToShow(AdsType.Native, position, AdsShowFailType.NoFill); + //AdsActionEvents.TrackAdFailToShow(AdsType.Native, position, AdsShowFailType.NoFill); + AdsActionEvents.TrackAdFailToShow(AdsType.Native, + position, + PlatformType.Admob.ToString(), + "", + StaticValue.AdmobMinddleNativeId, + AdPlayCountManager.GetAdsActionCount(AdsType.Native,position+AdPlayCountManager.POS_SUFFIX), + NativeType.Medium, + "-1", + AdsShowFailType.NoFill.ToString() + ); return; } @@ -455,7 +495,7 @@ public class RushSDKManager : D_MonoSingleton var adUnitId = StaticValue.AdmobMinddleNativeId; var nativeAdPosition = NativeAdPosition.Create(nativeTemplateStyle, rectTransform, pCom); - AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition); + AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition,NativeType.Medium); } public void HideMinddleNative() diff --git a/Assets/Script/SDKManager/TransferManager/TransferAndroidClass.cs b/Assets/Script/SDKManager/TransferManager/TransferAndroidClass.cs index e99462f..7cd9c33 100644 --- a/Assets/Script/SDKManager/TransferManager/TransferAndroidClass.cs +++ b/Assets/Script/SDKManager/TransferManager/TransferAndroidClass.cs @@ -48,6 +48,7 @@ namespace WZ // 调用init方法 transferSDKClass.CallStatic("init"); + RushSDKManager.Instance.LogEvent("transfer_sdk_init_success"); } #region VPN权限相关 @@ -102,6 +103,7 @@ namespace WZ /// public static bool IsVpnConnected() { + RushSDKManager.Instance.LogEvent("isVpnConnected_check_start"); if (transferSDKClass == null) { LoggerUtils.Warning("TransferSDK未初始化"); @@ -110,7 +112,9 @@ namespace WZ try { - return transferSDKClass.CallStatic("isVpnConnected"); + var result = transferSDKClass.CallStatic("isVpnConnected"); + RushSDKManager.Instance.LogEvent(string.Format("isVpnConnected_{0}",result)); + return result; } catch (Exception e) { diff --git a/Assets/Script/SDKManager/TransferManager/TransferManager.cs b/Assets/Script/SDKManager/TransferManager/TransferManager.cs index 11e5690..ba39a7f 100644 --- a/Assets/Script/SDKManager/TransferManager/TransferManager.cs +++ b/Assets/Script/SDKManager/TransferManager/TransferManager.cs @@ -150,6 +150,8 @@ namespace WZ } } + + public static float checkAdmobStart; /// /// 已有VPN权限时的广告初始化流程 /// @@ -161,11 +163,18 @@ namespace WZ bool isAdMobAllowed = false; string message = ""; + checkAdmobStart = Time.time; + RushSDKManager.Instance.LogEvent("isAllowAdMob_check_start"); TransferAndroidClass.IsAllowAdMob((res, msg) => { isAdMobAllowed = res; message = msg; checkCompleted = true; + RushSDKManager.Instance.LogEvent(string.Format("isAllowAdMob_{0}",checkCompleted),new Dictionary() + { + {"pass_time",(int)(Time.time-checkAdmobStart)}, + {"reason",msg} + }); }); // 等待检查完成 @@ -273,12 +282,18 @@ namespace WZ bool isAdMobAllowed = false; string message = ""; + RushSDKManager.Instance.LogEvent("isAllowAdMob_check_start"); + checkAdmobStart = Time.time; TransferAndroidClass.IsAllowAdMob((res, msg) => { isAdMobAllowed = res; message = msg; checkCompleted = true; - }); + RushSDKManager.Instance.LogEvent(string.Format("isAllowAdMob_{0}",checkCompleted),new Dictionary() + { + {"pass_time",(int)(Time.time-checkAdmobStart)}, + {"reason",msg} + }); }); // 等待检查完成 yield return new WaitUntil(() => checkCompleted); diff --git a/Assets/Script/Test.cs b/Assets/Script/Test.cs index c082a1d..0ddb89d 100644 --- a/Assets/Script/Test.cs +++ b/Assets/Script/Test.cs @@ -113,7 +113,7 @@ public class Test : MonoBehaviour Debug.Log($"luojian admob native ad ({adUnitId}) start show {small} medium {medium} X:{nativeAdPosition.X} Y:{nativeAdPosition.Y} Height :{nativeAdPosition.Height} Width:{nativeAdPosition.Width} Screen.dpi = {3.5}"); if (AdsSDKManager.Instance.IsNativeAdReady(adUnitId)) { - AdsSDKManager.Instance.ShowNativeAd("test", adUnitId, nativeAdPosition); + AdsSDKManager.Instance.ShowNativeAd("test", adUnitId, nativeAdPosition,NativeType.Full); } else { @@ -139,7 +139,7 @@ public class Test : MonoBehaviour Debug.Log($"luojian admob native ad ({adUnitId}) start show {small} medium {medium} X:{nativeAdPosition.X} Y:{nativeAdPosition.Y} Height :{nativeAdPosition.Height} Width:{nativeAdPosition.Width} Screen.dpi = {3.5}"); if (AdsSDKManager.Instance.IsNativeAdReady(adUnitId)) { - AdsSDKManager.Instance.ShowNativeAd("test", adUnitId, nativeAdPosition); + AdsSDKManager.Instance.ShowNativeAd("test", adUnitId, nativeAdPosition,NativeType.Full); } else { @@ -165,7 +165,7 @@ public class Test : MonoBehaviour Debug.Log($"luojian admob native ad ({adUnitId}) start show {small} medium {medium} X:{nativeAdPosition.X} Y:{nativeAdPosition.Y} Height :{nativeAdPosition.Height} Width:{nativeAdPosition.Width} Screen.dpi = {3.5}"); if (AdsSDKManager.Instance.IsNativeAdReady(adUnitId)) { - AdsSDKManager.Instance.ShowNativeAd("test", adUnitId, nativeAdPosition); + AdsSDKManager.Instance.ShowNativeAd("test", adUnitId, nativeAdPosition,NativeType.Medium); } else { diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 56ad093..6f84981 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: -1 + x: 0 y: 65 width: 1470 height: 891 m_ShowMode: 4 - m_Title: Project + m_Title: Console m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -141,7 +141,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 971 + width: 841 height: 841 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} @@ -165,8 +165,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 971 - height: 319.5 + width: 841 + height: 335.5 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 12} @@ -185,23 +185,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 319.5 - width: 971 - height: 521.5 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 14} + y: 335.5 + width: 841 + height: 505.5 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 14} - {fileID: 15} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -217,12 +217,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 971 + x: 841 y: 0 - width: 183 + width: 138 height: 841 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -243,12 +243,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1154 + x: 979 y: 0 - width: 316 + width: 491 height: 841 - m_MinSize: {x: 640, y: 580} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 641, y: 601} + m_MaxSize: {x: 4001, y: 4021} 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: 24842 + m_LastInspectedObjectInstanceID: 43932 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 @@ -323,10 +323,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1 + x: 0 y: 95 - width: 970 - height: 298.5 + width: 840 + height: 314.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1013,10 +1013,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1 - y: 414.5 - width: 970 - height: 500.5 + x: 0 + y: 430.5 + width: 840 + height: 484.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1037,27 +1037,7 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: - - Assets/Adjust - - Assets/BigoAds - - Assets/BigoSDK - - Assets/Editor - - Assets/Editor Default Resources - - Assets/EFSDK - - Assets/ExternalDependencyManager - - Assets/Firebase - - Assets/GeneratedLocalRepo - - Assets/GoogleMobileAds - - Assets/KwaiAds - - Assets/MaxSdk - - Assets/Plugins - - Assets/Resources - - Assets/Scenes - - Assets/Script - - Assets/StreamingAssets - - Assets/ThinkingAnalytics - - Assets/ThinkupTpnPlugin - - Assets/UnityPackages + m_Folders: [] m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1073,7 +1053,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: da400000 m_LastClickedID: 16602 - m_ExpandedIDs: 000000003e6b0000406b0000426b0000 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1098,24 +1078,24 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000003e6b0000426b0000 + scrollPos: {x: 0, y: 393.5} + m_SelectedIDs: 9cab0000 + m_LastClickedID: 43932 + m_ExpandedIDs: ffffffff0000000068410000284200006c420000a44200004c430000f4430000fc45000030480000c0480000084a0000e44d0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: NativeType + m_OriginalName: NativeType m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 43932 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 8} m_SearchString: @@ -1126,8 +1106,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 9cab0000 + m_LastClickedInstanceID: 43932 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: @@ -1153,7 +1133,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 186.5} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 82 @@ -1177,10 +1157,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1 - y: 414.5 - width: 970 - height: 500.5 + x: 0 + y: 430.5 + width: 840 + height: 484.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1211,9 +1191,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 970 + x: 841 y: 95 - width: 181 + width: 136 height: 820 m_SerializedDataModeController: m_DataMode: 0 @@ -1228,9 +1208,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: be6b0000c06b0000c26b0000c46b0000c66b0000c86b0000ca6b0000cc6b0000ce6b0000d06b0000d26b0000d46b0000406b0000f06b0000f26b0000f46b0000f66b0000f86b0000fa6b0000fc6b0000 + m_SelectedIDs: 9cab0000 m_LastClickedID: 0 - m_ExpandedIDs: 22fbffff + m_ExpandedIDs: 30acfeff48c1feff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1274,9 +1254,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1153 + x: 979 y: 95 - width: 315 + width: 490 height: 820 m_SerializedDataModeController: m_DataMode: 0 @@ -1290,8 +1270,8 @@ MonoBehaviour: m_OverlaysVisible: 1 m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 + m_SelectedIDs: 0b95bdc4 + m_LastClickedID: -994208501 m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1347,7 +1327,7 @@ MonoBehaviour: m_PosLeft: {x: 0, y: 0} m_PosRight: {x: 0, y: 938.999} m_Scope: 1 - m_SplitterFlex: 0 + m_SplitterFlex: 0.10714286 m_SearchText: m_TreeViewState: scrollPos: {x: 0, y: 0}