From 53e8e14f53ad83005d5b382b82e238392b3a07cc Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 14 八月 2018 11:10:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Welfare/WelfareCenter.cs | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/System/Welfare/WelfareCenter.cs b/System/Welfare/WelfareCenter.cs
index 5382e89..e25e448 100644
--- a/System/Welfare/WelfareCenter.cs
+++ b/System/Welfare/WelfareCenter.cs
@@ -13,8 +13,6 @@
InSevenDayModel sevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }
- BossRebornModel bossRebornModel { get { return ModelCenter.Instance.GetModel<BossRebornModel>(); } }
-
FairyJadeInvestmentModel m_FairyJadeInvestmentModel;
FairyJadeInvestmentModel fairyJadeInvestmentModel { get { return m_FairyJadeInvestmentModel ?? (m_FairyJadeInvestmentModel = ModelCenter.Instance.GetModel<FairyJadeInvestmentModel>()); } }
/// <summary>
@@ -65,12 +63,6 @@
return;
}
- if (bossRebornModel.IsOpen() && RedpointCenter.Instance.GetRedpointState(20108) == RedPointState.Simple)
- {
- WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<WelfareWin>(false, 7);
- return;
- }
if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)
{
WindowCenter.Instance.Close<MainInterfaceWin>();
@@ -118,10 +110,6 @@
return 3;
}
- if (bossRebornModel.IsOpen() && RedpointCenter.Instance.GetRedpointState(20108) == RedPointState.Simple)
- {
- return 7;
- }
if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)
{
return 8;
--
Gitblit v1.8.0