新增buff和叠加方式优化

lua/app/config/buff.lua

@@ -715,6 +715,14 @@ local buff = {
 		["fx_disappear"]={
 			41
 		}
+	},
+	[81]={
+		["id"]=81,
+		["name"]="skill_hurt_add_show",
+		["buff_type"]=1,
+		["stack"]=2,
+		["decr"]=1,
+		["icon"]="skill_hurt_add"
 	}
 }
 local keys = {
@@ -798,12 +806,13 @@ local keys = {
 		["end_dmg_addition_all_add"]=buff[77],
 		["end_dmg_dec_all_add"]=buff[78],
 		["invincible_shield"]=buff[79],
-		["shield_ice_02"]=buff[80]
+		["shield_ice_02"]=buff[80],
+		["skill_hurt_add_show"]=buff[81]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=80
+count=81
 }
 return config

lua/app/module/battle/battle_const.lua

@@ -340,6 +340,7 @@ local BUFF_NAME = {
     END_DMG_DEC_ALL_ADD = "end_dmg_dec_all_add",
     INVINCIBLE_SHIELD = "invincible_shield",
     SHIELD_ICE_02 = "shield_ice_02",
+    SKILL_HURT_ADD_SHOW = "skill_hurt_add_show",
 }
 BattleConst.BUFF_NAME = BUFF_NAME
 
@@ -494,6 +495,7 @@ BattleConst.BUFF_NAME_TO_ATTR = {
     [BUFF_NAME.SKILL_HURT_ADD] = {ATTR_NAME.SKILL_HURTP, false},
     [BUFF_NAME.END_DMG_ADDITION_ALL_ADD] = {ATTR_NAME.END_DMG_ADDITION_ALL, false},
     [BUFF_NAME.END_DMG_DEC_ALL_ADD] = {ATTR_NAME.END_DMG_DEC_ALL, false},
+    [BUFF_NAME.SKILL_HURT_ADD_SHOW] = {ATTR_NAME.SKILL_HURTP, false},
 }
 
 ---- 格子类型

lua/app/module/battle/team/battle_team.lua

@@ -306,6 +306,9 @@ function BattleTeam:addBuff(buffEffect)
 							bEffect[fieldName] = buffEffect[fieldName]
 						end
 					end
+					if bEffect.buff:getEffectNum() < buffEffect.buff:getEffectNum() then
+						bEffect.buff:setEffectNum(buffEffect.buff:getEffectNum())
+					end
 					needRecycle = bEffect
 					break
 				end