diff --git a/asset/art/scene/c02/s04_保卫科/锡纸_highlight.png b/asset/art/scene/c02/s04_保卫科/锡纸_highlight.png new file mode 100644 index 00000000..d8fcf46e Binary files /dev/null and b/asset/art/scene/c02/s04_保卫科/锡纸_highlight.png differ 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