From e966d6360c14f71e858e497b843b1d8fa9ced0eb Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Thu, 29 Apr 2021 16:46:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=9C=BA=E6=99=AF=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E8=B5=B0=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E3=80=81=E6=93=8D=E4=BD=9C=E7=B1=BB=E5=8A=A8=E4=BD=9C=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=AE=8C=E6=88=90=EF=BC=88=E4=B8=BA=E4=BA=86=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cbtc/competition/CompetitionAndScriptManager.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 936a2e5f5..f275bb7fb 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
@@ -96,7 +96,8 @@ public class CompetitionAndScriptManager {
             unfinishedAction.setContent(String.format(content, currentTime));
         }
         // TODO: 2021/4/29 为方便测试
-        if (!ScriptActionBO.ActionType.Conversation.equals(unfinishedAction.getType())) {
+        if (ScriptActionBO.ActionType.Operation.equals(unfinishedAction.getType())
+                || ScriptActionBO.ActionType.Drive.equals(unfinishedAction.getType())) {
             if (competition != null && competition.isWeChat()) {
                 unfinishedAction.finish();
                 return;