From ffb5159944a3cd9a1663465d4fd8b6fe9389264c Mon Sep 17 00:00:00 2001 From: Fang Date: Mon, 16 Oct 2023 16:31:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E6=98=BE=E7=A4=BAfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/tourn_arena/tourn_arena_data.lua | 5 -- .../activity/tourn_wave/tourn_wave_data.lua | 17 +++--- lua/app/userdata/hero/hero_entity.lua | 58 +++++++++---------- 3 files changed, 37 insertions(+), 43 deletions(-) diff --git a/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua b/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua index 9f34b0ea..28203e07 100644 --- a/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua +++ b/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua @@ -262,11 +262,6 @@ function TournArenaData:getLevelTotalScore(level) return cfg and cfg.exp or 0 end --- 获取当前升级所需总积分 -function TournArenaData:getBountyUpgradeScore() - return self:getBountyCfgByLevel(self:getBountyLevel()).exp or 0 -end - -- 是否满足购买战令等级的条件 function TournArenaData:canBuyBountyLevel() if self:getBountyLevel() >= self:getBountyMaxLevel() then diff --git a/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua b/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua index 5dfb5a34..a375ad47 100644 --- a/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua +++ b/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua @@ -278,11 +278,6 @@ function TournWaveData:getLevelTotalScore(level) return cfg and cfg.exp or 0 end --- 获取当前升级所需总积分 -function TournWaveData:getBountyUpgradeScore() - return self:getBountyCfgByLevel(self:getBountyLevel()).exp or 0 -end - -- 是否满足购买战令等级的条件 function TournWaveData:canBuyBountyLevel() if self:getBountyLevel() >= self:getBountyMaxLevel() then @@ -431,10 +426,14 @@ function TournWaveData:addWaveCount(count) self.bountyExp = self.bountyExp + count - local upExp = self:getBountyUpgradeScore() - if upExp > 0 and self.bountyExp >= upExp then - self.bountyExp = self.bountyExp - upExp - self.bountyLevel = self.bountyLevel + 1 + local curCfg = self:getBountyCfgByLevel(self:getBountyLevel()) + local nextCfg = self:getBountyCfgByLevel(self:getBountyLevel() + 1) + if curCfg and nextCfg then + local diff = nextCfg.exp - curCfg.exp + if self.bountyExp >= diff then + self.bountyExp = self.bountyExp - diff + self.bountyLevel = self.bountyLevel + 1 + end end self:setDirty() diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 94a19ffd..d8139bff 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -185,20 +185,20 @@ function HeroEntity:updateSkinAttr() self.skinAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] = skillHurtPer self.skinAttr[GConst.MATCH_CURED_NAME[self:getMatchType()]] = healPer - if EDITOR_MODE then - local printStr = "" - printStr = printStr .. "更新皮肤数值："..self:getCfgId() .. "\n" - printStr = printStr .. "生命：".. hp .. "\n" - printStr = printStr .. "攻击力：".. atk .. "\n" - printStr = printStr .. "普攻增伤：".. normalHurt .. "\n" - printStr = printStr .. "技能增伤：".. skillHurt .. "\n" - printStr = printStr .. "暴击率：".. critPer .. "\n" - printStr = printStr .. "暴击伤害百分比：".. critHurtPer .. "\n" - printStr = printStr .. "普攻增伤百分比：".. normalHurtPer .. "\n" - printStr = printStr .. "技能增伤百分比：".. skillHurtPer .. "\n" - printStr = printStr .. "治疗加成百分比：".. healPer .. "\n" - Logger.logHighlight(printStr) - end + -- if EDITOR_MODE then + -- local printStr = "" + -- printStr = printStr .. "更新皮肤数值："..self:getCfgId() .. "\n" + -- printStr = printStr .. "生命：".. hp .. "\n" + -- printStr = printStr .. "攻击力：".. atk .. "\n" + -- printStr = printStr .. "普攻增伤：".. normalHurt .. "\n" + -- printStr = printStr .. "技能增伤：".. skillHurt .. "\n" + -- printStr = printStr .. "暴击率：".. critPer .. "\n" + -- printStr = printStr .. "暴击伤害百分比：".. critHurtPer .. "\n" + -- printStr = printStr .. "普攻增伤百分比：".. normalHurtPer .. "\n" + -- printStr = printStr .. "技能增伤百分比：".. skillHurtPer .. "\n" + -- printStr = printStr .. "治疗加成百分比：".. healPer .. "\n" + -- Logger.logHighlight(printStr) + -- end end -- 更新符文属性 @@ -232,21 +232,21 @@ function HeroEntity:updateRunesAttr() self.runesAttr[GConst.MATCH_CURED_NAME[self:getMatchType()]] = healPer self.runesAttr[GConst.MATCH_ALL_HURTP_NAME[self:getMatchType()]] = allHurtp - if EDITOR_MODE then - local printStr = "" - printStr = printStr .. "更新符文数值："..self:getCfgId() .. "\n" - printStr = printStr .. "生命：".. hp .. "\n" - printStr = printStr .. "攻击力：".. atk .. "\n" - printStr = printStr .. "普攻增伤：".. normalHurt .. "\n" - printStr = printStr .. "技能增伤：".. skillHurt .. "\n" - printStr = printStr .. "暴击率：".. critPer .. "\n" - printStr = printStr .. "暴击伤害百分比：".. critHurtPer .. "\n" - printStr = printStr .. "普攻增伤百分比：".. normalHurtPer .. "\n" - printStr = printStr .. "技能增伤百分比：".. skillHurtPer .. "\n" - printStr = printStr .. "治疗加成百分比：".. healPer .. "\n" - printStr = printStr .. "所有伤害百分比：".. allHurtp .. "\n" - Logger.logHighlight(printStr) - end + -- if EDITOR_MODE then + -- local printStr = "" + -- printStr = printStr .. "更新符文数值："..self:getCfgId() .. "\n" + -- printStr = printStr .. "生命：".. hp .. "\n" + -- printStr = printStr .. "攻击力：".. atk .. "\n" + -- printStr = printStr .. "普攻增伤：".. normalHurt .. "\n" + -- printStr = printStr .. "技能增伤：".. skillHurt .. "\n" + -- printStr = printStr .. "暴击率：".. critPer .. "\n" + -- printStr = printStr .. "暴击伤害百分比：".. critHurtPer .. "\n" + -- printStr = printStr .. "普攻增伤百分比：".. normalHurtPer .. "\n" + -- printStr = printStr .. "技能增伤百分比：".. skillHurtPer .. "\n" + -- printStr = printStr .. "治疗加成百分比：".. healPer .. "\n" + -- printStr = printStr .. "所有伤害百分比：".. allHurtp .. "\n" + -- Logger.logHighlight(printStr) + -- end end -- 更新总属性