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:
chenxi 2023-05-30 18:47:19 +08:00
commit 44085f6c23
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
local LocalizationGlobalConst =
{
BATTLE_DESC_11 = "BATTLE_DESC_11",
MAIN_BTN_1 = "MAIN_BTN_1",
QLT_DESC_1 = "QLT_DESC_1",
QLT_DESC_2 = "QLT_DESC_2",

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

@ -188,6 +188,7 @@ local localization_global =
["HERO_UNLOCK_DESC"] = "现在可从宝箱中获得",
["BOUNTY_TITLE"] = "通行证",
["REMAIN_TIME"] = "剩余时间：{0}",
["BATTLE_DESC_11"] = "神秘宝箱",
}
return localization_global

2
lua/app/ui/battle/battle_box_open_ui.lua
View File

@ -30,6 +30,8 @@ function BattleBoxOpenUI:onLoadRootComplete()
self.callback()
end
end)
uiMap["battle_box_open_ui.title_bg.title"]:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_11))
end
return BattleBoxOpenUI

12
lua/app/ui/battle/battle_ui.lua
View File

@ -2038,6 +2038,8 @@ function BattleUI:initBossEnterAni()
self.bossEnterNode = uiMap["battle_ui.bg_2.boss_enter_node"]
self.bossEnterImg = uiMap["battle_ui.bg_2.boss_enter_node.ui_spine_obj"]
self.bossName = uiMap["battle_ui.bg_2.boss_enter_node.boss_name"]
self.bossEnterNodeAnimator = self.bossEnterNode:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR)
self.bossEnterNodeAnimator.enabled = false
self.bossEnterNodeCanvasGroup = self.bossEnterNode:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP)
self.bossEnterNode:setVisible(false)
end
@ -2053,7 +2055,7 @@ function BattleUI:showBossEnterAni(bornTime, bossName, monsterComp, callback)
self.bossEnterNode:setVisible(true)
self.bossEnterImg:setVisible(false)
self.bossName:setText(bossName)
self.bossName:setAnchoredPositionX(-800)
self.bossName:setAnchoredPositionX(-756)
self.bossEnterNodeCanvasGroup.alpha = 0
monsterComp:getBaseObject():setLocalPosition(DEFAULT_X, 0, 0)
local keyFrameTimes = self.bossEnterImg:getAnimationKeyFrameTime("idle")
@ -2070,6 +2072,9 @@ function BattleUI:showBossEnterAni(bornTime, bossName, monsterComp, callback)
self.bossEnterAniSeq:AppendCallback(function()
self.bossEnterImg:setVisible(true)
self.bossEnterImg:playAnim("idle", false, true)
-- CS.UnityEngine.Animator.StringToHash("born") 结果是1155742626
self.bossEnterNodeAnimator.enabled = true
self.bossEnterNodeAnimator:Play(1155742626, -1, 0)
monsterComp:initPosition()
monsterComp:getBaseObject():setParent(self.maxLayerNode, false)
if callback then
@ -2082,20 +2087,17 @@ function BattleUI:showBossEnterAni(bornTime, bossName, monsterComp, callback)
monsterComp:getBaseObject():setParent(self:getBattleNode(), false)
self.bossEnterNode:setVisible(false)
self.battleController:showBuffTips(GConst.BattleConst.SIDE_DEF, true)
self.bossEnterNodeAnimator.enabled = false
end)
if keyFrameTime > 0 then
local addTime = 1
self.bossEnterAniSeq:InsertCallback(keyFrameTime + 0.2, function()
self.bossName:setText(bossName)
self.battleController:setTimeScale(0)
end)
self.bossEnterAniSeq:Insert(keyFrameTime + 0.2, self.bossName:getTransform():DOAnchorPosX(-212, 0.2))
self.bossEnterAniSeq:InsertCallback(keyFrameTime + 0.2 + addTime, function()
self.battleController:setTimeScale(DataManager.BattleData:getTimeScale())
end)
else
self.bossEnterAniSeq:Insert(0.2, self.bossName:getTransform():DOAnchorPosX(-212, 0.2))
end
end