From 1d15ca7477ef5fa9b902a252330db9831501fc28 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 22 一月 2019 11:18:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into SpringFestival
---
System/MainInterfacePanel/InGamePushContainer.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/InGamePushContainer.cs b/System/MainInterfacePanel/InGamePushContainer.cs
index 2ea3482..508f3d4 100644
--- a/System/MainInterfacePanel/InGamePushContainer.cs
+++ b/System/MainInterfacePanel/InGamePushContainer.cs
@@ -35,6 +35,7 @@
DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }
DogzDungeonModel dogzDungeonModel { get { return ModelCenter.Instance.GetModel<DogzDungeonModel>(); } }
CrossServerBossModel crossServerBossModel { get { return ModelCenter.Instance.GetModel<CrossServerBossModel>(); } }
+ JadeDynastyBossModel jadeDynastyBossModel { get { return ModelCenter.Instance.GetModel<JadeDynastyBossModel>(); } }
VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
@@ -269,10 +270,12 @@
show = !GeneralDefine.elderGodNoRebornRemindMaps.Contains(mapId);
break;
case FindPreciousType.DemonJar:
- var totalTimes = dungeonModel.GetTotalTimes(DemonJarModel.DEMONJAR_MAPID);
- var enterTimes = dungeonModel.GetEnterTimes(DemonJarModel.DEMONJAR_MAPID);
- killable = totalTimes > enterTimes;
- show = !GeneralDefine.demonJarNoRebornRemindMaps.Contains(mapId);
+ {
+ var totalTimes = dungeonModel.GetTotalTimes(DemonJarModel.DEMONJAR_MAPID);
+ var enterTimes = dungeonModel.GetEnterTimes(DemonJarModel.DEMONJAR_MAPID);
+ killable = totalTimes > enterTimes;
+ show = !GeneralDefine.demonJarNoRebornRemindMaps.Contains(mapId);
+ }
break;
case FindPreciousType.DogzDungeon:
killable = dogzDungeonModel.wearyValue < GeneralDefine.bossWearyValues[2];
@@ -282,6 +285,14 @@
killable = crossServerBossModel.wearyValue < GeneralDefine.bossWearyValues[2];
show = !GeneralDefine.dogzNoRebornRemindMaps.Contains(mapId);
break;
+ case FindPreciousType.JadeDynastyBoss:
+ {
+ var totalTimes = dungeonModel.GetTotalTimes(JadeDynastyBossModel.JADEDYNASTY_MAP);
+ var enterTimes = dungeonModel.GetEnterTimes(JadeDynastyBossModel.JADEDYNASTY_MAP);
+ killable = totalTimes > enterTimes;
+ show = !GeneralDefine.demonJarNoRebornRemindMaps.Contains(mapId);
+ }
+ break;
}
if (!killable)
--
Gitblit v1.8.0