From 81e5b8440c575e29caf0aea3fd2f332f35bc4e73 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期二, 14 八月 2018 17:27:37 +0800
Subject: [PATCH] [2155]丹药商店删除购买按钮
---
System/SystemSetting/ActivitiesPushMgr.cs | 41 +++++++++++++++-----
System/SystemSetting/SetPrivateModel.cs | 18 +++++---
System/BlastFurnace/DanDrugShopCell.cs | 5 --
Core/SDK/SDKUtility.cs | 2 +
4 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/Core/SDK/SDKUtility.cs b/Core/SDK/SDKUtility.cs
index b7fc1a5..39f7d9c 100644
--- a/Core/SDK/SDKUtility.cs
+++ b/Core/SDK/SDKUtility.cs
@@ -805,6 +805,7 @@
#region 鏋佸厜鎺ㄩ�佺浉鍏�
public void GeTui_SendLocalMessage(JsonData jsonData)
{
+ DebugEx.Log("GeTui_SendLocalMessage:" + jsonData["id"]);
// ------ 涓句緥 ------
// JsonData _params = new JsonData ();
// _params ["code"] = 2005;
@@ -829,6 +830,7 @@
public void GeTui_RemoveLocalMessage(string id)
{
+ DebugEx.Log("GeTui_RemoveLocalMessage:" + id);
#if !UNITY_EDITOR
m_Json.Clear();
m_Json["code"] = CodeU2A.JPushRemoveLocalMessage;
diff --git a/System/BlastFurnace/DanDrugShopCell.cs b/System/BlastFurnace/DanDrugShopCell.cs
index 12f6cdf..39b43e9 100644
--- a/System/BlastFurnace/DanDrugShopCell.cs
+++ b/System/BlastFurnace/DanDrugShopCell.cs
@@ -10,7 +10,6 @@
[SerializeField] Text nameText;
[SerializeField] Image moneyIcon;
[SerializeField] Text moneyCntText;
- [SerializeField] Button buyBtn;
[SerializeField] Button shopCellBtn;
[SerializeField] Image sellOutImg;
@@ -31,7 +30,6 @@
int addBuyCnt = 0;
bool isLimitBuy = BuyItemPopModel.Instance.CheckIsLimitBuyCnt(storeConfig, out canBuyCnt, out addBuyCnt);
sellOutImg.gameObject.SetActive(false);
- buyBtn.gameObject.SetActive(true);
if (canBuyCnt > 0)
{
itemCell.countText.gameObject.SetActive(true);
@@ -51,7 +49,6 @@
{
itemCell.countText.text = StringUtility.Contact(UIHelper.GetTextColorByItemColor(TextColType.Red, remainNum.ToString()),
"/" + canBuyCnt.ToString());
- buyBtn.gameObject.SetActive(false);
sellOutImg.gameObject.SetActive(true);
}
}
@@ -73,8 +70,6 @@
, "", null, ItemTipChildType.Buy);
tipsModel.SetItemTipsModel(attrData);
});
- buyBtn.RemoveAllListeners();
- buyBtn.AddListener(() => { ClickBuyBtn(storeConfig); });
}
private void ClickBuyBtn(StoreConfig storeConfig)
diff --git a/System/SystemSetting/ActivitiesPushMgr.cs b/System/SystemSetting/ActivitiesPushMgr.cs
index cc63db6..1dc3b54 100644
--- a/System/SystemSetting/ActivitiesPushMgr.cs
+++ b/System/SystemSetting/ActivitiesPushMgr.cs
@@ -63,6 +63,8 @@
{
SetRankStartPushInfo();
SetRankEndPushInfo();
+ RemovePushByActiveClose(PushInfoType.RankStart);
+ RemovePushByActiveClose(PushInfoType.RankEnd);
}
private void SetRankStartPushInfo()
@@ -115,6 +117,33 @@
}
}
+ private void RemovePushByActiveClose(PushInfoType type)
+ {
+ switch (type)
+ {
+ case PushInfoType.RankStart:
+ for (int i = 0; i < rankTypelist.Count; i++)
+ {
+ int rankStartId = WholePeopleRankStart + rankTypelist[i];
+ if (impactRank.IsActivityClose(rankTypelist[i]))
+ {
+ RemovePushInfo(rankStartId);
+ }
+ }
+ break;
+ case PushInfoType.RankEnd:
+ for (int i = 0; i < rankTypelist.Count; i++)
+ {
+ int rankEndId = WholePeopleRankEnd + rankTypelist[i];
+ if (impactRank.IsActivityClose(rankTypelist[i]))
+ {
+ RemovePushInfo(rankEndId);
+ }
+ }
+ break;
+ }
+ }
+
private void RemovePushByTime(PushInfoType type,int time)
{
int remainHour = time - TimeUtility.ServerNow.Hour;
@@ -126,11 +155,7 @@
for (int i = 0; i < rankTypelist.Count; i++)
{
int rankStartId = WholePeopleRankStart + rankTypelist[i];
- if (impactRank.IsActivityClose(rankTypelist[i]))
- {
- RemovePushInfo(rankStartId);
- }
- else
+ if (!impactRank.IsActivityClose(rankTypelist[i]))
{
int day = impactRank.GetOpenDay(rankTypelist[i]);
if (day <= 0 && remainSecond <= 120)
@@ -144,11 +169,7 @@
for (int i = 0; i < rankTypelist.Count; i++)
{
int rankEndId = WholePeopleRankEnd + rankTypelist[i];
- if (impactRank.IsActivityClose(rankTypelist[i]))
- {
- RemovePushInfo(rankEndId);
- }
- else
+ if (!impactRank.IsActivityClose(rankTypelist[i]))
{
int day = impactRank.GetSurplusDay(rankTypelist[i]);
if (day <= 1 && remainSecond <= 120)
diff --git a/System/SystemSetting/SetPrivateModel.cs b/System/SystemSetting/SetPrivateModel.cs
index 7e0d36e..590fea3 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,6 +163,14 @@
}
}
+ 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);
@@ -175,6 +182,7 @@
SDKUtility.Instance.GeTui_SendLocalMessage(pushNotifylist[j]);
}
}
+
public List<JsonData> GetPushJsonData(int dailyId)
{
@@ -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绉掑悗
@@ -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