diff --git a/components/Scenes/World.tscn b/components/Scenes/World.tscn index 228b82b..6abd8a7 100644 --- a/components/Scenes/World.tscn +++ b/components/Scenes/World.tscn @@ -86,7 +86,6 @@ libraries = { [node name="background" type="Sprite2D" parent="."] z_index = -1 -position = Vector2(630, 320) texture = ExtResource("6_p0nkj") [node name="rooster" parent="." groups=["players"] instance=ExtResource("3_5ui6q")] diff --git a/scripts/Contents/Panels/MakeFeed.gd b/scripts/Contents/Panels/MakeFeed.gd index 4a73302..0a1ecba 100644 --- a/scripts/Contents/Panels/MakeFeed.gd +++ b/scripts/Contents/Panels/MakeFeed.gd @@ -24,17 +24,12 @@ func _ready(): refreshNeedBaseballCount *= 1 + randf_range(GameRule.refreshCountIncreasePercent.x, GameRule.refreshCountIncreasePercent.y) regenerateCards() ) - for file in DirTool.listdir("res://components/Feeds/"): - var i = load(file).instantiate() as Feed - i.selected.connect( - func(applied: bool): - if applied: - selectedCount += 1 - updateValue() - if selectedCount >= UIState.player.fields[FieldStore.Entity.FEED_COUNT_CAN_MADE]: - finish() - ) - avaliableFeeds.add_child(i) + for feedScene in DirTool.listdir("res://components/Feeds/"): + if feedScene.get_extension() == "remap": + feedScene = feedScene.substr(0, len(feedScene) - 6) + print("正在从", feedScene, "加载饲料卡") + var feed = load(feedScene).instantiate() + avaliableFeeds.add_child(feed) func beforeOpen(): selectedCount = 0 diff --git a/scripts/Tools/DirTool.gd b/scripts/Tools/DirTool.gd index 8f770ec..3c67628 100644 --- a/scripts/Tools/DirTool.gd +++ b/scripts/Tools/DirTool.gd @@ -13,4 +13,5 @@ static func listdir(path: String) -> Array[String]: dir.list_dir_end() return files else: + print("无法打开目录: ", path) return []