2805【前端】超值礼包新增显示仙玉余额

client_linchunjie

2018-08-23 522ca3468a56c88cb15eaa428eb7499d3dba386f

 System/SystemSetting/SetPrivateModel.cs

@@ -98,7 +98,6 @@
            for (int i = 0; i < switchBtnLength; i++)

            {

                bool isOpen = MathUtility.GetBitValue(setting.OnoffBit, (ushort)i);

                DebugEx.Log("SetServerPushModel:" + i + "bool:" + isOpen);

                pushSetDict.Add(i, isOpen);

            }

            AnalysisFreeTime(setting.TimeStr);

@@ -164,9 +163,17 @@
            }

        }



        public void RemoveActivityPushByKey(int dailyId, string pushKey)

        {

            if(pushAtcivityKeyDict[dailyId].Contains(pushKey))

            {

                SDKUtility.Instance.GeTui_RemoveLocalMessage(pushKey);

            }

        }



        public void AddActivityPush(int dailyId)

        {

            var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(dailyId);

            var config = Config.Instance.Get<DailyQuestConfig>(dailyId);

            if (config == null || !FuncOpen.Instance.IsFuncOpen(config.UnLockFuncID)) return;



            List<JsonData> pushNotifylist = GetPushJsonData(dailyId);

@@ -176,9 +183,10 @@
            }

        }





        public List<JsonData> GetPushJsonData(int dailyId)

        {

            var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(dailyId);

            var config = Config.Instance.Get<DailyQuestConfig>(dailyId);

            string content = Language.Get("SetUpPrivate102", UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName).TrimEnd(), config.Title);

            List<JsonData> pushNotifylist = new List<JsonData>();

            List<string> pushKeylist = null;

@@ -194,7 +202,6 @@
                    _params["subtitle"] = "";// 副标题

                    _params["content"] = content;// 具体内容

                    _params["badge"] = -1;// 角标



                    // 以下为决定应该多久后弹出此通知

                    System.TimeSpan ts = System.DateTime.UtcNow - new System.DateTime(1970, 1, 1, 0, 0, 0, 0);

                    long ret = System.Convert.ToInt64(ts.TotalSeconds) + pushNotifyTimelist[i];// 表示3秒后

@@ -393,7 +400,7 @@
            {

                DailyQuestOpenTime dailyQuestOpenTime;

                dailyModel.TryGetOpenTime(quests[i], out dailyQuestOpenTime);

                var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(quests[i]);

                var config = Config.Instance.Get<DailyQuestConfig>(quests[i]);

                if(isFunclimit)

                {

                    if (dailyQuestOpenTime.IsValidServerOpenTime() && FuncOpen.Instance.IsFuncOpen(config.UnLockFuncID))

@@ -424,7 +431,7 @@


        public void GetDailyInfoById(int id, out string title, out string week, out string time)

        {

            var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(id);

            var config = Config.Instance.Get<DailyQuestConfig>(id);

            DailyQuestOpenTime dailyQuestOpenTime;

            dailyModel.TryGetOpenTime(id, out dailyQuestOpenTime);

            week = dailyQuestOpenTime.ToOpenTimeString();

@@ -508,13 +515,13 @@
                case DailyQuestType.FairyLeague:

                case DailyQuestType.FairyFeast:

                case DailyQuestType.FairyTask:

                    var _dailyConfig = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(_dailyQuestId);

                    var _dailyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);

                    return PlayerDatas.Instance.baseData.Family > 0 &&

                        (_dailyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyConfig.UnLockFuncID));

                case DailyQuestType.RuneTowerSweep:

                    return ModelCenter.Instance.GetModel<RuneTowerModel>().yesterdayPassFloor > 0;

                default:

                    var dailyConfig = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(_dailyQuestId);

                    var dailyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);

                    return dailyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(dailyConfig.UnLockFuncID);

            }

        }

@@ -538,11 +545,8 @@
                    float minuteOffset = (hourMinutes[i].hourBegin * 60 + hourMinutes[i].minuteBegin) - minutes;

                    if (minuteOffset <= 2 && minuteOffset > 0)

                    {

                        RemoveActivityPush(dailyId);

                    }

                    else if (minuteOffset < 0 && minuteOffset >= -2)

                    {

                        AddActivityPush(dailyId);

                        string key = StringUtility.Contact(dailyId, dayOfWeek, hourMinutes[i].hourBegin);

                        RemoveActivityPushByKey(dailyId,key);

                    }

                }

            }