greg 4 лет назад
Родитель
Сommit
6d1a6a3c1e

+ 1 - 1
assets/scripts/games/ui/fightings/FightingMediator.ts

@@ -344,7 +344,7 @@ export class FightingMediator extends GUIMediator {
                 this.DisposeBullet(bullet);
             }
         }
-        if(GameController.single.currentSkill!=null&&GameController.single.currentSkill.bullets){
+        if(GameController.single.currentSkill!=null&&GameController.single.currentSkill.infiniteAmmo){
             this.BulletCount.string="∞";
         }else{
             this.BulletCount.string=GameController.single.weapon.bulletCount.toString();

+ 1 - 1
assets/scripts/games/ui/fightings/skills/DefaultSkill.ts

@@ -51,7 +51,7 @@ export default class DefaultSkill extends SkillBase
                     this.weapon.fireKey=3;
                 }
                 this.weapon.MoveFirePosition();
-                this.weapon.Fire(this.bullets);
+                this.weapon.Fire(this.infiniteAmmo);
                 this.lastTime=current;
             }
         }

+ 1 - 1
assets/scripts/games/ui/fightings/skills/KillAllMonsterSkill.ts

@@ -53,7 +53,7 @@ export class KillAllMonsterSkill extends SkillBase {
                 this.weapon.fireKey=3;
             }
             this.weapon.MoveFirePosition();
-            this.weapon.Fire(this.bullets);
+            this.weapon.Fire(this.infiniteAmmo);
             this.lastTime=current;
         }
     }

+ 5 - 5
assets/scripts/games/ui/fightings/skills/SkillBase.ts

@@ -121,27 +121,27 @@ export class SkillBase extends EventDispatcher{
      * 是否阻断玩家操作
      */
     get unController():boolean{
-        return this.config.unController;
+        return this.config.unController==1;
     }
 
     /**
      * 武器闪烁
      */
     get weaponFlicker():boolean{
-        return this.config.weaponFlicker
+        return this.config.weaponFlicker==1;
     }
 
     /**
      * 界面闪烁
      */
     get viewFlicker():boolean{
-        return this.config.viewFlicker;
+        return this.config.viewFlicker==1;
     }
 
     /**
      * 无限子弹
      */
-    get bullets():boolean{
-        return true;
+    get infiniteAmmo():boolean{
+        return this.config.infiniteAmmo==1;
     }
 }

+ 1 - 1
assets/scripts/games/ui/fightings/weapons/WeaponBase.ts

@@ -154,7 +154,7 @@ export class WeaponBase extends EventDispatcher{
         if(GameController.single.currentSkill!=null&&GameController.single.currentSkill.unController==false){
             let currentTime:number=director.getCurrentTime();
             if(currentTime-this.lastFireTime>GameController.single.currentSkill.fireInterval){
-                this.Fire(!GameController.single.currentSkill.bullets);
+                this.Fire(!GameController.single.currentSkill.infiniteAmmo);
                 this.lastFireTime=currentTime;
             }
         }else{