From fddfc335126c8e408f573449659ad5bd79811eed Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 09 十月 2018 17:05:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
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 b498364..88e3137 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>()); } }
+ WheelOfFortuneModel m_WheelOfFortuneModel;
+ WheelOfFortuneModel wheelOfFortuneModel { get { return m_WheelOfFortuneModel ?? (m_WheelOfFortuneModel = ModelCenter.Instance.GetModel<WheelOfFortuneModel>()); } }
/// <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 (wheelOfFortuneModel.redPointStre1.state == RedPointState.Simple)//缁戠帀杞洏
+ {
+ 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 (wheelOfFortuneModel.redPointStre1.state == RedPointState.Simple)
+ {
+ return 5;
+ }
return functionOrder;
}
}
--
Gitblit v1.8.0