2.0协议完善加简单交管配置
This commit is contained in:
@@ -297,11 +297,13 @@ namespace StandardScene
|
||||
&& car.status.pendingLocks.Length == 0 && !car.tags.Contains("deliver") &&//pendingLocks临时增加解决车接多任务问题
|
||||
(!car.tags.Contains("shouldCharge") || needCharge)
|
||||
&& !car.tags.Contains("currentWorkStep") && !car.fields.ContainsKey("StopAccept") && car.tags.Contains("Online"); //巡航任务未完成的车
|
||||
if (car.name.Contains("模拟"))
|
||||
// Mag2Car 联调:UDP Online 即可调度,不强制 lstatus=上线(模拟器常报 state=0 未准备)
|
||||
var isMag2Car = string.Equals(car.GetType().Name, "Mag2Car", StringComparison.Ordinal);
|
||||
if (car.name.Contains("模拟") || isMag2Car)
|
||||
{
|
||||
conditions = car.GetLastSite() != -1 &&
|
||||
(!car.tags.Contains("holdCar") || !checkHoldCar) && !car.tags.Contains("occupied")
|
||||
|
||||
&& (!isMag2Car || car.tags.Contains("Online"))
|
||||
&& car.status.pendingLocks.Length == 0 && !car.tags.Contains("deliver") &&//pendingLocks临时增加解决车接多任务问题
|
||||
(!car.tags.Contains("shouldCharge") || needCharge)
|
||||
&& !car.tags.Contains("currentWorkStep") && !car.fields.ContainsKey("StopAccept"); //巡航任务未完成的车
|
||||
|
||||
Reference in New Issue
Block a user