diff --git a/components/Effects/Parry.tscn b/components/Effects/Parry.tscn index 106c5ca..2b99561 100644 --- a/components/Effects/Parry.tscn +++ b/components/Effects/Parry.tscn @@ -21,7 +21,7 @@ tracks/0/path = NodePath("%stage/../texture") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.8), +"times": PackedFloat32Array(0, 0.53), "transitions": PackedFloat32Array(1, 1), "values": [{ "args": [&"default", 1.0, false], @@ -66,7 +66,7 @@ animations = [{ }], "loop": false, "name": &"default", -"speed": 10.0 +"speed": 15.0 }] [node name="Parry" instance=ExtResource("1_vc7s4")] diff --git a/resources/bullets/parrier/Effect_ParryCounterPrepare8.png b/resources/bullets/parrier/Effect_ParryCounterPrepare8.png new file mode 100644 index 0000000..c354082 Binary files /dev/null and b/resources/bullets/parrier/Effect_ParryCounterPrepare8.png differ diff --git a/resources/bullets/parrier/Effect_ParryCounterPrepare8.png.import b/resources/bullets/parrier/Effect_ParryCounterPrepare8.png.import new file mode 100644 index 0000000..c51c7fe --- /dev/null +++ b/resources/bullets/parrier/Effect_ParryCounterPrepare8.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dk6basvgsbdqn" +path="res://.godot/imported/Effect_ParryCounterPrepare8.png-0bba423dc0300aecabcaa63e327d83fc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/bullets/parrier/Effect_ParryCounterPrepare8.png" +dest_files=["res://.godot/imported/Effect_ParryCounterPrepare8.png-0bba423dc0300aecabcaa63e327d83fc.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scripts/Contents/Bullets/Parrier.gd b/scripts/Contents/Bullets/Parrier.gd index 467d2ea..beb96c5 100644 --- a/scripts/Contents/Bullets/Parrier.gd +++ b/scripts/Contents/Bullets/Parrier.gd @@ -6,7 +6,7 @@ class_name ParrierBullet func hitBullet(bullet: BulletBase): if BulletTool.canDamage(bullet, launcher): if MathTool.rate(parryRate): - var eff = EffectController.create(ComponentManager.getEffect("Parry"), position + (bullet.position - position).normalized() * 120) - eff.modulate = bullet.modulate + var eff = EffectController.create(ComponentManager.getEffect("Parry"), position + (bullet.position - position).normalized() * 150) + eff.modulate = bullet.modulate.blend(bullet.texture.modulate) eff.shot() bullet.tryDestroy()