From fa63de8ad9396a561ba95674ca394bcb0be6c8fc Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 2 Jun 2023 21:03:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=8B=B1=E9=9B=84icon=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/bounty/cell/bounty_reward_cell.lua | 2 -- lua/app/ui/common/cell/item_cell.lua | 2 -- lua/app/ui/common/cell/reward_cell.lua | 2 -- lua/app/ui/fund/cell/growth_fund_reward_cell.lua | 2 -- 4 files changed, 8 deletions(-) diff --git a/lua/app/ui/bounty/cell/bounty_reward_cell.lua b/lua/app/ui/bounty/cell/bounty_reward_cell.lua index 5a449785..2906ba47 100644 --- a/lua/app/ui/bounty/cell/bounty_reward_cell.lua +++ b/lua/app/ui/bounty/cell/bounty_reward_cell.lua @@ -52,7 +52,6 @@ function BountyRewardCell:_refreshItem(item) if info.type == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then local heroInfo = ConfigManager:getConfig("hero")[info.parameter] if heroInfo then - self.icon:setLocalScale(0.86, 0.86, 0.86) self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position]) self.matchImg:setVisible(true) @@ -64,7 +63,6 @@ function BountyRewardCell:_refreshItem(item) end self.fragment:setVisible(true) else - self.icon:setLocalScale(1, 1, 1) self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) self.fragment:setVisible(false) self.matchImg:setVisible(false) diff --git a/lua/app/ui/common/cell/item_cell.lua b/lua/app/ui/common/cell/item_cell.lua index 0e192864..53151083 100644 --- a/lua/app/ui/common/cell/item_cell.lua +++ b/lua/app/ui/common/cell/item_cell.lua @@ -25,14 +25,12 @@ function ItemCell:_refresh(itemId, count) if cfg.type == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then local heroInfo = ConfigManager:getConfig("hero")[cfg.parameter] if heroInfo then - self.icon:setLocalScale(0.86, 0.86, 0.86) self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) else self.icon:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha") end self.fragment:setVisible(true) else - self.icon:setLocalScale(1, 1, 1) self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, cfg.icon) self.fragment:setVisible(false) end diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index f1aa2782..c423dfd5 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -78,7 +78,6 @@ function RewardCell:_refreshItem(info, count) if info.type == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then local heroInfo = ConfigManager:getConfig("hero")[info.parameter] if heroInfo then - self.icon:setLocalScale(0.86, 0.86, 0.86) self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) self.sImg:setVisible(heroInfo.qlt >= 4) self.matchImg:setVisible(true) @@ -90,7 +89,6 @@ function RewardCell:_refreshItem(info, count) end self.fragment:setVisible(true) else - self.icon:setLocalScale(1, 1, 1) self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) self.fragment:setVisible(false) self.sImg:setVisible(false) diff --git a/lua/app/ui/fund/cell/growth_fund_reward_cell.lua b/lua/app/ui/fund/cell/growth_fund_reward_cell.lua index 9ee479d8..b8e5f9f9 100644 --- a/lua/app/ui/fund/cell/growth_fund_reward_cell.lua +++ b/lua/app/ui/fund/cell/growth_fund_reward_cell.lua @@ -58,14 +58,12 @@ function GrowthFundRewardCell:_refreshItem(item) if info.type == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then local heroInfo = ConfigManager:getConfig("hero")[info.parameter] if heroInfo then - self.icon:setLocalScale(0.86, 0.86, 0.86) self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) else self.icon:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha") end self.fragment:setVisible(true) else - self.icon:setLocalScale(1, 1, 1) self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) self.fragment:setVisible(false) end From 74ba59f107e3472d61172ee25d935c79c26f5a15 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 2 Jun 2023 21:30:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E8=B4=A7=E5=B8=81=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/main_city/main_city_ui.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 558a4a9f..e284bda1 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -45,12 +45,12 @@ function MainCityUI:getCurrencyParams() self.currencyParams.itemIds[2] = GConst.ItemConst.ITEM_ID_GEM self.currencyParams.itemIds[3] = GConst.ItemConst.ITEM_ID_VIT elseif self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.HERO then - self.currencyParams.itemIds[1] = GConst.ItemConst.ITEM_ID_VIT - self.currencyParams.itemIds[2] = GConst.ItemConst.ITEM_ID_GOLD + self.currencyParams.itemIds[1] = GConst.ItemConst.ITEM_ID_GOLD + self.currencyParams.itemIds[2] = GConst.ItemConst.ITEM_ID_VIT elseif self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.SHOP then - self.currencyParams.itemIds[1] = GConst.ItemConst.ITEM_ID_VIT - self.currencyParams.itemIds[2] = GConst.ItemConst.ITEM_ID_GOLD - self.currencyParams.itemIds[3] = GConst.ItemConst.ITEM_ID_GEM + self.currencyParams.itemIds[1] = GConst.ItemConst.ITEM_ID_GOLD + self.currencyParams.itemIds[2] = GConst.ItemConst.ITEM_ID_GEM + self.currencyParams.itemIds[3] = GConst.ItemConst.ITEM_ID_VIT end return self.currencyParams end From 336e713fb10b223646ab150fdbca43aa45a0a3f2 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 2 Jun 2023 22:24:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E7=89=B9=E6=95=88=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/hero/hero_detail_ui.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/ui/hero/hero_detail_ui.lua b/lua/app/ui/hero/hero_detail_ui.lua index 4ab62049..5cbd7d9f 100644 --- a/lua/app/ui/hero/hero_detail_ui.lua +++ b/lua/app/ui/hero/hero_detail_ui.lua @@ -71,7 +71,7 @@ function HeroDetailUI:_display(lvChange) skillBg:setSprite(GConst.ATLAS_PATH.ICON_SKILL_ROGUE, ModuleManager.HeroManager:getSkillRogueBg(skillId, true)) if i == activeCount and lvChange and self.heroEntity:getLv() == skillLvs[i] then local x, y = skillBg:fastGetAnchoredPosition() - self.spineObjSkill:setLocalPositionX(x) + self.spineObjSkill:setLocalPosition(x, y) self.spineObjSkill:setVisible(true) self.spineObjSkill:playAnim("idle", false, true) end