Merge branch 'demo'

asset/art/ui/note/c02_slices.json

@@ -1,5 +1,5 @@
 { "frames": {
-   "c02_slices.png": {
+   "c02_slices.ase": {
     "frame": { "x": 0, "y": 0, "w": 2984, "h": 1894 },
     "rotated": false,
     "trimmed": false,
@@ -11,28 +11,28 @@
  "meta": {
   "app": "https://www.aseprite.org/",
   "version": "1.3.8.1-arm64",
-  "image": "c02_slices.png",
+  "image": "c02_slices_en.png",
   "format": "RGBA8888",
   "size": { "w": 2984, "h": 1894 },
   "scale": "1",
   "slices": [
-   { "name": "c02_meat_knockDoor", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 246, "y": 120, "w": 298, "h": 138 } }] },
-   { "name": "c02_hand_exchange", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 76, "y": 308, "w": 415, "h": 280 } }] },
-   { "name": "c02_musicbox_needPuppet", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 186, "y": 652, "w": 263, "h": 155 } }] },
-   { "name": "c02_split_illusionSpace", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 612, "y": 322, "w": 525, "h": 221 } }] },
-   { "name": "c02_meat_stopMouse", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 654, "y": 108, "w": 289, "h": 167 } }] },
-   { "name": "c02_shoe_giveToMouce", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1072, "y": 96, "w": 317, "h": 195 } }] },
-   { "name": "c02_gate_chain", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 656, "y": 580, "w": 323, "h": 239 } }] },
-   { "name": "c02_hand_requireCoin", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1084, "y": 558, "w": 271, "h": 181 } }] },
-   { "name": "c02_xchan_giveHerPuppet", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 996, "y": 824, "w": 371, "h": 177 } }] },
-   { "name": "c02_list_namesAndGoal", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1017, "y": 1281, "w": 1063, "h": 517 } }] },
-   { "name": "c02_xchan_isSheGhost", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 147, "y": 1515, "w": 349, "h": 241 } }] },
-   { "name": "c02_blotOut", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 603, "y": 1521, "w": 274, "h": 211 } }] },
-   { "name": "c02_xchan_sheKnowsMe", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1461, "y": 927, "w": 748, "h": 205 } }] },
-   { "name": "c02_road_address", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 2286, "y": 921, "w": 667, "h": 181 } }] },
-   { "name": "c02_map_2", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 2181, "y": 1191, "w": 748, "h": 619 } }] },
-   { "name": "c02_map_1Left", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1456, "y": 140, "w": 857, "h": 645 } }] },
-   { "name": "c02_map_1Right", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 2404, "y": 436, "w": 465, "h": 369 } }] }
+   { "name": "c02_meat_knockDoor", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 222, "y": 94, "w": 341, "h": 189 } }] },
+   { "name": "c02_hand_exchange", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 22, "y": 314, "w": 469, "h": 271 } }] },
+   { "name": "c02_musicbox_needPuppet", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 108, "y": 646, "w": 401, "h": 173 } }] },
+   { "name": "c02_split_illusionSpace", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 596, "y": 332, "w": 561, "h": 213 } }] },
+   { "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_gate_chain", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 598, "y": 580, "w": 421, "h": 243 } }] },
+   { "name": "c02_hand_requireCoin", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1020, "y": 552, "w": 395, "h": 211 } }] },
+   { "name": "c02_xchan_giveHerPuppet", "color": "#0000ffff", "keys": [{ "frame": 0, "bounds": {"x": 1000, "y": 812, "w": 393, "h": 211 } }] },
+   { "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 } }] }
   ]
  }
 }

asset/art/ui/note/c02_slices/c02_blotOut.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_yfw6c")
-region = Rect2(603, 1521, 274, 211)
+region = Rect2(599, 1526, 293, 193)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_gate_chain.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_r8xbd")
-region = Rect2(656, 580, 323, 239)
+region = Rect2(598, 580, 421, 243)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_hand_exchange.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_036bj")
-region = Rect2(76, 308, 415, 280)
+region = Rect2(22, 314, 469, 271)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_hand_requireCoin.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_bal72")
-region = Rect2(1084, 558, 271, 181)
+region = Rect2(1020, 552, 395, 211)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_list_namesAndGoal.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_4di5c")
-region = Rect2(1017, 1281, 1063, 517)
+region = Rect2(1026, 1272, 1045, 524)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_map_1Left.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_xc11y")
-region = Rect2(1456, 140, 857, 645)
+region = Rect2(1452, 162, 883, 658)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_map_1Right.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_lupqk")
-region = Rect2(2404, 436, 465, 369)
+region = Rect2(2409, 447, 460, 364)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_map_2.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_m0mgu")
-region = Rect2(2181, 1191, 748, 619)
+region = Rect2(2211, 1188, 727, 640)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_meat_knockDoor.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_5rkoq")
-region = Rect2(246, 120, 298, 138)
+region = Rect2(222, 94, 341, 189)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_meat_stopMouse.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_4wotv")
-region = Rect2(654, 108, 289, 167)
+region = Rect2(596, 94, 419, 189)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_musicbox_needPuppet.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_01jll")
-region = Rect2(186, 652, 263, 155)
+region = Rect2(108, 646, 401, 173)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_road_address.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_hneqy")
-region = Rect2(2286, 921, 667, 181)
+region = Rect2(2284, 916, 681, 213)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_shoe_giveToMouce.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_hjq36")
-region = Rect2(1072, 96, 317, 195)
+region = Rect2(1064, 92, 357, 205)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_split_illusionSpace.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_cu3l7")
-region = Rect2(612, 322, 525, 221)
+region = Rect2(596, 332, 561, 213)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_xchan_giveHerPuppet.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_7ebxh")
-region = Rect2(996, 824, 371, 177)
+region = Rect2(1000, 812, 393, 211)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_xchan_isSheGhost.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_jin8p")
-region = Rect2(147, 1515, 349, 241)
+region = Rect2(153, 1521, 358, 226)
 filter_clip = true

asset/art/ui/note/c02_slices/c02_xchan_sheKnowsMe.tres

@@ -4,5 +4,5 @@
 
 [resource]
 atlas = ExtResource("1_a3qry")
-region = Rect2(1461, 927, 748, 205)
+region = Rect2(1398, 926, 881, 213)
 filter_clip = true

asset/dialogue/线索笔记.csv

@@ -0,0 +1,31 @@
+keys,zh_CN,en
+c02_1,和小手交换东西,"Trade with small hand"
+c02_2,三快三慢,"Three fast, three slow"
+c02_3,不要让老鼠叼走肉,"Don't let rats take the meat"
+c02_4,八音盒缺少人偶？,"Music box missing figurine?"
+c02_5,铁门需要剪开,"Gate chained. Needs cutting"
+c02_6,墙内还有空间 幻觉,"Space behind wall - illusion"
+c02_7,把小鞋子给老鼠,"Give small shoes to rat"
+c02_8,另一只手要元宝？,"Other hand wants gold ingot?"
+c02_9,给她木头人偶？,"Give her wooden figurine?"
+c02_10,鬼？,"Ghost?"
+c02_11,堵死了,"Blocked"
+c02_12,外侧走廊,"Outer corridor"
+c02_13,理发店,"Barber"
+c02_11,入口,"Entrance"
+c02_14,芦昌路26弄3号？,"26 Luchang Rd, Lane 3?"
+c02_15,小女孩 她似乎认识我,"The little girl... she knows me?"
+c02_16,楼梯无法使用,"STAIRS UNUSABLE"
+c02_17,肉店？,"Butcher?"
+c02_18,无法前往,"Cannot proceed"
+c02_19,戏台？,"Stage?"
+c02_20,上二楼,"Go to 2F"
+c02_21,一楼,"1F"
+c02_22,二楼,"2F"
+c02_23,3012号房有我的名字,"Room 3012 has my name"
+c02_24,先想办法上三楼,"Find way to 3F first"
+c02_25,方启钊,"Fang Qizhao"
+c02_26,方小蝉,"Fang Xiaochan"
+c02_27,李兰,"Li Lan"
+c02_28,王守义,"Wang Shouyi"
+c02_29,张文开,"Zhang Wenkai"

asset/dialogue/线索笔记.csv.import

@@ -0,0 +1,17 @@
+[remap]
+
+importer="csv_translation"
+type="Translation"
+uid="uid://bs0bwwfhv3ew4"
+
+[deps]
+
+files=["res://asset/dialogue/线索笔记.zh_CN.translation", "res://asset/dialogue/线索笔记.en.translation"]
+
+source_file="res://asset/dialogue/线索笔记.csv"
+dest_files=["res://asset/dialogue/线索笔记.zh_CN.translation", "res://asset/dialogue/线索笔记.en.translation"]
+
+[params]
+
+compress=true
+delimiter=0

scene/ux/note/ux_note.tscn

@@ -76,7 +76,6 @@ expand_mode = 5
 stretch_mode = 5
 
 [node name="Event_handnote_chapter_stage" type="Sprite2D" parent="Bag/Book"]
-visible = false
 position = Vector2(340, 137)
 scale = Vector2(0.2, 0.2)
 script = ExtResource("5_nk0pj")
@@ -94,7 +93,7 @@ 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_handnote_chapter_stage"]
-position = Vector2(-820, -260)
+position = Vector2(-840, -245)
 texture = ExtResource("8_nfxph")
 script = ExtResource("7_nfxph")
 event = &"handnote_c02_list_namesAndGoal"
@@ -102,7 +101,7 @@ 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_handnote_chapter_stage"]
-position = Vector2(-680, -60)
+position = Vector2(-690, -50)
 texture = ExtResource("22_rkppt")
 script = ExtResource("7_nfxph")
 event = &"handnote_c02_xchan_sheKnowsMe"
@@ -122,7 +121,7 @@ hide_if_on_stage = Array[int]([0, 3])
 metadata/_custom_type_script = "uid://c5woj7mivdxrh"
 
 [node name="Event_handnote_c02_hand_exchange" type="Sprite2D" parent="Bag/Book/Event_handnote_chapter_stage"]
-position = Vector2(-1260, 390)
+position = Vector2(-1280, 370)
 scale = Vector2(0.65, 0.65)
 texture = ExtResource("10_1efbh")
 script = ExtResource("7_nfxph")
@@ -130,12 +129,12 @@ event = &"handnote_c02_hand_exchange"
 hide_if_on_stage = Array[int]([0, 3])
 
 [node name="BlotOut" type="Sprite2D" parent="Bag/Book/Event_handnote_chapter_stage/Event_handnote_c02_hand_exchange"]
-position = Vector2(-69.2309, -38.4616)
+position = Vector2(-38.4617, -53.8461)
 scale = Vector2(1.09176, 1.1318)
 texture = ExtResource("11_dohnv")
 
 [node name="Event_handnote_c02_musicbox_needPuppet" type="Sprite2D" parent="Bag/Book/Event_handnote_chapter_stage"]
-position = Vector2(-1220, 605)
+position = Vector2(-1225, 580)
 scale = Vector2(0.7, 0.7)
 texture = ExtResource("11_vv1f8")
 script = ExtResource("7_nfxph")
@@ -143,12 +142,12 @@ event = &"handnote_c02_musicbox_needPuppet"
 hide_if_on_stage = Array[int]([0, 3])
 
 [node name="BlotOut" type="Sprite2D" parent="Bag/Book/Event_handnote_chapter_stage/Event_handnote_c02_musicbox_needPuppet"]
-position = Vector2(0.000196695, 7.14289)
+position = Vector2(-2.12877e-05, 7.14289)
 scale = Vector2(0.972891, 1)
 texture = ExtResource("11_dohnv")
 
 [node name="Event_handnote_c02_meat_knockDoor" type="Sprite2D" parent="Bag/Book/Event_handnote_chapter_stage"]
-position = Vector2(-1025, 455)
+position = Vector2(-1025, 420)
 scale = Vector2(0.7, 0.7)
 texture = ExtResource("13_iiemy")
 script = ExtResource("7_nfxph")
@@ -184,7 +183,7 @@ hide_if_on_stage = Array[int]([0, 3])
 metadata/_custom_type_script = "uid://c5woj7mivdxrh"
 
 [node name="Event_handnote_c02_gate_chain" type="Sprite2D" parent="Bag/Book/Event_handnote_chapter_stage"]
-position = Vector2(-760, 555)
+position = Vector2(-780, 560)
 scale = Vector2(0.7, 0.7)
 texture = ExtResource("16_c71vy")
 script = ExtResource("7_nfxph")
@@ -228,7 +227,7 @@ hide_if_on_stage = Array[int]([0, 3])
 metadata/_custom_type_script = "uid://c5woj7mivdxrh"
 
 [node name="Event_handnote_c02_hand_requireCoin" type="Sprite2D" parent="Bag/Book/Event_handnote_chapter_stage"]
-position = Vector2(685.667, -127.167)
+position = Vector2(675, -125)
 scale = Vector2(0.7, 0.7)
 texture = ExtResource("21_x45ak")
 script = ExtResource("7_nfxph")
@@ -236,7 +235,7 @@ event = &"handnote_c02_hand_requireCoin"
 hide_if_on_stage = Array[int]([0, 3])
 
 [node name="BlotOut" type="Sprite2D" parent="Bag/Book/Event_handnote_chapter_stage/Event_handnote_c02_hand_requireCoin"]
-position = Vector2(-7.14288, 14.2857)
+position = Vector2(-0.953043, 10.2386)
 rotation = -0.448216
 scale = Vector2(1.03957, 1.62217)
 texture = ExtResource("11_dohnv")
@@ -256,6 +255,7 @@ scale = Vector2(1.19114, 1.20576)
 texture = ExtResource("11_dohnv")
 
 [node name="Event_handnote_chapter_stage2" type="Sprite2D" parent="Bag/Book"]
+visible = false
 position = Vector2(340, 137)
 scale = Vector2(0.2, 0.2)
 script = ExtResource("5_nk0pj")
@@ -274,7 +274,7 @@ 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_handnote_chapter_stage2"]
-position = Vector2(-820, -260)
+position = Vector2(-845, -240)
 texture = ExtResource("8_nfxph")
 script = ExtResource("7_nfxph")
 event = &"handnote_c02_list_namesAndGoal"
@@ -302,7 +302,7 @@ hide_if_on_stage = Array[int]([0, 3])
 metadata/_custom_type_script = "uid://c5woj7mivdxrh"
 
 [node name="Event_handnote_c02_meat_knockDoor" type="Sprite2D" parent="Bag/Book/Event_handnote_chapter_stage2"]
-position = Vector2(-1025, 455)
+position = Vector2(-1030, 425)
 scale = Vector2(0.7, 0.7)
 texture = ExtResource("13_iiemy")
 script = ExtResource("7_nfxph")
@@ -316,7 +316,7 @@ scale = Vector2(1.22374, 0.924062)
 texture = ExtResource("11_dohnv")
 
 [node name="Event_handnote_c02_meat_stopMouse" type="Sprite2D" parent="Bag/Book/Event_handnote_chapter_stage2"]
-position = Vector2(-735, 205)
+position = Vector2(-745, 195)
 scale = Vector2(0.7, 0.7)
 texture = ExtResource("14_cd76s")
 script = ExtResource("7_nfxph")