diff --git a/src/actions/GmAction.lua b/src/actions/GmAction.lua index f0995c6..e69bec4 100644 --- a/src/actions/GmAction.lua +++ b/src/actions/GmAction.lua @@ -289,14 +289,15 @@ function _M.get(role, pms) end elseif pms.pm1 == "MAXHERO" then -- 给英雄 - for itemId = 400 , 700 do - if csvdb["itemCsv"][itemId] then - role:award({[itemId] = 1}, {log = {desc = "gm"}}) + for heroId = 100, 500 do + local heroCfg = csvdb["unitCsv"][heroId] + if heroCfg and heroCfg.open == 1 then + role:award({[heroId + 300] = 1}, {log = {desc = "gm"}}) end end -- 升满级 for _, hero in ipairs(role.heros) do - hero:updateProperty({field = "level", value = 140}) + _M.herol(role, {pm1 = hero:getProperty("type"), pm2 = 130}) hero:updateProperty({field = "wakeL", value = #csvdb["unit_wakeCsv"]}) end diff --git a/src/actions/RoleAction.lua b/src/actions/RoleAction.lua index 69c8686..d9abeb5 100644 --- a/src/actions/RoleAction.lua +++ b/src/actions/RoleAction.lua @@ -754,6 +754,17 @@ function _M.openSpeedUpBoxRpc(agent, data) role:costItems({[id] = count}, {log = {desc = "speedUpBox"}}) end + local doubleCoef = role.activity:isOpen("DoubleDrop") and 2 or 1 + -- 特权卡获取加速获得额外道具 + local coef = role.storeData:getProduceItemSpeedCoef() + if coef > 1 or doubleCoef > 1 then + for k, cnt in pairs(reward) do + if k == ItemId.Gold or k == ItemId.Exp then + reward[k] = math.floor(cnt * coef * doubleCoef) + end + end + end + local change reward, change = role:award(reward, {log = {desc = "speedUpBox"}}) diff --git a/src/csvdata b/src/csvdata index 22bce48..9ab88a6 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit 22bce4827af9dd5e283b29abefa7f6bd89163a10 +Subproject commit 9ab88a62f1c2ff1121be7547f02668db43dc1f75 -- libgit2 0.21.2