diff --git a/asset/art/scene/c01/s07_书店外/纸片_正面.png b/asset/art/scene/c01/s07_书店外/纸片_正面.png index da178fea..8871c611 100755 Binary files a/asset/art/scene/c01/s07_书店外/纸片_正面.png and b/asset/art/scene/c01/s07_书店外/纸片_正面.png differ diff --git a/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-09.png b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-09.png index b45cf30e..87c91d21 100644 Binary files a/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-09.png and b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-09.png differ diff --git a/asset/art/ui/journal.aseprite b/asset/art/ui/journal.aseprite deleted file mode 100644 index 73b49ef1..00000000 Binary files a/asset/art/ui/journal.aseprite and /dev/null differ diff --git a/asset/art/ui/prop/inspect文本衬底蒙版.png b/asset/art/ui/prop_and_bag/inspect文本衬底蒙版.png similarity index 100% rename from asset/art/ui/prop/inspect文本衬底蒙版.png rename to asset/art/ui/prop_and_bag/inspect文本衬底蒙版.png diff --git a/asset/art/ui/prop/inspect文本衬底蒙版.png.import b/asset/art/ui/prop_and_bag/inspect文本衬底蒙版.png.import similarity index 74% rename from asset/art/ui/prop/inspect文本衬底蒙版.png.import rename to asset/art/ui/prop_and_bag/inspect文本衬底蒙版.png.import index 567b4a34..f011a6b3 100644 --- a/asset/art/ui/prop/inspect文本衬底蒙版.png.import +++ b/asset/art/ui/prop_and_bag/inspect文本衬底蒙版.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dwgxa5j6602vv" -path="res://.godot/imported/inspect文本衬底蒙版.png-cd10504990c0e4eca29f24b858d45a1f.ctex" +path="res://.godot/imported/inspect文本衬底蒙版.png-1da8974099d619e860c7c3eea08bc047.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/ui/prop/inspect文本衬底蒙版.png" -dest_files=["res://.godot/imported/inspect文本衬底蒙版.png-cd10504990c0e4eca29f24b858d45a1f.ctex"] +source_file="res://asset/art/ui/prop_and_bag/inspect文本衬底蒙版.png" +dest_files=["res://.godot/imported/inspect文本衬底蒙版.png-1da8974099d619e860c7c3eea08bc047.ctex"] [params] diff --git a/asset/art/ui/prop/inspect背景遮罩.png b/asset/art/ui/prop_and_bag/inspect背景遮罩.png similarity index 100% rename from asset/art/ui/prop/inspect背景遮罩.png rename to asset/art/ui/prop_and_bag/inspect背景遮罩.png diff --git a/asset/art/ui/prop/inspect背景遮罩.png.import b/asset/art/ui/prop_and_bag/inspect背景遮罩.png.import similarity index 68% rename from asset/art/ui/prop/inspect背景遮罩.png.import rename to asset/art/ui/prop_and_bag/inspect背景遮罩.png.import index 641b1fab..5c02b5ba 100644 --- a/asset/art/ui/prop/inspect背景遮罩.png.import +++ b/asset/art/ui/prop_and_bag/inspect背景遮罩.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://f186lvt5y2ql" -path="res://.godot/imported/inspect背景遮罩.png-8ed5ea7249831a11560a94b6a085cd4d.ctex" +path="res://.godot/imported/inspect背景遮罩.png-12d01888bf81d435dd86406a8439f755.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/ui/prop/inspect背景遮罩.png" -dest_files=["res://.godot/imported/inspect背景遮罩.png-8ed5ea7249831a11560a94b6a085cd4d.ctex"] +source_file="res://asset/art/ui/prop_and_bag/inspect背景遮罩.png" +dest_files=["res://.godot/imported/inspect背景遮罩.png-12d01888bf81d435dd86406a8439f755.ctex"] [params] diff --git a/asset/art/ui/小蝶笔记.png b/asset/art/ui/prop_and_bag/小蝶笔记.png similarity index 100% rename from asset/art/ui/小蝶笔记.png rename to asset/art/ui/prop_and_bag/小蝶笔记.png diff --git a/asset/art/ui/小蝶笔记.png.import b/asset/art/ui/prop_and_bag/小蝶笔记.png.import similarity index 69% rename from asset/art/ui/小蝶笔记.png.import rename to asset/art/ui/prop_and_bag/小蝶笔记.png.import index 07b3ed68..f7e5312b 100644 --- a/asset/art/ui/小蝶笔记.png.import +++ b/asset/art/ui/prop_and_bag/小蝶笔记.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dsj3l0baqg1g7" -path="res://.godot/imported/小蝶笔记.png-837049327efa1c125bdacb9f5cbb413a.ctex" +path="res://.godot/imported/小蝶笔记.png-693accd9e1df896b5877648cbebf165b.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/ui/小蝶笔记.png" -dest_files=["res://.godot/imported/小蝶笔记.png-837049327efa1c125bdacb9f5cbb413a.ctex"] +source_file="res://asset/art/ui/prop_and_bag/小蝶笔记.png" +dest_files=["res://.godot/imported/小蝶笔记.png-693accd9e1df896b5877648cbebf165b.ctex"] [params] diff --git a/asset/art/ui/prop/特写通用遮罩.png b/asset/art/ui/prop_and_bag/特写通用遮罩.png similarity index 100% rename from asset/art/ui/prop/特写通用遮罩.png rename to asset/art/ui/prop_and_bag/特写通用遮罩.png diff --git a/asset/art/ui/prop/特写通用遮罩.png.import b/asset/art/ui/prop_and_bag/特写通用遮罩.png.import similarity index 68% rename from asset/art/ui/prop/特写通用遮罩.png.import rename to asset/art/ui/prop_and_bag/特写通用遮罩.png.import index af757988..29ef6960 100644 --- a/asset/art/ui/prop/特写通用遮罩.png.import +++ b/asset/art/ui/prop_and_bag/特写通用遮罩.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cbql1i4hblmt1" -path="res://.godot/imported/特写通用遮罩.png-9fffebcdfc96857ca313182d79f507b8.ctex" +path="res://.godot/imported/特写通用遮罩.png-2ddfd83815d8ba406d36dfa56db4c3bf.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/ui/prop/特写通用遮罩.png" -dest_files=["res://.godot/imported/特写通用遮罩.png-9fffebcdfc96857ca313182d79f507b8.ctex"] +source_file="res://asset/art/ui/prop_and_bag/特写通用遮罩.png" +dest_files=["res://.godot/imported/特写通用遮罩.png-2ddfd83815d8ba406d36dfa56db4c3bf.ctex"] [params] diff --git a/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-29.png b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-29.png new file mode 100644 index 00000000..209362f2 Binary files /dev/null and b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-29.png differ diff --git a/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-29.png.import b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-29.png.import new file mode 100644 index 00000000..98045971 --- /dev/null +++ b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-29.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bv57eyqs03k4y" +path="res://.godot/imported/线索笔记内容-29.png-3126a7d0a4da9080aebb9dfade55bf16.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-29.png" +dest_files=["res://.godot/imported/线索笔记内容-29.png-3126a7d0a4da9080aebb9dfade55bf16.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/ui/prop_and_bag/线索笔记内容/线索笔记内容-30.png b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-30.png new file mode 100644 index 00000000..28d6bfa2 Binary files /dev/null and b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-30.png differ diff --git a/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-30.png.import b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-30.png.import new file mode 100644 index 00000000..e60232ad --- /dev/null +++ b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-30.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://blub5hsn6iqit" +path="res://.godot/imported/线索笔记内容-30.png-74e04710cf5e7e59f2b1dc2475b441a9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-30.png" +dest_files=["res://.godot/imported/线索笔记内容-30.png-74e04710cf5e7e59f2b1dc2475b441a9.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/ui/prop_and_bag/线索笔记内容/线索笔记内容-31.png b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-31.png new file mode 100644 index 00000000..f229d8cb Binary files /dev/null and b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-31.png differ diff --git a/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-31.png.import b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-31.png.import new file mode 100644 index 00000000..bf57476c --- /dev/null +++ b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-31.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://beltvxcu7pumi" +path="res://.godot/imported/线索笔记内容-31.png-c1b46d1bdf1c06dec7883c73002e812a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-31.png" +dest_files=["res://.godot/imported/线索笔记内容-31.png-c1b46d1bdf1c06dec7883c73002e812a.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/ui/prop_and_bag/线索笔记内容/线索笔记内容-32.png b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-32.png new file mode 100644 index 00000000..f340c9d9 Binary files /dev/null and b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-32.png differ diff --git a/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-32.png.import b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-32.png.import new file mode 100644 index 00000000..1bc2d688 --- /dev/null +++ b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-32.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://db1k1t1lc34ut" +path="res://.godot/imported/线索笔记内容-32.png-90bd9eaa335210cd65e0ad4ab01a6d77.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-32.png" +dest_files=["res://.godot/imported/线索笔记内容-32.png-90bd9eaa335210cd65e0ad4ab01a6d77.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/ui/prop_and_bag/线索笔记内容/线索笔记内容-34.png b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-34.png new file mode 100644 index 00000000..ece2f668 Binary files /dev/null and b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-34.png differ diff --git a/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-34.png.import b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-34.png.import new file mode 100644 index 00000000..61095b28 --- /dev/null +++ b/asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-34.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ldh387gluo1t" +path="res://.godot/imported/线索笔记内容-34.png-04a726a3a1a0051f7a21104308cf2fcd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/线索笔记内容/线索笔记内容-34.png" +dest_files=["res://.godot/imported/线索笔记内容-34.png-04a726a3a1a0051f7a21104308cf2fcd.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/ui/prop_and_bag/重要物品/UI显示相关-25.png b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-25.png new file mode 100644 index 00000000..080b7cec Binary files /dev/null and b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-25.png differ diff --git a/asset/art/ui/prop_and_bag/重要物品/UI显示相关-25.png.import b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-25.png.import new file mode 100644 index 00000000..b3491021 --- /dev/null +++ b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-25.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8gdny0iewwl2" +path="res://.godot/imported/UI显示相关-25.png-0ec1750b98ccd8275203986cc2d3256e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/重要物品/UI显示相关-25.png" +dest_files=["res://.godot/imported/UI显示相关-25.png-0ec1750b98ccd8275203986cc2d3256e.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/ui/prop_and_bag/重要物品/UI显示相关-26.png.import b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-26.png.import new file mode 100644 index 00000000..528b3137 --- /dev/null +++ b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-26.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d11ljcou6mnhj" +path="res://.godot/imported/UI显示相关-26.png-bcc92c79f06762a2003be721672da3ea.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/重要物品/UI显示相关-26.png" +dest_files=["res://.godot/imported/UI显示相关-26.png-bcc92c79f06762a2003be721672da3ea.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/ui/prop_and_bag/重要物品/UI显示相关-27.png.import b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-27.png.import new file mode 100644 index 00000000..364a5f3d --- /dev/null +++ b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-27.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dqepyp4248e38" +path="res://.godot/imported/UI显示相关-27.png-d3721a15a619ca69729ac58200e4c4af.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/重要物品/UI显示相关-27.png" +dest_files=["res://.godot/imported/UI显示相关-27.png-d3721a15a619ca69729ac58200e4c4af.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/ui/prop_and_bag/重要物品/UI显示相关-28.png b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-28.png new file mode 100644 index 00000000..955a6581 Binary files /dev/null and b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-28.png differ diff --git a/asset/art/ui/prop_and_bag/重要物品/UI显示相关-28.png.import b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-28.png.import new file mode 100644 index 00000000..84671d9f --- /dev/null +++ b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-28.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b10njg374yi6n" +path="res://.godot/imported/UI显示相关-28.png-acb9b415b30745e1597105427c9cba78.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/重要物品/UI显示相关-28.png" +dest_files=["res://.godot/imported/UI显示相关-28.png-acb9b415b30745e1597105427c9cba78.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/ui/互动提示符/ui 像素版_纯白.png.import b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-29.png.import similarity index 64% rename from asset/art/ui/互动提示符/ui 像素版_纯白.png.import rename to asset/art/ui/prop_and_bag/重要物品/UI显示相关-29.png.import index 4c7b9c4f..ba5544d8 100644 --- a/asset/art/ui/互动提示符/ui 像素版_纯白.png.import +++ b/asset/art/ui/prop_and_bag/重要物品/UI显示相关-29.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b343nvvbtpglb" -path="res://.godot/imported/ui 像素版_纯白.png-10bd05b436d05585c6b2c042bf4efe44.ctex" +uid="uid://0qrjkar4mwb2" +path="res://.godot/imported/UI显示相关-29.png-32ab066335997ec9fc38a4ae99d5c617.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/ui/互动提示符/ui 像素版_纯白.png" -dest_files=["res://.godot/imported/ui 像素版_纯白.png-10bd05b436d05585c6b2c042bf4efe44.ctex"] +source_file="res://asset/art/ui/prop_and_bag/重要物品/UI显示相关-29.png" +dest_files=["res://.godot/imported/UI显示相关-29.png-32ab066335997ec9fc38a4ae99d5c617.ctex"] [params] diff --git a/asset/art/ui/prop_and_bag/重要物品/重要物品ui-25.png b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-25.png new file mode 100644 index 00000000..cec54415 Binary files /dev/null and b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-25.png differ diff --git a/asset/art/ui/prop_and_bag/重要物品/重要物品ui-25.png.import b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-25.png.import new file mode 100644 index 00000000..1f5feb8c --- /dev/null +++ b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-25.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://1ky8heqxctnf" +path="res://.godot/imported/重要物品ui-25.png-407ffd8f3f56be214021fd258f380b89.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/重要物品/重要物品ui-25.png" +dest_files=["res://.godot/imported/重要物品ui-25.png-407ffd8f3f56be214021fd258f380b89.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/ui/prop_and_bag/重要物品/重要物品ui-26.png b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-26.png new file mode 100644 index 00000000..2ea1f61c Binary files /dev/null and b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-26.png differ diff --git a/asset/art/ui/prop_and_bag/重要物品/重要物品ui-26.png.import b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-26.png.import new file mode 100644 index 00000000..2ab0bdff --- /dev/null +++ b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-26.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8lmwf2at5g3u" +path="res://.godot/imported/重要物品ui-26.png-2fde379a811eae74a756263b14c24af0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/重要物品/重要物品ui-26.png" +dest_files=["res://.godot/imported/重要物品ui-26.png-2fde379a811eae74a756263b14c24af0.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/ui/prop_and_bag/重要物品/重要物品ui-27.png b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-27.png new file mode 100644 index 00000000..fc36547d Binary files /dev/null and b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-27.png differ diff --git a/asset/art/ui/prop_and_bag/重要物品/重要物品ui-27.png.import b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-27.png.import new file mode 100644 index 00000000..5750001f --- /dev/null +++ b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-27.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1l5royi6w0cm" +path="res://.godot/imported/重要物品ui-27.png-883293e09ea707222341de684f31a112.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/重要物品/重要物品ui-27.png" +dest_files=["res://.godot/imported/重要物品ui-27.png-883293e09ea707222341de684f31a112.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/ui/prop_and_bag/重要物品/重要物品ui-28.png b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-28.png new file mode 100644 index 00000000..61027b18 Binary files /dev/null and b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-28.png differ diff --git a/asset/art/ui/prop_and_bag/重要物品/重要物品ui-28.png.import b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-28.png.import new file mode 100644 index 00000000..fec0cd5f --- /dev/null +++ b/asset/art/ui/prop_and_bag/重要物品/重要物品ui-28.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bhjynxasn03jv" +path="res://.godot/imported/重要物品ui-28.png-4ca35ed6f768d32ef4f0f4da9e61b1c0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/prop_and_bag/重要物品/重要物品ui-28.png" +dest_files=["res://.godot/imported/重要物品ui-28.png-4ca35ed6f768d32ef4f0f4da9e61b1c0.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/ui/settings/设置菜单ui组件-22.png b/asset/art/ui/settings/设置菜单ui组件-22.png new file mode 100644 index 00000000..1e3747b1 Binary files /dev/null and b/asset/art/ui/settings/设置菜单ui组件-22.png differ diff --git a/asset/art/ui/settings/设置菜单ui组件-22.png.import b/asset/art/ui/settings/设置菜单ui组件-22.png.import new file mode 100644 index 00000000..aab5385c --- /dev/null +++ b/asset/art/ui/settings/设置菜单ui组件-22.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c5i5dawbfvhax" +path="res://.godot/imported/设置菜单ui组件-22.png-fcf4cc9684c7f470152cfd06155bfdc3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/settings/设置菜单ui组件-22.png" +dest_files=["res://.godot/imported/设置菜单ui组件-22.png-fcf4cc9684c7f470152cfd06155bfdc3.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/ui/settings/设置菜单ui组件-23.png b/asset/art/ui/settings/设置菜单ui组件-23.png new file mode 100644 index 00000000..50b361f0 Binary files /dev/null and b/asset/art/ui/settings/设置菜单ui组件-23.png differ diff --git a/asset/art/ui/settings/设置菜单ui组件-23.png.import b/asset/art/ui/settings/设置菜单ui组件-23.png.import new file mode 100644 index 00000000..e4cfdc7e --- /dev/null +++ b/asset/art/ui/settings/设置菜单ui组件-23.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bt0b2q54tibpk" +path="res://.godot/imported/设置菜单ui组件-23.png-ecf4ffbf8b7fa67b329782aa5f0f5953.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/settings/设置菜单ui组件-23.png" +dest_files=["res://.godot/imported/设置菜单ui组件-23.png-ecf4ffbf8b7fa67b329782aa5f0f5953.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/ui/settings/设置菜单ui组件-24.png b/asset/art/ui/settings/设置菜单ui组件-24.png new file mode 100644 index 00000000..3db3f714 Binary files /dev/null and b/asset/art/ui/settings/设置菜单ui组件-24.png differ diff --git a/asset/art/ui/settings/设置菜单ui组件-24.png.import b/asset/art/ui/settings/设置菜单ui组件-24.png.import new file mode 100644 index 00000000..a21f0d53 --- /dev/null +++ b/asset/art/ui/settings/设置菜单ui组件-24.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ctiun7d08wgwy" +path="res://.godot/imported/设置菜单ui组件-24.png-1f4cce16dc573fe1ce5ec23fb5d31699.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/settings/设置菜单ui组件-24.png" +dest_files=["res://.godot/imported/设置菜单ui组件-24.png-1f4cce16dc573fe1ce5ec23fb5d31699.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/ui/互动提示符/ui 像素版_纯白.png b/asset/art/ui/互动提示符/ui 像素版_纯白.png deleted file mode 100644 index 92c92ae5..00000000 Binary files a/asset/art/ui/互动提示符/ui 像素版_纯白.png and /dev/null differ diff --git a/asset/art/ui/对话框.aseprite b/asset/art/ui/对话框.aseprite deleted file mode 100644 index 5a7337cd..00000000 Binary files a/asset/art/ui/对话框.aseprite and /dev/null differ diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 2f554946..aa04905e 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -58,11 +58,11 @@ # texture 路径从 "res://asset/art/prop/" 之后算起 # c01 信碎片(一) [#texture=c01/信件左上.png] [ID:prop_信碎片1] -浦育院院长秦阳,民国21年,11月20日 [ID:prop_信碎片1_说明] +浦育院院长秦阳 [ID:prop_信碎片1_说明] 信碎片(二) [#texture=c01/信件右上.png] [ID:prop_信碎片2] -... [ID:prop_信碎片2_说明] +民国21年,11月20日 [ID:prop_信碎片2_说明] 银元 [#texture=c01/银元.png] [ID:prop_银元] -一枚“袁大头”银元,中華民國十年造。 [ID:prop_银元_说明] +一枚“袁大头”银元,中华民国十年造。 [ID:prop_银元_说明] # 重要物品 院长的信 [#texture=c01/院长的信物品.png][#inspect=c01/院长的信.png] [ID:prop_院长的信] @@ -211,7 +211,7 @@ 到处都是老鼠洞,怕不是整栋楼都被老鼠打通了。 [ID:c02_二楼老鼠洞] 又是这种小小尖尖的血脚印... [ID:c02_二楼血脚印] # c02 瞎子卧室 -刚才的那两个人...是幻觉吗 [ID:c02_离开红色演出] +刚才那些...到底是怎么回事? [ID:c02_离开红色演出] 「乾三连,坤六断;震仰盂,艮覆碗;离中虚,坎中满;兑上缺,巽下断」
咦,这口诀是谁教我的来着... [ID:c02_瞎子卧室_八卦图] 这画上的脚印和刚刚看到的一样。 [ID:c02_瞎子卧室_血脚印] 院长房间里也有一个类似的十字架。[ID:c02_瞎子卧室_十字架] diff --git a/scene/entity/inspectable.tscn b/scene/entity/inspectable.tscn index ef6bda1b..d43a61f8 100644 --- a/scene/entity/inspectable.tscn +++ b/scene/entity/inspectable.tscn @@ -6,9 +6,9 @@ [ext_resource type="Texture2D" uid="uid://bei1s1uucktso" path="res://asset/art/tool/neutral_point_light.webp" id="3_o562w"] [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_q18ff"] [ext_resource type="PackedScene" uid="uid://c4tipnj1cr1j3" path="res://scene/entity/ux/sign.tscn" id="4_do8tr"] -[ext_resource type="Texture2D" uid="uid://dwgxa5j6602vv" path="res://asset/art/ui/prop/inspect文本衬底蒙版.png" id="6_q18ff"] +[ext_resource type="Texture2D" uid="uid://dwgxa5j6602vv" path="res://asset/art/ui/prop_and_bag/inspect文本衬底蒙版.png" id="6_q18ff"] [ext_resource type="FontVariation" uid="uid://1ryw42kej6lv" path="res://config/font_ui.tres" id="7_ianbs"] -[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop/inspect背景遮罩.png" id="7_xawjo"] +[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop_and_bag/inspect背景遮罩.png" id="7_xawjo"] [ext_resource type="Script" uid="uid://cnt01hiw52bmn" path="res://scene/entity/ux/sign_snapper.gd" id="10_mtbvd"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_4fuic"] diff --git a/scene/gallery/gallery.tscn b/scene/gallery/gallery.tscn index 788202ef..4579ad30 100644 --- a/scene/gallery/gallery.tscn +++ b/scene/gallery/gallery.tscn @@ -6,7 +6,7 @@ [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_cntvv"] [ext_resource type="PackedScene" uid="uid://ckd26q67hm7j0" path="res://scene/gallery/clips/clip1_偷听.tscn" id="3_ymhcd"] [ext_resource type="Theme" uid="uid://ro8r1wa1bvua" path="res://config/gallery_item_theme.tres" id="4_bk3xr"] -[ext_resource type="Texture2D" uid="uid://dsj3l0baqg1g7" path="res://asset/art/ui/小蝶笔记.png" id="4_cntvv"] +[ext_resource type="Texture2D" uid="uid://dsj3l0baqg1g7" path="res://asset/art/ui/prop_and_bag/小蝶笔记.png" id="4_cntvv"] [ext_resource type="PackedScene" uid="uid://da4rposvvqo3d" path="res://scene/gallery/clips/clip2_疯子看井.tscn" id="7_cntvv"] [node name="Gallery" type="CanvasLayer"] diff --git a/scene/gallery/gallery_item.tscn b/scene/gallery/gallery_item.tscn index eb3f8bd3..c5592852 100644 --- a/scene/gallery/gallery_item.tscn +++ b/scene/gallery/gallery_item.tscn @@ -2,7 +2,7 @@ [ext_resource type="Theme" uid="uid://ro8r1wa1bvua" path="res://config/gallery_item_theme.tres" id="1_2f468"] [ext_resource type="Script" uid="uid://bk8ton7q8i6hb" path="res://scene/gallery/gallery_item.gd" id="1_2q576"] -[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop/特写通用遮罩.png" id="3_wb2ol"] +[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop_and_bag/特写通用遮罩.png" id="3_wb2ol"] [node name="GalleryItem" type="PanelContainer"] offset_right = 75.0 diff --git a/scene/ground/scene/c02/s10_空房间.tscn b/scene/ground/scene/c02/s10_空房间.tscn index 9a0d4357..7ce7cb28 100644 --- a/scene/ground/scene/c02/s10_空房间.tscn +++ b/scene/ground/scene/c02/s10_空房间.tscn @@ -13,7 +13,7 @@ [ext_resource type="Texture2D" uid="uid://cdsq0ylmgtfq0" path="res://asset/art/prop/c02/小蝉人偶.png" id="12_27dvh"] [ext_resource type="PackedScene" uid="uid://cxw5rovg5mu1a" path="res://scene/ground/script/c02/s00_煤油灯.tscn" id="13_27dvh"] [ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="14_3ftnp"] -[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop/inspect背景遮罩.png" id="14_e24j0"] +[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop_and_bag/inspect背景遮罩.png" id="14_e24j0"] [ext_resource type="SpriteFrames" uid="uid://cwes55ajc3rd4" path="res://asset/art/gif/c02_空房间/c02_空房间_frames.tres" id="15_2j5dr"] [ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="15_e24j0"] [ext_resource type="Texture2D" uid="uid://bp84w8keuelyj" path="res://asset/art/scene/c02/s10_空房间/e_蜡烛-sheet.png" id="15_kqj5r"] diff --git a/scene/ground/script/c02/s08_画特写.tscn b/scene/ground/script/c02/s08_画特写.tscn index e2c96512..78e2eb15 100644 --- a/scene/ground/script/c02/s08_画特写.tscn +++ b/scene/ground/script/c02/s08_画特写.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://dnrql1t0j6v8i" path="res://scene/ground/script/c02/通用特写脚本.gd" id="1_jgyts"] [ext_resource type="Texture2D" uid="uid://d1seskftkw08q" path="res://asset/art/scene/c02/s12_to_s17_盒子猫/ux_特写.png" id="2_jo6o1"] -[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop/特写通用遮罩.png" id="3_myoho"] +[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop_and_bag/特写通用遮罩.png" id="3_myoho"] [node name="s08_画特写" type="CanvasLayer"] script = ExtResource("1_jgyts") diff --git a/scene/ground/script/c02/刮海报_二楼内侧.tscn b/scene/ground/script/c02/刮海报_二楼内侧.tscn index 1151a839..9a619614 100644 --- a/scene/ground/script/c02/刮海报_二楼内侧.tscn +++ b/scene/ground/script/c02/刮海报_二楼内侧.tscn @@ -4,7 +4,7 @@ [ext_resource type="Texture2D" uid="uid://ca5tpfxmeh5q8" path="res://asset/art/scene/c02/s07_二楼内侧楼道/ux_二楼过道内侧.png" id="2_auxb7"] [ext_resource type="AudioStream" uid="uid://bomvnle4oh1ol" path="res://asset/audio/sfx/交互/第一章/sfx_折纸.wav" id="2_vl1ak"] [ext_resource type="PackedScene" uid="uid://bvnclp341hxoh" path="res://scene/entity/ux/刮刮乐.tscn" id="3_auxb7"] -[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop/特写通用遮罩.png" id="3_phw8g"] +[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop_and_bag/特写通用遮罩.png" id="3_phw8g"] [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_ro3vo"] [sub_resource type="Image" id="Image_vl1ak"] diff --git a/scene/ground/script/c02/刮海报_过道.tscn b/scene/ground/script/c02/刮海报_过道.tscn index 63960dec..0f8aee7f 100644 --- a/scene/ground/script/c02/刮海报_过道.tscn +++ b/scene/ground/script/c02/刮海报_过道.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://d31fc1bolhwlf" path="res://scene/ground/script/c02/刮海报.gd" id="1_qroub"] [ext_resource type="Texture2D" uid="uid://du1gfsc8mp0q0" path="res://asset/art/scene/c02/s02_大门过道/ux_过道面板.png" id="2_5kq43"] -[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop/特写通用遮罩.png" id="3_5kq43"] +[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop_and_bag/特写通用遮罩.png" id="3_5kq43"] [ext_resource type="PackedScene" uid="uid://bvnclp341hxoh" path="res://scene/entity/ux/刮刮乐.tscn" id="3_qwopf"] [ext_resource type="AudioStream" uid="uid://bomvnle4oh1ol" path="res://asset/audio/sfx/交互/第一章/sfx_折纸.wav" id="5_xjg44"] [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="6_cffxi"] diff --git a/scene/ground/script/c02/戏台特写.tscn b/scene/ground/script/c02/戏台特写.tscn index 5c615271..9169ab41 100644 --- a/scene/ground/script/c02/戏台特写.tscn +++ b/scene/ground/script/c02/戏台特写.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://baocsio2v7pme" path="res://scene/ground/script/c02/戏台特写.gd" id="1_eu5r2"] [ext_resource type="Texture2D" uid="uid://dhrl5mlivx108" path="res://asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具).png" id="3_timwg"] -[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop/特写通用遮罩.png" id="4_ujm2t"] +[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop_and_bag/特写通用遮罩.png" id="4_ujm2t"] [node name="戏台特写" type="CanvasLayer"] script = ExtResource("1_eu5r2") diff --git a/scene/ground/script/c02/折锡纸.tscn b/scene/ground/script/c02/折锡纸.tscn index 1759beb4..36cf2f5c 100644 --- a/scene/ground/script/c02/折锡纸.tscn +++ b/scene/ground/script/c02/折锡纸.tscn @@ -6,7 +6,7 @@ [ext_resource type="SpriteFrames" uid="uid://c2sjavnptjn" path="res://asset/art/gif/c02_保卫科/c02_保卫科_frames.tres" id="3_ckoix"] [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_ftr7c"] [ext_resource type="AudioStream" uid="uid://bomvnle4oh1ol" path="res://asset/audio/sfx/交互/第一章/sfx_折纸.wav" id="4_g2p6p"] -[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop/inspect背景遮罩.png" id="4_qu4ce"] +[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop_and_bag/inspect背景遮罩.png" id="4_qu4ce"] [ext_resource type="Texture2D" uid="uid://bygsskp1cr0y8" path="res://asset/art/scene/c02/s04_保卫科/锡纸.png" id="4_uslgh"] [ext_resource type="Texture2D" uid="uid://dcubpjb5qgfl2" path="res://asset/art/scene/c02/s04_保卫科/锡纸_hover.png" id="5_6lb1j"] [ext_resource type="BitMap" uid="uid://cfu2y1q2ercd" path="res://asset/art/scene/c02/s04_保卫科/锡纸_mask.png" id="5_uslgh"] diff --git a/scene/ground/script/c02/盒子猫canvas_layer.tscn b/scene/ground/script/c02/盒子猫canvas_layer.tscn index 286a1f23..e528e68e 100644 --- a/scene/ground/script/c02/盒子猫canvas_layer.tscn +++ b/scene/ground/script/c02/盒子猫canvas_layer.tscn @@ -8,7 +8,7 @@ [ext_resource type="AudioStream" uid="uid://7sjwgob6tsu4" path="res://asset/audio/sfx/交互/第一章/sfx_猫退出躲藏.wav" id="4_0rwiy"] [ext_resource type="Texture2D" uid="uid://tcjm158n8hnw" path="res://asset/art/scene/c02/s12_to_s17_盒子猫/小脚脚印.png" id="4_bc5tk"] [ext_resource type="Texture2D" uid="uid://ccfbubistf0ov" path="res://asset/art/scene/c02/s12_to_s17_盒子猫/ux_镂空_纸.png" id="5_l6g3a"] -[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop/特写通用遮罩.png" id="6_aeggu"] +[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop_and_bag/特写通用遮罩.png" id="6_aeggu"] [ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="6_qw0v6"] [ext_resource type="Texture2D" uid="uid://dx3i8mchgux1d" path="res://asset/art/scene/c02/s12_to_s17_盒子猫/ux_纸张.png" id="6_rxlkc"] diff --git a/scene/ground/script/c02/老鼠精画像.tscn b/scene/ground/script/c02/老鼠精画像.tscn index 51a45046..b33bcf87 100644 --- a/scene/ground/script/c02/老鼠精画像.tscn +++ b/scene/ground/script/c02/老鼠精画像.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://dyk58stu5enia" path="res://scene/ground/script/c02/老鼠精画像.gd" id="1_l77sh"] [ext_resource type="Texture2D" uid="uid://d1xr7g5huv5or" path="res://asset/art/scene/c02/s04_保卫科/ux_老鼠画像特写.png" id="2_eyynm"] [ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="3_lpmq3"] -[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop/inspect背景遮罩.png" id="4_l77sh"] +[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop_and_bag/inspect背景遮罩.png" id="4_l77sh"] [node name="老鼠精画像" type="CanvasLayer"] script = ExtResource("1_l77sh") diff --git a/scene/ground/script/c02/花名册.tscn b/scene/ground/script/c02/花名册.tscn index 5bf6e670..55adca66 100644 --- a/scene/ground/script/c02/花名册.tscn +++ b/scene/ground/script/c02/花名册.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cmapmn0v70p4l" path="res://scene/ground/script/c02/花名册.gd" id="1_jin3n"] [ext_resource type="Texture2D" uid="uid://cypvxj1vsl5yk" path="res://asset/art/scene/c02/s04_保卫科/花名册/bg_花名册桌面.png" id="2_v047l"] [ext_resource type="Texture2D" uid="uid://sx3i3lkt2vfd" path="res://asset/art/scene/c02/s04_保卫科/花名册/花名册封皮.png" id="3_myeas"] -[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop/inspect背景遮罩.png" id="4_myeas"] +[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop_and_bag/inspect背景遮罩.png" id="4_myeas"] [node name="折锡纸" type="CanvasLayer"] script = ExtResource("1_jin3n") diff --git a/scene/little_game/八音盒/八音盒.tscn b/scene/little_game/八音盒/八音盒.tscn index 45e9c987..2d654946 100644 --- a/scene/little_game/八音盒/八音盒.tscn +++ b/scene/little_game/八音盒/八音盒.tscn @@ -34,7 +34,7 @@ [ext_resource type="Texture2D" uid="uid://c07o1l2hs2ex5" path="res://asset/art/little_game/八音盒/新小猫身体.png" id="31_wq2wm"] [ext_resource type="Texture2D" uid="uid://b2jnocfgfr3io" path="res://asset/art/little_game/八音盒/小蝉人偶.png" id="32_sg8mt"] [ext_resource type="SpriteFrames" uid="uid://cwes55ajc3rd4" path="res://asset/art/gif/c02_空房间/c02_空房间_frames.tres" id="34_tgpfj"] -[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop/inspect背景遮罩.png" id="35_wq2wm"] +[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop_and_bag/inspect背景遮罩.png" id="35_wq2wm"] [ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="36_sg8mt"] [sub_resource type="Animation" id="Animation_j1llk"] diff --git a/scene/prop/prop_bag.tscn b/scene/prop/prop_bag.tscn index 929d6d17..191e73d0 100644 --- a/scene/prop/prop_bag.tscn +++ b/scene/prop/prop_bag.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://cg7wdaw03bovq" path="res://scene/prop/prop_bag.gd" id="1_f3hpu"] [ext_resource type="Theme" uid="uid://ro8r1wa1bvua" path="res://config/gallery_item_theme.tres" id="1_rvhvk"] -[ext_resource type="Texture2D" uid="uid://dsj3l0baqg1g7" path="res://asset/art/ui/小蝶笔记.png" id="2_3s314"] +[ext_resource type="Texture2D" uid="uid://dsj3l0baqg1g7" path="res://asset/art/ui/prop_and_bag/小蝶笔记.png" id="2_3s314"] [ext_resource type="AudioStream" uid="uid://dyjifofhdx25w" path="res://asset/audio/sfx/交互/打开背包.wav" id="2_xo6jf"] [ext_resource type="PackedScene" uid="uid://wxd25ec3cqyy" path="res://scene/prop/prop_bag_button.tscn" id="3_wlvs1"] [ext_resource type="Texture2D" uid="uid://dl214l7im21sf" path="res://asset/art/prop/c01/院长的信.png" id="4_wlvs1"] diff --git a/scene/prop/prop_bag_button.tscn b/scene/prop/prop_bag_button.tscn index f8a1ecc7..1cc440d6 100644 --- a/scene/prop/prop_bag_button.tscn +++ b/scene/prop/prop_bag_button.tscn @@ -1,10 +1,6 @@ -[gd_scene load_steps=3 format=3 uid="uid://wxd25ec3cqyy"] +[gd_scene load_steps=2 format=3 uid="uid://wxd25ec3cqyy"] -[ext_resource type="Texture2D" uid="uid://b343nvvbtpglb" path="res://asset/art/ui/互动提示符/ui 像素版_纯白.png" id="1_cj3ky"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_rvhvk"] -atlas = ExtResource("1_cj3ky") -region = Rect2(732, 546, 45, 48) +[ext_resource type="Texture2D" uid="uid://1ky8heqxctnf" path="res://asset/art/ui/prop_and_bag/重要物品/重要物品ui-25.png" id="1_jf0g1"] [node name="Button" type="Button"] custom_minimum_size = Vector2(100, 15) @@ -13,6 +9,9 @@ theme_override_colors/icon_hover_color = Color(1, 1, 1, 0.913725) theme_override_colors/icon_pressed_color = Color(1, 1, 1, 1) theme_override_colors/icon_focus_color = Color(1, 1, 1, 0.819608) theme_override_colors/icon_normal_color = Color(1, 1, 1, 0.6) +theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_constants/icon_max_width = 8 text = "院长的信" -icon = SubResource("AtlasTexture_rvhvk") +icon = ExtResource("1_jf0g1") +flat = true +clip_text = true diff --git a/scene/prop/prop_inspector.tscn b/scene/prop/prop_inspector.tscn index e40543fd..facc5921 100644 --- a/scene/prop/prop_inspector.tscn +++ b/scene/prop/prop_inspector.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=3 uid="uid://cekhj65axie0p"] [ext_resource type="Script" uid="uid://1xdb7s1nigv8" path="res://scene/prop/prop_inspector.gd" id="1_2wpwe"] -[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop/inspect背景遮罩.png" id="2_j83lq"] +[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop_and_bag/inspect背景遮罩.png" id="2_j83lq"] [ext_resource type="Texture2D" uid="uid://cvgw2mxrlr6io" path="res://asset/art/scene/c02/旧版/s02_走道/ux_进门鼠疫海报yz.png" id="2_wr575"] -[ext_resource type="Texture2D" uid="uid://dwgxa5j6602vv" path="res://asset/art/ui/prop/inspect文本衬底蒙版.png" id="4_hehdd"] +[ext_resource type="Texture2D" uid="uid://dwgxa5j6602vv" path="res://asset/art/ui/prop_and_bag/inspect文本衬底蒙版.png" id="4_hehdd"] [ext_resource type="FontVariation" uid="uid://1ryw42kej6lv" path="res://config/font_ui.tres" id="4_opug5"] [node name="PropInspector" type="CanvasLayer"]