From 045b294b18d7e77a4bc5ea223f7744fd58f3e467 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 23 八月 2018 18:23:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/HappyXB/BestXBWin.cs | 80 +++++-----------------------------------
1 files changed, 10 insertions(+), 70 deletions(-)
diff --git a/System/HappyXB/BestXBWin.cs b/System/HappyXB/BestXBWin.cs
index 567c351..bbc484b 100644
--- a/System/HappyXB/BestXBWin.cs
+++ b/System/HappyXB/BestXBWin.cs
@@ -94,7 +94,7 @@
}
protected override void OnPreOpen()
{
- XBModel.RefreshAgainXBAct += RefreshAgainXB;
+ XBModel.StartXBEvent += OnStartXB;
XBModel.RefreshBestXBTimeAct += RefreshFreeTime;
XBModel.RefreshXBTypeInfoAct += RefreshXBTypeInfo;
XBModel.RefreshXBResultAct += RefreshXBResult;
@@ -125,8 +125,8 @@
XBModel.RefreshBestXBTimeAct -= RefreshFreeTime;
XBModel.RefreshXBResultAct -= RefreshXBResult;
XBModel.RefreshXBTypeInfoAct -= RefreshXBTypeInfo;
- XBModel.RefreshAgainXBAct -= RefreshAgainXB;
playerPack.RefreshItemCountAct -= RefreshItemCount;
+ XBModel.StartXBEvent -= OnStartXB;
GlobalTimeEvent.Instance.secondEvent -= RefreshSecond;
}
protected override void OnAfterClose()
@@ -246,98 +246,38 @@
}
}
-
- private void RefreshAgainXB(HappXBTitle title, int xbType)
- {
- if (title != HappXBTitle.Best) return;
- if (xbType == 0) ClickXBBtn();
- else if (xbType == 1) ClickXBManyBtn();
- }
-
bool isXBMany = false;
private void ClickXBManyBtn()
{
- if (XBModel.CheckIsEmptyGrid(PackType.rptTreasure))
- {
- int toolCnt = 0;
- int needToolCnt = 0;
- if (XBModel.IsHaveManyXBTool(1,out toolCnt,out needToolCnt))
- {
- needToolCnt= needToolCnt - toolCnt;
- int needMoney = needToolCnt * xbOneMoney;
- if(needToolCnt > 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);
- }
- return;
- });
- }
- else
- {
- CheckXBManyLimit(xbManyMoney);
- }
-
- }
- else
- {
- CheckXBManyLimit(xbManyMoney);
- }
-
- }
+ XBModel.SendXBManyQuest(PackType.rptTreasure,1);
}
- private void CheckXBManyLimit(int needMoney)
+ private void OnStartXB(int oneOrMany)
{
- if (UIHelper.GetMoneyCnt(1) >= (ulong)needMoney)
+ if(oneOrMany == 0)
{
maskObj.SetActive(true);
- isXBMany = true;
- XBModel.SendXBQuest(1, 1, 2);
+ isXBMany = false;
}
else
{
- WindowCenter.Instance.Open<RechargeTipWin>();
+ maskObj.SetActive(true);
+ isXBMany = true;
}
+
}
private void ClickFreeXbBtn()
{
if (XBModel.CheckIsEmptyGrid(PackType.rptTreasure))
{
- maskObj.SetActive(true);
- isXBMany = false;
XBModel.SendXBQuest(1, 0, 1);
}
}
private void ClickXBBtn()
{
- if (XBModel.CheckIsEmptyGrid(PackType.rptTreasure))
- {
- if(XBModel.IsHaveOneXBTool(1))
- {
- XBModel.SendXBQuest(1, 0, 2);
- }
- else
- {
- if (UIHelper.GetMoneyCnt(1) >= (ulong)xbOneMoney)
- {
- maskObj.SetActive(true);
- isXBMany = false;
- XBModel.SendXBQuest(1, 0, 0);
- }
- else
- {
- WindowCenter.Instance.Open<RechargeTipWin>();
- }
- }
-
- }
+ XBModel.SendOneXBQuest(PackType.rptTreasure, 1);
}
private void RefreshXBTypeInfo()
--
Gitblit v1.8.0