fallingshrimp/Dog-Lynx-And-HCN
1
1
Fork 0
mirror of https://github.com/Rundll86/Dog-Lynx-And-HCN.git synced 2026-06-26 05:22:29 +08:00
Code Releases Activity

Refactor feed components and UI interactions

Browse Source 
- Updated various feed components (Cake, Cupcake, Dango, Donut, FruitPlatter, FruitSalad, Milk, Orange, RedJam, Strawberry, Taco, WaterBottle, Xigua-Full, Xigua-Half, YellowJam) to correct names, textures, and display names.
- Modified MakeFeed scene to improve feed selection and display logic, including the addition of skip functionality.
- Enhanced UIState and EntityBase scripts to manage feed counts and selections more effectively.
- Introduced DirTool for directory operations and improved file loading mechanisms.
- Adjusted TickTool for frame-based operations.
This commit is contained in:
陨落基围虾
2025-08-27 16:33:21 +08:00
parent a3ae7ae887
commit 9e396eef3d
24 changed files with 164 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/Feeds/Cake.tscn
+3 -4
View File
@@ -1,7 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://dl34e70hpckp0"]
[gd_scene load_steps=3 format=3 uid="uid://dl34e70hpckp0"]
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_f2mv8"]
[ext_resource type="Texture2D" uid="uid://b7vxserbhskol" path="res://resources/feeds/banana.svg" id="2_1wmlm"]
[ext_resource type="Texture2D" uid="uid://bfioxi3ehf4kv" path="res://resources/feeds/cake-a.svg" id="2_ijk6h"]
[node name="Cake" instance=ExtResource("1_f2mv8")]
@@ -13,7 +12,7 @@ costs = Array[int]([1])
costCounts = Array[int]([70])
[node name="avatar" parent="container/info" index="0"]
texture = ExtResource("2_1wmlm")
texture = ExtResource("2_ijk6h")
[node name="name" parent="container/info" index="1"]
text = "[b]香蕉[/b]"
text = "[b]生日蛋糕[/b]"
components/Feeds/Cupcake.tscn
+4 -5
View File
@@ -1,10 +1,9 @@
[gd_scene load_steps=4 format=3 uid="uid://u58mo875ipgg"]
[gd_scene load_steps=3 format=3 uid="uid://u58mo875ipgg"]
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_x5oju"]
[ext_resource type="Texture2D" uid="uid://d3rkwlf75hvva" path="res://resources/feeds/jar-b.svg" id="2_jjjxx"]
[ext_resource type="Texture2D" uid="uid://tp2scdjwalro" path="res://resources/feeds/muffin-a.svg" id="2_qojf3"]
[node name="FruitSalad" instance=ExtResource("1_x5oju")]
[node name="Cupcake" instance=ExtResource("1_x5oju")]
avatarTexture = ExtResource("2_qojf3")
displayName = "烘焙松糕"
fields = Array[int]([12, 2])
@@ -13,7 +12,7 @@ costs = Array[int]([0])
costCounts = Array[int]([125])
[node name="avatar" parent="container/info" index="0"]
texture = ExtResource("2_jjjxx")
texture = ExtResource("2_qojf3")
[node name="name" parent="container/info" index="1"]
text = "[b]蜂蜜果酱[/b]"
text = "[b]烘焙松糕[/b]"
components/Feeds/Dango.tscn
+3 -3
View File
@@ -3,11 +3,11 @@
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_mwo1u"]
[ext_resource type="Texture2D" uid="uid://bvkjvgxabqyvg" path="res://resources/feeds/dango.svg" id="2_ckr7l"]
[node name="FruitSalad" instance=ExtResource("1_mwo1u")]
[node name="Dango" instance=ExtResource("1_mwo1u")]
avatarTexture = ExtResource("2_ckr7l")
displayName = "团子"
fields = Array[int]([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14])
fieldValues = Array[float]([10.0, 0.1, 0.15, 0.12, 0.04, 0.1, 0.075, 5.0, 0.15, 3.0, 0.07, 0.15, 0.1, 0.4, 0.2])
fields = Array[int]([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16])
fieldValues = Array[float]([10.0, 0.1, 0.15, 0.12, 0.04, 0.1, 0.075, 5.0, 0.15, 3.0, 0.07, 0.15, 0.1, 0.4, 0.2, 2.0, 2.0])
costs = Array[int]([0, 1])
costCounts = Array[int]([2000, 1500])
components/Feeds/Donut.tscn
+2 -6
View File
@@ -1,8 +1,7 @@
[gd_scene load_steps=4 format=3 uid="uid://bbmjur6cjmffo"]
[gd_scene load_steps=3 format=3 uid="uid://bbmjur6cjmffo"]
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_7gqm6"]
[ext_resource type="Texture2D" uid="uid://bxqax0anr5a45" path="res://resources/feeds/donut.svg" id="2_bv6j5"]
[ext_resource type="Texture2D" uid="uid://d3op67s1hysla" path="res://resources/feeds/cheesy puffs.png" id="2_q5fyh"]
[node name="Donut" instance=ExtResource("1_7gqm6")]
avatarTexture = ExtResource("2_bv6j5")
@@ -12,8 +11,5 @@ fieldValues = Array[float]([1.0, -3.0])
costs = Array[int]([0])
costCounts = Array[int]([100])
[node name="avatar" parent="container/info" index="0"]
texture = ExtResource("2_q5fyh")
[node name="name" parent="container/info" index="1"]
text = "[b]奶酪泡芙[/b]"
text = "[b]甜甜圈[/b]"
components/Feeds/FruitPlatter.tscn
+3 -4
View File
@@ -1,8 +1,7 @@
[gd_scene load_steps=4 format=3 uid="uid://b45fcafxjacch"]
[gd_scene load_steps=3 format=3 uid="uid://b45fcafxjacch"]
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_rejfg"]
[ext_resource type="Texture2D" uid="uid://b7g4nciiimp1t" path="res://resources/feeds/fruit platter.png" id="2_6i6sp"]
[ext_resource type="Texture2D" uid="uid://b8uh5md8o4ihf" path="res://resources/feeds/fortune cookie.png" id="2_n0rfa"]
[node name="FruitPlatter" instance=ExtResource("1_rejfg")]
avatarTexture = ExtResource("2_6i6sp")
@@ -13,7 +12,7 @@ costs = Array[int]([0, 1])
costCounts = Array[int]([150, 200])
[node name="avatar" parent="container/info" index="0"]
texture = ExtResource("2_n0rfa")
texture = ExtResource("2_6i6sp")
[node name="name" parent="container/info" index="1"]
text = "[b]幸运签语饼[/b]"
text = "[b]水果拼盘[/b]"
components/Feeds/FruitSalad.tscn
+1 -1
View File
@@ -15,4 +15,4 @@ costCounts = Array[int]([200])
texture = ExtResource("2_2oxe7")
[node name="name" parent="container/info" index="1"]
text = "[b]水果拼盘[/b]"
text = "[b]水果沙拉[/b]"
components/Feeds/Milk.tscn
+5 -6
View File
@@ -1,19 +1,18 @@
[gd_scene load_steps=4 format=3 uid="uid://cx5o43i2untlo"]
[gd_scene load_steps=3 format=3 uid="uid://cx5o43i2untlo"]
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_y8pe8"]
[ext_resource type="Texture2D" uid="uid://d3rkwlf75hvva" path="res://resources/feeds/jar-b.svg" id="2_5p5xn"]
[ext_resource type="Texture2D" uid="uid://dhvv8isqodfd5" path="res://resources/feeds/milk-a.svg" id="2_15plv"]
[node name="FruitSalad" instance=ExtResource("1_y8pe8")]
[node name="Milk" instance=ExtResource("1_y8pe8")]
avatarTexture = ExtResource("2_15plv")
displayName = "牛奶"
fields = Array[int]([13, 11])
fields = Array[int]([13, 11, 7])
fieldValues = Array[float]([0.4, 0.24])
costs = Array[int]([0, 1])
costCounts = Array[int]([355, 200])
[node name="avatar" parent="container/info" index="0"]
texture = ExtResource("2_5p5xn")
texture = ExtResource("2_15plv")
[node name="name" parent="container/info" index="1"]
text = "[b]蜂蜜果酱[/b]"
text = "[b]牛奶[/b]"
components/Feeds/Orange.tscn
+4 -5
View File
@@ -1,10 +1,9 @@
[gd_scene load_steps=4 format=3 uid="uid://byfn3ruhh0fid"]
[gd_scene load_steps=3 format=3 uid="uid://byfn3ruhh0fid"]
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_w5eks"]
[ext_resource type="Texture2D" uid="uid://d3rkwlf75hvva" path="res://resources/feeds/jar-b.svg" id="2_0xfoo"]
[ext_resource type="Texture2D" uid="uid://5xp54g568jbb" path="res://resources/feeds/orange2-b.svg" id="2_l6jnq"]
[node name="FruitSalad" instance=ExtResource("1_w5eks")]
[node name="Orange" instance=ExtResource("1_w5eks")]
avatarTexture = ExtResource("2_l6jnq")
displayName = "橘子"
fields = Array[int]([10, 3])
@@ -13,7 +12,7 @@ costs = Array[int]([1])
costCounts = Array[int]([275])
[node name="avatar" parent="container/info" index="0"]
texture = ExtResource("2_0xfoo")
texture = ExtResource("2_l6jnq")
[node name="name" parent="container/info" index="1"]
text = "[b]蜂蜜果酱[/b]"
text = "[b]橘子[/b]"
components/Feeds/RedJam.tscn
+4 -5
View File
@@ -1,10 +1,9 @@
[gd_scene load_steps=4 format=3 uid="uid://dhyjvrmcql6ay"]
[gd_scene load_steps=3 format=3 uid="uid://dhyjvrmcql6ay"]
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_a74ax"]
[ext_resource type="Texture2D" uid="uid://wa3p5atf521t" path="res://resources/feeds/jar-a.svg" id="2_o2o56"]
[ext_resource type="Texture2D" uid="uid://doyq5mp7wvv7s" path="res://resources/feeds/glass water-a.svg" id="2_q67vo"]
[node name="FruitSalad" instance=ExtResource("1_a74ax")]
[node name="RedJam" instance=ExtResource("1_a74ax")]
avatarTexture = ExtResource("2_o2o56")
displayName = "草莓果酱"
fields = Array[int]([3, 1])
@@ -13,7 +12,7 @@ costs = Array[int]([0, 1])
costCounts = Array[int]([100, 50])
[node name="avatar" parent="container/info" index="0"]
texture = ExtResource("2_q67vo")
texture = ExtResource("2_o2o56")
[node name="name" parent="container/info" index="1"]
text = "[b]一杯水[/b]"
text = "[b]草莓果酱[/b]"
components/Feeds/Strawberry.tscn
+1 -1
View File
@@ -3,7 +3,7 @@
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_wr2cd"]
[ext_resource type="Texture2D" uid="uid://cbyfpwrg2e3ns" path="res://resources/feeds/strawberry-a.svg" id="2_82amy"]
[node name="FruitSalad" instance=ExtResource("1_wr2cd")]
[node name="Strawberry" instance=ExtResource("1_wr2cd")]
avatarTexture = ExtResource("2_82amy")
displayName = "草莓"
fields = Array[int]([14])
components/Feeds/Taco.tscn
+4 -5
View File
@@ -1,10 +1,9 @@
[gd_scene load_steps=4 format=3 uid="uid://c52nrkruwwhyd"]
[gd_scene load_steps=3 format=3 uid="uid://c52nrkruwwhyd"]
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_iixnt"]
[ext_resource type="Texture2D" uid="uid://pvcwt58hsg5i" path="res://resources/feeds/Taco.svg" id="2_eed3c"]
[ext_resource type="Texture2D" uid="uid://cbyfpwrg2e3ns" path="res://resources/feeds/strawberry-a.svg" id="2_kd8ai"]
[node name="FruitSalad" instance=ExtResource("1_iixnt")]
[node name="Taco" instance=ExtResource("1_iixnt")]
avatarTexture = ExtResource("2_eed3c")
displayName = "塔克"
fields = Array[int]([13])
@@ -13,7 +12,7 @@ costs = Array[int]([1])
costCounts = Array[int]([225])
[node name="avatar" parent="container/info" index="0"]
texture = ExtResource("2_kd8ai")
texture = ExtResource("2_eed3c")
[node name="name" parent="container/info" index="1"]
text = "[b]草莓[/b]"
text = "[b]塔克[/b]"
components/Feeds/WaterBottle.tscn
+1 -1
View File
@@ -3,7 +3,7 @@
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_vfxjq"]
[ext_resource type="Texture2D" uid="uid://doyq5mp7wvv7s" path="res://resources/feeds/glass water-a.svg" id="2_gsfud"]
[node name="FruitSalad" instance=ExtResource("1_vfxjq")]
[node name="WaterBottle" instance=ExtResource("1_vfxjq")]
avatarTexture = ExtResource("2_gsfud")
displayName = "一杯水"
fields = Array[int]([3])
components/Feeds/Xigua-Full.tscn
+4 -5
View File
@@ -1,10 +1,9 @@
[gd_scene load_steps=4 format=3 uid="uid://dmdfxv7p8d061"]
[gd_scene load_steps=3 format=3 uid="uid://dmdfxv7p8d061"]
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_sw8vc"]
[ext_resource type="Texture2D" uid="uid://d3rkwlf75hvva" path="res://resources/feeds/jar-b.svg" id="2_e5g35"]
[ext_resource type="Texture2D" uid="uid://ddxq46crf8s0b" path="res://resources/feeds/watermelon-a.svg" id="2_j4m35"]
[node name="FruitSalad" instance=ExtResource("1_sw8vc")]
[node name="Xigua-Full" instance=ExtResource("1_sw8vc")]
avatarTexture = ExtResource("2_j4m35")
displayName = "西瓜"
fields = Array[int]([2, 0])
@@ -13,7 +12,7 @@ costs = Array[int]([0, 1])
costCounts = Array[int]([100, 125])
[node name="avatar" parent="container/info" index="0"]
texture = ExtResource("2_e5g35")
texture = ExtResource("2_j4m35")
[node name="name" parent="container/info" index="1"]
text = "[b]蜂蜜果酱[/b]"
text = "[b]西瓜[/b]"
components/Feeds/Xigua-Half.tscn
+4 -5
View File
@@ -1,10 +1,9 @@
[gd_scene load_steps=4 format=3 uid="uid://ub2joo082noq"]
[gd_scene load_steps=3 format=3 uid="uid://ub2joo082noq"]
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_bbid3"]
[ext_resource type="Texture2D" uid="uid://m2q78i18f1do" path="res://resources/feeds/watermelon-c.svg" id="2_htt7g"]
[ext_resource type="Texture2D" uid="uid://ddxq46crf8s0b" path="res://resources/feeds/watermelon-a.svg" id="2_nwypg"]
[node name="FruitSalad" instance=ExtResource("1_bbid3")]
[node name="Xigua-Half" instance=ExtResource("1_bbid3")]
avatarTexture = ExtResource("2_htt7g")
displayName = "一片西瓜"
fields = Array[int]([0])
@@ -13,7 +12,7 @@ costs = Array[int]([0])
costCounts = Array[int]([50])
[node name="avatar" parent="container/info" index="0"]
texture = ExtResource("2_nwypg")
texture = ExtResource("2_htt7g")
[node name="name" parent="container/info" index="1"]
text = "[b]西瓜[/b]"
text = "[b]一片西瓜[/b]"
components/Feeds/YellowJam.tscn
+4 -5
View File
@@ -1,10 +1,9 @@
[gd_scene load_steps=4 format=3 uid="uid://cuggrw1eiwlox"]
[gd_scene load_steps=3 format=3 uid="uid://cuggrw1eiwlox"]
[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_evi6p"]
[ext_resource type="Texture2D" uid="uid://d3rkwlf75hvva" path="res://resources/feeds/jar-b.svg" id="2_bea7w"]
[ext_resource type="Texture2D" uid="uid://wa3p5atf521t" path="res://resources/feeds/jar-a.svg" id="2_hqcck"]
[node name="FruitSalad" instance=ExtResource("1_evi6p")]
[node name="YellowJam" instance=ExtResource("1_evi6p")]
avatarTexture = ExtResource("2_bea7w")
displayName = "蜂蜜果酱"
fields = Array[int]([3, 1])
@@ -13,7 +12,7 @@ costs = Array[int]([0, 1])
costCounts = Array[int]([200, 125])
[node name="avatar" parent="container/info" index="0"]
texture = ExtResource("2_hqcck")
texture = ExtResource("2_bea7w")
[node name="name" parent="container/info" index="1"]
text = "[b]草莓果酱[/b]"
text = "[b]蜂蜜果酱[/b]"