改善

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index a859b58..c7fc1cc 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -8767,7 +8767,7 @@ SKIP1:
                 }U = UTop;
                 }
                 if(MS0->S4.unitType == 0){
-                    if(MS0->S4.objeFlag) team0num = MS0->S4.unitNum;
+                    if(MS0->S4.objeFlag ||!MS0->S4.placeFlag) team0num = MS0->S4.unitNum;
                     
                     if((MS0->S4.unitNum == team0num) && (MS0->S4.unitNum == objeSCSunitCnt)){
                         
@@ -8777,7 +8777,7 @@ SKIP1:
                         trueFlag = false;
                     }
                 }else if(MS0->S4.unitType == 1){
-                    if(MS0->S4.objeFlag) team0num = 65000;
+                    if(MS0->S4.objeFlag ||!MS0->S4.placeFlag) team0num = 65000;
                     
                     if((MS0->S4.unitNum <= team0num) && (MS0->S4.unitNum <= objeSCSunitCnt)){
                         
@@ -8807,7 +8807,7 @@ SKIP1:
                 }U = UTop;
                 }
                 if(MS0->S4.unitType == 0){
-                    if(MS0->S4.objeFlag) team1num = MS0->S4.unitNum;
+                    if(MS0->S4.objeFlag ||!MS0->S4.placeFlag) team1num = MS0->S4.unitNum;
                     
                     if((MS0->S4.unitNum == team1num) && (MS0->S4.unitNum == objeSCSunitCnt)){
                         
@@ -8817,6 +8817,7 @@ SKIP1:
                         trueFlag = false;
                     }
                 }else if(MS0->S4.unitType == 1){
+                    if(MS0->S4.objeFlag ||!MS0->S4.placeFlag) team1num = 65000;
                     if((MS0->S4.unitNum <= team1num) && (MS0->S4.unitNum <= objeSCSunitCnt)){
                         
                     }else if((MS0->S4.unitNum <= team1num) && !MS0->S4.objeFlag){
@@ -8825,7 +8826,6 @@ SKIP1:
                         trueFlag = false;
                     }
                 }else if(MS0->S4.unitType == 2){
-                    if(MS0->S4.objeFlag) team1num = 65000;
                     
                     if((MS0->S4.unitNum >= team1num) && (MS0->S4.unitNum >= objeSCSunitCnt)){
                         
@@ -8845,7 +8845,7 @@ SKIP1:
                 }U = UTop;
                 }
                 if(MS0->S4.unitType == 0){
-                    if(MS0->S4.objeFlag) team2num = MS0->S4.unitNum;
+                    if(MS0->S4.objeFlag || MS0->S4.placeFlag) team2num = MS0->S4.unitNum;
                     
                     if((MS0->S4.unitNum == team2num) && (MS0->S4.unitNum == objeSCSunitCnt)){
                         
@@ -8855,7 +8855,7 @@ SKIP1:
                         trueFlag = false;
                     }
                 }else if(MS0->S4.unitType == 1){
-                    if(MS0->S4.objeFlag) team2num = 65000;
+                    if(MS0->S4.objeFlag || MS0->S4.placeFlag) team2num = 65000;
                     
                     if((MS0->S4.unitNum <= team2num) && (MS0->S4.unitNum <= objeSCSunitCnt)){