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);