mirror of
https://github.com/Rundll86/Dog-Lynx-And-HCN.git
synced 2026-05-30 07:51:54 +08:00
feat(物品系统): 新增沙滩球物品及相关功能
refactor(武器卡片): 调整武器类型和颜色映射 style(UI): 更新武器名称标签样式 fix(实体基础): 修正物品掉落逻辑 perf(音频): 优化音频处理模式 docs(物品存储): 更新物品枚举和映射 build(资源): 添加沙滩球SVG资源文件 chore(资源): 更新篮球和棒球SVG资源
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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
|
||||
|
||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
@@ -1,35 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="57" height="57" viewBox="-0.5 -0.5 57 57" version="1.1" xml:space="preserve">
|
||||
<defs/>
|
||||
<g>
|
||||
<title>Slice 1</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<g id="Page-1" stroke="none" fill-rule="evenodd">
|
||||
<g id="baseball-[baseball,sports,ball,alex-eben-meyer]" fill-rule="nonzero">
|
||||
<g id="Group-3">
|
||||
<path d="M28,0 C35.7,0 42.7,3.1 47.8,8.2 C52.9,13.3 56,20.3 56,28 C56,35.7 52.9,42.7 47.8,47.8 C42.7,52.9 35.7,56 28,56 C20.3,56 13.3,52.9 8.2,47.8 C3.1,42.7 0,35.7 0,28 C0,20.3 3.1,13.3 8.2,8.2 C13.3,3.1 20.3,0 28,0 Z" id="Oval" fill="#FAF0E6" stroke-width="1"/>
|
||||
<path d="M56,28.1 C56,21.8 53.9,16 50.3,11.4 C47.1,13.7 40.4,19.7 37,30.4 C37,30.4 33,42.4 38.9,53.8 C49.1,49.4 56,39.6 56,28.1 Z" id="Shape" fill="#F0E6D2" stroke-width="1"/>
|
||||
</g>
|
||||
<g id="Group-2">
|
||||
<polyline id="Shape_1_" points="12.9 5.3 13.7 0.9 14.4 1.1 13.9 4.6 17.6 4.7 17.6 5.5 12.9 5.3" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,32,10)"/>
|
||||
<polyline id="Shape_2_" points="9 10.6 8.8 6.1 9.6 6 9.9 9.6 13.5 8.9 13.6 9.7 9 10.6" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,32,10)"/>
|
||||
<polyline id="Shape_3_" points="6.5 16.2 5 12 5.9 11.8 7 15.1 10.3 13.9 10.5 14.6 6.5 16.2" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,32,10)"/>
|
||||
<polyline id="Shape_4_" points="3.6 28.5 1 25 1.6 24.5 3.7 27.4 6.5 25.1 7 25.7 3.6 28.5" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,32,10)"/>
|
||||
<polyline id="Shape_5_" points="3.8 35.4 0.6 32.2 1.3 31.6 3.7 34.1 6.1 31.6 6.8 32.2 3.8 35.4" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,32,10)"/>
|
||||
<polyline id="Shape_6_" points="5.5 41.4 1.8 38.9 2.2 38.3 5.2 40.2 7 37.2 7.8 37.6 5.5 41.4" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,32,10)"/>
|
||||
<polyline id="Shape_7_" points="4.6 22 2.8 18.1 3.6 17.7 5 20.9 8.2 19.3 8.5 20 4.6 22" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,32,10)"/>
|
||||
<path d="M 50.2 11 C 46.5 13.2 43.4 16.3 41.2 19.9 C 35.3 29.4 32.7 43.7 38.5 54.1 C 38.7 54 39.1 53.9 39.3 53.8 C 34.9 45.8 34.4 32.6 41.9 20.4 C 44.1 16.8 47.1 13.9 50.7 11.8 C 50.5 11.4 50.3 11.3 50.2 11 Z " id="Shape_8_" stroke-width="1" fill="#F01446"/>
|
||||
</g>
|
||||
<g id="Group">
|
||||
<polyline id="Shape_9_" points="6.6 39.1 5.9 43.5 5.1 43.4 5.6 39.9 2.1 39.8 2.2 39 6.6 39.1" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,5,2)"/>
|
||||
<polyline id="Shape_10_" points="10.2 34 10.5 38.4 9.7 38.4 9.5 35 6 35.6 5.9 34.8 10.2 34" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,5,2)"/>
|
||||
<polyline id="Shape_11_" points="12.7 28.4 14 32.5 13.2 32.7 12.2 29.5 9.1 30.7 8.7 30 12.7 28.4" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,5,2)"/>
|
||||
<polyline id="Shape_12_" points="15.3 16.3 17.8 19.7 17.2 20.2 15.2 17.4 12.7 19.6 12.2 19 15.3 16.3" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,5,2)"/>
|
||||
<polyline id="Shape_13_" points="15.2 9.5 18.1 12.6 17.6 13.1 15.2 10.6 13 13.1 12.3 12.6 15.2 9.5" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,5,2)"/>
|
||||
<polyline id="Shape_14_" points="13.6 3.5 17.1 5.9 16.7 6.6 13.8 4.7 12.1 7.5 11.5 7.1 13.6 3.5" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,5,2)"/>
|
||||
<polyline id="Shape_15_" points="14.4 22.7 16.1 26.6 15.4 26.9 14 23.7 11 25.4 10.7 24.7 14.4 22.7" stroke-width="1" fill="#F01446" transform="matrix(1,0,0,1,5,2)"/>
|
||||
<path d="M 14.4 36.2 C 12.4 39.9 9.3 42.9 5.7 45 C 5.9 45.2 6 45.5 6.2 45.6 C 9.9 43.4 12.9 40.3 15 36.6 C 20.6 27.1 23.1 12.6 17.3 2.4 C 17.1 2.5 16.8 2.6 16.5 2.7 C 21 10.6 21.7 24 14.4 36.2 Z " id="Shape_16_" stroke-width="1" fill="#F01446"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg><!--rotationCenter:28:28-->
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="50" height="50" viewBox="0,0,50,50"><g transform="translate(-215,-155)"><g stroke="none" stroke-miterlimit="10"><g><g><path d="M240,155c6.875,0 13.125,2.76786 17.67857,7.32143c4.55357,4.55357 7.32143,10.80357 7.32143,17.67857c0,6.875 -2.76786,13.125 -7.32143,17.67857c-4.55357,4.55357 -10.80357,7.32143 -17.67857,7.32143c-6.875,0 -13.125,-2.76786 -17.67857,-7.32143c-4.55357,-4.55357 -7.32143,-10.80357 -7.32143,-17.67857c0,-6.875 2.76786,-13.125 7.32143,-17.67857c4.55357,-4.55357 10.80357,-7.32143 17.67857,-7.32143z" fill="#faf0e6"/><path d="M249.73214,203.03571c-5.26786,-10.17857 -1.69643,-20.89286 -1.69643,-20.89286c3.03571,-9.55357 9.01786,-14.91071 11.875,-16.96429c3.21429,4.10714 5.08929,9.28571 5.08929,14.91071c0,10.26786 -6.16071,19.01786 -15.26786,22.94643z" fill="#f0e6d2"/></g><g fill="#f01446"><path d="M255.08929,168.66071l0.71429,-3.92857l0.625,0.17857l-0.44643,3.125l3.30357,0.08929v0.71429l-4.19643,-0.17857"/><path d="M251.60714,173.39286l-0.17857,-4.01786l0.71429,-0.08929l0.26786,3.21429l3.21429,-0.625l0.08929,0.71429l-4.10714,0.80357"/><path d="M249.375,178.39286l-1.33929,-3.75l0.80357,-0.17857l0.98214,2.94643l2.94643,-1.07143l0.17857,0.625l-3.57143,1.42857"/><path d="M246.78571,189.375l-2.32143,-3.125l0.53571,-0.44643l1.875,2.58929l2.5,-2.05357l0.44643,0.53571l-3.03571,2.5"/><path d="M246.96429,195.53571l-2.85714,-2.85714l0.625,-0.53571l2.14286,2.23214l2.14286,-2.23214l0.625,0.53571l-2.67857,2.85714"/><path d="M248.48214,200.89286l-3.30357,-2.23214l0.35714,-0.53571l2.67857,1.69643l1.60714,-2.67857l0.71429,0.35714l-2.05357,3.39286"/><path d="M247.67857,183.57143l-1.60714,-3.48214l0.71429,-0.35714l1.25,2.85714l2.85714,-1.42857l0.26786,0.625l-3.48214,1.78571"/><path d="M260.26786,165.53571c-3.21429,1.875 -5.89286,4.46429 -7.85714,7.67857c-6.69643,10.89286 -6.25,22.67857 -2.32143,29.82143c-0.17857,0.08929 -0.53571,0.17857 -0.71429,0.26786c-5.17857,-9.28571 -2.85714,-22.05357 2.41071,-30.53571c1.96429,-3.21429 4.73214,-5.98214 8.03571,-7.94643c0.08929,0.26786 0.26786,0.35714 0.44643,0.71429z"/></g><g fill="#f01446"><path d="M225.35714,191.69643l-0.625,3.92857l-0.71429,-0.08929l0.44643,-3.125l-3.125,-0.08929l0.08929,-0.71429l3.92857,0.08929"/><path d="M228.57143,187.14286l0.26786,3.92857h-0.71429l-0.17857,-3.03571l-3.125,0.53571l-0.08929,-0.71429l3.83929,-0.71429"/><path d="M230.80357,182.14286l1.16071,3.66071l-0.71429,0.17857l-0.89286,-2.85714l-2.76786,1.07143l-0.35714,-0.625l3.57143,-1.42857"/><path d="M233.125,171.33929l2.23214,3.03571l-0.53571,0.44643l-1.78571,-2.5l-2.23214,1.96429l-0.44643,-0.53571l2.76786,-2.41071"/><path d="M233.03571,165.26786l2.58929,2.76786l-0.44643,0.44643l-2.14286,-2.23214l-1.96429,2.23214l-0.625,-0.44643l2.58929,-2.76786"/><path d="M231.60714,159.91071l3.125,2.14286l-0.35714,0.625l-2.58929,-1.69643l-1.51786,2.5l-0.53571,-0.35714l1.875,-3.21429"/><path d="M232.32143,177.05357l1.51786,3.48214l-0.625,0.26786l-1.25,-2.85714l-2.67857,1.51786l-0.26786,-0.625l3.30357,-1.78571"/><path d="M229.73214,157.41071c0.26786,-0.08929 0.53571,-0.17857 0.71429,-0.26786c5.17857,9.10714 2.94643,22.05357 -2.05357,30.53571c-1.875,3.30357 -4.55357,6.07143 -7.85714,8.03571c-0.17857,-0.08929 -0.26786,-0.35714 -0.44643,-0.53571c3.21429,-1.875 5.98214,-4.55357 7.76786,-7.85714c6.51786,-10.89286 5.89286,-22.85714 1.875,-29.91071z"/></g></g></g></g></svg><!--rotationCenter:24.99999999999997:25-->
|
||||
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.4 KiB |
@@ -1,18 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46.3714714050293" height="46.397254943847656" viewBox="0.005429744720458984 -0.10458087921142578 46.3714714050293 46.397254943847656" version="1.1" xml:space="preserve">
|
||||
<!-- Generator: Sketch 52.4 (67378) - http://www.bohemiancoding.com/sketch -->
|
||||
<g>
|
||||
<title>Slice 1</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<g id="Page-1" stroke="none" fill-rule="evenodd">
|
||||
<g id="basketball-[sports,basketball,alex-eben-meyer]">
|
||||
<path d="M45.8574648,23.1360563 C45.8846538,13.3683614 39.6539895,4.68084279 30.3934296,1.57429566 C21.1328697,-1.53225146 10.9236157,1.64033263 5.05483732,9.44840822 C-0.813941103,17.2564838 -1.02330531,27.9452781 4.53521127,35.9771831 C7.82,42.015493 13.6056338,44.9957746 19.8512676,45.5335211 C26.0303958,46.4528578 32.3146456,44.7762762 37.2146479,40.9011268 C37.5969014,40.6419718 37.9726761,40.3698592 38.335493,40.0912676 C40.4134082,38.5367279 42.0338268,36.4507748 43.0261972,34.0529577 C44.8779518,30.7119673 45.852078,26.9558971 45.8574648,23.1360563 Z" id="Shape" fill="#E6781E" stroke-width="1"/>
|
||||
<g id="Group">
|
||||
<path d="M23.868169,0.505352113 L23.2202817,0.505352113 C23.1230986,13.8194366 23.0064789,30.3664789 23.1295775,45.7926761 L23.2073239,45.7926761 L23.7774648,45.7926761 C23.6543662,30.3535211 23.7709859,13.8194366 23.868169,0.505352113 Z" id="Shape" stroke-width="1" fill="#824600"/>
|
||||
<path d="M0.596056338,22.3261972 C0.596056338,22.5529577 0.596056338,22.7797183 0.596056338,23.0129577 L45.8769014,23.0129577 C45.8769014,22.7797183 45.8769014,22.5464789 45.8769014,22.3197183 L0.596056338,22.3261972 Z" id="Shape" stroke-width="1" fill="#824600"/>
|
||||
<path d="M32.2388732,14.1369014 C33.0678257,10.8081213 34.7543188,7.75456349 37.1304225,5.28028169 C36.955493,5.14422535 36.7740845,5.00169014 36.5926761,4.87211268 C34.1801721,7.41629412 32.4661572,10.5408005 31.6169014,13.9425352 C29.3039437,22.591831 30.6126761,34.195493 37.26,40.888169 C37.4543662,40.7585915 37.6357746,40.6160563 37.823662,40.48 C32.6794366,35.2709859 29.3039437,25.1315493 32.2388732,14.1369014 Z" id="Shape" stroke-width="1" fill="#824600"/>
|
||||
<path d="M14.9014085,30.3340845 C16.2875264,25.1949269 16.445105,19.8017434 15.3614085,14.5904225 C14.5798336,10.8503822 12.8836511,7.36230095 10.424507,4.43802817 L9.88028169,4.82676056 C12.3017267,7.67541516 13.9701687,11.0858087 14.7329577,14.7459155 C17.1625352,26.0580282 13.4371831,35.7439437 8.09859155,40.5642254 C8.26704225,40.7283568 8.44197183,40.8838498 8.62338028,41.0307042 C11.5129577,38.4650704 13.6639437,34.8239437 14.9014085,30.3340845 Z" id="Shape" stroke-width="1" fill="#824600"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg><!--rotationCenter:23:23-->
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="49.37009" height="49.39815" viewBox="0,0,49.37009,49.39815"><g transform="translate(-215.31495,-155.30092)"><g fill-rule="evenodd" stroke="none" stroke-miterlimit="10"><g><path d="M261.58311,191.92473c-1.07983,2.60914 -2.84306,4.87893 -5.1041,6.57047c-0.39479,0.30314 -0.80368,0.59924 -1.21963,0.88123c-5.33184,4.21667 -12.16993,6.04101 -18.89363,5.04065c-6.79607,-0.58514 -13.09159,-3.82807 -16.66587,-10.39854c-6.04839,-8.73976 -5.82058,-20.37057 0.56542,-28.86677c6.386,-8.49621 17.495,-11.94839 27.5717,-8.56806c10.0767,3.38033 16.85648,12.83349 16.82689,23.46201c-0.00586,4.15649 -1.06584,8.24358 -3.08079,11.87902z" fill="#e6781e"/><g fill="#824600"><path d="M240.63797,204.69908h-0.62039h-0.0846c-0.13395,-16.78572 -0.00705,-34.79106 0.0987,-49.27853h0.70499c-0.10575,14.48746 -0.23265,32.47871 -0.0987,49.27853z"/><path d="M264.68505,179.15743c0,0.24675 0,0.50054 0,0.75434h-49.27148c0,-0.25379 0,-0.50054 0,-0.74729z"/><path d="M255.92207,198.91819c-0.20445,0.14805 -0.40184,0.30314 -0.61334,0.44414c-7.23316,-7.28251 -8.65723,-19.90881 -6.14043,-29.32037c0.9241,-3.70153 2.78917,-7.1014 5.41429,-9.86981c0.1974,0.141 0.39479,0.29609 0.58514,0.44414c-2.58551,2.69234 -4.42064,6.01501 -5.32265,9.63716c-3.19359,11.96361 0.47939,22.99665 6.07698,28.66473z"/><path d="M224.14835,199.51743c-0.1974,-0.1598 -0.38774,-0.32899 -0.57104,-0.50759c5.80909,-5.2451 9.86276,-15.78464 7.21906,-28.0937c-0.83001,-3.98267 -2.6455,-7.69363 -5.28035,-10.79334l0.59219,-0.42299c2.67587,3.18199 4.52154,6.97748 5.37199,11.04713c1.1792,5.6706 1.00774,11.53909 -0.50054,17.13116c-1.34652,4.88555 -3.68708,8.84758 -6.83132,11.63932z"/></g></g></g></g></svg><!--rotationCenter:24.68504637717666:24.699075000907214-->
|
||||
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 1.8 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 5.6 KiB |
@@ -0,0 +1,37 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dw0g7cb4skd5s"
|
||||
path="res://.godot/imported/beachball.svg-44c9c9a724c60757f2d6e61f16abf098.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://resources/items/beachball.svg"
|
||||
dest_files=["res://.godot/imported/beachball.svg-44c9c9a724c60757f2d6e61f16abf098.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
|
||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
@@ -50,11 +50,13 @@ var inventory = {
|
||||
ItemStore.ItemType.BASEBALL: 500,
|
||||
ItemStore.ItemType.BASKETBALL: 500,
|
||||
ItemStore.ItemType.APPLE: 5,
|
||||
ItemStore.ItemType.BEACHBALL: 0,
|
||||
}
|
||||
var inventoryMax = {
|
||||
ItemStore.ItemType.BASEBALL: INF, # 无限
|
||||
ItemStore.ItemType.BASKETBALL: INF,
|
||||
ItemStore.ItemType.APPLE: 5,
|
||||
ItemStore.ItemType.BEACHBALL: INF,
|
||||
}
|
||||
|
||||
@export var defaultCooldownUnit: float = 100
|
||||
@@ -237,6 +239,7 @@ func tryDie(by: BulletBase):
|
||||
) or isBoss:
|
||||
for i in randi_range(appleCount.x, appleCount.y):
|
||||
ItemDropped.generate(ItemStore.ItemType.APPLE, 1, position + MathTool.randv2_range(GameRule.itemDroppedSpawnOffset))
|
||||
ItemDropped.generate(ItemStore.ItemType.BEACHBALL, fields[FieldStore.Entity.MAX_HEALTH], position + MathTool.randv2_range(GameRule.itemDroppedSpawnOffset))
|
||||
EffectController.create(preload("res://components/Effects/DeadBlood.tscn"), texture.global_position).shot()
|
||||
await die()
|
||||
if isPlayer() and UIState.player == self:
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
extends CanvasLayer
|
||||
class_name UIState
|
||||
|
||||
@onready var baseball = $"%baseball"
|
||||
@onready var basketball = $"%basketball"
|
||||
@onready var apple = $"%apple"
|
||||
@onready var items = $"%items"
|
||||
@onready var energyLabel: Label = $"%energy"
|
||||
@onready var energyMaxLabel: Label = $"%energyMax"
|
||||
|
||||
@@ -13,6 +13,7 @@ enum TypeTopic {
|
||||
IMPACT,
|
||||
ENERGY,
|
||||
TEMPERATURE,
|
||||
MAGIC,
|
||||
}
|
||||
|
||||
@export var displayName: String = "未命名武器"
|
||||
@@ -50,11 +51,13 @@ enum TypeTopic {
|
||||
TypeTopic.IMPACT: "冲击",
|
||||
TypeTopic.ENERGY: "能量",
|
||||
TypeTopic.TEMPERATURE: "熔融",
|
||||
TypeTopic.MAGIC: "魔法",
|
||||
}
|
||||
@export var typeTopicColorMap = {
|
||||
TypeTopic.IMPACT: Color(),
|
||||
TypeTopic.ENERGY: Color(),
|
||||
TypeTopic.TEMPERATURE: Color(),
|
||||
TypeTopic.MAGIC: Color(),
|
||||
}
|
||||
|
||||
@onready var qualityLabel: Label = $"%quality"
|
||||
|
||||
@@ -4,17 +4,20 @@ class_name ItemStore
|
||||
enum ItemType {
|
||||
BASEBALL,
|
||||
BASKETBALL,
|
||||
APPLE
|
||||
APPLE,
|
||||
BEACHBALL
|
||||
}
|
||||
static var nameMap = {
|
||||
ItemType.BASEBALL: "棒球",
|
||||
ItemType.BASKETBALL: "篮球",
|
||||
ItemType.APPLE: "苹果"
|
||||
ItemType.APPLE: "苹果",
|
||||
ItemType.BEACHBALL: "沙滩球"
|
||||
}
|
||||
static var idMap = {
|
||||
ItemType.BASEBALL: "baseball",
|
||||
ItemType.BASKETBALL: "basketball",
|
||||
ItemType.APPLE: "apple"
|
||||
ItemType.APPLE: "apple",
|
||||
ItemType.BEACHBALL: "beachball"
|
||||
}
|
||||
static func getTexture(type: ItemType) -> Texture2D:
|
||||
return load("res://resources/items/%s.svg" % idMap[type])
|
||||
|
||||
Reference in New Issue
Block a user