diff --git a/components/Feeds/A-BigLaser.tscn b/components/Feeds/A-BigLaser.tscn index 01c3fd5..25408df 100644 --- a/components/Feeds/A-BigLaser.tscn +++ b/components/Feeds/A-BigLaser.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=4 format=3 uid="uid://dqnkn1nbdl67l"] +[gd_scene format=3 uid="uid://dqnkn1nbdl67l"] [ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_3s2fe"] [ext_resource type="Texture2D" uid="uid://dy4op6n6vxef3" path="res://resources/bullets/laser-circle/circle.svg" id="2_igv34"] [ext_resource type="PackedScene" uid="uid://cxabqjo7skxev" path="res://components/Weapons/BigLaser.tscn" id="3_u2qxo"] -[node name="BigLaser" instance=ExtResource("1_3s2fe")] +[node name="BigLaser" unique_id=910672627 instance=ExtResource("1_3s2fe")] avatarTexture = ExtResource("2_igv34") -displayName = "湮灭激光" +displayName = "金法阵" quality = 2 topic = 8 weapons = Array[PackedScene]([ExtResource("3_u2qxo")]) diff --git a/components/Feeds/A-Hetun.tscn b/components/Feeds/A-Hetun.tscn new file mode 100644 index 0000000..a7985d4 --- /dev/null +++ b/components/Feeds/A-Hetun.tscn @@ -0,0 +1,22 @@ +[gd_scene format=3 uid="uid://ovx8i8xd4hvf"] + +[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_3x1iw"] +[ext_resource type="Texture2D" uid="uid://dyump10b0et3r" path="res://resources/feeds/Fishing_Rod_JE2_BE2.png" id="2_ke7m6"] +[ext_resource type="PackedScene" uid="uid://c65tbxm3tclw0" path="res://components/Weapons/Hetun.tscn" id="3_3x1iw"] + +[node name="Hetun" unique_id=1666687782 instance=ExtResource("1_3x1iw")] +avatarTexture = ExtResource("2_ke7m6") +displayName = "钓鱼竿" +quality = 2 +topic = 8 +weapons = Array[PackedScene]([ExtResource("3_3x1iw")]) +costs = Array[int]([0, 1]) +costCounts = Array[int]([114, 514]) + +[node name="avatar" parent="container/info" index="0"] +texture = ExtResource("2_ke7m6") + +[node name="name" parent="container/info" index="1"] +displayName = "钓鱼竿" +quality = 2 +topic = 8 diff --git a/components/Feeds/A-Tree.tscn b/components/Feeds/A-Tree.tscn index baa3821..893267c 100644 --- a/components/Feeds/A-Tree.tscn +++ b/components/Feeds/A-Tree.tscn @@ -1,7 +1,6 @@ [gd_scene format=3 uid="uid://dcm4gglpbiywo"] [ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_8ua8m"] -[ext_resource type="Texture2D" uid="uid://74n7umby4d4w" path="res://resources/weapons/ParryCounter.png" id="2_5yxds"] [ext_resource type="Texture2D" uid="uid://6omf2so5me3x" path="res://resources/feeds/date-cake.png" id="2_7iihr"] [ext_resource type="PackedScene" uid="uid://cx7nogfnv7s8t" path="res://components/Weapons/Tree.tscn" id="3_7iihr"] [ext_resource type="PackedScene" uid="uid://bbrllsqjmx0ie" path="res://components/Weapons/DaoStatue.tscn" id="4_b8wyh"] @@ -13,14 +12,14 @@ quality = 2 topic = 8 fields = Array[int]([2]) fieldValues = Array[float]([0.1]) -weapons = Array[PackedScene]([ExtResource("3_7iihr"), ExtResource("4_b8wyh")]) +weapons = Array[PackedScene]([ExtResource("4_b8wyh"), ExtResource("3_7iihr")]) costs = Array[int]([0, 1]) costCounts = Array[int]([999, 999]) [node name="avatar" parent="container/info" index="0"] -texture = ExtResource("2_5yxds") +texture = ExtResource("2_7iihr") [node name="name" parent="container/info" index="1"] -displayName = "扶桑元神" +displayName = "红枣糕" quality = 2 topic = 8 diff --git a/components/Feeds/Burger.tscn b/components/Feeds/Burger.tscn new file mode 100644 index 0000000..5dc067b --- /dev/null +++ b/components/Feeds/Burger.tscn @@ -0,0 +1,22 @@ +[gd_scene format=3 uid="uid://cieit84hbkcmw"] + +[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_so7nn"] +[ext_resource type="Texture2D" uid="uid://dl616p8cdejlj" path="res://resources/feeds/burger.png" id="2_w7qr4"] + +[node name="Burger" unique_id=665641734 instance=ExtResource("1_so7nn")] +avatarTexture = ExtResource("2_w7qr4") +displayName = "香辣鸡腿堡" +quality = 3 +topic = 1 +fields = Array[int]([2, 25, 19]) +fieldValues = Array[float]([-0.08, 1.0, 0.1]) +costs = Array[int]([1, 2]) +costCounts = Array[int]([400, 1]) + +[node name="avatar" parent="container/info" index="0"] +texture = ExtResource("2_w7qr4") + +[node name="name" parent="container/info" index="1"] +displayName = "香辣鸡腿堡" +quality = 3 +topic = 1 diff --git a/components/Feeds/Danta.tscn b/components/Feeds/Danta.tscn new file mode 100644 index 0000000..6a219e8 --- /dev/null +++ b/components/Feeds/Danta.tscn @@ -0,0 +1,20 @@ +[gd_scene format=3 uid="uid://i68nojagoct4"] + +[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_4ba8r"] +[ext_resource type="Texture2D" uid="uid://v7k8yaxjesao" path="res://resources/feeds/danta.png" id="2_y7pyg"] + +[node name="Danta" unique_id=665641734 instance=ExtResource("1_4ba8r")] +avatarTexture = ExtResource("2_y7pyg") +displayName = "蛋挞" +quality = 2 +topic = 4 +fields = Array[int]([1, 6, 18]) +fieldValues = Array[float]([0.12, 0.1, -4.0]) + +[node name="avatar" parent="container/info" index="0"] +texture = ExtResource("2_y7pyg") + +[node name="name" parent="container/info" index="1"] +displayName = "蛋挞" +quality = 2 +topic = 4 diff --git a/components/Feeds/Yinyang.tscn b/components/Feeds/Yinyang.tscn new file mode 100644 index 0000000..7c67783 --- /dev/null +++ b/components/Feeds/Yinyang.tscn @@ -0,0 +1,22 @@ +[gd_scene format=3 uid="uid://bs1sb3j6cr5bd"] + +[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_86tiu"] +[ext_resource type="Texture2D" uid="uid://c2ee1nkl8da64" path="res://resources/feeds/yinyang.png" id="2_1ouu0"] + +[node name="Yinyang" unique_id=665641734 instance=ExtResource("1_86tiu")] +avatarTexture = ExtResource("2_1ouu0") +displayName = "阴阳球" +quality = 4 +topic = 7 +fields = Array[int]([2, 0, 1]) +fieldValues = Array[float]([-0.5, -50.0, -0.5]) +costs = Array[int]([2, 4]) +costCounts = Array[int]([-2, -1]) + +[node name="avatar" parent="container/info" index="0"] +texture = ExtResource("2_1ouu0") + +[node name="name" parent="container/info" index="1"] +displayName = "阴阳球" +quality = 4 +topic = 7 diff --git a/components/Weapons/Tree.tscn b/components/Weapons/Tree.tscn index ae95592..f04bf72 100644 --- a/components/Weapons/Tree.tscn +++ b/components/Weapons/Tree.tscn @@ -16,7 +16,7 @@ store = { "atk": 20, "count": 1.0, "max": 3.0, -"rate": 1.0 +"rate": 0.25 } storeType = { "atk": 1, @@ -57,9 +57,9 @@ text = "Nine Sols × Terraria" text = "[center]进行[b]格挡[/b]，化解飞来的子弹。 每成功格挡一次，获得一点[b]气力[/b]。 每拥有一点气力，增加[color=yellow]1[/color]点冲刺初速度，闪避穿过敌人时对其贴上一层[b]符咒[/b]，符咒会自动引爆，召唤[b]乾坤剑[/b]穿透敌人。 -近战攻击造成乾坤剑的[color=cyan]25.0%[/color]点伤害。 +近战攻击造成乾坤剑的[color=cyan]100.0%[/color]点伤害。 -每次格挡有[color=cyan]25.0%[/color]的概率弹反，子弹弹反后造成乾坤剑的[color=cyan]25.0%[/color]伤害。 +每次格挡有[color=cyan]100.0%[/color]的概率弹反，子弹弹反后造成乾坤剑的[color=cyan]100.0%[/color]伤害。 每次格挡最多化解[color=cyan]1[/color]个子弹， 体内最多储存[color=cyan]3[/color]点气力。 每化解[color=yellow]1[/color]点伤害， diff --git a/resources/feeds/Fishing_Rod_JE2_BE2.png b/resources/feeds/Fishing_Rod_JE2_BE2.png new file mode 100644 index 0000000..920b74e Binary files /dev/null and b/resources/feeds/Fishing_Rod_JE2_BE2.png differ diff --git a/resources/feeds/Fishing_Rod_JE2_BE2.png.import b/resources/feeds/Fishing_Rod_JE2_BE2.png.import new file mode 100644 index 0000000..2307fcd --- /dev/null +++ b/resources/feeds/Fishing_Rod_JE2_BE2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dyump10b0et3r" +path="res://.godot/imported/Fishing_Rod_JE2_BE2.png-7c35ff338bc05c54da115fc7f24fc7bd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/feeds/Fishing_Rod_JE2_BE2.png" +dest_files=["res://.godot/imported/Fishing_Rod_JE2_BE2.png-7c35ff338bc05c54da115fc7f24fc7bd.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/resources/feeds/burger.png b/resources/feeds/burger.png new file mode 100644 index 0000000..c2fd983 Binary files /dev/null and b/resources/feeds/burger.png differ diff --git a/resources/feeds/burger.png.import b/resources/feeds/burger.png.import new file mode 100644 index 0000000..5b6260a --- /dev/null +++ b/resources/feeds/burger.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dl616p8cdejlj" +path="res://.godot/imported/burger.png-42b50cedfee8e245dff409fdfc7daa8b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/feeds/burger.png" +dest_files=["res://.godot/imported/burger.png-42b50cedfee8e245dff409fdfc7daa8b.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/resources/feeds/danta.png b/resources/feeds/danta.png new file mode 100644 index 0000000..2f32dd8 Binary files /dev/null and b/resources/feeds/danta.png differ diff --git a/resources/feeds/danta.png.import b/resources/feeds/danta.png.import new file mode 100644 index 0000000..17aba04 --- /dev/null +++ b/resources/feeds/danta.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://v7k8yaxjesao" +path="res://.godot/imported/danta.png-09fab7a3155918ef8d25e2e8e92f8563.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/feeds/danta.png" +dest_files=["res://.godot/imported/danta.png-09fab7a3155918ef8d25e2e8e92f8563.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/resources/feeds/yinyang.png b/resources/feeds/yinyang.png new file mode 100644 index 0000000..bbcf7a2 Binary files /dev/null and b/resources/feeds/yinyang.png differ diff --git a/resources/feeds/yinyang.png.import b/resources/feeds/yinyang.png.import new file mode 100644 index 0000000..ad5e1b9 --- /dev/null +++ b/resources/feeds/yinyang.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c2ee1nkl8da64" +path="res://.godot/imported/yinyang.png-4d7cdae92076fda0f805c935ea9aa271.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/feeds/yinyang.png" +dest_files=["res://.godot/imported/yinyang.png-4d7cdae92076fda0f805c935ea9aa271.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/Weapons/Bow.gd b/scripts/Contents/Weapons/Bow.gd index 02ac6d9..bc73b61 100644 --- a/scripts/Contents/Weapons/Bow.gd +++ b/scripts/Contents/Weapons/Bow.gd @@ -2,9 +2,9 @@ extends Weapon func update(to: int, origin: Dictionary, _entity: EntityBase): - origin["atk"] += 0.075 * to * soulLevel + origin["atk"] += 0.1 * to * soulLevel origin["count"] = 1 * soulLevel - origin["self"] += 0.025 * to + origin["self"] *= soulLevel return origin func attack(entity: EntityBase): entity.takeDamage(readStore("self"))