From bbf6b96d920efcb6a8c8283525b08c5c5d5ced55 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 2 Jun 2023 19:20:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/account/account_manager.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lua/app/module/account/account_manager.lua b/lua/app/module/account/account_manager.lua index 3da5800f..94d70632 100644 --- a/lua/app/module/account/account_manager.lua +++ b/lua/app/module/account/account_manager.lua @@ -103,6 +103,22 @@ function AccountManager:changeAccount() if not params.token then return end + local accountInfo = LocalData:getAccountInfo() + local bindId = nil + if Platform:isIosPlatform() then + bindId = accountInfo.apple_id + else + bindId = accountInfo.google_id + end + if bindId and bindId ~= "" and bindId == params.id then + local params = { + content = I18N:getGlobalText(I18N.GlobalConst.CHANGE_ACCOUNT_FAILED_2), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK, + okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), + } + GFunc.showMessageBox(params) + return + end local args = { type = SDKManager.LOGIN_TYPE[loginType], id = params.id, From 398602f773be5625cbd1b9406d6c594716921890 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 2 Jun 2023 19:31:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E6=8C=91=E6=88=98boss=E6=A8=A1=E5=9E=8B=E9=87=8D=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/main_city/component/daily_challenge_comp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/ui/main_city/component/daily_challenge_comp.lua b/lua/app/ui/main_city/component/daily_challenge_comp.lua index 60b59bfd..ff4610f4 100644 --- a/lua/app/ui/main_city/component/daily_challenge_comp.lua +++ b/lua/app/ui/main_city/component/daily_challenge_comp.lua @@ -109,7 +109,7 @@ function DailyChallengeComp:refreshBoss() return end if self.spineBoss then - self.spineBoss:onDestroy() + self.spineBoss:destroy() self.spineBoss = nil self.curModelId = nil end From 5b667ffc0b51cc44744acf4853d3e84b8828f9f2 Mon Sep 17 00:00:00 2001 From: CloudJ Date: Fri, 2 Jun 2023 19:32:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BB=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/global/global_const.lua | 11 +++++++++++ lua/app/ui/common/cell/hero_cell.lua | 4 +++- lua/app/ui/main_city/component/chapter_comp.lua | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index 131d68bf..dc1ce491 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -184,6 +184,7 @@ GConst.ATLAS_PATH = { UI_LOGIN = "assets/arts/atlas/ui/login.asset", ICON_SKILL = "assets/arts/atlas/icon/skill.asset", ICON_HERO = "assets/arts/atlas/icon/hero.asset", + ICON_HERO_2 = "assets/arts/atlas/icon/hero_2.asset", ICON_SKILL_ROGUE = "assets/arts/atlas/icon/skill_rogue.asset", ICON_BUFF = "assets/arts/atlas/icon/buff.asset", BOUNTY = "assets/arts/atlas/ui/bounty.asset", @@ -414,6 +415,16 @@ GConst.HERO_FRAME_GRAY_QLT = { [7] = "frame_gray_7", } +GConst.HERO_DEC_QLT = { + [1] = "frame_dec_1", + [2] = "frame_dec_2", + [3] = "frame_dec_3", + [4] = "frame_dec_4", + [5] = "frame_dec_5", + [6] = "frame_dec_6", + [7] = "frame_dec_7", +} + GConst.QLT_LABLE = { DEFAULT = "equip_quality_1", GRAY = "equip_quality_1", diff --git a/lua/app/ui/common/cell/hero_cell.lua b/lua/app/ui/common/cell/hero_cell.lua index 5bd027da..5873885c 100644 --- a/lua/app/ui/common/cell/hero_cell.lua +++ b/lua/app/ui/common/cell/hero_cell.lua @@ -4,6 +4,7 @@ function HeroCell:init() local uiMap = self.baseObject:genAllChildren() self.icon = uiMap["hero_cell.hero_bg.icon"] self.heroBg = uiMap["hero_cell.hero_bg"] + self.heroDec = uiMap["hero_cell.hero_bg.dec"] self.check = uiMap["hero_cell.hero_bg.mask"] self.matchImg = uiMap["hero_cell.hero_bg.match_img"] self.progressBg = uiMap["hero_cell.hero_bg.progress_bg"] @@ -100,7 +101,8 @@ function HeroCell:_refresh(heroInfo, isGray) else self.heroBg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.FRAME_QLT[heroInfo.qlt]) end - self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, tostring(heroInfo.icon)) + self.heroDec:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HERO_DEC_QLT[heroInfo.qlt]) + self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO_2, tostring(heroInfo.icon)) self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position]) self.check:setVisible(false) self.sImg:setVisible(heroInfo.qlt >= 4) diff --git a/lua/app/ui/main_city/component/chapter_comp.lua b/lua/app/ui/main_city/component/chapter_comp.lua index bce4aee9..c8616269 100644 --- a/lua/app/ui/main_city/component/chapter_comp.lua +++ b/lua/app/ui/main_city/component/chapter_comp.lua @@ -97,6 +97,8 @@ function ChapterComp:refreshChapter(force) end local mysteryBoxCount = DataManager.ChapterData:getChapterMysteryBoxRewardCount(chapterId) + local mysteryBoxBg = self.uiMap["chapter_comp.img.bg"] + mysteryBoxBg:setVisible(mysteryBoxCount > 0) local mysteryBoxIcon = self.uiMap["chapter.img.mystery_box_icon"] mysteryBoxIcon:setVisible(mysteryBoxCount > 0) if mysteryBoxCount > 0 then From 6ff90dafa4d495bbebd214496255098a0324c223 Mon Sep 17 00:00:00 2001 From: CloudJ Date: Fri, 2 Jun 2023 19:58:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/main_city/component/main_comp.lua | 2 +- lua/app/ui/main_city/main_city_ui.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/app/ui/main_city/component/main_comp.lua b/lua/app/ui/main_city/component/main_comp.lua index 9ce7880c..230e284f 100644 --- a/lua/app/ui/main_city/component/main_comp.lua +++ b/lua/app/ui/main_city/component/main_comp.lua @@ -178,7 +178,7 @@ function MainComp:refreshStageFormaion() if formation[i] then local heroEntity = DataManager.HeroData:getHeroById(formation[i]) if heroEntity then - heroCell:setVisible(true, 0.84) + heroCell:setVisible(true, 1) heroCell:refresh(heroEntity) heroCell:addClickListener(function() ModuleManager.HeroManager:showHeroDetailUI(heroEntity:getCfgId()) diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 1f3a3615..558a4a9f 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -2,8 +2,8 @@ local UIPrefabObject = require "app/bf/unity/uiprefab_object" local MainCityUI = class("MainCityUI", BaseUI) -local SIDE_BAR_BORDER_OFFSET = 12 -local SIDE_BAR_INTERVAL = 14 +local SIDE_BAR_BORDER_OFFSET = 22 +local SIDE_BAR_INTERVAL = 28 local SIDE_BAR_ARROW_INTERVAL = 20 local BF_UI_HELPER = GConst.TYPEOF_UNITY_CLASS.BF_UI_HELPER