diff --git a/src/actions/HangAction.lua b/src/actions/HangAction.lua index d83a780..c712399 100644 --- a/src/actions/HangAction.lua +++ b/src/actions/HangAction.lua @@ -516,7 +516,10 @@ local function bonusWinReward(role, bonusData, rewardType, count) if rewardType == 3 then local open, actId = role.activity:isOpen("BonusDouble") - local actData = csvdb["activity_ctrlCsv"][actId] + local actData + if open then + actData = csvdb["activity_ctrlCsv"][actId] + end reward = bonusData.reward:toNumMap() for itemId, c in pairs(reward) do @@ -528,8 +531,10 @@ local function bonusWinReward(role, bonusData, rewardType, count) reward[chance[1]] = (reward[chance[1]] or 0) + chance[2] end end - for k, v in pairs(reward) do - reward[k] = v * (actData.condition > 1 and actData.condition or 1) + if open and actData then + for k, v in pairs(reward) do + reward[k] = v * (actData.condition > 1 and actData.condition or 1) + end end end @@ -604,7 +609,7 @@ function _M.endBonusBattleRpc(agent, data) end local bonusData = csvdb["bonus_battleCsv"][id] - local reward, change + local reward, change = {} local bonusStar = role:getProperty("bonusStar") local oldStar = bonusStar[id] or 0 diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua index 57080a7..32ffbd6 100644 --- a/src/models/RolePlugin.lua +++ b/src/models/RolePlugin.lua @@ -1606,6 +1606,7 @@ function RolePlugin.bind(Role) key = orderKey, order = partnerOrderId, rechargeId = rechargeId, + createTime = skynet.timex(), }) order:create() -- 正在进行中的订单 缓存 -- libgit2 0.21.2