From 557922193b06fac92c3912ee3ef0a4e48117dcd3 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 28 八月 2018 15:51:11 +0800
Subject: [PATCH] 成长基金移至精彩活动
---
System/Welfare/WelfareCenter.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/System/Welfare/WelfareCenter.cs b/System/Welfare/WelfareCenter.cs
index 38da6cc..b498364 100644
--- a/System/Welfare/WelfareCenter.cs
+++ b/System/Welfare/WelfareCenter.cs
@@ -13,8 +13,8 @@
InSevenDayModel sevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }
- FairyJadeInvestmentModel m_FairyJadeInvestmentModel;
- FairyJadeInvestmentModel fairyJadeInvestmentModel { get { return m_FairyJadeInvestmentModel ?? (m_FairyJadeInvestmentModel = ModelCenter.Instance.GetModel<FairyJadeInvestmentModel>()); } }
+ //FairyJadeInvestmentModel m_FairyJadeInvestmentModel;
+ //FairyJadeInvestmentModel fairyJadeInvestmentModel { get { return m_FairyJadeInvestmentModel ?? (m_FairyJadeInvestmentModel = ModelCenter.Instance.GetModel<FairyJadeInvestmentModel>()); } }
/// <summary>
/// 鐐瑰嚮涓荤晫闈㈢鍒╂寜閽墦寮�
/// </summary>
@@ -63,12 +63,12 @@
return;
}
- if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)
- {
- WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<WelfareWin>(false, 5);
- return;
- }
+ //if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)
+ //{
+ // WindowCenter.Instance.Close<MainInterfaceWin>();
+ // WindowCenter.Instance.Open<WelfareWin>(false, 5);
+ // return;
+ //}
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<WelfareWin>(false, functionOrder);
}
@@ -110,10 +110,10 @@
return 3;
}
- if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)
- {
- return 5;
- }
+ //if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)
+ //{
+ // return 5;
+ //}
return functionOrder;
}
}
--
Gitblit v1.8.0