From cb24198cd84cd7c829d7169430cd8a021e14e3cb Mon Sep 17 00:00:00 2001
From: 0x012FA733 <49284128+0x012FA733@users.noreply.github.com>
Date: Sun, 19 Apr 2020 21:21:54 +0800
Subject: [PATCH] [fix] StormRaffle

---
 src/plugin/StormRaffle.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugin/StormRaffle.php b/src/plugin/StormRaffle.php
index 5886523..57feffc 100644
--- a/src/plugin/StormRaffle.php
+++ b/src/plugin/StormRaffle.php
@@ -113,16 +113,12 @@ class StormRaffle extends BaseRaffle
                     Log::notice(self::formatInfo($raffle['raffle_id'], $num, '节奏风暴未实名或异常验证码'));
                     break;
                 }
-                if (isset($de_raw['data']) && empty($de_raw['data'])) {
-                    Log::notice(self::formatInfo($raffle['raffle_id'], $num, '节奏风暴在小黑屋'));
-                    break;
-                }
                 if ($de_raw['code'] == 0) {
                     Statistics::addSuccessList(self::ACTIVE_TITLE);
                     Log::notice(self::formatInfo($raffle['raffle_id'], $num, $de_raw['data']['mobile_content']));
                     break;
                 }
-                if ($de_raw['msg'] == '节奏风暴不存在' || $de_raw['msg'] == '节奏风暴抽奖过期') {
+                if ($de_raw['msg'] == '节奏风暴不存在' || $de_raw['msg'] == '节奏风暴抽奖过期' || $de_raw['msg'] == '没抢到') {
                     Log::notice(self::formatInfo($raffle['raffle_id'], $num, '节奏风暴已经结束'));
                     break;
                 }
@@ -130,6 +126,10 @@ class StormRaffle extends BaseRaffle
                     Log::notice(self::formatInfo($raffle['raffle_id'], $num, '节奏风暴已经领取'));
                     break;
                 }
+                if (isset($de_raw['data']) && empty($de_raw['data'])) {
+                    Log::notice(self::formatInfo($raffle['raffle_id'], $num, '节奏风暴在小黑屋'));
+                    break;
+                }
                 if ($de_raw['msg'] == '你错过了奖励，下次要更快一点哦~') {
                     continue;
                 }