1
1
mirror of https://github.com/Rundll86/Dog-Lynx-And-HCN.git synced 2026-06-02 09:21:54 +08:00

feat(物品系统): 新增沙滩球物品及相关功能

refactor(武器卡片): 调整武器类型和颜色映射
style(UI): 更新武器名称标签样式
fix(实体基础): 修正物品掉落逻辑
perf(音频): 优化音频处理模式
docs(物品存储): 更新物品枚举和映射
build(资源): 添加沙滩球SVG资源文件
chore(资源): 更新篮球和棒球SVG资源
This commit is contained in:
2025-09-06 11:05:56 +08:00
parent 86e14b3bfe
commit 2486eb6d8a
17 changed files with 84 additions and 78 deletions
+1
View File
@@ -33,6 +33,7 @@ metadata/_edit_lock_ = true
unique_name_in_owner = true
[node name="attack" type="AudioStreamPlayer2D" parent="sounds"]
process_mode = 3
[node name="container" type="VBoxContainer" parent="."]
layout_mode = 2
+2 -1
View File
@@ -5,5 +5,6 @@
[node name="FeedHasField" type="HBoxContainer"]
theme_override_constants/separation = 0
script = ExtResource("1_7leag")
targetFields = Array[int]([16])
targetFields = Array[int]([24])
composeMode = 1
clickToRefresh = true
+2 -1
View File
@@ -5,4 +5,5 @@
[node name="Debug" type="HBoxContainer"]
theme_override_constants/separation = 0
script = ExtResource("1_2hikw")
targetTopics = Array[int]([6])
targetTopics = Array[int]([2])
clickToRefresh = true
+4 -4
View File
@@ -6,10 +6,10 @@
[node name="Taco" instance=ExtResource("1_iixnt")]
avatarTexture = ExtResource("2_eed3c")
displayName = "塔克"
quality = 2
quality = 3
topic = 2
fields = Array[int]([13, 3])
fieldValues = Array[float]([0.18, 0.02])
fields = Array[int]([13, 3, 24])
fieldValues = Array[float]([0.18, 0.02, 0.01])
costs = Array[int]([1])
costCounts = Array[int]([400])
@@ -18,5 +18,5 @@ texture = ExtResource("2_eed3c")
[node name="name" parent="container/info" index="1"]
displayName = "塔克"
quality = 4
quality = 2
topic = 2
+5
View File
@@ -156,6 +156,11 @@ unique_name_in_owner = true
layout_mode = 2
type = 2
[node name="beachball" parent="root/items/items" instance=ExtResource("3_o2oi4")]
unique_name_in_owner = true
layout_mode = 2
type = 3
[node name="energy" type="PanelContainer" parent="root"]
z_index = 1
z_as_relative = false
+7 -8
View File
@@ -3,11 +3,10 @@
[ext_resource type="Theme" uid="uid://bje5cd08dyok7" path="res://themes/bigTextAndBold.tres" id="2_y8dft"]
[ext_resource type="Script" path="res://scripts/Statemachine/WeaponName.gd" id="3_g750e"]
[sub_resource type="LabelSettings" id="LabelSettings_r88ap"]
[sub_resource type="LabelSettings" id="LabelSettings_k3i20"]
font_size = 12
font_color = Color(1, 0.442751, 0, 1)
[sub_resource type="LabelSettings" id="LabelSettings_wsanh"]
[sub_resource type="LabelSettings" id="LabelSettings_07pas"]
font_size = 12
[node name="WeaponName" type="HBoxContainer"]
@@ -15,7 +14,6 @@ offset_right = 205.0
offset_bottom = 25.0
alignment = 1
script = ExtResource("3_g750e")
quality = 4
qualityColorMap = {
0: Color(0.5, 0.5, 0.5, 1),
1: Color(1, 1, 1, 1),
@@ -26,7 +24,8 @@ qualityColorMap = {
typeTopicColorMap = {
0: Color(1, 1, 1, 1),
1: Color(1, 0, 0, 1),
2: Color(0, 1, 1, 1)
2: Color(0, 1, 1, 1),
3: Color(0.851563, 0, 1, 1)
}
metadata/_edit_horizontal_guides_ = [25.0]
@@ -34,8 +33,8 @@ metadata/_edit_horizontal_guides_ = [25.0]
unique_name_in_owner = true
layout_mode = 2
size_flags_vertical = 0
text = "[传说]"
label_settings = SubResource("LabelSettings_r88ap")
text = "[普通]"
label_settings = SubResource("LabelSettings_k3i20")
[node name="label" type="RichTextLabel" parent="."]
unique_name_in_owner = true
@@ -51,4 +50,4 @@ unique_name_in_owner = true
layout_mode = 2
size_flags_vertical = 8
text = "[冲击]"
label_settings = SubResource("LabelSettings_wsanh")
label_settings = SubResource("LabelSettings_07pas")
+9 -3
View File
@@ -1,8 +1,9 @@
[gd_scene load_steps=4 format=3 uid="uid://wl8u5m52708w"]
[gd_scene load_steps=5 format=3 uid="uid://wl8u5m52708w"]
[ext_resource type="PackedScene" uid="uid://ckq2cq6m23hq3" path="res://components/Abstracts/WeaponCardBase.tscn" id="1_jwtmd"]
[ext_resource type="Script" path="res://scripts/Contents/Weapons/LGBTWeapon.gd" id="2_0tyah"]
[ext_resource type="Texture2D" uid="uid://cwfyi61xkt4bt" path="res://resources/weapons/lgbt.jpeg" id="2_ou6jo"]
[ext_resource type="AudioStream" uid="uid://bgo8p1l77xrbe" path="res://resources/sounds/effect/Magic Spell.wav" id="4_c5xse"]
[node name="LGBT" instance=ExtResource("1_jwtmd")]
offset_bottom = 346.0
@@ -25,17 +26,22 @@ needEnergy = 50.0
cooldown = 500.0
[node name="attack" parent="sounds" index="0"]
process_mode = 3
stream = ExtResource("4_c5xse")
[node name="avatar" parent="container/info" index="0"]
texture = ExtResource("2_ou6jo")
[node name="energy" parent="container/info/energyInfo" index="1"]
text = "25.0"
text = "50.0"
[node name="name" parent="container/info" index="2"]
displayName = "彩虹旗"
quality = 4
typeTopicNameMap = {
0: "冲击",
1: "能量",
2: "熔融"
}
[node name="description" parent="container" index="2"]
size_flags_vertical = 3