diff --git a/asset/art/gif/c01_书店外街道/frames.tres b/asset/art/gif/c01_书店外街道/frames.tres index 8d17b59b..0782cd22 100644 --- a/asset/art/gif/c01_书店外街道/frames.tres +++ b/asset/art/gif/c01_书店外街道/frames.tres @@ -1,4 +1,4 @@ -[gd_resource type="SpriteFrames" load_steps=298 format=3 uid="uid://cvkuw35ulebme"] +[gd_resource type="SpriteFrames" load_steps=290 format=3 uid="uid://cvkuw35ulebme"] [ext_resource type="Texture2D" uid="uid://cjyu2wmfa7dhb" path="res://asset/art/gif/c01_书店外街道/杂戏团黄昏_举碗小孩/0.png" id="1_1vswb"] [ext_resource type="Texture2D" uid="uid://dcy3g28cqfc40" path="res://asset/art/gif/c01_书店外街道/杂戏团夜晚_陆仁舞刀/0.png" id="1_3jpe8"] @@ -248,30 +248,22 @@ [ext_resource type="Texture2D" uid="uid://doxpjhmnwj1xf" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/42.png" id="281_ua8rm"] [ext_resource type="Texture2D" uid="uid://et72c4udhk1d" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/43.png" id="282_nl8l1"] [ext_resource type="Texture2D" uid="uid://cci3x2nvli2vl" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/44.png" id="283_o4vq4"] -[ext_resource type="Texture2D" uid="uid://cekbtgppfvln" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png" id="284_7em41"] +[ext_resource type="Texture2D" uid="uid://b6l27ysh0bpgh" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png" id="284_7em41"] [ext_resource type="Texture2D" uid="uid://c0um1aq24snna" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/45.png" id="284_u720u"] -[ext_resource type="Texture2D" uid="uid://g0onbmobem5y" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/0.png" id="284_vlsm5"] -[ext_resource type="Texture2D" uid="uid://p7geyjeas81t" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/1.png" id="285_3e6og"] +[ext_resource type="Texture2D" uid="uid://c311ayix6nmd" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/0.png" id="284_vlsm5"] +[ext_resource type="Texture2D" uid="uid://cf7re7jrqmmla" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/1.png" id="285_3e6og"] [ext_resource type="Texture2D" uid="uid://4u8c6ok5me5o" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/46.png" id="285_4oygu"] -[ext_resource type="Texture2D" uid="uid://dyusm5cgxf32x" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png" id="285_iq05n"] -[ext_resource type="Texture2D" uid="uid://dtqf08f1cs2k0" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/2.png" id="286_0a0mf"] +[ext_resource type="Texture2D" uid="uid://dwgicnbr6ribm" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png" id="285_iq05n"] +[ext_resource type="Texture2D" uid="uid://tbn7m16x57ql" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/2.png" id="286_0a0mf"] [ext_resource type="Texture2D" uid="uid://7d8g7ng2xpyb" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/47.png" id="286_4p3c8"] -[ext_resource type="Texture2D" uid="uid://csvbfrnx7767" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/2.png" id="286_egq1j"] [ext_resource type="Texture2D" uid="uid://0mlggoik1x0n" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/48.png" id="287_4g43k"] -[ext_resource type="Texture2D" uid="uid://dun8poejk2van" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/3.png" id="287_b7lkb"] -[ext_resource type="Texture2D" uid="uid://32qxfp5n6srh" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/3.png" id="287_iusbw"] +[ext_resource type="Texture2D" uid="uid://paakxne0sao6" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/3.png" id="287_b7lkb"] [ext_resource type="Texture2D" uid="uid://cya5ed0xgwwil" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/49.png" id="288_7ydas"] -[ext_resource type="Texture2D" uid="uid://bly8fydjrs0rt" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/4.png" id="288_i6y4i"] -[ext_resource type="Texture2D" uid="uid://dllp6jv7gbake" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/4.png" id="288_m8jtt"] -[ext_resource type="Texture2D" uid="uid://c8pd3ef326ysi" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/5.png" id="289_643sc"] +[ext_resource type="Texture2D" uid="uid://ciqqxer27ilkg" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/4.png" id="288_i6y4i"] [ext_resource type="Texture2D" uid="uid://dk6sh3tcy14yp" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/50.png" id="289_m5h2g"] [ext_resource type="Texture2D" uid="uid://n3go2optbrjh" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/51.png" id="290_1252k"] -[ext_resource type="Texture2D" uid="uid://ctorkkaeex6qk" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/6.png" id="290_o2bht"] [ext_resource type="Texture2D" uid="uid://ce105oaxjpsxl" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/52.png" id="291_4r8gj"] -[ext_resource type="Texture2D" uid="uid://bhu2g1jheobfm" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/7.png" id="291_yupn7"] [ext_resource type="Texture2D" uid="uid://c0x2bhgi32gwv" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/53.png" id="292_3nsgo"] -[ext_resource type="Texture2D" uid="uid://w5gp2ciigkqi" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/8.png" id="292_nlodd"] -[ext_resource type="Texture2D" uid="uid://cvkvvk5eytee0" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/9.png" id="293_7vsdf"] [ext_resource type="Texture2D" uid="uid://d3t4ra4y6rkwg" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/54.png" id="293_xfy5u"] [ext_resource type="Texture2D" uid="uid://dt5occx2ntnus" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/55.png" id="294_wynmm"] [ext_resource type="Texture2D" uid="uid://dq8or4u1hnqoo" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/56.png" id="295_isvd4"] @@ -562,79 +554,79 @@ animations = [{ "speed": 30.0 }, { "frames": [{ -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("71_3jvux") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("72_5hb5o") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("73_cjpg1") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("74_f10vf") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("75_6xgk4") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("76_g8kkt") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("77_qhrtf") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("78_yk8i7") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("79_fkhvh") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("80_5uv37") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("81_7bw88") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("82_3u4nq") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("83_qrsew") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("84_uo4wb") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("85_fkotq") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("86_uis1u") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("87_58pi6") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("88_hkw0j") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("89_gmi4a") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("90_i6d5b") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("91_rvhwd") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("92_aokro") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("93_p7pti") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("94_polw3") }, { -"duration": 6.0, +"duration": 8.0, "texture": ExtResource("95_b08kf") }], "loop": false, @@ -1007,40 +999,16 @@ animations = [{ "duration": 9.0, "texture": ExtResource("288_i6y4i") }], -"loop": false, +"loop": true, "name": &"陆仁收刀", "speed": 30.0 }, { "frames": [{ -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("284_7em41") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("285_iq05n") -}, { -"duration": 9.0, -"texture": ExtResource("286_egq1j") -}, { -"duration": 9.0, -"texture": ExtResource("287_iusbw") -}, { -"duration": 9.0, -"texture": ExtResource("288_m8jtt") -}, { -"duration": 9.0, -"texture": ExtResource("289_643sc") -}, { -"duration": 9.0, -"texture": ExtResource("290_o2bht") -}, { -"duration": 9.0, -"texture": ExtResource("291_yupn7") -}, { -"duration": 9.0, -"texture": ExtResource("292_nlodd") -}, { -"duration": 9.0, -"texture": ExtResource("293_7vsdf") }], "loop": true, "name": &"陆仁收刀后呼吸", diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀.gif b/asset/art/gif/c01_书店外街道/陆仁收刀.gif index 2e223d00..2bc4553e 100644 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀.gif and b/asset/art/gif/c01_书店外街道/陆仁收刀.gif differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀.gif.import b/asset/art/gif/c01_书店外街道/陆仁收刀.gif.import index c1c6b32f..9eb2483f 100644 --- a/asset/art/gif/c01_书店外街道/陆仁收刀.gif.import +++ b/asset/art/gif/c01_书店外街道/陆仁收刀.gif.import @@ -2,7 +2,7 @@ importer="gif.animated.texture.plugin" type="SpriteFrames" -uid="uid://de1evrm08ud20" +uid="uid://cya2jmb8rdbur" path="res://.godot/imported/陆仁收刀.gif-b37c489e9ebf7ff9e4ff10d6d5edc843.tres" [deps] diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀/0.png b/asset/art/gif/c01_书店外街道/陆仁收刀/0.png index 5cbd285b..59c811d1 100644 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀/0.png and b/asset/art/gif/c01_书店外街道/陆仁收刀/0.png differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀/0.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀/0.png.import index 00cb09ac..0cac6bf5 100644 --- a/asset/art/gif/c01_书店外街道/陆仁收刀/0.png.import +++ b/asset/art/gif/c01_书店外街道/陆仁收刀/0.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://g0onbmobem5y" +uid="uid://c311ayix6nmd" path="res://.godot/imported/0.png-43bbc36ee36542a64cd01c218f812af0.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀/1.png b/asset/art/gif/c01_书店外街道/陆仁收刀/1.png index 4363d853..b5398839 100644 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀/1.png and b/asset/art/gif/c01_书店外街道/陆仁收刀/1.png differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀/1.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀/1.png.import index 1e93e378..bab71fa3 100644 --- a/asset/art/gif/c01_书店外街道/陆仁收刀/1.png.import +++ b/asset/art/gif/c01_书店外街道/陆仁收刀/1.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://p7geyjeas81t" +uid="uid://cf7re7jrqmmla" path="res://.godot/imported/1.png-07c99170b27cd55f90237619c2d29771.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀/2.png b/asset/art/gif/c01_书店外街道/陆仁收刀/2.png index 7c62c8a6..9391d5bf 100644 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀/2.png and b/asset/art/gif/c01_书店外街道/陆仁收刀/2.png differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀/2.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀/2.png.import index 1436b144..6167d414 100644 --- a/asset/art/gif/c01_书店外街道/陆仁收刀/2.png.import +++ b/asset/art/gif/c01_书店外街道/陆仁收刀/2.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dtqf08f1cs2k0" +uid="uid://tbn7m16x57ql" path="res://.godot/imported/2.png-c891e20404b33d044f899b31cf8ccf33.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀/3.png b/asset/art/gif/c01_书店外街道/陆仁收刀/3.png index 38d50870..1d0dad2c 100644 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀/3.png and b/asset/art/gif/c01_书店外街道/陆仁收刀/3.png differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀/3.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀/3.png.import index a41d882c..2b137479 100644 --- a/asset/art/gif/c01_书店外街道/陆仁收刀/3.png.import +++ b/asset/art/gif/c01_书店外街道/陆仁收刀/3.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dun8poejk2van" +uid="uid://paakxne0sao6" path="res://.godot/imported/3.png-8f3448e25ebcdb5ea6c6214e4b8394de.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀/4.png b/asset/art/gif/c01_书店外街道/陆仁收刀/4.png index 4eab6965..38f69f43 100644 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀/4.png and b/asset/art/gif/c01_书店外街道/陆仁收刀/4.png differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀/4.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀/4.png.import index d6ad49bc..88c75d97 100644 --- a/asset/art/gif/c01_书店外街道/陆仁收刀/4.png.import +++ b/asset/art/gif/c01_书店外街道/陆仁收刀/4.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bly8fydjrs0rt" +uid="uid://ciqqxer27ilkg" path="res://.godot/imported/4.png-14fa0fe29f85e42c1fe7164531f68e8c.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸.gif b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸.gif index e9fb3b40..bb1d4e5c 100644 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸.gif and b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸.gif differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸.gif.import b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸.gif.import index 01b7cc2d..f8b9aadd 100644 --- a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸.gif.import +++ b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸.gif.import @@ -2,7 +2,7 @@ importer="gif.animated.texture.plugin" type="SpriteFrames" -uid="uid://hib5bkfy0k0v" +uid="uid://pmta6vn8obgp" path="res://.godot/imported/陆仁收刀后呼吸.gif-e85806f06a4bcd77eb1d83124bc7e294.tres" [deps] diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png index 38d50870..1d0dad2c 100644 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png and b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png.import index 7f1aea79..3790d502 100644 --- a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png.import +++ b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cekbtgppfvln" +uid="uid://b6l27ysh0bpgh" path="res://.godot/imported/0.png-9932776fce482b8b5c2b8100bdc35d5e.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png index 26e2db21..38f69f43 100644 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png and b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png.import index 79fd61dc..f74ce313 100644 --- a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png.import +++ b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dyusm5cgxf32x" +uid="uid://dwgicnbr6ribm" path="res://.godot/imported/1.png-1ce493c76ec6ccfdf6531fd5381597bd.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/2.png b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/2.png deleted file mode 100644 index b9f026f5..00000000 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/2.png and /dev/null differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/2.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/2.png.import deleted file mode 100644 index 38f87721..00000000 --- a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/2.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://csvbfrnx7767" -path="res://.godot/imported/2.png-3d911b476b3295281b8a4c2f8fd1e52c.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/2.png" -dest_files=["res://.godot/imported/2.png-3d911b476b3295281b8a4c2f8fd1e52c.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/art/gif/c01_书店外街道/陆仁收刀后呼吸/3.png b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/3.png deleted file mode 100644 index 258721a7..00000000 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/3.png and /dev/null differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/3.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/3.png.import deleted file mode 100644 index 368c9534..00000000 --- a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/3.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://32qxfp5n6srh" -path="res://.godot/imported/3.png-e4b9097dc169046da04574378948a140.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/3.png" -dest_files=["res://.godot/imported/3.png-e4b9097dc169046da04574378948a140.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/art/gif/c01_书店外街道/陆仁收刀后呼吸/4.png b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/4.png deleted file mode 100644 index 38d50870..00000000 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/4.png and /dev/null differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/5.png b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/5.png deleted file mode 100644 index 38d50870..00000000 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/5.png and /dev/null differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/5.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/5.png.import deleted file mode 100644 index b461a83d..00000000 --- a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/5.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c8pd3ef326ysi" -path="res://.godot/imported/5.png-174f9e61b331e70a617d14e50b249ef8.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/5.png" -dest_files=["res://.godot/imported/5.png-174f9e61b331e70a617d14e50b249ef8.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/art/gif/c01_书店外街道/陆仁收刀后呼吸/6.png b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/6.png deleted file mode 100644 index 26e2db21..00000000 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/6.png and /dev/null differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/6.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/6.png.import deleted file mode 100644 index b4f6c144..00000000 --- a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/6.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ctorkkaeex6qk" -path="res://.godot/imported/6.png-cc7b39f9c68b7e75006b62fc02f78ea8.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/6.png" -dest_files=["res://.godot/imported/6.png-cc7b39f9c68b7e75006b62fc02f78ea8.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/art/gif/c01_书店外街道/陆仁收刀后呼吸/7.png b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/7.png deleted file mode 100644 index b9f026f5..00000000 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/7.png and /dev/null differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/7.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/7.png.import deleted file mode 100644 index fac0fdd4..00000000 --- a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/7.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bhu2g1jheobfm" -path="res://.godot/imported/7.png-9d431ae24a879c421697b49de59a6792.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/7.png" -dest_files=["res://.godot/imported/7.png-9d431ae24a879c421697b49de59a6792.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/art/gif/c01_书店外街道/陆仁收刀后呼吸/8.png b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/8.png deleted file mode 100644 index 258721a7..00000000 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/8.png and /dev/null differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/8.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/8.png.import deleted file mode 100644 index 4d617a9e..00000000 --- a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/8.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://w5gp2ciigkqi" -path="res://.godot/imported/8.png-35738fe61c62cc5dd49dce35f5326234.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/8.png" -dest_files=["res://.godot/imported/8.png-35738fe61c62cc5dd49dce35f5326234.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/art/gif/c01_书店外街道/陆仁收刀后呼吸/9.png b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/9.png deleted file mode 100644 index 38d50870..00000000 Binary files a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/9.png and /dev/null differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/9.png.import b/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/9.png.import deleted file mode 100644 index 0c24ff70..00000000 --- a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/9.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cvkvvk5eytee0" -path="res://.godot/imported/9.png-4859b36acf4ef4f995a855f30df9a34e.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/9.png" -dest_files=["res://.godot/imported/9.png-4859b36acf4ef4f995a855f30df9a34e.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/art/little_game/书架_生死簿/生死簿摊开特写 印章.png b/asset/art/little_game/书架_生死簿/生死簿摊开特写 印章.png index f3d6a6a6..0ff640f5 100644 Binary files a/asset/art/little_game/书架_生死簿/生死簿摊开特写 印章.png and b/asset/art/little_game/书架_生死簿/生死簿摊开特写 印章.png differ diff --git a/asset/art/prop/c01/院长的信.png b/asset/art/prop/c01/院长的信.png index 679e3e42..790369b4 100644 Binary files a/asset/art/prop/c01/院长的信.png and b/asset/art/prop/c01/院长的信.png differ diff --git a/asset/art/prop/c01/院长的信物品.png b/asset/art/prop/c01/院长的信物品.png new file mode 100644 index 00000000..679e3e42 Binary files /dev/null and b/asset/art/prop/c01/院长的信物品.png differ diff --git a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/4.png.import b/asset/art/prop/c01/院长的信物品.png.import similarity index 65% rename from asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/4.png.import rename to asset/art/prop/c01/院长的信物品.png.import index 24857b41..649b8547 100644 --- a/asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/4.png.import +++ b/asset/art/prop/c01/院长的信物品.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dllp6jv7gbake" -path="res://.godot/imported/4.png-bb74ccd78dfcb7f428df24ad05d7a6e1.ctex" +uid="uid://bg77dh6ua3kfo" +path="res://.godot/imported/院长的信物品.png-a689d7549aa71e15e7515e0c89cc9b6a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/4.png" -dest_files=["res://.godot/imported/4.png-bb74ccd78dfcb7f428df24ad05d7a6e1.ctex"] +source_file="res://asset/art/prop/c01/院长的信物品.png" +dest_files=["res://.godot/imported/院长的信物品.png-a689d7549aa71e15e7515e0c89cc9b6a.ctex"] [params] diff --git a/asset/art/scene/c01/s06_孤儿院长廊围墙/bg_院子长背景.png b/asset/art/scene/c01/s06_孤儿院长廊围墙/bg_院子长背景.png old mode 100755 new mode 100644 index b704cde9..ef905d93 Binary files a/asset/art/scene/c01/s06_孤儿院长廊围墙/bg_院子长背景.png and b/asset/art/scene/c01/s06_孤儿院长廊围墙/bg_院子长背景.png differ diff --git a/asset/art/scene/c01/s10_公寓过道/bg_过道夜晚.png b/asset/art/scene/c01/s10_公寓过道/bg_过道夜晚.png old mode 100755 new mode 100644 index 67cba836..bbf631dc Binary files a/asset/art/scene/c01/s10_公寓过道/bg_过道夜晚.png and b/asset/art/scene/c01/s10_公寓过道/bg_过道夜晚.png differ diff --git a/asset/dialogue/c01.csv b/asset/dialogue/c01.csv index 6ca9a2b7..757b39b8 100644 --- a/asset/dialogue/c01.csv +++ b/asset/dialogue/c01.csv @@ -25,19 +25,22 @@ c01_老人喂食_3,“吃饱了......就会帮我找......”,,老人,, c01_老人喂食_4,“帮我找到我的孩子......”,,老人,, c01_在这儿吗,“在这儿吗......”,,,, c01_s08_书店老板任务,(台词设计:安排⼯作,整理书架,有封寄给玩家的信,放在柜台上),,书店老板,, -c01_s06_走廊前对话1,昨天认的字,现在全忘了?,,老师,# note, +c01_s06_对话3_1,画完了没有?你小子咋比秤砣还沉!,,胖小孩,猫鼠游戏前,与跟班2(同乡)的对话, +c01_s06_对话3_2,快了、快了。,,残疾小孩,, +...后面看不清了。,...后面看不清了。,,???,# note, +c01_s06_走廊前对话1,昨天认的字,现在全忘了?,,老师,, c01_s06_走廊前对话2,(唉呀)黄鱼脑子!,,老师,, +画完了没有?你小子咋比秤砣还沉!,画完了没有?你小子咋比秤砣还沉!,,胖小孩,, +快了、快了。,快了、快了。,,残疾小孩,, +这是个啥?黑乎乎的,旁边还有两朵花。,这是个啥?黑乎乎的,旁边还有两朵花。,,跟班甲,, +非也,非也。谁规定神仙不能长成这样的?,非也,非也。谁规定神仙不能长成这样的?,,残疾小孩,, +呸,神仙要是真长得这么丑,老子以后都倒立撒尿!,呸,神仙要是真长得这么丑,老子以后都倒立撒尿!,,胖小孩,, 嘶,总觉得好像在哪见过……,嘶,总觉得好像在哪见过……,,跟班乙,, 这画是六指儿画的,你问他去!,这画是六指儿画的,你问他去!,,跟班甲,, 我知道什么?知道也不能告诉你!,我知道什么?知道也不能告诉你!,,残疾小孩,, 还有,以后别叫我六指儿!,还有,以后别叫我六指儿!,,残疾小孩,, 那个怪人是最近才出现的,总是透过门缝往院子里头看。,那个怪人是最近才出现的,总是透过门缝往院子里头看。,,跟班乙,, 搞得大家都不去墙根底下玩儿了,真晦气。,搞得大家都不去墙根底下玩儿了,真晦气。,,跟班乙,, -c01_s06_对话3_1,画完了没有?你小子咋比秤砣还沉!,,胖小孩,猫鼠游戏前,与跟班2(同乡)的对话, -c01_s06_对话3_2,快了、快了。,,残疾小孩,, -这是个啥?黑乎乎的,旁边还有两朵花。,这是个啥?黑乎乎的,旁边还有两朵花。,,跟班甲,, -非也,非也。谁规定神仙不能长成这样的?,非也,非也。谁规定神仙不能长成这样的?,,残疾小孩,, -呸,神仙要是真长得这么丑,老子以后都倒立撒尿!,呸,神仙要是真长得这么丑,老子以后都倒立撒尿!,,胖小孩,, c01_s06_谈论鬼差1,站住!,,胖小孩,, c01_s06_谈论鬼差2,我们可没让你走!,,胖小孩,, c01_s06_谈论鬼差3,我们玩游戏还差个人,就你了,吕萍。,,残疾小孩,, @@ -49,9 +52,9 @@ c01_s06_谈论鬼差8,倒数三个数,你要是被抓到了,我们就请你 c01_s06_猫鼠游戏1,三!,,小胖孩,,[#wait=2] c01_s06_猫鼠游戏2,二!,,小胖孩,,[#wait=0.5] c01_s06_猫鼠游戏3,一!,,小胖孩,,[#wait=3] -瞧一瞧,看一看,动动各位的发财手,老爷夫人别急走,什么把戏咱都有……,瞧一瞧,看一看,动动各位的发财手,老爷夫人别急走,什么把戏咱都有……,,监督小孩,, -不要千、不要万,只求一顿温饱饭,又集福、又集善,亲戚儿孙中状元!,不要千、不要万,只求一顿温饱饭,又集福、又集善,亲戚儿孙中状元!,,监督小孩,, -儿孙坐在那金銮殿,荣华富贵顶上天!,儿孙坐在那金銮殿,荣华富贵顶上天!,,监督小孩,, +瞧一瞧,看一看,动动各位的发财手,老爷夫人别急走,什么把戏咱都有……,瞧一瞧,看一看,动动各位的发财手,老爷夫人别急走,什么把戏咱都有……,,???,, +不要千、不要万,只求一顿温饱饭,又集福、又集善,亲戚儿孙中状元!,不要千、不要万,只求一顿温饱饭,又集福、又集善,亲戚儿孙中状元!,,???,, +儿孙坐在那金銮殿,荣华富贵顶上天!,儿孙坐在那金銮殿,荣华富贵顶上天!,,???,, 您、您行行好,给点...,您、您行行好,给点...,,小孩甲,, 祝恁身子骨儿杠赛来,吃嘛嘛香木个病,一年更比一年行!,祝恁身子骨儿杠赛来,吃嘛嘛香木个病,一年更比一年行!,,小孩乙,, 宾安哗在,有才有财!,宾安哗在,有才有财!,,小孩丙,, diff --git a/asset/dialogue/c01.dialogue b/asset/dialogue/c01.dialogue index 200bb8d0..b9458a1c 100644 --- a/asset/dialogue/c01.dialogue +++ b/asset/dialogue/c01.dialogue @@ -34,14 +34,23 @@ 跟班甲: 这是个啥?黑乎乎的,旁边还有两朵花。 残疾小孩: 非也,非也。谁规定神仙不能长成这样的? 胖小孩: 呸,神仙要是真长得这么丑,老子以后都倒立撒尿! -跟班乙: 嘶,总觉得好像在哪见过…… +跟班乙: 嘶,总觉得好像在哪见过... +=> END + +~ c01_s06_四个小孩_对话1 跟班甲: 这画是六指儿画的,你问他去! -残疾小孩: 我知道什么?知道也不能告诉你! -残疾小孩: 还有,以后别叫我六指儿! +=> END + +~ c01_s06_四个小孩_对话2 跟班乙: 那个怪人是最近才出现的,总是透过门缝往院子里头看。 跟班乙: 搞得大家都不去墙根底下玩儿了,真晦气。 => END +~ c01_s06_四个小孩_对话3 +残疾小孩: 我知道什么?知道也不能告诉你! +残疾小孩: 还有,以后别叫我六指儿! +=> END + ~ c01_s06_谈论鬼差与猫鼠游戏 胖小孩: 站住! [ID:c01_s06_谈论鬼差1] 胖小孩: 我们可没让你走! [ID:c01_s06_谈论鬼差2] @@ -54,16 +63,16 @@ => END ~ c01_s06_猫鼠游戏 -小胖孩: 三! [#wait=2] [ID:c01_s06_猫鼠游戏1] +小胖孩: 三! [#wait=0.5] [ID:c01_s06_猫鼠游戏1] 小胖孩: 二! [#wait=0.5] [ID:c01_s06_猫鼠游戏2] -小胖孩: 一! [#wait=3] [ID:c01_s06_猫鼠游戏3] +小胖孩: 一! [#wait=2] [ID:c01_s06_猫鼠游戏3] => END ~ c01_s07_监督小孩吉祥话 -监督小孩: 瞧一瞧,看一看,动动各位的发财手,老爷夫人别急走,什么把戏咱都有…… -监督小孩: 不要千、不要万,只求一顿温饱饭,又集福、又集善,亲戚儿孙中状元! -监督小孩: 儿孙坐在那金銮殿,荣华富贵顶上天! +???: 瞧一瞧,看一看,动动各位的发财手,老爷夫人别急走,什么把戏咱都有…… +???: 不要千、不要万,只求一顿温饱饭,又集福、又集善,亲戚儿孙中状元! +???: 儿孙坐在那金銮殿,荣华富贵顶上天! => END ~ c01_s07_小孩吉祥话1 diff --git a/asset/dialogue/inspect_content.dialogue b/asset/dialogue/inspect_content.dialogue index d8108c34..ffb251b5 100644 --- a/asset/dialogue/inspect_content.dialogue +++ b/asset/dialogue/inspect_content.dialogue @@ -3,10 +3,6 @@ x年 [ID:t89c0f4a8de] 下午一点 [ID:t356af5308e] => END -~ c01_信件全文 -小蝶:\n信件正文内容...\n落款 [ID:c01_信件全文] -=> END - ~ c02_鼠疫海报 据闻奉贤县分水墩又有七人染受鼠疫,病状可怖,闻医官药治无用,免职。 [ID:t344c97cf2c] 有地方人称鼠疫为妖邪作祟,甚为惊骇,一时人心惶惶,竟有聚众滋闹之事,政府以防疫事宜关系紧要,拟赴分水墩一带调查防疫事宜云。 [ID:tdb119a3714] diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index 3cbba3c1..0bcda368 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -2,6 +2,7 @@ keys,zh_CN,_character,_notes,_tags 说明文本,说明文本,,, ui_press_b,按 B 打开背包,,, 5,5,,, +院长的信...,院长的信...,,, index_新游戏,新游戏,,, index_继续游戏,继续游戏,,, index_退出游戏,退出游戏,,, @@ -37,7 +38,7 @@ prop_空手,空手,,, prop_信碎片1,信碎片(一),,,[#texture=c01/信件左上.png] prop_信碎片2,信碎片(二),,,[#texture=c01/信件右上.png] prop_银元,银元,,,[#texture=c01/银元.png] -prop_院长的信,院长的信,,,[#texture=c01/院长的信.png] +prop_院长的信,院长的信,,,[#texture=c01/院长的信物品.png][#inspect=c01/院长的信.png] prop_重要物品示例,重要物品示例,,,[#texture=c01/银元.png] prop_令牌,令牌,,,[#texture=c01/令牌物品.png][#inspect=c01/令牌.png] prop_装有灵魂的令牌,装有灵魂的令牌,,,[#texture=c01/装有灵魂的令牌物品.png][#inspect=c01/装有灵魂的令牌.png] @@ -50,11 +51,14 @@ prop_3014旋转锁钥匙,3014旋转锁钥匙,,,[#texture=c02/3014旋转锁钥匙 prop_小猫玩具完整,小猫玩具,,,[#texture=c02/小猫玩具完整物品.png][#inspect=c02/小猫玩具完整.png] prop_信碎片1_说明,浦育院院长秦阳,民国21年,11月20日,,ID格式: prop_xx_说明, prop_银元_说明,一枚“袁大头”银元,中華民國十年造。,,, -院长的信...,院长的信...,,, +prop_院长的信_说明,"院长的信... +1 +2 +3",,, +重要物品示例,重要物品示例,,, 1,1,,, 2,2,,, 3,3,,, -重要物品示例,重要物品示例,,, 4,4,,, c01_s05_检查院长房间,好像忘记了什么事情,再回去检查一遍吧。,,, c01_s07_需要报纸,书店还没开门。,,, @@ -83,6 +87,8 @@ c01_s06_院长房间,这是院长的房间,,, c01_s06_小朋友房间,这是其他小朋友的房间,,, c01_s06_熟悉的墙画,"墙上的画看起来好熟悉。 过去问问看吧,没准他们几个知道些什么。",,, +c01_s06_四小孩对话结束,"怪人、花、门... +他在找什么东西,或是什么人?",,, c01_s07_钱碗,碗里只有一枚铜钱。,,, c01_s07_获得报纸,这是什么?,,, c01_s07_书店展柜,"院长说,读一百本书,就可以成为无所不能的大人。 diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 567c97da..ce7d6d2d 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -48,7 +48,7 @@ 信碎片(一) [#texture=c01/信件左上.png] [ID:prop_信碎片1] 信碎片(二) [#texture=c01/信件右上.png] [ID:prop_信碎片2] 银元 [#texture=c01/银元.png] [ID:prop_银元] -院长的信 [#texture=c01/院长的信.png] [ID:prop_院长的信] +院长的信 [#texture=c01/院长的信物品.png][#inspect=c01/院长的信.png] [ID:prop_院长的信] 重要物品示例 [#texture=c01/银元.png] [ID:prop_重要物品示例] 令牌 [#texture=c01/令牌物品.png][#inspect=c01/令牌.png] [ID:prop_令牌] @@ -77,10 +77,7 @@ => END ~ prop_院长的信 -院长的信... -1 -2 -3 +院长的信...\n1\n2\n3 [ID:prop_院长的信_说明] => END ~ prop_重要物品示例 @@ -121,6 +118,7 @@ 这是其他小朋友的房间 [ID:c01_s06_小朋友房间] # 院子里四个小孩交谈结束后 墙上的画看起来好熟悉。\n过去问问看吧,没准他们几个知道些什么。 [ID:c01_s06_熟悉的墙画] +怪人、花、门...\n他在找什么东西,或是什么人? [ID:c01_s06_四小孩对话结束] # c01-s07 书店外 碗里只有一枚铜钱。 [ID:c01_s07_钱碗] 这是什么? [ID:c01_s07_获得报纸] diff --git a/config/animation/entity_sprite_frames.tres b/config/animation/entity_sprite_frames.tres index b95e9a46..4bbc3e3b 100644 --- a/config/animation/entity_sprite_frames.tres +++ b/config/animation/entity_sprite_frames.tres @@ -1324,85 +1324,85 @@ animations = [{ "speed": 30.0 }, { "frames": [{ -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("184_tsskx") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("185_adpbv") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("186_xaqjo") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("187_exmgj") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("188_glo3y") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("189_y86r8") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("190_16mpc") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("191_0ssab") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("192_moer7") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("193_6xoj6") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("194_n7qvh") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("195_077om") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("196_b6i75") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("197_2um7t") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("198_iimum") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("199_u2jno") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("200_13qfd") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("201_a0f2d") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("202_ypwpj") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("203_3qf2e") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("204_ktwt1") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("205_2v3u4") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("206_dlydb") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("207_xewty") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("208_yjsfv") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("209_253oi") }, { -"duration": 9.0, +"duration": 15.0, "texture": ExtResource("210_mlkjm") }], "loop": false, diff --git a/manager/config_manager/global_config.gd b/manager/config_manager/global_config.gd index 687564b8..7fcb8bfd 100644 --- a/manager/config_manager/global_config.gd +++ b/manager/config_manager/global_config.gd @@ -9,10 +9,10 @@ const RES_FILE_FORMAT = ".tres" ## layers const CANVAS_LAYER_SETTINGS = 30 const CANVAS_LAYER_BAG = 25 +const CANVAS_LAYER_DIALOG = 23 const CANVAS_LAYER_UI = 22 -const CANVAS_LAYER_PROP_INSPECTOR = 21 +const CANVAS_LAYER_PROP_INSPECTOR = 20 const CANVAS_LAYER_GROUND_MASK = 14 -const CANVAS_LAYER_DIALOG = 12 const CANVAS_LAYER_SHADING = 10 const CANVAS_LAYER_LITTLE_GAME = 5 const CANVAS_LAYER_FG = 2 diff --git a/scene/dialog/balloon_debug.tscn b/scene/dialog/balloon_debug.tscn index 713b2f61..508d9919 100644 --- a/scene/dialog/balloon_debug.tscn +++ b/scene/dialog/balloon_debug.tscn @@ -56,7 +56,7 @@ MarginContainer/constants/margin_top = 15 Panel/styles/panel = SubResource("StyleBoxEmpty_jydvi") [node name="Balloon" type="CanvasLayer"] -layer = 12 +layer = 100 script = ExtResource("1_jfh0c") metadata/_edit_vertical_guides_ = [-78.0] metadata/_edit_horizontal_guides_ = [276.0] diff --git a/scene/ground/scene/c01/s05_animation.gd b/scene/ground/scene/c01/s05_animation.gd index 22b21818..d2dc2dd1 100644 --- a/scene/ground/scene/c01/s05_animation.gd +++ b/scene/ground/scene/c01/s05_animation.gd @@ -71,19 +71,23 @@ func _on_ground_ready() -> void: piano.interacted.connect(_on_piano_interacted) + +var intro_dialog_played = false + func _on_bed_reading_frame_changed(): if bed_reading.animation == "c01_小小蝶_床上看书": - if bed_reading.frame == 5: + if bed_reading.frame == 5 and not intro_dialog_played: + intro_dialog_played = true DialogueManager.show_dialogue_balloon(dialogue_c01, "c01_s05_院长房间_开场") elif bed_reading.frame == 10: # 播放结束,0.5s 后释放角色 get_tree().create_timer(0.5).timeout.connect(SceneManager.release_player) - + $"../DeployLayer/床".enabled = true func _on_note_read(): frame.enabled = false # 稍加延时后显示鸡毛掸子 - get_tree().create_timer(1.0).timeout.connect(func(): ambush.enabled = true) + get_tree().create_timer(4.5).timeout.connect(func(): ambush.enabled = true) func _on_ambush_triggered(): diff --git a/scene/ground/scene/c01/s05_院长房间.tscn b/scene/ground/scene/c01/s05_院长房间.tscn index d3ca41c1..0a426a91 100644 --- a/scene/ground/scene/c01/s05_院长房间.tscn +++ b/scene/ground/scene/c01/s05_院长房间.tscn @@ -606,6 +606,7 @@ default_texture = ExtResource("4_gdhoy") [node name="床" parent="Ground/DeployLayer" index="2" instance=ExtResource("10_18v0g")] position = Vector2(84, 50) texture = ExtResource("7_xakd0") +enabled = false title_filter = "c01" note_key = "c01_院长床" diff --git a/scene/ground/scene/c01/s06_animation.gd b/scene/ground/scene/c01/s06_animation.gd index ff5d8183..ecfab24f 100644 --- a/scene/ground/scene/c01/s06_animation.gd +++ b/scene/ground/scene/c01/s06_animation.gd @@ -101,6 +101,10 @@ func pre_game_os_finished(): SceneManager.release_player() func game_intro() -> void: + standing_kid1.get_node("对话1ambush").enabled = false + standing_kid2.get_node("对话2ambush").enabled = false + game_kid.get_node("对话3ambush").enabled = false + # 禁用猫鼠游戏开始 ambush 检测 cat_rat_game_start_ambush.enabled = false var camera = SceneManager.get_camera_marker() as CameraFocusMarker @@ -136,6 +140,33 @@ func _game_counting_down(_res = null): cat.visible = true cat.play("【墙上黑猫】跑步") +# 与小孩 1 对话 +func talk1(): + _on_talked() + +# 与小孩 2 对话 +func talk2(): + _on_talked() + +# 与残疾小孩对话 +func talk3(): + _on_talked() + +# 玩家与三个小孩的互动计数 +var talk_count := 0 + +func _on_talked(): + talk_count += 1 + if talk_count == 3: + # 三个小孩都对话完毕 + await DialogueManager.dialogue_ended + SceneManager.freeze_player(0) + await get_tree().create_timer(1.0).timeout + var lines = await DialogueUtil.generate_lines(tr("c01_s06_四小孩对话结束")) + var player = SceneManager.get_player() as MainPlayer + player.pop_os(lines) + player.os_finished.connect(SceneManager.release_player, CONNECT_ONE_SHOT) + var kid_run_tween diff --git a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn index b7df653f..a458cc96 100644 --- a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn +++ b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn @@ -340,6 +340,13 @@ enabled = false [node name="CollisionShape2D" parent="Ground/DeployLayer/【站立小孩-1】/猫鼠游戏重置ambush/Area2D" index="0"] shape = SubResource("RectangleShape2D_7cdhx") +[node name="对话1ambush" parent="Ground/DeployLayer/【站立小孩-1】" instance=ExtResource("11_tudob")] +position = Vector2(0, 51) +trigger_mode = "interact" +freeze_time = 1.0 +hook_dialogue_title = "c01_s06_四个小孩_对话1" +hook_method = "talk1" + [node name="【站立小孩-2】" parent="Ground/DeployLayer" index="15" instance=ExtResource("8_ouldg")] z_index = 10 position = Vector2(1505, 19) @@ -378,6 +385,13 @@ collision_mask = 64 [node name="CollisionShape2D" parent="Ground/DeployLayer/【站立小孩-2】/桌椅ambush2/Area2D" index="0"] shape = SubResource("RectangleShape2D_ceat6") +[node name="对话2ambush" parent="Ground/DeployLayer/【站立小孩-2】" instance=ExtResource("11_tudob")] +position = Vector2(2, 39) +trigger_mode = "interact" +freeze_time = 1.0 +hook_dialogue_title = "c01_s06_四个小孩_对话2" +hook_method = "talk2" + [node name="【墙上黑猫】" parent="Ground/DeployLayer" index="16" instance=ExtResource("8_ouldg")] position = Vector2(1453, -14) scale = Vector2(0.8, 0.8) @@ -439,7 +453,6 @@ z_as_relative = false position = Vector2(-23, 1) sprite_frames = ExtResource("7_dsj2r") animation = &"【单残疾小孩】爬行" -autoplay = "【单残疾小孩】爬行" autostart = false move_configs = Array[Dictionary]([{ "animation": &"【单残疾小孩】爬行", @@ -473,6 +486,13 @@ enabled = false [node name="CollisionShape2D" parent="Ground/DeployLayer/【胖小孩背着残疾小孩】/【单残疾小孩】/猫鼠游戏失败ambush/Area2D" index="0"] shape = SubResource("RectangleShape2D_7cdhx") +[node name="对话3ambush" parent="Ground/DeployLayer/【胖小孩背着残疾小孩】" instance=ExtResource("11_tudob")] +position = Vector2(-4, 41) +trigger_mode = "interact" +freeze_time = 1.0 +hook_dialogue_title = "c01_s06_四个小孩_对话3" +hook_method = "talk3" + [node name="猫鼠游戏胜利ambush" parent="Ground/DeployLayer" index="19" instance=ExtResource("11_tudob")] position = Vector2(4546, 45) one_shot = false @@ -496,7 +516,6 @@ offset = Vector2(601.5, -0.5) [node name="MainPlayer" parent="Ground" index="5"] modulate = Color(0.931897, 0.931897, 0.931897, 1) position = Vector2(1575, 91) -character = "小小蝶" [node name="院长凳子" type="Sprite2D" parent="Ground/ParallaxForeground/BGParallaxLayer" index="0"] position = Vector2(34, 3) diff --git a/scene/ground/scene/c01/s07_animation.gd b/scene/ground/scene/c01/s07_animation.gd index edcf6b2d..c7d0997b 100644 --- a/scene/ground/scene/c01/s07_animation.gd +++ b/scene/ground/scene/c01/s07_animation.gd @@ -16,12 +16,14 @@ func _ready() -> void: return +var luren var fog var seller var ambush_seller: Ambush2D func _on_ground_ready() -> void: + luren = $"../DeployLayer/陆仁舞刀" as ProAnimatedSprite2D fog = $"../DeployLayer/portal_1/Fog" as Fog2D if data.fog_disappeared: # 雾已经消失,直接隐藏 @@ -45,6 +47,18 @@ func _on_ground_ready() -> void: bookstore_portal.before_pre_transport_wait.connect(_knock_door) +func greetings_ambush() -> void: + (luren.sprite_frames as SpriteFrames).set_animation_loop("陆仁舞刀-黄昏带红缨", false) + luren.animation_finished.connect(_on_luren_animation_finished, CONNECT_ONE_SHOT) + + +func _on_luren_animation_finished() -> void: + luren.play("陆仁收刀") + # luren.offset = Vector2(-9.5, -0.5) + luren.offset = Vector2(-19, -1) + $"../DeployLayer/其余小孩/Note吉祥话4".enabled = true + + func _knock_door(): # 6 号动作:敲门 SceneManager.freeze_player(3.5, 6) @@ -58,7 +72,7 @@ func _on_fog_disappear() -> void: SceneManager.pop_center_texture(chapter_title) fog.tween_fog(0, Color.TRANSPARENT, Fog2D.FOG_OFFSET_DEFAULT, 15.0, true) # await get_tree().create_timer(5.0).timeout - + func seller_interacted(): $"../DeployLayer/portal_2".holding = false diff --git a/scene/ground/scene/c01/s07_书店外.tscn b/scene/ground/scene/c01/s07_书店外.tscn index 74b90d76..1eb15827 100644 --- a/scene/ground/scene/c01/s07_书店外.tscn +++ b/scene/ground/scene/c01/s07_书店外.tscn @@ -132,11 +132,15 @@ character_name = "小孩甲" anonymous = false height = -10.0 -[node name="陆仁舞刀" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="7"] -position = Vector2(1028, 1) +[node name="陆仁舞刀" parent="Ground/DeployLayer" index="7" instance=ExtResource("9_slaub")] +position = Vector2(970, 4) sprite_frames = ExtResource("6_thm8f") animation = &"陆仁舞刀-黄昏带红缨" autoplay = "陆仁舞刀-黄昏带红缨" +action_configs = Array[Dictionary]([{ +"animation_intro": "陆仁收刀", +&"animation_next": "陆仁收刀后呼吸" +}]) [node name="其余小孩" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="8"] position = Vector2(1160, 7) @@ -145,9 +149,11 @@ animation = &"杂戏团黄昏-其余小孩" autoplay = "杂戏团黄昏-其余小孩" [node name="Ambush监督小孩" parent="Ground/DeployLayer/其余小孩" instance=ExtResource("9_f61dl")] -position = Vector2(-117, 65) -freeze_time = 1.0 +position = Vector2(-255, 63) +freeze_time = 0.1 +lock_player_on_playing_dialogue = false hook_dialogue_title = "c01_s07_监督小孩吉祥话" +hook_method = "greetings_ambush" [node name="Note吉祥话1" parent="Ground/DeployLayer/其余小孩" instance=ExtResource("5_3pha1")] position = Vector2(-41, 63) @@ -171,8 +177,8 @@ title_filter = "c01" note_key = "c01_s07_小孩吉祥话3" [node name="Note吉祥话4" parent="Ground/DeployLayer/其余小孩" instance=ExtResource("5_3pha1")] -visible = false -position = Vector2(-209, 51) +position = Vector2(-203, 46) +enabled = false mode = "ballon" dialogue = "c01" title_filter = "c01" diff --git a/scene/ground/scene/c01/s08_书店.tscn b/scene/ground/scene/c01/s08_书店.tscn index d3327fe8..1d18f101 100644 --- a/scene/ground/scene/c01/s08_书店.tscn +++ b/scene/ground/scene/c01/s08_书店.tscn @@ -135,7 +135,6 @@ offset = Vector2(317, 0) [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(437, 98) -character = "小小蝶" [node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"] position = Vector2(-1, 22) diff --git a/scene/ground/scene/c01/s11_黄包车演出.tscn b/scene/ground/scene/c01/s11_黄包车演出.tscn index bbdee4a7..fa2c9de5 100644 --- a/scene/ground/scene/c01/s11_黄包车演出.tscn +++ b/scene/ground/scene/c01/s11_黄包车演出.tscn @@ -181,6 +181,7 @@ target_scene = "c02_s01" [node name="车夫与吕萍" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="2"] z_index = 5 position = Vector2(157, 68) +scale = Vector2(0.9, 0.9) sprite_frames = ExtResource("7_wo6md") animation = &"车夫静止" autoplay = "车夫静止" diff --git a/scene/ground/scene/c01/s12_书店外_诡异版.tscn b/scene/ground/scene/c01/s12_书店外_诡异版.tscn index ea04998b..e292c362 100644 --- a/scene/ground/scene/c01/s12_书店外_诡异版.tscn +++ b/scene/ground/scene/c01/s12_书店外_诡异版.tscn @@ -139,7 +139,7 @@ hook_method = "player_been_catched" [node name="飘动的寻人启事" parent="Ground/DeployLayer" index="6" instance=ExtResource("11_pwu7i")] z_index = 1 -position = Vector2(943, -51) +position = Vector2(1021, -48) [node name="陆仁舞刀" parent="Ground/DeployLayer" index="7" instance=ExtResource("14_ct084")] position = Vector2(1748, 10) @@ -271,7 +271,6 @@ texture = ExtResource("17_nta2f") [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(41, 98) -character = "小小蝶" [node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"] texture = null diff --git a/scene/ground/script/c01/s12_飘动的寻人启事.gd b/scene/ground/script/c01/s12_飘动的寻人启事.gd index 939a6ee8..a77fd71c 100644 --- a/scene/ground/script/c01/s12_飘动的寻人启事.gd +++ b/scene/ground/script/c01/s12_飘动的寻人启事.gd @@ -1,7 +1,6 @@ @tool extends Node2D -@export var velocity := 0.15 @export var area_size := Vector2(500, 150): set(val): area_size = val @@ -15,9 +14,9 @@ extends Node2D @onready var remote_sprite := %Sprite2D @onready var sign_mark := %Sign as Sign +var velocity := 2.0 var interacted_x = -10000 - func _draw() -> void: if Engine.is_editor_hint(): # draw gizmo @@ -31,7 +30,7 @@ func _draw() -> void: # 最多保持 4 个点; 先生成两个在左侧,再生成两个在右侧,然后再回到左侧,以此循环,形成左右摇摆的闭合路径 -var bezier_points = [Vector2(0, 0), Vector2(150, 20), Vector2(250, 40), Vector2(350, 60), Vector2(400, 80), Vector2(300, 100), Vector2(250, 120), Vector2(160, 130), Vector2(120, 140), Vector2(60, 150), Vector2(0, 150)] +var bezier_points = [Vector2(300, 0), Vector2(400, 20), Vector2(350, 40), Vector2(300, 60), Vector2(250, 80), Vector2(200, 100), Vector2(150, 120), Vector2(100, 140), Vector2(60, 150), Vector2(0, 150)] var current_position = Vector2.ZERO var weight := 0.0 diff --git a/scene/ground/script/c01/s12_飘动的寻人启事.tscn b/scene/ground/script/c01/s12_飘动的寻人启事.tscn index 1bab6b48..7e5bc65f 100644 --- a/scene/ground/script/c01/s12_飘动的寻人启事.tscn +++ b/scene/ground/script/c01/s12_飘动的寻人启事.tscn @@ -22,7 +22,6 @@ size = Vector2(20, 10) [node name="飘动的寻人启事" type="Node2D"] position = Vector2(43, 96) script = ExtResource("1_like6") -velocity = 0.5 [node name="Node2D" type="Node2D" parent="."] diff --git a/scene/little_game/拼凑信件.gd b/scene/little_game/拼凑信件.gd index f7c215b4..83faeba7 100644 --- a/scene/little_game/拼凑信件.gd +++ b/scene/little_game/拼凑信件.gd @@ -29,7 +29,6 @@ func _ready() -> void: _display_selected() content_rect.modulate.a = 0.0 content_rect.visible = true - # %Label.text = tr("c01_信件全文") SceneManager.pop_center_notification(tr("input_拼凑信件")) @@ -136,6 +135,9 @@ func _post_success(): # var tween = create_tween() # tween.tween_property(content_rect, "modulate:a", 1.0, 1.0) SceneManager.pop_center_notification(tr("ui_important_item_update")) + var texture = preload("res://asset/art/prop/c01/院长的信.png") + var inspector = SceneManager.get_inspector() + inspector.pop_standard_inspection(texture, null, tr("prop_院长的信_说明")) SceneManager.enable_important_item("prop_院长的信") # 1s 后退出 await get_tree().create_timer(1.0).timeout diff --git a/scene/notification/notification.tscn b/scene/notification/notification.tscn index 8cbc06ef..145ac4e4 100644 --- a/scene/notification/notification.tscn +++ b/scene/notification/notification.tscn @@ -6,8 +6,7 @@ [sub_resource type="LabelSettings" id="LabelSettings_ycsas"] font = ExtResource("2_eh7gu") -font_size = 20 -outline_size = 5 +outline_size = 4 outline_color = Color(0.184314, 0.12549, 0.141176, 1) [node name="Notification" type="Control"] diff --git a/scene/player/main_player.tscn b/scene/player/main_player.tscn index 2394a7d4..fc779b3a 100644 --- a/scene/player/main_player.tscn +++ b/scene/player/main_player.tscn @@ -28,8 +28,8 @@ modulate_color = Color(0.996078, 0.92549, 0.85098, 0.733333) z_index = 5 collision_mask = 2 script = ExtResource("1_3a78y") +character = "小小蝶" running_locked = true -debug_freeze = 4 metadata/_edit_vertical_guides_ = [-120.0] metadata/_edit_horizontal_guides_ = [-9.0] @@ -45,8 +45,8 @@ shape = SubResource("RectangleShape2D_fno82") unique_name_in_owner = true layout_mode = 3 anchors_preset = 0 -offset_top = -120.0 -offset_bottom = -120.0 +offset_top = -70.0 +offset_bottom = -70.0 mouse_filter = 2 [node name="MarginContainer" type="MarginContainer" parent="OSPivot"] @@ -95,7 +95,6 @@ seconds_per_pause_step = 0.15 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] unique_name_in_owner = true light_mask = 9 -scale = Vector2(0.6, 0.6) sprite_frames = ExtResource("2_3w63u") -animation = &"c00_吕萍_idle_right" -offset = Vector2(0, -100) +animation = &"c01_小小蝶_书店递报纸" +offset = Vector2(0, -37) diff --git a/scene/prop/prop_hud.gd b/scene/prop/prop_hud.gd index 67631e4a..29628095 100644 --- a/scene/prop/prop_hud.gd +++ b/scene/prop/prop_hud.gd @@ -404,6 +404,7 @@ func enable_prop_item(prop_key: String) -> void: var inspector = SceneManager.get_inspector() if inspector: var inspect_path = items_dict[prop_key].inspect_path + # 是否有独立的 inspect 图片 if inspect_path: var texture = load(inspect_path) as Texture2D inspector.pop_prop_inspection(prop_key, texture) diff --git a/scene/prop/prop_inspector.gd b/scene/prop/prop_inspector.gd index 55e277d9..7c190d16 100644 --- a/scene/prop/prop_inspector.gd +++ b/scene/prop/prop_inspector.gd @@ -73,7 +73,7 @@ func _blink_label(init := true): blinking_tween.tween_callback(_blink_label.bind(true)) -func pop_standard_inspection(cover_texture, notes_texture, inspection_note, centered := true): +func pop_standard_inspection(cover_texture, notes_texture, inspection_note, centered := false): if centered: content_label.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER else: diff --git a/scene/prop/prop_inspector.tscn b/scene/prop/prop_inspector.tscn index 269018fc..f029fdf8 100644 --- a/scene/prop/prop_inspector.tscn +++ b/scene/prop/prop_inspector.tscn @@ -94,7 +94,6 @@ theme_override_constants/margin_bottom = 60 [node name="ContentLabel" type="Label" parent="MarginContainer2"] unique_name_in_owner = true -modulate = Color(1, 1, 1, 0) custom_minimum_size = Vector2(150, 0) layout_mode = 2 size_flags_horizontal = 4 @@ -104,7 +103,6 @@ text = "据闻奉贤县分水墩又有七人染受鼠疫,病状可怖,闻医 《申报》 民国五年一月十三日" label_settings = SubResource("LabelSettings_5qe7a") -horizontal_alignment = 1 vertical_alignment = 1 autowrap_mode = 3 @@ -127,6 +125,6 @@ unique_name_in_owner = true modulate = Color(1, 1, 1, 0) layout_mode = 2 size_flags_horizontal = 4 -text = "Q: ui_退出 E: ui_阅读" +text = "Q: Exit E: Read" horizontal_alignment = 1 vertical_alignment = 1