Merge remote-tracking branch 'origin/demo'

This commit is contained in:
cakipaul 2025-08-06 18:01:21 +08:00
commit 114f63a95b
2 changed files with 12 additions and 32 deletions

View File

@ -15,19 +15,19 @@ var audio_auto = preload("res://asset/audio/sfx/game/八音盒/自走八音盒.o
@onready var side_handle = $All/SideHandle as AnimatedSprite2D
@onready var pic = $"All/Draggable照片" as Draggable2D
@onready var d1 = $"All/OpenedBox/Panel/panel_父亲" as Draggable2D
@onready var d2 = $"All/OpenedBox/Panel/panel_母亲" as Draggable2D
@onready var d3 = $"All/OpenedBox/Panel/panel_小小蝶" as Draggable2D
@onready var d4 = $"All/OpenedBox/Panel/panel_小蝉" as Draggable2D
@onready var d1 = $"All/OpenedBox/Panel/Draggable2D1" as Draggable2D
@onready var d2 = $"All/OpenedBox/Panel/Draggable2D2" as Draggable2D
@onready var d3 = $"All/OpenedBox/Panel/Draggable2D3" as Draggable2D
@onready var d4 = $"All/OpenedBox/Panel/Draggable2D4" as Draggable2D
@onready var s0 = $"All/OpenedBox/Panel/Marker2D1" as Marker2D
@onready var s1 = $"All/OpenedBox/Panel/Marker2D2" as Marker2D
@onready var s2 = $"All/OpenedBox/Panel/Marker2D3" as Marker2D
@onready var s3 = $"All/OpenedBox/Panel/Marker2D4" as Marker2D
@onready var danzhu = $"All/Drawer/drawer_弹珠" as Draggable2D
@onready var xiaomao = $"All/Drawer/drawer_小猫身子" as Draggable2D
@onready var xiaochan = $"All/Drawer/drawer_小蝉" as Draggable2D
@onready var danzhu = $"All/Drawer/Draggable1" as Draggable2D
@onready var xiaomao = $"All/Drawer/Draggable2" as Draggable2D
@onready var xiaochan = $"All/Drawer/Draggable3" as Draggable2D
var slots: PackedVector2Array = []
var draggables: Array[Draggable2D] = []

View File

@ -1,5 +1,3 @@
[gd_scene load_steps=46 format=3 uid="uid://beleib3mmu0af"]
[gd_scene load_steps=45 format=3 uid="uid://beleib3mmu0af"]
[gd_scene load_steps=44 format=3 uid="uid://beleib3mmu0af"]
[ext_resource type="Texture2D" uid="uid://2xbl572hv2qf" path="res://asset/art/little_game/八音盒/背景.png" id="1_j0wst"]
@ -212,18 +210,13 @@ centered = false
y_sort_enabled = true
position = Vector2(68.5, -38)
[node name="panel_父亲" parent="All/OpenedBox/Panel" instance=ExtResource("16_h88gi")]
[node name="Draggable2D1" parent="All/OpenedBox/Panel" instance=ExtResource("16_h88gi")]
position = Vector2(180, 196)
rotation = 1.11169
sprite_offset = Vector2(3, -35)
texture = ExtResource("17_gm7pw")
limit_rect = Rect2(150, 150, 220, 70)
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="All/OpenedBox/Panel/panel_父亲"]
position = Vector2(3.20175, -33.5559)
polygon = PackedVector2Array(2.5, -45.5, -8.5, -45.5, -9.3, -44.5, -11.9, -44.5, -9.5, -31.1, -9.5, -30.4, -15.2, -25.5, -17.1, -25.5, -18.5, -19.2, -18.5, -3.9, -14.5, -0.700001, -13.5, 33.3, -14.5, 34.8, -14.5, 41.7, -7.7, 45.5, 4.3, 45.5, 6.3, 43.5, 8.1, 43.5, 9.5, 37.7, 9.5, 35.7, 5.8, 32, 6.3, 31.5, 8.7, 31.5, 7.5, 16.5, 7.5, -5.5, 13.8, -5.5, 18.5, -15.9, 18.5, -26.8, 16.2, -27.8, 9.5, -22.5, 9.5, -20.5, 8.6, -20.5, 3.1, -28.8, 6.5, -38.1, 6.5, -42.5)
[node name="panel_母亲" parent="All/OpenedBox/Panel" instance=ExtResource("16_h88gi")]
[node name="Sprite2D" parent="All/OpenedBox/Panel/Draggable2D1" index="0"]
light_mask = 3
texture = ExtResource("17_gm7pw")
@ -247,11 +240,6 @@ sprite_offset = Vector2(1, -34)
texture = ExtResource("18_8vbnc")
limit_rect = Rect2(150, 150, 220, 70)
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="All/OpenedBox/Panel/panel_母亲"]
position = Vector2(1.42264, -34.029)
polygon = PackedVector2Array(11.5, -41.9, 2, -45.5, -5.5, -45.5, -9.4, -40.5, -12.1, -40.5, -10.5, -34.5, -10.5, -31.5, -6, -27.9, -10.3, -23.5, -12.3, -23.5, -12.5, -21.9, -12.5, -7.8, -10.9, -3.5, -12.5, 9.4, -12.5, 29.3, -9.5, 32.3, -12.5, 34.4, -12.5, 41.7, -5.7, 45.5, 6.3, 45.5, 8.3, 43.5, 10.1, 43.5, 11.5, 37.7, 11.5, 35.7, 8, 32.2, 10.2, 30.5, 12.5, 30.5, 12.5, 28.1, 8.5, -2.5, 8.5, -3.6, 12.2, -6.5, 12.5, -19.6, 5.4, -29.3, 11.5, -37.9)
[node name="panel_小小蝶" parent="All/OpenedBox/Panel" instance=ExtResource("16_h88gi")]
[node name="Sprite2D" parent="All/OpenedBox/Panel/Draggable2D2" index="0"]
light_mask = 5
texture = ExtResource("18_8vbnc")
@ -275,11 +263,6 @@ sprite_offset = Vector2(1, -23)
texture = ExtResource("19_858bj")
limit_rect = Rect2(150, 150, 220, 70)
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="All/OpenedBox/Panel/panel_小小蝶"]
position = Vector2(1.18075, -22.9097)
polygon = PackedVector2Array(9.5, -23.1, 4.6, -26.3, 2.5, -25.2, 2.5, -24, -6.6, -24, -8.6, -21, -10.5, -21, -10.5, -18.8, -9.5, -15, -9.5, -8.9, -6.5, -6.9, -10.5, -2.8, -10.5, 16, -7.4, 18.3, -10, 20, -10.5, 29.5, -8.5, 31, -8.5, 32, 6.3, 32, 8.3, 30, 10.5, 30, 10.5, 27.6, 7, 17.3, 8.6, 15, 10.5, 15, 10.5, 13, 7.2, -9, 9.5, -20.8)
[node name="panel_小蝉" parent="All/OpenedBox/Panel" instance=ExtResource("16_h88gi")]
[node name="Sprite2D" parent="All/OpenedBox/Panel/Draggable2D3" index="0"]
light_mask = 9
texture = ExtResource("19_858bj")
@ -303,7 +286,6 @@ rotation = -1.14307
sprite_offset = Vector2(-4, -23)
limit_rect = Rect2(150, 150, 220, 70)
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="All/OpenedBox/Panel/panel_小蝉"]
[node name="Sprite2D" parent="All/OpenedBox/Panel/Draggable2D4" index="0"]
light_mask = 17
offset = Vector2(-4, -23)
@ -375,17 +357,16 @@ position = Vector2(-26.5, -3)
texture = ExtResource("29_hder7")
centered = false
[node name="drawer_弹珠" parent="All/Drawer" instance=ExtResource("16_h88gi")]
[node name="Draggable1" parent="All/Drawer" instance=ExtResource("16_h88gi")]
position = Vector2(128.5, 135)
act_as_button = true
texture = ExtResource("30_tgpfj")
limit_rect = Rect2(150, 150, 220, 70)
[node name="CollisionShape2D" type="CollisionShape2D" parent="All/Drawer/drawer_弹珠"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="All/Drawer/Draggable1"]
position = Vector2(1, 7.62939e-06)
shape = SubResource("CircleShape2D_wq2wm")
[node name="drawer_小猫身子" parent="All/Drawer" instance=ExtResource("16_h88gi")]
[node name="PointLight2D" type="PointLight2D" parent="All/Drawer/Draggable1"]
range_layer_max = 10
texture = ExtResource("30_tgpfj")
@ -397,10 +378,9 @@ act_as_button = true
texture = ExtResource("31_wq2wm")
limit_rect = Rect2(150, 150, 220, 70)
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="All/Drawer/drawer_小猫身子"]
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="All/Drawer/Draggable2"]
polygon = PackedVector2Array(5.5, -37.9, 3, -36.8, 3, -35.8, 1, -34.7, 1, -30.5, 2.2, -29.6, 1.2, -28.1, -4.2, -33.5, -6.8, -33.5, -10, -30.3, -10, -27.5, -12.7, -25.5, -14.2, -25.5, -15, -31.5, -15, -35.5, -24.3, -31.5, -26.3, -31.5, -27.4, -29, -24, -25.7, -24, -23.3, -24.8, -22.5, -26.6, -22.5, -27.5, -18.8, -35, -26.3, -35, -28.5, -43.8, -28.5, -52.8, -19.5, -54.7, -19.5, -56.7, -7.5, -58.1, -7.5, -57, 10.6, -57, 16.1, -53, 22.1, -53, 24.5, -44, 31.4, -44, 33.5, -31.1, 33.5, -27, 40.1, -27, 42.3, -19, 43.2, -19, 44.5, 10.1, 44.5, 15.5, 35.8, 18.8, 36.5, 22.9, 36.5, 26.8, 43.5, 42.8, 43.5, 45.8, 40.5, 49.1, 40.5, 55.1, 31.5, 57.4, 31.5, 48, -20.9, 48, -22.3, 38, -32.3, 38, -34.5, 28.4, -34.5, 27, -28.7, 27, -25.6, 25.4, -24.6, 23, -26.5, 23, -27.8, 20.5, -28.9, 17.4, -25.9)
[node name="drawer_小蝉" parent="All/Drawer" instance=ExtResource("16_h88gi")]
[node name="PointLight2D" type="PointLight2D" parent="All/Drawer/Draggable2"]
range_layer_max = 10
texture = ExtResource("31_wq2wm")
@ -412,7 +392,7 @@ act_as_button = true
texture = ExtResource("32_sg8mt")
limit_rect = Rect2(150, 150, 220, 70)
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="All/Drawer/drawer_小蝉"]
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="All/Drawer/Draggable3"]
position = Vector2(-1.99999, 0.999999)
polygon = PackedVector2Array(-11, -44.2, -11, -42.1, -14, -40.1, -14, -34.4, -9, -26.4, -9, -23.8, -5.6, -22.1, -12, -14.8, -12, -14.2, -27.6, -4, -29.2, -4, -30.3, -1.9, -27.1, 3, -20.5, 3, -8.7, -3.4, -11, 6.8, -11, 11.7, -5, 18.8, -5, 29, -12.7, 35, -15, 35, -15, 43.8, -11, 47.8, -11, 49.3, -2.4, 53, 6.8, 53, 15.7, 45, 18, 45, 18, 36, 13, 32, 13, 30, 8, 30, 8, 25.6, 10, 23, 11.7, 23, 13.7, 12, 15.6, 12, 11.5, -3, 12, -9.9, 12, -15.4, 19, -25, 21, -25, 21, -34.8, 16.8, -39, 13.8, -39, 12, -35.7, 12, -41.8)