From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/HappyXB/HappyXBModel.cs | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/System/HappyXB/HappyXBModel.cs b/System/HappyXB/HappyXBModel.cs
index c518dbb..1be026a 100644
--- a/System/HappyXB/HappyXBModel.cs
+++ b/System/HappyXB/HappyXBModel.cs
@@ -611,39 +611,47 @@
int needToolCnt = 0;
if (IsHaveManyXBTool(xbType, out toolCnt, out needToolCnt))
{
- needToolCnt = needToolCnt - toolCnt;
- int needMoney = needToolCnt * funcSet.xbPrices[0];
- if (needMoney > 0)
+ if(toolCnt >= needToolCnt)
{
- ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(funcSet.costToolIds[1]);
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("HappyXBCostTools", funcSet.costToolNums[1], itemConfig.ItemName, needMoney, needToolCnt), (bool isOk) =>
- {
- if (isOk)
- {
- CheckXBManyLimit(needMoney, xbType);
- }
- return;
- });
+ CheckXBManyLimit(0, xbType, 2);
}
else
{
- CheckXBManyLimit(0, xbType);
+ CheckXBManyLimit(funcSet.xbPrices[1], xbType,0);
}
+ //needToolCnt = needToolCnt - toolCnt;
+ //int needMoney = needToolCnt * funcSet.xbPrices[0];
+ //if (needMoney > 0)
+ //{
+ // ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(funcSet.costToolIds[1]);
+ // ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("HappyXBCostTools", funcSet.costToolNums[1], itemConfig.ItemName, needMoney, needToolCnt), (bool isOk) =>
+ // {
+ // if (isOk)
+ // {
+ // CheckXBManyLimit(needMoney, xbType,0);
+ // }
+ // return;
+ // });
+ //}
+ //else
+ //{
+ // CheckXBManyLimit(0, xbType,2);
+ //}
}
else
{
- CheckXBManyLimit(funcSet.xbPrices[1],xbType);
+ CheckXBManyLimit(funcSet.xbPrices[1],xbType,0);
}
}
}
- public void CheckXBManyLimit(int needMoney,int xbtype)
+ public void CheckXBManyLimit(int needMoney,int xbtype,int costType)
{
if (UIHelper.GetMoneyCnt(1) >= (ulong)needMoney)
{
- SendXBQuest(xbtype, 1, 2);
+ SendXBQuest(xbtype, 1, costType);
}
else
{
--
Gitblit v1.8.0