puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
xiekaidong 2023-09-18 20:51:28 +08:00
parent 531961e843
commit 0211dfe5d0
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/module/battle/component/battle_unit_comp.lua
View File

@ -2225,7 +2225,9 @@ end
function BattleUnitComp:rebirth() function BattleUnitComp:rebirth()
self.isClear = false self.isClear = false
self.currState = UNIT_STATE.INIT if self.currState == UNIT_STATE.DEAD then
self.currState = UNIT_STATE.INIT
end
self.unitEntity:rebirth() self.unitEntity:rebirth()
end end

6
lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua
View File

@ -199,7 +199,7 @@ function ActPvpSelectUI:refreshSelectInfo()
self.heroEntities[inedx] = heroEntity self.heroEntities[inedx] = heroEntity
unit.node:setVisible(true) unit.node:setVisible(true)
unit.clickMask:addClickListener(function() unit.clickMask:addClickListener(function()
ModuleManager.HeroManager:showHeroDetailUI(heroId, true) ModuleManager.HeroManager:showHeroDetailUI(nil, true, heroEntity)
end) end)
unit.simpleHeroCell:refresh(heroEntity) unit.simpleHeroCell:refresh(heroEntity)
unit.simpleHeroCell:getBaseObject():setActive(false) unit.simpleHeroCell:getBaseObject():setActive(false)
@ -224,7 +224,7 @@ function ActPvpSelectUI:refreshSelectInfo()
local heroInfo = ConfigManager:getConfig("hero")[heroId] local heroInfo = ConfigManager:getConfig("hero")[heroId]
if heroInfo then if heroInfo then
unit.nextBg1:addClickListener(function() unit.nextBg1:addClickListener(function()
ModuleManager.HeroManager:showHeroDetailUI(heroId, true) ModuleManager.HeroManager:showHeroDetailUI(nil, true, heroEntity)
end) end)
local itemInfo = ConfigManager:getConfig("item")[heroInfo.item_id] local itemInfo = ConfigManager:getConfig("item")[heroInfo.item_id]
if itemInfo then if itemInfo then
@ -239,7 +239,7 @@ function ActPvpSelectUI:refreshSelectInfo()
heroInfo = ConfigManager:getConfig("hero")[heroId] heroInfo = ConfigManager:getConfig("hero")[heroId]
if heroInfo then if heroInfo then
unit.nextBg2:addClickListener(function() unit.nextBg2:addClickListener(function()
ModuleManager.HeroManager:showHeroDetailUI(heroId, true) ModuleManager.HeroManager:showHeroDetailUI(nil, true, heroEntity)
end) end)
local itemInfo = ConfigManager:getConfig("item")[heroInfo.item_id] local itemInfo = ConfigManager:getConfig("item")[heroInfo.item_id]
if itemInfo then if itemInfo then

8
lua/app/userdata/activity/act_pvp/act_pvp_data.lua
View File

@ -65,14 +65,12 @@ function ActPvpData:init(data)
end end
self:getBountyList() self:getBountyList()
DataManager:registerCrossDayFunc("ActPvpData", function() DataManager:registerCrossDayFunc("ActPvpData", function()
self.playing = false if self:isFinalDay() then
self.playing = false
end
self.enterCountDaily = 0 self.enterCountDaily = 0
self.winCount = 0
self.loseCount = 0
self.heroeAndSkins = {}
self.todayAdCount = 0 self.todayAdCount = 0
self.dailyRewards = {} self.dailyRewards = {}
self.flushCount = 0
self:setDirty() self:setDirty()
end) end)
end end