diff --git a/src/actions/HangAction.lua b/src/actions/HangAction.lua index 457bf99..fedda22 100644 --- a/src/actions/HangAction.lua +++ b/src/actions/HangAction.lua @@ -447,8 +447,6 @@ function _M.startBonusBattleRpc(agent, data) local bonusC = role.dailyData:getProperty("bonusC") bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0} if globalCsv.bonus_daily_count - bonusC[bonusData.type]["c"] <= 0 then return 4 end - bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + 1 - role.dailyData:updateProperty({field = "bonusC", value = bonusC}) role.__bonusBattleCache = { @@ -472,6 +470,13 @@ function _M.endBonusBattleRpc(agent, data) local reward if starNum and starNum > 0 then + -- 胜利扣除次数 + local bonusC = role.dailyData:getProperty("bonusC") + bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0} + if globalCsv.bonus_daily_count - bonusC[bonusData.type]["c"] <= 0 then return 3 end + bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + 1 + role.dailyData:updateProperty({field = "bonusC", value = bonusC}) + reward = role:award(bonusData.reward, {log = {desc = "bonusBattle", int1 = id}}) role:checkTaskEnter("BonusPass", {id = id}) end diff --git a/src/adv/Adv.lua b/src/adv/Adv.lua index 311483f..e3fb0c1 100644 --- a/src/adv/Adv.lua +++ b/src/adv/Adv.lua @@ -887,8 +887,13 @@ function Adv:cost(item, params, check) end --事件点击处理 -local function clickOut(self, room, block, params) +local function clickOut(self, room, block, params, isExit) if self:getCurMap():checkOver() then --检查是否可以出去了 + if isExit then + self:over(true) + return true + end + if #self.mapStack > 1 then -- 处于夹层中 table.remove(self.mapStack) --退出夹层 self:backLayer(-1) @@ -942,8 +947,7 @@ local function clickOut(self, room, block, params) end local function clickExit(self, room, block, params) - self:over(true) - return true + return clickOut(self, room, block, params, true) end --战斗 普通攻击 -- libgit2 0.21.2