From 14dc25e0d9074d7ec5ed069914d29e2d24e26543 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 03 九月 2018 15:26:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowJump/WindowJumpMgr.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 990e118..a47004c 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -108,6 +108,7 @@
case JumpUIType.UnionTask2:
case JumpUIType.UnionActive1:
case JumpUIType.UnionActive2:
+ case JumpUIType.UnionBoss:
if (!PlayerDatas.Instance.fairyData.HasFairy)
{
SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");
@@ -556,6 +557,9 @@
case JumpUIType.UnionActive2:
SetJumpLogic<UnionTaskWin>(_tagWinSearchModel.TABID);
break;
+ case JumpUIType.UnionBoss:
+ SetJumpLogic<FairyBoss>(_tagWinSearchModel.TABID);
+ break;
case JumpUIType.RealmPractice1:
case JumpUIType.RealmPractice2:
SetJumpLogic<RealmWin>(_tagWinSearchModel.TABID);
@@ -936,7 +940,9 @@
}
private void SecondRefresh()
{
- if (DeadModel.playerIsDie && WindowCenter.Instance.CheckOpen<MainInterfaceWin>())
+ if (DeadModel.playerIsDie
+ && WindowCenter.Instance.CheckOpen<MainInterfaceWin>()
+ && dungeonModel.dungeonFightStage != DungeonFightStage.ExitPrepare)
{
if (!WindowCenter.Instance.CheckOpen<RebornWin>()
&& !WindowCenter.Instance.CheckOpen<ReliveWin>()
@@ -1024,6 +1030,7 @@
MountStone = 65,
MountSkill = 66,
MountAppearance = 67,
+ UnionBoss = 68, //浠欑洘Boss鐣岄潰
IceCrystal = 69, //鍐版櫠鐭胯剦
FairyLand = 70, //浠欑晫绉樺
GridExtend = 71,
--
Gitblit v1.8.0