From 052bb69a8b50948052165847ea44312b8d4f6607 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 九月 2018 16:13:14 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/WindowJump/WindowJumpMgr.cs | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 3a683f6..25ce56f 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -45,6 +45,7 @@
DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
TrialDungeonModel trialDungeonModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }
ImpactRankModel rankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }
+ ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } }
public bool IsJumpState { get; private set; }
private int jumpPhase = 0;
@@ -320,6 +321,22 @@
break;
case JumpUIType.OpenServerGift:
return;
+ case JumpUIType.EquipCompose1:
+ case JumpUIType.EquipCompose2:
+ case JumpUIType.EquipCompose3:
+ case JumpUIType.EquipCompose4:
+ case JumpUIType.ComposeTicketFairy:
+ case JumpUIType.ComposeTicketGod:
+ case JumpUIType.ComposeTicketIce:
+ int[] types = ConfigParse.GetMultipleStr<int>(_tagWinSearchModel.SelectActive);
+ if (types.Length > 0)
+ {
+ if (!composeModel.CheckIsComposeByType(_tagWinSearchModel.TABID+1,types[0],types[1]))
+ {
+ return;
+ }
+ }
+ break;
}
DebugEx.Log("WindowJumpTo" + jumpType);
@@ -353,7 +370,9 @@
case JumpUIType.StrengthFunc3:
case JumpUIType.StrengthFunc4:
case JumpUIType.StrengthFunc5:
+ case JumpUIType.EquipWashType2:
case JumpUIType.StrengthFunc1Type2:
+ case JumpUIType.EquipSuitType2:
SetJumpLogic<EquipReinforceWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.ComposeFunc1:
@@ -364,6 +383,17 @@
case JumpUIType.TicketCompose1:
case JumpUIType.TicketCompose2:
SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);
+ break;
+ case JumpUIType.EquipCompose1:
+ case JumpUIType.EquipCompose2:
+ case JumpUIType.EquipCompose3:
+ case JumpUIType.EquipCompose4:
+ int[] types = ConfigParse.GetMultipleStr<int>(_tagWinSearchModel.SelectActive);
+ if(types.Length > 0)
+ {
+ composeModel.SetJumpToModel((ComposeFuncType)_tagWinSearchModel.TABID + 1,types[0],types[1]);
+ SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);
+ }
break;
case JumpUIType.RuneFunc1:
case JumpUIType.RuneFunc2:
@@ -383,6 +413,7 @@
break;
case JumpUIType.PetFunc1:
case JumpUIType.PetFunc2:
+ case JumpUIType.MountType2:
case JumpUIType.FairyGrabBoss:
SetJumpLogic<PetWin>(_tagWinSearchModel.TABID);
break;
@@ -723,7 +754,6 @@
case JumpUIType.ComposeTicketFairy:
case JumpUIType.ComposeTicketGod:
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]);
SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);
@@ -1081,7 +1111,9 @@
StrengthFunc2 = 13,
StrengthFunc3 = 14,
StrengthFunc4 = 15,
+ EquipSuitType2 = 241, //濂楄鐣岄潰
StrengthFunc5 = 16,
+ EquipWashType2 = 239, //瑁呭娲楃粌鐣岄潰
ComposeFunc1 = 17,
ComposeFunc2 = 18,
ComposeFunc3 = 19,
@@ -1099,6 +1131,7 @@
UnionFunc5 = 31,
PetFunc1 = 32,
PetFunc2 = 33,
+ MountType2 = 240,//鍧愰獞鐣岄潰
PetStone = 34,
Treasure = 35,
WorldChat = 38,
@@ -1270,6 +1303,10 @@
Kylin5= 232,//楹掗簾涔嬪簻鐨�5灞�
Kylin6 = 233,//楹掗簾涔嬪簻鐨�6灞�
PrayforDrug = 234, //鐐间腹绁堢锛堝お涓婅�佸悰鐨勯璧狅級
+ EquipCompose1 = 235, //瑁呭鍚堟垚-榫欓瓊绾簩
+ EquipCompose2 = 236, //瑁呭鍚堟垚-榫欓瓊绾笁
+ EquipCompose3 = 237, //瑁呭鍚堟垚-鐏电懚绾簩
+ EquipCompose4 = 238, //瑁呭鍚堟垚-鐏电懚绾笁
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
GyzTs = 1003,//楝肩墮鍒冨姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0