From 62667e194448b52fcc3c3b710852d9b178ceb3e9 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 10 十二月 2018 21:23:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/InGamePushContainer.cs | 115 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 62 insertions(+), 53 deletions(-)
diff --git a/System/MainInterfacePanel/InGamePushContainer.cs b/System/MainInterfacePanel/InGamePushContainer.cs
index 6d46af1..649993c 100644
--- a/System/MainInterfacePanel/InGamePushContainer.cs
+++ b/System/MainInterfacePanel/InGamePushContainer.cs
@@ -104,7 +104,7 @@
{
int pushId = exchageModel.currentShopId;
m_HelpPointExchangeNotify.gameObject.SetActive(pushId != 0);
- if(pushId != 0)
+ if (pushId != 0)
{
m_HelpPointExchangeNotify.SetDisplay();
}
@@ -231,64 +231,73 @@
private void CheckBossReborn()
{
+ var notifies = findPreciousModel.bossNotifies;
+ for (var i = notifies.Count - 1; i >= 0; i--)
+ {
+ if (BossFakeLineUtility.Instance.IsBossVisible(findPreciousModel.currentBossNotify.bossId))
+ {
+ findPreciousModel.ReportConfirmBossRebornNotify(findPreciousModel.currentBossNotify);
+ continue;
+ }
+
+ var findPreciousType = findPreciousModel.GetBossFindPreciousType(findPreciousModel.currentBossNotify.bossId);
+ var killable = false;
+ var show = true;
+ var mapId = PlayerDatas.Instance.baseData.MapID;
+ switch (findPreciousType)
+ {
+ case FindPreciousType.WorldBoss:
+ killable = worldBossModel.wearyValue < GeneralDefine.bossWearyValues[0] + worldBossModel.extraBossWearyValue;
+ show = !GeneralDefine.worldBossNoRebornRemindMaps.Contains(mapId);
+ break;
+ case FindPreciousType.BossHome:
+ killable = true;
+ show = !GeneralDefine.bossHomeNoRebornRemindMaps.Contains(mapId);
+ break;
+ case FindPreciousType.ElderGodArea:
+ var elderGodEnterTimes = dungeonModel.GetEnterTimes(ElderGodAreaModel.ELDERGODAREA_MAPID);
+ var elderGodTotalTimes = dungeonModel.GetTotalTimes(ElderGodAreaModel.ELDERGODAREA_MAPID);
+ killable = elderGodTotalTimes > elderGodEnterTimes;
+ 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);
+ break;
+ case FindPreciousType.DogzDungeon:
+ killable = dogzDungeonModel.wearyValue < GeneralDefine.bossWearyValues[2];
+ show = !GeneralDefine.dogzNoRebornRemindMaps.Contains(mapId);
+ break;
+ }
+
+ if (!killable)
+ {
+ findPreciousModel.ReportConfirmBossRebornNotify(findPreciousModel.currentBossNotify);
+ continue;
+ }
+
+ if (!show)
+ {
+ findPreciousModel.ReportConfirmBossRebornNotify(findPreciousModel.currentBossNotify);
+ continue;
+ }
+
+ if (findPreciousModel.currentBossNotify != default(FindPreciousModel.BossNotify))
+ {
+ break;
+ }
+ }
+
if (findPreciousModel.currentBossNotify == default(FindPreciousModel.BossNotify))
{
m_BossRebornPusher.gameObject.SetActive(false);
}
else
{
- if (!BossFakeLineUtility.Instance.IsBossVisible(findPreciousModel.currentBossNotify.bossId))
- {
- var findPreciousType = findPreciousModel.GetBossFindPreciousType(findPreciousModel.currentBossNotify.bossId);
-
- var killable = false;
- var show = true;
- var mapId = PlayerDatas.Instance.baseData.MapID;
- switch (findPreciousType)
- {
- case FindPreciousType.WorldBoss:
- killable = worldBossModel.wearyValue < GeneralDefine.bossWearyValues[0] + worldBossModel.extraBossWearyValue;
- show = !GeneralDefine.worldBossNoRebornRemindMaps.Contains(mapId);
- break;
- case FindPreciousType.BossHome:
- killable = true;
- show = !GeneralDefine.bossHomeNoRebornRemindMaps.Contains(mapId);
- break;
- case FindPreciousType.ElderGodArea:
- var elderGodEnterTimes = dungeonModel.GetEnterTimes(ElderGodAreaModel.ELDERGODAREA_MAPID);
- var elderGodTotalTimes = dungeonModel.GetTotalTimes(ElderGodAreaModel.ELDERGODAREA_MAPID);
- killable = elderGodTotalTimes > elderGodEnterTimes;
- 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);
- break;
- case FindPreciousType.DogzDungeon:
- killable = dogzDungeonModel.wearyValue < GeneralDefine.bossWearyValues[2];
- show = !GeneralDefine.dogzNoRebornRemindMaps.Contains(mapId);
- break;
- }
-
- if (killable)
- {
- if (show)
- {
- m_BossRebornPusher.DisplayRebornBoss();
- m_BossRebornPusher.gameObject.SetActive(true);
- }
- }
- else
- {
- findPreciousModel.ReportConfirmBossRebornNotify(findPreciousModel.currentBossNotify);
- }
- }
- else
- {
- findPreciousModel.ReportConfirmBossRebornNotify(findPreciousModel.currentBossNotify);
- }
+ m_BossRebornPusher.gameObject.SetActive(true);
+ m_BossRebornPusher.DisplayRebornBoss();
}
}
--
Gitblit v1.8.0