diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua
index da72a503..37446e09 100644
--- a/lua/app/global/global_const.lua
+++ b/lua/app/global/global_const.lua
@@ -396,9 +396,21 @@ GConst.ENTITY_TYPE = {
 	JEWELRY_ENTITY = 3,
 }
 
+GConst.MATCH_ATTACK_NAME = {
+	[1] = "atk_red",
+	[2] = "atk_yellow",
+	[3] = "atk_green",
+	[4] = "atk_blue",
+	[5] = "atk_purple",
+}
+
 GConst.ATTR_TYPE = {
 	hp = 1,
-	atk = 2,
+	atk_red = 2,
+	atk_yellow = 3,
+	atk_green = 4,
+	atk_blue = 5,
+	atk_purple = 6
 }
 
 GConst.GAMEOBJECT_LAYER = {
diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua
index 00bc6f2b..b42ba678 100644
--- a/lua/app/module/battle/component/battle_unit_comp.lua
+++ b/lua/app/module/battle/component/battle_unit_comp.lua
@@ -252,6 +252,7 @@ function BattleUnitComp:updateNormalAttack(dt)
 			return
 		else -- 继续攻击
 			self.attackTime = 0
+			self.currAttackKeyTime = 0.3
 			local skill = self.unitEntity:getNormalSkill()
 			local attackName = skill:getRandomNormalAttackName()
 			self.currAttackDuration = self:getAnimationDuration(attackName)
diff --git a/lua/app/userdata/battle/battle_data.lua b/lua/app/userdata/battle/battle_data.lua
index 39c7e0fe..eabdef03 100644
--- a/lua/app/userdata/battle/battle_data.lua
+++ b/lua/app/userdata/battle/battle_data.lua
@@ -311,7 +311,11 @@ function BattleData:initHeroData()
 					attr = {
 						hp = hp,
 						max_hp = hp,
-						atk = heroAttr[ATTR_TYPE.atk] // DEFAULT_FACTOR,
+						atk_red = heroAttr[ATTR_TYPE.atk_red] // DEFAULT_FACTOR,
+                        atk_yellow = heroAttr[ATTR_TYPE.atk_yellow] // DEFAULT_FACTOR,
+                        atk_green = heroAttr[ATTR_TYPE.atk_green] // DEFAULT_FACTOR,
+                        atk_blue = heroAttr[ATTR_TYPE.atk_blue] // DEFAULT_FACTOR,
+                        atk_purple = heroAttr[ATTR_TYPE.atk_purple] // DEFAULT_FACTOR,
 					}
 				}
                 Logger.printTable(unitData)
@@ -328,16 +332,21 @@ end
 function BattleData:addMonster(monsterId)
     local monsterInfo = ConfigManager:getConfig("monster")[monsterId]
     local hp = monsterInfo.hp // DEFAULT_FACTOR
+    local atk = monsterInfo.atk // DEFAULT_FACTOR
     local unitData = {
         id = monsterId,
         modelId = monsterInfo.model_id,
-        matchType = 1,
+        matchType = 0,
         normalSkill = monsterInfo.hurt_skill,
         activeSkills = monsterInfo.skill,
         attr = {
             hp = hp,
             max_hp = hp,
-            atk = monsterInfo.atk // DEFAULT_FACTOR,
+            atk_red = atk,
+            atk_yellow = atk,
+            atk_green = atk,
+            atk_blue = atk,
+            atk_purple = atk,
         }
     }
     return self.defTeam:addUnit(unitData)
diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua
index 258584e8..8e0b25fe 100644
--- a/lua/app/userdata/hero/hero_entity.lua
+++ b/lua/app/userdata/hero/hero_entity.lua
@@ -16,7 +16,11 @@ end
 
 function HeroEntity:initAttr()
 	self.allAttr[GConst.ATTR_TYPE.hp] = 0
-	self.allAttr[GConst.ATTR_TYPE.atk] = 0
+	self.allAttr[GConst.ATTR_TYPE.atk_red] = 0
+	self.allAttr[GConst.ATTR_TYPE.atk_yellow] = 0
+	self.allAttr[GConst.ATTR_TYPE.atk_green] = 0
+	self.allAttr[GConst.ATTR_TYPE.atk_blue] = 0
+	self.allAttr[GConst.ATTR_TYPE.atk_purple] = 0
 end
 
 function HeroEntity:setLv(lv)
@@ -69,7 +73,12 @@ end
 
 function HeroEntity:updateBaseAttr()
 	self.baseAttrOriginal[GConst.ATTR_TYPE.hp] = self:getCfgHp()
-	self.baseAttrOriginal[GConst.ATTR_TYPE.atk] = self:getCfgAtk()
+	self.baseAttrOriginal[GConst.ATTR_TYPE.atk_red] = 0
+	self.baseAttrOriginal[GConst.ATTR_TYPE.atk_yellow] = 0
+	self.baseAttrOriginal[GConst.ATTR_TYPE.atk_green] = 0
+	self.baseAttrOriginal[GConst.ATTR_TYPE.atk_blue] = 0
+	self.baseAttrOriginal[GConst.ATTR_TYPE.atk_purple] = 0
+	self.baseAttrOriginal[GConst.ATTR_TYPE[GConst.MATCH_ATTACK_NAME[self.config.position]]] = self:getCfgAtk()
 end
 
 function HeroEntity:getCfgHp(lv)