From 37237493aaaffcf1b37f5ddb995f3dbc338f16d5 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Tue, 23 Sep 2025 20:17:16 +0800 Subject: [PATCH 1/4] fix bug --- lua/app/userdata/talent/talent_data.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/userdata/talent/talent_data.lua b/lua/app/userdata/talent/talent_data.lua index 00b52d86..715fc17e 100644 --- a/lua/app/userdata/talent/talent_data.lua +++ b/lua/app/userdata/talent/talent_data.lua @@ -115,7 +115,7 @@ function TalentData:_updateAllAttr() local lv = self:getLevels(id) if lv and lv > 0 and cfg.attr then for _, v in ipairs(cfg.attr) do - self.allAttr[v.type] = (self.allAttr[v.type] or 0) + v.num + self.allAttr[v.type] = (self.allAttr[v.type] or 0) + v.num * lv end end end From 73bd541e945ab4de12e4e3a20d44d88a2e3e6a35 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Tue, 23 Sep 2025 20:47:32 +0800 Subject: [PATCH 2/4] fix bug --- lua/app/ui/hero/hero_comp.lua | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/lua/app/ui/hero/hero_comp.lua b/lua/app/ui/hero/hero_comp.lua index 1f13d739..39452e7b 100644 --- a/lua/app/ui/hero/hero_comp.lua +++ b/lua/app/ui/hero/hero_comp.lua @@ -100,9 +100,11 @@ function HeroComp:init() local powerImg = self.uiMap["hero_ui.power_img"] local formationBg = self.uiMap["hero_ui.formation"] local bottomBg = self.uiMap["hero_ui.bottom_bg"] + local viewport = self.uiMap["hero_ui.bottom_bg.scrollrect.viewport"] local rect = self.baseObject:getRectSize() local bgHeight = rect.height * 0.66 bottomBg:setSizeDeltaY(bgHeight) + viewport:setSizeDeltaY(bgHeight - 230) formationBg:setAnchoredPositionY(bgHeight) powerImg:setAnchoredPositionY(bgHeight + 20) end @@ -110,9 +112,6 @@ end function HeroComp:refresh(battleType) self.battleType = battleType or self.battleType - self:clearAdapt() - self:adapt() - -- self:refreshCollectEntrance() self:updateFilter() if self.battleType == GConst.BattleConst.FORMATION_TYPE.STAGE then self:refreshStageFormation() @@ -313,35 +312,6 @@ function HeroComp:onClickHero(cell, heroId) end end -function HeroComp:adapt() - local addH = GFunc.calculateFitSizeY() - local uiMap = self:getBaseObject():genAllChildren() - local scrollRect = uiMap["hero_ui.bottom_bg.scrollrect"] - local viewport = uiMap["hero_ui.bottom_bg.scrollrect.viewport"] - if not self.rectDefaultSize then - self.rectDefaultSize = scrollRect:getSizeDelta() - end - if not self.viewDefaultSize then - self.viewDefaultSize = viewport:getSizeDelta() - end - scrollRect:setSizeDelta(self.rectDefaultSize.x, self.rectDefaultSize.y + addH) - viewport:setSizeDelta(self.viewDefaultSize.x, self.viewDefaultSize.y + addH) -end - -function HeroComp:clearAdapt() - local uiMap = self:getBaseObject():genAllChildren() - local scrollRect = uiMap["hero_ui.bottom_bg.scrollrect"] - local viewport = uiMap["hero_ui.bottom_bg.scrollrect.viewport"] - if not self.rectDefaultSize then - self.rectDefaultSize = scrollRect:getSizeDelta() - end - if not self.viewDefaultSize then - self.viewDefaultSize = viewport:getSizeDelta() - end - scrollRect:setSizeDelta(self.rectDefaultSize.x, self.rectDefaultSize.y) - viewport:setSizeDelta(self.viewDefaultSize.x, self.viewDefaultSize.y) -end - function HeroComp:getHeroCell(heroId) if not self.scrollRect then return From 1a4a8ff880bcf9ba59cc638bb6db68a96ebf7c43 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Tue, 23 Sep 2025 20:57:51 +0800 Subject: [PATCH 3/4] fix bug --- lua/app/userdata/hero/hero_entity.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index eb1536d4..ce2a46f0 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -10,6 +10,7 @@ function HeroEntity:ctor(cfgId, lv, skin, star) self.config = ConfigManager:getConfig("hero")[self.cfgId] self.beginLv = 1 -- 激活等级 self.isNew = false + -- self.data.star = 2 self.baseAttrOriginal = {} self.starAttr = {} @@ -185,7 +186,7 @@ function HeroEntity:_updateStarAttr() self.starAttr = {} for i = 1, self.data.star do local attr = self:getStarAttrCfg()[i] - self.starAttr[attr.type] = attr.num + self.starAttr[attr.type] = (self.starAttr[attr.type] or 0) + attr.num end end From 027fa61721aa883ebd3187b361bf0b994e4e10b3 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Tue, 23 Sep 2025 21:09:51 +0800 Subject: [PATCH 4/4] fix bug --- lua/app/ui/summon/summon_main_ui.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/ui/summon/summon_main_ui.lua b/lua/app/ui/summon/summon_main_ui.lua index 443df7be..b5a8ceea 100755 --- a/lua/app/ui/summon/summon_main_ui.lua +++ b/lua/app/ui/summon/summon_main_ui.lua @@ -355,7 +355,7 @@ function SummonMainUI:onSummon(count, isAd) return else for i, cost in ipairs(costs) do - if not GFunc.checkCost(cost.id, GFunc.getRewardNum(cost) * count, true) then + if not GFunc.checkCost(cost.id, GFunc.getRewardNum(cost), true) then return end end