装備エフェクト保存バグ、バトル描画バグ改善

diff --git a/Awars III/BattleView.m b/Awars III/BattleView.m
index 5acdb18..a59a12e 100755 (executable)
--- a/Awars III/BattleView.m
+++ b/Awars III/BattleView.m
@@ -129,10 +129,16 @@
         if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 y:BT_POINTY f:1.0];
         U = UTop;
         
-        
+        if(!btSelfAction){
         if(btDistanceX1 >= BT_CHADISTANCEDELTA && btDistanceX2 >= BT_CHADISTANCEDELTA){
             baseDistanceCompFlag = true;
         }
+        }else{
+            if(btDistanceX1 >= BT_CHADISTANCEDELTA + BT_CHADISTANCEDELTASELF
+               && btDistanceX2 >= BT_CHADISTANCEDELTA + BT_CHADISTANCEDELTASELF){
+                baseDistanceCompFlag = true;
+            }
+        }
         //画像の開始時の位置と、準備に動く位置
     }
     else if(BTunitAttackFlag1 && !btHitFlag1 && !btHitExtendFlag1){
@@ -278,9 +284,9 @@
             }
             
             if(btAttackMoveValue2 < 2){
-                if(!btSelfAction) [self drawImage:img x:BT_POINTX1 + btDistanceX2 + btAttackMove2 y:BT_POINTY f:1.0];
+                if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 - btAttackMove2 y:BT_POINTY f:1.0];
             }else{
-                if(!btSelfAction) [self drawImage:img x:BT_POINTX1 + btDistanceX2 y:BT_POINTY f:1.0];
+                if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 y:BT_POINTY f:1.0];
             }
         }else if(btAttackType2 == BT_TYPE_MAGIC){
             
@@ -314,9 +320,9 @@
             }
             
             if(btAttackMoveValue2 < 4){
-                if(!btSelfAction) [self drawImage:img x:BT_POINTX1 + btDistanceX2 y:BT_POINTY - btAttackMove2 f:1.0];
+                if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 y:BT_POINTY - btAttackMove2 f:1.0];
             }else{
-                if(!btSelfAction) [self drawImage:img x:BT_POINTX1 + btDistanceX2 y:BT_POINTY f:1.0];
+                if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 y:BT_POINTY f:1.0];
             }
         }else if(btAttackType2 == BT_TYPE_ABILITY){
             
@@ -334,9 +340,9 @@
             }
             
             if(btAttackMoveValue2 < 2){
-                if(!btSelfAction) [self drawImage:img x:BT_POINTX1 + btDistanceX2 + btAttackMove2 y:BT_POINTY f:1.0];
+                if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 - btAttackMove2 y:BT_POINTY f:1.0];
             }else{
-                if(!btSelfAction) [self drawImage:img x:BT_POINTX1 + btDistanceX2 y:BT_POINTY f:1.0];
+                if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 y:BT_POINTY f:1.0];
             }
         }
         U = UTop;
@@ -535,6 +541,7 @@
         img = [U->C.imgb copy];
         [img setSize:NSMakeSize(BT_CHASIZEX, BT_CHASIZEY)];
         
+        if(!btSelfAction)
         if(btHitFlagCnt2%2 == 0) [self drawImage:img x:BT_POINTX1 + btDistanceX1 + btHitExtendMove1 y:BT_POINTY f:1.0];
         U = UTop;
         

diff --git a/Awars III/UnitChipList.m b/Awars III/UnitChipList.m
index 79050e0..672eb14 100644 (file)
--- a/Awars III/UnitChipList.m
+++ b/Awars III/UnitChipList.m
@@ -5747,9 +5747,7 @@ bool eHandLFlag = false;
         
         [UCLPanelAttack close];
         return;
-    }
-    
-    if(!loadChipSideFlag){
+    }else if(!loadChipSideFlag){
         [self saveDataAL];
     }else{
         [self saveDataAL2];
@@ -8197,8 +8195,7 @@ int omfgErase() {
         
         if(EQmodeFlag){
         A = EQ[clickIndexEQ].A;
-        }
-        if(!loadChipSideFlag){
+        }else if(!loadChipSideFlag){
         A = UC[clickIndex].A;
         }else{
         A = LC[clickIndex].A;