Commit 119b51dba9125e6a00a216025fa473fa67187202
1 parent
40c88e08
新春签到 记录字段值的key改成string
Showing
2 changed files
with
6 additions
and
6 deletions
Show diff stats
src/actions/ActivityAction.lua
@@ -1304,21 +1304,21 @@ function _M.newSignRpc(agent, data) | @@ -1304,21 +1304,21 @@ function _M.newSignRpc(agent, data) | ||
1304 | if not open then return 1 end | 1304 | if not open then return 1 end |
1305 | 1305 | ||
1306 | local actData = role.activity:getActData("NewSign") | 1306 | local actData = role.activity:getActData("NewSign") |
1307 | - if actData[actData[0] or 0] then | 1307 | + if actData[actData["0"] or 0] then |
1308 | return 2 | 1308 | return 2 |
1309 | end | 1309 | end |
1310 | 1310 | ||
1311 | local actCfg = csvdb["activity_signInCsv"][actId] | 1311 | local actCfg = csvdb["activity_signInCsv"][actId] |
1312 | if not actCfg then return 4 end | 1312 | if not actCfg then return 4 end |
1313 | 1313 | ||
1314 | - local sumDay = actData[0] or 0 | 1314 | + local sumDay = actData["0"] or 0 |
1315 | local award = {} | 1315 | local award = {} |
1316 | for k, data in pairs(actCfg) do | 1316 | for k, data in pairs(actCfg) do |
1317 | - if not actData[data.day] and data.day <= sumDay then | 1317 | + if not actData[tostring(data.day)] and data.day <= sumDay then |
1318 | for id, value in pairs(data.reward:toNumMap()) do | 1318 | for id, value in pairs(data.reward:toNumMap()) do |
1319 | award[id] = (award[id] or 0) + value | 1319 | award[id] = (award[id] or 0) + value |
1320 | end | 1320 | end |
1321 | - actData[data.day] = 1 | 1321 | + actData[tostring(data.day)] = 1 |
1322 | end | 1322 | end |
1323 | end | 1323 | end |
1324 | 1324 |
src/models/Activity.lua
@@ -1096,9 +1096,9 @@ activityFunc[Activity.ActivityType.NewSign] = { | @@ -1096,9 +1096,9 @@ activityFunc[Activity.ActivityType.NewSign] = { | ||
1096 | -- end, | 1096 | -- end, |
1097 | ["crossDay"] = function(self, actType, notify) | 1097 | ["crossDay"] = function(self, actType, notify) |
1098 | local curData = self:getActData(actType) | 1098 | local curData = self:getActData(actType) |
1099 | - curData[0] = (curData[0] or 0) + 1 | 1099 | + curData["0"] = (curData["0"] or 0) + 1 |
1100 | local actData = csvdb["activity_signInCsv"][48] or {} | 1100 | local actData = csvdb["activity_signInCsv"][48] or {} |
1101 | - if curData[0] > #actData then return end -- 满了就忽略了 | 1101 | + if curData["0"] > #actData then return end -- 满了就忽略了 |
1102 | 1102 | ||
1103 | -- 没满更新一下 | 1103 | -- 没满更新一下 |
1104 | self:updateActData(actType, curData, not notify) | 1104 | self:updateActData(actType, curData, not notify) |