diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 6cac7735..214843c7 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -2225,7 +2225,9 @@ end function BattleUnitComp:rebirth() self.isClear = false - self.currState = UNIT_STATE.INIT + if self.currState == UNIT_STATE.DEAD then + self.currState = UNIT_STATE.INIT + end self.unitEntity:rebirth() end diff --git a/lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua b/lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua index aa32b34d..a50fff6f 100644 --- a/lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua +++ b/lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua @@ -199,7 +199,7 @@ function ActPvpSelectUI:refreshSelectInfo() self.heroEntities[inedx] = heroEntity unit.node:setVisible(true) unit.clickMask:addClickListener(function() - ModuleManager.HeroManager:showHeroDetailUI(heroId, true) + ModuleManager.HeroManager:showHeroDetailUI(nil, true, heroEntity) end) unit.simpleHeroCell:refresh(heroEntity) unit.simpleHeroCell:getBaseObject():setActive(false) @@ -224,7 +224,7 @@ function ActPvpSelectUI:refreshSelectInfo() local heroInfo = ConfigManager:getConfig("hero")[heroId] if heroInfo then unit.nextBg1:addClickListener(function() - ModuleManager.HeroManager:showHeroDetailUI(heroId, true) + ModuleManager.HeroManager:showHeroDetailUI(nil, true, heroEntity) end) local itemInfo = ConfigManager:getConfig("item")[heroInfo.item_id] if itemInfo then @@ -239,7 +239,7 @@ function ActPvpSelectUI:refreshSelectInfo() heroInfo = ConfigManager:getConfig("hero")[heroId] if heroInfo then unit.nextBg2:addClickListener(function() - ModuleManager.HeroManager:showHeroDetailUI(heroId, true) + ModuleManager.HeroManager:showHeroDetailUI(nil, true, heroEntity) end) local itemInfo = ConfigManager:getConfig("item")[heroInfo.item_id] if itemInfo then diff --git a/lua/app/userdata/activity/act_pvp/act_pvp_data.lua b/lua/app/userdata/activity/act_pvp/act_pvp_data.lua index a4abd76e..afec6d4d 100644 --- a/lua/app/userdata/activity/act_pvp/act_pvp_data.lua +++ b/lua/app/userdata/activity/act_pvp/act_pvp_data.lua @@ -65,14 +65,12 @@ function ActPvpData:init(data) end self:getBountyList() DataManager:registerCrossDayFunc("ActPvpData", function() - self.playing = false + if self:isFinalDay() then + self.playing = false + end self.enterCountDaily = 0 - self.winCount = 0 - self.loseCount = 0 - self.heroeAndSkins = {} self.todayAdCount = 0 self.dailyRewards = {} - self.flushCount = 0 self:setDirty() end) end