From 07df8803bd782c7e6fd47547d64a68fb6e6da77d Mon Sep 17 00:00:00 2001 From: "xiaohui.wang" Date: Tue, 5 Jul 2022 19:06:56 +0800 Subject: [PATCH] =?UTF-8?q?gp=E5=8F=82=E6=95=B0=20banner=20show=20click?= =?UTF-8?q?=E6=89=93=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BuildString.meta} | 2 +- .../BuildString/BuildStringKey_Android.json | 1 + .../BuildStringKey_Android.json.meta} | 5 +- .../Editor/Build/Editor_Android/export_apk.sh | 2 +- .../Editor/Build/Editor_iOS/export_ipa.sh | 2 +- .../Resources/JoyPacBuildParams.asset | 6 +- .../JoyPacSDK/Resources/JoyPacParams.asset | 44 +++--- .../Joypac/Scripts/Ad/JoypacAdManager.cs | 2 + .../JPSDK/AndroidJPSDK/JoyPacAdverManager.cs | 35 +++++ .../Scripts/JPSettings/StaticStringsKey.cs | 26 +-- .../Assets/Joypac/Scripts/JoypacFBManager.cs | 148 +++++++++--------- .../Assets/Joypac/Scripts/JoypacManager.cs | 2 +- .../Assets/MyGame/Scripts/FooterManager.cs | 3 + .../Plugins/Android/AndroidManifest.xml.meta | 2 +- .../Resources/GameAnalytics/Settings.asset | 123 +-------------- .../JoyPacJSON/StringKey_Android.json | 2 +- .../AndroidResolverDependencies.xml | 2 +- .../ProjectSettings/GraphicsSettings.asset | 1 + popcorn/ProjectSettings/ProjectSettings.asset | 8 +- 19 files changed, 171 insertions(+), 245 deletions(-) rename popcorn/Assets/{MyGame/Resources/Material/Main/recipe.meta => JoyPacSDK/BuildString.meta} (77%) create mode 100644 popcorn/Assets/JoyPacSDK/BuildString/BuildStringKey_Android.json rename popcorn/Assets/{MyGame/Resources/Material/cooking.meta => JoyPacSDK/BuildString/BuildStringKey_Android.json.meta} (57%) diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/recipe.meta b/popcorn/Assets/JoyPacSDK/BuildString.meta similarity index 77% rename from popcorn/Assets/MyGame/Resources/Material/Main/recipe.meta rename to popcorn/Assets/JoyPacSDK/BuildString.meta index 62b8329e..de9aba9d 100644 --- a/popcorn/Assets/MyGame/Resources/Material/Main/recipe.meta +++ b/popcorn/Assets/JoyPacSDK/BuildString.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 05d732d5ceb224e39b151954ccd7cb5a +guid: a22deadbb13074b139618f1481b24c21 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/popcorn/Assets/JoyPacSDK/BuildString/BuildStringKey_Android.json b/popcorn/Assets/JoyPacSDK/BuildString/BuildStringKey_Android.json new file mode 100644 index 00000000..12578782 --- /dev/null +++ b/popcorn/Assets/JoyPacSDK/BuildString/BuildStringKey_Android.json @@ -0,0 +1 @@ +"{\"productName\":\"Chicks & Popcorn\",\"bundleVersion\":\"1.0.0\",\"BundleID\":\"jp.usaya.popcornos\"}" \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Material/cooking.meta b/popcorn/Assets/JoyPacSDK/BuildString/BuildStringKey_Android.json.meta similarity index 57% rename from popcorn/Assets/MyGame/Resources/Material/cooking.meta rename to popcorn/Assets/JoyPacSDK/BuildString/BuildStringKey_Android.json.meta index 5f79481d..c03dc071 100644 --- a/popcorn/Assets/MyGame/Resources/Material/cooking.meta +++ b/popcorn/Assets/JoyPacSDK/BuildString/BuildStringKey_Android.json.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 0fc6e4b371760458ea45865e6f26cdd3 -folderAsset: yes -DefaultImporter: +guid: 4c6d571b028994f80a9f528d0f8e3d70 +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_Android/export_apk.sh b/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_Android/export_apk.sh index 0d33a8e9..ae2c78df 100644 --- a/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_Android/export_apk.sh +++ b/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_Android/export_apk.sh @@ -31,7 +31,7 @@ PROJ_PATH=${CurrentScriptPath//${CurrentScriptRelativePath}//""} PROJ_PATH=${PROJ_PATH%?} # unity app path -UNITY_PATH=/Applications/Unity2019.4.19f1/Unity.app/Contents/MacOS/Unity +UNITY_PATH=/Applications/Unity/Hub/Editor/2019.4.19f1/Unity.app/Contents/MacOS/Unity # 构建日志的输出路径 LOG_PATH=$PROJ_PATH/BuildProductDir/Android/Log/BuildApk.log diff --git a/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_iOS/export_ipa.sh b/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_iOS/export_ipa.sh index d18ff623..8ffa6deb 100644 --- a/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_iOS/export_ipa.sh +++ b/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_iOS/export_ipa.sh @@ -31,7 +31,7 @@ PROJ_PATH=${CurrentScriptPath//${CurrentScriptRelativePath}//""} PROJ_PATH=${PROJ_PATH%?} # unity app path -UNITY_PATH=/Applications/Unity2019.4.19f1/Unity.app/Contents/MacOS/Unity +UNITY_PATH=/Applications/Unity/Hub/Editor/2019.4.19f1/Unity.app/Contents/MacOS/Unity # 构建日志的输出路径 LOG_PATH=$PROJ_PATH/BuildProductDir/iOS/Log/BuildIpa.log diff --git a/popcorn/Assets/JoyPacSDK/Resources/JoyPacBuildParams.asset b/popcorn/Assets/JoyPacSDK/Resources/JoyPacBuildParams.asset index 63567d83..9f8d6c33 100644 --- a/popcorn/Assets/JoyPacSDK/Resources/JoyPacBuildParams.asset +++ b/popcorn/Assets/JoyPacSDK/Resources/JoyPacBuildParams.asset @@ -22,6 +22,6 @@ MonoBehaviour: iOSOS_BundleID: iOSOS_Automaticall_Sign: 0 iOSOS_DeveloperTeamID: - AndroidOS_productName: - AndroidOS_bundleVersion: - AndroidOS_BundleID: + AndroidOS_productName: Chicks & Popcorn + AndroidOS_bundleVersion: 1.0.0 + AndroidOS_BundleID: jp.usaya.popcornos diff --git a/popcorn/Assets/JoyPacSDK/Resources/JoyPacParams.asset b/popcorn/Assets/JoyPacSDK/Resources/JoyPacParams.asset index 2823ac47..77dc8a4b 100644 --- a/popcorn/Assets/JoyPacSDK/Resources/JoyPacParams.asset +++ b/popcorn/Assets/JoyPacSDK/Resources/JoyPacParams.asset @@ -61,33 +61,33 @@ MonoBehaviour: iOSOS_AppLovinSdkKey: MziT8gS2aacKcumsF6qUd7ZPa1xoZ07xzqT5Vx84WlP8dA-tGpMvwwIVyEIVEPRCEwIksQpMADVoNUfdH0WCxq PushEnabled: 0 AndroidOS_AdjustDeeplink: - AndroidOS_ADJUST_APP_TOKEN: - AndroidOS_GA_gameKey: - AndroidOS_GA_secretKey: + AndroidOS_ADJUST_APP_TOKEN: kag5h8weefwg + AndroidOS_GA_gameKey: 4bf66864631eaeadbd4218929ffeaafe + AndroidOS_GA_secretKey: 4de0a1edf6bf7021103d417ae307357326a7b50d AndroidOS_IsHaveAdjustEvent: 1 - AndroidOS_DEVICEINFO_IPAD_TOKEN: - AndroidOS_DEVICEINFO_IPHONE_TOKEN: - AndroidOS_INTERSITIAL_SHOW_COUNT_TOKEN: - AndroidOS_SECOND_LAUNCH_DAY_TOKEN: - AndroidOS_VIDEO_SHOW_COUNT_TOKEN: - AndroidOS_ADJUST_EVENT_RVIV24: - AndroidOS_ADJUST_EVENT_RV24: + AndroidOS_DEVICEINFO_IPAD_TOKEN: ynh832 + AndroidOS_DEVICEINFO_IPHONE_TOKEN: kun19e + AndroidOS_INTERSITIAL_SHOW_COUNT_TOKEN: oae8ya + AndroidOS_SECOND_LAUNCH_DAY_TOKEN: 1rsatl + AndroidOS_VIDEO_SHOW_COUNT_TOKEN: pc4b80 + AndroidOS_ADJUST_EVENT_RVIV24: x6cju4 + AndroidOS_ADJUST_EVENT_RV24: sz47zf AndroidCN_AdjustDeeplink: - AndroidCN_ADJUST_APP_TOKEN: 3qgtbs1fnc1s - AndroidCN_GA_gameKey: 31b85abe526af175daa0edf184f318a6 - AndroidCN_GA_secretKey: f67efdd40269ae738ac8f9890c6338e65a0b0378 + AndroidCN_ADJUST_APP_TOKEN: kag5h8weefwg + AndroidCN_GA_gameKey: 4bf66864631eaeadbd4218929ffeaafe + AndroidCN_GA_secretKey: 4de0a1edf6bf7021103d417ae307357326a7b50d AndroidCN_IsHaveAdjustEvent: 1 - AndroidCN_DEVICEINFO_IPAD_TOKEN: - AndroidCN_DEVICEINFO_IPHONE_TOKEN: - AndroidCN_INTERSITIAL_SHOW_COUNT_TOKEN: o56yld - AndroidCN_SECOND_LAUNCH_DAY_TOKEN: w0ado1 - AndroidCN_VIDEO_SHOW_COUNT_TOKEN: 7l45ib - AndroidCN_ADJUST_EVENT_RVIV24: 9mlkw2 - AndroidCN_ADJUST_EVENT_RV24: jwnqhw + AndroidCN_DEVICEINFO_IPAD_TOKEN: ynh832 + AndroidCN_DEVICEINFO_IPHONE_TOKEN: kun19e + AndroidCN_INTERSITIAL_SHOW_COUNT_TOKEN: oae8ya + AndroidCN_SECOND_LAUNCH_DAY_TOKEN: 1rsatl + AndroidCN_VIDEO_SHOW_COUNT_TOKEN: pc4b80 + AndroidCN_ADJUST_EVENT_RVIV24: x6cju4 + AndroidCN_ADJUST_EVENT_RV24: sz47zf AndroidOS_JoypacAppName: AndroidOS_JOYPAC_SDK_APPID: - AndroidCN_JoypacAppName: "\u5C0F\u9E21\u7206\u7C73\u82B1" - AndroidCN_JOYPAC_SDK_APPID: ec897ae7b4 + AndroidCN_JoypacAppName: ChicksPopcorn + AndroidCN_JOYPAC_SDK_APPID: 1f33ba5a06 AndroidOS_UMENG_APPKEY: AndroidOS_UMENG_CHANNELID: googleplay AndroidOS_Admob_GADApplicationIdentifier: diff --git a/popcorn/Assets/Joypac/Scripts/Ad/JoypacAdManager.cs b/popcorn/Assets/Joypac/Scripts/Ad/JoypacAdManager.cs index e040bd8b..c385197e 100644 --- a/popcorn/Assets/Joypac/Scripts/Ad/JoypacAdManager.cs +++ b/popcorn/Assets/Joypac/Scripts/Ad/JoypacAdManager.cs @@ -259,12 +259,14 @@ public IEnumerator SwitchPageTime() if(joypacAds.IsReadyBanner()) { LogTool.DebugLog("Joypac: Show banner"); + BannerShow = false; joypacAds.ShowBanner(); } else { LogTool.DebugLog("joypacAds.IsReadyBanner() = false "); } + #endif } diff --git a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs index e2dd456f..dabee586 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs @@ -146,6 +146,33 @@ public class JoyPacAdverManager : MonoBehaviour Debug.Log("unity JoyPacAdverManager setBannerListener_onAdOpened msg:" + json); if (onSetBannerListener_onAdOpened != null) onSetBannerListener_onAdOpened (json); + + + Debug.Log("banner show打点准备"); + if (!string.IsNullOrEmpty(json)) + { + Debug.Log("banner show打点，json回调不为空"); + //规避安卓两次回调 + if (!JoypacAdManager.BannerShow) + { + Debug.Log("banner show打点，当前次可用"); + JoypacAdManager.BannerShow = true; + + Dictionary jsonTemp = new Dictionary(); + jsonTemp = JsonMapper.ToObject>(json); + + string newsss = jsonTemp["price_int"].ToString(); + double newEcpm = double.Parse(newsss); + //Debug.Log("newEcpm：：：" + newEcpm); + + JoypacAnalyticsManager.DesignEvent_ECPM(newEcpm, jsonTemp["currency"].ToString(), ConstStringKey.Instance.BANNER_ECPM); + + + + JoypacAnalyticsManager.Instance.App_Banner_Show(jsonTemp); + } + } + Debug.Log("banner show打点结束"); } void setBannerListener_onAdLeftApplication (string json) @@ -167,6 +194,14 @@ public class JoyPacAdverManager : MonoBehaviour Debug.Log("unity JoyPacAdverManager setBannerListener_onClick msg:" + json); if (onSetBannerListener_onClick != null) onSetBannerListener_onClick (json); + + if (!string.IsNullOrEmpty(json)) + { + Dictionary jsonTemp = new Dictionary(); + jsonTemp = JsonMapper.ToObject>(json); + + JoypacAnalyticsManager.Instance.App_Banner_Click(jsonTemp); + } } void setBannerListener_onRequestAd (string json) diff --git a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsKey.cs b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsKey.cs index 1be62dc5..ccc6b9bf 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsKey.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsKey.cs @@ -225,29 +225,31 @@ public class ConstStringKey public const string ADJUST_FIRSTMAINPAGE = "eptkmn"; #endif #elif UNITY_ANDROID - public string DEVICEINFO_IPHONE_TOKEN = "pj2o55";//必填 - public string DEVICEINFO_IPAD_TOKEN = "a2txyw";//必填 + public string DEVICEINFO_IPHONE_TOKEN = "kun19e";//必填 + public string DEVICEINFO_IPAD_TOKEN = "ynh832";//必填 public string FIRST_RATE_TOKEN = "";//必填 - public string INTERSITIAL_SHOW_COUNT_TOKEN = "o56yld";//必填 - public string VIDEO_SHOW_COUNT_TOKEN = "7l45ib";//必填 - public string SECOND_LAUNCH_DAY_TOKEN = "w0ado1";//必填 + public string INTERSITIAL_SHOW_COUNT_TOKEN = "oae8ya";//必填 + public string VIDEO_SHOW_COUNT_TOKEN = "pc4b80";//必填 + public string SECOND_LAUNCH_DAY_TOKEN = "1rsatl";//必填 public string NATIVE_SHOW_TOKEN = "";//必填 public string VIDEO_AND_INTERITIAL_COUNT_TOKEN = "";//必填 public string PLAY_10_TOKEN = "";//必填 public string GAME_FINISH = "";//必填 - public string ADJUST_EVENT_RV24 = "9mlkw2";//必填 - public string ADJUST_EVENT_RVIV24 = "jwnqhw";//必填 + public string ADJUST_EVENT_RV24 = "sz47zf";//必填 + public string ADJUST_EVENT_RVIV24 = "x6cju4";//必填 - public string RV_ECPM = "jg4abn"; - public string IV_ECPM = "wnsqf0"; + public string RV_ECPM = "fsyy7k"; + public string IV_ECPM = "2c459x"; + public string BANNER_ECPM = "t9p0f7"; + public string EnterGame = ""; public const string ADJUST_LEVELCOUNT = ""; - public const string ADJUST_FIRSTAD = "5601ah"; - public const string ADJUST_FIRSTLEVEL = "6ymf40"; - public const string ADJUST_FIRSTMAINPAGE = "gybndv"; + public const string ADJUST_FIRSTAD = "jlctlw"; + public const string ADJUST_FIRSTLEVEL = "jo57ij"; + public const string ADJUST_FIRSTMAINPAGE = "tgfeea"; #endif } diff --git a/popcorn/Assets/Joypac/Scripts/JoypacFBManager.cs b/popcorn/Assets/Joypac/Scripts/JoypacFBManager.cs index ef09d72c..9f1cb552 100644 --- a/popcorn/Assets/Joypac/Scripts/JoypacFBManager.cs +++ b/popcorn/Assets/Joypac/Scripts/JoypacFBManager.cs @@ -1,81 +1,81 @@  -#if UNITY_ANDROID -#if ANDROID_GP +//#if UNITY_ANDROID +//#if ANDROID_GP -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using Facebook.Unity; -public class JoypacFBManager : MonoBehaviour -{ +//using System.Collections; +//using System.Collections.Generic; +//using UnityEngine; +//using Facebook.Unity; +//public class JoypacFBManager : MonoBehaviour +//{ - private static JoypacFBManager s_instance; - public static JoypacFBManager Instance - { - get - { - if (s_instance == null) - { - s_instance = GameObject.FindObjectOfType(); - if (s_instance == null) - { - GameObject Joypac = new GameObject(); - Joypac.name = "JoypacFBManager"; - s_instance = Joypac.AddComponent(); - DontDestroyOnLoad(Joypac); - } - else - { - Debug.LogWarning("A JoypacFBManager object already exists in this scene - you should never have more than one per scene!"); - } - } - return s_instance; - } - } - public void Init() - { - if (!FB.IsInitialized) - { - // Initialize the Facebook SDK - FB.Init(InitCallback, OnHideUnity); - } - else - { - // Already initialized, signal an app activation App Event - FB.ActivateApp(); - } +// private static JoypacFBManager s_instance; +// public static JoypacFBManager Instance +// { +// get +// { +// if (s_instance == null) +// { +// s_instance = GameObject.FindObjectOfType(); +// if (s_instance == null) +// { +// GameObject Joypac = new GameObject(); +// Joypac.name = "JoypacFBManager"; +// s_instance = Joypac.AddComponent(); +// DontDestroyOnLoad(Joypac); +// } +// else +// { +// Debug.LogWarning("A JoypacFBManager object already exists in this scene - you should never have more than one per scene!"); +// } +// } +// return s_instance; +// } +// } +// public void Init() +// { +// if (!FB.IsInitialized) +// { +// // Initialize the Facebook SDK +// FB.Init(InitCallback, OnHideUnity); +// } +// else +// { +// // Already initialized, signal an app activation App Event +// FB.ActivateApp(); +// } - } +// } - private void InitCallback() - { - if (FB.IsInitialized) - { - // Signal an app activation App Event - FB.ActivateApp(); - // Continue with Facebook SDK - // ... - } - else - { - Debug.Log("Failed to Initialize the Facebook SDK"); - } - } +// private void InitCallback() +// { +// if (FB.IsInitialized) +// { +// // Signal an app activation App Event +// FB.ActivateApp(); +// // Continue with Facebook SDK +// // ... +// } +// else +// { +// Debug.Log("Failed to Initialize the Facebook SDK"); +// } +// } - private void OnHideUnity(bool isGameShown) - { - if (!isGameShown) - { - // Pause the game - we will need to hide - Time.timeScale = 0; - } - else - { - // Resume the game - we're getting focus again - Time.timeScale = 1; - } - } -} -#endif -#endif \ No newline at end of file +// private void OnHideUnity(bool isGameShown) +// { +// if (!isGameShown) +// { +// // Pause the game - we will need to hide +// Time.timeScale = 0; +// } +// else +// { +// // Resume the game - we're getting focus again +// Time.timeScale = 1; +// } +// } +//} +//#endif +//#endif \ No newline at end of file diff --git a/popcorn/Assets/Joypac/Scripts/JoypacManager.cs b/popcorn/Assets/Joypac/Scripts/JoypacManager.cs index bc5dfb55..96ef4e94 100644 --- a/popcorn/Assets/Joypac/Scripts/JoypacManager.cs +++ b/popcorn/Assets/Joypac/Scripts/JoypacManager.cs @@ -56,7 +56,7 @@ public class JoypacManager : MonoBehaviour #if ANDROID_GP - JoypacFBManager.Instance.Init(); + // JoypacFBManager.Instance.Init(); #endif #if CROSS StartCoroutine(CrossEnumerator()); diff --git a/popcorn/Assets/MyGame/Scripts/FooterManager.cs b/popcorn/Assets/MyGame/Scripts/FooterManager.cs index 56aacd52..eee61807 100644 --- a/popcorn/Assets/MyGame/Scripts/FooterManager.cs +++ b/popcorn/Assets/MyGame/Scripts/FooterManager.cs @@ -113,6 +113,9 @@ public class FooterManager : MonoBehaviour } // StartCoroutine(CornFull()); + + JoypacAdManager.Instance.ShowBanner(); + } float falshCorn = 0; diff --git a/popcorn/Assets/Plugins/Android/AndroidManifest.xml.meta b/popcorn/Assets/Plugins/Android/AndroidManifest.xml.meta index 38afdc12..21a6b52b 100644 --- a/popcorn/Assets/Plugins/Android/AndroidManifest.xml.meta +++ b/popcorn/Assets/Plugins/Android/AndroidManifest.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9ff5ce456e2794ddc8d114ee10373921 +guid: bcf3cf8698cdd40799a95cfe10a971f3 TextScriptImporter: externalObjects: {} userData: diff --git a/popcorn/Assets/Resources/GameAnalytics/Settings.asset b/popcorn/Assets/Resources/GameAnalytics/Settings.asset index 96ef4ad1..96b5b524 100644 --- a/popcorn/Assets/Resources/GameAnalytics/Settings.asset +++ b/popcorn/Assets/Resources/GameAnalytics/Settings.asset @@ -35,127 +35,10 @@ MonoBehaviour: SelectedOrganization: SelectedStudio: SelectedGame: - NewVersion: 7.3.20 - Changes: '7.3.20 + NewVersion: 7.3.24 + Changes: '7.3.24 - - added event uuid to events sent - - - 7.3.19 - - - updated - dependencies - - - 7.3.18 - - - fixed fps event script to still run coroutines - when Time.timeScale = 0 by using WaitForSecondsRealtime instead of WaitForSeconds - - - 7.3.17 - - - - added method manually update gamekey and secretkey - - - 7.3.16 - - - fixed - uwp build errors - - - 7.3.15 - - - changed frequency logic for fps events - - - 7.3.14 - - - - small fix - - - 7.3.13 - - - fixed crash for android builds - - - 7.3.12 - - - - removed imei identifiers and other alternative identifiers from user identifier - logic (android) - - - 7.3.11 - - - updated dependency to external dependency - resolver - - - 7.3.10 - - - adding missing .meta file for upm release - - - - switched to using openupm for scoped registry when using upm, please update the - upm setup for the unity sdk - - - 7.3.9 - - - fixed upm package.json - - - 7.3.8 - - - - fixed upm dependecy - - - 7.3.7 - - - added depedencies.xml for upm release - - - 7.3.6 - - - - fixed playmaker bugs - - - 7.3.5 - - - changed settings to have FPS events turned - off by default - - - 7.3.4 - - - added error events to be sent for invalid custom - event fields used - - - added optional mergeFields argument to event methods - to merge with global custom fields instead of overwrite them - - - 7.3.3 - - - - playmaker fixes - - - 7.3.2 - - - fixed missing custom event fields for when - trying to fix missing session end events - - - 7.3.1 - - - fixed editor ui bug - with games with the same name' + - fixed fps script for when pausing game' SignUpOpen: 0 StudioName: GameName: diff --git a/popcorn/Assets/Resources/JoyPacJSON/StringKey_Android.json b/popcorn/Assets/Resources/JoyPacJSON/StringKey_Android.json index ac417fc4..9f34cf16 100644 --- a/popcorn/Assets/Resources/JoyPacJSON/StringKey_Android.json +++ b/popcorn/Assets/Resources/JoyPacJSON/StringKey_Android.json @@ -1 +1 @@ -"{\"AdjustDeeplink\":\"\",\"ADJUST_APP_TOKEN\":\"3qgtbs1fnc1s\",\"GA_gameKey\":\"31b85abe526af175daa0edf184f318a6\",\"GA_secretKey\":\"f67efdd40269ae738ac8f9890c6338e65a0b0378\",\"DEVICEINFO_IPAD_TOKEN\":\"\",\"DEVICEINFO_IPHONE_TOKEN\":\"\",\"INTERSITIAL_SHOW_COUNT_TOKEN\":\"o56yld\",\"SECOND_LAUNCH_DAY_TOKEN\":\"w0ado1\",\"VIDEO_SHOW_COUNT_TOKEN\":\"7l45ib\",\"ADJUST_EVENT_RVIV24\":\"9mlkw2\",\"ADJUST_EVENT_RV24\":\"jwnqhw\",\"JoypacAppName\":\"小鸡爆米花\",\"JOYPAC_SDK_APPID\":\"ec897ae7b4\"}" \ No newline at end of file +"{\"AdjustDeeplink\":\"\",\"ADJUST_APP_TOKEN\":\"kag5h8weefwg\",\"GA_gameKey\":\"4bf66864631eaeadbd4218929ffeaafe\",\"GA_secretKey\":\"4de0a1edf6bf7021103d417ae307357326a7b50d\",\"DEVICEINFO_IPAD_TOKEN\":\"ynh832\",\"DEVICEINFO_IPHONE_TOKEN\":\"kun19e\",\"INTERSITIAL_SHOW_COUNT_TOKEN\":\"oae8ya\",\"SECOND_LAUNCH_DAY_TOKEN\":\"1rsatl\",\"VIDEO_SHOW_COUNT_TOKEN\":\"pc4b80\",\"ADJUST_EVENT_RVIV24\":\"x6cju4\",\"ADJUST_EVENT_RV24\":\"sz47zf\",\"JoypacAppName\":\"ChicksPopcorn\",\"JOYPAC_SDK_APPID\":\"1f33ba5a06\"}" \ No newline at end of file diff --git a/popcorn/ProjectSettings/AndroidResolverDependencies.xml b/popcorn/ProjectSettings/AndroidResolverDependencies.xml index 5d83343d..de6a821b 100644 --- a/popcorn/ProjectSettings/AndroidResolverDependencies.xml +++ b/popcorn/ProjectSettings/AndroidResolverDependencies.xml @@ -39,7 +39,7 @@ - + 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 71b39edd..3313cd44 100644 --- a/popcorn/ProjectSettings/ProjectSettings.asset +++ b/popcorn/ProjectSettings/ProjectSettings.asset @@ -127,7 +127,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.1.11 + bundleVersion: 1.0.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -171,13 +171,13 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: jp.usaya.popcornch.cn + Android: jp.usaya.popcornos iPhone: jp.usaya.popcornos buildNumber: iPhone: 1 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 21 - AndroidTargetSdkVersion: 0 + AndroidTargetSdkVersion: 30 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 1 @@ -752,7 +752,7 @@ PlayerSettings: scriptingDefineSymbols: 1: TextMeshPro 4: TextMeshPro;Notifications;JOYPAC_Volcano_OS;IOS_OS - 7: ANDROID_CN;TextMeshPro;JOYPAC_ReYun;JOYPAC_Volcano + 7: TextMeshPro;JOYPAC_Volcano_OS;BANNER_ENABLE 13: TextMeshPro 14: TextMeshPro 19: TextMeshPro