Commit 2bd1108b by liulongfei

暂时提交修改文件

parent c7a41468
...@@ -47,6 +47,9 @@ namespace VIZ.Package.Module ...@@ -47,6 +47,9 @@ namespace VIZ.Package.Module
this.vizCommandService.SetEnabledUpdate(conn, false); this.vizCommandService.SetEnabledUpdate(conn, false);
try try
{ {
// 清楚板子上的信息
this.vizCommandService.SetCue(conn, ApplicationDomainEx.CurrentPage.ScenePath);
this.vizCommandService.SetObject(conn, ApplicationDomainEx.CurrentPage.ScenePath, ApplicationDomainEx.CurrentPage.Layer); this.vizCommandService.SetObject(conn, ApplicationDomainEx.CurrentPage.ScenePath, ApplicationDomainEx.CurrentPage.Layer);
if (obj != null) if (obj != null)
{ {
...@@ -63,7 +66,7 @@ namespace VIZ.Package.Module ...@@ -63,7 +66,7 @@ namespace VIZ.Package.Module
log.Error(ex); log.Error(ex);
} }
this.vizCommandService.SetEnabledUpdate(conn, true); this.vizCommandService.SetEnabledUpdate(conn, true);
this.vizCommandService.Start(conn, ApplicationDomainEx.CurrentPage.Layer); this.vizCommandService.Start(conn, ApplicationDomainEx.CurrentPage.Layer, ApplicationDomainEx.CurrentPage.ScenePath);
} }
/// <summary> /// <summary>
...@@ -96,7 +99,7 @@ namespace VIZ.Package.Module ...@@ -96,7 +99,7 @@ namespace VIZ.Package.Module
// 当前逻辑层场景是否为将要上的场景 // 当前逻辑层场景是否为将要上的场景
bool isCurrent = !string.IsNullOrWhiteSpace(transitionLogicLayer.SceneIdentifier) && string.Equals(transitionLogicLayer.SceneIdentifier, newPageBase.Scene); bool isCurrent = !string.IsNullOrWhiteSpace(transitionLogicLayer.SceneIdentifier) && string.Equals(transitionLogicLayer.SceneIdentifier, newPageBase.Scene);
// 当前逻辑层是否被占用 // 当前逻辑层是否被占用
bool isUsed = !string.IsNullOrWhiteSpace(transitionLogicLayer.SceneIdentifier); bool isUsed = string.IsNullOrWhiteSpace(transitionLogicLayer.SceneIdentifier);
// 背景场景路径 // 背景场景路径
string bgScenePath = $"{newPageBase.GetSceneParent()}/{newPageBase.BackgroundScene}"; string bgScenePath = $"{newPageBase.GetSceneParent()}/{newPageBase.BackgroundScene}";
// 获取当前场景名 // 获取当前场景名
......
...@@ -31,6 +31,19 @@ namespace VIZ.Package.Service ...@@ -31,6 +31,19 @@ namespace VIZ.Package.Service
} }
/// <summary> /// <summary>
/// /清楚板子信息 根据trio CUE来的
/// </summary>
/// <param name="conn"></param>
/// <param name="scene"></param>
public void SetCue(ConnModel conn,string scene)
{
if (string.IsNullOrEmpty(scene))
return;
conn.EndpointManager.Request($"SCENE*{scene} CUE");
}
/// <summary>
/// 设置空场景 /// 设置空场景
/// </summary> /// </summary>
/// <param name="conn">连接</param> /// <param name="conn">连接</param>
...@@ -276,10 +289,17 @@ namespace VIZ.Package.Service ...@@ -276,10 +289,17 @@ namespace VIZ.Package.Service
/// </summary> /// </summary>
/// <param name="conn">连接</param> /// <param name="conn">连接</param>
/// <param name="layer">层</param> /// <param name="layer">层</param>
public void Start(ConnModel conn, VizLayer layer) public void Start(ConnModel conn, VizLayer layer,string scene)
{
if (string.IsNullOrWhiteSpace(scene))
{ {
conn.EndpointManager.Send($"RENDERER*{layer}*STAGE START"); conn.EndpointManager.Send($"RENDERER*{layer}*STAGE START");
} }
else
{
conn.EndpointManager.Send($"SCENE*{scene}*STAGE START");
}
}
/// <summary> /// <summary>
/// 继续版子 /// 继续版子
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment