物资危机

zhouhaihai
1 parent a5660239
Showing 3 changed files with 4 additions and 2 deletions Show diff stats
src/actions/ActivityAction.lua
src/models/Activity.lua
src/models/RoleLog.lua
@@ -793,8 +793,8 @@ function _M.crisisMilestoneRpc(agent, data)
 	end
 	actData.score[id] = -1
 	role.activity:updateActData("Crisis", actData)
-	
-	local reward, change = role:award(curCsv.award, {log = {desc = "actMilecrisis", int1 = actid}})
+
+	local reward, change = role:award(curCsv.reward, {log = {desc = "actMilecrisis", int1 = actid}})
 	SendPacket(actionCodes.Activity_crisisMilestoneRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -90,6 +90,7 @@ function Activity:data()
 		act18 = self:getProperty("act18"),
 		act19 = self:getProperty("act19"),
 		act20 = self:getProperty("act20"),
+		act26 = self:getProperty("act26"),
 	}
 end
  
@@ -90,6 +90,7 @@ local ItemReason = {
 	actSign = 1007, -- 活动签到
 	actPaySign = 1008, -- 活动付费签到
 	calendaTask = 1009,	-- 英雄帖
+	actMilecrisis = 1010, -- 物资危机
  
 	-- 餐厅
 	greenHourse = 1101, -- 食材获得