diff --git a/components/Bullets/VolcanoShadow.tscn b/components/Bullets/VolcanoShadow.tscn index 0276969..606e428 100644 --- a/components/Bullets/VolcanoShadow.tscn +++ b/components/Bullets/VolcanoShadow.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=3 uid="uid://doytyuk72vr74"] +[gd_scene format=3 uid="uid://doytyuk72vr74"] [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_4oiyn"] [ext_resource type="Texture2D" uid="uid://ctmxadaowx5ps" path="res://resources/weapons/Volcano.webp" id="2_668mx"] @@ -6,86 +6,32 @@ [sub_resource type="Animation" id="Animation_i7b6y"] length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("static:modulate") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Color(1, 1, 1, 1)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("static:scale") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector2(1, 1)] -} - -[sub_resource type="Animation" id="Animation_668mx"] -resource_name = "spawn" -step = 0.05 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("static:modulate") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.90000004, 1), -"transitions": PackedFloat32Array(1, 1, 1, 1), -"update": 0, -"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 0.5), Color(1, 1, 1, 0.5), Color(1, 1, 1, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("static:scale") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 0.1, 1), -"transitions": PackedFloat32Array(1, 1, 1), -"update": 0, -"values": [Vector2(0, 0), Vector2(1.5, 1.5), Vector2(0, 0)] -} [sub_resource type="AnimationLibrary" id="AnimationLibrary_i7b6y"] _data = { -&"RESET": SubResource("Animation_i7b6y"), -&"spawn": SubResource("Animation_668mx") +&"RESET": SubResource("Animation_i7b6y") } [sub_resource type="RectangleShape2D" id="RectangleShape2D_668mx"] -size = Vector2(76, 12) +size = Vector2(192, 50) -[node name="VolcanoShadow" instance=ExtResource("1_4oiyn")] +[node name="VolcanoShadow" unique_id=1512282051 instance=ExtResource("1_4oiyn")] script = ExtResource("2_i7b6y") speed = 25.0 -penerate = 0.35 -penerateDamageReduction = 0.2 -autoSpawnAnimation = true -freeAfterSpawn = true +penerate = 0.85 +penerateDamageReduction = 0.1 +lifeTime = 2000.0 -[node name="texture" parent="." index="0"] +[node name="texture" parent="." index="0" unique_id=162977358] rotation = 0.7853982 -[node name="animator" parent="texture" index="0"] -libraries = { -&"": SubResource("AnimationLibrary_i7b6y") -} +[node name="animator" parent="texture" index="0" unique_id=1114087117] +libraries/ = SubResource("AnimationLibrary_i7b6y") -[node name="static" type="Sprite2D" parent="texture" index="1"] +[node name="static" type="Sprite2D" parent="texture" index="1" unique_id=1656204664] +modulate = Color(1, 1, 1, 0.5) +scale = Vector2(2, 2) texture = ExtResource("2_668mx") -[node name="hitbox" parent="." index="1"] +[node name="hitbox" parent="." index="1" unique_id=175349408] shape = SubResource("RectangleShape2D_668mx") diff --git a/components/Weapons/WhiteSoul.tscn b/components/Weapons/WhiteSoul.tscn index f13e16f..a170c12 100644 --- a/components/Weapons/WhiteSoul.tscn +++ b/components/Weapons/WhiteSoul.tscn @@ -11,7 +11,7 @@ displayName = "代达罗斯风暴魂" quality = 3 costBeachball = 300 store = { -"atk": 10, +"atk": 15, "count": 1.0, "radius": 100.0 } @@ -22,7 +22,6 @@ storeType = { } descriptionTemplate = "从天而降$count支目标位于半径$radius内的[b]怪物灵魂[/b],造成$atk点伤害,穿透+[color=yellow]50%[/color]。" sources = Array[String](["Terraria", "Undertale"]) -debugRebuild = true [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_kcegs") diff --git a/scripts/Contents/Bullets/VolcanoShadow.gd b/scripts/Contents/Bullets/VolcanoShadow.gd index 0840bed..7808b95 100644 --- a/scripts/Contents/Bullets/VolcanoShadow.gd +++ b/scripts/Contents/Bullets/VolcanoShadow.gd @@ -2,5 +2,4 @@ extends BulletBase class_name VolcanoShadow func ai(): - speed = initialSpeed * (1 - animator.current_animation_position / animator.current_animation_length) - PresetBulletAI.forward(self, rotation) + PresetBulletAI.forward(self , rotation) diff --git a/scripts/Contents/Weapons/Volcano.gd b/scripts/Contents/Weapons/Volcano.gd index 2559195..21de39b 100644 --- a/scripts/Contents/Weapons/Volcano.gd +++ b/scripts/Contents/Weapons/Volcano.gd @@ -3,11 +3,11 @@ extends Weapon func update(to: int, origin: Dictionary, _entity: EntityBase): origin["rotate"] += 0.005 * to * soulLevel - origin["dmg1"] += 0.03 * to * soulLevel - origin["dmg2"] += 0.03 * to * soulLevel - origin["dmg3"] += 0.03 * to * soulLevel - origin["dmg4"] += 0.03 * to * soulLevel - origin["dmg5"] += 0.025 * to * soulLevel + origin["dmg1"] += 0.3 * (soulLevel - 1) + origin["dmg2"] += 0.3 * (soulLevel - 1) + origin["dmg3"] += 0.3 * (soulLevel - 1) + origin["dmg4"] += 0.3 * (soulLevel - 1) + origin["dmg5"] += 0.15 * (soulLevel - 1) origin["count"] = 1 * soulLevel origin["atk"] += 3 * to * soulLevel return origin