diff --git a/scripts/Contents/Bullets/Parrier.gd b/scripts/Contents/Bullets/Parrier.gd index 6ffcac9..1683d24 100644 --- a/scripts/Contents/Bullets/Parrier.gd +++ b/scripts/Contents/Bullets/Parrier.gd @@ -31,6 +31,7 @@ func hitBullet(bullet: BulletBase): # 当前子弹与其他子弹相撞 eff.shot() CameraManager.shake(250, 300) launcher.impluse((position - bullet.position).normalized() * (bullet.speed * bullet.getDamage()) ** (1.0 / 3) * 250) + var targetBaseDamage = bullet.baseDamage # 弹反 还是 格挡? if MathTool.rate(reflectRate): bullet.look_at(bullet.launcher.position) @@ -49,7 +50,7 @@ func hitBullet(bullet: BulletBase): # 当前子弹与其他子弹相撞 0 ): if b is ParryBallBullet: - b.atk = atk * bullet.baseDamage + b.atk = atk * targetBaseDamage func refract(_newBullet: BulletBase, _entity: EntityBase, _index: int, _total: int, _lastBullet: float): return null func split(_newBullet: BulletBase, _index: int, _total: int, _lastBullet: float): diff --git a/scripts/Contents/Wave.gd b/scripts/Contents/Wave.gd index b770534..0f46de1 100644 --- a/scripts/Contents/Wave.gd +++ b/scripts/Contents/Wave.gd @@ -49,8 +49,10 @@ static var WAVE_JUSTJOKE = [ Wave.create("Kernyr", 0, 0, true, 0, INF, 1), ] static var WAVE_EMPTY = [] -static var current: int = startWith(1) if WorldManager.isRelease() else startWith(10) -static var data = WAVE_NORMAL if WorldManager.isRelease() else WAVE_JUSTJOKE +static var waveConfig = [WAVE_JUSTJOKE, 10] + +static var current: int = startWith(1) if WorldManager.isRelease() else startWith(waveConfig[1]) +static var data = WAVE_NORMAL if WorldManager.isRelease() else waveConfig[0] static func create( entity_: String,