diff --git a/lua/app/config/battle_exp.lua b/lua/app/config/battle_exp.lua index c66353c6..aa700348 100644 --- a/lua/app/config/battle_exp.lua +++ b/lua/app/config/battle_exp.lua @@ -1,27 +1,27 @@ local battle_exp = { [1]={ - ["exp"]=1 + ["exp"]=10000 }, [2]={ - ["exp"]=1 + ["exp"]=10000 }, [3]={ - ["exp"]=1 + ["exp"]=10000 }, [4]={ - ["exp"]=1 + ["exp"]=10000 }, [5]={ - ["exp"]=1 + ["exp"]=10000 }, [6]={ - ["exp"]=1 + ["exp"]=10000 }, [7]={ - ["exp"]=1 + ["exp"]=10000 }, [8]={ - ["exp"]=1 + ["exp"]=10000 }, [9]={ ["exp"]=10000 diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index 4d24e503..bb251f80 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -1081,6 +1081,22 @@ local buff = { ["buff_type"]=7, ["stack"]=0, ["decr"]=3 + }, + [113]={ + ["id"]=113, + ["name"]="attr_monster_dmg_add", + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=3, + ["is_percent"]=1 + }, + [114]={ + ["id"]=114, + ["name"]="attr_boss_dmg_add", + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=3, + ["is_percent"]=1 } } local keys = { @@ -1196,12 +1212,14 @@ local keys = { ["blue_refresh_weight"]=buff[109], ["purple_refresh_weight"]=buff[110], ["random_universal"]=buff[111], - ["main_hero_energyadd"]=buff[112] + ["main_hero_energyadd"]=buff[112], + ["attr_monster_dmg_add"]=buff[113], + ["attr_boss_dmg_add"]=buff[114] } } local config = { data=buff, keys=keys, -count=112 +count=114 } return config \ No newline at end of file diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 750be735..ca5ea76d 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -281,12 +281,14 @@ local chapter = { 5 }, ["not_involved_skill"]={ - 16, - 17, - 18, - 42, - 43, - 44 + 1, + 2, + 3, + 20, + 21, + 22, + 27, + 32 }, ["monster"]={ 1020101, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 3b2f00f1..cb2a0f2c 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -125,7 +125,7 @@ local skill_rogue = { ["qlt"]=5, ["type"]=5, ["attr"]={ - ["type"]="attr_monster_dmg", + ["type"]="attr_monster_dmg_add", ["minnum"]=1500, ["maxnum"]=1500 }, @@ -141,7 +141,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=5, ["attr"]={ - ["type"]="attr_monster_dmg", + ["type"]="attr_monster_dmg_add", ["minnum"]=1000, ["maxnum"]=1000 }, @@ -156,7 +156,7 @@ local skill_rogue = { ["qlt"]=3, ["type"]=5, ["attr"]={ - ["type"]="attr_monster_dmg", + ["type"]="attr_monster_dmg_add", ["minnum"]=500, ["maxnum"]=500 }, @@ -171,7 +171,7 @@ local skill_rogue = { ["qlt"]=5, ["type"]=5, ["attr"]={ - ["type"]="attr_boss_dmg", + ["type"]="attr_boss_dmg_add", ["minnum"]=1500, ["maxnum"]=1500 }, @@ -187,7 +187,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=5, ["attr"]={ - ["type"]="attr_boss_dmg", + ["type"]="attr_boss_dmg_add", ["minnum"]=1000, ["maxnum"]=1000 }, @@ -202,7 +202,7 @@ local skill_rogue = { ["qlt"]=3, ["type"]=5, ["attr"]={ - ["type"]="attr_boss_dmg", + ["type"]="attr_boss_dmg_add", ["minnum"]=500, ["maxnum"]=500 }, @@ -213,7 +213,7 @@ local skill_rogue = { ["universal"]=1, ["toast_mark"]=13, ["limit_times"]=3, - ["weight"]=100000000000, + ["weight"]=2000, ["qlt"]=4, ["type"]=5, ["attr"]={ diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 444c88bc..2d0cdd77 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -382,6 +382,8 @@ local BUFF_NAME = { GREEN_REFRESH_WEIGHT = "green_refresh_weight", BLUE_REFRESH_WEIGHT = "blue_refresh_weight", PURPLE_REFRESH_WEIGHT = "purple_refresh_weight", + ATTR_MONSTER_DMG_ADD = "attr_monster_dmg_add", + ATTR_BOSS_DMG_ADD = "attr_boss_dmg_add", } BattleConst.BUFF_NAME = BUFF_NAME @@ -505,6 +507,11 @@ local ATTR_NAME = { ATTR_ATKP_BLUE_ALL = "attr_atkp_blue_all", ATTR_ATKP_PURPLE_ALL = "attr_atkp_purple_all", DMGDEC = "dmgdec", + ATTR_HPP_ALL = "attr_hpp_all", + ATTR_MONSTER_DMG = "attr_monster_dmg", + ATTR_BOSS_DMG = "attr_boss_dmg", + ATTR_NORMAL_HURTP = "attr_normal_hurtp", + ATTR_SKILL_HURTP = "attr_skill_hurtp", INVINCIBLE_SHIELD = "invincible_shield", REBIRTH = "rebirth", diff --git a/lua/app/module/battle/helper/battle_buff_handle.lua b/lua/app/module/battle/helper/battle_buff_handle.lua index 00fb18f0..d47f067b 100644 --- a/lua/app/module/battle/helper/battle_buff_handle.lua +++ b/lua/app/module/battle/helper/battle_buff_handle.lua @@ -87,7 +87,15 @@ BattleBuffHandle.addAttribute = { end target.unitEntity:setAttr(ATTR_NAME.DEATH_SUMMON, num) return num - end + end, + [BUFF_NAME.ATTR_MONSTER_DMG_ADD] = function(target, num) + target.unitEntity:addAttr(ATTR_NAME.ATTR_MONSTER_DMG, num, false) + return num + end, + [BUFF_NAME.ATTR_BOSS_DMG_ADD] = function(target, num) + target.unitEntity:addAttr(ATTR_NAME.ATTR_BOSS_DMG, num, false) + return num + end, } local function _takeEffectDirectHurt(unitComp, buff, target, buffEffect) diff --git a/lua/app/ui/battle/battle_pause_ui.lua b/lua/app/ui/battle/battle_pause_ui.lua index 3ddc8bfe..831ebfd2 100644 --- a/lua/app/ui/battle/battle_pause_ui.lua +++ b/lua/app/ui/battle/battle_pause_ui.lua @@ -117,7 +117,7 @@ function BattlePauseUI:_refreshScrollRect() -- valueStr = ModuleManager.HeroManager:getSkillRogueDesc(skillId, value) -- end if EDITOR_MODE then - valueStr = valueStr .. "\n技能ID：" .. skillId + valueStr = valueStr .. "\n技能ID：" .. skillId .. "" end ModuleManager.TipsManager:showDescTips(valueStr, cell:getBaseObject()) end) diff --git a/lua/app/userdata/battle/battle_base_data.lua b/lua/app/userdata/battle/battle_base_data.lua index bec1f3a2..ec05b190 100644 --- a/lua/app/userdata/battle/battle_base_data.lua +++ b/lua/app/userdata/battle/battle_base_data.lua @@ -889,6 +889,8 @@ function BattleBaseData:initHeroData(formation) for matchType, attrName in pairs(GConst.MATCH_ALL_HURTP_NAME) do unitData.attr[attrName] = heroEntity:getTotalAttrValue(attrName) end + unitData.attr[BattleConst.ATTR_NAME.ATTR_MONSTER_DMG] = heroEntity:getTotalAttrValue(BattleConst.ATTR_NAME.ATTR_MONSTER_DMG) + unitData.attr[BattleConst.ATTR_NAME.ATTR_BOSS_DMG] = heroEntity:getTotalAttrValue(BattleConst.ATTR_NAME.ATTR_BOSS_DMG) local skillInfo = skillCfg[skillId] if skillInfo then diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 8f237467..11e5cb1c 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -246,9 +246,9 @@ function HeroEntity:_updateTotalAttr() for k, v in pairs(self.starAttr) do self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v end - for k, v in pairs(self.skinAttr) do - self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v - end + -- for k, v in pairs(self.skinAttr) do + -- self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v + -- end end function HeroEntity:getTotalAttrValue(name) @@ -624,15 +624,15 @@ function HeroEntity:getRogueSkillList() end function HeroEntity:getRogueSkillListBattle() - if not self.rogueSkillList then - self.rogueSkillList = {} + if not self.rogueSkillListBattle then + self.rogueSkillListBattle = {} local count = 1 while true do local ids = self.config["rouge_skill_" .. count] if ids then for i = #ids, 1, -1 do if self.data.star >= ids[i][1] then - table.insert(self.rogueSkillList, ids[i][2]) + table.insert(self.rogueSkillListBattle, ids[i][2]) break end end @@ -643,7 +643,7 @@ function HeroEntity:getRogueSkillListBattle() end end - return self.rogueSkillList + return self.rogueSkillListBattle end function HeroEntity:getRogueSkillListByIdx(idx)