|
@@ -1,4 +1,5 @@
|
|
|
using Common.Utility.CombatEvent;
|
|
|
+using Core.Audio;
|
|
|
using Core.State;
|
|
|
using Fort23.Core;
|
|
|
using GameLogic.Combat.CombatState;
|
|
@@ -6,11 +7,13 @@ using GameLogic.Combat.CombatType;
|
|
|
using GameLogic.Combat.Hero.HeroGPU;
|
|
|
using GameLogic.CombatScenesTool;
|
|
|
using UnityEngine;
|
|
|
+using Utility.CustomizeTimeLogic.FxLogic.TimeLineEvent;
|
|
|
using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
|
|
|
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic;
|
|
|
|
|
|
namespace GameLogic.Combat.CombatTool
|
|
|
{
|
|
|
- public class CombatController
|
|
|
+ public class CombatController : ITimeLineAudio
|
|
|
{
|
|
|
public static CombatController currActiveCombat;
|
|
|
public CombatHeroController CombatHeroController;
|
|
@@ -30,6 +33,7 @@ namespace GameLogic.Combat.CombatTool
|
|
|
|
|
|
public async CTask InitCombat()
|
|
|
{
|
|
|
+ TimeLineSingletonEventManager.Instance.AddTimeLineBasic(this);
|
|
|
GameTimeLineParticleFactory = new GameTimeLineParticleFactory();
|
|
|
TimeLineFxParticleTool.Instance.Init(GameTimeLineParticleFactory);
|
|
|
currActiveCombat = this;
|
|
@@ -71,7 +75,11 @@ namespace GameLogic.Combat.CombatTool
|
|
|
|
|
|
stateControl.Update(t);
|
|
|
CombatTypeBasic?.Update(t);
|
|
|
-
|
|
|
+ }
|
|
|
+
|
|
|
+ public void PlayAudio(string audioName, bool isLoop)
|
|
|
+ {
|
|
|
+ AudioManager.Instance.PlayAudio(audioName, isLoop);
|
|
|
}
|
|
|
}
|
|
|
}
|