merge hotfix

This commit is contained in:
cakipaul 2025-07-13 21:45:57 +08:00
parent b052e0ab15
commit 434bb7b509
8 changed files with 4 additions and 18 deletions

View File

@ -1,5 +1,4 @@
[gd_scene load_steps=83 format=3 uid="uid://djc2uaefhmu7"] [gd_scene load_steps=84 format=3 uid="uid://djc2uaefhmu7"]
[gd_scene load_steps=82 format=3 uid="uid://djc2uaefhmu7"]
[ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_0dylx"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_0dylx"]
[ext_resource type="Script" uid="uid://dsp5plrdkrsd7" path="res://scene/ground/scene/c02/s03_院子.gd" id="2_dt5aj"] [ext_resource type="Script" uid="uid://dsp5plrdkrsd7" path="res://scene/ground/scene/c02/s03_院子.gd" id="2_dt5aj"]
@ -58,7 +57,6 @@
[ext_resource type="Texture2D" uid="uid://uh2ruegr3d7v" path="res://asset/art/gif/c02_一楼火灾/7-最左木箱 烧痕.png" id="36_rnk1v"] [ext_resource type="Texture2D" uid="uid://uh2ruegr3d7v" path="res://asset/art/gif/c02_一楼火灾/7-最左木箱 烧痕.png" id="36_rnk1v"]
[ext_resource type="SpriteFrames" uid="uid://b0icyhxpj16tv" path="res://asset/art/gif/c02_谢幕演出/c02_谢幕演出_frames.tres" id="39_rnk1v"] [ext_resource type="SpriteFrames" uid="uid://b0icyhxpj16tv" path="res://asset/art/gif/c02_谢幕演出/c02_谢幕演出_frames.tres" id="39_rnk1v"]
[ext_resource type="PackedScene" uid="uid://cpxt082my5yac" path="res://scene/ground/script/c02/s03_closeup抓药游戏.tscn" id="45_fxne6"] [ext_resource type="PackedScene" uid="uid://cpxt082my5yac" path="res://scene/ground/script/c02/s03_closeup抓药游戏.tscn" id="45_fxne6"]
[ext_resource type="AudioStream" uid="uid://dxoj6vg0wrj0j" path="res://asset/audio/peiyin_new/c02/c02_8小男孩童谣.wav" id="46_qqdxs"]
[ext_resource type="AudioStream" uid="uid://broetvd8vuc05" path="res://asset/audio/peiyin/c02/c02_8小男孩童谣.ogg" id="46_qqdxs"] [ext_resource type="AudioStream" uid="uid://broetvd8vuc05" path="res://asset/audio/peiyin/c02/c02_8小男孩童谣.ogg" id="46_qqdxs"]
[ext_resource type="Script" uid="uid://cnt01hiw52bmn" path="res://scene/entity/ux/sign_snapper.gd" id="51_vddfx"] [ext_resource type="Script" uid="uid://cnt01hiw52bmn" path="res://scene/entity/ux/sign_snapper.gd" id="51_vddfx"]
[ext_resource type="AudioStream" uid="uid://bxp3f263aaqkp" path="res://asset/audio/sfx/脚步/02_室外_1.ogg" id="52_qqdxs"] [ext_resource type="AudioStream" uid="uid://bxp3f263aaqkp" path="res://asset/audio/sfx/脚步/02_室外_1.ogg" id="52_qqdxs"]
@ -574,6 +572,7 @@ texture = ExtResource("8_plfv5")
position = Vector2(800, -173) position = Vector2(800, -173)
script = ExtResource("26_o1qbs") script = ExtResource("26_o1qbs")
event_name = &"c02_madman_interacted_stage" event_name = &"c02_madman_interacted_stage"
event_memo = "当事件[c02_madman_interacted_stage=]时显示该节点"
metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" metadata/_custom_type_script = "uid://bkkiyk5jkdw4d"
[node name="Sfx2D小蝉哼歌" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/Event2D小蝉哼歌"] [node name="Sfx2D小蝉哼歌" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/Event2D小蝉哼歌"]

View File

@ -1076,10 +1076,6 @@ position = Vector2(0, 15)
texture = ExtResource("8_7x2h6") texture = ExtResource("8_7x2h6")
[node name="煤油灯2" type="Sprite2D" parent="Ground/DeployLayer" index="10"] [node name="煤油灯2" type="Sprite2D" parent="Ground/DeployLayer" index="10"]
[node name="灯光" parent="Ground/DeployLayer/煤油灯" index="5"]
animation = &"小蝉背对呼吸帧"
[node name="煤油灯2" type="Sprite2D" parent="Ground/DeployLayer" index="9"]
position = Vector2(321, 1) position = Vector2(321, 1)
texture = ExtResource("16_osg51") texture = ExtResource("16_osg51")

View File

@ -1,6 +0,0 @@
extends CanvasLayer
signal exit(arg)
func _ready() -> void:
layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME

View File

@ -1 +0,0 @@
uid://c8qy6xorxe42h

View File

@ -33,7 +33,7 @@ script = ExtResource("2_y504i")
[node name="VibeSfx" type="Node" parent="Ground/AnimationPlayer" index="0"] [node name="VibeSfx" type="Node" parent="Ground/AnimationPlayer" index="0"]
script = ExtResource("3_kchgf") script = ExtResource("3_kchgf")
autoplay_group = &"c02_楼道2" autoplay_group = &"c02_房间里1"
metadata/_custom_type_script = "uid://cpejxlfni6n52" metadata/_custom_type_script = "uid://cpejxlfni6n52"
[node name="BGSprite2D" parent="Ground" index="2"] [node name="BGSprite2D" parent="Ground" index="2"]

View File

@ -29,7 +29,7 @@ script = ExtResource("2_oxs1j")
[node name="VibeSfx" type="Node" parent="Ground/AnimationPlayer" index="0"] [node name="VibeSfx" type="Node" parent="Ground/AnimationPlayer" index="0"]
script = ExtResource("3_vyti6") script = ExtResource("3_vyti6")
autoplay_group = &"c02_楼道2" autoplay_group = &"c02_房间里2"
metadata/_custom_type_script = "uid://cpejxlfni6n52" metadata/_custom_type_script = "uid://cpejxlfni6n52"
[node name="BGSprite2D" parent="Ground" index="2"] [node name="BGSprite2D" parent="Ground" index="2"]

View File

@ -1,6 +1,5 @@
[gd_scene load_steps=6 format=3 uid="uid://dd8dfoik0ig3y"] [gd_scene load_steps=6 format=3 uid="uid://dd8dfoik0ig3y"]
[ext_resource type="Script" uid="uid://c8qy6xorxe42h" path="res://scene/ground/scene/c02/盒子猫画特写.gd" id="1_4p6cc"]
[ext_resource type="Script" uid="uid://befm61kt22miu" path="res://scene/ground/script/c02/s08_画特写.gd" id="1_4p6cc"] [ext_resource type="Script" uid="uid://befm61kt22miu" path="res://scene/ground/script/c02/s08_画特写.gd" id="1_4p6cc"]
[ext_resource type="Texture2D" uid="uid://d1seskftkw08q" path="res://asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫初次特写.png" id="2_jo6o1"] [ext_resource type="Texture2D" uid="uid://d1seskftkw08q" path="res://asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫初次特写.png" id="2_jo6o1"]
[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_myoho"] [ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_myoho"]

View File

@ -1,6 +1,5 @@
[gd_scene load_steps=8 format=3 uid="uid://cxv7vdgwb8lqb"] [gd_scene load_steps=8 format=3 uid="uid://cxv7vdgwb8lqb"]
[ext_resource type="Script" uid="uid://c8qy6xorxe42h" path="res://scene/ground/scene/c02/盒子猫画特写.gd" id="1_tja8r"]
[ext_resource type="Script" uid="uid://befm61kt22miu" path="res://scene/ground/script/c02/s08_画特写.gd" id="1_tja8r"] [ext_resource type="Script" uid="uid://befm61kt22miu" path="res://scene/ground/script/c02/s08_画特写.gd" id="1_tja8r"]
[ext_resource type="Texture2D" uid="uid://k6164drvkbg8" path="res://asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫结束特写.png" id="2_qrck0"] [ext_resource type="Texture2D" uid="uid://k6164drvkbg8" path="res://asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫结束特写.png" id="2_qrck0"]
[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_7dv3t"] [ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_7dv3t"]