diff --git a/components/Characters/Rooster.tscn b/components/Characters/Rooster.tscn index 2581378..82588a7 100644 --- a/components/Characters/Rooster.tscn +++ b/components/Characters/Rooster.tscn @@ -1,10 +1,8 @@ -[gd_scene load_steps=15 format=3 uid="uid://dky8574uqc18r"] +[gd_scene load_steps=13 format=3 uid="uid://dky8574uqc18r"] [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_e5pl8"] [ext_resource type="Script" uid="uid://cthtupc6dtbav" path="res://scripts/Contents/Characters/Rooster.gd" id="2_oqdqd"] -[ext_resource type="PackedScene" uid="uid://dldnbpubu2jgm" path="res://components/Weapons/GrassWall.tscn" id="3_0omr3"] -[ext_resource type="PackedScene" uid="uid://blwoev5sencdh" path="res://components/Weapons/Gobo.tscn" id="3_jluqw"] -[ext_resource type="PackedScene" uid="uid://dlaks67h2osms" path="res://components/Weapons/ChainGun.tscn" id="3_joj4g"] +[ext_resource type="PackedScene" uid="uid://c0n3igy4hucrg" path="res://components/Weapons/PurpleCrystal.tscn" id="3_da2ca"] [ext_resource type="AudioStream" uid="uid://cdrevrq7n6yqa" path="res://resources/sounds/effect/Boing.mp3" id="4_66s6c"] [ext_resource type="AudioStream" uid="uid://benyec5bqni0b" path="res://resources/sounds/effect/Chomp.wav" id="4_k0yme"] [ext_resource type="AudioStream" uid="uid://dmxh3bpk8vyy5" path="res://resources/sounds/effect/Coin.mp3" id="5_xnbhq"] @@ -60,15 +58,9 @@ metadata/_edit_vertical_guides_ = [71.0] [node name="weaponStore" parent="." index="1"] process_mode = 4 -[node name="ChainGun" parent="weaponStore" index="0" instance=ExtResource("3_joj4g")] -offset_bottom = 374.0 - -[node name="Gobo" parent="weaponStore" index="1" instance=ExtResource("3_jluqw")] -offset_bottom = 446.0 +[node name="PurpleCrystal" parent="weaponStore" index="0" instance=ExtResource("3_da2ca")] debugRebuild = false -[node name="GrassWall" parent="weaponStore" index="2" instance=ExtResource("3_0omr3")] - [node name="sprint" parent="sounds" index="0"] stream = ExtResource("4_66s6c") diff --git a/components/Feeds/Choclate.tscn b/components/Feeds/Choclate.tscn new file mode 100644 index 0000000..3874d3a --- /dev/null +++ b/components/Feeds/Choclate.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=3 format=3 uid="uid://riqkaxail0gj"] + +[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_ou8vj"] +[ext_resource type="Texture2D" uid="uid://cjuwnp221i7cs" path="res://resources/feeds/choclate.png" id="2_8d6qo"] + +[node name="Choclate" instance=ExtResource("1_ou8vj")] +avatarTexture = ExtResource("2_8d6qo") +displayName = "巧克力" +quality = 0 +topic = 2 +fields = Array[int]([6]) +fieldValues = Array[float]([0.04]) +costs = Array[int]([0]) +costCounts = Array[int]([750]) + +[node name="avatar" parent="container/info" index="0"] +texture = ExtResource("2_8d6qo") + +[node name="name" parent="container/info" index="1"] +displayName = "巧克力" +quality = 0 +topic = 2 diff --git a/components/Feeds/Egg.tscn b/components/Feeds/Egg.tscn index 73ae495..6237c4d 100644 --- a/components/Feeds/Egg.tscn +++ b/components/Feeds/Egg.tscn @@ -8,8 +8,8 @@ avatarTexture = ExtResource("2_4crt5") displayName = "鸡蛋" quality = 3 topic = 3 -fields = Array[int]([3, 7]) -fieldValues = Array[float]([0.2, 5.0]) +fields = Array[int]([3, 7, 1]) +fieldValues = Array[float]([1.0, -360.0, -0.45]) costs = Array[int]([0, 1]) costCounts = Array[int]([500, 300]) diff --git a/components/Feeds/Flower.tscn b/components/Feeds/Flower.tscn new file mode 100644 index 0000000..d0fce4d --- /dev/null +++ b/components/Feeds/Flower.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=3 format=3 uid="uid://ce5dd3yjwdsl0"] + +[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_7j382"] +[ext_resource type="Texture2D" uid="uid://ccmcnmt3b60k5" path="res://resources/feeds/flower.png" id="2_bj1le"] + +[node name="Flower" instance=ExtResource("1_7j382")] +avatarTexture = ExtResource("2_bj1le") +displayName = "百合花冠" +quality = 4 +topic = 2 +fields = Array[int]([7, 3, 13, 1]) +fieldValues = Array[float]([180.0, -0.35, 10.0, 0.1]) +costs = Array[int]([0, 1]) +costCounts = Array[int]([500, 500]) + +[node name="avatar" parent="container/info" index="0"] +texture = ExtResource("2_bj1le") + +[node name="name" parent="container/info" index="1"] +displayName = "百合花冠" +quality = 4 +topic = 2 diff --git a/components/Feeds/RainbowCandy.tscn b/components/Feeds/RainbowCandy.tscn index a309100..dae3c67 100644 --- a/components/Feeds/RainbowCandy.tscn +++ b/components/Feeds/RainbowCandy.tscn @@ -9,7 +9,7 @@ displayName = "彩虹糖" quality = 3 topic = 4 fields = Array[int]([1, 5, 6, 13, 7, 3]) -fieldValues = Array[float]([0.5, 0.75, 0.1, 3.0, 25.0, -0.8]) +fieldValues = Array[float]([0.5, 0.75, 0.3, 3.0, 30.0, -0.8]) costs = Array[int]([0, 3]) costCounts = Array[int]([700, 100]) diff --git a/resources/feeds/choclate.png b/resources/feeds/choclate.png new file mode 100644 index 0000000..3308c01 Binary files /dev/null and b/resources/feeds/choclate.png differ diff --git a/resources/feeds/choclate.png.import b/resources/feeds/choclate.png.import new file mode 100644 index 0000000..f7280d4 --- /dev/null +++ b/resources/feeds/choclate.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cjuwnp221i7cs" +path="res://.godot/imported/choclate.png-11ecdfb8389df44297ffc06fe5d23d55.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/feeds/choclate.png" +dest_files=["res://.godot/imported/choclate.png-11ecdfb8389df44297ffc06fe5d23d55.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/flower.png b/resources/feeds/flower.png new file mode 100644 index 0000000..e67c9a1 Binary files /dev/null and b/resources/feeds/flower.png differ diff --git a/resources/feeds/flower.png.import b/resources/feeds/flower.png.import new file mode 100644 index 0000000..c55d76e --- /dev/null +++ b/resources/feeds/flower.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ccmcnmt3b60k5" +path="res://.godot/imported/flower.png-ca29bc14bf46cb87b88ffa38d366cddc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/feeds/flower.png" +dest_files=["res://.godot/imported/flower.png-ca29bc14bf46cb87b88ffa38d366cddc.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/Panels/SelectIntialFeed.gd b/scripts/Contents/Panels/SelectIntialFeed.gd index fbf4bb9..791f9ce 100644 --- a/scripts/Contents/Panels/SelectIntialFeed.gd +++ b/scripts/Contents/Panels/SelectIntialFeed.gd @@ -6,7 +6,11 @@ extends FullscreenPanelBase func beforeOpen(_args: Array = []): for feed in initialFeedSelection.get_children(): feed.queue_free() + ComponentManager.feeds.shuffle() for feed in ComponentManager.feeds: var card = feed.instantiate() as Feed + if card.topic == FeedName.Topic.WEAPON: + continue card.freeToBuy = true + card.selected.connect(func(_success): UIState.closeCurrentPanel()) initialFeedSelection.add_child(card)