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