diff --git a/components/Abstracts/EntityBase.tscn b/components/Abstracts/EntityBase.tscn index 625f25a..474efd2 100644 --- a/components/Abstracts/EntityBase.tscn +++ b/components/Abstracts/EntityBase.tscn @@ -107,76 +107,34 @@ snap = 1.0 [sub_resource type="Animation" id="Animation_3wcjn"] length = 0.001 -tracks/0/type = "bezier" +tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath(".:modulate:r") +tracks/0/path = NodePath(".:modulate") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"handle_modes": PackedInt32Array(0), -"points": PackedFloat32Array(1, -0.2, 0, 0.2, 0), -"times": PackedFloat32Array(0) -} -tracks/1/type = "bezier" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:modulate:g") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"handle_modes": PackedInt32Array(0), -"points": PackedFloat32Array(1, -0.2, 0, 0.2, 0), -"times": PackedFloat32Array(0) -} -tracks/2/type = "bezier" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath(".:modulate:b") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"handle_modes": PackedInt32Array(0), -"points": PackedFloat32Array(1, -0.2, 0, 0.2, 0), -"times": PackedFloat32Array(0) +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Color(1, 1, 1, 1)] } [sub_resource type="Animation" id="Animation_wl2we"] resource_name = "hurt" -length = 0.4 +length = 0.1 step = 0.1 -tracks/0/type = "bezier" +tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath(".:modulate:r") +tracks/0/path = NodePath(".:modulate") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"handle_modes": PackedInt32Array(0, 0, 0), -"points": PackedFloat32Array(1, -0.2, 0, 0.2, 0, 10, -0.2, 0, 0.2, 0, 1, -0.2, 0, 0.2, 0), -"times": PackedFloat32Array(0, 0.2, 0.4) -} -tracks/1/type = "bezier" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:modulate:g") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"handle_modes": PackedInt32Array(0, 0, 0), -"points": PackedFloat32Array(1, -0.2, 0, 0.2, 0, 10, -0.2, 0, 0.2, 0, 1, -0.2, 0, 0.2, 0), -"times": PackedFloat32Array(0, 0.2, 0.4) -} -tracks/2/type = "bezier" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath(".:modulate:b") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"handle_modes": PackedInt32Array(0, 0, 0), -"points": PackedFloat32Array(1, -0.2, 0, 0.2, 0, 10, -0.2, 0, 0.2, 0, 1, -0.2, 0, 0.2, 0), -"times": PackedFloat32Array(0, 0.2, 0.4) +"times": PackedFloat32Array(0, 0.099999994), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(18.892157, 18.892157, 18.892157, 1), Color(1, 1, 1, 1)] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_kbmff"] diff --git a/resources/characters/kukemc/cy.png b/resources/characters/kukemc/cy.png new file mode 100644 index 0000000..15324a1 Binary files /dev/null and b/resources/characters/kukemc/cy.png differ diff --git a/resources/characters/kukemc/cy.png.import b/resources/characters/kukemc/cy.png.import new file mode 100644 index 0000000..7e07a1e --- /dev/null +++ b/resources/characters/kukemc/cy.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c6thlmj566h82" +path="res://.godot/imported/cy.png-d1b3b8e8254d4baace10674493f30a79.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/characters/kukemc/cy.png" +dest_files=["res://.godot/imported/cy.png-d1b3b8e8254d4baace10674493f30a79.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/ChickSprint.gd b/scripts/Contents/Bullets/ChickSprint.gd index 076890f..7b8115a 100644 --- a/scripts/Contents/Bullets/ChickSprint.gd +++ b/scripts/Contents/Bullets/ChickSprint.gd @@ -7,7 +7,7 @@ func register(): speed = 0 penerate = 1 func ai(): - baseDamage = launcher.velocity.length() / 500 * atk + baseDamage = launcher.velocity.length() / 500.0 * atk PresetBulletAI.lockLauncher(self, launcher, true) if !launcher.sprinting: tryDestroy() diff --git a/scripts/Contents/Characters/Cat.gd b/scripts/Contents/Characters/Cat.gd index 76b5d21..c7c461a 100644 --- a/scripts/Contents/Characters/Cat.gd +++ b/scripts/Contents/Characters/Cat.gd @@ -13,7 +13,7 @@ func attack(type: int): if type == 0: for bullet in BulletBase.generate(ComponentManager.getBullet("ChickSprint"), self, position, 0): if bullet is ChickSprint: - bullet.atk = 0.2 + bullet.atk = 0.01 trySprint() return true func sprint():