From 506fef59da82d078de4404f9539c00645727c071 Mon Sep 17 00:00:00 2001 From: cakipaul Date: Sat, 13 Sep 2025 15:33:06 +0800 Subject: [PATCH] =?UTF-8?q?demo=200.7.3=20=E7=99=9E=E5=AD=90=E7=BA=B8?= =?UTF-8?q?=E4=BA=BA=20hotfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scene/c02/s04_保卫科/锡纸_highlight.png | Bin 0 -> 17706 bytes .../c02/s04_保卫科/锡纸_highlight.png.import | 34 +++++++++ asset/dialogue/event_stage.dialogue | 2 + manager/config_manager/global_config.gd | 2 +- scene/ground/scene/c04/s06_小蝶房间.gd | 4 +- scene/ground/scene/c04/s06_小蝶房间.tscn | 70 +++++++++++++++--- scene/ground/script/c02/折锡纸.tscn | 4 +- .../script/c03/s03_closeup癞子纸人.tscn | 1 - .../ground/script/c04/s06_closeup书桌日记.gd | 8 ++ .../script/c04/s06_closeup书桌日记.tscn | 5 +- scene/ground/script/c04/s06_closeup日历.tscn | 13 +--- scene/ground/script/c04/s06_event时间线1.gd | 27 +++++++ .../ground/script/c04/s06_event时间线1.gd.uid | 1 + scene/ground/script/c04/s06_event时间线2.gd | 27 +++++++ .../ground/script/c04/s06_event时间线2.gd.uid | 1 + scene/ground/script/c04/s06_event时间线3.gd | 27 +++++++ .../ground/script/c04/s06_event时间线3.gd.uid | 1 + 17 files changed, 201 insertions(+), 26 deletions(-) create mode 100644 asset/art/scene/c02/s04_保卫科/锡纸_highlight.png create mode 100644 asset/art/scene/c02/s04_保卫科/锡纸_highlight.png.import create mode 100644 scene/ground/script/c04/s06_event时间线1.gd create mode 100644 scene/ground/script/c04/s06_event时间线1.gd.uid create mode 100644 scene/ground/script/c04/s06_event时间线2.gd create mode 100644 scene/ground/script/c04/s06_event时间线2.gd.uid create mode 100644 scene/ground/script/c04/s06_event时间线3.gd create mode 100644 scene/ground/script/c04/s06_event时间线3.gd.uid diff --git a/asset/art/scene/c02/s04_保卫科/锡纸_highlight.png b/asset/art/scene/c02/s04_保卫科/锡纸_highlight.png new file mode 100644 index 0000000000000000000000000000000000000000..d8fcf46e72e2e3b11b5955c5eb92517f3a509e13 GIT binary patch literal 17706 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
  • ^}OqL9B~g9&b*vlv(06C~ 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 literal 0 HcmV?d00001 diff --git a/asset/art/scene/c02/s04_保卫科/锡纸_highlight.png.import b/asset/art/scene/c02/s04_保卫科/锡纸_highlight.png.import new file mode 100644 index 00000000..076a09b5 --- /dev/null +++ b/asset/art/scene/c02/s04_保卫科/锡纸_highlight.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bd5but24012lt" +path="res://.godot/imported/锡纸_highlight.png-bf307010c923496336217c100e8ea0db.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s04_保卫科/锡纸_highlight.png" +dest_files=["res://.godot/imported/锡纸_highlight.png-bf307010c923496336217c100e8ea0db.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 diff --git a/asset/dialogue/event_stage.dialogue b/asset/dialogue/event_stage.dialogue index 478abf1e..74f50a17 100644 --- a/asset/dialogue/event_stage.dialogue +++ b/asset/dialogue/event_stage.dialogue @@ -52,6 +52,8 @@ c04_puppet_game: 0:初始化 1:开始游戏 2:游戏胜利 c04_erase_curse: 0:初始化 1:开始游戏 2:游戏结束 # 煮肉游戏 c04_stew_meat: 0:初始化 1:游戏结束 +# 日记游戏 +c04_xdie_calendar_stage: 0:初始化 1:时间线一 2:时间线二 3:时间线三 4:结束 => END diff --git a/manager/config_manager/global_config.gd b/manager/config_manager/global_config.gd index fc50a372..0cc46509 100644 --- a/manager/config_manager/global_config.gd +++ b/manager/config_manager/global_config.gd @@ -7,7 +7,7 @@ const DEBUG_CHARACTER_PREFIX = "[debug]" # 影响事件的 release_stage # 0:demo # 1:v1.0正式版 -const RELEASE_STAGE := 1 +const RELEASE_STAGE := 0 static func is_demo() -> bool: return RELEASE_STAGE == 0 diff --git a/scene/ground/scene/c04/s06_小蝶房间.gd b/scene/ground/scene/c04/s06_小蝶房间.gd index a9e78a88..2c56a078 100644 --- a/scene/ground/scene/c04/s06_小蝶房间.gd +++ b/scene/ground/scene/c04/s06_小蝶房间.gd @@ -23,6 +23,8 @@ func _setup_node_reference() -> void: func _on_ground_ready() -> void: + # c04_xdie_calendar_stage: 0:初始化 1:时间线一 2:时间线二 3:时间线三 4:结束 + var calendar_stage = EventManager.get_stage("c04_xdie_calendar_stage") # 共有三天 [0]民国八年三月一日 [1]民国八年十月三十日 [2]民国八年十一月二日 - var dairy_status = ArchiveManager.get_global_value("c04_xdie_calendar", [0, 0, 0]) + var calendar_mask = ArchiveManager.get_global_value("c04_xdie_calendar_mask", [0, 0, 0]) diff --git a/scene/ground/scene/c04/s06_小蝶房间.tscn b/scene/ground/scene/c04/s06_小蝶房间.tscn index 25581e9d..cb286986 100644 --- a/scene/ground/scene/c04/s06_小蝶房间.tscn +++ b/scene/ground/scene/c04/s06_小蝶房间.tscn @@ -1,16 +1,22 @@ -[gd_scene load_steps=13 format=3 uid="uid://dgcxqcu5k6tvt"] +[gd_scene load_steps=19 format=3 uid="uid://dgcxqcu5k6tvt"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_18ge5"] [ext_resource type="Script" uid="uid://btnilpqjbdksp" path="res://scene/ground/scene/c04/s06_小蝶房间.gd" id="2_18ge5"] [ext_resource type="AudioStream" uid="uid://b2mudqvq1dmng" path="res://asset/audio/sfx/环境音/白噪音/白噪声房间里1.ogg" id="3_ccr25"] [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="4_ypwo5"] [ext_resource type="Texture2D" uid="uid://bs32stvx3tf55" path="res://asset/art/scene/c04/s06_小蝶房间/藤曼(连环画游戏结束后).png" id="5_ccr25"] +[ext_resource type="Texture2D" uid="uid://d0mo8j2qal64h" path="res://asset/art/scene/c04/s06_小蝶房间/首次进入（老鼠精痕迹）/小蝶房间(首次进入)背景.png" id="5_iavu1"] [ext_resource type="Texture2D" uid="uid://diaag73brt8tj" path="res://asset/art/scene/c04/s06_小蝶房间/小蝶房间.png" id="5_ypwo5"] [ext_resource type="Script" uid="uid://0wjaho6qkg6s" path="res://manager/event_manager/event_binder.gd" id="6_ypwo5"] +[ext_resource type="Texture2D" uid="uid://cwyqn8vu785qm" path="res://asset/art/scene/c04/s06_小蝶房间/日记1/小蝶房间第一版.png" id="7_jq27m"] [ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="8_06w3v"] -[ext_resource type="Texture2D" uid="uid://b3loxa0q7tp8m" path="res://asset/art/scene/c04/s06_小蝶房间/前景.png" id="8_233xp"] [ext_resource type="PackedScene" uid="uid://c6xyuggu3b4y7" path="res://scene/ground/script/c04/s06_closeup书桌日记.tscn" id="9_xu7dv"] [ext_resource type="PackedScene" uid="uid://dhrc5sc21rwc" path="res://scene/ground/script/c04/s06_closeup日历.tscn" id="10_ndd52"] +[ext_resource type="Texture2D" uid="uid://2extcncru2mq" path="res://asset/art/scene/c04/s06_小蝶房间/首次进入（老鼠精痕迹）/前景.png" id="13_mu0l7"] +[ext_resource type="Script" uid="uid://bp6vwn12wa7xp" path="res://scene/ground/script/c04/s06_event时间线1.gd" id="13_qskdw"] +[ext_resource type="Script" uid="uid://ckuwiorhrcmak" path="res://scene/ground/script/c04/s06_event时间线2.gd" id="14_nmp0h"] +[ext_resource type="Texture2D" uid="uid://chuflxy8k7by3" path="res://asset/art/scene/c04/s06_小蝶房间/日记1/前景搬家.png" id="14_qskdw"] +[ext_resource type="Script" uid="uid://ckrybu5owjxsp" path="res://scene/ground/script/c04/s06_event时间线3.gd" id="15_cd6ht"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"] @@ -40,7 +46,7 @@ metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="BGSprite2D" parent="Ground" index="2"] light_mask = 5 -texture = ExtResource("5_ypwo5") +texture = ExtResource("5_iavu1") offset = Vector2(0, -158) [node name="portal_left" parent="Ground/DeployLayer" index="0"] @@ -53,25 +59,52 @@ status = "opened" position = Vector2(631, 18) [node name="藤蔓" type="Sprite2D" parent="Ground/DeployLayer" index="2"] -position = Vector2(319, -27) +position = Vector2(337, -17) texture = ExtResource("5_ccr25") [node name="EventBinder" type="Node" parent="Ground/DeployLayer/藤蔓"] script = ExtResource("6_ypwo5") -updater_event = &"c04_erase_curse" +updater_event = &"c04_s06_vine" updater_mode = "shower" updater_ease_duration = 0.0 -updater_stages = Array[int]([0, 1]) metadata/_custom_type_script = "uid://0wjaho6qkg6s" [node name="Closeup书桌日记" parent="Ground/DeployLayer" index="3" instance=ExtResource("8_06w3v")] -position = Vector2(201, 35) +position = Vector2(201, 41) packed_scene = ExtResource("9_xu7dv") [node name="Closeup日历" parent="Ground/DeployLayer" index="4" instance=ExtResource("8_06w3v")] -position = Vector2(292, 4) +position = Vector2(293, 5) packed_scene = ExtResource("10_ndd52") +[node name="Event时间线1" type="Node2D" parent="Ground/DeployLayer" index="5"] +script = ExtResource("13_qskdw") +event_name = &"c04_xdie_calendar_stage" +event_stages = Array[int]([1]) +metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" + +[node name="背景2" type="Sprite2D" parent="Ground/DeployLayer/Event时间线1"] +texture = ExtResource("5_ypwo5") +centered = false +offset = Vector2(0, -158) + +[node name="Event时间线2" type="Node2D" parent="Ground/DeployLayer" index="6"] +script = ExtResource("14_nmp0h") +event_name = &"c04_xdie_calendar_stage" +event_stages = Array[int]([2]) +metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" + +[node name="背景3" type="Sprite2D" parent="Ground/DeployLayer/Event时间线2"] +texture = ExtResource("7_jq27m") +centered = false +offset = Vector2(-1, -156) + +[node name="Event时间线3" type="Node2D" parent="Ground/DeployLayer" index="7"] +script = ExtResource("15_cd6ht") +event_name = &"c04_xdie_calendar_stage" +event_stages = Array[int]([3]) +metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" + [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(63, 95) catty_light_energy = 0.5 @@ -80,9 +113,28 @@ facing_direction = Vector2(1, 0) [node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"] scale = Vector2(1.1, 1.1) -texture = ExtResource("8_233xp") +texture = ExtResource("13_mu0l7") offset = Vector2(0, 43) +[node name="EventBinder" type="Node" parent="Ground/ParallaxForeground/FGParallaxLayer/FGSprite2D" index="0"] +script = ExtResource("6_ypwo5") +updater_event = &"c04_xdie_calendar_stage" +updater_stage_mode = "exclude" +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + +[node name="前景3" type="Sprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="1"] +unique_name_in_owner = true +position = Vector2(0, -2) +scale = Vector2(1.1, 1.1) +texture = ExtResource("14_qskdw") +centered = false +offset = Vector2(0, 64) + +[node name="EventBinder" type="Node" parent="Ground/ParallaxForeground/FGParallaxLayer/前景3"] +script = ExtResource("6_ypwo5") +updater_event = &"c04_xdie_calendar_stage" +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + [node name="PlayerLine2D" parent="Ground/ParallaxForeground" index="2"] points = PackedVector2Array(20, 150, 547, 151) diff --git a/scene/ground/script/c02/折锡纸.tscn b/scene/ground/script/c02/折锡纸.tscn index 8ebe0afa..70473740 100644 --- a/scene/ground/script/c02/折锡纸.tscn +++ b/scene/ground/script/c02/折锡纸.tscn @@ -8,8 +8,8 @@ [ext_resource type="AudioStream" uid="uid://bomvnle4oh1ol" path="res://asset/audio/sfx/交互/第一章/sfx_折纸.ogg" id="4_g2p6p"] [ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="4_qu4ce"] [ext_resource type="Texture2D" uid="uid://bygsskp1cr0y8" path="res://asset/art/scene/c02/s04_保卫科/锡纸.png" id="4_uslgh"] -[ext_resource type="Texture2D" uid="uid://dcubpjb5qgfl2" path="res://asset/art/scene/c02/s04_保卫科/锡纸_hover.png" id="5_6lb1j"] [ext_resource type="BitMap" uid="uid://cfu2y1q2ercd" path="res://asset/art/scene/c02/s04_保卫科/锡纸_mask.png" id="5_uslgh"] +[ext_resource type="Texture2D" uid="uid://bd5but24012lt" path="res://asset/art/scene/c02/s04_保卫科/锡纸_highlight.png" id="9_0pjjb"] [node name="折锡纸" type="CanvasLayer"] script = ExtResource("1_7tphw") @@ -85,5 +85,5 @@ grow_horizontal = 2 grow_vertical = 2 scale = Vector2(1.25, 1.25) texture_normal = ExtResource("4_uslgh") -texture_hover = ExtResource("5_6lb1j") +texture_hover = ExtResource("9_0pjjb") texture_click_mask = ExtResource("5_uslgh") diff --git a/scene/ground/script/c03/s03_closeup癞子纸人.tscn b/scene/ground/script/c03/s03_closeup癞子纸人.tscn index 701f480c..7453997c 100644 --- a/scene/ground/script/c03/s03_closeup癞子纸人.tscn +++ b/scene/ground/script/c03/s03_closeup癞子纸人.tscn @@ -378,7 +378,6 @@ rotation = 0.0950055 texture = ExtResource("9_yixv2") [node name="头" type="TextureRect" parent="."] -visible = false anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 diff --git a/scene/ground/script/c04/s06_closeup书桌日记.gd b/scene/ground/script/c04/s06_closeup书桌日记.gd index 00b04ceb..3bc54e8e 100644 --- a/scene/ground/script/c04/s06_closeup书桌日记.gd +++ b/scene/ground/script/c04/s06_closeup书桌日记.gd @@ -5,3 +5,11 @@ signal exit(arg) func _ready() -> void: layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME + # c04_xdie_calendar_stage: 0:初始化 1:时间线一 2:时间线二 3:时间线三 4:结束 + var calendar_stage = EventManager.get_stage("c04_xdie_calendar_stage") + # 共有三天 [0]民国八年三月一日 [1]民国八年十月三十日 [2]民国八年十一月二日 + var calendar_mask = ArchiveManager.get_global_value("c04_xdie_calendar_mask", [0, 0, 0]) + + # TODO + # 显示藤蔓 + EventManager.set_stage("c04_s06_vine", 1) diff --git a/scene/ground/script/c04/s06_closeup书桌日记.tscn b/scene/ground/script/c04/s06_closeup书桌日记.tscn index 629d000e..49926b3f 100644 --- a/scene/ground/script/c04/s06_closeup书桌日记.tscn +++ b/scene/ground/script/c04/s06_closeup书桌日记.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=6 format=3 uid="uid://c6xyuggu3b4y7"] +[gd_scene load_steps=7 format=3 uid="uid://c6xyuggu3b4y7"] [ext_resource type="Script" uid="uid://cpyticy4jdwfm" path="res://scene/ground/script/c04/s06_closeup书桌日记.gd" id="1_ljxk1"] [ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="2_4886t"] +[ext_resource type="Texture2D" uid="uid://duagnjhcl6v0w" path="res://asset/art/scene/c04/s06_小蝶房间/日记游戏/日记特写/互动书桌_日记内容.png" id="2_ljxk1"] [ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="3_0miq6"] [ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="5_0ofmx"] [ext_resource type="Script" uid="uid://dpocj5al0rvai" path="res://ui/text_helper.gd" id="6_7gfr2"] @@ -15,6 +16,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +texture = ExtResource("2_ljxk1") [node name="遮罩" type="TextureRect" parent="."] anchors_preset = 15 @@ -26,6 +28,7 @@ mouse_filter = 2 texture = ExtResource("2_4886t") [node name="ContentInspector" parent="." instance=ExtResource("3_0miq6")] +visible = false [node name="遮罩" type="TextureRect" parent="ContentInspector"] layout_mode = 1 diff --git a/scene/ground/script/c04/s06_closeup日历.tscn b/scene/ground/script/c04/s06_closeup日历.tscn index 4a7d555d..92790201 100644 --- a/scene/ground/script/c04/s06_closeup日历.tscn +++ b/scene/ground/script/c04/s06_closeup日历.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=7 format=3 uid="uid://dhrc5sc21rwc"] +[gd_scene load_steps=6 format=3 uid="uid://dhrc5sc21rwc"] [ext_resource type="Script" uid="uid://cvsj8mktuf8wn" path="res://scene/ground/script/c04/s06_closeup日历.gd" id="1_e3s2p"] [ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="2_6av83"] [ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="3_e35wp"] -[ext_resource type="Script" uid="uid://0dcbk75cd5pl" path="res://scene/entity/ux/content_inspector.gd" id="4_8ivo7"] [ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="5_0yds4"] [ext_resource type="Script" uid="uid://dpocj5al0rvai" path="res://ui/text_helper.gd" id="6_p5dpr"] @@ -26,15 +25,7 @@ grow_vertical = 2 mouse_filter = 2 texture = ExtResource("2_6av83") -[node name="ContentInspector" type="Control" parent="." instance=ExtResource("3_e35wp")] -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -script = ExtResource("4_8ivo7") +[node name="ContentInspector" parent="." instance=ExtResource("3_e35wp")] [node name="遮罩" type="TextureRect" parent="ContentInspector"] layout_mode = 1 diff --git a/scene/ground/script/c04/s06_event时间线1.gd b/scene/ground/script/c04/s06_event时间线1.gd new file mode 100644 index 00000000..005c1965 --- /dev/null +++ b/scene/ground/script/c04/s06_event时间线1.gd @@ -0,0 +1,27 @@ +@tool +extends Event2D + +# var prev_stage := 0 +# var stage := 0 + + +func _ready() -> void: + super._ready() + if Engine.is_editor_hint(): + return + + +func _on_global_stage_updated(e: StringName, s: int) -> void: + super._on_global_stage_updated(e, s) + + +func _on_ground_ready(_ground: Ground2D) -> void: + pass + + +func _on_pre_stage_updated() -> void: + pass + + +func _on_stage_updated() -> void: + pass diff --git a/scene/ground/script/c04/s06_event时间线1.gd.uid b/scene/ground/script/c04/s06_event时间线1.gd.uid new file mode 100644 index 00000000..bdfbe1d2 --- /dev/null +++ b/scene/ground/script/c04/s06_event时间线1.gd.uid @@ -0,0 +1 @@ +uid://bp6vwn12wa7xp diff --git a/scene/ground/script/c04/s06_event时间线2.gd b/scene/ground/script/c04/s06_event时间线2.gd new file mode 100644 index 00000000..005c1965 --- /dev/null +++ b/scene/ground/script/c04/s06_event时间线2.gd @@ -0,0 +1,27 @@ +@tool +extends Event2D + +# var prev_stage := 0 +# var stage := 0 + + +func _ready() -> void: + super._ready() + if Engine.is_editor_hint(): + return + + +func _on_global_stage_updated(e: StringName, s: int) -> void: + super._on_global_stage_updated(e, s) + + +func _on_ground_ready(_ground: Ground2D) -> void: + pass + + +func _on_pre_stage_updated() -> void: + pass + + +func _on_stage_updated() -> void: + pass diff --git a/scene/ground/script/c04/s06_event时间线2.gd.uid b/scene/ground/script/c04/s06_event时间线2.gd.uid new file mode 100644 index 00000000..544afca9 --- /dev/null +++ b/scene/ground/script/c04/s06_event时间线2.gd.uid @@ -0,0 +1 @@ +uid://ckuwiorhrcmak diff --git a/scene/ground/script/c04/s06_event时间线3.gd b/scene/ground/script/c04/s06_event时间线3.gd new file mode 100644 index 00000000..005c1965 --- /dev/null +++ b/scene/ground/script/c04/s06_event时间线3.gd @@ -0,0 +1,27 @@ +@tool +extends Event2D + +# var prev_stage := 0 +# var stage := 0 + + +func _ready() -> void: + super._ready() + if Engine.is_editor_hint(): + return + + +func _on_global_stage_updated(e: StringName, s: int) -> void: + super._on_global_stage_updated(e, s) + + +func _on_ground_ready(_ground: Ground2D) -> void: + pass + + +func _on_pre_stage_updated() -> void: + pass + + +func _on_stage_updated() -> void: + pass diff --git a/scene/ground/script/c04/s06_event时间线3.gd.uid b/scene/ground/script/c04/s06_event时间线3.gd.uid new file mode 100644 index 00000000..5406d03a --- /dev/null +++ b/scene/ground/script/c04/s06_event时间线3.gd.uid @@ -0,0 +1 @@ +uid://ckrybu5owjxsp