From ed00bc646b5bcafd46d9cd9a810f2f68c48008cb Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Fri, 28 Aug 2020 17:26:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=89=E7=BB=B4=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6=E5=88=87=E8=BD=A6=E5=90=8E=E6=9C=AA=E5=A4=8D=E4=BD=8D?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jl3ddrive/moveupdate/DrivingConnectNew.js   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
index 73535947b..be6287a6e 100644
--- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
+++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
@@ -56,6 +56,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
 		}
 
 		if(data.type == "Train_Position_3D"){
+
 			otherTrainRun(data.body);
 			return;
 		}
@@ -220,13 +221,17 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
 			}else{
 
 				for(let i=0,leni=data.length;i<leni;i++){
+					let updateTrain = trainlisttest.otherTrainList[data[i].code];
+
 					if(data[i].code != trainmodel.code){
-						let updateTrain = trainlisttest.otherTrainList[data[i].code];
+
 						otherTrainUpdate(data[i],updateTrain);
 					}else{
-						trainlisttest.otherTrainList[data[i].code].position.x = -99999;
+						updateTrain.position.x = -99999;
 					}
 
+
+
 				}
 			}
 
@@ -240,7 +245,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
 			// 	console.log(data);
 			// }
 
-			if(updateTrainModel.code != trainmodel.code){
 				if(data.section != updateTrainModel.nowsection){
 					updateTrainModel.nowsection = data.section;
 					updateTrainModel.curve = rails.sectionrail[data.section].lineleft;
@@ -397,7 +401,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
 						}
 					}
 				}
-			}
+
 
 		}
 
@@ -407,7 +411,12 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
 			// if(data.code = "336"){
 			// 	console.log(data);
 			// }
+
 			if(data.code != trainmodel.code){
+				if(trainlisttest.otherTrainList[trainmodel.code] && trainmodel.code){
+					trainlisttest.otherTrainList[trainmodel.code].offset = 0;
+				}
+
 				trainmodel.code = data.code;
 				trainmodel.nowcode = data.code;
 			}