diff --git a/lua/app/config/activity_pvp_robot.lua b/lua/app/config/activity_pvp_robot.lua
index 3b639845..a49548de 100644
--- a/lua/app/config/activity_pvp_robot.lua
+++ b/lua/app/config/activity_pvp_robot.lua
@@ -12,7 +12,7 @@ local activity_pvp_robot = {
 				6
 			},
 			{
-				24004,
+				22004,
 				6
 			},
 			{
@@ -20,7 +20,7 @@ local activity_pvp_robot = {
 				6
 			},
 			{
-				44002,
+				42002,
 				6
 			},
 			{
@@ -42,15 +42,15 @@ local activity_pvp_robot = {
 				6
 			},
 			{
-				24002,
+				22002,
 				6
 			},
 			{
-				34001,
+				32001,
 				6
 			},
 			{
-				44004,
+				42004,
 				6
 			},
 			{
@@ -68,7 +68,7 @@ local activity_pvp_robot = {
 		["avatar_frame"]=1000,
 		["hero_id"]={
 			{
-				14002,
+				12002,
 				6
 			},
 			{
@@ -76,7 +76,7 @@ local activity_pvp_robot = {
 				6
 			},
 			{
-				34001,
+				32001,
 				6
 			},
 			{
@@ -102,7 +102,7 @@ local activity_pvp_robot = {
 				6
 			},
 			{
-				24003,
+				22003,
 				6
 			},
 			{
@@ -132,7 +132,7 @@ local activity_pvp_robot = {
 				6
 			},
 			{
-				24002,
+				23002,
 				6
 			},
 			{
@@ -140,7 +140,7 @@ local activity_pvp_robot = {
 				6
 			},
 			{
-				44001,
+				42001,
 				6
 			},
 			{
diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua
index ab46ab0f..9a33d84b 100644
--- a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua
+++ b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua
@@ -152,6 +152,7 @@ function BattleControllerDungeonRune:enterRoundBegin()
     -- 完成任务
     local taskOver = self:getRuneTaskAllOver()
     if taskOver and not self.isBossChapter then
+        self.needWaitingBoardOver = nil
         self.victory = true
         self:postWaveOver(false)
         self:battleEnd()
@@ -454,8 +455,9 @@ function BattleControllerDungeonRune:getRuneTaskNumByType(taskInfo)
     elseif taskType == GConst.DungeonRuneConst.TASK_TYPE.BREAK_GRID_TYPE then
         return self.totalBreakedGridType[taskParams1] or 0
     elseif taskType == GConst.DungeonRuneConst.TASK_TYPE.KILL_MONSTER then
-        return self.taskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.KILL_NORMAL_MONSTER]
+        return self.taskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.KILL_NORMAL_MONSTER] or 0
     end
+    return 0
 end
 
 function BattleControllerDungeonRune:getRuneTaskAllOver()
diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua
index 1eb4c4b6..96031dc7 100644
--- a/lua/app/userdata/arena/arena_data.lua
+++ b/lua/app/userdata/arena/arena_data.lua
@@ -211,6 +211,10 @@ function ArenaData:getGradingIdFromScore(score, isLastSeason)
     if isLastSeason then
         cfg = self:getRankCfg(self.season - 1)
     end
+    if cfg == nil then
+        -- 活动没开特殊处理
+        cfg = self:getRankCfg(1)
+    end
 
     local ids = table.keys(cfg)
     table.sort(ids)
diff --git a/lua/app/userdata/hero/hero_data.lua b/lua/app/userdata/hero/hero_data.lua
index a1140b9c..44edc5e0 100644
--- a/lua/app/userdata/hero/hero_data.lua
+++ b/lua/app/userdata/hero/hero_data.lua
@@ -98,12 +98,16 @@ function HeroData:updateSelfHeroEquipsAndRunes(entity)
 		Logger.logHighlight("更新英雄属性:" .. entity:getCfgId())
 	end
 
-	entity:setEquips(GConst.EquipConst.PART_TYPE.WEAPON, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.WEAPON))
-	entity:setEquips(GConst.EquipConst.PART_TYPE.HAT, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.HAT))
-	entity:setEquips(GConst.EquipConst.PART_TYPE.CLOTHES, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.CLOTHES))
-	entity:setEquips(GConst.EquipConst.PART_TYPE.BELT, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.BELT))
-	entity:setEquips(GConst.EquipConst.PART_TYPE.HANDGUARD, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.HANDGUARD))
-	entity:setRunes(DataManager.RunesData:getRunes(entity:getCfgId()))
+	entity:setEquips(GConst.EquipConst.PART_TYPE.WEAPON, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.WEAPON), true)
+	entity:setEquips(GConst.EquipConst.PART_TYPE.HAT, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.HAT), true)
+	entity:setEquips(GConst.EquipConst.PART_TYPE.CLOTHES, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.CLOTHES), true)
+	entity:setEquips(GConst.EquipConst.PART_TYPE.BELT, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.BELT), true)
+	entity:setEquips(GConst.EquipConst.PART_TYPE.HANDGUARD, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.HANDGUARD), true)
+	entity:setRunes(DataManager.RunesData:getRunes(entity:getCfgId()), true)
+
+	-- 手动调用更新数据
+	entity:onEquipAttrChange()
+	entity:onRunesAttrChange()
 end
 
 function HeroData:getEntity(heroStruct)
diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua
index deb5bcd9..94a19ffd 100644
--- a/lua/app/userdata/hero/hero_entity.lua
+++ b/lua/app/userdata/hero/hero_entity.lua
@@ -594,12 +594,15 @@ function HeroEntity:getTotalBaseAtk()
 end
 
 -- {partType = EquipEntity}
-function HeroEntity:setEquips(partType, equipEntities)
+function HeroEntity:setEquips(partType, equipEntities, notNowUpdate)
 	if self.equipEntities == nil then
 		self.equipEntities = {}
 	end
 	self.equipEntities[partType] = equipEntities
 
+	if notNowUpdate then
+		return
+	end
 	self:getTotalAttrValue() -- 防止报错
 	self:onEquipAttrChange()
 end
@@ -621,8 +624,12 @@ function HeroEntity:getSkins()
 	return self.unlockSkins
 end
 
-function HeroEntity:setRunes(runesEntity)
+function HeroEntity:setRunes(runesEntity, notNowUpdate)
 	self.runesEntity = runesEntity
+
+	if notNowUpdate then
+		return
+	end
 	self:getTotalAttrValue() -- 防止报错
 	self:onRunesAttrChange()
 end