From 377cdcbbc6fcb5a4eeda3ea7a5a8e117cbc18ecb Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 16 一月 2019 20:50:09 +0800
Subject: [PATCH] 2895 【1.5】关注的跨服boss复活没有收到弹框提示
---
System/CrossServerBoss/CrossServerBossModel.cs | 10 +++++-----
Utility/EnumHelper.cs | 1 +
System/MainInterfacePanel/InGamePushContainer.cs | 7 +++++++
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/System/CrossServerBoss/CrossServerBossModel.cs b/System/CrossServerBoss/CrossServerBossModel.cs
index 5ec5910..b110d70 100644
--- a/System/CrossServerBoss/CrossServerBossModel.cs
+++ b/System/CrossServerBoss/CrossServerBossModel.cs
@@ -426,16 +426,16 @@
public void UpdateRedpoint()
{
- if (!FuncOpen.Instance.IsFuncOpen(162))
- {
- redpoint.count = 0;
- }
- else
+ if (FuncOpen.Instance.IsFuncOpen(162) && TimeUtility.OpenDay >= GeneralDefine.crossServerOneVsOneOpenDay)
{
var wearyValueLimit = GeneralDefine.bossWearyValues[2];
var count = (wearyValueLimit - wearyValue) + (GeneralDefine.dogzBoxLimit - bigBoxCollectCount);
redpoint.count = count;
}
+ else
+ {
+ redpoint.count = 0;
+ }
redpoint.state = redpoint.count > 0 ? RedPointState.Quantity : RedPointState.None;
CrossServerUtility.UpdateCrossServerRedpoint();
diff --git a/System/MainInterfacePanel/InGamePushContainer.cs b/System/MainInterfacePanel/InGamePushContainer.cs
index deaca6c..2ea3482 100644
--- a/System/MainInterfacePanel/InGamePushContainer.cs
+++ b/System/MainInterfacePanel/InGamePushContainer.cs
@@ -34,6 +34,8 @@
ElderGodAreaModel elderGodAreaModel { get { return ModelCenter.Instance.GetModel<ElderGodAreaModel>(); } }
DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }
DogzDungeonModel dogzDungeonModel { get { return ModelCenter.Instance.GetModel<DogzDungeonModel>(); } }
+ CrossServerBossModel crossServerBossModel { get { return ModelCenter.Instance.GetModel<CrossServerBossModel>(); } }
+
VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
FBHelpPointExchageModel exchageModel { get { return ModelCenter.Instance.GetModel<FBHelpPointExchageModel>(); } }
@@ -51,6 +53,7 @@
FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
InSevenDayModel inSevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }
+
public void Init()
{
CheckBetterEquip();
@@ -275,6 +278,10 @@
killable = dogzDungeonModel.wearyValue < GeneralDefine.bossWearyValues[2];
show = !GeneralDefine.dogzNoRebornRemindMaps.Contains(mapId);
break;
+ case FindPreciousType.CrossServerBoss:
+ killable = crossServerBossModel.wearyValue < GeneralDefine.bossWearyValues[2];
+ show = !GeneralDefine.dogzNoRebornRemindMaps.Contains(mapId);
+ break;
}
if (!killable)
diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index 3d2e0d6..c0af2e8 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -902,6 +902,7 @@
Dogz = 138, //绁炲吔
AddPoint = 145,//鍔犵偣
CrossServer = 157, //璺ㄦ湇澶╂璧�
+ CrossServerBoss=162,
}
//灞炴�х被鍨�
public enum AttrEnum
--
Gitblit v1.8.0