新增属性

lua/app/global/global_const.lua

@@ -612,6 +612,14 @@ GConst.MATCH_SKILL_HURTP_NAME = {
 	[5] = "attr_skill_hurtp_purple",
 }
 
+GConst.MATCH_ALL_HURTP_NAME = {
+	[1] = "attr_all_hurtp_red",
+	[2] = "attr_all_hurtp_yellow",
+	[3] = "attr_all_hurtp_green",
+	[4] = "attr_all_hurtp_blue",
+	[5] = "attr_all_hurtp_purple",
+}
+
 GConst.GAMEOBJECT_LAYER = {
 	DEFAULT = CS.BF.Utils.NameToLayer("Default"),
 	UI = CS.BF.Utils.NameToLayer("UI"),

lua/app/module/battle/battle_const.lua

@@ -464,6 +464,12 @@ local ATTR_NAME = {
     ATTR_SKILL_HURTP_GREEN = "attr_skill_hurtp_green",
     ATTR_SKILL_HURTP_BLUE = "attr_skill_hurtp_blue",
     ATTR_SKILL_HURTP_PURPLE = "attr_skill_hurtp_purple",
+    ATTR_ALL_HURTP_RED = "attr_all_hurtp_red",
+    ATTR_ALL_HURTP_YELLOW = "attr_all_hurtp_yellow",
+    ATTR_ALL_HURTP_GREEN = "attr_all_hurtp_green",
+    ATTR_ALL_HURTP_BLUE = "attr_all_hurtp_blue",
+    ATTR_ALL_HURTP_PURPLE = "attr_all_hurtp_purple",
+
     INVINCIBLE_SHIELD = "invincible_shield",
     REBIRTH = "rebirth",
     IMMUNE_REDUCTION_BENEFIT = "immune_reduction_benefit", -- 免疫减益

lua/app/module/battle/helper/battle_formula.lua

@@ -64,6 +64,7 @@ BattleFormula.calculateFormula = {
 				skillFixedAdd = unitComp.unitEntity:getNormalSkillHurtFixed()
 				skillPAdd = unitComp.unitEntity:getNormalSkillHurtP()
 			end
+			skillPAdd = skillPAdd + unitComp.unitEntity:getAllHurtP()
 		end
 
 		local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR -- 基础值(攻击 * 技能倍率)

lua/app/userdata/battle/battle_base_data.lua

@@ -835,6 +835,11 @@ function BattleBaseData:initHeroData(formation)
                 unitData.attr[attrName] = heroEntity:getTotalAttrValue(attrName)
             end
 
+            ---- 普攻\技能增伤百分比
+            for matchType, attrName in pairs(GConst.MATCH_ALL_HURTP_NAME) do
+                unitData.attr[attrName] = 2000--heroEntity:getTotalAttrValue(attrName)
+            end
+
             local skillInfo = skillCfg[skillId]
             if skillInfo then
                 if skillInfo.effect_type == 1 then -- 主动

lua/app/userdata/battle/team/battle_team_entity.lua

@@ -358,6 +358,11 @@ function BattleTeamEntity:getNormalSkillHurtFixed(matchType)
 	return self:getAttrValue(skillHurtName)
 end
 
+function BattleTeamEntity:getAllHurtP(matchType)
+	local allHurtPName = GConst.MATCH_ALL_HURTP_NAME[matchType]
+	return self:getAttrValue(allHurtPName)
+end
+
 function BattleTeamEntity:getCanRebirth()
 	return self:getAttrValue(ATTR_NAME.REBIRTH) > 0
 end

lua/app/userdata/battle/team/battle_unit_entity.lua

@@ -388,6 +388,10 @@ function BattleUnitEntity:getNormalSkillHurtFixed()
 	return self.team:getNormalSkillHurtFixed(self.unitData.matchType)
 end
 
+function BattleUnitEntity:getAllHurtP()
+	return self.team:getAllHurtP(self.unitData.matchType)
+end
+
 function BattleUnitEntity:addLimit(name, buffEffect)
 	return self.team:addLimit(name, buffEffect)
 end