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(); // 计算合力