Commit d2c8c7716eae84f8bb1fc41497ed03b9f7150cb4
Merge remote-tracking branch 'origin/cn/develop' into cn/develop
# Conflicts: # src/actions/HangAction.lua
Showing
2 changed files
with
2 additions
and
4 deletions
Show diff stats
src/actions/HangAction.lua
| ... | ... | @@ -127,9 +127,8 @@ local function checkReward(role, isTreasure, carbonId) |
| 127 | 127 | |
| 128 | 128 | --挂机得到的宝藏加入到挂机奖励 |
| 129 | 129 | if isTreasure or false == true then |
| 130 | - carbonId = carbonId or hangInfo.carbonId | |
| 131 | - local treasureList = role.dailyData:checkTreasureList(carbonId) or {} | |
| 132 | - if treasureList and next(treasureList) ~= nil then | |
| 130 | + local treasureList= role.dailyData:checkTreasureList(hangInfo.carbonId) or {} | |
| 131 | + if next(treasureList) ~= nil then | |
| 133 | 132 | for id, val in pairs(treasureList) do |
| 134 | 133 | local award = val.award:toNumMap() |
| 135 | 134 | for k,v in pairs(award) do | ... | ... |
src/models/RoleBattle.lua