From 7f1a6f7d2e0fadcafef2e240cd02bab7973dbfb4 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 24 一月 2019 15:55:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/PackSendQuestMgr.cs | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/System/KnapSack/Logic/PackSendQuestMgr.cs b/System/KnapSack/Logic/PackSendQuestMgr.cs
index 7a2e804..e610b07 100644
--- a/System/KnapSack/Logic/PackSendQuestMgr.cs
+++ b/System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -556,31 +556,33 @@
return;
}
- if (sendItemModel.chinItemModel.EquipPlace >= (int)RoleEquipType.JadeDynasty_Cloak
- && sendItemModel.chinItemModel.EquipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)
+ if(sendItemModel.packType == PackType.rptJadeDynastyItem)
{
- var jadeDynastyModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
- bool islock = jadeDynastyModel.IsLockEquipPlace(sendItemModel.chinItemModel.EquipPlace);
- if (islock)
+ if (sendItemModel.chinItemModel.EquipPlace >= (int)RoleEquipType.JadeDynasty_Cloak
+ && sendItemModel.chinItemModel.EquipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)
{
- int towerlayer = 0;
- jadeDynastyModel.TryGetLockTowerLayer(sendItemModel.chinItemModel.EquipPlace, out towerlayer);
- SysNotifyMgr.Instance.ShowTip("JadeDynastyEquip", towerlayer);
+ 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) =>
+ {
+ if (isOk)
+ {
+ SendPutOnQuest(equipPlace, itemIndex);
+ }
+ });
return;
}
- }
-
-
- if (sendItemModel != null && sendItemModel.itemInfo.IsBind == 0)
- {
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("JadeDynastyEquip5"),(bool isOk)=>
- {
- if(isOk)
- {
- SendPutOnQuest(equipPlace, itemIndex);
- }
- });
- return;
}
SendPutOnQuest(equipPlace, itemIndex);
--
Gitblit v1.8.0