Merge branch 'develop' into feature/方块拼图
This commit is contained in:
@@ -62,6 +62,7 @@ namespace AibisDream.FixSystem
|
||||
FixState.MemoryCut => new MemoryCutState(),
|
||||
FixState.LogicCut => new LogicCutState(),
|
||||
FixState.Dream => new DreamState(),
|
||||
FixState.LanguageAnalysis => new LanguageAnalysisState(),
|
||||
_ => new DefaultState()
|
||||
};
|
||||
|
||||
@@ -87,6 +88,7 @@ namespace AibisDream.FixSystem
|
||||
MemoryCut,
|
||||
LogicCut,
|
||||
Dream,
|
||||
LanguageAnalysis,
|
||||
}
|
||||
|
||||
public struct DefaultState : IState<FixState>
|
||||
@@ -424,8 +426,10 @@ namespace AibisDream.FixSystem
|
||||
|
||||
public IEnumerator Enter()
|
||||
{
|
||||
// 先切BodyModule
|
||||
// 获取表达系统
|
||||
var expressionManager = FixSystemCenter.SystemDic.Get<ExpressionManager>();
|
||||
|
||||
// 先切 BodyModule(如果需要)
|
||||
if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule))
|
||||
{
|
||||
var bodyModule = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
|
||||
@@ -433,11 +437,14 @@ namespace AibisDream.FixSystem
|
||||
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
|
||||
}
|
||||
|
||||
// 切换相机
|
||||
// 开启表达系统视图(无参数版本,使用默认配置)
|
||||
expressionManager.OpenView();
|
||||
|
||||
// 切换到表达相机
|
||||
yield return CameraKit.Instance.SwitchCamera(CameraEnum.Expression);
|
||||
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeInAsync(0.5f);
|
||||
//expressionManager.OpenView();
|
||||
|
||||
// 切换到深度表达相机
|
||||
yield return CameraKit.Instance.SwitchCamera(CameraEnum.ExpressionDeep);
|
||||
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutAsync(0.5f);
|
||||
}
|
||||
@@ -446,8 +453,13 @@ namespace AibisDream.FixSystem
|
||||
{
|
||||
var expressionManager = FixSystemCenter.SystemDic.Get<ExpressionManager>();
|
||||
var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
|
||||
|
||||
// 重置身体模块
|
||||
bodyModuleSystem.ResetPlug();
|
||||
|
||||
// 关闭表达系统视图
|
||||
expressionManager.CloseView();
|
||||
|
||||
yield break;
|
||||
}
|
||||
}
|
||||
@@ -688,4 +700,61 @@ namespace AibisDream.FixSystem
|
||||
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutAsync(0.1f);
|
||||
}
|
||||
}
|
||||
|
||||
public struct LanguageAnalysisState : IState<FixState>
|
||||
{
|
||||
public FixState GetState => FixState.LanguageAnalysis;
|
||||
|
||||
public void SetArgs(string args)
|
||||
{
|
||||
// 无
|
||||
}
|
||||
|
||||
public IEnumerator Enter()
|
||||
{
|
||||
// 获取语言分析系统
|
||||
var languageAnalysisManager = FixSystemCenter.SystemDic.Get<AibisDream.MiniGame.Language.LanguageAnalysisManager>();
|
||||
|
||||
if (languageAnalysisManager == null)
|
||||
{
|
||||
Debug.LogError("[LanguageAnalysisState] LanguageAnalysisManager 未找到!");
|
||||
yield break;
|
||||
}
|
||||
|
||||
// 先切 BodyModule(如果需要)
|
||||
if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule))
|
||||
{
|
||||
var bodyModule = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
|
||||
bodyModule.SwitchModuleGroup(ModuleState.Head);
|
||||
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
|
||||
}
|
||||
|
||||
// 打开语言分析系统视图
|
||||
languageAnalysisManager.OpenView();
|
||||
|
||||
// 切换到语言分析相机
|
||||
yield return CameraKit.Instance.SwitchCamera(CameraEnum.LanguageAnalysis);
|
||||
|
||||
}
|
||||
|
||||
public IEnumerator Exit()
|
||||
{
|
||||
var languageAnalysisManager = FixSystemCenter.SystemDic.Get<AibisDream.MiniGame.Language.LanguageAnalysisManager>();
|
||||
var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
|
||||
|
||||
if (languageAnalysisManager != null)
|
||||
{
|
||||
// 关闭语言分析系统视图
|
||||
languageAnalysisManager.CloseView();
|
||||
}
|
||||
|
||||
// 重置身体模块
|
||||
if (bodyModuleSystem != null)
|
||||
{
|
||||
bodyModuleSystem.ResetPlug();
|
||||
}
|
||||
|
||||
yield break;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user