少年修仙传客户端代码仓库
client_Zxw
2018-08-29 9550fdaf3e76818ab5dfd0f690d48af1e8389110
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
37 ■■■■■ 已修改文件
System/OpenServerActivity/OSGiftBehaviour.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/OSTimeLimitGiftModel.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/OSTimeLimitGiftWin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OSGiftBehaviour.cs
@@ -148,7 +148,7 @@
            switch ((StoreFunc)_storeConfig.ShopType)
            {
                case StoreFunc.OSTimeLimitGift:
                    if (TimeUtility.CreateDays > timeLimitGiftModel.openDays)
                    if (timeLimitGiftModel.currentDay > timeLimitGiftModel.openDays)
                    {
                        SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
                        return;
System/Vip/OSTimeLimitGiftModel.cs
@@ -31,7 +31,7 @@
        {
            get
            {
                return TimeUtility.CreateDays <= openDays && FuncOpen.Instance.IsFuncOpen(132);
                return currentDay <= openDays && FuncOpen.Instance.IsFuncOpen(132);
            }
        }
@@ -40,6 +40,14 @@
            get
            {
                return redpoint.state == RedPointState.Simple;
            }
        }
        public int currentDay
        {
            get
            {
                return TimeUtility.OpenDay + 1;
            }
        }
@@ -66,19 +74,22 @@
            redpoint = new Redpoint(MainRedDot.REDPOINT_OPENSERVER, MainRedDot.REDPOINT_OPENSERVER * 100 + 3);
            TimeUtility.OnServerOpenDayRefresh += UpdateRedpoint;
            TimeUtility.OnCreateRoleTimeRefresh += OnCreateRoleTimeRefresh;
            TimeUtility.OnServerOpenDayRefresh += OnServerOpenDayRefresh;
            storeModel.RefreshBuyShopLimitEvent += UpdateRedpoint;
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
            OpenServerActivityCenter.Instance.Register(3, this);
        }
        private void OnServerOpenDayRefresh()
        {
            OnCreateRoleTimeRefresh();
        }
        public override void UnInit()
        {
            TimeUtility.OnServerOpenDayRefresh -= UpdateRedpoint;
            TimeUtility.OnCreateRoleTimeRefresh -= OnCreateRoleTimeRefresh;
            TimeUtility.OnServerOpenDayRefresh -= OnServerOpenDayRefresh;
            storeModel.RefreshBuyShopLimitEvent -= UpdateRedpoint;
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
        }
        public void OnBeforePlayerDataInitialize()
@@ -93,9 +104,9 @@
        private void OnCreateRoleTimeRefresh()
        {
            if (TimeUtility.CreateDays <= openDays)
            if (currentDay <= openDays)
            {
                m_OverdueTime = TimeUtility.ServerNow.AddDays(openDays - TimeUtility.CreateDays + 1);
                m_OverdueTime = TimeUtility.ServerNow.AddDays(openDays - currentDay + 1);
                m_OverdueTime = new DateTime(m_OverdueTime.Year, m_OverdueTime.Month, m_OverdueTime.Day);
            }
            UpdateRedpoint();
@@ -130,13 +141,13 @@
        void UpdateRedpoint()
        {
            redpoint.state = RedPointState.None;
            if (TimeUtility.CreateDays > openDays || !FuncOpen.Instance.IsFuncOpen(132)
            if (currentDay > openDays || !FuncOpen.Instance.IsFuncOpen(132)
                || DayRemind.Instance.GetDayRemind(DayRemind.OSTIMEGIFT_REDPOINT))
            {
                return;
            }
            List<StoreConfig> _list;
            var day = Mathf.Max(1, TimeUtility.CreateDays);
            var day = Mathf.Max(1, currentDay);
            day = Mathf.Min(day, openDays);
            if (TryGetGifts(day, out _list))
            {
System/Vip/OSTimeLimitGiftWin.cs
@@ -97,7 +97,7 @@
            var t = model.overdueTime - TimeUtility.ServerNow;
            m_CoolDown.text = StringUtility.Contact(Language.Get("OSActivityCoolDown"),
                TimeUtility.SecondsToDHMSCHS((int)t.TotalSeconds));
            if (TimeUtility.CreateDays > model.openDays)
            if (model.currentDay > model.openDays)
            {
                IsOutOffTime = true;
                m_CoolDown.color = UIHelper.GetUIColor(TextColType.NavyYellow);
@@ -112,7 +112,7 @@
        private void DisplayItems()
        {
            List<StoreConfig> _list;
            var day = Mathf.Max(1, TimeUtility.CreateDays);
            var day = Mathf.Max(1, model.currentDay);
            day = Mathf.Min(day, model.openDays);
            if (model.TryGetGifts(day, out _list))
            {