From ffe5d28fa429b0b1dec9c9a23beb6b173a097bd3 Mon Sep 17 00:00:00 2001 From: "xiaohui.wang" Date: Thu, 14 Apr 2022 17:39:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=83=E9=94=80=E5=9C=A8=E7=BA=BF=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=8E=A7=E5=88=B6=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/JPSettings/StaticOnlineParams.cs | 15 ++++++++++++++- .../Scripts/JPSettings/StaticStringsEvent.cs | 6 +++--- .../ui_button_icon_stop_logo_small_zh.png | Bin 1929 -> 4804 bytes .../shopping/Scripts/ShopHeaderTabView.cs | 6 ++++-- popcorn/Assets/MyGame/Scripts/CoinManager.cs | 18 ++++++++++++++++-- .../Assets/MyGame/Scripts/GetRewardDialog.cs | 18 +++++++++++++++++- 6 files changed, 54 insertions(+), 9 deletions(-) diff --git a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticOnlineParams.cs b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticOnlineParams.cs index 83268ec9..4bbf3b5c 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticOnlineParams.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticOnlineParams.cs @@ -45,8 +45,21 @@ /// - /// LOG开关 + /// 切换页签 /// public static JoypacOnlineParam SwitchPage = new JoypacOnlineParam("SwitchPage", "300"); + /// + /// 促销时间1 + /// + public static JoypacOnlineParam SaleTime1 = new JoypacOnlineParam("SaleTime1", "12"); + /// + /// 促销时间2 + /// + public static JoypacOnlineParam SaleTime2 = new JoypacOnlineParam("SaleTime2", "18"); + /// + /// 促销视频时间 + /// + public static JoypacOnlineParam SaleVideoTime = new JoypacOnlineParam("SaleVideoTime", "120"); + } \ 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 c74a99b0..a79babdb 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs @@ -64,11 +64,11 @@ public const string CookSuccess = "CookSuccess"; public const string SwitchPage = "SwitchPage"; - public const string Butter = "Butter"; + public const string Butter = "Recipe1"; - public const string StrawBerry = "StrawBerry"; + public const string StrawBerry = "Recipe2"; - public const string Sale = "Sale"; + public const string Sale = "Discount"; //public const string SpendCoin = "SpendCoin"; //public const string Noadspage = "Noadspage"; diff --git a/popcorn/Assets/MyGame/Resources/Material/shopping/ui_button_icon_stop_logo_small_zh.png b/popcorn/Assets/MyGame/Resources/Material/shopping/ui_button_icon_stop_logo_small_zh.png index 058eadea5b5423c993683ad54232ee38bf70b025..f2db3c0a7cc29d54767f557b9d927ef6465208c6 100644 GIT binary patch literal 4804 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 delta 1914 zcmV-=2Zi{=C5aD^B!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o000Lo zNklX+64!g6n zO}}Ka%j}!?=Ka3k`@Y}zW~j5OVDEi;u2p;_#1WIH(!c$1dCsbmiSgocEPSTrczI2` zgly9(j&*Tl#4)F98U88mFEc!A7YsSxJ>~?Rfu-Zp39%A=k5mKX zx)7QBSCzr#2GG6;0NP#+4*8Z=Ss3<8Nd1gP2rlem6~MLR98!WXvo9LJL+XhGuhv_q zPP}6s>+XyMag2wt@L8(e*vErbPv_gknk59tsW9$qUw??6_t>T6X{)Wd$^O2$lJWf3 zbTDQ$9(>LD{(4OO?R-Dn-r@lQ*XMQ~TR$)S;p>AN+9l7tZ+{MKc3J0BGgjg0Gi^KE z7y544UvDjE9u!@b0_15CF48pvSjOIzY0|KVn>o+GXw`!Da zD1Sm~ts<<%(JpuCt4WHITBBHwr9uKZqaYZiTk^1hzApQ7IkV=r(Iq=FfUU-6-W~}~ z1)tflU@=PW^(X=MQ4g_oK!A)Ghe?BB02Y&@o5y)Rae#TL{j?3dPFbL@)XXj4T#WQTFUWQ2~k<~QuNxIZ%dc7NmYmp0=K1W3rejmQ9A@`I7LK0No0M+Y~_ zSje+8*SdU?q$tP;vp0s;`DZGwpQ z8YR*aX^4RM7RzS6(()Kf^NwJCRyaXThBmuLoh1w~Ig8O2i4DJjdDK_x`mYY~;(uD* zk_T|m(@3u98{ncJ7-Sm&ZqQePk84pXk5n4BkyrqXuIln=>W!RHNl+e+b!8nNyx`=2_&T9v7QcBe{;a#Tpkjz63~X&jYN7%k(P!K zl8zK$`MAeN1F!~_6Q3wR);bR9Wg6P6?7{Up!$uEO0?9(K5J2I23JbLR#$z#!q1#-t z!;2U%t1me6H3zux^tq=vz@#~VI-~N{l-YyCcU8V2)PTK^Y&pfbT&L?CR>aa#1H7&) zG$55+O?x7MOuM^UwnIsoz<)U_Y%dqd4~_-Mq;ZSH)<8v7C7bSL$uwD)r*(xxA>=Gv zN}Z@1@o*YekzM5};h{{6%LfaQ7aHTW(w2yq?&GNCtfqkZ(`9)GW_)T>?Lq@@>P*!F zV0Zg-GpA+dN@mTML@Tsm`SMDn36oeGR0No z16wU@Zn;`p)yZDD7PH4gV#auecD?0bRI!Q>Ab%yid&G1DjY`!-s=;{@+;7V(+C?*M zTRLEFxk(YR{;lRF&o-#aSpJj)F&X_{oA}J*6q5!w?5MTY1YnaniN+E0m;|2~CXXTm zTZn3*;FW%kZbe@_)_>w06pOq6Ac5rJf`6a5a>E`^-QH9yI57Vo@u`dJ!Om*Z5b??Jwm^>%1j@1_k~&Rdl) zt3eC*MV{nX9G=p#_$4vu{gbuO!K$6Cq-Njagy$j}Ye^h^m2*6{5Bmk|xC|BXA~!s3 zIj^1ueQPE!LB)}wcX$K5k31eM AW&i*H diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs index 0db9a793..9e9dd56d 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs @@ -43,7 +43,7 @@ public class ShopHeaderTabView : MonoBehaviour { if (null!= freshSale) { - GameDataManager.sale = GameDataManager.GetTimeStamp(dateTime) +10; + GameDataManager.sale = GameDataManager.GetTimeStamp(dateTime) + JoypacUtils.OnlineParametersIntByJoypacSDK(StaticOnlineParams.SaleVideoTime); freshSale(true); } @@ -54,7 +54,7 @@ public class ShopHeaderTabView : MonoBehaviour public IEnumerator SaleTime() { dateTime = DateTime.Now; - if (dateTime.Hour==12|| dateTime.Hour == 19) + if (dateTime.Hour== JoypacUtils.OnlineParametersIntByJoypacSDK(StaticOnlineParams.SaleTime1) || dateTime.Hour == JoypacUtils.OnlineParametersIntByJoypacSDK(StaticOnlineParams.SaleTime2)) { m_videobutton.gameObject.SetActive(false); // timetextObject.SetActive(true); @@ -81,6 +81,8 @@ public class ShopHeaderTabView : MonoBehaviour { long videotime = GameDataManager.sale - GameDataManager.GetTimeStamp(dateTime); timetextObject.text = string.Format("8折促销中 {0:D2}:{1:D2}", videotime/60, videotime%60); + + m_videobutton.gameObject.SetActive(false); } } diff --git a/popcorn/Assets/MyGame/Scripts/CoinManager.cs b/popcorn/Assets/MyGame/Scripts/CoinManager.cs index 3d93741b..2259e006 100644 --- a/popcorn/Assets/MyGame/Scripts/CoinManager.cs +++ b/popcorn/Assets/MyGame/Scripts/CoinManager.cs @@ -11,7 +11,7 @@ using UnityEngine.UI; public class CoinManager : SingletonMonoBehaviour { private static readonly int Add = Animator.StringToHash("Add"); - + private static readonly double refreshWaitTime = 300; // CoinView [SerializeField] private RectTransform coinIconTransform; [SerializeField] private TextWithCountUpInt coinCountText; @@ -43,13 +43,27 @@ public class CoinManager : SingletonMonoBehaviour var gameData = GameDataManager.GameData; coinvideoButton.OnClickAsObservable().Subscribe(_ => { + var remaining = (int)DateTime.FromBinary(gameData.kitchenRefreshTime).Subtract(DateTime.UtcNow).TotalSeconds; + if (remaining>0) + { + GetRewardDialog.ShowColdVideoDialog(() => + { + + + }); + return; + } GetRewardDialog.ShowCoinDialog(() => { CoinGetDialog.ShowDialog(refreshRewardCoin, () => { CoinManager.Instance.AddCoin(refreshRewardCoin); gameData.Coin = CoinManager.Instance.OwnCoin; - + gameData.kitchenRefreshTime = DateTime.UtcNow.AddSeconds(refreshWaitTime).ToBinary(); +#if UNITY_EDITOR + gameData.kitchenRefreshTime = DateTime.UtcNow.AddSeconds(10).ToBinary(); +#endif + GameDataManager.SaveGameData(); }); }); diff --git a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs index 04b1fd76..6eeca1ec 100644 --- a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs +++ b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs @@ -18,7 +18,8 @@ namespace MyGame.Scripts VipCustomer, Butter, StrawBerry, - Sale + Sale, + Cold } private static readonly string OkCallbackTag = "GetRewardDialogOkCallbackTag"; @@ -128,6 +129,16 @@ namespace MyGame.Scripts JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); SetButtonAction(closeButton, okButton, StaticStringsEvent.Sale);// AdManager.AD_PLACEMENT_VIP); break; + case RewardType.Cold: + okButton.gameObject.SetActive(false); + normalWindow.SetActive(true); + movieObject.SetActive(true); + closeButton.transform.localPosition =new Vector3(0, closeButton.transform.localPosition.y,0); + messageText.text = "金币奖励冷却中..."; + //position = StaticStringsEvent.Sale; + //JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); + SetButtonAction(closeButton, okButton, StaticStringsEvent.Sale);// AdManager.AD_PLACEMENT_VIP); + break; default: throw new ArgumentOutOfRangeException(); @@ -223,5 +234,10 @@ namespace MyGame.Scripts { ShowDialog(RewardType.Sale, okCallback, closeCallback); } + + public static void ShowColdVideoDialog(Action okCallback = null, Action closeCallback = null) + { + ShowDialog(RewardType.Cold, okCallback, closeCallback); + } } } \ No newline at end of file