diff --git a/popcorn/Assets/Joypac/Scripts/Ad/JoypacAdManager.cs b/popcorn/Assets/Joypac/Scripts/Ad/JoypacAdManager.cs index f2fb49f6..634fd1bb 100644 --- a/popcorn/Assets/Joypac/Scripts/Ad/JoypacAdManager.cs +++ b/popcorn/Assets/Joypac/Scripts/Ad/JoypacAdManager.cs @@ -108,10 +108,28 @@ public partial class JoypacAdManager : MonoBehaviour } } + bool switchPageInter = false; + public bool SwitchPageInter { get { return switchPageInter; } } + +public IEnumerator SwitchPageTime() + { + switchPageInter = false; + yield return new WaitForSeconds(JoypacUtils.OnlineParametersIntByJoypacSDK(StaticOnlineParams.SwitchPage)); + // Debug.LogError("==========="); + switchPageInter = true; + + + } + + public void startSwitchPageTime() + { + StartCoroutine(SwitchPageTime()); + } public void Init() { + startSwitchPageTime(); LogTool.DebugLog("!!!!init"); if (m_initialized) return; m_initialized = true; diff --git a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticOnlineParams.cs b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticOnlineParams.cs index 9926cfda..83268ec9 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticOnlineParams.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticOnlineParams.cs @@ -43,4 +43,10 @@ /// public static JoypacOnlineParam LOGSwitch = new JoypacOnlineParam("LOGSwitch", "off"); + + /// + /// LOG开关 + /// + public static JoypacOnlineParam SwitchPage = new JoypacOnlineParam("SwitchPage", "300"); + } \ No newline at end of file diff --git a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs index ca9915ac..2143c843 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs @@ -60,6 +60,10 @@ public const string Leaflets = "Leaflets"; public const string Coin = "Coin"; public const string VIP = "VIP"; + + public const string CookSuccess = "CookSuccess"; + + public const string SwitchPage = "SwitchPage"; //public const string SpendCoin = "SpendCoin"; //public const string Noadspage = "Noadspage"; diff --git a/popcorn/Assets/MyGame/Resources/Material/cooking/ui_button_icon_stop_big_logo_zh.png b/popcorn/Assets/MyGame/Resources/Material/cooking/ui_button_icon_stop_big_logo_zh.png index 4f12ee7c..43eb131d 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material/cooking/ui_button_icon_stop_big_logo_zh.png and b/popcorn/Assets/MyGame/Resources/Material/cooking/ui_button_icon_stop_big_logo_zh.png differ diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index de149801..8566415f 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -108,6 +108,7 @@ public class CookingResult : MonoBehaviour // ボタン表示 successAction?.Invoke(); okButton.gameObject.SetActive(true); + okButton.OnClickAsObservable().Take(1).Subscribe(_ => { // 獲得、遷移 @@ -162,6 +163,17 @@ public class CookingResult : MonoBehaviour GameDataManager.SaveGameData(); Market.Instance.IsPause.Value = false; TransitionManager.Instance.LoadScene(GameScenes.Main); + + JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Click, StaticStringsEvent.CookSuccess); + CryptoPrefs.SetInt("CookSuccess", CryptoPrefs.GetInt("CookSuccess", 0) + 1); + if (CryptoPrefs.GetInt("CookSuccess", 0)==2) + { + JoypacAdManager.Instance.ShowInterstitial(null, ConstStringKey.JOYPAC_SDK_INTERID, StaticStringsEvent.CookSuccess); + // Debug.LogError("jp======Interstitial"+ CryptoPrefs.GetInt("CookSuccess", 0)); + CryptoPrefs.SetInt("CookSuccess", 0); + } + + }).AddTo(this); // もう一度作る @@ -221,6 +233,11 @@ public class CookingResult : MonoBehaviour perfectButton.gameObject.SetActive(cornResult != CornResult.Perfect); destructionButton.gameObject.SetActive(cornResult == CornResult.Failure); okButton.gameObject.SetActive(cornResult != CornResult.Failure); + if (cornResult != CornResult.Failure) + { + JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, StaticStringsEvent.CookSuccess); + + } }); } diff --git a/popcorn/Assets/MyGame/Scripts/FooterManager.cs b/popcorn/Assets/MyGame/Scripts/FooterManager.cs index 82083bb7..6fea2ffc 100644 --- a/popcorn/Assets/MyGame/Scripts/FooterManager.cs +++ b/popcorn/Assets/MyGame/Scripts/FooterManager.cs @@ -38,5 +38,15 @@ public class FooterManager : MonoBehaviour }).AddTo(this); stockNotifyIcon.SetActive(Shopping.CheckEarnedRecipe()); + if (JoypacAdManager.Instance.SwitchPageInter) + { + JoypacAdManager.Instance.ShowInterstitial(null, ConstStringKey.JOYPAC_SDK_INTERID, StaticStringsEvent.SwitchPage); + Debug.Log("jp======Interstitial"); + + // StartCoroutine(JoypacAdManager.Instance.SwitchPageTime()); + + JoypacAdManager.Instance.startSwitchPageTime(); + } } + } \ No newline at end of file diff --git a/popcorn/Assets/Resources/GameAnalytics/Settings.asset b/popcorn/Assets/Resources/GameAnalytics/Settings.asset index 01ac34c3..96ef4ad1 100644 --- a/popcorn/Assets/Resources/GameAnalytics/Settings.asset +++ b/popcorn/Assets/Resources/GameAnalytics/Settings.asset @@ -168,7 +168,6 @@ MonoBehaviour: VerboseLogBuild: 0 UseManualSessionHandling: 0 SendExampleGameDataToMyGame: 0 - UseIMEI: 0 InternetConnectivity: 0 CustomDimensions01: [] CustomDimensions02: []