From 58c3e478799fe3d96fc289bcd6158a180d3a8d43 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 27 四月 2019 17:54:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Alchemy/AlchemyDrugWin.cs | 26 +++++++++++++++++++++++---
System/WindowJump/WindowJumpMgr.cs | 15 +++++++++++++++
System/Alchemy/AlchemyModel.cs | 2 ++
3 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/System/Alchemy/AlchemyDrugWin.cs b/System/Alchemy/AlchemyDrugWin.cs
index 41ce3d2..44a9ef5 100644
--- a/System/Alchemy/AlchemyDrugWin.cs
+++ b/System/Alchemy/AlchemyDrugWin.cs
@@ -38,6 +38,8 @@
SetDefaultSelect();
+ model.jumpAlchemy = 0;
+
m_AlchemyScroll.Display((int)m_AlchemyType);
DisplayAlchmey();
m_AlchemyDrug.Display();
@@ -81,10 +83,28 @@
}
var qualities = AlchemyConfig.GetAlchemyQualities((int)m_AlchemyType);
- model.selectQuality = qualities.First();
- var alchemys = AlchemyConfig.GetAlchemies((int)m_AlchemyType, model.selectQuality);
- model.selectAlchemy = alchemys[0];
+ if (model.jumpAlchemy != 0)
+ {
+ foreach (var quality in qualities)
+ {
+ var alchemys = AlchemyConfig.GetAlchemies((int)m_AlchemyType, quality);
+ if (alchemys.Contains(model.jumpAlchemy))
+ {
+ model.selectQuality = quality;
+ model.selectAlchemy = model.jumpAlchemy;
+ return;
+ }
+ }
+ }
+
+
+ {
+ model.selectQuality = qualities.First();
+
+ var alchemys = AlchemyConfig.GetAlchemies((int)m_AlchemyType, model.selectQuality);
+ model.selectAlchemy = alchemys[0];
+ }
}
private void SelectQualityRefresh()
diff --git a/System/Alchemy/AlchemyModel.cs b/System/Alchemy/AlchemyModel.cs
index 6873ca2..9cf4b0c 100644
--- a/System/Alchemy/AlchemyModel.cs
+++ b/System/Alchemy/AlchemyModel.cs
@@ -64,6 +64,8 @@
public int stoveExp { get; private set; }
public string alchemySuccRate { get; private set; }
+ public int jumpAlchemy { get; set; }
+
public bool isServerPrepare { get; private set; }
Clock m_AlchemingClock = null;
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index defa594..4f87e27 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -718,6 +718,16 @@
case JumpUIType.HazyRegion:
SetJumpLogic<CrossServerWin>(_tagWinSearchModel.TABID);
break;
+ case JumpUIType.Alchemy1:
+ case JumpUIType.Alchemy2:
+ case JumpUIType.Alchemy3:
+ case JumpUIType.Alchemy4:
+ case JumpUIType.Alchemy5:
+ var selectAlchemy = 0;
+ int.TryParse(_tagWinSearchModel.SelectActive, out selectAlchemy);
+ ModelCenter.Instance.GetModel<AlchemyModel>().jumpAlchemy = selectAlchemy;
+ SetJumpLogic<AlchemyBaseWin>(_tagWinSearchModel.TABID);
+ break;
default:
DebugEx.Log("鏈坊鍔犳璺宠浆鐣岄潰锛�" + jumpType);
IsJumpState = false;
@@ -1653,6 +1663,11 @@
AllianceBoss2 = 309,//浠欑洘Boss2
FairyAuction = 310,//浠欑洘鎷嶅崠琛�
TreasureSkill = 311,//鎶�鑳藉崌绾�
+ Alchemy1 = 312,//鐐间腹
+ Alchemy2 = 313,
+ Alchemy3 = 314,
+ Alchemy4 = 315,
+ Alchemy5 = 316,
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0