diff --git a/asset/art/prop/c01/令牌.png b/asset/art/prop/c01/令牌.png deleted file mode 100755 index db50ac53..00000000 Binary files a/asset/art/prop/c01/令牌.png and /dev/null differ diff --git a/asset/art/prop/c01/令牌物品.png b/asset/art/prop/c01/令牌物品.png deleted file mode 100755 index 16c37b9b..00000000 Binary files a/asset/art/prop/c01/令牌物品.png and /dev/null differ diff --git a/asset/art/prop/c01/装有灵魂的令牌物品.png b/asset/art/prop/c01/装有灵魂的令牌物品.png deleted file mode 100755 index 9dc47a8f..00000000 Binary files a/asset/art/prop/c01/装有灵魂的令牌物品.png and /dev/null differ diff --git a/asset/art/prop/c01/装有灵魂的令牌物品.png.import b/asset/art/prop/c01/装有灵魂的令牌物品.png.import deleted file mode 100644 index 54e14c56..00000000 --- a/asset/art/prop/c01/装有灵魂的令牌物品.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ctfklddglknwl" -path="res://.godot/imported/装有灵魂的令牌物品.png-21ea833cc10a18293591d3b518868b7d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/prop/c01/装有灵魂的令牌物品.png" -dest_files=["res://.godot/imported/装有灵魂的令牌物品.png-21ea833cc10a18293591d3b518868b7d.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/prop/c01/装有灵魂的魂牌.png b/asset/art/prop/c01/装有灵魂的魂牌.png deleted file mode 100755 index 278f0e04..00000000 Binary files a/asset/art/prop/c01/装有灵魂的魂牌.png and /dev/null differ diff --git a/asset/art/prop/c02/1012钥匙.png b/asset/art/prop/c02/1012钥匙.png deleted file mode 100755 index 1d556734..00000000 Binary files a/asset/art/prop/c02/1012钥匙.png and /dev/null differ diff --git a/asset/art/prop/c02/1012钥匙物品.png b/asset/art/prop/c02/1012钥匙物品.png deleted file mode 100755 index a6e324cc..00000000 Binary files a/asset/art/prop/c02/1012钥匙物品.png and /dev/null differ diff --git a/asset/art/prop/c02/1014钥匙.png b/asset/art/prop/c02/1014钥匙.png deleted file mode 100755 index c59dda00..00000000 Binary files a/asset/art/prop/c02/1014钥匙.png and /dev/null differ diff --git a/asset/art/prop/c02/1014钥匙物品.png b/asset/art/prop/c02/1014钥匙物品.png deleted file mode 100755 index 931e3bc0..00000000 Binary files a/asset/art/prop/c02/1014钥匙物品.png and /dev/null differ diff --git a/asset/art/prop/c02/1014钥匙物品.png.import b/asset/art/prop/c02/1014钥匙物品.png.import deleted file mode 100644 index 7af304f2..00000000 --- a/asset/art/prop/c02/1014钥匙物品.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bn1nimj0u5ex4" -path="res://.godot/imported/1014钥匙物品.png-5dd4a2ee584b9e7faacb6e0a0b04d700.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/prop/c02/1014钥匙物品.png" -dest_files=["res://.godot/imported/1014钥匙物品.png-5dd4a2ee584b9e7faacb6e0a0b04d700.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/prop/c02/3014旋转锁钥匙.png b/asset/art/prop/c02/3014旋转锁钥匙.png deleted file mode 100755 index cf1ac3e8..00000000 Binary files a/asset/art/prop/c02/3014旋转锁钥匙.png and /dev/null differ diff --git a/asset/art/prop/c02/3014旋转锁钥匙.png.import b/asset/art/prop/c02/3014旋转锁钥匙.png.import deleted file mode 100644 index 6514613c..00000000 --- a/asset/art/prop/c02/3014旋转锁钥匙.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ctakv35evrunp" -path="res://.godot/imported/3014旋转锁钥匙.png-a142520136cb81a73321fa84d49504d3.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/prop/c02/3014旋转锁钥匙.png" -dest_files=["res://.godot/imported/3014旋转锁钥匙.png-a142520136cb81a73321fa84d49504d3.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/prop/c02/3014旋转锁钥匙物品.png b/asset/art/prop/c02/3014旋转锁钥匙物品.png deleted file mode 100755 index 87787488..00000000 Binary files a/asset/art/prop/c02/3014旋转锁钥匙物品.png and /dev/null differ diff --git a/asset/art/prop/c02/3014旋转锁钥匙物品.png.import b/asset/art/prop/c02/3014旋转锁钥匙物品.png.import deleted file mode 100644 index cc6718be..00000000 --- a/asset/art/prop/c02/3014旋转锁钥匙物品.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dnu6dd4btalgl" -path="res://.godot/imported/3014旋转锁钥匙物品.png-a6cc40fbdeed0b3d86ec4a6a3927efd9.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/prop/c02/3014旋转锁钥匙物品.png" -dest_files=["res://.godot/imported/3014旋转锁钥匙物品.png-a6cc40fbdeed0b3d86ec4a6a3927efd9.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/prop/c02/一把香.png b/asset/art/prop/c02/一把香.png deleted file mode 100644 index cd8b9712..00000000 Binary files a/asset/art/prop/c02/一把香.png and /dev/null differ diff --git a/asset/art/prop/c02/绳子.png b/asset/art/prop/c02/绳子.png deleted file mode 100755 index cd76115c..00000000 Binary files a/asset/art/prop/c02/绳子.png and /dev/null differ diff --git a/asset/art/prop/c02/绳子物品.png b/asset/art/prop/c02/绳子物品.png deleted file mode 100755 index 4173d792..00000000 Binary files a/asset/art/prop/c02/绳子物品.png and /dev/null differ diff --git a/asset/art/prop/c02/绳子物品.png.import b/asset/art/prop/c02/绳子物品.png.import deleted file mode 100644 index 642823e9..00000000 --- a/asset/art/prop/c02/绳子物品.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://0uwun1mo726u" -path="res://.godot/imported/绳子物品.png-7aae0d57f0c8a098d2d11a480083ef6d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/prop/c02/绳子物品.png" -dest_files=["res://.godot/imported/绳子物品.png-7aae0d57f0c8a098d2d11a480083ef6d.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/prop/c03/ux_缠着符咒的剪刀.png b/asset/art/prop/c03/ux_缠着符咒的剪刀.png index 36d4fc51..b5e8a546 100644 Binary files a/asset/art/prop/c03/ux_缠着符咒的剪刀.png and b/asset/art/prop/c03/ux_缠着符咒的剪刀.png differ diff --git a/asset/art/prop/c03/一碗浆糊.png b/asset/art/prop/c03/一碗浆糊.png new file mode 100644 index 00000000..fb8337ae Binary files /dev/null and b/asset/art/prop/c03/一碗浆糊.png differ diff --git a/asset/art/prop/c03/一碗浆糊.png.import b/asset/art/prop/c03/一碗浆糊.png.import new file mode 100644 index 00000000..8e018b76 --- /dev/null +++ b/asset/art/prop/c03/一碗浆糊.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://yrhj5pnjaflv" +path="res://.godot/imported/一碗浆糊.png-881ca69536e4b3ca4a3705cf08691030.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/一碗浆糊.png" +dest_files=["res://.godot/imported/一碗浆糊.png-881ca69536e4b3ca4a3705cf08691030.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/prop/c03/下半部的舌头.png b/asset/art/prop/c03/下半部的舌头.png new file mode 100644 index 00000000..fc2acd19 Binary files /dev/null and b/asset/art/prop/c03/下半部的舌头.png differ diff --git a/asset/art/prop/c02/1012钥匙物品.png.import b/asset/art/prop/c03/下半部的舌头.png.import similarity index 65% rename from asset/art/prop/c02/1012钥匙物品.png.import rename to asset/art/prop/c03/下半部的舌头.png.import index 15171e0b..056b7604 100644 --- a/asset/art/prop/c02/1012钥匙物品.png.import +++ b/asset/art/prop/c03/下半部的舌头.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b6mchcvq5d6jf" -path="res://.godot/imported/1012钥匙物品.png-237569bb81c86082db0a93d21685ab45.ctex" +uid="uid://bf0mn057brfnl" +path="res://.godot/imported/下半部的舌头.png-21dd8e6fca88a1a69efbd5d6f385392e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/prop/c02/1012钥匙物品.png" -dest_files=["res://.godot/imported/1012钥匙物品.png-237569bb81c86082db0a93d21685ab45.ctex"] +source_file="res://asset/art/prop/c03/下半部的舌头.png" +dest_files=["res://.godot/imported/下半部的舌头.png-21dd8e6fca88a1a69efbd5d6f385392e.ctex"] [params] diff --git a/asset/art/prop/c03/刀把.png b/asset/art/prop/c03/刀把.png new file mode 100644 index 00000000..11a9e424 Binary files /dev/null and b/asset/art/prop/c03/刀把.png differ diff --git a/asset/art/prop/c02/绳子.png.import b/asset/art/prop/c03/刀把.png.import similarity index 68% rename from asset/art/prop/c02/绳子.png.import rename to asset/art/prop/c03/刀把.png.import index f745e06c..2f2ac9d1 100644 --- a/asset/art/prop/c02/绳子.png.import +++ b/asset/art/prop/c03/刀把.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://keeamp7q5kep" -path="res://.godot/imported/绳子.png-cfff339f3aaf7654a63fce7f87268a15.ctex" +uid="uid://dc35n7d84i1mn" +path="res://.godot/imported/刀把.png-375710a35a1ff2a67614f76e63b8d1b8.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/prop/c02/绳子.png" -dest_files=["res://.godot/imported/绳子.png-cfff339f3aaf7654a63fce7f87268a15.ctex"] +source_file="res://asset/art/prop/c03/刀把.png" +dest_files=["res://.godot/imported/刀把.png-375710a35a1ff2a67614f76e63b8d1b8.ctex"] [params] diff --git a/asset/art/prop/c03/剪下的辫子.png b/asset/art/prop/c03/剪下的辫子.png new file mode 100644 index 00000000..be078af4 Binary files /dev/null and b/asset/art/prop/c03/剪下的辫子.png differ diff --git a/asset/art/prop/c03/剪下的辫子.png.import b/asset/art/prop/c03/剪下的辫子.png.import new file mode 100644 index 00000000..579b0097 --- /dev/null +++ b/asset/art/prop/c03/剪下的辫子.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dyn2y3g7vf0j0" +path="res://.godot/imported/剪下的辫子.png-1ae6181871d6abe55505e4c9fcc02203.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/剪下的辫子.png" +dest_files=["res://.godot/imported/剪下的辫子.png-1ae6181871d6abe55505e4c9fcc02203.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/prop/c03/寻人启事.png b/asset/art/prop/c03/寻人启事.png new file mode 100644 index 00000000..3717e394 Binary files /dev/null and b/asset/art/prop/c03/寻人启事.png differ diff --git a/asset/art/prop/c01/令牌物品.png.import b/asset/art/prop/c03/寻人启事.png.import similarity index 67% rename from asset/art/prop/c01/令牌物品.png.import rename to asset/art/prop/c03/寻人启事.png.import index 2c4ebcd2..d56bee6a 100644 --- a/asset/art/prop/c01/令牌物品.png.import +++ b/asset/art/prop/c03/寻人启事.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b6x5bekiplb2v" -path="res://.godot/imported/令牌物品.png-52dab7f6287a0eb4af3010805d27e8fb.ctex" +uid="uid://b1f31j0ujnrka" +path="res://.godot/imported/寻人启事.png-d3db0293a76a0f5bb2ae569a41d8b2b8.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/prop/c01/令牌物品.png" -dest_files=["res://.godot/imported/令牌物品.png-52dab7f6287a0eb4af3010805d27e8fb.ctex"] +source_file="res://asset/art/prop/c03/寻人启事.png" +dest_files=["res://.godot/imported/寻人启事.png-d3db0293a76a0f5bb2ae569a41d8b2b8.ctex"] [params] diff --git a/asset/art/prop/c03/报纸.png b/asset/art/prop/c03/报纸.png new file mode 100644 index 00000000..a8a68cf9 Binary files /dev/null and b/asset/art/prop/c03/报纸.png differ diff --git a/asset/art/prop/c01/令牌.png.import b/asset/art/prop/c03/报纸.png.import similarity index 68% rename from asset/art/prop/c01/令牌.png.import rename to asset/art/prop/c03/报纸.png.import index bf68c43f..e76b4511 100644 --- a/asset/art/prop/c01/令牌.png.import +++ b/asset/art/prop/c03/报纸.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://beigm5cp20bff" -path="res://.godot/imported/令牌.png-2f91a051dd5dd8d5d824d349c4ef80d0.ctex" +uid="uid://dxfgy5t41jtmh" +path="res://.godot/imported/报纸.png-5e9a1438a0feea269ba821b6edebc9d5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/prop/c01/令牌.png" -dest_files=["res://.godot/imported/令牌.png-2f91a051dd5dd8d5d824d349c4ef80d0.ctex"] +source_file="res://asset/art/prop/c03/报纸.png" +dest_files=["res://.godot/imported/报纸.png-5e9a1438a0feea269ba821b6edebc9d5.ctex"] [params] diff --git a/asset/art/prop/c03/沾血的纸条.png b/asset/art/prop/c03/沾血的纸条.png new file mode 100644 index 00000000..d5916bed Binary files /dev/null and b/asset/art/prop/c03/沾血的纸条.png differ diff --git a/asset/art/prop/c03/沾血的纸条.png.import b/asset/art/prop/c03/沾血的纸条.png.import new file mode 100644 index 00000000..4c556831 --- /dev/null +++ b/asset/art/prop/c03/沾血的纸条.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dm3vbbxc4gxev" +path="res://.godot/imported/沾血的纸条.png-8b01f6f3dad8e09f446f214c308e5e57.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/沾血的纸条.png" +dest_files=["res://.godot/imported/沾血的纸条.png-8b01f6f3dad8e09f446f214c308e5e57.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/prop/c03/纸铜钱1.png b/asset/art/prop/c03/纸铜钱1.png new file mode 100644 index 00000000..ccd35762 Binary files /dev/null and b/asset/art/prop/c03/纸铜钱1.png differ diff --git a/asset/art/prop/c02/1014钥匙.png.import b/asset/art/prop/c03/纸铜钱1.png.import similarity index 67% rename from asset/art/prop/c02/1014钥匙.png.import rename to asset/art/prop/c03/纸铜钱1.png.import index 44cec609..1de9318e 100644 --- a/asset/art/prop/c02/1014钥匙.png.import +++ b/asset/art/prop/c03/纸铜钱1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dwq3n37f601j4" -path="res://.godot/imported/1014钥匙.png-6333986b260ca3fc0784691797a27e91.ctex" +uid="uid://g2jlyvf718h" +path="res://.godot/imported/纸铜钱1.png-c7521df3814ccf406cde97c390d0b60e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/prop/c02/1014钥匙.png" -dest_files=["res://.godot/imported/1014钥匙.png-6333986b260ca3fc0784691797a27e91.ctex"] +source_file="res://asset/art/prop/c03/纸铜钱1.png" +dest_files=["res://.godot/imported/纸铜钱1.png-c7521df3814ccf406cde97c390d0b60e.ctex"] [params] diff --git a/asset/art/prop/c03/纸铜钱2.png b/asset/art/prop/c03/纸铜钱2.png new file mode 100644 index 00000000..f28603bd Binary files /dev/null and b/asset/art/prop/c03/纸铜钱2.png differ diff --git a/asset/art/prop/c02/1012钥匙.png.import b/asset/art/prop/c03/纸铜钱2.png.import similarity index 67% rename from asset/art/prop/c02/1012钥匙.png.import rename to asset/art/prop/c03/纸铜钱2.png.import index bdf1428c..1bff7f0e 100644 --- a/asset/art/prop/c02/1012钥匙.png.import +++ b/asset/art/prop/c03/纸铜钱2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bckch35wlg1pb" -path="res://.godot/imported/1012钥匙.png-487ac5038bd79ae4640b6d005a78054f.ctex" +uid="uid://c6f3u7m7ikmou" +path="res://.godot/imported/纸铜钱2.png-dd134cc76f6ca1c6f2c3d6044b5249bc.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/prop/c02/1012钥匙.png" -dest_files=["res://.godot/imported/1012钥匙.png-487ac5038bd79ae4640b6d005a78054f.ctex"] +source_file="res://asset/art/prop/c03/纸铜钱2.png" +dest_files=["res://.godot/imported/纸铜钱2.png-dd134cc76f6ca1c6f2c3d6044b5249bc.ctex"] [params] diff --git a/asset/art/prop/c03/纸铜钱3.png b/asset/art/prop/c03/纸铜钱3.png new file mode 100644 index 00000000..232c1d72 Binary files /dev/null and b/asset/art/prop/c03/纸铜钱3.png differ diff --git a/asset/art/prop/c03/纸铜钱3.png.import b/asset/art/prop/c03/纸铜钱3.png.import new file mode 100644 index 00000000..d314e145 --- /dev/null +++ b/asset/art/prop/c03/纸铜钱3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dqj23l5c1u684" +path="res://.godot/imported/纸铜钱3.png-bba4cdd800f1a00ee33b5b89cc31500a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/纸铜钱3.png" +dest_files=["res://.godot/imported/纸铜钱3.png-bba4cdd800f1a00ee33b5b89cc31500a.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/prop/c03/缠着符咒的剪刀.png b/asset/art/prop/c03/缠着符咒的剪刀.png new file mode 100644 index 00000000..ee53c434 Binary files /dev/null and b/asset/art/prop/c03/缠着符咒的剪刀.png differ diff --git a/asset/art/prop/c01/装有灵魂的魂牌.png.import b/asset/art/prop/c03/缠着符咒的剪刀.png.import similarity index 65% rename from asset/art/prop/c01/装有灵魂的魂牌.png.import rename to asset/art/prop/c03/缠着符咒的剪刀.png.import index a9037391..10607721 100644 --- a/asset/art/prop/c01/装有灵魂的魂牌.png.import +++ b/asset/art/prop/c03/缠着符咒的剪刀.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dabd55jlbiu24" -path="res://.godot/imported/装有灵魂的魂牌.png-47c783da0a3cb216b55f5f123ac5444d.ctex" +uid="uid://b7ic8ih5ahiw2" +path="res://.godot/imported/缠着符咒的剪刀.png-53449b447b4e1b7f124e5beb03bb0252.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/prop/c01/装有灵魂的魂牌.png" -dest_files=["res://.godot/imported/装有灵魂的魂牌.png-47c783da0a3cb216b55f5f123ac5444d.ctex"] +source_file="res://asset/art/prop/c03/缠着符咒的剪刀.png" +dest_files=["res://.godot/imported/缠着符咒的剪刀.png-53449b447b4e1b7f124e5beb03bb0252.ctex"] [params] diff --git a/asset/art/prop/c03/胖子的钥匙.png b/asset/art/prop/c03/胖子的钥匙.png new file mode 100644 index 00000000..61e53839 Binary files /dev/null and b/asset/art/prop/c03/胖子的钥匙.png differ diff --git a/asset/art/prop/c03/胖子的钥匙.png.import b/asset/art/prop/c03/胖子的钥匙.png.import new file mode 100644 index 00000000..2495b0ba --- /dev/null +++ b/asset/art/prop/c03/胖子的钥匙.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bt2q4bbbai78d" +path="res://.godot/imported/胖子的钥匙.png-974cf9b1e4e5084436584fd02ffd2d9c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/胖子的钥匙.png" +dest_files=["res://.godot/imported/胖子的钥匙.png-974cf9b1e4e5084436584fd02ffd2d9c.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/prop/c03/药包.png b/asset/art/prop/c03/药包.png new file mode 100644 index 00000000..d322ddc1 Binary files /dev/null and b/asset/art/prop/c03/药包.png differ diff --git a/asset/art/prop/c02/一把香.png.import b/asset/art/prop/c03/药包.png.import similarity index 68% rename from asset/art/prop/c02/一把香.png.import rename to asset/art/prop/c03/药包.png.import index d9f8797a..f9153d8d 100644 --- a/asset/art/prop/c02/一把香.png.import +++ b/asset/art/prop/c03/药包.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b8v5cy6q23aad" -path="res://.godot/imported/一把香.png-bc70295f57ec30f629b9d37dc74634a5.ctex" +uid="uid://dp8junmvxwop1" +path="res://.godot/imported/药包.png-ed8b7ea4da1f705848cff6493d02b4a1.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/prop/c02/一把香.png" -dest_files=["res://.godot/imported/一把香.png-bc70295f57ec30f629b9d37dc74634a5.ctex"] +source_file="res://asset/art/prop/c03/药包.png" +dest_files=["res://.godot/imported/药包.png-ed8b7ea4da1f705848cff6493d02b4a1.ctex"] [params] diff --git a/asset/art/prop/c03/菜刀.png b/asset/art/prop/c03/菜刀.png new file mode 100644 index 00000000..662ed48f Binary files /dev/null and b/asset/art/prop/c03/菜刀.png differ diff --git a/asset/art/prop/c03/菜刀.png.import b/asset/art/prop/c03/菜刀.png.import new file mode 100644 index 00000000..a6da02f1 --- /dev/null +++ b/asset/art/prop/c03/菜刀.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b75cehywjrw4e" +path="res://.godot/imported/菜刀.png-a783980a10632ea991140edc84774d96.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/菜刀.png" +dest_files=["res://.godot/imported/菜刀.png-a783980a10632ea991140edc84774d96.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/prop/c03/邀请信.png b/asset/art/prop/c03/邀请信.png new file mode 100644 index 00000000..4de67628 Binary files /dev/null and b/asset/art/prop/c03/邀请信.png differ diff --git a/asset/art/prop/c03/邀请信.png.import b/asset/art/prop/c03/邀请信.png.import new file mode 100644 index 00000000..4cb5fc0a --- /dev/null +++ b/asset/art/prop/c03/邀请信.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cpyfed75akmns" +path="res://.godot/imported/邀请信.png-861cb98b747eb19cdf11bc787a697c22.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/邀请信.png" +dest_files=["res://.godot/imported/邀请信.png-861cb98b747eb19cdf11bc787a697c22.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/prop/c03/麻将2.png b/asset/art/prop/c03/麻将2.png new file mode 100644 index 00000000..6fee5ee8 Binary files /dev/null and b/asset/art/prop/c03/麻将2.png differ diff --git a/asset/art/prop/c03/麻将2.png.import b/asset/art/prop/c03/麻将2.png.import new file mode 100644 index 00000000..062a5cc5 --- /dev/null +++ b/asset/art/prop/c03/麻将2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://by4or3cbifoxd" +path="res://.godot/imported/麻将2.png-0bb66f73ddf0cb93a38caba6dde3db80.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/麻将2.png" +dest_files=["res://.godot/imported/麻将2.png-0bb66f73ddf0cb93a38caba6dde3db80.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index 34774cc4..18046780 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -87,16 +87,17 @@ prop_木头人偶,木头人偶,,,[#texture=c02/小蝉人偶.png],,Wooden Doll prop_木头人偶_说明,略显粗糙的木头玩偶,能依稀辨认出是个小女孩的模样,,,,,"A somewhat crude wooden doll, vaguely recognizable as a little girl" prop_粘鼠板,粘鼠板,,,[#texture=c02/粘鼠板特写.png],,Sticky Trap prop_粘鼠板_说明,自制的捕鼠工具,纸上面有黏黏的浆糊,,,,,Homemade mouse trap with sticky paste on paper -prop_一把香,一把香,,,[#texture=c02/一把香.png],,Bundle of Incense -prop_1015钥匙,1015钥匙,,,[#texture=c02/1012钥匙物品.png],, -prop_麻将2,麻将(二),,,[#texture=c02/麻将.png],, -prop_2014钥匙,2014钥匙,,,[#texture=c02/1012钥匙物品.png],,Key 2014 -prop_重要物品示例,重要物品示例,,,[#texture=c01/银元.png],,Important Item Example -prop_1012钥匙,1012钥匙,,,[#texture=c02/1012钥匙物品.png][#inspect=c02/1012钥匙.png],,Key 1012 -prop_绳子,绳子,,,[#texture=c02/绳子物品.png][#inspect=c02/绳子.png],,Rope -prop_3014旋转锁钥匙,3014旋转锁钥匙,,,[#texture=c02/3014旋转锁钥匙物品.png][#inspect=c02/3014旋转锁钥匙.png],,Key 3014 (Rotating Lock) -prop_令牌,令牌,,,[#texture=c01/令牌物品.png][#inspect=c01/令牌.png],,Token -prop_装有灵魂的令牌,装有灵魂的令牌,,,[#texture=c01/装有灵魂的令牌物品.png][#inspect=c01/装有灵魂的令牌.png],,Soul-Containing Token +prop_一把香,一把香,,,[#texture=c03/一把香.png],,Bundle of Incense +prop_麻将2,麻将(二),,,[#texture=c03/麻将2.png],, +prop_一碗浆糊,一碗浆糊,,,[#texture=c03/ux_一碗浆糊.png],, +prop_下半部的舌头,下半部的舌头,,,[#texture=c03/ux_下半部的舌头.png],, +prop_刀把,刀把,,,[#texture=c03/ux_刀把.png],, +prop_剪下的辫子,剪下的辫子,,,[#texture=c03/ux_剪下的辫子.png],, +prop_沾血的纸条,沾血的纸条,,,[#texture=c03/ux_沾血的纸条.png],, +prop_纸铜钱1,纸铜钱1,,,[#texture=c03/ux_纸铜钱1.png],, +prop_剪刀,剪刀,,,[#texture=c03/ux_缠着符咒的剪刀.png],, +prop_药包,药包,,,[#texture=c03/ux_药包.png],, +prop_菜刀,菜刀,,,[#texture=c03/ux_菜刀.png],, prop_院长的信,院长的信,,,[#texture=c01/院长的信物品.png][#inspect=c01/院长的信.png],,Director's Letter prop_院长的信_说明,小萍:{br}你现下境况如何?{br}你虽离开浦育院已久,但我始终没有忘记为你祈祷。{br}愿上帝保佑你走向真正光明的道路。我相信这也是当年你父亲将你托付给我时的殷切愿景。{br}你既已成人,无论你的父母出于何种理由选择与你分离,你都应当拥有知晓真相的权利,所以我将公寓地址附在了信后,除此之外,我亦知之甚少。{br}若有闲暇,欢迎你回浦育院看看。{br}院长童玉君{br}民国二十一年十月十五日{br}公寓地址 芦昌路26弄3号,,,,,"Xiao Ping:{br}How are you faring now?{br}Though you left Puyu Orphanage long ago, I have never forgotten to pray for you.{br}May God bless you to walk the path of true enlightenment. I believe this was also your father's earnest wish when he entrusted you to my care.{br}Now that you are grown, regardless of whatever reasons your parents had for separating from you, you deserve the right to know the truth. I have attached the apartment address to this letter, though I know little beyond this.{br}If you have time, you are welcome to visit Puyu Orphanage.{br}Director Tong Yujun{br}October 15th, Year 21 of the Republic{br}Apartment Address: No. 3, Lane 26, Luchang Road" prop_船票,船票,,,[#texture=c02/船票.png],,Boat Ticket diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 3b75533b..edfd2888 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -109,27 +109,25 @@ 粘鼠板 [#texture=c02/粘鼠板特写.png] [ID:prop_粘鼠板] 自制的捕鼠工具,纸上面有黏黏的浆糊[ID:prop_粘鼠板_说明] -# 未使用 -一把香 [#texture=c02/一把香.png] [ID:prop_一把香] - #c03 -1015钥匙 [#texture=c02/1012钥匙物品.png] [ID:prop_1015钥匙] -麻将(二) [#texture=c02/麻将.png] [ID:prop_麻将2] - - - -# 未适配 -2014钥匙 [#texture=c02/1012钥匙物品.png] [ID:prop_2014钥匙] - -# 无效 -重要物品示例 [#texture=c01/银元.png] [ID:prop_重要物品示例] +一把香 [#texture=c03/一把香.png] [#inspect=c03/一把香.png] [ID:prop_一把香] +麻将(二) [#texture=c03/麻将2.png] [#inspect=c03/ux_麻将2.png] [ID:prop_麻将2] +一碗浆糊 [#texture=c03/一碗浆糊.png] [#inspect=c03/ux_一碗浆糊.png] [ID:prop_一碗浆糊] +纸舌头 [#texture=c03/下半部的舌头.png][#inspect=c03/ux_下半部的舌头.png] [ID:prop_纸舌头] +刀把 [#texture=c03/刀把.png][#inspect=c03/ux_刀把.png] [ID:prop_刀把] +剪下的辫子 [#texture=c03/剪下的辫子.png][#inspect=c03/ux_剪下的辫子.png] [ID:prop_剪下的辫子] +沾血的纸条 [#texture=c03/沾血的纸条.png] [#inspect=c03/ux_沾血的纸条.png] [ID:prop_沾血的纸条] +纸铜钱1 [#texture=c03/纸铜钱1.png][#inspect=c03/ux_纸铜钱1.png] [ID:prop_纸铜钱1] +剪刀 [#texture=c03/缠着符咒的剪刀.png][#inspect=c03/ux_缠着符咒的剪刀.png] [ID:prop_剪刀] +药包 [#texture=c03/药包.png][#inspect=c03/ux_药包.png] [ID:prop_药包] +菜刀 [#texture=c03/菜刀.png][#inspect=c03/ux_菜刀.png] [ID:prop_菜刀] # 旧版 -1012钥匙 [#texture=c02/1012钥匙物品.png][#inspect=c02/1012钥匙.png] [ID:prop_1012钥匙] -绳子 [#texture=c02/绳子物品.png][#inspect=c02/绳子.png] [ID:prop_绳子] -3014旋转锁钥匙 [#texture=c02/3014旋转锁钥匙物品.png][#inspect=c02/3014旋转锁钥匙.png] [ID:prop_3014旋转锁钥匙] -令牌 [#texture=c01/令牌物品.png][#inspect=c01/令牌.png] [ID:prop_令牌] -装有灵魂的令牌 [#texture=c01/装有灵魂的令牌物品.png][#inspect=c01/装有灵魂的令牌.png] [ID:prop_装有灵魂的令牌] +#令牌 [#texture=c01/令牌物品.png][#inspect=c01/令牌.png] [ID:prop_令牌] +#装有灵魂的令牌 [#texture=c01/装有灵魂的令牌物品.png][#inspect=c01/装有灵魂的令牌.png] [ID:prop_装有灵魂的令牌] +#绳子 [#texture=c02/绳子物品.png][#inspect=c02/绳子.png] [ID:prop_绳子] +#1012钥匙 [#texture=c03/1012钥匙物品.png][#inspect=c03/1012钥匙.png] [ID:prop_1012钥匙] +#3014旋转锁钥匙 [#texture=c03/3014旋转锁钥匙物品.png][#inspect=c03/3014旋转锁钥匙.png] [ID:prop_3014旋转锁钥匙] => END diff --git a/manager/archive_manager/archive_manager.gd b/manager/archive_manager/archive_manager.gd index b2d08084..78b44fc7 100644 --- a/manager/archive_manager/archive_manager.gd +++ b/manager/archive_manager/archive_manager.gd @@ -36,7 +36,7 @@ func _ready() -> void: # 在 debug or editor 模式下,直接保证有 archive if GlobalConfig.DEBUG or Engine.is_editor_hint(): if archives.size() == 0: - create_and_use_new_archive() + create_and_use_new_archive(0) else: # debug 模式下默认使用 0 号存档 GlobalConfigManager.config.current_selected_archive_id = 0 diff --git a/scene/ground/script/c02/刮海报.gd b/scene/ground/script/c02/刮海报.gd index fff956b6..c9c87a72 100644 --- a/scene/ground/script/c02/刮海报.gd +++ b/scene/ground/script/c02/刮海报.gd @@ -9,9 +9,14 @@ signal shaven_fulfilled @onready var flyer = $"刮刮乐" @onready var sfx = $"Sfx撕海报" +var shaven = ArchiveManager.get_global_value(name) + func _ready() -> void: layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME + if shaven: + flyer.queue_free() + return flyer.shaven.connect(_on_shaven) SceneManager.pop_center_notification("ui_left_mouse_shave") if exit_on_shaven_fulfilled: @@ -27,6 +32,7 @@ func _on_shaven(progress: float): if progress >= required_ratio: exiting = true print("刮开 %s 以上!" % required_ratio) + ArchiveManager.set_global_entry(name, true) sfx.global_play() var tween = create_tween() tween.tween_property(flyer, "modulate:a", 0.0, 1.0) diff --git a/scene/ground/script/c03/s03_刮海报_理发店.tscn b/scene/ground/script/c03/s03_刮海报_理发店.tscn index 6bbcf6f4..604f8097 100644 --- a/scene/ground/script/c03/s03_刮海报_理发店.tscn +++ b/scene/ground/script/c03/s03_刮海报_理发店.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=3 uid="uid://dohvkxfdmcrw4"] +[gd_scene load_steps=21 format=3 uid="uid://dohvkxfdmcrw4"] [ext_resource type="Script" uid="uid://d31fc1bolhwlf" path="res://scene/ground/script/c02/刮海报.gd" id="1_pdoaa"] [ext_resource type="Script" uid="uid://bagqdqsd0b4fy" path="res://scene/ground/script/c03/鬼母子游戏.gd" id="2_86fqw"] @@ -15,8 +15,21 @@ [ext_resource type="Texture2D" uid="uid://cx3kcrqpjt55x" path="res://asset/art/scene/c03/s03_瞎子理发店/鬼母子神/3背.png" id="11_6jvn1"] [ext_resource type="Texture2D" uid="uid://fgafxxahidbk" path="res://asset/art/scene/c03/s03_瞎子理发店/鬼母子神/4背.png" id="12_s7g11"] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_682sk"] -size = Vector2(50, 120) +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_6jvn1"] +radius = 21.7 +height = 118.4 + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_s7g11"] +radius = 21.7 +height = 117.8 + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_3uuyc"] +radius = 21.7 +height = 115.7 + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_ikyli"] +radius = 21.7 +height = 91.8 [sub_resource type="Image" id="Image_6jvn1"] data = { @@ -84,7 +97,7 @@ freezing = true texture = ExtResource("9_mg2qe") [node name="CollisionShape2D" type="CollisionShape2D" parent="鬼母子游戏/kid1"] -shape = SubResource("RectangleShape2D_682sk") +shape = SubResource("CapsuleShape2D_6jvn1") [node name="kid2" parent="鬼母子游戏" instance=ExtResource("3_86fqw")] position = Vector2(212, 190) @@ -93,7 +106,7 @@ freezing = true texture = ExtResource("10_pilu4") [node name="CollisionShape2D" type="CollisionShape2D" parent="鬼母子游戏/kid2"] -shape = SubResource("RectangleShape2D_682sk") +shape = SubResource("CapsuleShape2D_s7g11") [node name="kid3" parent="鬼母子游戏" instance=ExtResource("3_86fqw")] position = Vector2(368, 193) @@ -102,7 +115,7 @@ freezing = true texture = ExtResource("11_6jvn1") [node name="CollisionShape2D" type="CollisionShape2D" parent="鬼母子游戏/kid3"] -shape = SubResource("RectangleShape2D_682sk") +shape = SubResource("CapsuleShape2D_3uuyc") [node name="kid4" parent="鬼母子游戏" instance=ExtResource("3_86fqw")] position = Vector2(437, 206) @@ -111,7 +124,7 @@ freezing = true texture = ExtResource("12_s7g11") [node name="CollisionShape2D" type="CollisionShape2D" parent="鬼母子游戏/kid4"] -shape = SubResource("RectangleShape2D_682sk") +shape = SubResource("CapsuleShape2D_ikyli") [node name="刮刮乐" parent="." instance=ExtResource("5_edyi3")] visible = false diff --git a/scene/ground/script/c03/鬼母子游戏.gd b/scene/ground/script/c03/鬼母子游戏.gd index a0fb731c..12d29089 100644 --- a/scene/ground/script/c03/鬼母子游戏.gd +++ b/scene/ground/script/c03/鬼母子游戏.gd @@ -9,22 +9,26 @@ var freezing := true: var _state_map = ["背", "右", "正", "左"] # 0背 1右 2正 3左 -var states = [0, 0, 0, 0]: +var states: Array = [0, 0, 0, 0]: set(val): if not val or len(val) != 4: val = [0, 0, 0, 0] states = val ArchiveManager.set_global_entry("c03_s03_hariti_states", states) -# 正 右 左 背 -var success_states: Array = [2, 2, 3, 0] +# 2正 1右 3左 0背 +var success_states: Array = [2, 1, 3, 0] func _ready() -> void: $"../刮刮乐".visible = true var shaven = ArchiveManager.get_global_value("c03_s03_flyer_shaven") states = ArchiveManager.get_global_value("c03_s03_hariti_states", []) - if shaven: + _setup_state() + if _check_success(): + get_node("../刮刮乐").queue_free() + freezing = true + elif shaven: _on_shaven_fulfilled() else: get_parent().shaven_fulfilled.connect(_on_shaven_fulfilled) @@ -33,7 +37,6 @@ func _ready() -> void: ) for i in range(1, 5): get_node("kid" + str(i)).picked.connect(_on_picked.bind(i)) - _setup_state() func _on_shaven_fulfilled(): @@ -54,7 +57,16 @@ func _on_picked(node, id): elif not freezing: $SfxSuccess.play() freezing = true - print("鬼母子神游戏成功!") + _on_game_success() + + +func _on_game_success(): + SceneManager.enable_prop_item_silently("prop_纸舌头") + SceneManager.enable_prop_item("prop_剪刀") + await SceneManager.get_inspector().quit_and_hidden + SceneManager.enable_prop_item("prop_纸舌头") + await SceneManager.get_inspector().quit_and_hidden + get_parent().exit.emit(true) func _setup_state(): @@ -70,6 +82,6 @@ func _check_success() -> bool: func _unhandled_input(event: InputEvent) -> void: - if event.is_action_pressed("cancel") or event.is_action_pressed("escape"): + if event.is_action_pressed("cancel"): get_viewport().set_input_as_handled() get_parent().exit.emit(_check_success()) diff --git a/scene/ux/prop_hud.gd b/scene/ux/prop_hud.gd index 09f378cc..4fb9a82c 100644 --- a/scene/ux/prop_hud.gd +++ b/scene/ux/prop_hud.gd @@ -499,7 +499,7 @@ func inspect_item(prop_key: String, display_obtained := true, as_important_item if inspect_path: var texture = load(inspect_path) as Texture2D inspector.pop_prop_inspection( - prop_key, texture, false, display_obtained, as_important_item + prop_key, texture, display_obtained, as_important_item ) else: var texture = cached_inventory_textures.get(prop_key) @@ -511,7 +511,7 @@ func inspect_item(prop_key: String, display_obtained := true, as_important_item printerr("prophud inspect_item invalid texture_path:", texture_path) return inspector.pop_prop_inspection( - prop_key, texture, true, display_obtained, as_important_item + prop_key, texture, display_obtained, as_important_item ) diff --git a/scene/ux/prop_hud.tscn b/scene/ux/prop_hud.tscn index 1297cf05..e80cf67e 100644 --- a/scene/ux/prop_hud.tscn +++ b/scene/ux/prop_hud.tscn @@ -8,8 +8,8 @@ [ext_resource type="Texture2D" uid="uid://c45k7ncg6xhpv" path="res://asset/art/ui/hud/pressed_left.png" id="3_fca7p"] [ext_resource type="AudioStream" uid="uid://c57eu0dnr821k" path="res://asset/audio/sfx/交互/sfx_检阅道具.wav" id="4_lom38"] [ext_resource type="Texture2D" uid="uid://c2jq2neda32ix" path="res://asset/art/ui/hud/Prop.png" id="5_6tt77"] -[ext_resource type="Texture2D" uid="uid://0uwun1mo726u" path="res://asset/art/prop/c02/绳子物品.png" id="6_0m706"] [ext_resource type="Texture2D" uid="uid://c0gjes4a8ou3b" path="res://asset/art/ui/hud/select_mark.png" id="7_53yeo"] +[ext_resource type="Texture2D" uid="uid://yvwjasroj4yr" path="res://asset/art/prop/c01/银元.png" id="9_hty3r"] [ext_resource type="Texture2D" uid="uid://c1ogeaa836kry" path="res://asset/art/ui/hud/normal_right.png" id="10_vkaik"] [ext_resource type="Script" uid="uid://cmpkidbjeue6p" path="res://scene/ux/test_hbox.gd" id="11_008sv"] [ext_resource type="Texture2D" uid="uid://d03la4d2swk0k" path="res://asset/art/ui/hud/pressed_right.png" id="11_a512b"] @@ -156,10 +156,10 @@ grow_vertical = 2 unique_name_in_owner = true light_mask = 16 layout_mode = 0 -offset_right = 146.0 -offset_bottom = 146.0 +offset_right = 180.0 +offset_bottom = 180.0 scale = Vector2(0.75, 0.75) -texture_normal = ExtResource("6_0m706") +texture_normal = ExtResource("9_hty3r") stretch_mode = 5 [node name="Tail" type="Control" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropScrollContainer/PropHBox"] @@ -197,7 +197,6 @@ layout_mode = 0 offset_right = 146.0 offset_bottom = 146.0 scale = Vector2(0.75, 0.75) -texture_normal = ExtResource("6_0m706") stretch_mode = 5 [node name="SelectMark" type="TextureRect" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropsBagScroll/PropsBag/PropContainer/Control"] diff --git a/scene/ux/prop_inspector.gd b/scene/ux/prop_inspector.gd index d211c94b..f29a5a4d 100644 --- a/scene/ux/prop_inspector.gd +++ b/scene/ux/prop_inspector.gd @@ -128,11 +128,7 @@ var balloon func pop_prop_inspection( - prop_key: String, - cover_texture: Texture2D, - use_default_bg: bool, - display_obtained: bool, - as_important_item: bool + prop_key: String, cover_texture: Texture2D, display_obtained: bool, as_important_item: bool ): if not cover_texture: push_error("PropInspector: cover_texture is not set") @@ -144,16 +140,12 @@ func pop_prop_inspection( status = STATUS_INSPECTING_PROP visible = true var tween = create_tween() - if use_default_bg: - prop_bg.visible = true - origin_texture.texture = cover_texture - full_texture.texture = null - tween.tween_property(origin_texture, "modulate:a", 1.0, 0.15) - tween.tween_property(prop_bg, "modulate:a", 1.0, 0.15) - else: - origin_texture.texture = null - full_texture.texture = cover_texture - tween.tween_property(full_texture, "modulate:a", 1.0, 0.15) + # 显示遮罩 + prop_bg.visible = true + tween.tween_property(prop_bg, "modulate:a", 1.0, 0.15) + origin_texture.texture = cover_texture + full_texture.texture = null + tween.parallel().tween_property(origin_texture, "modulate:a", 1.0, 0.15) content_label.text = "" tip_label.text = ""