From 0701fabd203b46244fa781b63ba5a13d7a0ebfad Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 27 四月 2019 14:34:48 +0800
Subject: [PATCH] Merge branch 'master' into ViewOtherPlayer
---
System/Alchemy/AlchemyStudyBehaviour.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/System/Alchemy/AlchemyStudyBehaviour.cs b/System/Alchemy/AlchemyStudyBehaviour.cs
index 3d12c7e..afe9df3 100644
--- a/System/Alchemy/AlchemyStudyBehaviour.cs
+++ b/System/Alchemy/AlchemyStudyBehaviour.cs
@@ -88,12 +88,6 @@
{
error = 0;
var config = AlchemyConfig.Get(model.selectAlchemy);
- var count = packModel.GetItemCountByID(PackType.Item, config.LearnNeedItemID);
- if (count <= 0)
- {
- error = 1;
- return false;
- }
if (model.stoveLevel < config.LearnNeedAlchemLV)
{
error = 2;
@@ -104,6 +98,12 @@
error = 3;
return false;
}
+ var count = packModel.GetItemCountByID(PackType.Item, config.LearnNeedItemID);
+ if (count <= 0)
+ {
+ error = 1;
+ return false;
+ }
return true;
}
@@ -112,7 +112,9 @@
switch (error)
{
case 1:
- SysNotifyMgr.Instance.ShowTip("AlchemyLearnError_1");
+ var config = AlchemyConfig.Get(model.selectAlchemy);
+ ItemTipUtility.Show(config.LearnNeedItemID);
+ //SysNotifyMgr.Instance.ShowTip("AlchemyLearnError_1");
break;
case 2:
SysNotifyMgr.Instance.ShowTip("AlchemyLearnError_2");
--
Gitblit v1.8.0