Merge branch '火山语言模块原型制作' into 11.18火山流程合入
This commit is contained in:
@@ -424,8 +424,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 +435,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 +451,13 @@ namespace AibisDream.FixSystem
|
||||
{
|
||||
var expressionManager = FixSystemCenter.SystemDic.Get<ExpressionManager>();
|
||||
var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
|
||||
|
||||
// 重置身体模块
|
||||
bodyModuleSystem.ResetPlug();
|
||||
|
||||
// 关闭表达系统视图
|
||||
expressionManager.CloseView();
|
||||
|
||||
yield break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user