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/RuneXBWin.cs | 85 +++++++++---------------------------------
1 files changed, 18 insertions(+), 67 deletions(-)
diff --git a/System/HappyXB/RuneXBWin.cs b/System/HappyXB/RuneXBWin.cs
index 5dea506..caba398 100644
--- a/System/HappyXB/RuneXBWin.cs
+++ b/System/HappyXB/RuneXBWin.cs
@@ -102,6 +102,7 @@
protected override void OnPreOpen()
{
+ XBModel.StartXBEvent += OnStartXB;
playerPack.RefreshItemCountAct += RefreshItemCount;
XBModel.RefreshAgainXBAct += RefreshAgainXB;
XBModel.RefreshRuneXBTimeAct += RefreshFreeTime;
@@ -136,6 +137,7 @@
XBModel.RefreshXBTypeInfoAct -= RefreshXBTypeInfo;
playerPack.RefreshItemCountAct -= RefreshItemCount;
GlobalTimeEvent.Instance.secondEvent -= RefreshSecond;
+ XBModel.StartXBEvent -= OnStartXB;
}
protected override void OnAfterClose()
{
@@ -263,87 +265,36 @@
bool isXBMany = false;
private void ClickXBManyBtn()
{
- if (XBModel.CheckIsEmptyGrid(PackType.rptRunePack))
- {
- int toolCnt = 0;
- int needToolCnt = 0;
- if (XBModel.IsHaveManyXBTool(2, out toolCnt,out needToolCnt))
- {
- needToolCnt = funcSet.costToolNums[1] - 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);
- }
- }
- }
-
- private void CheckXBManyLimit(int needMoney)
- {
- if (UIHelper.GetMoneyCnt(1) >= (ulong)needMoney)
- {
- maskObj.SetActive(true);
- isXBMany = true;
- XBModel.SendXBQuest(2, 1, 2);
- }
- else
- {
- WindowCenter.Instance.Open<RechargeTipWin>();
- }
+ XBModel.SendXBManyQuest(PackType.rptRunePack, 2);
}
private void ClickXBBtn()
{
- if(XBModel.CheckIsEmptyGrid(PackType.rptRunePack))
- {
- if (XBModel.IsHaveOneXBTool(2))
- {
- XBModel.SendXBQuest(2, 0, 2);
- }
- else
- {
- if (UIHelper.GetMoneyCnt(1) >= (ulong)xbOneMoney)
- {
- maskObj.SetActive(true);
- isXBMany = false;
- XBModel.SendXBQuest(2, 0, 0);
- }
- else
- {
- WindowCenter.Instance.Open<RechargeTipWin>();
- }
- }
- }
+ XBModel.SendOneXBQuest(PackType.rptRunePack, 2);
}
private void ClickFreeXbBtn()
{
if (XBModel.CheckIsEmptyGrid(PackType.rptRunePack))
{
- maskObj.SetActive(true);
- isXBMany = false;
XBModel.SendXBQuest(2, 0, 1);
}
}
+ private void OnStartXB(int oneOrMany)
+ {
+ maskObj.SetActive(true);
+ if (oneOrMany == 0)
+ {
+ isXBMany = false;
+ }
+ else
+ {
+ isXBMany = true;
+ }
+
+ }
+
private void RefreshXBTypeInfo()
{
XBTypeInfo typeInfo = XBModel.GetXBInfoByType(2);
--
Gitblit v1.8.0