From 19a5086536a5f9eafaa311664b82bc2efcef00b5 Mon Sep 17 00:00:00 2001 From: "xiaohui.wang" Date: Thu, 31 Mar 2022 13:41:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=92=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Joypac/Scripts/Ad/JoypacAdManager.cs | 18 ++++++++++++++++++ .../Scripts/JPSettings/StaticOnlineParams.cs | 6 ++++++ .../Scripts/JPSettings/StaticStringsEvent.cs | 4 ++++ .../ui_button_icon_stop_big_logo_zh.png | Bin 1832 -> 6134 bytes .../Scenes/Cooking/Scripts/CookingResult.cs | 17 +++++++++++++++++ .../Assets/MyGame/Scripts/FooterManager.cs | 10 ++++++++++ .../Resources/GameAnalytics/Settings.asset | 1 - 7 files changed, 55 insertions(+), 1 deletion(-) 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 4f12ee7c1436ad263b2792eb4dccf22cfc5feb9c..43eb131d64007e99bdeef3ce0834a1beda27b0b6 100644 GIT binary patch literal 6134 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 delta 1817 zcmV+!2j=+pFQ^WXB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o000Kc zNkl^azc}KiFXM8|MSm3{|wtmOnCL(_Xp`mhX4K3=VvM&>fri3EraZ<8Z8xCw?kxi*(JX(>_?%R;>s ziJ;gq#p^}*UVnI>QCbcPZG_-nrDd76r`fT@GfiLjNS>(0gqd|e_1tiQkx~ozP9+yB z^q3HLBJqoDIw&q+c=*UC=_`V-(GF$$oGFuDyelGYH<5H;jtQkI78OVbCh2oVJBoO> z4%+){mh9iRNBM>a2A(IwLj$_n2T~>#1Ub*fbXAl(jeq#O)0ZH8;nZ<*x^R?Czj4^} z%|Q6vgMs_s$(!G+*J`V?LjeGfC^WNAQe;PG9yv_rIq1?t0qSjbSmS#}AXz zxgUbI5v1h#bdYJaD6mx)FKEgH8CK}fP(OL_@LzKFyG!)*k<9uncM9=RjptaeH>|&p zy!N8<&3}h!XJ`+kQdgSO2(UkuH9x0+o6Yvac^*^K0%4vLD1DXYcN;?6Qn0#D_h`kI2lTh+Dtk zA!~m&B6(p5S&HyY{b)N4y~T)tX}rFAJJiN(+<(0%GxJelkXpeNm*3$_T&2Fma$<>R zX5P`X4G9{5{pRg0n$OLqi@8(+EQ!R?iUS#$&m;Il1=@Et`Z-1gpqfODKPL0UMQ4nY zEl$_qDCtD$+>hk)jhjk!vb!>tEwr0=2*$?W z{>J3qXEK|XMK#ESc8GNlXNbu+$gsYgGM@N$+AelzI}iKq4;Os51JC*P%*iLg0Uu2S z@k~M;ZR5zxFDR4e*D=fbj0Wle{Fu|lqkl?u;73T}3mN1j=yvqBYu0vzBqtrGaQpUH z9ioDyYAgg+H5i5KF~bpk9-GNG+PRaiKzRwrLh8eqdcjvn5t7EUrA@~=i+6y0`-{&HYicpD>!i3<{B+cU;J$c0ColHK2W5UOhtRGyyu^PGQ4}dDw z_W3Yw+!f_pAVERLG%pAchE<(i#Dp3xW5zpoq?Jni*tFxlPrkG|8=5AIeu+UHnBw)i z-X&VxUlcAln``xk$)uM_D=oX31b^a}o#yZ$TgB0F$&d*aRN0;No#>%ii8%MXZhcTVcC=eNhzmXEJ8H{{v81%eD1!-4eRw~HRlrO(If7cjLNq>oVA;0W% zYm$Yj+0Q(gdTU5vQ!{9>QFn>u45J}98^UecY!1)UA*6vmJu zrA$2WzH6sMg``4STfemnKo?12GV-LAdpDR8-+8dMWV2nzDe)ahejz2^AF2s&|I8Eb z+-b%`-(0+AEyBQb%gDmgED|oUXAMGv(nm`VHOt-1 z#PjV{NZfECu4y~%68UR$B$?2fdlx40kj}jQOAzHX;SmCW5+Fg+-dXd+<){;bQDbdS z#5{f}ZqsP*ESA~wl7G&zGNShw)18$Q8u4sAit~gg$IfEy>LabZHq(JN_JwgkLa0ZY zDjxmW)HGM+8dCAlz8o8lat50AP;>7>Kg*Vp4~NPv)(n!0jIVzfz! z^4M}{6?WSU2pYzZ_O43maBa-7dKrm!;6CYpSfGIa1Q-A)@)E3Iu)vof00000NkvXX Hu0mjfY3PMl 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: []