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

Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

Browse Source
This commit is contained in:
xiekaidong 2023-06-02 20:13:41 +08:00
commit 7151a033d7
7 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lua/app/global/global_const.lua
View File

@ -184,6 +184,7 @@ GConst.ATLAS_PATH = {
UI_LOGIN = "assets/arts/atlas/ui/login.asset", UI_LOGIN = "assets/arts/atlas/ui/login.asset",
ICON_SKILL = "assets/arts/atlas/icon/skill.asset", ICON_SKILL = "assets/arts/atlas/icon/skill.asset",
ICON_HERO = "assets/arts/atlas/icon/hero.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_SKILL_ROGUE = "assets/arts/atlas/icon/skill_rogue.asset",
ICON_BUFF = "assets/arts/atlas/icon/buff.asset", ICON_BUFF = "assets/arts/atlas/icon/buff.asset",
BOUNTY = "assets/arts/atlas/ui/bounty.asset", BOUNTY = "assets/arts/atlas/ui/bounty.asset",
@ -414,6 +415,16 @@ GConst.HERO_FRAME_GRAY_QLT = {
[7] = "frame_gray_7", [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 = { GConst.QLT_LABLE = {
DEFAULT = "equip_quality_1", DEFAULT = "equip_quality_1",
GRAY = "equip_quality_1", GRAY = "equip_quality_1",

16
lua/app/module/account/account_manager.lua
View File

@ -103,6 +103,22 @@ function AccountManager:changeAccount()
if not params.token then if not params.token then
return return
end 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 = { local args = {
type = SDKManager.LOGIN_TYPE[loginType], type = SDKManager.LOGIN_TYPE[loginType],
id = params.id, id = params.id,

4
lua/app/ui/common/cell/hero_cell.lua
View File

@ -4,6 +4,7 @@ function HeroCell:init()
local uiMap = self.baseObject:genAllChildren() local uiMap = self.baseObject:genAllChildren()
self.icon = uiMap["hero_cell.hero_bg.icon"] self.icon = uiMap["hero_cell.hero_bg.icon"]
self.heroBg = uiMap["hero_cell.hero_bg"] self.heroBg = uiMap["hero_cell.hero_bg"]
self.heroDec = uiMap["hero_cell.hero_bg.dec"]
self.check = uiMap["hero_cell.hero_bg.mask"] self.check = uiMap["hero_cell.hero_bg.mask"]
self.matchImg = uiMap["hero_cell.hero_bg.match_img"] self.matchImg = uiMap["hero_cell.hero_bg.match_img"]
self.progressBg = uiMap["hero_cell.hero_bg.progress_bg"] self.progressBg = uiMap["hero_cell.hero_bg.progress_bg"]
@ -100,7 +101,8 @@ function HeroCell:_refresh(heroInfo, isGray)
else else
self.heroBg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.FRAME_QLT[heroInfo.qlt]) self.heroBg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.FRAME_QLT[heroInfo.qlt])
end 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.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position])
self.check:setVisible(false) self.check:setVisible(false)
self.sImg:setVisible(heroInfo.qlt >= 4) self.sImg:setVisible(heroInfo.qlt >= 4)

2
lua/app/ui/main_city/component/chapter_comp.lua
View File

@ -97,6 +97,8 @@ function ChapterComp:refreshChapter(force)
end end
local mysteryBoxCount = DataManager.ChapterData:getChapterMysteryBoxRewardCount(chapterId) 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"] local mysteryBoxIcon = self.uiMap["chapter.img.mystery_box_icon"]
mysteryBoxIcon:setVisible(mysteryBoxCount > 0) mysteryBoxIcon:setVisible(mysteryBoxCount > 0)
if mysteryBoxCount > 0 then if mysteryBoxCount > 0 then

2
lua/app/ui/main_city/component/daily_challenge_comp.lua
View File

@ -109,7 +109,7 @@ function DailyChallengeComp:refreshBoss()
return return
end end
if self.spineBoss then if self.spineBoss then
self.spineBoss:onDestroy() self.spineBoss:destroy()
self.spineBoss = nil self.spineBoss = nil
self.curModelId = nil self.curModelId = nil
end end

2
lua/app/ui/main_city/component/main_comp.lua
View File

@ -178,7 +178,7 @@ function MainComp:refreshStageFormaion()
if formation[i] then if formation[i] then
local heroEntity = DataManager.HeroData:getHeroById(formation[i]) local heroEntity = DataManager.HeroData:getHeroById(formation[i])
if heroEntity then if heroEntity then
heroCell:setVisible(true, 0.84) heroCell:setVisible(true, 1)
heroCell:refresh(heroEntity) heroCell:refresh(heroEntity)
heroCell:addClickListener(function() heroCell:addClickListener(function()
ModuleManager.HeroManager:showHeroDetailUI(heroEntity:getCfgId()) ModuleManager.HeroManager:showHeroDetailUI(heroEntity:getCfgId())

4
lua/app/ui/main_city/main_city_ui.lua
View File

@ -2,8 +2,8 @@ local UIPrefabObject = require "app/bf/unity/uiprefab_object"
local MainCityUI = class("MainCityUI", BaseUI) local MainCityUI = class("MainCityUI", BaseUI)
local SIDE_BAR_BORDER_OFFSET = 12 local SIDE_BAR_BORDER_OFFSET = 22
local SIDE_BAR_INTERVAL = 14 local SIDE_BAR_INTERVAL = 28
local SIDE_BAR_ARROW_INTERVAL = 20 local SIDE_BAR_ARROW_INTERVAL = 20
local BF_UI_HELPER = GConst.TYPEOF_UNITY_CLASS.BF_UI_HELPER local BF_UI_HELPER = GConst.TYPEOF_UNITY_CLASS.BF_UI_HELPER