From bb30b1c19ae574ecbd27b1465ead58f027105b8c Mon Sep 17 00:00:00 2001
From: zhouhaihai <zhhyf521@163.com>
Date: Thu, 28 Jan 2021 13:10:22 +0800
Subject: [PATCH] 宝藏怪

---
 src/models/Activity.lua | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/models/Activity.lua b/src/models/Activity.lua
index bc51c8d..b455e9b 100644
--- a/src/models/Activity.lua
+++ b/src/models/Activity.lua
@@ -834,25 +834,27 @@ activityFunc[Activity.ActivityType.Crisis] = {
 		for id, actSet in pairs(actCsv) do
 			if actSet.type == atype then
 				local status = actData.task[id] or 0
-				status = status + count
-				if status >= actSet.condition1 then
-					local reward
-					if actSet.loop == 1 then
-						local rcount = math.floor(status / actSet.condition1)
-						reward = actSet.reward:toNumMap()
-						for itemId, itemC in pairs(reward) do
-							reward[itemId] = itemC * rcount
+				if status ~= -1 then
+					status = status + count
+					if status >= actSet.condition1 then
+						local reward
+						if actSet.loop == 1 then
+							local rcount = math.floor(status / actSet.condition1)
+							reward = actSet.reward:toNumMap()
+							for itemId, itemC in pairs(reward) do
+								reward[itemId] = itemC * rcount
+							end
+							status = status % actSet.condition1
+						else
+							reward = actSet.reward
+							status = -1
 						end
-						status = status % actSet.condition1
-					else
-						reward = actSet.reward
-						status = -1
-					end
 
-					self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify})
+						self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify})
+					end
+					actData.task[id] = status
+					change = true
 				end
-				actData.task[id] = status
-				change = true
 			end
 		end
 		if change then
--
libgit2 0.21.2