From e63f13e01e2e459881ac050a95fef26ac28c6614 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 30 八月 2018 21:42:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/PackSendQuestMgr.cs | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/System/KnapSack/Logic/PackSendQuestMgr.cs b/System/KnapSack/Logic/PackSendQuestMgr.cs
index 856013e..1d44ab8 100644
--- a/System/KnapSack/Logic/PackSendQuestMgr.cs
+++ b/System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -689,19 +689,6 @@
return;
}
- if (useItemModel.itemInfo.ItemID == fairyModel.changeFairyNameItem)
- {
- if(PlayerDatas.Instance.fairyData.HasFairy)
- {
- WindowCenter.Instance.Open<FamilyChangeNameWin>();
- }
- else
- {
- SysNotifyMgr.Instance.ShowTip("jiazu_andyshao_0");
- }
- return;
- }
-
if(playerPack.CheckIsDrugById(useItemModel.itemInfo.ItemID))
{
if(CheckItemUselimit(useItemModel.chinItemModel))
@@ -827,6 +814,27 @@
return;
}
+ if (itemModel.chinItemModel.Effect1 == 209
+ && !PlayerDatas.Instance.fairyData.HasFairy)
+ {
+ SysNotifyMgr.Instance.ShowTip("jiazu_andyshao_0");
+ return;
+ }
+
+ if (useItemModel.itemInfo.ItemID == fairyModel.changeFairyNameItem)
+ {
+ if (PlayerDatas.Instance.fairyData.HasFairy)
+ {
+ WindowCenter.Instance.Open<FamilyChangeNameWin>();
+ }
+ else
+ {
+ SysNotifyMgr.Instance.ShowTip("jiazu_andyshao_0");
+ }
+ return;
+ }
+
+
ulong maxValue = 0;
playerPack.IsReachUseLimit(itemModel.itemInfo.ItemGUID, out maxValue);
if (itemModel.chinItemModel.BatchUse != 0 && maxValue > 1)
@@ -908,13 +916,6 @@
if(fruitConfig != null && (sumHaveUseCnt >= fruitConfig.MaxUseCnt || useCnt > fruitConfig.MaxUseCnt))
{
SysNotifyMgr.Instance.ShowTip("UseCntLimit");
- return;
- }
-
- if(itemModel.chinItemModel.Effect1 == 209
- && !PlayerDatas.Instance.fairyData.HasFairy)
- {
- SysNotifyMgr.Instance.ShowTip("jiazu_andyshao_0");
return;
}
--
Gitblit v1.8.0