From c9af2abe181f26f97dfad5bb90760ebd439175d5 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 29 九月 2018 21:45:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/PackSendQuestMgr.cs | 8 ++++++++
System/MainInterfacePanel/TaskListTip.cs | 6 +++---
System/Dogz/DogzModel.cs | 16 ++++++++++++++++
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/System/Dogz/DogzModel.cs b/System/Dogz/DogzModel.cs
index 15a745c..156c945 100644
--- a/System/Dogz/DogzModel.cs
+++ b/System/Dogz/DogzModel.cs
@@ -229,6 +229,22 @@
}
}
+ public void MakeUseAddAssistNum()
+ {
+ if (IsAddMaxAssist())
+ {
+ SysNotifyMgr.Instance.ShowTip("DogzNumLimit");
+ return;
+ }
+
+ var _itemConfig = Config.Instance.Get<ItemConfig>(AddAssistItem);
+ ConfirmCancel.ShowItemConfirm(Language.Get("DogzFunc102", _itemConfig.ItemName,GetAssistItemCnt()),
+ AddAssistItem, GetAssistItemCnt(), () =>
+ {
+ SendBuyAssistCnt();
+ });
+ }
+
public bool IsAddMaxAssist()
{
if (curSumAssistNum < DogzAssistMaxCnt)
diff --git a/System/KnapSack/Logic/PackSendQuestMgr.cs b/System/KnapSack/Logic/PackSendQuestMgr.cs
index be949c2..353732b 100644
--- a/System/KnapSack/Logic/PackSendQuestMgr.cs
+++ b/System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -93,6 +93,9 @@
get { return _suitModel ?? (_suitModel = ModelCenter.Instance.GetModel<PlayerSuitModel>()); }
}
+ DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
+
+
#region 鍙戦�佺┛鎴磋澶囩殑璇锋眰
ItemConfig sendItemConfig = null;
public ItemModel sendItemModel = null;
@@ -834,6 +837,11 @@
return;
}
+ if(dogzModel.AddAssistItem == itemModel.itemInfo.ItemID)
+ {
+ dogzModel.MakeUseAddAssistNum();
+ return;
+ }
ulong maxValue = 0;
playerPack.IsReachUseLimit(itemModel.itemInfo.ItemGUID, out maxValue);
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index f88ac68..12767f1 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -166,9 +166,9 @@
}
private void MainCardLevelChange(int _id)//涓荤嚎浠诲姟鍗＄骇鐘舵�佹敼鍙�
{
- TaskScheduling();
- ChangeSort();
- TaskJump(_id);
+ //TaskScheduling();
+ //ChangeSort();
+ //TaskJump(_id);
}
private void SetLength()
--
Gitblit v1.8.0