1
1
mirror of https://github.com/Rundll86/Dog-Lynx-And-HCN.git synced 2026-06-06 03:37:13 +08:00

feat(Meowmere): 调整武器和子弹属性并优化动画

- 为Meowmere子弹添加穿透属性
- 调整武器伤害计算和子子弹伤害
- 更新武器描述模板和数值显示
- 修改子弹碰撞体大小和位置
- 优化武器动画和旋转效果
- 调整角色武器库中的武器顺序
This commit is contained in:
2025-09-21 15:32:38 +08:00
parent f0edb426f1
commit 1a6a47da74
5 changed files with 38 additions and 29 deletions
+19 -17
View File
@@ -6,6 +6,21 @@
[sub_resource type="SpriteFrames" id="SpriteFrames_432r6"]
[sub_resource type="Animation" id="Animation_q4hki"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("sword:rotation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [-0.436332]
}
[sub_resource type="Animation" id="Animation_jdotg"]
resource_name = "spwan"
length = 0.2
@@ -22,21 +37,6 @@ tracks/0/keys = {
"values": [-0.436332, 2.00713]
}
[sub_resource type="Animation" id="Animation_q4hki"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("sword:rotation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [-0.436332]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_47iyl"]
_data = {
"RESET": SubResource("Animation_q4hki"),
@@ -44,7 +44,7 @@ _data = {
}
[sub_resource type="RectangleShape2D" id="RectangleShape2D_ja03c"]
size = Vector2(56, 107)
size = Vector2(56, 250)
[node name="Meowmere" instance=ExtResource("1_newpt")]
script = ExtResource("2_eoimw")
@@ -52,6 +52,8 @@ autoSpawnAnimation = true
freeAfterSpawn = true
[node name="texture" parent="." index="0"]
position = Vector2(100, 0)
scale = Vector2(2, 2)
sprite_frames = SubResource("SpriteFrames_432r6")
[node name="animator" parent="texture" index="0"]
@@ -67,5 +69,5 @@ position = Vector2(25, -29)
texture = ExtResource("2_ahi5w")
[node name="hitbox" parent="." index="1"]
position = Vector2(30, -4.5)
position = Vector2(140, 0)
shape = SubResource("RectangleShape2D_ja03c")
+8 -7
View File
@@ -57,19 +57,20 @@ debugRebuild = false
[node name="Meowmere" parent="weaponStore" index="1" instance=ExtResource("3_e2rag")]
offset_bottom = 315.0
[node name="PurpleCrystal" parent="weaponStore" index="2" instance=ExtResource("3_ms5sq")]
[node name="MushroomPickaxe" parent="weaponStore" index="2" instance=ExtResource("9_85j0d")]
offset_bottom = 315.0
debugRebuild = false
[node name="VectorStar" parent="weaponStore" index="3" instance=ExtResource("6_fvy5n")]
[node name="PurpleCrystal" parent="weaponStore" index="3" instance=ExtResource("3_ms5sq")]
debugRebuild = false
[node name="LGBT" parent="weaponStore" index="4" instance=ExtResource("4_pb8qn")]
[node name="BigLaser" parent="weaponStore" index="5" instance=ExtResource("4_plqwu")]
[node name="MushroomPickaxe" parent="weaponStore" index="6" instance=ExtResource("9_85j0d")]
[node name="VectorStar" parent="weaponStore" index="4" instance=ExtResource("6_fvy5n")]
debugRebuild = false
[node name="LGBT" parent="weaponStore" index="5" instance=ExtResource("4_pb8qn")]
[node name="BigLaser" parent="weaponStore" index="6" instance=ExtResource("4_plqwu")]
[node name="NuclearBomb" parent="weaponStore" index="7" instance=ExtResource("10_ncj2v")]
[node name="sprint" parent="sounds" index="0"]
+4 -2
View File
@@ -13,13 +13,15 @@ typeTopic = 3
costBeachball = 600
store = {
"atk": 10,
"childatk": 5,
"count": 1.0
}
storeType = {
"atk": 1,
"childatk": 1,
"count": 1.0
}
descriptionTemplate = "发射$count只彩虹猫的同时挥舞造成$atk点伤害。"
descriptionTemplate = "发射$count只造成$childatk点伤害的[b]彩虹猫[/b]的同时挥舞造成$atk点伤害。"
cooldown = 200.0
[node name="avatar" parent="container/info" index="0"]
@@ -34,4 +36,4 @@ quality = 2
typeTopic = 3
[node name="description" parent="container" index="2"]
text = "[center]发射[color=cyan]1[/color]→[color=yellow]1[/color]只彩虹猫的同时挥舞造成[color=cyan]10[/color]→[color=yellow]17[/color]点伤害。[/center]"
text = "[center]发射[color=cyan]1[/color]→[color=yellow]1[/color]只造成[color=cyan]5[/color]→[color=yellow]3[/color]点伤害的[b]彩虹猫[/b]的同时挥舞造成[color=cyan]15[/color]→[color=yellow]22[/color]点伤害。[/center]"
+3 -1
View File
@@ -1,4 +1,6 @@
extends BulletBase
func register():
penerate = 1
func ai():
PresetBulletAI.lockLauncher(self, launcher, true)
PresetBulletAI.lockLauncher(self, launcher, true)
+4 -2
View File
@@ -2,12 +2,14 @@
extends Weapon
func update(to, origin, _entity):
origin["atk"] += 7 * to * soulLevel
origin["atk"] += 3 * to * soulLevel
origin["count"] = 1 * soulLevel
origin["childatk"] = 2 * to * soulLevel
return origin
func attack(entity: EntityBase):
var weaponPos = entity.findWeaponAnchor("normal")
for i in BulletBase.generate(ComponentManager.getBullet("Meowmere"), entity, weaponPos, weaponPos.angle_to_point(get_global_mouse_position())):
i.damage = readStore("atk")
for i in readStore("count"):
BulletBase.generate(ComponentManager.getBullet("RainbowCat"), entity, weaponPos, weaponPos.angle_to_point(get_global_mouse_position()))
for j in BulletBase.generate(ComponentManager.getBullet("RainbowCat"), entity, weaponPos, weaponPos.angle_to_point(get_global_mouse_position())):
j.damage = readStore("childatk")