1
1
mirror of https://github.com/Rundll86/Dog-Lynx-And-HCN.git synced 2026-05-28 06:51:54 +08:00

Compare commits

...

7 Commits

Author SHA1 Message Date
fallingshrimp 07f1334cc7 chore: 删除todo.md中未完成的框架开发任务
移除了过时的待办条目,清理项目文档
2026-05-13 22:49:24 +08:00
fallingshrimp 2a864ae607 fix: 调整两个角色的技能平衡参数
调整Lynx的冲刺倍率从2改为1.5,下调牧羊犬的技能冷却时间从1000ms到500ms,并更新其技能描述文本
2026-05-12 22:43:27 +08:00
fallingshrimp 2abe9ec8b0 chore: 调整多名角色数值与技能逻辑
1. 下调Lynx冲刺倍率至2,同步更新其卡片属性
2. 重写牧羊犬技能为伤害吸血,替换原格挡逻辑
3. 上调氰化氢击杀储能数值,优化其描述文本
4. 新增全局伤害触发信号,完善实体伤害上报逻辑
2026-05-12 22:41:47 +08:00
fallingshrimp d4b9999e44 feat(MuyangDog): add Tree weapon to the character's weapon store
add Tree weapon resource and attach it to MuyangDog's weapon slot 1
2026-05-12 22:28:25 +08:00
fallingshrimp 8a75adc580 fix(volcano bullet): adjust animation speed, cuttable time and hitbox
调整了火山子弹的动画播放速度、可切割时长,修改了动画轨道参数与碰撞箱位置旋转角度
2026-05-12 22:13:30 +08:00
fallingshrimp fb5488b10d fix(Volcano.gd): 硬编码动画播放速度替换原攻击速度计算
将原本根据攻击速度计算的动画缩放倍率改为固定0.75,简化子弹动画速度控制逻辑
2026-05-12 06:49:36 +08:00
fallingshrimp 4026caf0de refactor(bullet): 修复子弹切割时的速度缩放逻辑
1. 修正Volcano子弹动画速度计算改为直接修改animator.speed_scale
2. 调整Volcano子弹发射速度倍率从0.9倍改为原0.75倍
3. 优化Volcano子弹粒子发射速度从300改为150
4. 调整MuyangDog的fieldValues并添加点击重建属性
5. 修复Volcano动画轨迹的多余关键帧与modulate显示逻辑
2026-05-12 06:46:33 +08:00
11 changed files with 64 additions and 36 deletions
+36 -12
View File
@@ -115,6 +115,18 @@ tracks/8/keys = {
"update": 1,
"values": [false]
}
tracks/9/type = "value"
tracks/9/imported = false
tracks/9/enabled = true
tracks/9/path = NodePath("%textureSword/trailLine:modulate")
tracks/9/interp = 1
tracks/9/loop_wrap = true
tracks/9/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Color(1, 1, 1, 1)]
}
[sub_resource type="Animation" id="Animation_oinqg"]
resource_name = "destroy"
@@ -133,7 +145,7 @@ tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"handle_modes": PackedInt32Array(0, 0, 2),
"points": PackedFloat32Array(200, 0, 0, 0.25, 0, 500, -0.083333336, -8.333334, 0, 0, 200, 0, 0, 0, 0),
"points": PackedFloat32Array(200, 0, 0, 0.1, 0, 500, -0.2, 0, 0.02, 0, 200, -0.05, -100, 0, 0),
"times": PackedFloat32Array(0, 0.2, 0.3)
}
tracks/1/type = "bezier"
@@ -144,8 +156,8 @@ tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"handle_modes": PackedInt32Array(0, 0, 0, 0, 0, 0),
"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.2, 0, 0.7853982, -0.1, 0, 0.25, 0, -0.7853982, 0, 0, 0, -2, -0.7853982, -0.1, 0, 0.2, 0, 3.142, -0.2, 3, 0, 0),
"times": PackedFloat32Array(0, 0.3, 0.6, 0.888264, 1.2, 1.45)
"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.1, 0, 0.7853982, -0.1, 0, 0.4, 0, -0.7853982, 0, 0.3, 0, -2, -0.7853982, -0.1, 0, 0.2, 0, 3.142, -0.2, 3, 0, 0),
"times": PackedFloat32Array(0, 0.2, 0.4, 0.888264, 1.2, 1.45)
}
tracks/2/type = "bezier"
tracks/2/imported = false
@@ -155,7 +167,7 @@ tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"handle_modes": PackedInt32Array(0, 0),
"points": PackedFloat32Array(1, 0, 0, 0.2, 0, -1, 0, 0, 0, 0),
"points": PackedFloat32Array(1, 0, 0, 0.2, 0, -2, 0, 0, 0, 0),
"times": PackedFloat32Array(1.45, 1.7)
}
tracks/3/type = "value"
@@ -242,7 +254,7 @@ tracks/8/path = NodePath("anchor/textureSword/trailRight:visible")
tracks/8/interp = 1
tracks/8/loop_wrap = true
tracks/8/keys = {
"times": PackedFloat32Array(0, 0.8, 0.95, 1.35),
"times": PackedFloat32Array(0, 0.75, 0.95, 1.35),
"transitions": PackedFloat32Array(1, 1, 1, 1),
"update": 1,
"values": [false, true, false, false]
@@ -254,10 +266,10 @@ tracks/9/path = NodePath("anchor/textureSword/trailLine:visible")
tracks/9/interp = 1
tracks/9/loop_wrap = true
tracks/9/keys = {
"times": PackedFloat32Array(0, 0.15, 0.2, 1.65, 1.8),
"transitions": PackedFloat32Array(1, 1, 1, 1, 1),
"times": PackedFloat32Array(0, 0.15, 0.2, 1.65),
"transitions": PackedFloat32Array(1, 1, 1, 1),
"update": 1,
"values": [false, true, false, true, false]
"values": [false, true, false, true]
}
tracks/10/type = "value"
tracks/10/imported = false
@@ -271,6 +283,18 @@ tracks/10/keys = {
"update": 1,
"values": [false, true, false]
}
tracks/11/type = "value"
tracks/11/imported = false
tracks/11/enabled = true
tracks/11/path = NodePath("%textureSword/trailLine:modulate")
tracks/11/interp = 1
tracks/11/loop_wrap = true
tracks/11/keys = {
"times": PackedFloat32Array(0, 1.65, 2),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 1), Color(1, 1, 1, 0)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_w1utg"]
_data = {
@@ -319,8 +343,8 @@ alpha_curve = SubResource("CurveTexture_xrrxo")
particle_flag_disable_z = true
direction = Vector3(-1, 1, 0)
spread = 0.0
initial_velocity_min = 300.0
initial_velocity_max = 300.0
initial_velocity_min = 150.0
initial_velocity_max = 150.0
gravity = Vector3(0, 0, 0)
alpha_curve = SubResource("CurveTexture_b5nxd")
@@ -375,8 +399,8 @@ local_coords = true
process_material = SubResource("ParticleProcessMaterial_1sgli")
[node name="hitbox" parent="." index="1" unique_id=175349408 node_paths=PackedStringArray("target")]
position = Vector2(199.99998, 0.081461266)
rotation = 0.00040731629
position = Vector2(399.99997, 0.16292253)
rotation = 0.32215786
shape = SubResource("RectangleShape2D_1sgli")
script = ExtResource("7_1sgli")
target = NodePath("../texture/anchor/textureSword")
+3 -3
View File
@@ -20,9 +20,9 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_1yfsg")
displayName = "氰化氢"
slogan = "微量便可颠覆生机"
avatar = ExtResource("2_1yfsg")
description = "击杀敌人时储能。"
description = "击杀敌人时少量储能。"
fields = Array[int]([18, 10, 1])
fieldValues = Array[float]([3.0, 0.15, -0.15])
fieldValues = Array[float]([4.0, 0.2, -0.2])
[node name="avatarTexture" parent="wrapper" parent_id_path=PackedInt32Array(2023039659) index="0" unique_id=1334645594]
texture = ExtResource("2_1yfsg")
@@ -34,4 +34,4 @@ text = "氰化氢"
text = "“微量便可颠覆生机”"
[node name="descriptionLabel" parent="wrapper/infoContainer" parent_id_path=PackedInt32Array(143242635) index="1" unique_id=808054282]
text = "击杀敌人时储能。"
text = "击杀敌人时少量储能。"
+1 -1
View File
@@ -22,7 +22,7 @@ slogan = "栖于寒域密林,孤影独行世间"
avatar = ExtResource("2_1s675")
description = "拥有更大的冲刺速度。"
fields = Array[int]([3, 4, 10])
fieldValues = Array[float]([0.15, 0.04, -0.3])
fieldValues = Array[float]([0.2, 0.04, -0.3])
clickToRebuild = true
[node name="avatarTexture" parent="wrapper" parent_id_path=PackedInt32Array(2023039659) index="0" unique_id=1334645594]
+5 -3
View File
@@ -19,9 +19,10 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_fi2nw")
displayName = "牧羊犬"
slogan = "恪守使命不离不弃"
avatar = ExtResource("2_fi2nw")
description = "每隔3秒发动格挡。"
description = "造成伤害时少量吸血,
每0.5秒最多触发一次。"
fields = Array[int]([0, 8, 3])
fieldValues = Array[float]([100.0, 0.2, 0.0])
fieldValues = Array[float]([35.0, 0.2, -0.5])
[node name="avatarTexture" parent="wrapper" parent_id_path=PackedInt32Array(2023039659) index="0" unique_id=1334645594]
texture = ExtResource("2_fi2nw")
@@ -33,4 +34,5 @@ text = "牧羊犬"
text = "“恪守使命不离不弃”"
[node name="descriptionLabel" parent="wrapper/infoContainer" parent_id_path=PackedInt32Array(143242635) index="1" unique_id=808054282]
text = "每隔3秒发动格挡。"
text = "造成伤害时少量吸血,
每0.5秒最多触发一次。"
+3
View File
@@ -3,9 +3,12 @@
[ext_resource type="PackedScene" uid="uid://bs863g2s8r770" path="res://components/Abstracts/PlayerBase.tscn" id="1_y3l4w"]
[ext_resource type="Script" uid="uid://bbmb572iba42l" path="res://scripts/Contents/Characters/MuyangDog.gd" id="2_mr6nm"]
[ext_resource type="PackedScene" uid="uid://u0djqwuuysp8" path="res://components/Weapons/Volcano.tscn" id="3_e236u"]
[ext_resource type="PackedScene" uid="uid://cx7nogfnv7s8t" path="res://components/Weapons/Tree.tscn" id="4_im5m5"]
[node name="MuyangDog" unique_id=1711205167 instance=ExtResource("1_y3l4w")]
script = ExtResource("2_mr6nm")
displayName = "牧羊犬"
[node name="Volcano" parent="weaponStore" parent_id_path=PackedInt32Array(1319091445) index="0" unique_id=204992396 instance=ExtResource("3_e236u")]
[node name="Tree" parent="weaponStore" parent_id_path=PackedInt32Array(1319091445) index="1" unique_id=185228402 instance=ExtResource("4_im5m5")]
+2 -2
View File
@@ -10,8 +10,8 @@ var dmg5: float = 0
var splitAngle: float = 10
func spawn():
animator.speed_scale = launcher.fields[FieldStore.Entity.ATTACK_SPEED] * 0.75
setupCuttable(0.2)
animator.speed_scale = 0.85
setupCuttable(0.75)
func ai():
PresetBulletAI.lockLauncher(self , launcher, true)
rotation = lerp_angle(
+1 -1
View File
@@ -2,4 +2,4 @@ extends PlayerBase
func register():
super.register()
sprintMultiplier += 3
sprintMultiplier += 1.5
+8 -9
View File
@@ -1,12 +1,11 @@
extends PlayerBase
var parryCounter: CooldownTimer = CooldownTimer.new(3000)
var healCounter = CooldownTimer.new(500)
func ai():
super.ai()
if parryCounter.isCooldowned():
var track = getTrackingAnchor()
var bullet = BulletTool.findClosetBulletCanDamage(track, get_tree(), self , 300)
if is_instance_valid(bullet):
BulletBase.generate(ComponentManager.getBullet("Parrier"), self , track, track.angle_to_point(bullet.position))
parryCounter.start()
func register():
super.register()
madeDamage.connect(
func(_w, _b):
if healCounter.start():
heal(1)
)
+2 -2
View File
@@ -131,13 +131,13 @@ func setupCuttable(cutSpeed: float):
func(body):
var entity = EntityTool.fromHurtbox(body)
if entity:
speedScale *= cutSpeed
animator.speed_scale *= cutSpeed
)
area_exited.connect(
func(body):
var entity = EntityTool.fromHurtbox(body)
if entity:
speedScale /= cutSpeed
animator.speed_scale /= cutSpeed
)
func getDamage():
return baseDamage * damageMultipliers[usingDamageMultiplier]
+3
View File
@@ -6,6 +6,7 @@ signal healed(amount: float)
signal healthChanged(health: float)
signal died()
signal killEnemy(who: EntityBase, by: BulletBase)
signal madeDamage(who: EntityBase, by: BulletBase)
signal energyChanged(energy: float, dontChangeDirection: bool)
@@ -172,6 +173,7 @@ func _ready():
healthChanged.emit(health)
energyChanged.emit(energy, false)
killEnemy.connect(func(_w, _b): return )
madeDamage.connect(func(_w, _b): return )
spawn()
func _process(_delta):
health = clamp(health, 0, fields.get(FieldStore.Entity.MAX_HEALTH))
@@ -304,6 +306,7 @@ func bulletHit(bullet: BulletBase, crit: bool, damageOverride = "none"):
hit.emit(damage, bullet, crit)
health -= damage
healthChanged.emit(health)
bullet.launcher.madeDamage.emit(self , bullet)
DamageLabel.create(damage, crit || perfectMiss, damageAnchor.global_position + MathTool.sampleInCircle(GameRule.damageLabelSpawnOffset))
if isBoss and bullet.launcher.isPlayer():
bullet.launcher.setBoss(self )
-3
View File
@@ -1,3 +0,0 @@
# Todo
1. 完成Godockly UGC框架。