From 522ca3468a56c88cb15eaa428eb7499d3dba386f Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 23 八月 2018 11:44:27 +0800
Subject: [PATCH] 2805【前端】超值礼包新增显示仙玉余额
---
System/SystemSetting/SetPrivateModel.cs | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/System/SystemSetting/SetPrivateModel.cs b/System/SystemSetting/SetPrivateModel.cs
index 7e0d36e..20111db 100644
--- a/System/SystemSetting/SetPrivateModel.cs
+++ b/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);
}
}
}
--
Gitblit v1.8.0