Commit 28dadd592dbc26d2c66110305cda7a374ad30195
Merge branch 'tr/bugfix' into tr/publish/preview
# Conflicts: # src/csvdata
Showing
2 changed files
with
16 additions
and
4 deletions
Show diff stats
src/actions/GmAction.lua
| @@ -293,14 +293,15 @@ function _M.get(role, pms) | @@ -293,14 +293,15 @@ function _M.get(role, pms) | ||
| 293 | end | 293 | end |
| 294 | elseif pms.pm1 == "MAXHERO" then | 294 | elseif pms.pm1 == "MAXHERO" then |
| 295 | -- 给英雄 | 295 | -- 给英雄 |
| 296 | - for itemId = 400 , 700 do | ||
| 297 | - if csvdb["itemCsv"][itemId] then | ||
| 298 | - role:award({[itemId] = 1}, {log = {desc = "gm"}}) | 296 | + for heroId = 100, 500 do |
| 297 | + local heroCfg = csvdb["unitCsv"][heroId] | ||
| 298 | + if heroCfg and heroCfg.open == 1 then | ||
| 299 | + role:award({[heroId + 300] = 1}, {log = {desc = "gm"}}) | ||
| 299 | end | 300 | end |
| 300 | end | 301 | end |
| 301 | -- 升满级 | 302 | -- 升满级 |
| 302 | for _, hero in ipairs(role.heros) do | 303 | for _, hero in ipairs(role.heros) do |
| 303 | - hero:updateProperty({field = "level", value = 140}) | 304 | + _M.herol(role, {pm1 = hero:getProperty("type"), pm2 = 130}) |
| 304 | hero:updateProperty({field = "wakeL", value = #csvdb["unit_wakeCsv"]}) | 305 | hero:updateProperty({field = "wakeL", value = #csvdb["unit_wakeCsv"]}) |
| 305 | end | 306 | end |
| 306 | 307 |
src/actions/RoleAction.lua
| @@ -754,6 +754,17 @@ function _M.openSpeedUpBoxRpc(agent, data) | @@ -754,6 +754,17 @@ function _M.openSpeedUpBoxRpc(agent, data) | ||
| 754 | role:costItems({[id] = count}, {log = {desc = "speedUpBox"}}) | 754 | role:costItems({[id] = count}, {log = {desc = "speedUpBox"}}) |
| 755 | end | 755 | end |
| 756 | 756 | ||
| 757 | + local doubleCoef = role.activity:isOpen("DoubleDrop") and 2 or 1 | ||
| 758 | + -- 特权卡获取加速获得额外道具 | ||
| 759 | + local coef = role.storeData:getProduceItemSpeedCoef() | ||
| 760 | + if coef > 1 or doubleCoef > 1 then | ||
| 761 | + for k, cnt in pairs(reward) do | ||
| 762 | + if k == ItemId.Gold or k == ItemId.Exp then | ||
| 763 | + reward[k] = math.floor(cnt * coef * doubleCoef) | ||
| 764 | + end | ||
| 765 | + end | ||
| 766 | + end | ||
| 767 | + | ||
| 757 | local change | 768 | local change |
| 758 | reward, change = role:award(reward, {log = {desc = "speedUpBox"}}) | 769 | reward, change = role:award(reward, {log = {desc = "speedUpBox"}}) |
| 759 | 770 |