From 530686d773419c8f46ebba08037c21480749dc07 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 03 九月 2018 15:26:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowJump/WindowJumpMgr.cs | 98 +++++++++++++++++++++++++++++-------------------
1 files changed, 59 insertions(+), 39 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 16c41e0..a47004c 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -19,8 +19,10 @@
private Dictionary<int, List<string>> openWindows = new Dictionary<int, List<string>>();
private Dictionary<int, string> jumpWinNameDict = new Dictionary<int, string>();
PlayerPetDatas m_petModel;
- PlayerPetDatas petmodel {
- get {
+ PlayerPetDatas petmodel
+ {
+ get
+ {
return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>());
}
}
@@ -44,7 +46,7 @@
TrialDungeonModel trialDungeonModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }
ImpactRankModel rankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }
- public bool IsJumpState { get; private set;}
+ public bool IsJumpState { get; private set; }
private int jumpPhase = 0;
public void GetPreAllOpenWin()
@@ -84,12 +86,12 @@
public void WindowJumpTo(JumpUIType jumpType)
{
_tagWinSearchModel = Config.Instance.Get<WindowSearchConfig>((int)jumpType);
-
+
if (_tagWinSearchModel == null)
{
return;
}
-
+
if (!FuncOpen.Instance.IsFuncOpen(_tagWinSearchModel.Lv) && _tagWinSearchModel.Lv != 0)
{
FuncOpen.Instance.ProcessorFuncErrorTip(_tagWinSearchModel.Lv);
@@ -106,6 +108,7 @@
case JumpUIType.UnionTask2:
case JumpUIType.UnionActive1:
case JumpUIType.UnionActive2:
+ case JumpUIType.UnionBoss:
if (!PlayerDatas.Instance.fairyData.HasFairy)
{
SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");
@@ -120,7 +123,7 @@
}
break;
case JumpUIType.UnionStore:
- if(!fairyModel.fairyStoreOpen)
+ if (!fairyModel.fairyStoreOpen)
{
fairyModel.ProcessErrorTip();
return;
@@ -133,7 +136,7 @@
case JumpUIType.TreasureFindHostFunc2Type2:
case JumpUIType.TreasureFindHostFunc3Type2:
bool isUnlock = hostModel.IsUnlockTreasure(int.Parse(_tagWinSearchModel.SelectActive));
- if(!isUnlock)
+ if (!isUnlock)
{
hostModel.jumpTreasureId = 0;
return;
@@ -194,6 +197,13 @@
if (!trialDungeonModel.CompleteTrialFloor(0))
{
trialDungeonModel.ProcessOpenTrialExchangeError();
+ return;
+ }
+ break;
+ case JumpUIType.Kylin:
+ if (!FuncOpen.Instance.IsFuncOpen(85))
+ {
+ FuncOpen.Instance.ProcessorFuncErrorTip((int)FuncOpenEnum.Kylin);
return;
}
break;
@@ -260,7 +270,7 @@
#region 鏉′欢鍒ゆ
switch (jumpType)
{
- case JumpUIType.RoleFunc1:
+ case JumpUIType.RoleFunc1:
case JumpUIType.RoleFunc2:
case JumpUIType.RoleFunc3:
case JumpUIType.RoleFunc4:
@@ -290,7 +300,7 @@
case JumpUIType.ComposeFunc1:
case JumpUIType.ComposeFunc2:
case JumpUIType.ComposeFunc3:
- case JumpUIType.ComposeFunc4:
+ case JumpUIType.ComposeFunc4:
case JumpUIType.ComposeFunc5:
case JumpUIType.TicketCompose1:
case JumpUIType.TicketCompose2:
@@ -307,8 +317,8 @@
break;
case JumpUIType.UnionFunc1:
case JumpUIType.UnionFunc2:
- case JumpUIType.UnionFunc3:
- case JumpUIType.UnionFunc4:
+ case JumpUIType.UnionFunc3:
+ case JumpUIType.UnionFunc4:
case JumpUIType.UnionFunc5:
SetJumpLogic<UnionPanel>(_tagWinSearchModel.TABID);
break;
@@ -317,7 +327,7 @@
SetJumpLogic<PetWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.PetStone:
- if(PackSendQuestMgr.Instance.useItemModel != null)
+ if (PackSendQuestMgr.Instance.useItemModel != null)
{
petModel.PetStoneItemId = PackSendQuestMgr.Instance.useItemModel.itemId;
}
@@ -463,12 +473,12 @@
SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.LootPreciousFrameSpec:
- DemonJarWin.guideChallenge =true;
+ DemonJarWin.guideChallenge = true;
SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.MarketFunc1:
case JumpUIType.MarketFunc2:
- case JumpUIType.MarketFunc3:
+ case JumpUIType.MarketFunc3:
SetJumpLogic<MarketWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.BlastFurnaceFunc1:
@@ -547,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);
@@ -558,7 +571,7 @@
break;
case JumpUIType.UnionChat1:
case JumpUIType.UnionChat2:
- ChatCtrl.Inst.presentChatType =(ChatInfoType)(int.Parse(_tagWinSearchModel.SelectActive) - 1);
+ ChatCtrl.Inst.presentChatType = (ChatInfoType)(int.Parse(_tagWinSearchModel.SelectActive) - 1);
SetJumpLogic<ChatWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.MakeDrug:
@@ -578,7 +591,7 @@
break;
case JumpUIType.Alchemyrescripte104:
case JumpUIType.Alchemyrescripte105:
- ModelCenter.Instance.GetModel<BlastFurnaceModel>().jumpToPrescripe =int.Parse(_tagWinSearchModel.SelectActive);
+ ModelCenter.Instance.GetModel<BlastFurnaceModel>().jumpToPrescripe = int.Parse(_tagWinSearchModel.SelectActive);
SetJumpLogic<BlastFurnaceWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.AttackMagicianType1:
@@ -591,6 +604,9 @@
break;
case JumpUIType.TreasureCollectSoul:
SetJumpLogic<TreasureLevelUpWin>(0);
+ break;
+ case JumpUIType.Kylin:
+ SetJumpLogic<MultipleDifficultyDungeonWin>(0);
break;
case JumpUIType.VipRechargeFunc3:
case JumpUIType.OSTimeLimitGift:
@@ -633,7 +649,7 @@
case JumpUIType.ComposeTicketIce:
var composeModel = ModelCenter.Instance.GetModel<ComposeWinModel>();
int[] composeTypelist = ConfigParse.GetMultipleStr<int>(_tagWinSearchModel.SelectActive);
- composeModel.SetJumpToModel((ComposeFuncType)_tagWinSearchModel.TABID +1,composeTypelist[0], composeTypelist[1]);
+ composeModel.SetJumpToModel((ComposeFuncType)_tagWinSearchModel.TABID + 1, composeTypelist[0], composeTypelist[1]);
SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.TrialDungeonSelect:
@@ -704,7 +720,7 @@
SetJumpLogic<FirstRechargeWin>(_tagWinSearchModel.TABID, true);
break;
default:
- DebugEx.Log("鏈坊鍔犳璺宠浆鐣岄潰锛�"+ jumpType);
+ DebugEx.Log("鏈坊鍔犳璺宠浆鐣岄潰锛�" + jumpType);
IsJumpState = false;
openWindows.Clear();
jumpWinNameDict.Clear();
@@ -746,7 +762,7 @@
{
string curOpenWin = typeof(T).Name;
- jumpWinNameDict.Add(jumpPhase,curOpenWin);
+ jumpWinNameDict.Add(jumpPhase, curOpenWin);
switch (_tagWinSearchModel.Type)
{
case 1:
@@ -789,7 +805,7 @@
}
DebugEx.Log("鍏抽棴鐣岄潰绫诲瀷锛�" + _tagWinSearchModel.Type);
WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;
-
+
int i = 0;
List<string> openWinlist = null;
switch (_tagWinSearchModel.Type)
@@ -798,7 +814,7 @@
case 4:
openWinlist = openWindows[jumpPhase];
WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.SystemAndCustom);
- for (i = 0; i < openWinlist.Count; i++)
+ for (i = 0; i < openWinlist.Count; i++)
{
Window window = WindowCenter.Instance.Get(openWinlist[i]);
switch (window.name)
@@ -837,7 +853,7 @@
}
break;
}
-
+
}
jumpWinNameDict.Remove(jumpPhase);
jumpPhase -= 1;
@@ -853,20 +869,20 @@
for (i = 0; i < openWinlist.Count; i++)
{
Window window = WindowCenter.Instance.Get(openWinlist[i]);
- if(window != null && window.windowInfo.windowType == WindowType.Base)
+ if (window != null && window.windowInfo.windowType == WindowType.Base)
{
- if(!WindowCenter.Instance.CheckOpen(openWinlist[i]))
+ if (!WindowCenter.Instance.CheckOpen(openWinlist[i]))
{
WindowCenter.Instance.Get(openWinlist[i]).Open();
}
-
+
}
else
{
- switch(window.name)
+ switch (window.name)
{
case "RebornWin":
- if(SettingEffectMgr.Instance.isPlayerDie)
+ if (SettingEffectMgr.Instance.isPlayerDie)
{
if (!WindowCenter.Instance.CheckOpen(openWinlist[i]))
{
@@ -910,23 +926,25 @@
break;
}
- if(jumpPhase <= 0)
+ if (jumpPhase <= 0)
{
openWindows.Clear();
IsJumpState = false;
jumpWinNameDict.Clear();
- if(DeadModel.playerIsDie)
+ if (DeadModel.playerIsDie)
{
DeadModel.PlayerDie(PlayerDatas.Instance.baseData.PlayerID);
}
}
-
+
}
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>()
+ if (!WindowCenter.Instance.CheckOpen<RebornWin>()
&& !WindowCenter.Instance.CheckOpen<ReliveWin>()
&& !WindowCenter.Instance.CheckOpen<ElderGodAreaExitWin>()
&& !WindowCenter.Instance.CheckOpen<ElderGodAreaRebornWin>())
@@ -944,7 +962,7 @@
jumpPhase = 0;
openWindows.Clear();
IsJumpState = false;
- foreach(var key in jumpWinNameDict.Keys)
+ foreach (var key in jumpWinNameDict.Keys)
{
WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;
}
@@ -999,7 +1017,7 @@
Treasure = 35,
WorldChat = 38,
PrivateChat = 39,
- BountyInterface=40,//璧忛噾鐣岄潰
+ BountyInterface = 40,//璧忛噾鐣岄潰
DailyQuestFunc1 = 44,
DailyQuestFunc2 = 45,
DailyQuestFunc3 = 46,
@@ -1012,6 +1030,7 @@
MountStone = 65,
MountSkill = 66,
MountAppearance = 67,
+ UnionBoss = 68, //浠欑洘Boss鐣岄潰
IceCrystal = 69, //鍐版櫠鐭胯剦
FairyLand = 70, //浠欑晫绉樺
GridExtend = 71,
@@ -1047,10 +1066,10 @@
RebornOpenHourse = 115,//姝讳骸澶嶆椿鎵撳紑鍧愰獞
RebornOpenStrength = 116,//姝讳骸澶嶆椿鎵撳紑寮哄寲
RebornOpenPet = 117,//姝讳骸澶嶆椿鎵撳紑鐏靛疇
- RedPacket=118,//绾㈠寘
+ RedPacket = 118,//绾㈠寘
TreasureFunc1 = 119, //鍏ヤ笘娉曞疂
TreasureFunc2 = 120, //鏈簮娉曞疂
-
+
Type1TreasureFunc1 = 121, //鍏ヤ笘娉曞疂
Type1TreasureFunc2 = 122, //鏈簮娉曞疂
UnionWarehouse = 123, //浠欑洘瀹濆簱鐣岄潰
@@ -1071,7 +1090,7 @@
MakeDrug = 138, //涓硅嵂浣跨敤
XianBaguaIntr = 139, //浠欐棌娉曞疂鍏崷鐐変粙缁嶇晫闈�
UnionTask2 = 140, //浠欑洘浠诲姟鐣岄潰鍥炲埌涓荤晫闈�
- OpenServerActivityFunc2_1 =141, //娲诲姩鍙戠孩鍖咃紙绮惧僵娲诲姩锛�
+ OpenServerActivityFunc2_1 = 141, //娲诲姩鍙戠孩鍖咃紙绮惧僵娲诲姩锛�
OpenServerActivityFunc2_2 = 142, //娲诲姩鎶㈢孩鍖咃紙绮惧僵娲诲姩锛�
FirstRecharge = 143, // 棣栧厖鐣岄潰
KnapSackFunc1Type2 = 144, // 鑳屽寘鐣岄潰锛堣繑鍥烇級
@@ -1129,7 +1148,7 @@
FaBaoSoul_Suit = 196, //娉曞疂榄�-濂楄涔嬮瓊
FaBaoSoul_Wash = 197, //娉曞疂榄�-娲楃偧涔嬮瓊
ConsumreRebate = 198, //绂忓埄鈥旀秷璐硅繑鍒╃晫闈紙绮惧僵娲诲姩锛�
- OSTimeLimitGift=199, //寮�鏈嶆椿鍔ㄥ紑鏈嶇壒鎯狅紙绮惧僵娲诲姩锛�
+ OSTimeLimitGift = 199, //寮�鏈嶆椿鍔ㄥ紑鏈嶇壒鎯狅紙绮惧僵娲诲姩锛�
WelfareFunc2Type2 = 200, //绁堟効杩斿洖涓荤晫闈�
LimitedTimePackage = 201, //闄愭椂绀煎寘锛堢簿褰╂椿鍔級
BossReborn = 202, //Boss澶嶆椿锛堢簿褰╂椿鍔級
@@ -1143,7 +1162,7 @@
XBStoreType2 = 210, //瀵诲疂鍟嗗簵
XBWarehouseType2 = 211, //瀵诲疂浠撳簱
TrialExchange = 212, //瀹楅棬璇曠粌鏉愭枡鍏戞崲
- ComposeTicketFairy =213, //鍚堟垚-浠欑晫瀵嗗閫氳璇�
+ ComposeTicketFairy = 213, //鍚堟垚-浠欑晫瀵嗗閫氳璇�
ComposeTicketGod = 214, //鍚堟垚-鍙ょ閫氳璇�
ComposeTicketIce = 215, //鍚堟垚-鍐版櫠鐭胯剦閫氳璇�
TrialDungeonSelect = 216, //瀹楅棬璇曠粌鍓湰閫夋嫨鐣岄潰
@@ -1157,6 +1176,7 @@
OpenServerGift2 = 224, //瓒呭�肩ぜ鍖�2
OpenServerGift3 = 225, //瓒呭�肩ぜ鍖�3
TreasureCollectSoul = 226,//娉曞疂闆嗛瓊
+ Kylin = 227,//璺宠浆鍒伴簰楹熶箣搴滐紝 涓嶉厤缃�変腑浠讳綍灞�
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
GyzTs = 1003,//楝肩墮鍒冨姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0