Commit 1a5d40a63eca81f8d0efb8574a02d9127acdb41a
Merge branch 'develop' into tr/cb
Showing
4 changed files
with
4 additions
and
2 deletions
Show diff stats
src/actions/ActivityAction.lua
| @@ -195,6 +195,7 @@ function _M.actPaySignRpc(agent, data) | @@ -195,6 +195,7 @@ function _M.actPaySignRpc(agent, data) | ||
| 195 | local diffDay = diffFromTs(ts) + 1 | 195 | local diffDay = diffFromTs(ts) + 1 |
| 196 | 196 | ||
| 197 | local curData = role.activity:getActData("PaySignIn") | 197 | local curData = role.activity:getActData("PaySignIn") |
| 198 | + if not curData then return 3 end | ||
| 198 | local reward, change = {} | 199 | local reward, change = {} |
| 199 | for day, csvData in ipairs(csvdb["pay_signInCsv"]) do | 200 | for day, csvData in ipairs(csvdb["pay_signInCsv"]) do |
| 200 | if day <= diffDay and day == dayIndex then | 201 | if day <= diffDay and day == dayIndex then |
src/models/Role.lua
| @@ -112,6 +112,7 @@ Role.schema = { | @@ -112,6 +112,7 @@ Role.schema = { | ||
| 112 | hangBag = {"table", {}}, -- 背包 | 112 | hangBag = {"table", {}}, -- 背包 |
| 113 | hangBagLimit = {"number", globalCsv.idle_field_origin}, --背包上限 | 113 | hangBagLimit = {"number", globalCsv.idle_field_origin}, --背包上限 |
| 114 | bTeam = {"table", {}}, -- 奖励副本队伍 | 114 | bTeam = {"table", {}}, -- 奖励副本队伍 |
| 115 | + heroFormate = {"table", {}}, -- 自选编队 {adv={}, hang={}} | ||
| 115 | 116 | ||
| 116 | --引导相关 | 117 | --引导相关 |
| 117 | newerGuide = {"string","1=1"}, -- 新手引导 master=slave | 118 | newerGuide = {"string","1=1"}, -- 新手引导 master=slave |
src/utils/CommonFunc.lua
| @@ -167,7 +167,7 @@ function diffFromTs(ts) | @@ -167,7 +167,7 @@ function diffFromTs(ts) | ||
| 167 | 167 | ||
| 168 | local time = os.time({year = tm.year, month = tm.month, day = tm.day, hour = RESET_TIME}) | 168 | local time = os.time({year = tm.year, month = tm.month, day = tm.day, hour = RESET_TIME}) |
| 169 | if now < time then | 169 | if now < time then |
| 170 | - return -1 | 170 | + return 0 |
| 171 | end | 171 | end |
| 172 | 172 | ||
| 173 | return math.floor((now - time) / DAY_SEC) | 173 | return math.floor((now - time) / DAY_SEC) |