diff --git a/asset/art/ui/note/c03_slices.ase b/asset/art/ui/note/c03_slices.ase index 03c4c267..31a5a875 100644 Binary files a/asset/art/ui/note/c03_slices.ase and b/asset/art/ui/note/c03_slices.ase differ diff --git a/asset/art/ui/note/c03_slices.json b/asset/art/ui/note/c03_slices.json index 7236afc7..a9666a10 100644 --- a/asset/art/ui/note/c03_slices.json +++ b/asset/art/ui/note/c03_slices.json @@ -1,10 +1,10 @@ { "frames": { "c03_slices.ase": { - "frame": { "x": 0, "y": 0, "w": 2984, "h": 1894 }, + "frame": { "x": 0, "y": 0, "w": 2000, "h": 1500 }, "rotated": false, "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 2984, "h": 1894 }, - "sourceSize": { "w": 2984, "h": 1894 }, + "spriteSourceSize": { "x": 0, "y": 0, "w": 2000, "h": 1500 }, + "sourceSize": { "w": 2000, "h": 1500 }, "duration": 100 } }, @@ -13,24 +13,17 @@ "version": "1.3.8.1-arm64", "image": "c03_slices_en.png", "format": "RGBA8888", - "size": { "w": 2984, "h": 1894 }, + "size": { "w": 2000, "h": 1500 }, "scale": "1", "slices": [ - { "name": "c02_meat_knockDoor", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 222, "y": 94, "w": 341, "h": 189 } }] }, - { "name": "c02_meat_stopMouse", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 596, "y": 94, "w": 419, "h": 189 } }] }, - { "name": "c02_shoe_giveToMouce", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1064, "y": 92, "w": 357, "h": 205 } }] }, - { "name": "c02_list_namesAndGoal", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1026, "y": 1272, "w": 1045, "h": 524 } }] }, - { "name": "c02_xchan_isSheGhost", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 153, "y": 1521, "w": 358, "h": 226 } }] }, - { "name": "c02_blotOut", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 599, "y": 1526, "w": 293, "h": 193 } }] }, - { "name": "c02_xchan_sheKnowsMe", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1398, "y": 926, "w": 881, "h": 213 } }] }, - { "name": "c02_road_address", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 2284, "y": 916, "w": 681, "h": 213 } }] }, - { "name": "c02_map_2", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 2211, "y": 1188, "w": 727, "h": 640 } }] }, - { "name": "c02_map_1Left", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1452, "y": 162, "w": 883, "h": 658 } }] }, - { "name": "c02_map_1Right", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 2409, "y": 447, "w": 460, "h": 364 } }] }, - { "name": "c03_prop_scissor", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 219, "y": 346, "w": 280, "h": 168 } }] }, - { "name": "c03_prop_tounge", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 522, "y": 346, "w": 283, "h": 169 } }] }, - { "name": "c03_prop_drug", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 827, "y": 347, "w": 275, "h": 167 } }] }, - { "name": "c03_map_3", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 114, "y": 844, "w": 817, "h": 631 } }] } + { "name": "c03_prop_tounge", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 981, "y": 272, "w": 964, "h": 175 } }] }, + { "name": "c03_prop_drug", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1127, "y": 456, "w": 809, "h": 200 } }] }, + { "name": "c03_map_3", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 910, "y": 657, "w": 957, "h": 726 } }] }, + { "name": "c03_xchan", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 344, "y": 616, "w": 416, "h": 225 } }] }, + { "name": "c03_the_coming_truth", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 28, "y": 286, "w": 933, "h": 267 } }] }, + { "name": "c03_illusion_and_memory", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 120, "y": 88, "w": 953, "h": 149 } }] }, + { "name": "c03_what_puppets", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1150, "y": 16, "w": 755, "h": 117 } }] }, + { "name": "c03_prop_scissors", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1380, "y": 114, "w": 493, "h": 181 } }] } ] } } diff --git a/asset/art/ui/note/c03_slices.png b/asset/art/ui/note/c03_slices.png index 1cb6d756..4b71621f 100644 Binary files a/asset/art/ui/note/c03_slices.png and b/asset/art/ui/note/c03_slices.png differ diff --git a/asset/art/ui/note/c03_slices/c02_gate_chain.tres b/asset/art/ui/note/c03_slices/c02_gate_chain.tres deleted file mode 100644 index 57b49cab..00000000 --- a/asset/art/ui/note/c03_slices/c02_gate_chain.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://c2mjbb80cblfq"] - -[ext_resource type="Texture2D" uid="uid://drijblepnhhsw" path="res://asset/art/ui/note/c02_slices.png" id="1_b0naa"] - -[resource] -atlas = ExtResource("1_b0naa") -region = Rect2(598, 580, 421, 243) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_hand_exchange.tres b/asset/art/ui/note/c03_slices/c02_hand_exchange.tres deleted file mode 100644 index a8a11ae6..00000000 --- a/asset/art/ui/note/c03_slices/c02_hand_exchange.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://cup2uc6dljydt"] - -[ext_resource type="Texture2D" uid="uid://drijblepnhhsw" path="res://asset/art/ui/note/c02_slices.png" id="1_nw7f1"] - -[resource] -atlas = ExtResource("1_nw7f1") -region = Rect2(22, 314, 469, 271) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_hand_requireCoin.tres b/asset/art/ui/note/c03_slices/c02_hand_requireCoin.tres deleted file mode 100644 index a3e94c91..00000000 --- a/asset/art/ui/note/c03_slices/c02_hand_requireCoin.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://3vq5h0g0srj7"] - -[ext_resource type="Texture2D" uid="uid://drijblepnhhsw" path="res://asset/art/ui/note/c02_slices.png" id="1_jjuwd"] - -[resource] -atlas = ExtResource("1_jjuwd") -region = Rect2(1020, 552, 395, 211) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_list_namesAndGoal.tres b/asset/art/ui/note/c03_slices/c02_list_namesAndGoal.tres deleted file mode 100644 index 0d85142d..00000000 --- a/asset/art/ui/note/c03_slices/c02_list_namesAndGoal.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://c50tcer03ydhk"] - -[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_f76b8"] - -[resource] -atlas = ExtResource("1_f76b8") -region = Rect2(1026, 1272, 1045, 524) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_map_1Left.tres b/asset/art/ui/note/c03_slices/c02_map_1Left.tres deleted file mode 100644 index 87e2d5fb..00000000 --- a/asset/art/ui/note/c03_slices/c02_map_1Left.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dynop6kxxbvtl"] - -[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_egk8x"] - -[resource] -atlas = ExtResource("1_egk8x") -region = Rect2(1452, 162, 883, 658) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_map_2.tres b/asset/art/ui/note/c03_slices/c02_map_2.tres deleted file mode 100644 index 6fff5208..00000000 --- a/asset/art/ui/note/c03_slices/c02_map_2.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dtjfjxkqtxq68"] - -[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_y685c"] - -[resource] -atlas = ExtResource("1_y685c") -region = Rect2(2211, 1188, 727, 640) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_musicbox_needPuppet.tres b/asset/art/ui/note/c03_slices/c02_musicbox_needPuppet.tres deleted file mode 100644 index 05a86ed7..00000000 --- a/asset/art/ui/note/c03_slices/c02_musicbox_needPuppet.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://bf3jjpbhe78vl"] - -[ext_resource type="Texture2D" uid="uid://drijblepnhhsw" path="res://asset/art/ui/note/c02_slices.png" id="1_ysdhv"] - -[resource] -atlas = ExtResource("1_ysdhv") -region = Rect2(108, 646, 401, 173) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_road_address.tres b/asset/art/ui/note/c03_slices/c02_road_address.tres deleted file mode 100644 index fc5f377c..00000000 --- a/asset/art/ui/note/c03_slices/c02_road_address.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://bfd0i2tro51tp"] - -[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_2nqcr"] - -[resource] -atlas = ExtResource("1_2nqcr") -region = Rect2(2284, 916, 681, 213) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_split_illusionSpace.tres b/asset/art/ui/note/c03_slices/c02_split_illusionSpace.tres deleted file mode 100644 index a05d8f7a..00000000 --- a/asset/art/ui/note/c03_slices/c02_split_illusionSpace.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dtevkj07syux7"] - -[ext_resource type="Texture2D" uid="uid://drijblepnhhsw" path="res://asset/art/ui/note/c02_slices.png" id="1_bxwd7"] - -[resource] -atlas = ExtResource("1_bxwd7") -region = Rect2(596, 332, 561, 213) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_xchan_giveHerPuppet.tres b/asset/art/ui/note/c03_slices/c02_xchan_giveHerPuppet.tres deleted file mode 100644 index 24223c87..00000000 --- a/asset/art/ui/note/c03_slices/c02_xchan_giveHerPuppet.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://brl32omw6jrgv"] - -[ext_resource type="Texture2D" uid="uid://drijblepnhhsw" path="res://asset/art/ui/note/c02_slices.png" id="1_mxsdd"] - -[resource] -atlas = ExtResource("1_mxsdd") -region = Rect2(1000, 812, 393, 211) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_xchan_isSheGhost.tres b/asset/art/ui/note/c03_slices/c02_xchan_isSheGhost.tres deleted file mode 100644 index fd324960..00000000 --- a/asset/art/ui/note/c03_slices/c02_xchan_isSheGhost.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://d4dc7m2wneehr"] - -[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_3tkng"] - -[resource] -atlas = ExtResource("1_3tkng") -region = Rect2(153, 1521, 358, 226) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_xchan_sheKnowsMe.tres b/asset/art/ui/note/c03_slices/c02_xchan_sheKnowsMe.tres deleted file mode 100644 index 55d37504..00000000 --- a/asset/art/ui/note/c03_slices/c02_xchan_sheKnowsMe.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://cfesjie0t48n2"] - -[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_0gy8g"] - -[resource] -atlas = ExtResource("1_0gy8g") -region = Rect2(1398, 926, 881, 213) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_meat_stopMouse.tres b/asset/art/ui/note/c03_slices/c03_illusion_and_memory.tres similarity index 54% rename from asset/art/ui/note/c03_slices/c02_meat_stopMouse.tres rename to asset/art/ui/note/c03_slices/c03_illusion_and_memory.tres index c84e84be..e8a24ca7 100644 --- a/asset/art/ui/note/c03_slices/c02_meat_stopMouse.tres +++ b/asset/art/ui/note/c03_slices/c03_illusion_and_memory.tres @@ -1,8 +1,8 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dbqjv4ppg4jej"] +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://mgqg7fy3bs3u"] -[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_r08t6"] +[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_4edwn"] [resource] -atlas = ExtResource("1_r08t6") -region = Rect2(596, 94, 419, 189) +atlas = ExtResource("1_4edwn") +region = Rect2(120, 88, 953, 149) filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c03_map_3.tres b/asset/art/ui/note/c03_slices/c03_map_3.tres index e2de7303..bd2066ce 100644 --- a/asset/art/ui/note/c03_slices/c03_map_3.tres +++ b/asset/art/ui/note/c03_slices/c03_map_3.tres @@ -4,5 +4,5 @@ [resource] atlas = ExtResource("1_naelb") -region = Rect2(114, 844, 817, 631) +region = Rect2(910, 657, 957, 726) filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c03_prop_drug.tres b/asset/art/ui/note/c03_slices/c03_prop_drug.tres index 86e56ba8..50dfeaa0 100644 --- a/asset/art/ui/note/c03_slices/c03_prop_drug.tres +++ b/asset/art/ui/note/c03_slices/c03_prop_drug.tres @@ -4,5 +4,5 @@ [resource] atlas = ExtResource("1_mgd4s") -region = Rect2(827, 347, 275, 167) +region = Rect2(1127, 456, 809, 200) filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c03_prop_scissor.tres b/asset/art/ui/note/c03_slices/c03_prop_scissor.tres deleted file mode 100644 index d4e733fd..00000000 --- a/asset/art/ui/note/c03_slices/c03_prop_scissor.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://cy2vpn01302xy"] - -[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_pv8k5"] - -[resource] -atlas = ExtResource("1_pv8k5") -region = Rect2(219, 346, 280, 168) -filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_blotOut.tres b/asset/art/ui/note/c03_slices/c03_prop_scissors.tres similarity index 53% rename from asset/art/ui/note/c03_slices/c02_blotOut.tres rename to asset/art/ui/note/c03_slices/c03_prop_scissors.tres index d0c36450..28bbdd1a 100644 --- a/asset/art/ui/note/c03_slices/c02_blotOut.tres +++ b/asset/art/ui/note/c03_slices/c03_prop_scissors.tres @@ -1,8 +1,8 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://b6xwbm3wsef1s"] +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://c63gyy1cewojc"] -[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_a0x2j"] +[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_tl728"] [resource] -atlas = ExtResource("1_a0x2j") -region = Rect2(599, 1526, 293, 193) +atlas = ExtResource("1_tl728") +region = Rect2(1380, 114, 493, 181) filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c03_prop_tounge.tres b/asset/art/ui/note/c03_slices/c03_prop_tounge.tres index 89b0e3ce..2a21d631 100644 --- a/asset/art/ui/note/c03_slices/c03_prop_tounge.tres +++ b/asset/art/ui/note/c03_slices/c03_prop_tounge.tres @@ -4,5 +4,5 @@ [resource] atlas = ExtResource("1_os7bw") -region = Rect2(522, 346, 283, 169) +region = Rect2(981, 272, 964, 175) filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_meat_knockDoor.tres b/asset/art/ui/note/c03_slices/c03_the_coming_truth.tres similarity index 54% rename from asset/art/ui/note/c03_slices/c02_meat_knockDoor.tres rename to asset/art/ui/note/c03_slices/c03_the_coming_truth.tres index e493735a..64217d50 100644 --- a/asset/art/ui/note/c03_slices/c02_meat_knockDoor.tres +++ b/asset/art/ui/note/c03_slices/c03_the_coming_truth.tres @@ -1,8 +1,8 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://bopric6ffk34x"] +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://d352122ccuqqg"] -[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_xxqwe"] +[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_cwcoc"] [resource] -atlas = ExtResource("1_xxqwe") -region = Rect2(222, 94, 341, 189) +atlas = ExtResource("1_cwcoc") +region = Rect2(28, 286, 933, 267) filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_shoe_giveToMouce.tres b/asset/art/ui/note/c03_slices/c03_what_puppets.tres similarity index 53% rename from asset/art/ui/note/c03_slices/c02_shoe_giveToMouce.tres rename to asset/art/ui/note/c03_slices/c03_what_puppets.tres index 55f870e5..a3f624dc 100644 --- a/asset/art/ui/note/c03_slices/c02_shoe_giveToMouce.tres +++ b/asset/art/ui/note/c03_slices/c03_what_puppets.tres @@ -1,8 +1,8 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dv21xpibobt6u"] +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://cph5skaax2b7s"] -[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_xwofv"] +[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_eg7yb"] [resource] -atlas = ExtResource("1_xwofv") -region = Rect2(1064, 92, 357, 205) +atlas = ExtResource("1_eg7yb") +region = Rect2(1150, 16, 755, 117) filter_clip = true diff --git a/asset/art/ui/note/c03_slices/c02_map_1Right.tres b/asset/art/ui/note/c03_slices/c03_xchan.tres similarity index 53% rename from asset/art/ui/note/c03_slices/c02_map_1Right.tres rename to asset/art/ui/note/c03_slices/c03_xchan.tres index 7a38c615..575ec8f5 100644 --- a/asset/art/ui/note/c03_slices/c02_map_1Right.tres +++ b/asset/art/ui/note/c03_slices/c03_xchan.tres @@ -1,8 +1,8 @@ -[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://q25c37y7k51y"] +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://b6kvxocttqs1u"] -[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_k5ft1"] +[ext_resource type="Texture2D" uid="uid://coornj7bkofw1" path="res://asset/art/ui/note/c03_slices.png" id="1_0fo28"] [resource] -atlas = ExtResource("1_k5ft1") -region = Rect2(2409, 447, 460, 364) +atlas = ExtResource("1_0fo28") +region = Rect2(344, 616, 416, 225) filter_clip = true diff --git a/asset/art/ui/note/c03_slices_en.png b/asset/art/ui/note/c03_slices_en.png index 52c267b4..b3ec6baa 100644 Binary files a/asset/art/ui/note/c03_slices_en.png and b/asset/art/ui/note/c03_slices_en.png differ diff --git a/scene/ground/script/c02/s03_event_2d第二章结束井边演出.gd b/scene/ground/script/c02/s03_event_2d第二章结束井边演出.gd index 23533b66..0728180c 100644 --- a/scene/ground/script/c02/s03_event_2d第二章结束井边演出.gd +++ b/scene/ground/script/c02/s03_event_2d第二章结束井边演出.gd @@ -56,9 +56,11 @@ func _start_well_show() -> void: tween.tween_property(xchan, "modulate:a", 0.0, 1.5) DialogueManager.show_dialogue_balloon(GlobalConfig.DIALOG_C03, "c03_井边回忆_结束", [GlobalConfig.DIALOG_IGNORE_INPUT]) await DialogueManager.dialogue_ended + await Util.wait(1.0) # 如果选择离开,此处不会设置,需要在 GlobalFunctor.c03_final_choose_exit() 中设置 EventManager.set_stage_if_greater("c03_well_show", 2) - await Util.wait(1.0) + EventManager.set_stage_if_greater("handnote_c03_illusion_and_memory", 1) + EventManager.set_stage_if_greater("handnote_c03_the_coming_truth", 1) SceneManager.unlock_player() SceneManager.toggle_hud_display(true) diff --git a/scene/ground/script/c02/s04_event李癞拜老鼠精.gd b/scene/ground/script/c02/s04_event李癞拜老鼠精.gd index a43d9818..c68c1622 100644 --- a/scene/ground/script/c02/s04_event李癞拜老鼠精.gd +++ b/scene/ground/script/c02/s04_event李癞拜老鼠精.gd @@ -59,6 +59,7 @@ func _on_exit_room() -> void: $"Sfx拔舌头".global_play() # Util.timer(0.5, $"Sfx拔舌头".global_play) SceneManager.pop_debug_dialog_info("音效", "惊悚: 拔舌头") + EventManager.set_stage_if_greater("handnote_c03_prop_tounge", 1) light_cut_tounge.show() light_cut_tounge.energy = 0.0 diff --git a/scene/ground/script/c02/s06_event_2d疯子跑开.gd b/scene/ground/script/c02/s06_event_2d疯子跑开.gd index cf7d95fc..8def8f19 100644 --- a/scene/ground/script/c02/s06_event_2d疯子跑开.gd +++ b/scene/ground/script/c02/s06_event_2d疯子跑开.gd @@ -59,6 +59,7 @@ func _on_stage_updated(): func _on_left_poortal_interacted()-> void: # 0 正常; 1 歪头 if not ArchiveManager.get_global_value("c03_s06_paperman_knocked"): + EventManager.set_stage_if_greater("handnote_c03_what_puppets", 1) ArchiveManager.set_global_entry("c03_s06_paperman_knocked", true) $"Sfx纸人咔嚓转头".global_play() - paperman.frame = 1 \ No newline at end of file + paperman.frame = 1 diff --git a/scene/ground/script/c03/s03_closeup癞子纸人.gd b/scene/ground/script/c03/s03_closeup癞子纸人.gd index 61ff80cd..61bb6af2 100644 --- a/scene/ground/script/c03/s03_closeup癞子纸人.gd +++ b/scene/ground/script/c03/s03_closeup癞子纸人.gd @@ -40,7 +40,7 @@ func _check_if_notify_to_use_prop() -> void: return elif SceneManager.has_prop("prop_剪刀"): SceneManager.pop_center_notification("ui_center_notify_use_prop") - EventManager.set_stage_if_greater("handnote_c03_prop_scissor", 1) + EventManager.set_stage_if_greater("handnote_c03_prop_scissors", 1) else: var label = $"Container/RichTextLabel" label.show() @@ -96,7 +96,7 @@ func _on_braid_interacted() -> void: # 剪刀变为重要物品 SceneManager.disable_prop_item("prop_剪刀") SceneManager.enable_important_item("prop_剪刀", false) - EventManager.set_stage_if_greater("handnote_c03_prop_scissor", 2) + EventManager.set_stage_if_greater("handnote_c03_prop_scissors", 2) _braid_cutting_show() diff --git a/scene/ground/script/c03/s04_closeup李氏纸人.gd b/scene/ground/script/c03/s04_closeup李氏纸人.gd index 728e0781..27203bc4 100644 --- a/scene/ground/script/c03/s04_closeup李氏纸人.gd +++ b/scene/ground/script/c03/s04_closeup李氏纸人.gd @@ -37,7 +37,6 @@ func _display_label(id: int) -> void: var label if id == 0: label = $"求舌头/RichTextLabel" - EventManager.set_stage_if_greater("handnote_c03_prop_tounge", 1) elif id == 1: label = $"求药/RichTextLabel" EventManager.set_stage_if_greater("handnote_c03_prop_drug", 1) @@ -83,7 +82,6 @@ func _unhandled_input(event: InputEvent) -> void: sprite.modulate.a = 0.0 # 浆糊可以用两次 SceneManager.disable_prop_item("prop_纸舌头") - EventManager.set_stage_if_greater("handnote_c03_prop_tounge", 3) EventManager.set_stage_if_greater("c03_li_paperwoman", 2) create_tween().tween_property(sprite, "modulate:a", 1.0, 1.0) animation_player.play("give_scissor") @@ -95,7 +93,7 @@ func _unhandled_input(event: InputEvent) -> void: holding = true # 给药 -> 2013 钥匙 (prop_2013钥匙) $"Sfx使用药包".play() - EventManager.set_stage_if_greater("handnote_c03_prop_drug", 3) + EventManager.set_stage_if_greater("handnote_c03_prop_drug", 2) SceneManager.disable_prop_item("prop_药包") EventManager.set_stage_if_greater("c03_li_paperwoman", 4) animation_player.play("give_key") diff --git a/scene/ground/script/c03/二章结尾回忆.gd b/scene/ground/script/c03/二章结尾回忆.gd index 1b719462..5cdee1f5 100644 --- a/scene/ground/script/c03/二章结尾回忆.gd +++ b/scene/ground/script/c03/二章结尾回忆.gd @@ -78,6 +78,7 @@ func start_show() -> void: # 覆盖转场效果 SceneManager.white_transition(1.5, 2.0) await Util.wait(1.5) + EventManager.set_stage_if_greater("handnote_c03_xchan", 1) # 李氏癞子房间离井边演出比较近,所以选择 5 号门 SceneManager.get_ground_loader().transition_to_scene("c02_s03", "5", 0.5, Color.WHITE) diff --git a/scene/ux/note/ux_note.tscn b/scene/ux/note/ux_note.tscn index 43af7322..8e60b854 100644 --- a/scene/ux/note/ux_note.tscn +++ b/scene/ux/note/ux_note.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=3 uid="uid://cy7wrrsm8e04f"] +[gd_scene load_steps=34 format=3 uid="uid://cy7wrrsm8e04f"] [ext_resource type="Script" uid="uid://bkyg34xfhe60p" path="res://scene/ux/note/ux_note.gd" id="1_e61yw"] [ext_resource type="Texture2D" uid="uid://bi7l47cit2xs" path="res://asset/art/ui/ux_panel/完整背景.png" id="2_1ka1m"] @@ -26,8 +26,12 @@ [ext_resource type="Texture2D" uid="uid://bs2aus63tgwv1" path="res://asset/art/ui/note/c02_slices/c02_xchan_isSheGhost.tres" id="23_njh4q"] [ext_resource type="Texture2D" uid="uid://doehawi3ynl1r" path="res://asset/art/ui/note/c03_slices/c03_map_3.tres" id="24_vv1f8"] [ext_resource type="Texture2D" uid="uid://cl56csmk7dx3n" path="res://asset/art/ui/note/c03_slices/c03_prop_drug.tres" id="25_hw4ys"] -[ext_resource type="Texture2D" uid="uid://cy2vpn01302xy" path="res://asset/art/ui/note/c03_slices/c03_prop_scissor.tres" id="26_iiemy"] +[ext_resource type="Texture2D" uid="uid://c63gyy1cewojc" path="res://asset/art/ui/note/c03_slices/c03_prop_scissors.tres" id="27_60qdw"] [ext_resource type="Texture2D" uid="uid://db386t8b8gyev" path="res://asset/art/ui/note/c03_slices/c03_prop_tounge.tres" id="27_cd76s"] +[ext_resource type="Texture2D" uid="uid://mgqg7fy3bs3u" path="res://asset/art/ui/note/c03_slices/c03_illusion_and_memory.tres" id="28_60qdw"] +[ext_resource type="Texture2D" uid="uid://d352122ccuqqg" path="res://asset/art/ui/note/c03_slices/c03_the_coming_truth.tres" id="29_c71vy"] +[ext_resource type="Texture2D" uid="uid://cph5skaax2b7s" path="res://asset/art/ui/note/c03_slices/c03_what_puppets.tres" id="30_gmufd"] +[ext_resource type="Texture2D" uid="uid://b6kvxocttqs1u" path="res://asset/art/ui/note/c03_slices/c03_xchan.tres" id="31_en7n8"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_j3kdg"] @@ -81,6 +85,7 @@ expand_mode = 5 stretch_mode = 5 [node name="Event_current_chapter_stage" type="Sprite2D" parent="Bag/Book"] +visible = false position = Vector2(340, 137) scale = Vector2(0.2, 0.2) script = ExtResource("5_nk0pj") @@ -90,7 +95,8 @@ hide_if_on_stage = Array[int]([0, 3]) metadata/_custom_type_script = "uid://c5woj7mivdxrh" [node name="Event_handnote_c02_road_address" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage"] -position = Vector2(-675, -395) +position = Vector2(-655, -410) +scale = Vector2(0.838405, 0.76208) texture = ExtResource("6_dohnv") script = ExtResource("7_nfxph") event = &"handnote_c02_road_address" @@ -98,7 +104,8 @@ hide_if_on_stage = Array[int]([0, 3]) metadata/_custom_type_script = "uid://c5woj7mivdxrh" [node name="Event_handnote_c02_list_namesAndGoal" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage"] -position = Vector2(-840, -245) +position = Vector2(-875, -295) +scale = Vector2(0.821172, 0.869678) texture = ExtResource("8_nfxph") script = ExtResource("7_nfxph") event = &"handnote_c02_list_namesAndGoal" @@ -106,7 +113,8 @@ hide_if_on_stage = Array[int]([0, 3]) metadata/_custom_type_script = "uid://c5woj7mivdxrh" [node name="Event_handnote_c02_xchan_sheKnowsMe" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage"] -position = Vector2(-670, -35) +position = Vector2(-680, -130) +scale = Vector2(0.809135, 0.81106) texture = ExtResource("22_rkppt") script = ExtResource("7_nfxph") event = &"handnote_c02_xchan_sheKnowsMe" @@ -260,7 +268,6 @@ scale = Vector2(1.19114, 1.20576) texture = ExtResource("11_dohnv") [node name="Event_current_chapter_stage2" type="Sprite2D" parent="Bag/Book"] -visible = false position = Vector2(340, 137) scale = Vector2(0.2, 0.2) script = ExtResource("5_nk0pj") @@ -271,7 +278,8 @@ hide_if_on_stage = Array[int]([0, 3]) metadata/_custom_type_script = "uid://c5woj7mivdxrh" [node name="Event_handnote_c02_road_address" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] -position = Vector2(-675, -395) +position = Vector2(-655, -410) +scale = Vector2(0.838405, 0.76208) texture = ExtResource("6_dohnv") script = ExtResource("7_nfxph") event = &"handnote_c02_road_address" @@ -279,7 +287,8 @@ hide_if_on_stage = Array[int]([0, 3]) metadata/_custom_type_script = "uid://c5woj7mivdxrh" [node name="Event_handnote_c02_list_namesAndGoal" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] -position = Vector2(-840, -245) +position = Vector2(-875, -295) +scale = Vector2(0.821172, 0.869678) texture = ExtResource("8_nfxph") script = ExtResource("7_nfxph") event = &"handnote_c02_list_namesAndGoal" @@ -287,7 +296,8 @@ hide_if_on_stage = Array[int]([0, 3]) metadata/_custom_type_script = "uid://c5woj7mivdxrh" [node name="Event_handnote_c02_xchan_sheKnowsMe" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] -position = Vector2(-670, -35) +position = Vector2(-680, -130) +scale = Vector2(0.809135, 0.81106) texture = ExtResource("22_rkppt") script = ExtResource("7_nfxph") event = &"handnote_c02_xchan_sheKnowsMe" @@ -321,7 +331,7 @@ scale = Vector2(1.22374, 0.924062) texture = ExtResource("11_dohnv") [node name="Event_handnote_c02_meat_stopMouse" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] -position = Vector2(-735, 205) +position = Vector2(-745, 205) scale = Vector2(0.7, 0.7) texture = ExtResource("14_cd76s") script = ExtResource("7_nfxph") @@ -351,39 +361,82 @@ hide_if_on_stage = Array[int]([0, 3]) metadata/_custom_type_script = "uid://c5woj7mivdxrh" [node name="Event_handnote_c03_map_3" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] -position = Vector2(425, 395) +position = Vector2(515, 405) +scale = Vector2(0.914355, 0.890783) texture = ExtResource("24_vv1f8") script = ExtResource("7_nfxph") event = &"handnote_c03_map_3" hide_if_on_stage = Array[int]([0, 3]) [node name="Event_handnote_c03_prop_tounge" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] -position = Vector2(-390, 440) +position = Vector2(-1100, 560) +rotation = 0.00455025 +scale = Vector2(0.500218, 0.588734) texture = ExtResource("27_cd76s") script = ExtResource("7_nfxph") event = &"handnote_c03_prop_tounge" hide_if_on_stage = Array[int]([0, 3]) [node name="Event_handnote_c03_prop_drug" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] -position = Vector2(-385, 435) +position = Vector2(-510, 360) +scale = Vector2(0.67215, 0.678049) texture = ExtResource("25_hw4ys") script = ExtResource("7_nfxph") event = &"handnote_c03_prop_drug" hide_if_on_stage = Array[int]([0, 3]) -[node name="Event_handnote_c03_prop_scissor" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] -position = Vector2(435, -140) -texture = ExtResource("26_iiemy") +[node name="BlotOut" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2/Event_handnote_c03_prop_drug"] +position = Vector2(-203.167, 6.63059) +rotation = -0.181456 +scale = Vector2(0.836284, 1.31473) +texture = ExtResource("11_dohnv") + +[node name="Event_handnote_c03_prop_scissors" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] +position = Vector2(440, -140) +rotation = -0.140849 +scale = Vector2(0.433643, 0.471233) +texture = ExtResource("27_60qdw") script = ExtResource("7_nfxph") -event = &"handnote_c03_prop_scissor" +event = &"handnote_c03_prop_scissors" hide_if_on_stage = Array[int]([0, 3]) -[node name="BlotOut" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2/Event_handnote_c03_prop_scissor"] -position = Vector2(-6.40665e-05, -1.62125e-05) -rotation = -0.280488 -scale = Vector2(0.759944, 0.918027) +[node name="BlotOut" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2/Event_handnote_c03_prop_scissors"] +position = Vector2(24.4507, -7.52634) +rotation = -0.181456 +scale = Vector2(1.46799, 1.13704) texture = ExtResource("11_dohnv") +[node name="Event_handnote_c03_illusion_and_memory" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] +position = Vector2(-955, -15) +scale = Vector2(0.695169, 0.743772) +texture = ExtResource("28_60qdw") +script = ExtResource("7_nfxph") +event = &"handnote_c03_illusion_and_memory" +hide_if_on_stage = Array[int]([0, 3]) + +[node name="Event_handnote_c03_the_coming_truth" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] +position = Vector2(340, 385) +scale = Vector2(0.513765, 0.566932) +texture = ExtResource("29_c71vy") +script = ExtResource("7_nfxph") +event = &"handnote_c03_the_coming_truth" +hide_if_on_stage = Array[int]([0, 3]) + +[node name="Event_handnote_c03_what_puppets" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] +position = Vector2(435, -220) +scale = Vector2(0.764198, 0.736547) +texture = ExtResource("30_gmufd") +script = ExtResource("7_nfxph") +event = &"handnote_c03_what_puppets" +hide_if_on_stage = Array[int]([0, 3]) + +[node name="Event_handnote_c03_xchan" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage2"] +position = Vector2(700, 555) +texture = ExtResource("31_en7n8") +script = ExtResource("7_nfxph") +event = &"handnote_c03_xchan" +hide_if_on_stage = Array[int]([0, 3]) + [node name="Tabs" parent="Bag" node_paths=PackedStringArray("root") instance=ExtResource("4_7vpan")] unique_name_in_owner = true offset_left = 8.0