diff --git a/components/Abstracts/WeaponCardBase.tscn b/components/Abstracts/WeaponCardBase.tscn index 410671b..460c9f7 100644 --- a/components/Abstracts/WeaponCardBase.tscn +++ b/components/Abstracts/WeaponCardBase.tscn @@ -41,12 +41,32 @@ layout_mode = 2 theme_override_constants/separation = 10 alignment = 1 -[node name="updateBtn" type="Button" parent="container"] +[node name="wrapper" type="VBoxContainer" parent="container"] +layout_mode = 2 + +[node name="updateBtn" type="Button" parent="container/wrapper"] unique_name_in_owner = true layout_mode = 2 theme = ExtResource("2_fwkd3") text = "升级" +[node name="souls" type="HBoxContainer" parent="container/wrapper"] +layout_mode = 2 + +[node name="extractBtn" type="Button" parent="container/wrapper/souls"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +theme = ExtResource("2_fwkd3") +text = "提炼灵魂" + +[node name="inlayBtn" type="Button" parent="container/wrapper/souls"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +theme = ExtResource("2_fwkd3") +text = "镶嵌灵魂" + [node name="info" type="VBoxContainer" parent="container"] layout_mode = 2 theme_override_constants/separation = 10 diff --git a/components/Characters/Bear.tscn b/components/Characters/Bear.tscn index 8ddbdc5..04d58d8 100644 --- a/components/Characters/Bear.tscn +++ b/components/Characters/Bear.tscn @@ -143,6 +143,8 @@ alpha_curve = SubResource("CurveTexture_8q862") [node name="Bear" instance=ExtResource("1_3ves7")] script = ExtResource("2_kh2af") displayName = "熊谷凌" +drops = Array[int]([0, 1, 4]) +dropCounts = Array[Vector2]([Vector2(50, 100), Vector2(70, 140), Vector2(4, 10)]) metadata/_edit_vertical_guides_ = [-50.0] [node name="attack0" parent="sounds" index="5"] diff --git a/components/Characters/Chick.tscn b/components/Characters/Chick.tscn index f8e6dfd..9b8c3bb 100644 --- a/components/Characters/Chick.tscn +++ b/components/Characters/Chick.tscn @@ -37,8 +37,8 @@ animations = [{ script = ExtResource("2_r6bub") isBoss = true displayName = "小鸡" -drops = Array[int]([0, 1]) -dropCounts = Array[Vector2]([Vector2(10, 30), Vector2(15, 50)]) +drops = Array[int]([0, 1, 4]) +dropCounts = Array[Vector2]([Vector2(10, 30), Vector2(15, 50), Vector2(1, 3)]) appleCount = Vector2i(2, 4) [node name="hurt" parent="sounds" index="3"] diff --git a/components/Characters/KukeMC.tscn b/components/Characters/KukeMC.tscn index 66ff070..eaf5aaa 100644 --- a/components/Characters/KukeMC.tscn +++ b/components/Characters/KukeMC.tscn @@ -29,6 +29,8 @@ size = Vector2(150, 150) [node name="KukeMC" instance=ExtResource("1_r4q7y")] script = ExtResource("2_s2dg5") displayName = "酷可mc" +drops = Array[int]([0, 1, 4]) +dropCounts = Array[Vector2]([Vector2(20, 40), Vector2(25, 100), Vector2(2, 3)]) metadata/_edit_vertical_guides_ = [76.0] [node name="collect" parent="sounds" index="4"] diff --git a/resources/items/soul.svg b/resources/items/soul.svg new file mode 100644 index 0000000..96d7346 --- /dev/null +++ b/resources/items/soul.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/items/soul.svg.import b/resources/items/soul.svg.import new file mode 100644 index 0000000..95c03d6 --- /dev/null +++ b/resources/items/soul.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://7jhhyoinptns" +path="res://.godot/imported/soul.svg-be1bba571183bafbd4f4f2057b205ffb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/items/soul.svg" +dest_files=["res://.godot/imported/soul.svg-be1bba571183bafbd4f4f2057b205ffb.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/scripts/Statemachine/EntityBase.gd b/scripts/Statemachine/EntityBase.gd index f829de3..892bee1 100644 --- a/scripts/Statemachine/EntityBase.gd +++ b/scripts/Statemachine/EntityBase.gd @@ -57,12 +57,14 @@ var inventory = { ItemStore.ItemType.BASKETBALL: 500, ItemStore.ItemType.APPLE: 5, ItemStore.ItemType.BEACHBALL: 0, + ItemStore.ItemType.SOUL: 0, } var inventoryMax = { ItemStore.ItemType.BASEBALL: INF, # 无限 ItemStore.ItemType.BASKETBALL: INF, ItemStore.ItemType.APPLE: 5, ItemStore.ItemType.BEACHBALL: INF, + ItemStore.ItemType.SOUL: INF, } @export var defaultCooldownUnit: float = 100 diff --git a/scripts/Tools/ItemStore.gd b/scripts/Tools/ItemStore.gd index fe7505b..6385e0e 100644 --- a/scripts/Tools/ItemStore.gd +++ b/scripts/Tools/ItemStore.gd @@ -5,19 +5,22 @@ enum ItemType { BASEBALL, BASKETBALL, APPLE, - BEACHBALL + BEACHBALL, + SOUL, } static var nameMap = { ItemType.BASEBALL: "棒球", ItemType.BASKETBALL: "篮球", ItemType.APPLE: "苹果", - ItemType.BEACHBALL: "沙滩球" + ItemType.BEACHBALL: "沙滩球", + ItemType.SOUL: "灵魂", } static var idMap = { ItemType.BASEBALL: "baseball", ItemType.BASKETBALL: "basketball", ItemType.APPLE: "apple", - ItemType.BEACHBALL: "beachball" + ItemType.BEACHBALL: "beachball", + ItemType.SOUL: "soul", } static func getTexture(type: ItemType) -> Texture2D: return load("res://resources/items/%s.svg" % idMap[type])