From 6376c1e99cbc503384df4e7fec816be9a181fdb8 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 24 一月 2019 11:24:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/PackSendQuestMgr.cs | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/System/KnapSack/Logic/PackSendQuestMgr.cs b/System/KnapSack/Logic/PackSendQuestMgr.cs
index 0f50df8..7a2e804 100644
--- a/System/KnapSack/Logic/PackSendQuestMgr.cs
+++ b/System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -166,20 +166,6 @@
}
}
- if(config.EquipPlace >= (int)RoleEquipType.JadeDynasty_Cloak
- && config.EquipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)
- {
- var jadeDynastyModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
- bool islock = jadeDynastyModel.IsLockEquipPlace(config.EquipPlace);
- isCanPut = !islock;
- if(islock)
- {
- int towerlayer = 0;
- jadeDynastyModel.TryGetLockTowerLayer(config.EquipPlace,out towerlayer);
- SysNotifyMgr.Instance.ShowTip("JadeDynastyEquip",towerlayer);
- }
- }
-
if(isCanPut)
{
CheckPutOnPlace();
@@ -570,6 +556,21 @@
return;
}
+ if (sendItemModel.chinItemModel.EquipPlace >= (int)RoleEquipType.JadeDynasty_Cloak
+ && sendItemModel.chinItemModel.EquipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)
+ {
+ var jadeDynastyModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
+ bool islock = jadeDynastyModel.IsLockEquipPlace(sendItemModel.chinItemModel.EquipPlace);
+ if (islock)
+ {
+ int towerlayer = 0;
+ jadeDynastyModel.TryGetLockTowerLayer(sendItemModel.chinItemModel.EquipPlace, out towerlayer);
+ SysNotifyMgr.Instance.ShowTip("JadeDynastyEquip", towerlayer);
+ return;
+ }
+ }
+
+
if (sendItemModel != null && sendItemModel.itemInfo.IsBind == 0)
{
ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("JadeDynastyEquip5"),(bool isOk)=>
--
Gitblit v1.8.0