From 21a1542f9d99466b2aedd0992a1032b37b4154a3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 20 八月 2018 20:21:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/Welfare/WelfareCenter.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/System/Welfare/WelfareCenter.cs b/System/Welfare/WelfareCenter.cs
index fc49aec..397c2a5 100644
--- a/System/Welfare/WelfareCenter.cs
+++ b/System/Welfare/WelfareCenter.cs
@@ -25,7 +25,7 @@
{
functionOrder = 1;
}
- else if (signInModel.redpoint.state == RedPointState.Simple)
+ else if (signInModel.redpoint.state == RedPointState.GetReward)
{
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<WelfareWin>(false, 0);
@@ -38,7 +38,7 @@
{
functionOrder = 2;
}
- else if (prayerModel.redpoint.state == RedPointState.Simple)
+ else if (prayerModel.redpoint.state == RedPointState.GetReward)
{
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<WelfareWin>(false, 1);
@@ -56,7 +56,7 @@
return;
}
- if (levelGiftModel.redpoint.state == RedPointState.Simple)
+ if (levelGiftModel.redpoint.state == RedPointState.GetReward)
{
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<WelfareWin>(false, 3);
@@ -80,7 +80,7 @@
{
functionOrder = 1;
}
- else if (signInModel.redpoint.state == RedPointState.Simple)
+ else if (signInModel.redpoint.state == RedPointState.GetReward)
{
return 0;
}
@@ -91,7 +91,7 @@
{
functionOrder = 2;
}
- else if (prayerModel.redpoint.state == RedPointState.Simple)
+ else if (prayerModel.redpoint.state == RedPointState.GetReward)
{
return 1;
}
@@ -105,7 +105,7 @@
return 2;
}
- if (levelGiftModel.redpoint.state == RedPointState.Simple)
+ if (levelGiftModel.redpoint.state == RedPointState.GetReward)
{
return 3;
}
--
Gitblit v1.8.0