diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/competition/CompetitionAndScriptManager.java b/src/main/java/club/joylink/rtss/simulation/cbtc/competition/CompetitionAndScriptManager.java index 51e38c01b..68f97e763 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/competition/CompetitionAndScriptManager.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/competition/CompetitionAndScriptManager.java @@ -211,6 +211,7 @@ public class CompetitionAndScriptManager { return; } unfinishedAction.finish(); + scriptExecuteService.executeAction(simulation, unfinishedAction, correctSystemTime); unfinishedAction = script.getNextNeedPassAction(); } return; @@ -232,16 +233,16 @@ public class CompetitionAndScriptManager { break; case Conversation: if (unfinishedAction.isAudioPlaying()) { + // 获取当前会话 + Conversation conversation = simulation.getSimulationConversationMap().get(unfinishedAction.getConversationId()); + if (conversation.getMemberList().stream().allMatch(m -> m.getMember().isRobot())) { // 会话人员全部是机器人 + unfinishedAction.finish(); + } return; } if (scriptExecuteService.executeAction(simulation, unfinishedAction, correctSystemTime)) { unfinishedAction.playAudio(); } - // 获取当前会话 - Conversation conversation = simulation.getSimulationConversationMap().get(unfinishedAction.getConversationId()); - if (conversation.getMemberList().stream().allMatch(m -> m.getMember().isRobot())) { // 会话人员全部是机器人 - unfinishedAction.finish(); - } break; default: throw new SimulationException(SimulationExceptionType.System_Fault, "未知的动作类型");