From e214f2c7876241712abd39dfdac4ec4ac5fd0fcd Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 12 三月 2019 14:55:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowJump/WindowJumpMgr.cs | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 79f1611..d3e8f1e 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -713,6 +713,16 @@
rankModel.jumpRankType = int.Parse(_tagWinSearchModel.SelectActive);
SetJumpLogic<RankPanel>(_tagWinSearchModel.TABID);
break;
+ case JumpUIType.AllianceBoss1:
+ AllianceBossEntranceWin.dailyQuestId = (int)DailyQuestType.AllianceBoss1;
+ dungeonModel.currentDungeon = new Dungeon(AllianceBossModel.DATAMAPID, 0);
+ SetJumpLogic<AllianceBossEntranceWin>();
+ break;
+ case JumpUIType.AllianceBoss2:
+ AllianceBossEntranceWin.dailyQuestId = (int)DailyQuestType.AllianceBoss2;
+ dungeonModel.currentDungeon = new Dungeon(AllianceBossModel.DATAMAPID, 1);
+ SetJumpLogic<AllianceBossEntranceWin>();
+ break;
default:
DebugEx.Log("鏈坊鍔犳璺宠浆鐣岄潰锛�" + jumpType);
IsJumpState = false;
@@ -1093,6 +1103,14 @@
var springFestivalModel = ModelCenter.Instance.GetModel<SpringFestivalModel>();
if (!springFestivalModel.IsJumpOpen())
{
+ return false;
+ }
+ break;
+ case JumpUIType.AllianceBoss1:
+ case JumpUIType.AllianceBoss2:
+ if (!PlayerDatas.Instance.fairyData.HasFairy)
+ {
+ SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");
return false;
}
break;
@@ -1659,6 +1677,8 @@
ToolCompose305 = 305, //璇涗粰闄勪激瀹濈煶鍚堟垚
LuckyTreasure306 = 306, //骞歌繍閴村疂
LoginReward307 = 307, //鐧诲綍濂栧姳
+ AllianceBoss1 = 308,//浠欑洘Boss1
+ AllianceBoss2 = 309,//浠欑洘Boss2
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0