音效提交

dev_chengFeng
jiaoyangna 2021-05-24 20:22:38 +08:00
parent 1d11aeb1b0
commit 4452bb1d9a
8 changed files with 20 additions and 5 deletions

View File

@ -107,5 +107,9 @@ SoundConfig = {
UI_Xingyunzhuanpan = "UI_Xingyunzhuanpan",--幸运转盘
UI_Xyy_jiaobu = "UI_Xyy_jiaobu",--逍遥游
UI_Xyy_jinbi = "UI_Xyy_jinbi",--逍遥游
BGM_STORY_1_1 = "bgm_story_1_1",--逍遥游
BGM_STORY_1_2 = "bgm_story_1_2",--逍遥游
BGM_STORY_2_1 = "bgm_story_2_1",--逍遥游
BGM_STORY_2_2 = "bgm_story_2_2",--逍遥游
}

View File

@ -214,7 +214,7 @@ function this:IsBossFight(fightType)
end
--界面打开时调用(用于子类重写)
function this:OnOpen(_fightData, _fightType, _endFunc, _guideType)
function this:OnOpen(_fightData, _fightType, _endFunc, _guideType,isChangeBGM)
GuideBattleLogic:Init(_guideType)
BattleView:OnOpen(_fightData,_fightType, this:IsBossFight(_fightType))
@ -226,7 +226,10 @@ function this:OnOpen(_fightData, _fightType, _endFunc, _guideType)
this.BG:GetComponent("Image").sprite = this.spLoader:LoadSprite(BattleManager.GetBattleBg(fightType))
-- SoundManager.PlayMusic(SoundConfig.BGM_Battle_1, true, function()
SoundManager.PlayMusic(SoundConfig.BGM_Battle_2, false)
if not isChangeBGM then
SoundManager.PlayMusic(SoundConfig.BGM_Battle_2, false)
end
-- end)
this.fightResult = nil

View File

@ -9,6 +9,11 @@ function this.Initialize()
end
function this.InitData(groupId)
if groupId == 1 then
SoundManager.PlayMusic(SoundConfig.BGM_STORY_1_1)
elseif groupId == 3 then
SoundManager.PlayMusic(SoundConfig.BGM_STORY_2_1)
end
this.groupConfigs = {}
this.InitGroupIds(groupId)
this.GetSingleStoryConfig()
@ -34,6 +39,7 @@ function this.GetSingleStoryConfig()
else
StoryMapManager.isShowStory = 0
Game.GlobalEvent:DispatchEvent(GameEvent.GuaJi.CloseStoryMapPanel)
SoundManager.PlayMusic(SoundConfig.BGM_Main)
end
end

View File

@ -84,7 +84,7 @@ end
--移除事件监听(用于子类重写)
function StoryMapPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.GuaJi.CloseStoryMapPanel,this.ClosePanel)
Game.GlobalEvent:RemoveEvent(GameEvent.GuaJi.CloseStoryMapPanel,this.CloseThisPanel)
end
--界面打开时调用(用于子类重写)
@ -253,6 +253,7 @@ function this:CheckTrigger(data,go)
end
Util.AddParticleSortLayer(this.UI_Effect_ChuFaEffect_01,newSortingOrder - sortingOrder)
this.UI_Effect_ChuFaEffect_01.gameObject:SetActive(true)
SoundManager.PlayMusic(SoundConfig.BGM_STORY_1_2)
SoundManager.PlaySound(SoundConfig.STORY_VOICE_1_3)
Timer.New(function()
if this.UI_Effect_ChuFaEffect_01 then
@ -292,6 +293,7 @@ function this:CheckTrigger(data,go)
end
if this.UI_Effect_ChuFaEffect_05 then
this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(true)
SoundManager.PlayMusic(SoundConfig.bgm_story_2_2)
SoundManager.PlaySound(SoundConfig.STORY_VOICE_2_2)
end
end,data.groups[1],1,false):Start()
@ -460,7 +462,7 @@ function this:EnterFight()
}
UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test,function()
this:StackPop()
end)
end,nil,true)
end
function this:CloseDiaLog()