diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 202173f..1632cc7 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -961,6 +961,85 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &522908628 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 522908629} + - component: {fileID: 522908631} + - component: {fileID: 522908630} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &522908629 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522908628} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1238066087} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &522908630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522908628} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u63D2\u5C4F" +--- !u!222 &522908631 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522908628} + m_CullTransparentMesh: 1 --- !u!1 &575018474 GameObject: m_ObjectHideFlags: 0 @@ -1306,6 +1385,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 988501504} m_CullTransparentMesh: 1 +--- !u!1 &997270991 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 997270992} + - component: {fileID: 997270995} + - component: {fileID: 997270994} + - component: {fileID: 997270993} + m_Layer: 5 + m_Name: Button (Legacy) (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &997270992 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997270991} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1887326723} + m_Father: {fileID: 1332931146} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -115, y: -238} + m_SizeDelta: {x: 160, y: 81.78} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &997270993 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997270991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 997270994} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1332931147} + m_TargetAssemblyTypeName: Test, Assembly-CSharp + m_MethodName: ToponDebug + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &997270994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997270991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &997270995 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997270991} + m_CullTransparentMesh: 1 --- !u!1 &1034084153 GameObject: m_ObjectHideFlags: 0 @@ -1597,6 +1809,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1134071599} m_CullTransparentMesh: 1 +--- !u!1 &1204956323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1204956324} + - component: {fileID: 1204956327} + - component: {fileID: 1204956326} + - component: {fileID: 1204956325} + m_Layer: 5 + m_Name: Button (Legacy) (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1204956324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204956323} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1263400540} + m_Father: {fileID: 1332931146} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 104, y: -238} + m_SizeDelta: {x: 160, y: 81.78} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1204956325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204956323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1204956326} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1332931147} + m_TargetAssemblyTypeName: Test, Assembly-CSharp + m_MethodName: MaxDebug + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1204956326 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204956323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1204956327 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204956323} + m_CullTransparentMesh: 1 --- !u!1 &1222376247 GameObject: m_ObjectHideFlags: 0 @@ -1665,6 +2010,218 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1238066086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1238066087} + - component: {fileID: 1238066090} + - component: {fileID: 1238066089} + - component: {fileID: 1238066088} + m_Layer: 5 + m_Name: Button (Legacy) (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1238066087 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238066086} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 522908629} + m_Father: {fileID: 1332931146} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -317, y: -238} + m_SizeDelta: {x: 160, y: 81.78} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1238066088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238066086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1238066089} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1332931147} + m_TargetAssemblyTypeName: Test, Assembly-CSharp + m_MethodName: OnShowInterstitial + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1238066089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238066086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1238066090 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238066086} + m_CullTransparentMesh: 1 +--- !u!1 &1263400539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1263400540} + - component: {fileID: 1263400542} + - component: {fileID: 1263400541} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1263400540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263400539} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1204956324} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1263400541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263400539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: max debug +--- !u!222 &1263400542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263400539} + m_CullTransparentMesh: 1 --- !u!1 &1332931142 GameObject: m_ObjectHideFlags: 0 @@ -1761,6 +2318,9 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 231270963} + - {fileID: 1238066087} + - {fileID: 997270992} + - {fileID: 1204956324} - {fileID: 2018301549} - {fileID: 1560301799} - {fileID: 988501505} @@ -2448,6 +3008,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1839779887} m_CullTransparentMesh: 1 +--- !u!1 &1887326722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1887326723} + - component: {fileID: 1887326725} + - component: {fileID: 1887326724} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1887326723 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887326722} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 997270992} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1887326724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887326722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: topon debug +--- !u!222 &1887326725 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887326722} + m_CullTransparentMesh: 1 --- !u!1 &1979832640 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs index df9b207..f33ee2c 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs @@ -33,6 +33,8 @@ namespace WZ private float _nvStartLoadTime = 0; private float _bvStartLoadTime = 0; private float _spStartLoadTime = 0; + + public bool _splashLoaded = false; public void Initialize() { @@ -43,13 +45,13 @@ namespace WZ MobileAds.Initialize(initStatus => { LoggerUtils.Debug("[Admob] init success"); - }); - + }); + if (_bannerAdUnits.Count > 0) LoadBanner(); if (_interstitialAdUnits.Count > 0) LoadInterstitial(); if (_rewardedAdUnits.Count > 0) LoadRewarded(); - if(_splashAdUnits.Count > 0) AdsSplashManager.Instance.InitSplash(); - + if (_splashAdUnits.Count > 0) AdsSplashManager.Instance.InitSplash(); + if (_nativeAdUnits.Count > 0) { LoadNative(); @@ -259,11 +261,13 @@ namespace WZ private void OnSplashAdLoaded(string adSource,string adUnitId) { + _splashLoaded = true; AdsActionEvents.TrackAdLoaded(Platfrom,adSource,adUnitId,AdsType.Splash,Time.realtimeSinceStartup - _spStartLoadTime); } private void OnSplashAdLoadFailed(string adUnitId, int errorCode, string errorMsg) { + _splashLoaded = true; AdsActionEvents.TrackAdFailToLoad(Platfrom,"","",AdsType.Splash,Time.realtimeSinceStartup - _spStartLoadTime,errorMsg); } diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobBannerAdManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobBannerAdManager.cs index 9b5b265..d2fcf3b 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobBannerAdManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobBannerAdManager.cs @@ -46,7 +46,7 @@ namespace WZ _adRevenueCache[adUnitId] = AdmobUtils.GetBannerEcpm(bannerAds); LoggerUtils.Debug($"[Admob] banner -[Load]: {adUnitId} successfully"); onAdLoaded?.Invoke(bannerAds.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, - AdmobUtils.ParseResponseInfo(bannerAds.GetResponseInfo())); + adUnitId); AdsKeyEvents.Instance.LogAdFPUEvents(AdsType.Banner); }; @@ -68,7 +68,7 @@ namespace WZ AdmobAdsManager.Instance.TrackAdImpression(bannerAds.GetResponseInfo().GetLoadedAdapterResponseInfo(), adValue, AdsType.Banner, - AdmobUtils.ParseResponseInfo(bannerAds.GetResponseInfo())); + adUnitId); OnAdPaid?.Invoke(adValue); }); @@ -76,7 +76,7 @@ namespace WZ bannerAds.OnAdClicked += () => { onAdClicked?.Invoke(bannerAds.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, - AdmobUtils.ParseResponseInfo(bannerAds.GetResponseInfo()), + adUnitId, AdmobUtils.GetBannerEcpm(bannerAds)); }; LoadAd(adUnitId); diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobInterstitialAdManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobInterstitialAdManager.cs index 6e475cb..15c3864 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobInterstitialAdManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobInterstitialAdManager.cs @@ -54,14 +54,14 @@ namespace WZ _adRevenueCache[adUnitId] = AdmobUtils.GetInterstitialAdEcpm(ad); AdsKeyEvents.Instance.LogAdFPUEvents(AdsType.Interstitial); onAdLoaded?.Invoke(ad.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, - AdmobUtils.ParseResponseInfo(ad.GetResponseInfo())); + adUnitId); ad.OnAdPaid += (AdValue adValue) => { LoggerUtils.Debug(String.Format("[Admob] Interstitial ad paid {0} {1}.", adValue.Value, adValue.CurrencyCode)); AdmobAdsManager.Instance.TrackAdImpression(ad.GetResponseInfo().GetLoadedAdapterResponseInfo(), adValue, AdsType.Interstitial, - AdmobUtils.ParseResponseInfo(ad.GetResponseInfo())); + adUnitId); onAdPaid?.Invoke(adValue); }; @@ -75,7 +75,7 @@ namespace WZ { LoggerUtils.Debug("[Admob] Interstitial ad was clicked."); onAdClicked?.Invoke(ad.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, - AdmobUtils.ParseResponseInfo(ad.GetResponseInfo()), + adUnitId, AdmobUtils.GetInterstitialAdEcpm(ad)); }; @@ -88,7 +88,7 @@ namespace WZ ad.OnAdFullScreenContentClosed += () => { LoggerUtils.Debug("[Admob] Interstitial ad full screen content closed."); - onAdDismissed?.Invoke(ad.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, AdmobUtils.ParseResponseInfo(ad.GetResponseInfo()), AdmobUtils.GetInterstitialAdEcpm(ad)); + onAdDismissed?.Invoke(ad.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, adUnitId, AdmobUtils.GetInterstitialAdEcpm(ad)); }; ad.OnAdFullScreenContentFailed += (AdError error) => diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobNativeAdManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobNativeAdManager.cs index 20abad0..cb5dced 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobNativeAdManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobNativeAdManager.cs @@ -67,7 +67,7 @@ namespace WZ AdmobAdsManager.Instance.TrackAdImpression(ad.GetResponseInfo().GetLoadedAdapterResponseInfo(), adValue, AdsType.Native, - AdmobUtils.ParseResponseInfo(ad.GetResponseInfo())); + adUnitId); }; ad.OnAdImpressionRecorded += () => { LoggerUtils.Debug("[Admob] Native ad recorded an impression."); }; diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobRewardedAdManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobRewardedAdManager.cs index 5d6817a..73718e1 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobRewardedAdManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobRewardedAdManager.cs @@ -50,14 +50,16 @@ namespace WZ return; } - LoggerUtils.Debug("[Admob] rewarded ad loaded with response : " + ad.GetResponseInfo().ToString()); + LoggerUtils.Debug("[Admob] rewarded ad loaded with response : " + ad.GetResponseInfo().ToString()+"revenue:"+AdmobUtils.GetRewardedAdEcpm(ad)); + LoggerUtils.Debug("[Admob] rewarded ad revenue : " +AdmobUtils.GetRewardedAdEcpm(ad)); + _rewardedAds[adUnitId] = ad; _adRevenueCache[adUnitId] = AdmobUtils.GetRewardedAdEcpm(ad); AdsKeyEvents.Instance.LogAdFPUEvents(AdsType.Rewarded); onAdLoaded?.Invoke(ad.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, - AdmobUtils.ParseResponseInfo(ad.GetResponseInfo())); + adUnitId); ad.OnAdPaid += (AdValue adValue) => { @@ -65,7 +67,7 @@ namespace WZ AdmobAdsManager.Instance.TrackAdImpression(ad.GetResponseInfo().GetLoadedAdapterResponseInfo(), adValue, AdsType.Rewarded, - AdmobUtils.ParseResponseInfo(ad.GetResponseInfo())); + adUnitId); onAdPaid?.Invoke(adValue); }; @@ -78,7 +80,7 @@ namespace WZ { LoggerUtils.Debug("[Admob] rewarded ad was clicked."); onAdClicked?.Invoke(ad.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, - AdmobUtils.ParseResponseInfo(ad.GetResponseInfo()), + adUnitId, AdmobUtils.GetRewardedAdEcpm(ad)); }; @@ -91,7 +93,7 @@ namespace WZ ad.OnAdFullScreenContentClosed += () => { LoggerUtils.Debug("[Admob] rewarded ad full screen content closed."); - onAdDismissed?.Invoke(ad.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, AdmobUtils.ParseResponseInfo(ad.GetResponseInfo()), AdmobUtils.GetRewardedAdEcpm(ad)); + onAdDismissed?.Invoke(ad.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, adUnitId, AdmobUtils.GetRewardedAdEcpm(ad)); }; ad.OnAdFullScreenContentFailed += (AdError error) => diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobSplashAdManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobSplashAdManager.cs index b595332..b2f0a34 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobSplashAdManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobSplashAdManager.cs @@ -51,12 +51,12 @@ namespace WZ return; } - LoggerUtils.Debug("[Admob] appopen ad loaded with response : " + ad.GetResponseInfo().ToString()); + LoggerUtils.Debug("[Admob] appopen ad loaded with response : " + ad.GetResponseInfo().ToString()+" revenue:"+AdmobUtils.GetAppOpenAdEcpm(ad)); _appOpenAds[adUnitId] = ad; _adRevenueCache[adUnitId] = AdmobUtils.GetAppOpenAdEcpm(ad); AdsKeyEvents.Instance.LogAdFPUEvents(AdsType.Splash); onAdLoaded?.Invoke(ad.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, - AdmobUtils.ParseResponseInfo(ad.GetResponseInfo())); + adUnitId); ad.OnAdPaid += (AdValue adValue) => { @@ -64,7 +64,7 @@ namespace WZ AdmobAdsManager.Instance.TrackAdImpression(ad.GetResponseInfo().GetLoadedAdapterResponseInfo(), adValue, AdsType.Splash, - AdmobUtils.ParseResponseInfo(ad.GetResponseInfo())); + adUnitId); onAdPaid?.Invoke(adValue); }; @@ -77,7 +77,7 @@ namespace WZ { LoggerUtils.Debug("[Admob] appopen ad was clicked."); onAdClicked?.Invoke(ad.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, - AdmobUtils.ParseResponseInfo(ad.GetResponseInfo()), + adUnitId, AdmobUtils.GetAppOpenAdEcpm(ad)); }; @@ -91,7 +91,7 @@ namespace WZ { LoggerUtils.Debug("[Admob] appopen ad full screen content closed."); onAdDismissed?.Invoke(ad.GetResponseInfo().GetLoadedAdapterResponseInfo().AdSourceName, - AdmobUtils.ParseResponseInfo(ad.GetResponseInfo()), + adUnitId, AdmobUtils.GetAppOpenAdEcpm(ad)); }; @@ -124,7 +124,7 @@ namespace WZ // 检查特定广告位是否可用 - private bool IsAdAvailable(string adUnitId) + public bool IsAdAvailable(string adUnitId) { return _appOpenAds.TryGetValue(adUnitId, out var ad) && ad.CanShowAd(); } @@ -153,9 +153,8 @@ namespace WZ { var adUnitId = kvp.Key; var revenue = kvp.Value; - // 确保广告确实已加载并且价格更高 - if (IsAdAvailable(adUnitId) && revenue > highestRevenue) + if (IsAdAvailable(adUnitId)) { highestRevenue = revenue; highestPayingAdUnit = adUnitId; diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/Utils/AdmobTools.cs b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/Utils/AdmobTools.cs index 7089088..6bf969c 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/Utils/AdmobTools.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/Utils/AdmobTools.cs @@ -17,11 +17,11 @@ namespace WZ { string responseInfoJson = responseInfo.ToString(); JObject responseInfoObj = JObject.Parse(responseInfoJson); - JToken loadedAdapterResponse = responseInfoObj["Adapter Responses"]; + JToken loadedAdapterResponse = responseInfoObj["Response Extras"]; if (loadedAdapterResponse != null) { - pubid = loadedAdapterResponse["Credentials"]?.ToString(); + pubid = loadedAdapterResponse["mediation_group_name"]?.ToString(); } } catch diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs index b26ed5d..0f747c6 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs @@ -26,6 +26,7 @@ namespace WZ public void InitSDK(Action action) { + LoggerUtils.Debug("init ads sdk"); OnSplashAdCloseCallback = action; // 初始化广告平台状态，用于竞价失败后刷新 BidPlatformManager.Instance.InitializePlatformStates(AdConfigParser.GetAdExpireInSec()); @@ -41,6 +42,7 @@ namespace WZ _adNetworks.Add(KwaiAdsManager.Instance); foreach (var network in _adNetworks) { + LoggerUtils.Debug("init ads sdk network:"+network.ToString()); network.RefreshAdsData(); network.Initialize(); } @@ -204,7 +206,7 @@ namespace WZ #region 开屏广告 public bool IsSplashAvailable() { - return _adNetworks.Any(network => network.IsSplashAvailable()); + return AdmobAdsManager.Instance.IsSplashAvailable(); } public void ShowSplashAd() diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdsSplashManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdsSplashManager.cs index 72a211c..78e7193 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdsSplashManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdsSplashManager.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using Firebase.RemoteConfig; using GoogleMobileAds.Api; using GoogleMobileAds.Common; +using Unity.VisualScripting; using UnityEngine; namespace WZ @@ -16,28 +17,26 @@ namespace WZ { timeoutDuration = GetSplashConfigItem().loadtime; StartCoroutine(LoadSplashAdAdWithTimeout()); + LoggerUtils.Debug(" [AppOpen] 加载开屏："+timeoutDuration); } - private void OnAppStateChanged(AppState state) + private void OnApplicationPause(bool pauseStatus) { - if (_coldLaunch) + if (!pauseStatus) //从后台返回前台 { - _coldLaunch = false; - return; + LoggerUtils.Debug(" [AppOpen] 进入前台"); + if (AdmobAdsManager.Instance._splashLoaded) + { + StartCoroutine(DelayedAction()); + } } - if (state == AppState.Foreground) - { - LoggerUtils.Debug("[AppOpen] 进入前台"); - StartCoroutine(DelayedAction()); - } - else if (state == AppState.Background) + else { backgroundTime = Time.realtimeSinceStartup; - LoggerUtils.Debug("[AppOpen] 进入后台 ：" + backgroundTime); + LoggerUtils.Debug(" [AppOpen] 进入后台 ：" + backgroundTime); } } - private IEnumerator LoadSplashAdAdWithTimeout() { // 开始加载广告 @@ -49,7 +48,6 @@ namespace WZ elapsedTime += Time.deltaTime; yield return null; } - CheckSplashAdlash(true); } @@ -150,7 +148,6 @@ namespace WZ AdsSDKManager.Instance.OnSplashAdCloseCallback?.Invoke(); } } - AppStateEventNotifier.AppStateChanged += OnAppStateChanged; } } @@ -163,7 +160,7 @@ namespace WZ SplashConfigItem[] configItems = DataUtils.FromJsonArray(jsonData); if (configItems.Length == 0 || configItems == null) { - return new SplashConfigItem() { firstcold_splash_switch = 1, cold_splash_switch = 1, hot_splash_switch = 1, hot_timegap = 30, loadtime = 5 }; + return new SplashConfigItem() { firstcold_splash_switch = 1, cold_splash_switch = 1, hot_splash_switch = 1, hot_timegap = 30, loadtime = 15 }; } else { diff --git a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsKeyEvents.cs b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsKeyEvents.cs index c237ca2..3839f30 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsKeyEvents.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsKeyEvents.cs @@ -65,7 +65,11 @@ namespace WZ AdjustTrackEvent.Instance.TrackEvent(m_token); FireBaseAnalyticsManager.Instance.LogEvent(m_key); ShuShuEvent.Instance.Track(m_key); - LoggerUtils.Debug("[keyevents] adcount key:" + m_key + " ipu" + m_ipu + " eventName:" + m_eventName + " token:" + m_token); + LoggerUtils.Debug("[keyevents] finial LogEventByCount 未上报过，上报"); + } + else + { + LoggerUtils.Debug("[keyevents] finial LogEventByCount 已经上报过，不上报"); } } @@ -104,9 +108,13 @@ namespace WZ AdjustTrackEvent.Instance.TrackEvent(m_token); FireBaseAnalyticsManager.Instance.LogEvent(m_key); ShuShuEvent.Instance.Track(m_key); - LoggerUtils.Debug("[keyevents] fpu key:" + m_key + " fpu" + m_fpu + " eventName:" + m_eventName + " token:" + m_token); + LoggerUtils.Debug("[keyevents] finial LogEventByFPU 未上报过，上报"); } } + else + { + LoggerUtils.Debug("[keyevents] finial LogEventByFPU 已经上报过，不上报"); + } } #endregion @@ -140,11 +148,15 @@ namespace WZ AdjustTrackEvent.Instance.TrackEvent(m_token); FireBaseAnalyticsManager.Instance.LogEvent(m_key); ShuShuEvent.Instance.Track(m_key); - LoggerUtils.Debug("[keyevents] totalrevenue key:" + m_key + " revenu" + m_revenue + " eventName:" + m_eventName + " token:" + m_token); + LoggerUtils.Debug("[keyevents] finial LogEventByTotalRevenue 未上报过，上报"); if (!m_reset_after_trigger) return; AdPlayCountManager.ResetKeyEventTotalRevenue(m_key); PlayerPrefsUtils.DeletePlayerPrefs(m_key); } + else + { + LoggerUtils.Debug("[keyevents] finial LogEventByTotalRevenue 已经上报过，不上报"); + } } } diff --git a/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs index 0233720..a65921e 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs @@ -29,7 +29,7 @@ namespace WZ public void Initialize() { - + if (string.IsNullOrEmpty(_max_app_key)) return; LoggerUtils.Debug("[Max] init max"); // 关闭反转debug面板 diff --git a/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs index 8c6c264..4e5e6a3 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs @@ -31,7 +31,6 @@ namespace WZ { ATSDKAPI.initSDK(_topon_app_id, _topon_app_key); ATSDKAPI.setLogDebug(false); - // ATSDKAPI.showDebuggerUI(); InitRewarded(); InitInterstitial(); } diff --git a/Assets/Script/SDKManager/FirebaseManager/FireBaseAnalyticsManager.cs b/Assets/Script/SDKManager/FirebaseManager/FireBaseAnalyticsManager.cs index 22c8462..fc7e8cc 100644 --- a/Assets/Script/SDKManager/FirebaseManager/FireBaseAnalyticsManager.cs +++ b/Assets/Script/SDKManager/FirebaseManager/FireBaseAnalyticsManager.cs @@ -182,6 +182,7 @@ namespace WZ string name = GetName(); Firebase.Analytics.FirebaseAnalytics.LogEvent(name, impressionParameters); AdsKeyEvents.Instance.LogAdCountEvents(ad_format, revenue); + AdsKeyEvents.Instance.LogAdTotalRevenueEvents(ad_format, revenue); } /// diff --git a/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs b/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs index 8fe66ba..44bcc3c 100644 --- a/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs +++ b/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs @@ -21,6 +21,7 @@ namespace WZ { IsInitialized = true; AdjustTrackEvent.Instance.UpdateEventToken(); + AdsKeyEvents.Instance.InitData(); // 获取广告位信息 AdConfigParser.Parse(GetRemoteConfigString("ad_config")); // 刷新广告位信息 diff --git a/Assets/Script/Test.cs b/Assets/Script/Test.cs index f1b9f20..864ca5e 100644 --- a/Assets/Script/Test.cs +++ b/Assets/Script/Test.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using AnyThinkAds.Api; using GoogleMobileAds.Api; using UnityEngine; using WZ; @@ -34,23 +35,46 @@ public class Test : MonoBehaviour // TemplateId = NativeTemplateId.Medium // }, medium); - var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle + AdsSDKManager.Instance.ShowRewardAd("getcoin",(state,revenue)=> { - TemplateId = NativeTemplateId.Small - }, small); - Debug.Log($"luojian admob native ad 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("ca-app-pub-3940256099942544/2247696110")) - { - // var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle - // { - // TemplateId = NativeTemplateId.Medium - // }, medium); - AdsSDKManager.Instance.ShowNativeAd("test", "ca-app-pub-3940256099942544/2247696110", nativeAdPosition); - } - else - { - Debug.LogWarning("luojian admob native ad start show fail,not ready."); - } + LoggerUtils.Debug("OnRewardedVideoAdShowed revenue:"+revenue+"+ state:"+state); + }); + // var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle + // { + // TemplateId = NativeTemplateId.Small + // }, small); + // Debug.Log($"luojian admob native ad 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("ca-app-pub-3940256099942544/2247696110")) + // { + // // var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle + // // { + // // TemplateId = NativeTemplateId.Medium + // // }, medium); + // AdsSDKManager.Instance.ShowNativeAd("test", "ca-app-pub-3940256099942544/2247696110", nativeAdPosition); + // } + // else + // { + // Debug.LogWarning("luojian admob native ad start show fail,not ready."); + // } + } + + public void OnInterShow() + { + AdsSDKManager.Instance.ShowInterstitialAd("endgame",IvType.IV1, (revenue) => + { + LoggerUtils.Debug("oninter show call revenue:"+revenue); + + }); + } + + public void ToponDebug() + { + ATSDKAPI.showDebuggerUI(); + } + + public void MaxDebug() + { + MaxSdk.ShowMediationDebugger(); } public void Native1Show() diff --git a/Assets/Script/Utils/SingletonBase.cs b/Assets/Script/Utils/SingletonBase.cs index 21f970b..7c6aec3 100644 --- a/Assets/Script/Utils/SingletonBase.cs +++ b/Assets/Script/Utils/SingletonBase.cs @@ -55,10 +55,10 @@ namespace WZ private void Awake() { mTrans = transform; - Initialize(); + Initialized(); } - protected virtual void Initialize() + protected virtual void Initialized() { }