From c2b21b85c5bb1292398965a9d2de5c48934e5b70 Mon Sep 17 00:00:00 2001 From: "xiaohui.wang" Date: Thu, 7 Jul 2022 20:32:16 +0800 Subject: [PATCH] =?UTF-8?q?gp=E5=AE=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Joypac/Scripts/JPSettings/StaticStringsKey.cs | 8 ++++---- .../Assets/Joypac/Scripts/JoypacAnalyticsManager.cs | 11 +++++++++-- popcorn/Assets/MyGame/Resources/Material.meta | 8 -------- popcorn/ProjectSettings/GraphicsSettings.asset | 1 + popcorn/ProjectSettings/ProjectSettings.asset | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 popcorn/Assets/MyGame/Resources/Material.meta diff --git a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsKey.cs b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsKey.cs index 2aaa0548..6cd3917f 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsKey.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsKey.cs @@ -167,10 +167,10 @@ public class ConstStringKey public static long ADJUST_APP_INFO4 = 764359244;//必填不能是1 #else public static long ADJUST_APP_SECRET = 1;//必填 - public static long ADJUST_APP_INFO1 = 1;//必填不能是1 - public static long ADJUST_APP_INFO2 = 1;//必填不能是1 - public static long ADJUST_APP_INFO3 = 1;//必填不能是1 - public static long ADJUST_APP_INFO4 = 1;//必填不能是1 + public static long ADJUST_APP_INFO1 = 1896956387;//必填不能是1 + public static long ADJUST_APP_INFO2 = 1516811506;//必填不能是1 + public static long ADJUST_APP_INFO3 = 2107004855;//必填不能是1 + public static long ADJUST_APP_INFO4 = 531963954;//必填不能是1 #endif #endif diff --git a/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs b/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs index 6c57a415..b5efcdb3 100644 --- a/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs +++ b/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs @@ -330,8 +330,12 @@ public class JoypacAnalyticsManager : MonoBehaviour currAdSingleTemp.reyun_report_ad_show("Banner", "Banner", adSource["AdSourceId"].ToString(), adSource["From"].ToString(), adSource["price_int"].ToString(), adSource["price_string"].ToString(), adSource["currency"].ToString()); #elif ANDROID_GP Volcano(temp); - temp.eventname = "event_4"; ReYun(temp); +#endif + temp.eventname = "event_4"; + +#if JOYPAC_ReYun && UNITY_IOS && !UNITY_EDITOR + ReYun(temp); #endif } public void App_Banner_Click(Dictionary adSource) @@ -355,8 +359,11 @@ public class JoypacAnalyticsManager : MonoBehaviour currAdSingleTemp.reyun_report_ad_click("Banner", "Banner", adSource["AdSourceId"].ToString(), adSource["From"].ToString()); #elif ANDROID_GP Volcano(temp); - temp.eventname = "event_2"; ReYun(temp); +#endif + temp.eventname = "event_2"; +#if JOYPAC_ReYun && UNITY_IOS && !UNITY_EDITOR + ReYun(temp); #endif } diff --git a/popcorn/Assets/MyGame/Resources/Material.meta b/popcorn/Assets/MyGame/Resources/Material.meta deleted file mode 100644 index c6f1bd36..00000000 --- a/popcorn/Assets/MyGame/Resources/Material.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 241d4687577a5417d9ea766cb7b54e41 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: 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} diff --git a/popcorn/ProjectSettings/ProjectSettings.asset b/popcorn/ProjectSettings/ProjectSettings.asset index 77e74b72..5e2945a4 100644 --- a/popcorn/ProjectSettings/ProjectSettings.asset +++ b/popcorn/ProjectSettings/ProjectSettings.asset @@ -752,7 +752,7 @@ PlayerSettings: scriptingDefineSymbols: 1: TextMeshPro 4: TextMeshPro;Notifications;JOYPAC_Volcano_OS;IOS_OS;BANNER_ENABLE - 7: TextMeshPro;JOYPAC_Volcano_OS;BANNER_ENABLE + 7: TextMeshPro;JOYPAC_Volcano_OS;BANNER_ENABLE;ANDROID_GP 13: TextMeshPro 14: TextMeshPro 19: TextMeshPro