切换场景逻辑

VIZ.Package.Module/Control/Controller/ControlController.cs

@@ -117,9 +117,9 @@ namespace VIZ.Package.Module
                 foreach (TransitionLogicLayerInfo logicLayer in bgSceneInfo.TransitionLogic.LayerInfos)
                 foreach (TransitionLogicLayerInfo logicLayer in bgSceneInfo.TransitionLogic.LayerInfos)
                 {
                 {
                     // SCENE*TITLES/2022/YC/BG1*STAGE*DIRECTOR*DJ_CUP SHOW $O
                     // SCENE*TITLES/2022/YC/BG1*STAGE*DIRECTOR*DJ_CUP SHOW $O
-                    this.vizCommandService.DirectorShowWithTransitionLogic(conn, logicLayer.LayerIdentifier, ApplicationConstants.VIZ_TRANSITIONLOGIC_DEFAULT_OUT);
+                    this.vizCommandService.DirectorShowWithTransitionLogic(conn, bgScenePath, logicLayer.LayerIdentifier, ApplicationConstants.VIZ_TRANSITIONLOGIC_DEFAULT_OUT);
                     // SCENE*TITLES/2022/YC/BG1*TREE*$DJ_CUP*FUNCTION*Toggle*reset_current INVOKE
                     // SCENE*TITLES/2022/YC/BG1*TREE*$DJ_CUP*FUNCTION*Toggle*reset_current INVOKE
-                    this.vizCommandService.ToggleResetWithTransitionLogic(conn, logicLayer.LayerIdentifier);
+                    this.vizCommandService.ToggleResetWithTransitionLogic(conn, bgScenePath, logicLayer.LayerIdentifier);
 
 
                     // 清理状态
                     // 清理状态
                     logicLayer.SceneIdentifier = null;
                     logicLayer.SceneIdentifier = null;
@@ -136,7 +136,7 @@ namespace VIZ.Package.Module
             if (!string.Equals(newPageBase.BackgroundScene, sceneName))
             if (!string.Equals(newPageBase.BackgroundScene, sceneName))
             {
             {
                 // SCENE*TITLES/2022/YC/BG1*TREE*$DJ_CUP*FUNCTION*Toggle*reset_current INVOKE
                 // SCENE*TITLES/2022/YC/BG1*TREE*$DJ_CUP*FUNCTION*Toggle*reset_current INVOKE
-                this.vizCommandService.ToggleResetWithTransitionLogic(conn, newPageBase.LayerIdentifier);
+                this.vizCommandService.ToggleResetWithTransitionLogic(conn, bgScenePath, newPageBase.LayerIdentifier);
             }
             }
 
 
             // SCENE*TITLES/2022/YC/BG1*TREE*$DJ_CUP*FUNCTION*Toggle*object SET GEOM*TITLES/2022/YC/YC_CUP
             // SCENE*TITLES/2022/YC/BG1*TREE*$DJ_CUP*FUNCTION*Toggle*object SET GEOM*TITLES/2022/YC/YC_CUP
@@ -160,7 +160,7 @@ namespace VIZ.Package.Module
             if (isUsed && string.Equals(newPageBase.BackgroundScene, sceneName))
             if (isUsed && string.Equals(newPageBase.BackgroundScene, sceneName))
             {
             {
                 // RENDERER*MAIN_LAYER*STAGE*DIRECTOR*DJ_CUP SHOW $IN
                 // RENDERER*MAIN_LAYER*STAGE*DIRECTOR*DJ_CUP SHOW $IN
-                this.vizCommandService.DirectorShowWithTransitionLogic(conn, newPageBase.LayerIdentifier, newPageBase.StateIdentifier);
+                this.vizCommandService.DirectorShowWithTransitionLogic(conn, bgScenePath, newPageBase.LayerIdentifier, newPageBase.StateIdentifier);
 
 
                 // RENDERER*MAIN_LAYER*TREE*$DJ_CUP*FUNCTION*Toggle*switch INVOKE
                 // RENDERER*MAIN_LAYER*TREE*$DJ_CUP*FUNCTION*Toggle*switch INVOKE
                 this.vizCommandService.ToggleSwitchWithTransitionLogic(conn, newPageBase);
                 this.vizCommandService.ToggleSwitchWithTransitionLogic(conn, newPageBase);

VIZ.Package.Service/Viz/VizCommandService.cs

@@ -347,18 +347,21 @@ namespace VIZ.Package.Service
         /// <param name="conn">连接</param>
         /// <param name="conn">连接</param>
         /// <param name="layer">逻辑层</param>
         /// <param name="layer">逻辑层</param>
         /// <param name="state">状态</param>
         /// <param name="state">状态</param>
-        public void DirectorShowWithTransitionLogic(ConnModel conn, string layer, string state)
+        public void DirectorShowWithTransitionLogic(ConnModel conn, string bgScenePath, string layer, string state)
         {
         {
             if (conn == null)
             if (conn == null)
                 throw new ArgumentNullException(nameof(conn));
                 throw new ArgumentNullException(nameof(conn));
 
 
+            if (string.IsNullOrWhiteSpace(bgScenePath))
+                throw new ArgumentNullException(nameof(bgScenePath));
+
             if (string.IsNullOrWhiteSpace(layer))
             if (string.IsNullOrWhiteSpace(layer))
                 throw new ArgumentNullException(nameof(layer));
                 throw new ArgumentNullException(nameof(layer));
 
 
             if (string.IsNullOrWhiteSpace(state))
             if (string.IsNullOrWhiteSpace(state))
                 throw new ArgumentNullException(nameof(state));
                 throw new ArgumentNullException(nameof(state));
 
 
-            conn.EndpointManager.Send($"RENDERER*MAIN_LAYER*STAGE*DIRECTOR*{layer} SHOW ${state}");
+            conn.EndpointManager.Send($"SCENE*{bgScenePath}*STAGE*DIRECTOR*P{layer} SHOW ${state}");
         }
         }
 
 
         /// <summary>
         /// <summary>
@@ -442,16 +445,20 @@ namespace VIZ.Package.Service
         /// 触发重置
         /// 触发重置
         /// </summary>
         /// </summary>
         /// <param name="conn">连接</param>
         /// <param name="conn">连接</param>
+        /// <param name="bgScenePath">逻辑场景</param>
         /// <param name="logicLayer">切换逻辑层</param>
         /// <param name="logicLayer">切换逻辑层</param>
-        public void ToggleResetWithTransitionLogic(ConnModel conn, string logicLayer)
+        public void ToggleResetWithTransitionLogic(ConnModel conn, string bgScenePath, string logicLayer)
         {
         {
             if (conn == null)
             if (conn == null)
                 throw new ArgumentNullException(nameof(conn));
                 throw new ArgumentNullException(nameof(conn));
 
 
+            if (string.IsNullOrWhiteSpace(bgScenePath))
+                throw new ArgumentNullException(nameof(bgScenePath));
+
             if (string.IsNullOrWhiteSpace(logicLayer))
             if (string.IsNullOrWhiteSpace(logicLayer))
                 throw new ArgumentNullException(nameof(logicLayer));
                 throw new ArgumentNullException(nameof(logicLayer));
 
 
-            conn.EndpointManager.Send($"RENDERER*MAIN_LAYER*TREE*${logicLayer}*FUNCTION*Toggle*reset_current INVOKE");
+            conn.EndpointManager.Send($"SCENE*{bgScenePath}*TREE*${logicLayer}*FUNCTION*Toggle*reset_current INVOKE");
         }
         }
 
 
         /// <summary>
         /// <summary>