diff --git a/components/Abstracts/WeaponCardBase.tscn b/components/Abstracts/WeaponCardBase.tscn index 948d9b4..f4bbc59 100644 --- a/components/Abstracts/WeaponCardBase.tscn +++ b/components/Abstracts/WeaponCardBase.tscn @@ -34,6 +34,21 @@ corner_detail = 1 font_size = 12 font_color = Color(0.55, 0.55, 0.55, 1) +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_jv1l6"] +content_margin_left = 10.0 +content_margin_top = 10.0 +content_margin_right = 10.0 +content_margin_bottom = 10.0 +bg_color = Color(0, 0, 0, 0.4) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color(1, 1, 1, 1) +corner_radius_top_left = 15 +corner_radius_bottom_right = 15 +corner_detail = 1 + [node name="WeaponCard" type="PanelContainer" unique_id=2085048785] offset_right = 350.0 offset_bottom = 304.0 @@ -183,13 +198,17 @@ text = "无灵" label_settings = SubResource("LabelSettings_b3nsw") horizontal_alignment = 1 -[node name="scroller" type="ScrollContainer" parent="container" unique_id=543588938] -custom_minimum_size = Vector2(0, 100) +[node name="back" type="PanelContainer" parent="container" unique_id=517412512] +layout_mode = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_jv1l6") + +[node name="scroller" type="ScrollContainer" parent="container/back" unique_id=543588938] +custom_minimum_size = Vector2(0, 200) layout_mode = 2 size_flags_vertical = 3 horizontal_scroll_mode = 0 -[node name="description" type="RichTextLabel" parent="container/scroller" unique_id=566230682] +[node name="description" type="RichTextLabel" parent="container/back/scroller" unique_id=566230682] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 diff --git a/components/Weapons/AcidWind.tscn b/components/Weapons/AcidWind.tscn index f86e79d..c3aff09 100644 --- a/components/Weapons/AcidWind.tscn +++ b/components/Weapons/AcidWind.tscn @@ -56,7 +56,7 @@ displayName = "酸蚀风暴" quality = 4 typeTopic = 3 -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]发射一个[b]酸蚀风暴[/b],以[color=cyan]30.0Hz[/color]的频率吸引一下五种[b]酸[/b]到风暴中心,强酸可造成[color=cyan]1.00[/color]点伤害,弱酸造成[color=cyan]0.50[/color]点伤害。 [color=green][b]硫酸[/b][/color]:命中时溅射1~[color=cyan]4[/color]滴[b]硫酸[/b]。 [color=lightblue][b]硝酸[/b][/color]:额外造成[color=cyan]500.0%[/color]伤害。 diff --git a/components/Weapons/BigLaser.tscn b/components/Weapons/BigLaser.tscn index a81a034..71f73f7 100644 --- a/components/Weapons/BigLaser.tscn +++ b/components/Weapons/BigLaser.tscn @@ -26,7 +26,6 @@ sources = Array[String](["Magic Craft", "Harry Potter"]) tease = "秒天秒地秒空气" needEnergy = 200.0 cooldown = 6000.0 -debugRebuild = true [node name="attack" parent="sounds" parent_id_path=PackedInt32Array(1775425991) index="0" unique_id=853583292] stream = ExtResource("4_cb5nh") @@ -48,7 +47,7 @@ typeTopic = 1 [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "Magic Craft × Harry Potter" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]召唤[b]湮灭射线[/b], 每[color=cyan]0.10[/color]秒造成[color=cyan]40[/color]点伤害。[/center]" diff --git a/components/Weapons/BlueCrystal.tscn b/components/Weapons/BlueCrystal.tscn index 0704fd1..f8fbd0a 100644 --- a/components/Weapons/BlueCrystal.tscn +++ b/components/Weapons/BlueCrystal.tscn @@ -21,7 +21,6 @@ storeType = { } descriptionTemplate = "发射[b]蓝水晶[/b],可无限追踪,命中造成$atk点伤害,飞行过程中有$count颗[b]钻石[/b]环绕。" cooldown = 250.0 -debugRebuild = true [node name="attack" parent="sounds" parent_id_path=PackedInt32Array(1775425991) index="0" unique_id=853583292] stream = ExtResource("4_fewtg") @@ -33,5 +32,5 @@ texture = ExtResource("3_fewtg") displayName = "蓝水晶簇" typeTopic = 3 -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]发射[b]蓝水晶[/b],可无限追踪,命中造成[color=cyan]3[/color]点伤害,飞行过程中有[color=cyan]2[/color]颗[b]钻石[/b]环绕。[/center]" diff --git a/components/Weapons/Bow.tscn b/components/Weapons/Bow.tscn index 68006b9..c48085a 100644 --- a/components/Weapons/Bow.tscn +++ b/components/Weapons/Bow.tscn @@ -23,7 +23,6 @@ storeType = { descriptionTemplate = "消耗$self点生命值,发射$count支[b]鸡毛箭[/b],每支造成当前飞行速度的$atk伤害。" tease = "损人又害己" cooldown = 2000.0 -debugRebuild = true [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_ex3jl") @@ -35,7 +34,7 @@ count = 50 displayName = "鸡毛弓" quality = 2 -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]消耗[color=cyan]5[/color]点生命值,发射[color=cyan]1[/color]支[b]鸡毛箭[/b],每支造成当前飞行速度的[color=cyan]500.0%[/color]伤害。[/center]" [node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] diff --git a/components/Weapons/ChainGun.tscn b/components/Weapons/ChainGun.tscn index 5730afe..40ca37d 100644 --- a/components/Weapons/ChainGun.tscn +++ b/components/Weapons/ChainGun.tscn @@ -24,7 +24,6 @@ descriptionTemplate = "超高速发射$count个[b]微型水晶[/b],可造成$a sources = Array[String](["Terraria"]) needEnergy = 0.75 cooldown = 66.0 -debugRebuild = true [node name="attack" parent="sounds" parent_id_path=PackedInt32Array(1775425991) index="0" unique_id=853583292] stream = ExtResource("4_g38si") @@ -44,8 +43,5 @@ displayName = "链式机枪" [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "Terraria" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]超高速发射[color=cyan]1[/color]个[b]微型水晶[/b],可造成[color=cyan]5[/color]点伤害,散射+[color=cyan]15.0°[/color],穿透+[color=yellow]25%[/color]。[/center]" - -[node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] -visible = false diff --git a/components/Weapons/Cogwheel.tscn b/components/Weapons/Cogwheel.tscn index 0a7c083..8dfcbba 100644 --- a/components/Weapons/Cogwheel.tscn +++ b/components/Weapons/Cogwheel.tscn @@ -24,7 +24,6 @@ descriptionTemplate = "发射[b]齿轮[/b],在飞行一定距离后回旋。 tease = "马后炮令人措手不及" needEnergy = 4.0 cooldown = 1000.0 -debugRebuild = true [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_qs30c") @@ -36,7 +35,7 @@ text = "4.0" displayName = "齿轮回旋镖" quality = 3 -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]发射[b]齿轮[/b],在飞行一定距离后回旋。 齿轮的伤害频率与转速成正比。 锋利度:[color=cyan]2[/color],初始转速:[color=cyan]15.0°[/color], diff --git a/components/Weapons/CursorKnife.tscn b/components/Weapons/CursorKnife.tscn index f562b96..e93670e 100644 --- a/components/Weapons/CursorKnife.tscn +++ b/components/Weapons/CursorKnife.tscn @@ -35,8 +35,5 @@ count = 350 displayName = "光标刃轮" typeTopic = 1 -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]造成[color=cyan]10[/color]点伤害,攻击速度+[color=cyan]0.4%[/color]。[/center]" - -[node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] -visible = false diff --git a/components/Weapons/DaoStatue.tscn b/components/Weapons/DaoStatue.tscn index e650cdf..e8946cd 100644 --- a/components/Weapons/DaoStatue.tscn +++ b/components/Weapons/DaoStatue.tscn @@ -35,7 +35,6 @@ sources = Array[String](["Nine Sols"]) tease = "天机不可泄露" needEnergy = 40.0 cooldown = 4000.0 -debugRebuild = true [node name="attack" parent="sounds" parent_id_path=PackedInt32Array(1775425991) index="0" unique_id=853583292] stream = ExtResource("4_y3oaj") @@ -56,7 +55,7 @@ typeTopic = 1 [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "Nine Sols" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "消耗[color=yellow]3[/color]层气力,挥出[b]无为之剑[/b], 蓄力一段时间后,发动[b]无量反击[/b], 造成[color=cyan]20[/color]点基础伤害。 diff --git a/components/Weapons/Gobo.tscn b/components/Weapons/Gobo.tscn index b716ff2..9e8afb5 100644 --- a/components/Weapons/Gobo.tscn +++ b/components/Weapons/Gobo.tscn @@ -25,7 +25,6 @@ descriptionTemplate = "召唤[b]Gobo[/b],Gobo会自主行动,每受到$atk sources = Array[String](["Scratch"]) needEnergy = 75.0 cooldown = 1000.0 -debugRebuild = true [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_tw58e") @@ -40,5 +39,5 @@ typeTopic = 4 [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "Scratch" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]召唤[b]Gobo[/b],Gobo会自主行动,每受到[color=cyan]100[/color]点伤害后会生产[color=cyan]1[/color]颗[b]苹果[/b]。Gobo初始拥有[color=cyan]200[/color]点生命值。[/center]" diff --git a/components/Weapons/GrassWall.tscn b/components/Weapons/GrassWall.tscn index 503823e..0a238da 100644 --- a/components/Weapons/GrassWall.tscn +++ b/components/Weapons/GrassWall.tscn @@ -35,7 +35,7 @@ typeTopic = 4 [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "UDA" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]分泌一堵[b]肽聚墙[/b],可抵挡[color=cyan]200[/color]点伤害,敌人更有可能瞄准你。[/center]" [node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] diff --git a/components/Weapons/GravitySource.tscn b/components/Weapons/GravitySource.tscn index e0320d9..2b5cda1 100644 --- a/components/Weapons/GravitySource.tscn +++ b/components/Weapons/GravitySource.tscn @@ -23,7 +23,6 @@ descriptionTemplate = "使光标化身为[b]恒星[/b]产生强大引力,并 万有引力常数:$atk。" sources = Array[String](["万有引力", "宇宙航行"]) tease = "告诉我,逃逸速度是多少?!" -debugRebuild = true [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_r5y0x") @@ -34,7 +33,7 @@ displayName = "引力源" [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "万有引力 × 宇宙航行" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]使光标化身为[b]恒星[/b]产生强大引力,并吸引[color=yellow]1[/color]颗行星围绕其。移动恒星来使行星产生加速度,[color=yellow]行星速度越快撞击伤害越高[/color]。 行星的速度太快会发生[color=red]逃逸[/color], 撞上恒星后会[color=red]坠毁[/color]。 diff --git a/components/Weapons/HJM.tscn b/components/Weapons/HJM.tscn index 03d8bb7..523661d 100644 --- a/components/Weapons/HJM.tscn +++ b/components/Weapons/HJM.tscn @@ -23,7 +23,6 @@ descriptionTemplate = "召唤[b]抓狂的哈基米[/b],跟踪敌人,每$time sources = Array[String](["Internet"]) needEnergy = 50.0 cooldown = 1000.0 -debugRebuild = true [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_74sfb") @@ -42,5 +41,5 @@ typeTopic = 4 [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "Internet" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]召唤[b]抓狂的哈基米[/b],跟踪敌人,每[color=cyan]0.25[/color]秒造成[color=cyan]7[/color]点伤害。[/center]" diff --git a/components/Weapons/HXD.tscn b/components/Weapons/HXD.tscn index c7a97dc..1834a6e 100644 --- a/components/Weapons/HXD.tscn +++ b/components/Weapons/HXD.tscn @@ -23,7 +23,6 @@ descriptionTemplate = "发射$count颗[b]茴香豆[/b],在敌人间反弹, sources = Array[String](["Zenless Zone Zero", "孔乙己"]) tease = "不多了,我剩得不多了!" cooldown = 1000.0 -debugRebuild = true [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_d5bd0") @@ -39,7 +38,7 @@ typeTopic = 3 [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "Zenless Zone Zero × 孔乙己" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]发射[color=cyan]4[/color]颗[b]茴香豆[/b],在敌人间反弹,每颗茴香豆最多可以反弹[color=cyan]4[/color]次,每次反弹对敌人造成[color=cyan]4[/color]点伤害,有[color=yellow]1/4[/color]的概率反弹次数[color=yellow]+1[/color]。散射[color=red]+4°[/color],反弹时伤害[color=red]-4%[/color],命中同类敌人时额外造成一次[color=yellow]必定暴击[/color]的伤害,命中Boss时,伤害倍率[b]永久[/b][color=orange]+1%[/color]。[/center]" [node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] diff --git a/components/Weapons/Hetun.tscn b/components/Weapons/Hetun.tscn index 212decf..b18bb2a 100644 --- a/components/Weapons/Hetun.tscn +++ b/components/Weapons/Hetun.tscn @@ -24,7 +24,6 @@ sources = Array[String](["Minecraft", "Pathogenic"]) tease = "看我扎不扎你就完了" needEnergy = 2.0 cooldown = 2000.0 -debugRebuild = true [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_y0xe1") @@ -39,7 +38,7 @@ quality = 0 [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "Minecraft × Pathogenic" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]散射5~[color=cyan]10[/color]针[b]河豚刺针[/b],每根针造成[color=cyan]30[/color]点伤害,撞上敌人后有[color=cyan]25.0%[/color]概率反弹。[/center]" [node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] diff --git a/components/Weapons/LGBT.tscn b/components/Weapons/LGBT.tscn index 03c6c77..31331db 100644 --- a/components/Weapons/LGBT.tscn +++ b/components/Weapons/LGBT.tscn @@ -46,7 +46,7 @@ count = 200 displayName = "彩虹旗" typeTopic = 4 -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] size_flags_vertical = 3 text = "[center]召唤[b]彩虹旗[/b],每[color=cyan]35.0°[/color]发射1/[color=cyan]1[/color]条以[color=cyan]2.0%[/color]效率追踪[color=cyan]1.00[/color]秒的[b]七彩光标[/b],每条造成[color=cyan]15[/color]点伤害。[/center]" autowrap_mode = 2 diff --git a/components/Weapons/MagicMissle.tscn b/components/Weapons/MagicMissle.tscn index 81a40ee..c7a147a 100644 --- a/components/Weapons/MagicMissle.tscn +++ b/components/Weapons/MagicMissle.tscn @@ -39,7 +39,6 @@ sources = Array[String](["万有引力", "宇宙航行"]) tease = "物理学还在追我" needEnergy = 25.0 cooldown = 3000.0 -debugRebuild = true [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_3sdrm") @@ -55,7 +54,7 @@ typeTopic = 3 [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "万有引力 × 宇宙航行" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]召唤[color=yellow]1[/color]枚[b]魔法导弹[/b],围绕鼠标指针做由鼠标指针提供向心力的圆周运动。 鼠标指针质量:[color=cyan]100.00[/color]kg, 魔法导弹质量:[color=cyan]10.00[/color]kg, diff --git a/components/Weapons/Meowmere.tscn b/components/Weapons/Meowmere.tscn index bae3e93..b7a1a3a 100644 --- a/components/Weapons/Meowmere.tscn +++ b/components/Weapons/Meowmere.tscn @@ -28,7 +28,6 @@ descriptionTemplate = "发射$count只伤害以$reduce衰减的造成$childatk sources = Array[String](["Terraria"]) needEnergy = 2.0 cooldown = 230.0 -debugRebuild = true [node name="attack" parent="sounds" parent_id_path=PackedInt32Array(1775425991) index="0" unique_id=853583292] stream = ExtResource("4_hvtvi") @@ -51,5 +50,5 @@ typeTopic = 3 [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "Terraria" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]发射[color=cyan]1[/color]只伤害以[color=cyan]25.0%[/color]衰减的造成[color=cyan]6[/color]点伤害的[b]彩虹猫[/b]的同时挥舞造成[color=cyan]5[/color]点伤害。[/center]" diff --git a/components/Weapons/MushroomPickaxe.tscn b/components/Weapons/MushroomPickaxe.tscn index 6947e0f..15f33a2 100644 --- a/components/Weapons/MushroomPickaxe.tscn +++ b/components/Weapons/MushroomPickaxe.tscn @@ -32,5 +32,5 @@ count = 750 [node name="name" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="0" unique_id=1576068972] displayName = "蘑菇矿挖爪" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]命中时造成[color=cyan]1[/color]点伤害,有[color=cyan]10.0%[/color]概率挖出1~[color=cyan]3[/color]个随机物品。[/center]" diff --git a/components/Weapons/NuclearBomb.tscn b/components/Weapons/NuclearBomb.tscn index 7209146..315fdfd 100644 --- a/components/Weapons/NuclearBomb.tscn +++ b/components/Weapons/NuclearBomb.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=4 format=3 uid="uid://b2qhes4apaxsj"] +[gd_scene format=3 uid="uid://b2qhes4apaxsj"] [ext_resource type="PackedScene" uid="uid://ckq2cq6m23hq3" path="res://components/Abstracts/WeaponCardBase.tscn" id="1_k4t0h"] [ext_resource type="Texture2D" uid="uid://cp57lmeohvo3o" path="res://resources/weapons/nuclear-bomb.png" id="2_5nh8i"] -[ext_resource type="Script" path="res://scripts/Contents/Weapons/NuclearBomb.gd" id="2_hscw2"] +[ext_resource type="Script" uid="uid://ctjdfkr4sef7y" path="res://scripts/Contents/Weapons/NuclearBomb.gd" id="2_hscw2"] -[node name="NuclearBomb" instance=ExtResource("1_k4t0h")] +[node name="NuclearBomb" unique_id=1502548572 instance=ExtResource("1_k4t0h")] script = ExtResource("2_hscw2") avatarTexture = ExtResource("2_5nh8i") displayName = "核弹控制器" @@ -22,14 +22,11 @@ storeType = { descriptionTemplate = "倒计时10秒后对半径$radius范围的实体造成$atk点[b]无差别伤害[/b]。" needEnergy = 120.0 cooldown = 2000.0 -debugRebuild = true -[node name="avatar" parent="container/info" index="0"] +[node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_5nh8i") - - -[node name="name" parent="container/info/displays" index="0"] +[node name="name" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="0" unique_id=1576068972] displayName = "核弹控制器" quality = 4 typeTopic = 2 @@ -39,6 +36,3 @@ typeTopicColorMap = { 2: Color(1, 0.274813, 0, 1), 3: Color(0.707984, 0, 1, 1) } - -[node name="description" parent="container" index="2"] -text = "[center]倒计时10秒后对半径[color=cyan]750[/color]→[color=yellow]765[/color]范围的实体造成[color=cyan]2000[/color]→[color=yellow]2050[/color]点[b]无差别伤害[/b]。[/center]" diff --git a/components/Weapons/Oxygener.tscn b/components/Weapons/Oxygener.tscn index d50fc13..d1c86c0 100644 --- a/components/Weapons/Oxygener.tscn +++ b/components/Weapons/Oxygener.tscn @@ -27,7 +27,6 @@ storeType = { descriptionTemplate = "高速喷出[b]火焰[/b],造成$fireatk点伤害。小概率喷出[b]硝化火[/b],召唤$min-n~$max-n滴[b]浓硝酸[/b]围绕在火焰旁,每滴造成$atk点伤害。[b]火焰[/b]具有高额击退效果,[b]浓硝酸[/b]液滴的射程较短,每发射$count次火焰会消耗[color=yellow]1[/color]个[b]篮球[/b], 如果没有则消耗[color=yellow]5[/color]点[b]能量[/b]。" cooldown = 50.0 -debugRebuild = true [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_xmkcx") @@ -37,9 +36,6 @@ displayName = "氧化加农炮" quality = 0 typeTopic = 2 -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]高速喷出[b]火焰[/b],造成[color=cyan]5.00[/color]点伤害。小概率喷出[b]硝化火[/b],召唤[color=cyan]2[/color]~[color=cyan]7[/color]滴[b]浓硝酸[/b]围绕在火焰旁,每滴造成[color=cyan]10.00[/color]点伤害。[b]火焰[/b]具有高额击退效果,[b]浓硝酸[/b]液滴的射程较短,每发射[color=cyan]1[/color]次火焰会消耗[color=yellow]1[/color]个[b]篮球[/b], 如果没有则消耗[color=yellow]5[/color]点[b]能量[/b]。[/center]" - -[node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] -visible = false diff --git a/components/Weapons/Pipe.tscn b/components/Weapons/Pipe.tscn index fc62499..62d47a0 100644 --- a/components/Weapons/Pipe.tscn +++ b/components/Weapons/Pipe.tscn @@ -18,7 +18,6 @@ sources = Array[String](["MEME"]) tease = "保护耳朵" needEnergy = 40.0 cooldown = 3000.0 -debugRebuild = true [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_mmtf8") @@ -35,7 +34,7 @@ displayName = "钢管" [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "MEME" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]按住蓄力扔出钢管,蓄力越久伤害越高,至少造成[color=cyan]5[/color]点伤害,发射钢管后继续按住鼠标可进行连续发射。[/center]" [node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] diff --git a/components/Weapons/PurpleCrystal.tscn b/components/Weapons/PurpleCrystal.tscn index dc7e44b..11d8e40 100644 --- a/components/Weapons/PurpleCrystal.tscn +++ b/components/Weapons/PurpleCrystal.tscn @@ -13,7 +13,6 @@ displayName = "紫水晶簇" costBeachball = 200 descriptionTemplate = "发射[b]紫水晶[/b],撞击时造成$atk点伤害。" cooldown = 200.0 -debugRebuild = true [node name="attack" parent="sounds" parent_id_path=PackedInt32Array(1775425991) index="0" unique_id=853583292] stream = ExtResource("4_16daa") @@ -27,5 +26,5 @@ count = 200 [node name="name" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="0" unique_id=1576068972] displayName = "紫水晶簇" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]发射[b]紫水晶[/b],撞击时造成[color=cyan]10[/color]点伤害。[/center]" diff --git a/components/Weapons/RedCrystal.tscn b/components/Weapons/RedCrystal.tscn index 3badb3f..f0a9ba2 100644 --- a/components/Weapons/RedCrystal.tscn +++ b/components/Weapons/RedCrystal.tscn @@ -39,5 +39,5 @@ count = 400 displayName = "红水晶簇" typeTopic = 1 -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]发射[b]红水晶[/b],在3秒后以[color=cyan]150[/color]的半径爆炸,造成[color=cyan]45[/color]点伤害并向随机方向发射1~[color=cyan]3[/color]个[b]水晶碎片[/b],造成[color=cyan]50%[/color]基础伤害。[/center]" diff --git a/components/Weapons/SevenSoul.tscn b/components/Weapons/SevenSoul.tscn index a4068d0..520e24c 100644 --- a/components/Weapons/SevenSoul.tscn +++ b/components/Weapons/SevenSoul.tscn @@ -25,7 +25,6 @@ descriptionTemplate = "召唤[color=yellow]6[/color]条灵魂,每条造成$atk sources = Array[String](["Undertale"]) needEnergy = 150.0 cooldown = 180000.0 -debugRebuild = true [node name="attack" parent="sounds" parent_id_path=PackedInt32Array(1775425991) index="0" unique_id=853583292] stream = ExtResource("4_tmgox") @@ -45,5 +44,5 @@ typeTopic = 3 [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "Undertale" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]召唤[color=yellow]6[/color]条灵魂,每条造成[color=cyan]2[/color]点伤害,命中敌人时将伤害的[color=cyan]10.0%[/color]转换为能量并提供[color=cyan]1[/color]点治疗。[/center]" diff --git a/components/Weapons/Shield.tscn b/components/Weapons/Shield.tscn index b3b4d12..fb6ebbd 100644 --- a/components/Weapons/Shield.tscn +++ b/components/Weapons/Shield.tscn @@ -32,5 +32,5 @@ displayName = "回响水晶" quality = 3 typeTopic = 4 -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]召唤一个可抵挡[color=cyan]70[/color]点伤害的[b]音元盾[/b]。[/center]" diff --git a/components/Weapons/Tree.tscn b/components/Weapons/Tree.tscn index 598a728..253229d 100644 --- a/components/Weapons/Tree.tscn +++ b/components/Weapons/Tree.tscn @@ -85,7 +85,7 @@ typeTopic = 3 [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "Nine Sols × Terraria" -[node name="description" parent="container/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "进行[b]格挡[/b],化解敌人的攻击。 每成功格挡一次,获得一点[b]气力[/b]。 diff --git a/components/Weapons/VectorStar.tscn b/components/Weapons/VectorStar.tscn index 12e265d..62b90c4 100644 --- a/components/Weapons/VectorStar.tscn +++ b/components/Weapons/VectorStar.tscn @@ -25,7 +25,6 @@ storeType = { descriptionTemplate = "发射$mincount~$maxcount个[b]无主的飞星[/b],在$forwardtime秒后向目标冲刺并造成$atk点伤害。" needEnergy = 12.0 cooldown = 750.0 -debugRebuild = true [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("3_wfty8") @@ -40,5 +39,5 @@ count = 400 displayName = "矢量核心" quality = 2 -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]发射[color=cyan]5[/color]~[color=cyan]10[/color]个[b]无主的飞星[/b],在[color=cyan]1.00[/color]秒后向目标冲刺并造成[color=cyan]15[/color]点伤害。[/center]" diff --git a/components/Weapons/Volcano.tscn b/components/Weapons/Volcano.tscn index 62390da..632854e 100644 --- a/components/Weapons/Volcano.tscn +++ b/components/Weapons/Volcano.tscn @@ -47,5 +47,5 @@ displayName = "火山" quality = 4 typeTopic = 2 -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]召唤1支[b]火山[/b],以[color=cyan]5.0%[/color]的效率跟随鼠标指向,进行基础伤害为[color=cyan]20[/color]的4段挥舞攻击。造成的伤害分别为[color=cyan]100.0%[/color],[color=cyan]50.0%[/color],[color=cyan]115.0%[/color],[color=cyan]123.0%[/color],第4段攻击的同时发射[color=cyan]1[/color]支[b]火山幻影[/b],造成[color=cyan]40.0%[/color]伤害。[/center]" diff --git a/components/Weapons/WhiteSoul.tscn b/components/Weapons/WhiteSoul.tscn index a170c12..fd37e69 100644 --- a/components/Weapons/WhiteSoul.tscn +++ b/components/Weapons/WhiteSoul.tscn @@ -36,8 +36,5 @@ quality = 3 [node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] text = "Terraria × Undertale" -[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +[node name="description" parent="container/back/scroller" parent_id_path=PackedInt32Array(543588938) index="0" unique_id=566230682] text = "[center]从天而降[color=cyan]1[/color]支目标位于半径[color=cyan]100.00[/color]内的[b]怪物灵魂[/b],造成[color=cyan]10[/color]点伤害,穿透+[color=yellow]50%[/color]。[/center]" - -[node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] -visible = false diff --git a/scripts/Contents/Bullets/Parrier.gd b/scripts/Contents/Bullets/Parrier.gd index d70289e..f50b640 100644 --- a/scripts/Contents/Bullets/Parrier.gd +++ b/scripts/Contents/Bullets/Parrier.gd @@ -97,7 +97,7 @@ func hitBullet(bullet: BulletBase): # 当前子弹与其他子弹相撞 elif bullet.motionType == BulletBase.MotionType.EXPLOSION: penerateEffect(bullet.launcher, launcher.position) for i in 2: - InternalDamageBullet.generateBall(bullet.launcher, launcher, atk) + InternalDamageBullet.generateBall(bullet.launcher, launcher, sqrt(bullet.getDamage())) else: InternalDamageBullet.generateBall(bullet.launcher, launcher, atk)