From edb952b3a1f57c8099230a45b0b4bcae63085cc7 Mon Sep 17 00:00:00 2001
From: "xiaohui.wang" <xiaohui.wang@joypac.cn>
Date: Fri, 22 Apr 2022 11:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=8F=AA=E6=9C=89iOS?=
 =?UTF-8?q?=EF=BC=8C=E5=80=92=E8=AE=A1=E6=97=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 popcorn/Assets/Joypac/Scripts/JoypacManager.cs                 | 3 ++-
 .../Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/popcorn/Assets/Joypac/Scripts/JoypacManager.cs b/popcorn/Assets/Joypac/Scripts/JoypacManager.cs
index 2f7b9c55..377860ba 100644
--- a/popcorn/Assets/Joypac/Scripts/JoypacManager.cs
+++ b/popcorn/Assets/Joypac/Scripts/JoypacManager.cs
@@ -50,9 +50,10 @@ public class JoypacManager : MonoBehaviour
         JoypacAdManager.Instance.Init();//逻辑顺序别动
         JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Basic, StaticStringsEvent.PRE_START, StaticStringsEvent.PRE_START);
 
+#if UNITY_IOS
         LocalNotificationManager.Instance.Init();//推送
+#endif
 
-      
 
 #if ANDROID_GP
         JoypacFBManager.Instance.Init();
diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs
index d9c49792..a90dacff 100644
--- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs
+++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs
@@ -59,7 +59,7 @@ public class ShopHeaderTabView : MonoBehaviour
             m_videobutton.gameObject.SetActive(false);
             // timetextObject.SetActive(true);
 
-            timetextObject.text = string.Format("8折促销中 {0:D2}:{1:D2}", 60 - dateTime.Minute, 60 - dateTime.Second);
+            timetextObject.text = string.Format("8折促销中 {0:D2}:{1:D2}", 59 - dateTime.Minute, 59 - dateTime.Second);
             if (null != freshSale)
             {
                 freshSale(true);