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

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

Browse Source
This commit is contained in:
CloudJ 2023-06-06 11:45:01 +08:00
commit 062d3e54e8
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lua/app/common/audio_manager.lua
View File

@ -29,17 +29,13 @@ AudioManager.EFFECT_ID = {
LINK_SKILL = "assets/arts/sounds/sfx/battle/link_skill.wav",
BATTLE_VICTORY = "assets/arts/sounds/sfx/ui/battle_victory.wav",
BATTLE_DEFEAT = "assets/arts/sounds/sfx/ui/battle_defeat.wav",
SUMMON_START = "assets/arts/sounds/sfx/ui/ui_summon_start.wav",
REWARD = "assets/arts/sounds/sfx/ui/reward.wav",
HERO_UP = "assets/arts/sounds/sfx/ui/hero_up.wav",
PLAYER_UP = "assets/arts/sounds/sfx/ui/player_up.wav",
SUMMON_START = "assets/arts/sounds/sfx/ui/summon_start.wav",
REWARD = "assets/arts/sounds/sfx/ui/reward.wav",
HERO_UP = "assets/arts/sounds/sfx/ui/hero_up.wav",
PLAYER_UP = "assets/arts/sounds/sfx/ui/player_up.wav",
BOSS_WARNING = "assets/arts/sounds/sfx/battle/warning_boss.wav",
LINK_CANCEL = "assets/arts/sounds/sfx/battle/link_cancel.wav",
UI_FUNC_OPEN = "assets/arts/sounds/sfx/ui/ui_func_open.wav", -- 功能解锁
UI_HERO_LV_UP = "assets/arts/sounds/sfx/ui/ui_hero_lv_up.wav", -- 英雄升级
UI_PLAYER_LV_UP = "assets/arts/sounds/sfx/ui/ui_player_lv_up.wav", -- 角色升级
UI_REWARD_GET = "assets/arts/sounds/sfx/ui/ui_reward_get.wav", -- 奖励获取
UI_SUMMON_START = "assets/arts/sounds/sfx/ui/ui_summon_start.wav", -- 抽卡
FUNC_OPEN = "assets/arts/sounds/sfx/ui/func_open.wav",
}
AudioManager.BO_EFFECT_ID = {

1
lua/app/config/localization/localization_global_const.lua
View File

@ -215,6 +215,7 @@ local LocalizationGlobalConst =
BIND_TIPS_DESC = "BIND_TIPS_DESC",
GET_SEVER_ERROR = "GET_SEVER_ERROR",
PAY_FAILED_DESC_1 = "PAY_FAILED_DESC_1",
CHAPTER_DESC_2 = "CHAPTER_DESC_2",
}
return LocalizationGlobalConst

1
lua/app/config/strings/cn/global.lua
View File

@ -215,6 +215,7 @@ local localization_global =
["BIND_TIPS_DESC"] = "为了您的帐户安全，请绑定账号",
["GET_SEVER_ERROR"] = "请求服务器失败，请重试",
["PAY_FAILED_DESC_1"] = "订单异常，请联系客服处理",
["CHAPTER_DESC_2"] = "神秘宝箱{0}/{1}",
}
return localization_global

1
lua/app/module/hero/hero_manager.lua
View File

@ -20,7 +20,6 @@ function HeroManager:upgradeHero(heroId, heroEntity)
if state == GConst.HeroConst.CHECK_LV_UP_STATE.COIN_NOT_ENOUGH then
ModuleManager.ShopManager:tryTriggerCoinGift()
end
return
end

2
lua/app/ui/hero/cell/hero_list_cell.lua
View File

@ -55,6 +55,7 @@ function HeroListCell:refresh(index, heroList, stageFormation, allHeroCount, act
self.heroCells[i]:refresh(heroEntity, not heroEntity:isActived())
self.heroCells[i]:showCheck(stageFormation[matchType] == heroId)
self.heroCells[i]:addClickListener(function()
AudioManager:playEffect(AudioManager.CLICK_ID[GConst.CLICK_SOUND.NORMAL])
if func then
func(self.heroCells[i], heroId)
end
@ -68,6 +69,7 @@ function HeroListCell:refresh(index, heroList, stageFormation, allHeroCount, act
self.heroCells[i]:setVisible(true)
self.heroCells[i]:refresh(heroEntity, true)
self.heroCells[i]:addClickListener(function()
AudioManager:playEffect(AudioManager.CLICK_ID[GConst.CLICK_SOUND.NORMAL])
if func then
func(self.heroCells[i], heroId)
end

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

@ -103,7 +103,8 @@ function ChapterComp:refreshChapter(force)
mysteryBoxIcon:setVisible(mysteryBoxCount > 0)
if mysteryBoxCount > 0 then
local gotCount = DataManager.ChapterData:getChapterMysteryBoxGotCount(chapterId)
self.uiMap["chapter.img.mystery_box_icon.desc"]:setText(gotCount .. "/" .. mysteryBoxCount)
local desc = I18N:getGlobalText(I18N.GlobalConst.CHAPTER_DESC_2, gotCount, mysteryBoxCount)
self.uiMap["chapter.img.mystery_box_icon.desc"]:setText(desc)
end
local rewardChapterId = DataManager.ChapterData:getIsHaveRewardsMinId()

1
lua/app/ui/main_city/module_unlock_ui.lua
View File

@ -85,6 +85,7 @@ function ModuleUnlockUI:checkShowNext()
end
end
self:showModuleUnlockAppearAnim()
AudioManager:playEffect(AudioManager.EFFECT_ID.FUNC_OPEN)
end
-- 出现