joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

竞赛场景恢复

Browse Source
This commit is contained in:
joylink_zhangsai 2021-04-29 18:59:35 +08:00
parent 5db771b765
commit 687ada1133
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/club/joylink/rtss/simulation/cbtc/competition/CompetitionAndScriptManager.java
View File

@ -95,14 +95,6 @@ public class CompetitionAndScriptManager {
String content = unfinishedAction.getContent(); String content = unfinishedAction.getContent();
unfinishedAction.setContent(String.format(content, currentTime)); unfinishedAction.setContent(String.format(content, currentTime));
} }
// TODO: 2021/4/29 为方便测试
if (ScriptActionBO.ActionType.Operation.equals(unfinishedAction.getType())
|| ScriptActionBO.ActionType.Drive.equals(unfinishedAction.getType())) {
if (competition != null && competition.isWeChat()) {
unfinishedAction.finish();
return;
}
}
//如果动作执行者不是机器人 //如果动作执行者不是机器人
if (!unfinishedAction.getMember().isRobot()) { if (!unfinishedAction.getMember().isRobot()) {
if (!unfinishedAction.isPrompt()) { if (!unfinishedAction.isPrompt()) {

3
src/main/java/club/joylink/rtss/simulation/cbtc/competition/CompetitionBO.java
View File

@ -143,8 +143,7 @@ public class CompetitionBO {
public void start(Client client) { public void start(Client client) {
this.started = true; this.started = true;
// this.weChat = Client.Assistant.equals(client); this.weChat = Client.Assistant.equals(client);
this.weChat = true;
} }
public void end() { public void end() {