diff --git a/popcorn/Assets/Examples/Scripts/SettingPopViewButton.cs b/popcorn/Assets/Examples/Scripts/SettingPopViewButton.cs index 9d07aba3..9fec6e20 100644 --- a/popcorn/Assets/Examples/Scripts/SettingPopViewButton.cs +++ b/popcorn/Assets/Examples/Scripts/SettingPopViewButton.cs @@ -4,15 +4,15 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using Joypac; -#if UNITY_ANDROID -using JoyAdSigle = JoyPacCurrentcyAdSingle; -#endif -public class SettingPopViewButton : JPButton +//#if UNITY_ANDROID +//using JoyAdSigle = JoyPacCurrentcyAdSingle; +//#endif +public class SettingPopViewButton : MonoBehaviour { #if UNITY_ANDROID - private JoyAdSigle _currAdSigle; + private JoyPacCurrentcyAdSingle _currAdSigle = new JoyPacCurrentcyAdSingle(); #endif - public override void OnClick() + public void OnClick() { #if UNITY_IOS JoypacAdClient.Instance.ShowSettingPopView(); @@ -20,8 +20,14 @@ public class SettingPopViewButton : JPButton #if ANDROID_GP return; #endif + if (_currAdSigle != null) + { + + Debug.Log("点击隐私协议"); _currAdSigle.showAgreementPermissionPop(); + + } #endif } diff --git a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs index 3099c22c..4ef41093 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs @@ -264,6 +264,7 @@ public class JoyPacCurrentcyAdSingle public void showAgreementPermissionPop() { + Debug.Log("进入隐私协议"); _currentcyAdSinglePlugin.Call("showAgreementPermissionPop"); } diff --git a/popcorn/Assets/MyGame/Scenes/Settings/SettingPopViewButton.prefab b/popcorn/Assets/MyGame/Scenes/Settings/SettingPopViewButton.prefab new file mode 100644 index 00000000..c8e723cf --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Settings/SettingPopViewButton.prefab @@ -0,0 +1,240 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1682034354924739385 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1682034354924739366} + - component: {fileID: 1682034354924739364} + - component: {fileID: 1682034354924739367} + m_Layer: 5 + m_Name: Image_text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1682034354924739366 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682034354924739385} + 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_Children: [] + m_Father: {fileID: 1682034354971069932} + m_RootOrder: 0 + 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: 0, y: 4} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1682034354924739364 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682034354924739385} + m_CullTransparentMesh: 0 +--- !u!114 &1682034354924739367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682034354924739385} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u9690\u79C1\u534F\u8BAE" +--- !u!1 &1682034354971069935 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1682034354971069932} + - component: {fileID: 1682034354971069929} + - component: {fileID: 1682034354971069928} + - component: {fileID: 1682034354971069931} + - component: {fileID: 1682034354971069930} + - component: {fileID: 1682034354971069933} + m_Layer: 5 + m_Name: SettingPopViewButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1682034354971069932 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682034354971069935} + 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_Children: + - {fileID: 1682034354924739366} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -151, y: -14} + m_SizeDelta: {x: 250, y: 108} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1682034354971069929 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682034354971069935} + m_CullTransparentMesh: 0 +--- !u!114 &1682034354971069928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682034354971069935} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ee73db39cff93334a92789ac47e0e509, type: 3} + 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!114 &1682034354971069931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682034354971069935} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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: 1682034354971069928} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1682034354971069933} + m_MethodName: OnClick + 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 &1682034354971069930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682034354971069935} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 +--- !u!114 &1682034354971069933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682034354971069935} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37e4f36d79aae43168d20938963a0b80, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/popcorn/Assets/MyGame/Scenes/Settings/SettingPopViewButton.prefab.meta b/popcorn/Assets/MyGame/Scenes/Settings/SettingPopViewButton.prefab.meta new file mode 100644 index 00000000..ae5d2abc --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Settings/SettingPopViewButton.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f5256670b31e433bb92e5ad53a05298 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity index f359eef1..5ea4833f 100644 --- a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity +++ b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity @@ -298,6 +298,7 @@ RectTransform: m_Children: - {fileID: 1973484463} - {fileID: 1344990810} + - {fileID: 715728122} m_Father: {fileID: 827436435} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1229,6 +1230,12 @@ RectTransform: m_AnchoredPosition: {x: -155, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &715728122 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + m_PrefabInstance: {fileID: 1682034355685615894} + m_PrefabAsset: {fileID: 0} --- !u!114 &787553450 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2108,7 +2115,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1794914336} + mTarget: {fileID: 0} --- !u!1 &1283939611 GameObject: m_ObjectHideFlags: 0 @@ -2503,7 +2510,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -14} + m_AnchoredPosition: {x: 131, y: -14} m_SizeDelta: {x: 250, y: 108} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1344990811 @@ -3815,3 +3822,122 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1894598663} +--- !u!1001 &1682034355685615894 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 162960811} + m_Modifications: + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_SizeDelta.y + value: 108 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -151 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -14 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1682034354971069935, guid: 5f5256670b31e433bb92e5ad53a05298, + type: 3} + propertyPath: m_Name + value: SettingPopViewButton + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5f5256670b31e433bb92e5ad53a05298, type: 3} diff --git a/popcorn/ProjectSettings/GraphicsSettings.asset b/popcorn/ProjectSettings/GraphicsSettings.asset index 4654e133..71c9e0f5 100644 --- a/popcorn/ProjectSettings/GraphicsSettings.asset +++ b/popcorn/ProjectSettings/GraphicsSettings.asset @@ -34,6 +34,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}