两机器人干涉设置

source/DeviceLibrary/doubleLine/DoubleLineBean_S1Shelf.cs

@@ -1158,8 +1158,8 @@ namespace OnlineStore.DeviceLibrary
         #region 机器人干涉判断
         #region 机器人干涉判断
         internal bool ABBCanStart(int robotNum, bool isMyPoint)
         internal bool ABBCanStart(int robotNum, bool isMyPoint)
         {
         {
-            //左侧是2号机器人，右侧是1号机器人
-            if (robotNum.Equals(1))
+            //左侧是1号机器人，右侧是2号机器人
+            if (robotNum.Equals(2))
             {
             {
                 if (!LeftRobot.MoveInfo.MoveType.Equals(LineMoveType.None))
                 if (!LeftRobot.MoveInfo.MoveType.Equals(LineMoveType.None))
                 {
                 {
@@ -1173,7 +1173,7 @@ namespace OnlineStore.DeviceLibrary
                     }
                     }
                 }
                 }
             }
             }
-            if (robotNum.Equals(2))
+            if (robotNum.Equals(1))
             {
             {
                 if (!RightRobot.MoveInfo.MoveType.Equals(LineMoveType.None))
                 if (!RightRobot.MoveInfo.MoveType.Equals(LineMoveType.None))
                 {
                 {

source/DeviceLibrary/doubleLine/RobotMoveBean.cs

@@ -35,7 +35,7 @@ namespace OnlineStore.DeviceLibrary
             int smallEnd = 46;
             int smallEnd = 46;
             int bigStart = 1;
             int bigStart = 1;
             int bigEnd = 6;
             int bigEnd = 6;
-            if (num.Equals(1))
+            if (num.Equals(2))
             {
             {
                 smallStart = 47;
                 smallStart = 47;
                 smallEnd = 92;
                 smallEnd = 92;