From 3639ea5a2f6b1efde6a7944cea49477909e6c613 Mon Sep 17 00:00:00 2001
From: walker-sheng <shengxuqiang@joylink.club>
Date: Thu, 17 Jun 2021 15:27:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=BD=A6=E8=BF=90=E8=A1=8C=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E2=80=94=E2=80=94=E4=BF=AE=E6=94=B9=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E6=9C=80=E9=AB=98=E9=80=9F=E5=BA=A6=E4=B8=BA350km/h=20?=
 =?UTF-8?q?=E6=96=B0=E4=BB=BF=E7=9C=9F=E9=80=BB=E8=BE=91=E2=80=94=E2=80=94?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E8=BD=BD=E8=BF=90=E8=A1=8C=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../club/joylink/rtss/simulation/rt/RtSimulationService.java  | 2 +-
 .../java/club/joylink/rtss/simulation/rt/TL/bo/TlTrain.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/rt/RtSimulationService.java b/src/main/java/club/joylink/rtss/simulation/rt/RtSimulationService.java
index 6f7869060..9b5feca6f 100644
--- a/src/main/java/club/joylink/rtss/simulation/rt/RtSimulationService.java
+++ b/src/main/java/club/joylink/rtss/simulation/rt/RtSimulationService.java
@@ -68,7 +68,7 @@ public class RtSimulationService {
         try {
             rtSimulation.mapVO = mapVO;
             this.loadingMap(rtSimulation, mapVO);
-            this.loadRunPlan(rtSimulation, this.queryUserRunPlan(accountVO.getId(), mapId));
+            this.loadRunPlan(rtSimulation, this.queryUserRunPlan(mapId, accountVO.getId()));
             this.initSimulationMember(rtSimulation);
             this.initCreatorPlayMember(rtSimulation, mapVO);
         } catch (Exception e) {
diff --git a/src/main/java/club/joylink/rtss/simulation/rt/TL/bo/TlTrain.java b/src/main/java/club/joylink/rtss/simulation/rt/TL/bo/TlTrain.java
index 3a73f2a26..9f2fa3877 100644
--- a/src/main/java/club/joylink/rtss/simulation/rt/TL/bo/TlTrain.java
+++ b/src/main/java/club/joylink/rtss/simulation/rt/TL/bo/TlTrain.java
@@ -185,7 +185,7 @@ public class TlTrain extends TlDevice {
 //        G7(7, 95, 250, 0.41f, 0.29f),
 //        G8(8, 120, 300, 0.35f, 0.21f),
 //        G9(9, 150, 360, 0.26f, 0.16f),
-        G(1, 3, 100, 1.69f, 0.18f)
+        G(1, 3, 350, 1.69f, 0.18f)
         ;
 
         int gear;
@@ -244,7 +244,7 @@ public class TlTrain extends TlDevice {
             }
         }
         // 摩擦阻力
-        fb += 0.034 * this.srTrain.getTotalMass();
+        fb += 0.034 * this.srTrain.getTotalMass() + speed*speed;
         // 根据制动阀计算制动力
         fb += this.calculateFb();
         // 计算合力