diff --git a/asset/art/gif/c02_小手/frames.tres b/asset/art/gif/c02_小手/frames.tres index c73c8ed8..f27ebe5d 100644 --- a/asset/art/gif/c02_小手/frames.tres +++ b/asset/art/gif/c02_小手/frames.tres @@ -1,133 +1,141 @@ [gd_resource type="SpriteFrames" load_steps=84 format=3 uid="uid://b6nvwset1hwbv"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_show、/0.png" id="1_hvp15"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_show/0.png" id="1_6vtg8"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_show/0.png" id="1_it2fn"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_show/0.png" id="1_iyfnu"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/0.png" id="1_m7y8r"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_idle/0.png" id="1_v4n4n"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/0.png" id="1_vye64"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/0.png" id="1_yva86"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/1.png" id="2_405cl"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/1.png" id="2_m7y8r"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_show、/1.png" id="2_mi74d"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_idle/1.png" id="2_8j3gj"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_show/1.png" id="2_8yvfx"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/1.png" id="2_py3b2"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_show/1.png" id="2_qctyw"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_show/1.png" id="2_qurqp"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/2.png" id="3_0necx"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/2.png" id="3_405cl"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_show、/2.png" id="3_it2fn"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_show/2.png" id="3_vye64"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/2.png" id="3_wq7ej"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/3.png" id="4_0necx"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/3.png" id="4_1d45f"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/3.png" id="4_d07ii"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_show/3.png" id="4_py3b2"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_show、/3.png" id="4_qurqp"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/4.png" id="5_1d45f"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/4.png" id="5_nvg7e"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_show/4.png" id="5_wq7ej"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/4.png" id="5_yva86"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/5.png" id="6_1x7ap"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_show/5.png" id="6_d07ii"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/5.png" id="6_m7y8r"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/5.png" id="6_nvg7e"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/6.png" id="7_1x7ap"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/6.png" id="7_405cl"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/6.png" id="7_chbbt"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/7.png" id="8_0necx"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/7.png" id="8_chbbt"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/7.png" id="8_k20b1"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/8.png" id="9_k20b1"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/8.png" id="9_v5hd5"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/9.png" id="10_rqhwc"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/9.png" id="10_v5hd5"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/10.png" id="11_nmjfg"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/10.png" id="11_rqhwc"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/11.png" id="12_mmt6a"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/11.png" id="12_nmjfg"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_丢锡箔/12.png" id="13_8gsfy"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_show/2.png" id="15_oweld"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_show/3.png" id="16_kyunw"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_show/4.png" id="17_v4n4n"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_show/5.png" id="18_8j3gj"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_show/6.png" id="19_ndfcs"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_show/7.png" id="20_m45x4"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_show/8.png" id="21_go2dn"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/0.png" id="22_x3xqb"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_show/9.png" id="22_xiqwu"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_show/10.png" id="23_emris"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/1.png" id="23_l4o1c"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_show/11.png" id="24_wejkl"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/2.png" id="24_wrggh"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/3.png" id="25_a6sa3"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/4.png" id="26_1jnx8"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/5.png" id="27_4q82i"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/6.png" id="28_nbie2"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/7.png" id="29_e0o62"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡伯_hide/0.png" id="36_nbie2"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡伯_hide/1.png" id="37_e0o62"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡伯_hide/2.png" id="38_8uhr0"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡伯_hide/3.png" id="39_ab611"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡伯_hide/4.png" id="40_nbngb"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡伯_hide/5.png" id="41_67wbl"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_show/6.png" id="35_11vlt"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_弹珠_show/7.png" id="36_mc3mq"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_show/4.png" id="45_11vlt"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_show/5.png" id="46_mc3mq"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_idle/0.png" id="50_nwjv4"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_idle/1.png" id="51_6yug8"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_idle/2.png" id="52_hjmb2"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_idle/3.png" id="53_vg448"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_idle/4.png" id="54_ftt74"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_idle/5.png" id="55_6g8pg"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_show/0.png" id="56_8wl6b"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_show/1.png" id="57_rhstw"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_show/2.png" id="58_rggru"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_纸杯_show/3.png" id="59_0fj2q"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/2.png" id="59_11vlt"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/0.png" id="60_4i2m0"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/3.png" id="60_mc3mq"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/4.png" id="61_6vtg8"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/1.png" id="61_tfi3h"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/5.png" id="62_8yvfx"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/2.png" id="62_txuam"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/3.png" id="63_2md67"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/6.png" id="63_8wl6b"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/4.png" id="64_cycr5"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/7.png" id="64_rhstw"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/5.png" id="65_kh4rf"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/6.png" id="66_4wps5"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/7.png" id="67_oyp1k"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_idle/0.png" id="68_emymg"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_idle/1.png" id="69_k1jwp"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_idle/2.png" id="70_11vlt"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_idle/3.png" id="71_mc3mq"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_idle/4.png" id="72_6vtg8"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_idle/5.png" id="73_8yvfx"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_idle/6.png" id="74_8wl6b"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_idle/7.png" id="75_rhstw"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/0.png" id="76_11vlt"] [ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/1.png" id="77_mc3mq"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/0.png" id="84_8j3gj"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_hide/0.png" id="84_rggru"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_hide/1.png" id="85_0fj2q"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/1.png" id="85_ndfcs"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_hide/2.png" id="86_c7p0v"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/2.png" id="86_m45x4"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/3.png" id="87_go2dn"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_hide/3.png" id="87_vvqf7"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_hide/4.png" id="88_oweld"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/4.png" id="88_xiqwu"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/5.png" id="89_emris"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_hide/5.png" id="89_kyunw"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/6.png" id="90_wejkl"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/7.png" id="91_3i5ro"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/8.png" id="92_x16n6"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/9.png" id="93_p5nec"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/10.png" id="94_8f805"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/11.png" id="95_jk5lw"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/12.png" id="96_674cr"] [resource] animations = [{ "frames": [{ -"duration": 6.0, -"texture": ExtResource("1_m7y8r") +"duration": 10.8, +"texture": ExtResource("1_v4n4n") }, { -"duration": 6.0, -"texture": ExtResource("2_405cl") -}, { -"duration": 6.0, -"texture": ExtResource("3_0necx") -}, { -"duration": 6.0, -"texture": ExtResource("4_1d45f") -}, { -"duration": 6.0, -"texture": ExtResource("5_nvg7e") -}, { -"duration": 6.0, -"texture": ExtResource("6_1x7ap") -}, { -"duration": 6.0, -"texture": ExtResource("7_chbbt") -}, { -"duration": 6.0, -"texture": ExtResource("8_k20b1") -}, { -"duration": 6.0, -"texture": ExtResource("9_v5hd5") -}, { -"duration": 6.0, -"texture": ExtResource("10_rqhwc") -}, { -"duration": 6.0, -"texture": ExtResource("11_nmjfg") -}, { -"duration": 6.0, -"texture": ExtResource("12_mmt6a") -}, { -"duration": 6.0, -"texture": ExtResource("13_8gsfy") +"duration": 10.8, +"texture": ExtResource("2_8j3gj") }], "loop": true, -"name": &"小手_丢锡箔", +"name": &"小手_idle", +"speed": 30.0 +}, { +"frames": [{ +"duration": 6.0, +"texture": ExtResource("1_6vtg8") +}, { +"duration": 6.0, +"texture": ExtResource("2_8yvfx") +}, { +"duration": 6.0, +"texture": ExtResource("15_oweld") +}, { +"duration": 6.0, +"texture": ExtResource("16_kyunw") +}, { +"duration": 6.0, +"texture": ExtResource("17_v4n4n") +}, { +"duration": 6.0, +"texture": ExtResource("18_8j3gj") +}, { +"duration": 6.0, +"texture": ExtResource("19_ndfcs") +}, { +"duration": 6.0, +"texture": ExtResource("20_m45x4") +}, { +"duration": 6.0, +"texture": ExtResource("21_go2dn") +}, { +"duration": 6.0, +"texture": ExtResource("22_xiqwu") +}, { +"duration": 6.0, +"texture": ExtResource("23_emris") +}, { +"duration": 6.0, +"texture": ExtResource("24_wejkl") +}], +"loop": true, +"name": &"小手_show", "speed": 30.0 }, { "frames": [{ @@ -177,12 +185,6 @@ animations = [{ }, { "duration": 6.0, "texture": ExtResource("27_4q82i") -}, { -"duration": 6.0, -"texture": ExtResource("28_nbie2") -}, { -"duration": 6.0, -"texture": ExtResource("29_e0o62") }], "loop": true, "name": &"小手_弹珠_idle", @@ -206,6 +208,12 @@ animations = [{ }, { "duration": 6.0, "texture": ExtResource("6_d07ii") +}, { +"duration": 6.0, +"texture": ExtResource("35_11vlt") +}, { +"duration": 6.0, +"texture": ExtResource("36_mc3mq") }], "loop": true, "name": &"小手_弹珠_show", @@ -213,58 +221,6 @@ animations = [{ }, { "frames": [{ "duration": 6.0, -"texture": ExtResource("1_yva86") -}, { -"duration": 6.0, -"texture": ExtResource("2_m7y8r") -}, { -"duration": 6.0, -"texture": ExtResource("3_405cl") -}, { -"duration": 6.0, -"texture": ExtResource("4_0necx") -}, { -"duration": 6.0, -"texture": ExtResource("5_1d45f") -}, { -"duration": 6.0, -"texture": ExtResource("6_nvg7e") -}, { -"duration": 6.0, -"texture": ExtResource("7_1x7ap") -}, { -"duration": 6.0, -"texture": ExtResource("8_chbbt") -}, { -"duration": 6.0, -"texture": ExtResource("9_k20b1") -}, { -"duration": 6.0, -"texture": ExtResource("10_v5hd5") -}, { -"duration": 6.0, -"texture": ExtResource("11_rqhwc") -}, { -"duration": 6.0, -"texture": ExtResource("12_nmjfg") -}], -"loop": true, -"name": &"小手_空手讨东西_idle", -"speed": 30.0 -}, { -"frames": [{ -"duration": 10.8, -"texture": ExtResource("1_iyfnu") -}, { -"duration": 10.8, -"texture": ExtResource("2_qctyw") -}], -"loop": true, -"name": &"小手_空手讨东西_show", -"speed": 30.0 -}, { -"frames": [{ -"duration": 6.0, "texture": ExtResource("50_nwjv4") }, { "duration": 6.0, @@ -275,12 +231,6 @@ animations = [{ }, { "duration": 6.0, "texture": ExtResource("53_vg448") -}, { -"duration": 6.0, -"texture": ExtResource("54_ftt74") -}, { -"duration": 6.0, -"texture": ExtResource("55_6g8pg") }], "loop": true, "name": &"小手_纸杯_idle", @@ -288,19 +238,25 @@ animations = [{ }, { "frames": [{ "duration": 6.0, -"texture": ExtResource("1_hvp15") +"texture": ExtResource("56_8wl6b") }, { "duration": 6.0, -"texture": ExtResource("2_mi74d") +"texture": ExtResource("57_rhstw") }, { "duration": 6.0, -"texture": ExtResource("3_it2fn") +"texture": ExtResource("58_rggru") }, { "duration": 6.0, -"texture": ExtResource("4_qurqp") +"texture": ExtResource("59_0fj2q") +}, { +"duration": 6.0, +"texture": ExtResource("45_11vlt") +}, { +"duration": 6.0, +"texture": ExtResource("46_mc3mq") }], "loop": true, -"name": &"小手_纸杯_show、", +"name": &"小手_纸杯_show", "speed": 30.0 }, { "frames": [{ @@ -333,40 +289,40 @@ animations = [{ "speed": 30.0 }, { "frames": [{ -"duration": 6.0, +"duration": 10.5, "texture": ExtResource("68_emymg") }, { -"duration": 6.0, +"duration": 10.5, "texture": ExtResource("69_k1jwp") -}, { -"duration": 6.0, -"texture": ExtResource("70_11vlt") -}, { -"duration": 6.0, -"texture": ExtResource("71_mc3mq") -}, { -"duration": 6.0, -"texture": ExtResource("72_6vtg8") -}, { -"duration": 6.0, -"texture": ExtResource("73_8yvfx") -}, { -"duration": 6.0, -"texture": ExtResource("74_8wl6b") -}, { -"duration": 6.0, -"texture": ExtResource("75_rhstw") }], "loop": true, "name": &"小手_老虎钳_idle", "speed": 30.0 }, { "frames": [{ -"duration": 10.5, +"duration": 6.0, "texture": ExtResource("76_11vlt") }, { -"duration": 10.5, +"duration": 6.0, "texture": ExtResource("77_mc3mq") +}, { +"duration": 6.0, +"texture": ExtResource("59_11vlt") +}, { +"duration": 6.0, +"texture": ExtResource("60_mc3mq") +}, { +"duration": 6.0, +"texture": ExtResource("61_6vtg8") +}, { +"duration": 6.0, +"texture": ExtResource("62_8yvfx") +}, { +"duration": 6.0, +"texture": ExtResource("63_8wl6b") +}, { +"duration": 6.0, +"texture": ExtResource("64_rhstw") }], "loop": true, "name": &"小手_老虎钳_show", @@ -374,24 +330,68 @@ animations = [{ }, { "frames": [{ "duration": 6.0, -"texture": ExtResource("36_nbie2") +"texture": ExtResource("84_8j3gj") }, { "duration": 6.0, -"texture": ExtResource("37_e0o62") +"texture": ExtResource("85_ndfcs") }, { "duration": 6.0, -"texture": ExtResource("38_8uhr0") +"texture": ExtResource("86_m45x4") }, { "duration": 6.0, -"texture": ExtResource("39_ab611") +"texture": ExtResource("87_go2dn") }, { "duration": 6.0, -"texture": ExtResource("40_nbngb") +"texture": ExtResource("88_xiqwu") }, { "duration": 6.0, -"texture": ExtResource("41_67wbl") +"texture": ExtResource("89_emris") +}, { +"duration": 6.0, +"texture": ExtResource("90_wejkl") +}, { +"duration": 6.0, +"texture": ExtResource("91_3i5ro") +}, { +"duration": 6.0, +"texture": ExtResource("92_x16n6") +}, { +"duration": 6.0, +"texture": ExtResource("93_p5nec") +}, { +"duration": 6.0, +"texture": ExtResource("94_8f805") +}, { +"duration": 6.0, +"texture": ExtResource("95_jk5lw") +}, { +"duration": 6.0, +"texture": ExtResource("96_674cr") }], "loop": true, -"name": &"小手_锡伯_hide", +"name": &"小手_锡箔_drop", +"speed": 30.0 +}, { +"frames": [{ +"duration": 6.0, +"texture": ExtResource("84_rggru") +}, { +"duration": 6.0, +"texture": ExtResource("85_0fj2q") +}, { +"duration": 6.0, +"texture": ExtResource("86_c7p0v") +}, { +"duration": 6.0, +"texture": ExtResource("87_vvqf7") +}, { +"duration": 6.0, +"texture": ExtResource("88_oweld") +}, { +"duration": 6.0, +"texture": ExtResource("89_kyunw") +}], +"loop": true, +"name": &"小手_锡箔_hide", "speed": 30.0 }] diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_show.gif b/asset/art/gif/c02_小手/小手_idle.gif similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_show.gif rename to asset/art/gif/c02_小手/小手_idle.gif diff --git a/asset/art/gif/c02_小手/小手_idle.gif.import b/asset/art/gif/c02_小手/小手_idle.gif.import new file mode 100644 index 00000000..cf7cc0d0 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_idle.gif.import @@ -0,0 +1,14 @@ +[remap] + +importer="gif.animated.texture.plugin" +type="SpriteFrames" +uid="uid://byvoaepw1cw54" +path="res://.godot/imported/小手_idle.gif-704de960570a71ab841a3b7931310e35.tres" + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_idle.gif" +dest_files=["res://.godot/imported/小手_idle.gif-704de960570a71ab841a3b7931310e35.tres"] + +[params] + diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_show/0.png b/asset/art/gif/c02_小手/小手_idle/0.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_show/0.png rename to asset/art/gif/c02_小手/小手_idle/0.png diff --git a/asset/art/临时草稿/瞎子.png.import b/asset/art/gif/c02_小手/小手_idle/0.png.import similarity index 68% rename from asset/art/临时草稿/瞎子.png.import rename to asset/art/gif/c02_小手/小手_idle/0.png.import index b2d14349..83fec194 100644 --- a/asset/art/临时草稿/瞎子.png.import +++ b/asset/art/gif/c02_小手/小手_idle/0.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bhvo0srlvp8fy" -path="res://.godot/imported/瞎子.png-69e1854473c441a2f9209f023bdaa297.ctex" +uid="uid://bhgp2g8chocsq" +path="res://.godot/imported/0.png-7075c9ce39ce870ff1c8e160d5ea3df9.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/临时草稿/瞎子.png" -dest_files=["res://.godot/imported/瞎子.png-69e1854473c441a2f9209f023bdaa297.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_idle/0.png" +dest_files=["res://.godot/imported/0.png-7075c9ce39ce870ff1c8e160d5ea3df9.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_show/1.png b/asset/art/gif/c02_小手/小手_idle/1.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_show/1.png rename to asset/art/gif/c02_小手/小手_idle/1.png diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle/10.png.import b/asset/art/gif/c02_小手/小手_idle/1.png.import similarity index 70% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/10.png.import rename to asset/art/gif/c02_小手/小手_idle/1.png.import index 83f06795..e25a8da0 100644 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle/10.png.import +++ b/asset/art/gif/c02_小手/小手_idle/1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://chdw6ocqc87rh" -path="res://.godot/imported/10.png-f95ab49ed0dbb24aa6552261d8fe2db5.ctex" +uid="uid://dfn4cp6pguisc" +path="res://.godot/imported/1.png-7623bad36adf2f5bc6f064a3ad50f800.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/10.png" -dest_files=["res://.godot/imported/10.png-f95ab49ed0dbb24aa6552261d8fe2db5.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_idle/1.png" +dest_files=["res://.godot/imported/1.png-7623bad36adf2f5bc6f064a3ad50f800.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle.gif b/asset/art/gif/c02_小手/小手_show.gif similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle.gif rename to asset/art/gif/c02_小手/小手_show.gif diff --git a/asset/art/gif/c02_小手/小手_show.gif.import b/asset/art/gif/c02_小手/小手_show.gif.import new file mode 100644 index 00000000..e0826ac0 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_show.gif.import @@ -0,0 +1,14 @@ +[remap] + +importer="gif.animated.texture.plugin" +type="SpriteFrames" +uid="uid://b1grll5pvjo2y" +path="res://.godot/imported/小手_show.gif-1719c17ce4b9dfe7b59c3ac0d3b9c9e9.tres" + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_show.gif" +dest_files=["res://.godot/imported/小手_show.gif-1719c17ce4b9dfe7b59c3ac0d3b9c9e9.tres"] + +[params] + diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle/0.png b/asset/art/gif/c02_小手/小手_show/0.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/0.png rename to asset/art/gif/c02_小手/小手_show/0.png diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/3.png.import b/asset/art/gif/c02_小手/小手_show/0.png.import similarity index 68% rename from asset/art/gif/c02_小手/小手_老虎钳_idle/3.png.import rename to asset/art/gif/c02_小手/小手_show/0.png.import index cc50fa3b..1d10c273 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_idle/3.png.import +++ b/asset/art/gif/c02_小手/小手_show/0.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://4bu7ph2ep1cb" -path="res://.godot/imported/3.png-4a2da3bdf01c3606ccc21e3e9a28d6ef.ctex" +uid="uid://bsxqj8wgg63vt" +path="res://.godot/imported/0.png-2236ffbfdd653059f1c139d0fd9be3ef.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_老虎钳_idle/3.png" -dest_files=["res://.godot/imported/3.png-4a2da3bdf01c3606ccc21e3e9a28d6ef.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_show/0.png" +dest_files=["res://.godot/imported/0.png-2236ffbfdd653059f1c139d0fd9be3ef.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle/1.png b/asset/art/gif/c02_小手/小手_show/1.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/1.png rename to asset/art/gif/c02_小手/小手_show/1.png diff --git a/asset/art/临时草稿/小蝉.png.import b/asset/art/gif/c02_小手/小手_show/1.png.import similarity index 68% rename from asset/art/临时草稿/小蝉.png.import rename to asset/art/gif/c02_小手/小手_show/1.png.import index 8e548959..3153719a 100644 --- a/asset/art/临时草稿/小蝉.png.import +++ b/asset/art/gif/c02_小手/小手_show/1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c1s2072xus387" -path="res://.godot/imported/小蝉.png-7a82ea11e8fa9af3e8f9d629c02c7fea.ctex" +uid="uid://c5nh6rudlyxpd" +path="res://.godot/imported/1.png-73f2f3c392f357e3aa16cff398ad640d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/临时草稿/小蝉.png" -dest_files=["res://.godot/imported/小蝉.png-7a82ea11e8fa9af3e8f9d629c02c7fea.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_show/1.png" +dest_files=["res://.godot/imported/1.png-73f2f3c392f357e3aa16cff398ad640d.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle/10.png b/asset/art/gif/c02_小手/小手_show/10.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/10.png rename to asset/art/gif/c02_小手/小手_show/10.png diff --git a/asset/art/gif/c02_小手/小手_show/10.png.import b/asset/art/gif/c02_小手/小手_show/10.png.import new file mode 100644 index 00000000..08613ee4 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_show/10.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dh4yr7mecpi0b" +path="res://.godot/imported/10.png-ca671db43ad1e9e679a5b375d027d9b8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_show/10.png" +dest_files=["res://.godot/imported/10.png-ca671db43ad1e9e679a5b375d027d9b8.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/c02_小手/小手_空手讨东西_idle/11.png b/asset/art/gif/c02_小手/小手_show/11.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/11.png rename to asset/art/gif/c02_小手/小手_show/11.png diff --git a/asset/art/gif/c02_小手/小手_show/11.png.import b/asset/art/gif/c02_小手/小手_show/11.png.import new file mode 100644 index 00000000..9c1afbbd --- /dev/null +++ b/asset/art/gif/c02_小手/小手_show/11.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dmu885oc4xulq" +path="res://.godot/imported/11.png-e714f7397c83970dde4c996499450c5d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_show/11.png" +dest_files=["res://.godot/imported/11.png-e714f7397c83970dde4c996499450c5d.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/c02_小手/小手_空手讨东西_idle/2.png b/asset/art/gif/c02_小手/小手_show/2.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/2.png rename to asset/art/gif/c02_小手/小手_show/2.png diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/2.png.import b/asset/art/gif/c02_小手/小手_show/2.png.import similarity index 68% rename from asset/art/gif/c02_小手/小手_丢锡箔/2.png.import rename to asset/art/gif/c02_小手/小手_show/2.png.import index a7f56a57..cb07379a 100644 --- a/asset/art/gif/c02_小手/小手_丢锡箔/2.png.import +++ b/asset/art/gif/c02_小手/小手_show/2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://kqr6joip0vrk" -path="res://.godot/imported/2.png-003c72c79790d3cccbefaf8c61298bc5.ctex" +uid="uid://bxroq27cvsn0j" +path="res://.godot/imported/2.png-0547120fb14bca5ef7bf853f0b6d928f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/2.png" -dest_files=["res://.godot/imported/2.png-003c72c79790d3cccbefaf8c61298bc5.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_show/2.png" +dest_files=["res://.godot/imported/2.png-0547120fb14bca5ef7bf853f0b6d928f.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle/3.png b/asset/art/gif/c02_小手/小手_show/3.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/3.png rename to asset/art/gif/c02_小手/小手_show/3.png diff --git a/asset/art/gif/c02_小手/小手_show/3.png.import b/asset/art/gif/c02_小手/小手_show/3.png.import new file mode 100644 index 00000000..7cf55bdd --- /dev/null +++ b/asset/art/gif/c02_小手/小手_show/3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://clh0lf2rqhv2v" +path="res://.godot/imported/3.png-1b402934c167030c42aa71b69321c1ea.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_show/3.png" +dest_files=["res://.godot/imported/3.png-1b402934c167030c42aa71b69321c1ea.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/c02_小手/小手_空手讨东西_idle/4.png b/asset/art/gif/c02_小手/小手_show/4.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/4.png rename to asset/art/gif/c02_小手/小手_show/4.png diff --git a/asset/art/gif/c02_小手/小手_show/4.png.import b/asset/art/gif/c02_小手/小手_show/4.png.import new file mode 100644 index 00000000..63568b04 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_show/4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://n8w1i70ywklt" +path="res://.godot/imported/4.png-102e44f6b3764c62eedb3b0ea503216a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_show/4.png" +dest_files=["res://.godot/imported/4.png-102e44f6b3764c62eedb3b0ea503216a.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/c02_小手/小手_空手讨东西_idle/5.png b/asset/art/gif/c02_小手/小手_show/5.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/5.png rename to asset/art/gif/c02_小手/小手_show/5.png diff --git a/asset/art/gif/c02_小手/小手_show/5.png.import b/asset/art/gif/c02_小手/小手_show/5.png.import new file mode 100644 index 00000000..2b8d5e28 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_show/5.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://chsimyvkrtx01" +path="res://.godot/imported/5.png-008250dcc30c86ada20b169545ad0816.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_show/5.png" +dest_files=["res://.godot/imported/5.png-008250dcc30c86ada20b169545ad0816.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/c02_小手/小手_空手讨东西_idle/6.png b/asset/art/gif/c02_小手/小手_show/6.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/6.png rename to asset/art/gif/c02_小手/小手_show/6.png diff --git a/asset/art/gif/c02_小手/小手_show/6.png.import b/asset/art/gif/c02_小手/小手_show/6.png.import new file mode 100644 index 00000000..a8be51f2 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_show/6.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://08f8syao450t" +path="res://.godot/imported/6.png-775ee5052338d7de8a75f4c8082fec6a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_show/6.png" +dest_files=["res://.godot/imported/6.png-775ee5052338d7de8a75f4c8082fec6a.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/c02_小手/小手_空手讨东西_idle/7.png b/asset/art/gif/c02_小手/小手_show/7.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/7.png rename to asset/art/gif/c02_小手/小手_show/7.png diff --git a/asset/art/gif/c02_小手/小手_show/7.png.import b/asset/art/gif/c02_小手/小手_show/7.png.import new file mode 100644 index 00000000..357db5f7 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_show/7.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b4omya1mvro6w" +path="res://.godot/imported/7.png-e58b77727e10c24e13e91bf1120494b8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_show/7.png" +dest_files=["res://.godot/imported/7.png-e58b77727e10c24e13e91bf1120494b8.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/c02_小手/小手_空手讨东西_idle/8.png b/asset/art/gif/c02_小手/小手_show/8.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/8.png rename to asset/art/gif/c02_小手/小手_show/8.png diff --git a/asset/art/gif/c02_小手/小手_show/8.png.import b/asset/art/gif/c02_小手/小手_show/8.png.import new file mode 100644 index 00000000..3f88b9e3 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_show/8.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cofvv8kd53ygl" +path="res://.godot/imported/8.png-da12dbe0a4f93310ad52c41a8c33b378.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_show/8.png" +dest_files=["res://.godot/imported/8.png-da12dbe0a4f93310ad52c41a8c33b378.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/c02_小手/小手_空手讨东西_idle/9.png b/asset/art/gif/c02_小手/小手_show/9.png similarity index 100% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/9.png rename to asset/art/gif/c02_小手/小手_show/9.png diff --git a/asset/art/gif/c02_小手/小手_show/9.png.import b/asset/art/gif/c02_小手/小手_show/9.png.import new file mode 100644 index 00000000..d3dd414a --- /dev/null +++ b/asset/art/gif/c02_小手/小手_show/9.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bo8gon3gtclbu" +path="res://.godot/imported/9.png-ee7622edeb66f2a260c5548fecb9ecb2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_show/9.png" +dest_files=["res://.godot/imported/9.png-ee7622edeb66f2a260c5548fecb9ecb2.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/c02_小手/小手_丢锡箔.gif.import b/asset/art/gif/c02_小手/小手_丢锡箔.gif.import deleted file mode 100644 index 7352ca3a..00000000 --- a/asset/art/gif/c02_小手/小手_丢锡箔.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://dx381i3nwhuj" -path="res://.godot/imported/小手_丢锡箔.gif-39ce76c62e22154d87f589582a966c02.tres" - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔.gif" -dest_files=["res://.godot/imported/小手_丢锡箔.gif-39ce76c62e22154d87f589582a966c02.tres"] - -[params] - diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/8.png.import b/asset/art/gif/c02_小手/小手_丢锡箔/8.png.import deleted file mode 100644 index 15ef8f01..00000000 --- a/asset/art/gif/c02_小手/小手_丢锡箔/8.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://clboudye7fvph" -path="res://.godot/imported/8.png-3a209c725192c8d7ac878fde66958e7e.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/8.png" -dest_files=["res://.godot/imported/8.png-3a209c725192c8d7ac878fde66958e7e.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/c02_小手/小手_弹珠_hide.gif.import b/asset/art/gif/c02_小手/小手_弹珠_hide.gif.import index 0b6723b9..32ee57a9 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_hide.gif.import +++ b/asset/art/gif/c02_小手/小手_弹珠_hide.gif.import @@ -2,7 +2,7 @@ importer="gif.animated.texture.plugin" type="SpriteFrames" -uid="uid://yqsypoehav3b" +uid="uid://c0gkpkmp6d52d" path="res://.godot/imported/小手_弹珠_hide.gif-6b58b14a691d4b326e3a9144a48c521a.tres" [deps] diff --git a/asset/art/gif/c02_小手/小手_弹珠_hide/0.png.import b/asset/art/gif/c02_小手/小手_弹珠_hide/0.png.import index 4775efbf..9653c5a4 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_hide/0.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_hide/0.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://gxeo1l5e2rwi" +uid="uid://cvvjyi7h6h4ng" path="res://.godot/imported/0.png-5371e2f5f7aa1455fcae7419b111fc29.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_hide/1.png.import b/asset/art/gif/c02_小手/小手_弹珠_hide/1.png.import index 2154b59b..f8367f24 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_hide/1.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_hide/1.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bh31fj5wcw780" +uid="uid://cooclnmo8dn76" path="res://.godot/imported/1.png-f3f7c44888e2151ca425849fdbc0a1c2.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_hide/2.png.import b/asset/art/gif/c02_小手/小手_弹珠_hide/2.png.import index 94d0f81e..b44f7818 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_hide/2.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_hide/2.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dv4f55ph4bwpl" +uid="uid://lhmu3wvi48m4" path="res://.godot/imported/2.png-5a832827b459bb445a0c0cb9833aef68.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_hide/3.png.import b/asset/art/gif/c02_小手/小手_弹珠_hide/3.png.import index dc9b7b17..16c69c4f 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_hide/3.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_hide/3.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://r8ygr3g8vb3y" +uid="uid://bojwhnqvvge7q" path="res://.godot/imported/3.png-8a70e9999670ebf0a276472d260ba250.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_hide/4.png.import b/asset/art/gif/c02_小手/小手_弹珠_hide/4.png.import index efc06ff1..43d497cc 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_hide/4.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_hide/4.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cj7g05a3c4puy" +uid="uid://bmhambop0th5" path="res://.godot/imported/4.png-61570fda0dc309b98d4c23b8a74a762a.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_hide/5.png.import b/asset/art/gif/c02_小手/小手_弹珠_hide/5.png.import index 9a2247bc..c837ea8a 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_hide/5.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_hide/5.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cb6q6px6wjw6e" +uid="uid://cjpy0jeqnb51f" path="res://.godot/imported/5.png-3fee602798ae4e626114a4474233d544.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_hide/6.png.import b/asset/art/gif/c02_小手/小手_弹珠_hide/6.png.import index 7b4d7518..50d8fce5 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_hide/6.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_hide/6.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://wk14fvklldo1" +uid="uid://yiakyu1tfm1t" path="res://.godot/imported/6.png-2d59d7ec20345b71c3bc2d2d932af5be.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_hide/7.png.import b/asset/art/gif/c02_小手/小手_弹珠_hide/7.png.import index 3dde43ae..43769756 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_hide/7.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_hide/7.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://jgxfxasgh6vm" +uid="uid://bequen203kc1h" path="res://.godot/imported/7.png-56cf9de5e014964aa98f86723e4fa526.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle.gif b/asset/art/gif/c02_小手/小手_弹珠_idle.gif index 99319eb0..967f7704 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_idle.gif and b/asset/art/gif/c02_小手/小手_弹珠_idle.gif differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle.gif.import b/asset/art/gif/c02_小手/小手_弹珠_idle.gif.import index 35bd7b46..915f4087 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_idle.gif.import +++ b/asset/art/gif/c02_小手/小手_弹珠_idle.gif.import @@ -2,7 +2,7 @@ importer="gif.animated.texture.plugin" type="SpriteFrames" -uid="uid://bkknnvrpbi5yx" +uid="uid://b3hnkw1qf3amj" path="res://.godot/imported/小手_弹珠_idle.gif-b9151a09e4e5a8177f00057b048532d2.tres" [deps] diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/0.png b/asset/art/gif/c02_小手/小手_弹珠_idle/0.png index 81f72bf1..49fbc29e 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_idle/0.png and b/asset/art/gif/c02_小手/小手_弹珠_idle/0.png differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/0.png.import b/asset/art/gif/c02_小手/小手_弹珠_idle/0.png.import index 8840a89d..547f8de6 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_idle/0.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_idle/0.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://pkhao3cneub8" +uid="uid://hbrte1c6hnm7" path="res://.godot/imported/0.png-ea2759ac15aad7238732177d029ad531.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/1.png b/asset/art/gif/c02_小手/小手_弹珠_idle/1.png index 35395002..6f7ac6cb 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_idle/1.png and b/asset/art/gif/c02_小手/小手_弹珠_idle/1.png differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/1.png.import b/asset/art/gif/c02_小手/小手_弹珠_idle/1.png.import index 82a8b38b..e7ea9af0 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_idle/1.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_idle/1.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cwhi1c5oq760h" +uid="uid://jfw6iqgt0an0" path="res://.godot/imported/1.png-e34bdfb8ac5fa04929de60c0e686abcb.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/2.png b/asset/art/gif/c02_小手/小手_弹珠_idle/2.png index 2addf4eb..9dbbe63d 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_idle/2.png and b/asset/art/gif/c02_小手/小手_弹珠_idle/2.png differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/2.png.import b/asset/art/gif/c02_小手/小手_弹珠_idle/2.png.import index fff70789..f406db12 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_idle/2.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_idle/2.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://5ydmvuk3hea0" +uid="uid://bx882haqlu0no" path="res://.godot/imported/2.png-21885645dc7bc947f3d5bc67d84beec2.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/3.png b/asset/art/gif/c02_小手/小手_弹珠_idle/3.png index 004aae59..f7962d60 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_idle/3.png and b/asset/art/gif/c02_小手/小手_弹珠_idle/3.png differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/3.png.import b/asset/art/gif/c02_小手/小手_弹珠_idle/3.png.import index 91792b8f..e527d72b 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_idle/3.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_idle/3.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bupyyo8sp05sp" +uid="uid://b8khnb4t8dx7u" path="res://.godot/imported/3.png-3e908a993e54c850ece01051806f53d1.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/4.png b/asset/art/gif/c02_小手/小手_弹珠_idle/4.png index 8520d01d..9dbbe63d 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_idle/4.png and b/asset/art/gif/c02_小手/小手_弹珠_idle/4.png differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/4.png.import b/asset/art/gif/c02_小手/小手_弹珠_idle/4.png.import index 96455963..1899d7e2 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_idle/4.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_idle/4.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dngrjpxhyv70w" +uid="uid://bnts6ilbaft17" path="res://.godot/imported/4.png-ed2749d3158b817ed5555fe8975ad9b6.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/5.png b/asset/art/gif/c02_小手/小手_弹珠_idle/5.png index 86551efe..6f7ac6cb 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_idle/5.png and b/asset/art/gif/c02_小手/小手_弹珠_idle/5.png differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/5.png.import b/asset/art/gif/c02_小手/小手_弹珠_idle/5.png.import index 6398b8f6..61cdc0e2 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_idle/5.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_idle/5.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bau2ustx032qp" +uid="uid://clriqed0e1ngp" path="res://.godot/imported/5.png-0356687ed4b09b9c5191169fcf57d852.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_show.gif b/asset/art/gif/c02_小手/小手_弹珠_show.gif index 967f7704..99319eb0 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_show.gif and b/asset/art/gif/c02_小手/小手_弹珠_show.gif differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_show.gif.import b/asset/art/gif/c02_小手/小手_弹珠_show.gif.import index 0670d3f1..4ec32caf 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_show.gif.import +++ b/asset/art/gif/c02_小手/小手_弹珠_show.gif.import @@ -2,7 +2,7 @@ importer="gif.animated.texture.plugin" type="SpriteFrames" -uid="uid://bl5kku5b2qrx8" +uid="uid://cqhd1cb38ef28" path="res://.godot/imported/小手_弹珠_show.gif-40bee76ea0a6e02d546bfc6fd5712049.tres" [deps] diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/0.png b/asset/art/gif/c02_小手/小手_弹珠_show/0.png index 49fbc29e..81f72bf1 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_show/0.png and b/asset/art/gif/c02_小手/小手_弹珠_show/0.png differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/0.png.import b/asset/art/gif/c02_小手/小手_弹珠_show/0.png.import index 3ffabf1a..ae3ce2bc 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_show/0.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_show/0.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://tv8284i68jr7" +uid="uid://boscia1p7c07d" path="res://.godot/imported/0.png-32e134070bf01a27ae762f50d9090940.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/1.png b/asset/art/gif/c02_小手/小手_弹珠_show/1.png index 6f7ac6cb..35395002 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_show/1.png and b/asset/art/gif/c02_小手/小手_弹珠_show/1.png differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/1.png.import b/asset/art/gif/c02_小手/小手_弹珠_show/1.png.import index c903ac37..7d1350b0 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_show/1.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_show/1.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://gjvssjw6j34c" +uid="uid://ds5f21agtfxoi" path="res://.godot/imported/1.png-1ba4f4a862783618b646742a140ebff1.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/2.png b/asset/art/gif/c02_小手/小手_弹珠_show/2.png index 9dbbe63d..2addf4eb 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_show/2.png and b/asset/art/gif/c02_小手/小手_弹珠_show/2.png differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/2.png.import b/asset/art/gif/c02_小手/小手_弹珠_show/2.png.import index f5deea60..4ec9afcc 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_show/2.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_show/2.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dt2i37xh4qxrd" +uid="uid://cqebdpcixd32u" path="res://.godot/imported/2.png-60710cda837494abfaa863a552fcbbb6.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/3.png b/asset/art/gif/c02_小手/小手_弹珠_show/3.png index f7962d60..004aae59 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_show/3.png and b/asset/art/gif/c02_小手/小手_弹珠_show/3.png differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/3.png.import b/asset/art/gif/c02_小手/小手_弹珠_show/3.png.import index 4ac7d7bc..66ea3f8d 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_show/3.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_show/3.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://couj3sm3p41li" +uid="uid://8kiufjcrksfk" path="res://.godot/imported/3.png-401e5fb405c78571638953c04de7d971.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/4.png b/asset/art/gif/c02_小手/小手_弹珠_show/4.png index 9dbbe63d..8520d01d 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_show/4.png and b/asset/art/gif/c02_小手/小手_弹珠_show/4.png differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/4.png.import b/asset/art/gif/c02_小手/小手_弹珠_show/4.png.import index 635cca75..62356e91 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_show/4.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_show/4.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c5w0l45asicq3" +uid="uid://c4pu4amskjxbd" path="res://.godot/imported/4.png-38f549ac856f6431d0c9c3f724bff95b.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/5.png b/asset/art/gif/c02_小手/小手_弹珠_show/5.png index 6f7ac6cb..86551efe 100644 Binary files a/asset/art/gif/c02_小手/小手_弹珠_show/5.png and b/asset/art/gif/c02_小手/小手_弹珠_show/5.png differ diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/5.png.import b/asset/art/gif/c02_小手/小手_弹珠_show/5.png.import index 47edd942..6db986f4 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_show/5.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_show/5.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://vrx0h20oi7k4" +uid="uid://wxe1202hflal" path="res://.godot/imported/5.png-dac61a31e3d7e8d91a9e2da004894378.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/6.png b/asset/art/gif/c02_小手/小手_弹珠_show/6.png similarity index 100% rename from asset/art/gif/c02_小手/小手_弹珠_idle/6.png rename to asset/art/gif/c02_小手/小手_弹珠_show/6.png diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/6.png.import b/asset/art/gif/c02_小手/小手_弹珠_show/6.png.import similarity index 68% rename from asset/art/gif/c02_小手/小手_弹珠_idle/6.png.import rename to asset/art/gif/c02_小手/小手_弹珠_show/6.png.import index 3ed16790..ff064456 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_idle/6.png.import +++ b/asset/art/gif/c02_小手/小手_弹珠_show/6.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://3oq5g3lxt7fs" -path="res://.godot/imported/6.png-afe7751ec0d22d100f59a63d6d26ca20.ctex" +uid="uid://xl5fv8mm6gw" +path="res://.godot/imported/6.png-32e17adb60b0d629268b63c48a9f55e1.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_弹珠_idle/6.png" -dest_files=["res://.godot/imported/6.png-afe7751ec0d22d100f59a63d6d26ca20.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_弹珠_show/6.png" +dest_files=["res://.godot/imported/6.png-32e17adb60b0d629268b63c48a9f55e1.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/7.png b/asset/art/gif/c02_小手/小手_弹珠_show/7.png similarity index 100% rename from asset/art/gif/c02_小手/小手_弹珠_idle/7.png rename to asset/art/gif/c02_小手/小手_弹珠_show/7.png diff --git a/asset/art/gif/c02_小手/小手_弹珠_show/7.png.import b/asset/art/gif/c02_小手/小手_弹珠_show/7.png.import new file mode 100644 index 00000000..5705b06b --- /dev/null +++ b/asset/art/gif/c02_小手/小手_弹珠_show/7.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bkw8dm56oot5t" +path="res://.godot/imported/7.png-8749fb9b48785fe0bf4be3b43a22538f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_弹珠_show/7.png" +dest_files=["res://.godot/imported/7.png-8749fb9b48785fe0bf4be3b43a22538f.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/c02_小手/小手_空手讨东西_idle.gif.import b/asset/art/gif/c02_小手/小手_空手讨东西_idle.gif.import deleted file mode 100644 index 6cfc8afd..00000000 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://76d5h15a07n4" -path="res://.godot/imported/小手_空手讨东西_idle.gif-15c40a855d42cedb24bcf9788b76532b.tres" - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle.gif" -dest_files=["res://.godot/imported/小手_空手讨东西_idle.gif-15c40a855d42cedb24bcf9788b76532b.tres"] - -[params] - diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle/11.png.import b/asset/art/gif/c02_小手/小手_空手讨东西_idle/11.png.import deleted file mode 100644 index 2964256a..00000000 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle/11.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b2vg50jog7ou7" -path="res://.godot/imported/11.png-405baff489257476c6a093b8ba8aef1f.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/11.png" -dest_files=["res://.godot/imported/11.png-405baff489257476c6a093b8ba8aef1f.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/c02_小手/小手_空手讨东西_idle/6.png.import b/asset/art/gif/c02_小手/小手_空手讨东西_idle/6.png.import deleted file mode 100644 index 7d3889cc..00000000 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle/6.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://q4b0pv56mowx" -path="res://.godot/imported/6.png-cdfa8906b5d39c06a9b76ff7247321f0.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/6.png" -dest_files=["res://.godot/imported/6.png-cdfa8906b5d39c06a9b76ff7247321f0.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/c02_小手/小手_空手讨东西_idle/7.png.import b/asset/art/gif/c02_小手/小手_空手讨东西_idle/7.png.import deleted file mode 100644 index b38982ad..00000000 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle/7.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://s7gwofaau3ir" -path="res://.godot/imported/7.png-a69f7a59fd8bcb37751ee947811ddd40.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/7.png" -dest_files=["res://.godot/imported/7.png-a69f7a59fd8bcb37751ee947811ddd40.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/c02_小手/小手_空手讨东西_idle/8.png.import b/asset/art/gif/c02_小手/小手_空手讨东西_idle/8.png.import deleted file mode 100644 index f5d4a07b..00000000 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle/8.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b1q4upcbsqnxj" -path="res://.godot/imported/8.png-418c6db11481f4e633d8091aa00b9cd2.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/8.png" -dest_files=["res://.godot/imported/8.png-418c6db11481f4e633d8091aa00b9cd2.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/c02_小手/小手_空手讨东西_idle/9.png.import b/asset/art/gif/c02_小手/小手_空手讨东西_idle/9.png.import deleted file mode 100644 index 58aa4b68..00000000 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle/9.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cv5mka11kl57f" -path="res://.godot/imported/9.png-3e3852ce4db4adb9e3b7f87a7ace3b76.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/9.png" -dest_files=["res://.godot/imported/9.png-3e3852ce4db4adb9e3b7f87a7ace3b76.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/c02_小手/小手_空手讨东西_show.gif.import b/asset/art/gif/c02_小手/小手_空手讨东西_show.gif.import deleted file mode 100644 index 4b4d0227..00000000 --- a/asset/art/gif/c02_小手/小手_空手讨东西_show.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://bonhshlqkxgca" -path="res://.godot/imported/小手_空手讨东西_show.gif-6132534b0cfd2026cec5d7ef6b458dcf.tres" - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_show.gif" -dest_files=["res://.godot/imported/小手_空手讨东西_show.gif-6132534b0cfd2026cec5d7ef6b458dcf.tres"] - -[params] - diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle.gif b/asset/art/gif/c02_小手/小手_纸杯_idle.gif index 68b58b33..042ed849 100644 Binary files a/asset/art/gif/c02_小手/小手_纸杯_idle.gif and b/asset/art/gif/c02_小手/小手_纸杯_idle.gif differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle.gif.import b/asset/art/gif/c02_小手/小手_纸杯_idle.gif.import index bd5fb1fc..030d26d5 100644 --- a/asset/art/gif/c02_小手/小手_纸杯_idle.gif.import +++ b/asset/art/gif/c02_小手/小手_纸杯_idle.gif.import @@ -2,7 +2,7 @@ importer="gif.animated.texture.plugin" type="SpriteFrames" -uid="uid://cur2to60wyn6e" +uid="uid://l7apecl4g4sj" path="res://.godot/imported/小手_纸杯_idle.gif-94a47559656c0bc013d6dc1edbe06588.tres" [deps] diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle/0.png b/asset/art/gif/c02_小手/小手_纸杯_idle/0.png index 81f72bf1..42176415 100644 Binary files a/asset/art/gif/c02_小手/小手_纸杯_idle/0.png and b/asset/art/gif/c02_小手/小手_纸杯_idle/0.png differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle/0.png.import b/asset/art/gif/c02_小手/小手_纸杯_idle/0.png.import index 25c878c6..5bc9d541 100644 --- a/asset/art/gif/c02_小手/小手_纸杯_idle/0.png.import +++ b/asset/art/gif/c02_小手/小手_纸杯_idle/0.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c46516bif4psi" +uid="uid://bv0hqpnpqaevu" path="res://.godot/imported/0.png-7f0485782b06b989c44e72f2e51ba2fa.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle/1.png b/asset/art/gif/c02_小手/小手_纸杯_idle/1.png index 35395002..5f0e7dbe 100644 Binary files a/asset/art/gif/c02_小手/小手_纸杯_idle/1.png and b/asset/art/gif/c02_小手/小手_纸杯_idle/1.png differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle/1.png.import b/asset/art/gif/c02_小手/小手_纸杯_idle/1.png.import index 17aafe7b..555fa5fc 100644 --- a/asset/art/gif/c02_小手/小手_纸杯_idle/1.png.import +++ b/asset/art/gif/c02_小手/小手_纸杯_idle/1.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dr6imcedvlawo" +uid="uid://pnk023884ulg" path="res://.godot/imported/1.png-56164463156d442e3310ae402bc0f9c1.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle/2.png b/asset/art/gif/c02_小手/小手_纸杯_idle/2.png index 2addf4eb..d8b0d8d4 100644 Binary files a/asset/art/gif/c02_小手/小手_纸杯_idle/2.png and b/asset/art/gif/c02_小手/小手_纸杯_idle/2.png differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle/2.png.import b/asset/art/gif/c02_小手/小手_纸杯_idle/2.png.import index 6c23e4c6..1954749c 100644 --- a/asset/art/gif/c02_小手/小手_纸杯_idle/2.png.import +++ b/asset/art/gif/c02_小手/小手_纸杯_idle/2.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cje0ooxxpgwm4" +uid="uid://rssqa0pgxa5b" path="res://.godot/imported/2.png-7142e3916f15fdd08a9d07b5d166f80f.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle/3.png b/asset/art/gif/c02_小手/小手_纸杯_idle/3.png index f4fcfd9f..5f0e7dbe 100644 Binary files a/asset/art/gif/c02_小手/小手_纸杯_idle/3.png and b/asset/art/gif/c02_小手/小手_纸杯_idle/3.png differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle/3.png.import b/asset/art/gif/c02_小手/小手_纸杯_idle/3.png.import index 7f2ba72c..970c3a8b 100644 --- a/asset/art/gif/c02_小手/小手_纸杯_idle/3.png.import +++ b/asset/art/gif/c02_小手/小手_纸杯_idle/3.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://brhcr0pvlikrf" +uid="uid://cv5c25u45bi0h" path="res://.godot/imported/3.png-1b8a22b58390e2c5996a8555cd1fd9ce.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_纸杯_show.gif b/asset/art/gif/c02_小手/小手_纸杯_show.gif new file mode 100644 index 00000000..68b58b33 Binary files /dev/null and b/asset/art/gif/c02_小手/小手_纸杯_show.gif differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_show.gif.import b/asset/art/gif/c02_小手/小手_纸杯_show.gif.import new file mode 100644 index 00000000..1912bdfa --- /dev/null +++ b/asset/art/gif/c02_小手/小手_纸杯_show.gif.import @@ -0,0 +1,14 @@ +[remap] + +importer="gif.animated.texture.plugin" +type="SpriteFrames" +uid="uid://c2ylcekb0tmcd" +path="res://.godot/imported/小手_纸杯_show.gif-a6364a157e08a0a5fc3689a2a220bece.tres" + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_纸杯_show.gif" +dest_files=["res://.godot/imported/小手_纸杯_show.gif-a6364a157e08a0a5fc3689a2a220bece.tres"] + +[params] + diff --git a/asset/art/gif/c02_小手/小手_纸杯_show/0.png b/asset/art/gif/c02_小手/小手_纸杯_show/0.png new file mode 100644 index 00000000..81f72bf1 Binary files /dev/null and b/asset/art/gif/c02_小手/小手_纸杯_show/0.png differ diff --git a/asset/art/gif/c02_小手/小手_锡伯_hide/0.png.import b/asset/art/gif/c02_小手/小手_纸杯_show/0.png.import similarity index 68% rename from asset/art/gif/c02_小手/小手_锡伯_hide/0.png.import rename to asset/art/gif/c02_小手/小手_纸杯_show/0.png.import index 273cdbbb..71196b2a 100644 --- a/asset/art/gif/c02_小手/小手_锡伯_hide/0.png.import +++ b/asset/art/gif/c02_小手/小手_纸杯_show/0.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cekgir5ci3d1j" -path="res://.godot/imported/0.png-81b595d7bd40ef88a1e4b9725b2cab33.ctex" +uid="uid://b40dgwll4w3rb" +path="res://.godot/imported/0.png-7c248c921ef0785fd6e5757770e0ca27.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_锡伯_hide/0.png" -dest_files=["res://.godot/imported/0.png-81b595d7bd40ef88a1e4b9725b2cab33.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_纸杯_show/0.png" +dest_files=["res://.godot/imported/0.png-7c248c921ef0785fd6e5757770e0ca27.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_纸杯_show/1.png b/asset/art/gif/c02_小手/小手_纸杯_show/1.png new file mode 100644 index 00000000..35395002 Binary files /dev/null and b/asset/art/gif/c02_小手/小手_纸杯_show/1.png differ diff --git a/asset/art/gif/c02_小手/小手_锡伯_hide/1.png.import b/asset/art/gif/c02_小手/小手_纸杯_show/1.png.import similarity index 68% rename from asset/art/gif/c02_小手/小手_锡伯_hide/1.png.import rename to asset/art/gif/c02_小手/小手_纸杯_show/1.png.import index 527d0e7a..55a22c7e 100644 --- a/asset/art/gif/c02_小手/小手_锡伯_hide/1.png.import +++ b/asset/art/gif/c02_小手/小手_纸杯_show/1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://be1ajj5prjrog" -path="res://.godot/imported/1.png-b5735fed88bd56b463aba88f215409ed.ctex" +uid="uid://cwxf2pnqyggma" +path="res://.godot/imported/1.png-2687766130957db90132d964a33e5e6f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_锡伯_hide/1.png" -dest_files=["res://.godot/imported/1.png-b5735fed88bd56b463aba88f215409ed.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_纸杯_show/1.png" +dest_files=["res://.godot/imported/1.png-2687766130957db90132d964a33e5e6f.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_纸杯_show/2.png b/asset/art/gif/c02_小手/小手_纸杯_show/2.png new file mode 100644 index 00000000..2addf4eb Binary files /dev/null and b/asset/art/gif/c02_小手/小手_纸杯_show/2.png differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_show/2.png.import b/asset/art/gif/c02_小手/小手_纸杯_show/2.png.import new file mode 100644 index 00000000..d466e611 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_纸杯_show/2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dyyrepdth4qqa" +path="res://.godot/imported/2.png-c0492e05c506e8380135cfaef900d9ff.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_纸杯_show/2.png" +dest_files=["res://.godot/imported/2.png-c0492e05c506e8380135cfaef900d9ff.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/c02_小手/小手_纸杯_show/3.png b/asset/art/gif/c02_小手/小手_纸杯_show/3.png new file mode 100644 index 00000000..f4fcfd9f Binary files /dev/null and b/asset/art/gif/c02_小手/小手_纸杯_show/3.png differ diff --git a/asset/art/gif/c02_小手/小手_锡伯_hide/3.png.import b/asset/art/gif/c02_小手/小手_纸杯_show/3.png.import similarity index 68% rename from asset/art/gif/c02_小手/小手_锡伯_hide/3.png.import rename to asset/art/gif/c02_小手/小手_纸杯_show/3.png.import index 385839fa..4aa75194 100644 --- a/asset/art/gif/c02_小手/小手_锡伯_hide/3.png.import +++ b/asset/art/gif/c02_小手/小手_纸杯_show/3.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dwon16mn4ty2c" -path="res://.godot/imported/3.png-705cd4256af194e768b0803e303049f5.ctex" +uid="uid://dq8f2llbx3rc2" +path="res://.godot/imported/3.png-d3ba9149c9b06fe46a9f5199d3a4376c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_锡伯_hide/3.png" -dest_files=["res://.godot/imported/3.png-705cd4256af194e768b0803e303049f5.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_纸杯_show/3.png" +dest_files=["res://.godot/imported/3.png-d3ba9149c9b06fe46a9f5199d3a4376c.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle/4.png b/asset/art/gif/c02_小手/小手_纸杯_show/4.png similarity index 100% rename from asset/art/gif/c02_小手/小手_纸杯_idle/4.png rename to asset/art/gif/c02_小手/小手_纸杯_show/4.png diff --git a/asset/art/gif/c02_小手/小手_锡伯_hide/4.png.import b/asset/art/gif/c02_小手/小手_纸杯_show/4.png.import similarity index 68% rename from asset/art/gif/c02_小手/小手_锡伯_hide/4.png.import rename to asset/art/gif/c02_小手/小手_纸杯_show/4.png.import index 9752742d..134c6b55 100644 --- a/asset/art/gif/c02_小手/小手_锡伯_hide/4.png.import +++ b/asset/art/gif/c02_小手/小手_纸杯_show/4.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b46v3t1ppjyes" -path="res://.godot/imported/4.png-58d80cfcf2ad912e6c28b98a8a82237d.ctex" +uid="uid://cm74p78wv11vl" +path="res://.godot/imported/4.png-a0da1482e540a489a52a17f3935a5987.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_锡伯_hide/4.png" -dest_files=["res://.godot/imported/4.png-58d80cfcf2ad912e6c28b98a8a82237d.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_纸杯_show/4.png" +dest_files=["res://.godot/imported/4.png-a0da1482e540a489a52a17f3935a5987.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle/5.png b/asset/art/gif/c02_小手/小手_纸杯_show/5.png similarity index 100% rename from asset/art/gif/c02_小手/小手_纸杯_idle/5.png rename to asset/art/gif/c02_小手/小手_纸杯_show/5.png diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle/5.png.import b/asset/art/gif/c02_小手/小手_纸杯_show/5.png.import similarity index 68% rename from asset/art/gif/c02_小手/小手_纸杯_idle/5.png.import rename to asset/art/gif/c02_小手/小手_纸杯_show/5.png.import index 722a5d70..2c0e922b 100644 --- a/asset/art/gif/c02_小手/小手_纸杯_idle/5.png.import +++ b/asset/art/gif/c02_小手/小手_纸杯_show/5.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://n0imgkojvghd" -path="res://.godot/imported/5.png-9cdc0e1419f6fe4722bcf3cdbef4d9d1.ctex" +uid="uid://iig5cxtdixxm" +path="res://.godot/imported/5.png-b79a3230750add66578ea940a15f1787.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_纸杯_idle/5.png" -dest_files=["res://.godot/imported/5.png-9cdc0e1419f6fe4722bcf3cdbef4d9d1.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_纸杯_show/5.png" +dest_files=["res://.godot/imported/5.png-b79a3230750add66578ea940a15f1787.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_纸杯_show、.gif b/asset/art/gif/c02_小手/小手_纸杯_show、.gif deleted file mode 100644 index 042ed849..00000000 Binary files a/asset/art/gif/c02_小手/小手_纸杯_show、.gif and /dev/null differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_show、.gif.import b/asset/art/gif/c02_小手/小手_纸杯_show、.gif.import deleted file mode 100644 index ba82a7e9..00000000 --- a/asset/art/gif/c02_小手/小手_纸杯_show、.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://b6lxss4unndc2" -path="res://.godot/imported/小手_纸杯_show、.gif-80d204c780beb14b61f221d89a34f534.tres" - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_纸杯_show、.gif" -dest_files=["res://.godot/imported/小手_纸杯_show、.gif-80d204c780beb14b61f221d89a34f534.tres"] - -[params] - diff --git a/asset/art/gif/c02_小手/小手_纸杯_show、/0.png b/asset/art/gif/c02_小手/小手_纸杯_show、/0.png deleted file mode 100644 index 42176415..00000000 Binary files a/asset/art/gif/c02_小手/小手_纸杯_show、/0.png and /dev/null differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_show、/1.png b/asset/art/gif/c02_小手/小手_纸杯_show、/1.png deleted file mode 100644 index 5f0e7dbe..00000000 Binary files a/asset/art/gif/c02_小手/小手_纸杯_show、/1.png and /dev/null differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_show、/1.png.import b/asset/art/gif/c02_小手/小手_纸杯_show、/1.png.import deleted file mode 100644 index 6f4e2003..00000000 --- a/asset/art/gif/c02_小手/小手_纸杯_show、/1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c878xal3j60dg" -path="res://.godot/imported/1.png-1c037570c83ca2899c536670098aa6a4.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_纸杯_show、/1.png" -dest_files=["res://.godot/imported/1.png-1c037570c83ca2899c536670098aa6a4.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/c02_小手/小手_纸杯_show、/2.png b/asset/art/gif/c02_小手/小手_纸杯_show、/2.png deleted file mode 100644 index d8b0d8d4..00000000 Binary files a/asset/art/gif/c02_小手/小手_纸杯_show、/2.png and /dev/null differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_show、/3.png b/asset/art/gif/c02_小手/小手_纸杯_show、/3.png deleted file mode 100644 index 5f0e7dbe..00000000 Binary files a/asset/art/gif/c02_小手/小手_纸杯_show、/3.png and /dev/null differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_show、/3.png.import b/asset/art/gif/c02_小手/小手_纸杯_show、/3.png.import deleted file mode 100644 index 5912d556..00000000 --- a/asset/art/gif/c02_小手/小手_纸杯_show、/3.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://y6og8dr4w83m" -path="res://.godot/imported/3.png-2fe7ed1c225add8a5b0374e2f65368c7.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_纸杯_show、/3.png" -dest_files=["res://.godot/imported/3.png-2fe7ed1c225add8a5b0374e2f65368c7.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/c02_小手/小手_老虎钳_hide.gif.import b/asset/art/gif/c02_小手/小手_老虎钳_hide.gif.import index 377cebc6..c1803f03 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_hide.gif.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_hide.gif.import @@ -2,7 +2,7 @@ importer="gif.animated.texture.plugin" type="SpriteFrames" -uid="uid://5qt8rkuu5bcr" +uid="uid://dfhm0etguku7s" path="res://.godot/imported/小手_老虎钳_hide.gif-f8f6e0c667b098d5fd89e9e4a5178905.tres" [deps] diff --git a/asset/art/gif/c02_小手/小手_老虎钳_hide/0.png.import b/asset/art/gif/c02_小手/小手_老虎钳_hide/0.png.import index 888f15a6..cbf2dcad 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_hide/0.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_hide/0.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://wjkm3h78g61i" +uid="uid://cfe8bu6lfdfrb" path="res://.godot/imported/0.png-04fef777f3ffaaacd25f8260feac24e5.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_老虎钳_hide/1.png.import b/asset/art/gif/c02_小手/小手_老虎钳_hide/1.png.import index f69904c7..2c0a505d 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_hide/1.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_hide/1.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dna6v4ydm4ivq" +uid="uid://dyf500rtglsxl" path="res://.godot/imported/1.png-f22bb3106ff3c5b36b69c6ce5f70c90b.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_老虎钳_hide/2.png.import b/asset/art/gif/c02_小手/小手_老虎钳_hide/2.png.import index 5c1ab87a..57c2929d 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_hide/2.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_hide/2.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b3m4hsjha6tr4" +uid="uid://kgy18oyw2ach" path="res://.godot/imported/2.png-a9481ae7b8f216254d1180963e5d05f8.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_老虎钳_hide/3.png.import b/asset/art/gif/c02_小手/小手_老虎钳_hide/3.png.import index a92c00cc..f496f578 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_hide/3.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_hide/3.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://d14o8w75nfwjq" +uid="uid://cu85318jk4406" path="res://.godot/imported/3.png-8722e1e7104641039fffaf3eb67c1b57.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_老虎钳_hide/4.png.import b/asset/art/gif/c02_小手/小手_老虎钳_hide/4.png.import index 79a9d55b..ad8ccac1 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_hide/4.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_hide/4.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cb6qk6bjaf0co" +uid="uid://d4nln3dhs6nsr" path="res://.godot/imported/4.png-5791a9cf519a13b893f12b579c990ba6.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_老虎钳_hide/5.png.import b/asset/art/gif/c02_小手/小手_老虎钳_hide/5.png.import index 2b763b3b..238156a7 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_hide/5.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_hide/5.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dd25mshxcg5uw" +uid="uid://7mtlvnikj4u" path="res://.godot/imported/5.png-16e51a10cb073df50e4ca9557b85b976.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_老虎钳_hide/6.png.import b/asset/art/gif/c02_小手/小手_老虎钳_hide/6.png.import index 49b39ead..a2533d4a 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_hide/6.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_hide/6.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bveiknt5p6hi2" +uid="uid://dg3xlvngo4lms" path="res://.godot/imported/6.png-c4b0bba507aea48413ebb834235cafa5.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_老虎钳_hide/7.png.import b/asset/art/gif/c02_小手/小手_老虎钳_hide/7.png.import index 19c66f6d..c627f6d7 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_hide/7.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_hide/7.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c16qq13mekqqt" +uid="uid://4ynsh1c8gmko" path="res://.godot/imported/7.png-e2639ec2c007e732ff83433eace58c29.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle.gif b/asset/art/gif/c02_小手/小手_老虎钳_idle.gif index 71bf4c3c..859ac44d 100644 Binary files a/asset/art/gif/c02_小手/小手_老虎钳_idle.gif and b/asset/art/gif/c02_小手/小手_老虎钳_idle.gif differ diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle.gif.import b/asset/art/gif/c02_小手/小手_老虎钳_idle.gif.import index f933d9b3..c21b0f47 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_idle.gif.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_idle.gif.import @@ -2,7 +2,7 @@ importer="gif.animated.texture.plugin" type="SpriteFrames" -uid="uid://c6tlm7t5l1hiv" +uid="uid://degsbt3xv7m14" path="res://.godot/imported/小手_老虎钳_idle.gif-c02e6169db354f0eb1ccf1cf7c2475b7.tres" [deps] diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/0.png b/asset/art/gif/c02_小手/小手_老虎钳_idle/0.png index dda21e12..7f70a4c0 100644 Binary files a/asset/art/gif/c02_小手/小手_老虎钳_idle/0.png and b/asset/art/gif/c02_小手/小手_老虎钳_idle/0.png differ diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/0.png.import b/asset/art/gif/c02_小手/小手_老虎钳_idle/0.png.import index 5e3bf3cc..becbc194 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_idle/0.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_idle/0.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b22svrdb3jkaw" +uid="uid://ba1krqd8nyl1g" path="res://.godot/imported/0.png-4273496c36df2de74f8787389427aa4b.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/1.png b/asset/art/gif/c02_小手/小手_老虎钳_idle/1.png index cc571f1f..bd2c0e7e 100644 Binary files a/asset/art/gif/c02_小手/小手_老虎钳_idle/1.png and b/asset/art/gif/c02_小手/小手_老虎钳_idle/1.png differ diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/1.png.import b/asset/art/gif/c02_小手/小手_老虎钳_idle/1.png.import index d440e5e4..b5103f2a 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_idle/1.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_idle/1.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://0tpwuikblqo4" +uid="uid://ddiw7y48l54x3" path="res://.godot/imported/1.png-e4a6182ac8810f2b09abf5c5646aaa33.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/5.png.import b/asset/art/gif/c02_小手/小手_老虎钳_idle/5.png.import deleted file mode 100644 index 231bba8a..00000000 --- a/asset/art/gif/c02_小手/小手_老虎钳_idle/5.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bssusf3eph4nw" -path="res://.godot/imported/5.png-aa2483774d3120461d390c58d2d9b53e.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_老虎钳_idle/5.png" -dest_files=["res://.godot/imported/5.png-aa2483774d3120461d390c58d2d9b53e.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/c02_小手/小手_老虎钳_idle/6.png.import b/asset/art/gif/c02_小手/小手_老虎钳_idle/6.png.import deleted file mode 100644 index 74176cf3..00000000 --- a/asset/art/gif/c02_小手/小手_老虎钳_idle/6.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://r2mthq8s23wl" -path="res://.godot/imported/6.png-d030a441b52792f3b848c6a3659d0803.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_老虎钳_idle/6.png" -dest_files=["res://.godot/imported/6.png-d030a441b52792f3b848c6a3659d0803.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/c02_小手/小手_老虎钳_show.gif b/asset/art/gif/c02_小手/小手_老虎钳_show.gif index 859ac44d..71bf4c3c 100644 Binary files a/asset/art/gif/c02_小手/小手_老虎钳_show.gif and b/asset/art/gif/c02_小手/小手_老虎钳_show.gif differ diff --git a/asset/art/gif/c02_小手/小手_老虎钳_show.gif.import b/asset/art/gif/c02_小手/小手_老虎钳_show.gif.import index bb7f1d6c..dff9c843 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_show.gif.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_show.gif.import @@ -2,7 +2,7 @@ importer="gif.animated.texture.plugin" type="SpriteFrames" -uid="uid://dn4p5lv2jf0jn" +uid="uid://dkko64sc7f57h" path="res://.godot/imported/小手_老虎钳_show.gif-b84b11ecb1facefd3c23e2624e9ed083.tres" [deps] diff --git a/asset/art/gif/c02_小手/小手_老虎钳_show/0.png b/asset/art/gif/c02_小手/小手_老虎钳_show/0.png index 7f70a4c0..dda21e12 100644 Binary files a/asset/art/gif/c02_小手/小手_老虎钳_show/0.png and b/asset/art/gif/c02_小手/小手_老虎钳_show/0.png differ diff --git a/asset/art/gif/c02_小手/小手_老虎钳_show/0.png.import b/asset/art/gif/c02_小手/小手_老虎钳_show/0.png.import index 99ec46ea..d40a6b41 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_show/0.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_show/0.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dcf8377wl8lah" +uid="uid://cge36n0fvx4lr" path="res://.godot/imported/0.png-b1035b397fc788ce1c837d581bc4db65.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_老虎钳_show/1.png b/asset/art/gif/c02_小手/小手_老虎钳_show/1.png index bd2c0e7e..cc571f1f 100644 Binary files a/asset/art/gif/c02_小手/小手_老虎钳_show/1.png and b/asset/art/gif/c02_小手/小手_老虎钳_show/1.png differ diff --git a/asset/art/gif/c02_小手/小手_老虎钳_show/1.png.import b/asset/art/gif/c02_小手/小手_老虎钳_show/1.png.import index 8c5624a1..d1fb033d 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_show/1.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_show/1.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cwimwmqcleu5t" +uid="uid://j1tdm4gki4e8" path="res://.godot/imported/1.png-112aab9bbc151a1bc1ad90fb730e9f98.ctex" metadata={ "vram_texture": false diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/2.png b/asset/art/gif/c02_小手/小手_老虎钳_show/2.png similarity index 100% rename from asset/art/gif/c02_小手/小手_老虎钳_idle/2.png rename to asset/art/gif/c02_小手/小手_老虎钳_show/2.png diff --git a/asset/art/gif/c02_小手/小手_纸杯_show、/2.png.import b/asset/art/gif/c02_小手/小手_老虎钳_show/2.png.import similarity index 67% rename from asset/art/gif/c02_小手/小手_纸杯_show、/2.png.import rename to asset/art/gif/c02_小手/小手_老虎钳_show/2.png.import index 95da223d..4267b3bc 100644 --- a/asset/art/gif/c02_小手/小手_纸杯_show、/2.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_show/2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cbvb0xu62ja5h" -path="res://.godot/imported/2.png-2bbe8d657dd97b6477a6619a574b5bed.ctex" +uid="uid://cb64233o57s61" +path="res://.godot/imported/2.png-5db9331fe2236edfb8d88acace40b38e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_纸杯_show、/2.png" -dest_files=["res://.godot/imported/2.png-2bbe8d657dd97b6477a6619a574b5bed.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_老虎钳_show/2.png" +dest_files=["res://.godot/imported/2.png-5db9331fe2236edfb8d88acace40b38e.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/3.png b/asset/art/gif/c02_小手/小手_老虎钳_show/3.png similarity index 100% rename from asset/art/gif/c02_小手/小手_老虎钳_idle/3.png rename to asset/art/gif/c02_小手/小手_老虎钳_show/3.png diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/3.png.import b/asset/art/gif/c02_小手/小手_老虎钳_show/3.png.import similarity index 67% rename from asset/art/gif/c02_小手/小手_丢锡箔/3.png.import rename to asset/art/gif/c02_小手/小手_老虎钳_show/3.png.import index 8a05850b..32fef8a3 100644 --- a/asset/art/gif/c02_小手/小手_丢锡箔/3.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_show/3.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cqodbotf2pp7x" -path="res://.godot/imported/3.png-afa775aa61d243404d5e229809770461.ctex" +uid="uid://bd0rdad08ob06" +path="res://.godot/imported/3.png-5de89eb8bc1896ed320f1d1bd2ddd053.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/3.png" -dest_files=["res://.godot/imported/3.png-afa775aa61d243404d5e229809770461.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_老虎钳_show/3.png" +dest_files=["res://.godot/imported/3.png-5de89eb8bc1896ed320f1d1bd2ddd053.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/4.png b/asset/art/gif/c02_小手/小手_老虎钳_show/4.png similarity index 100% rename from asset/art/gif/c02_小手/小手_老虎钳_idle/4.png rename to asset/art/gif/c02_小手/小手_老虎钳_show/4.png diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/4.png.import b/asset/art/gif/c02_小手/小手_老虎钳_show/4.png.import similarity index 67% rename from asset/art/gif/c02_小手/小手_老虎钳_idle/4.png.import rename to asset/art/gif/c02_小手/小手_老虎钳_show/4.png.import index 548ac1b5..6d98138a 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_idle/4.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_show/4.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dutv538fttyjl" -path="res://.godot/imported/4.png-426f5a79361079036cff12f94941a85f.ctex" +uid="uid://b848bexhs14wu" +path="res://.godot/imported/4.png-6056f66004ccde3463b0cb94bfec37ec.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_老虎钳_idle/4.png" -dest_files=["res://.godot/imported/4.png-426f5a79361079036cff12f94941a85f.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_老虎钳_show/4.png" +dest_files=["res://.godot/imported/4.png-6056f66004ccde3463b0cb94bfec37ec.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/5.png b/asset/art/gif/c02_小手/小手_老虎钳_show/5.png similarity index 100% rename from asset/art/gif/c02_小手/小手_老虎钳_idle/5.png rename to asset/art/gif/c02_小手/小手_老虎钳_show/5.png diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/5.png.import b/asset/art/gif/c02_小手/小手_老虎钳_show/5.png.import similarity index 67% rename from asset/art/gif/c02_小手/小手_丢锡箔/5.png.import rename to asset/art/gif/c02_小手/小手_老虎钳_show/5.png.import index 9d7c2c6a..b0bbc7eb 100644 --- a/asset/art/gif/c02_小手/小手_丢锡箔/5.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_show/5.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dbrpdqxlw851u" -path="res://.godot/imported/5.png-ed6d6cca0d583d4104aabcada3009241.ctex" +uid="uid://buadrrx1cll7e" +path="res://.godot/imported/5.png-503f12d01569a8d253577d5f4ad8e3fe.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/5.png" -dest_files=["res://.godot/imported/5.png-ed6d6cca0d583d4104aabcada3009241.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_老虎钳_show/5.png" +dest_files=["res://.godot/imported/5.png-503f12d01569a8d253577d5f4ad8e3fe.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/6.png b/asset/art/gif/c02_小手/小手_老虎钳_show/6.png similarity index 100% rename from asset/art/gif/c02_小手/小手_老虎钳_idle/6.png rename to asset/art/gif/c02_小手/小手_老虎钳_show/6.png diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/6.png.import b/asset/art/gif/c02_小手/小手_老虎钳_show/6.png.import similarity index 67% rename from asset/art/gif/c02_小手/小手_丢锡箔/6.png.import rename to asset/art/gif/c02_小手/小手_老虎钳_show/6.png.import index b0fb4b85..58609e57 100644 --- a/asset/art/gif/c02_小手/小手_丢锡箔/6.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_show/6.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cg3uu5l4ycco3" -path="res://.godot/imported/6.png-7450ed3cda4620d8b3945b7ac34fdffd.ctex" +uid="uid://qhpnhn2ecnhk" +path="res://.godot/imported/6.png-53409a74be76252c5dbbb32db8b598a5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/6.png" -dest_files=["res://.godot/imported/6.png-7450ed3cda4620d8b3945b7ac34fdffd.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_老虎钳_show/6.png" +dest_files=["res://.godot/imported/6.png-53409a74be76252c5dbbb32db8b598a5.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/7.png b/asset/art/gif/c02_小手/小手_老虎钳_show/7.png similarity index 100% rename from asset/art/gif/c02_小手/小手_老虎钳_idle/7.png rename to asset/art/gif/c02_小手/小手_老虎钳_show/7.png diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/7.png.import b/asset/art/gif/c02_小手/小手_老虎钳_show/7.png.import similarity index 67% rename from asset/art/gif/c02_小手/小手_老虎钳_idle/7.png.import rename to asset/art/gif/c02_小手/小手_老虎钳_show/7.png.import index 10aedec9..a39afd50 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_idle/7.png.import +++ b/asset/art/gif/c02_小手/小手_老虎钳_show/7.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c0hdfoq2rmols" -path="res://.godot/imported/7.png-96c4ea92482d083439eea43d661291dd.ctex" +uid="uid://b17h6l48ayvuh" +path="res://.godot/imported/7.png-33c7b0a1cedf16092a913726e26ec760.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_老虎钳_idle/7.png" -dest_files=["res://.godot/imported/7.png-96c4ea92482d083439eea43d661291dd.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_老虎钳_show/7.png" +dest_files=["res://.godot/imported/7.png-33c7b0a1cedf16092a913726e26ec760.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_锡伯_hide.gif.import b/asset/art/gif/c02_小手/小手_锡伯_hide.gif.import deleted file mode 100644 index 132e1db7..00000000 --- a/asset/art/gif/c02_小手/小手_锡伯_hide.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://vlv8u8frmhkp" -path="res://.godot/imported/小手_锡伯_hide.gif-a1318f1a5035b4842ec440e7b906c91a.tres" - -[deps] - -source_file="res://asset/art/gif/c02_小手/小手_锡伯_hide.gif" -dest_files=["res://.godot/imported/小手_锡伯_hide.gif-a1318f1a5035b4842ec440e7b906c91a.tres"] - -[params] - diff --git a/asset/art/gif/c02_小手/小手_丢锡箔.gif b/asset/art/gif/c02_小手/小手_锡箔_drop.gif similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔.gif rename to asset/art/gif/c02_小手/小手_锡箔_drop.gif diff --git a/asset/art/gif/c02_小手/小手_锡箔_drop.gif.import b/asset/art/gif/c02_小手/小手_锡箔_drop.gif.import new file mode 100644 index 00000000..f69dd3cf --- /dev/null +++ b/asset/art/gif/c02_小手/小手_锡箔_drop.gif.import @@ -0,0 +1,14 @@ +[remap] + +importer="gif.animated.texture.plugin" +type="SpriteFrames" +uid="uid://bclpjt2ex4qgk" +path="res://.godot/imported/小手_锡箔_drop.gif-40175a94e92bfcff76b15bff3748ba32.tres" + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop.gif" +dest_files=["res://.godot/imported/小手_锡箔_drop.gif-40175a94e92bfcff76b15bff3748ba32.tres"] + +[params] + diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/0.png b/asset/art/gif/c02_小手/小手_锡箔_drop/0.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/0.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/0.png diff --git a/asset/art/gif/c02_小手/小手_锡箔_drop/0.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/0.png.import new file mode 100644 index 00000000..a5169fac --- /dev/null +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/0.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c7w1b7mo1gxwj" +path="res://.godot/imported/0.png-7371d1cff6761eaddb092936af0d81f4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/0.png" +dest_files=["res://.godot/imported/0.png-7371d1cff6761eaddb092936af0d81f4.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/c02_小手/小手_丢锡箔/1.png b/asset/art/gif/c02_小手/小手_锡箔_drop/1.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/1.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/1.png diff --git a/asset/art/gif/c02_小手/小手_锡箔_drop/1.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/1.png.import new file mode 100644 index 00000000..edb6cc13 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c2xrxungvy11a" +path="res://.godot/imported/1.png-9d827ed2e50ce207afe8f6cb65f69af0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/1.png" +dest_files=["res://.godot/imported/1.png-9d827ed2e50ce207afe8f6cb65f69af0.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/c02_小手/小手_丢锡箔/10.png b/asset/art/gif/c02_小手/小手_锡箔_drop/10.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/10.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/10.png diff --git a/asset/art/gif/c02_小手/小手_锡箔_drop/10.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/10.png.import new file mode 100644 index 00000000..079f8cd6 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/10.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dmsnp66kml14q" +path="res://.godot/imported/10.png-fabbc58c24fbe37fa1fd8e1728b55a6e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/10.png" +dest_files=["res://.godot/imported/10.png-fabbc58c24fbe37fa1fd8e1728b55a6e.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/c02_小手/小手_丢锡箔/11.png b/asset/art/gif/c02_小手/小手_锡箔_drop/11.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/11.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/11.png diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/11.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/11.png.import similarity index 67% rename from asset/art/gif/c02_小手/小手_丢锡箔/11.png.import rename to asset/art/gif/c02_小手/小手_锡箔_drop/11.png.import index 2004c04b..8108929a 100644 --- a/asset/art/gif/c02_小手/小手_丢锡箔/11.png.import +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/11.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://yjkr4hb7xlbp" -path="res://.godot/imported/11.png-7427c80d18b1e9c10d5aa4385ea89178.ctex" +uid="uid://bvf1niui2x05" +path="res://.godot/imported/11.png-f4a6b2569ba212e5982851a1524bc820.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/11.png" -dest_files=["res://.godot/imported/11.png-7427c80d18b1e9c10d5aa4385ea89178.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/11.png" +dest_files=["res://.godot/imported/11.png-f4a6b2569ba212e5982851a1524bc820.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/12.png b/asset/art/gif/c02_小手/小手_锡箔_drop/12.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/12.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/12.png diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/12.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/12.png.import similarity index 67% rename from asset/art/gif/c02_小手/小手_丢锡箔/12.png.import rename to asset/art/gif/c02_小手/小手_锡箔_drop/12.png.import index c37aa47c..7f9c72af 100644 --- a/asset/art/gif/c02_小手/小手_丢锡箔/12.png.import +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/12.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cg1y8lsnuavn7" -path="res://.godot/imported/12.png-d0ca01d4bf86ceaef9caef26485fcea5.ctex" +uid="uid://dk7tdu4aip06f" +path="res://.godot/imported/12.png-b878d226552a694cfc754dc94e2a63d8.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/12.png" -dest_files=["res://.godot/imported/12.png-d0ca01d4bf86ceaef9caef26485fcea5.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/12.png" +dest_files=["res://.godot/imported/12.png-b878d226552a694cfc754dc94e2a63d8.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/2.png b/asset/art/gif/c02_小手/小手_锡箔_drop/2.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/2.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/2.png diff --git a/asset/art/gif/c02_小手/小手_锡伯_hide/2.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/2.png.import similarity index 70% rename from asset/art/gif/c02_小手/小手_锡伯_hide/2.png.import rename to asset/art/gif/c02_小手/小手_锡箔_drop/2.png.import index 6ddc1593..f9ca6f77 100644 --- a/asset/art/gif/c02_小手/小手_锡伯_hide/2.png.import +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://wixpvqf3pu8f" -path="res://.godot/imported/2.png-cdb47d14992b59cb6b8f699c41bf1e69.ctex" +uid="uid://5m3g5pkodx76" +path="res://.godot/imported/2.png-8749c1273137f89a323b7be96bb44b69.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_锡伯_hide/2.png" -dest_files=["res://.godot/imported/2.png-cdb47d14992b59cb6b8f699c41bf1e69.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/2.png" +dest_files=["res://.godot/imported/2.png-8749c1273137f89a323b7be96bb44b69.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/3.png b/asset/art/gif/c02_小手/小手_锡箔_drop/3.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/3.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/3.png diff --git a/asset/art/gif/c02_小手/小手_锡箔_drop/3.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/3.png.import new file mode 100644 index 00000000..550a2564 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dn0i6qgh8xnqw" +path="res://.godot/imported/3.png-6134ea59a075f00f4e1880678a9e7298.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/3.png" +dest_files=["res://.godot/imported/3.png-6134ea59a075f00f4e1880678a9e7298.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/c02_小手/小手_丢锡箔/4.png b/asset/art/gif/c02_小手/小手_锡箔_drop/4.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/4.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/4.png diff --git a/asset/art/gif/c02_小手/小手_锡箔_drop/4.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/4.png.import new file mode 100644 index 00000000..2cc0e61a --- /dev/null +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://xvbqh54dpjxf" +path="res://.godot/imported/4.png-73a108197a6738e4857afa36ff2824e0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/4.png" +dest_files=["res://.godot/imported/4.png-73a108197a6738e4857afa36ff2824e0.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/c02_小手/小手_丢锡箔/5.png b/asset/art/gif/c02_小手/小手_锡箔_drop/5.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/5.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/5.png diff --git a/asset/art/gif/c02_小手/小手_锡伯_hide/5.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/5.png.import similarity index 68% rename from asset/art/gif/c02_小手/小手_锡伯_hide/5.png.import rename to asset/art/gif/c02_小手/小手_锡箔_drop/5.png.import index 975c7e82..0d2253f2 100644 --- a/asset/art/gif/c02_小手/小手_锡伯_hide/5.png.import +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/5.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b23rgw2iten1q" -path="res://.godot/imported/5.png-d7e002298e9118731c7c1582701a4fcc.ctex" +uid="uid://dc3d84wbb8xw0" +path="res://.godot/imported/5.png-17e3f83cb5aceebb3ac9a8a6118f6f6e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_锡伯_hide/5.png" -dest_files=["res://.godot/imported/5.png-d7e002298e9118731c7c1582701a4fcc.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/5.png" +dest_files=["res://.godot/imported/5.png-17e3f83cb5aceebb3ac9a8a6118f6f6e.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/6.png b/asset/art/gif/c02_小手/小手_锡箔_drop/6.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/6.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/6.png diff --git a/asset/art/gif/c02_小手/小手_锡箔_drop/6.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/6.png.import new file mode 100644 index 00000000..3a38da63 --- /dev/null +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/6.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://p2dp6mp2snyg" +path="res://.godot/imported/6.png-7bc100cedfc7550ce0b4d92e4de76742.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/6.png" +dest_files=["res://.godot/imported/6.png-7bc100cedfc7550ce0b4d92e4de76742.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/c02_小手/小手_丢锡箔/7.png b/asset/art/gif/c02_小手/小手_锡箔_drop/7.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/7.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/7.png diff --git a/asset/art/gif/c02_小手/小手_弹珠_idle/7.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/7.png.import similarity index 68% rename from asset/art/gif/c02_小手/小手_弹珠_idle/7.png.import rename to asset/art/gif/c02_小手/小手_锡箔_drop/7.png.import index a89e2aab..08faf1ca 100644 --- a/asset/art/gif/c02_小手/小手_弹珠_idle/7.png.import +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/7.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://roxqmfrhlx7p" -path="res://.godot/imported/7.png-75d3951930158994dfd0f0b45ad1f3b0.ctex" +uid="uid://vwx3542itv2a" +path="res://.godot/imported/7.png-00c5d1fa97160a57a938eac17073b7d9.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_弹珠_idle/7.png" -dest_files=["res://.godot/imported/7.png-75d3951930158994dfd0f0b45ad1f3b0.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/7.png" +dest_files=["res://.godot/imported/7.png-00c5d1fa97160a57a938eac17073b7d9.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/8.png b/asset/art/gif/c02_小手/小手_锡箔_drop/8.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/8.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/8.png diff --git a/asset/art/gif/c02_小手/小手_锡箔_drop/8.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/8.png.import new file mode 100644 index 00000000..109c866b --- /dev/null +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/8.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1d2t8iy4gvjg" +path="res://.godot/imported/8.png-a77e69da10adc71663cb8567d8090271.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/8.png" +dest_files=["res://.godot/imported/8.png-a77e69da10adc71663cb8567d8090271.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/c02_小手/小手_丢锡箔/9.png b/asset/art/gif/c02_小手/小手_锡箔_drop/9.png similarity index 100% rename from asset/art/gif/c02_小手/小手_丢锡箔/9.png rename to asset/art/gif/c02_小手/小手_锡箔_drop/9.png diff --git a/asset/art/gif/c02_小手/小手_锡箔_drop/9.png.import b/asset/art/gif/c02_小手/小手_锡箔_drop/9.png.import new file mode 100644 index 00000000..e76ceb1d --- /dev/null +++ b/asset/art/gif/c02_小手/小手_锡箔_drop/9.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://lutx2s4fce48" +path="res://.godot/imported/9.png-4badb7b8278fbcb8c5c1b1c4ccda9f24.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_锡箔_drop/9.png" +dest_files=["res://.godot/imported/9.png-4badb7b8278fbcb8c5c1b1c4ccda9f24.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/c02_小手/小手_锡伯_hide.gif b/asset/art/gif/c02_小手/小手_锡箔_hide.gif similarity index 100% rename from asset/art/gif/c02_小手/小手_锡伯_hide.gif rename to asset/art/gif/c02_小手/小手_锡箔_hide.gif diff --git a/asset/art/gif/c02_小手/小手_锡箔_hide.gif.import b/asset/art/gif/c02_小手/小手_锡箔_hide.gif.import new file mode 100644 index 00000000..15717d1b --- /dev/null +++ b/asset/art/gif/c02_小手/小手_锡箔_hide.gif.import @@ -0,0 +1,14 @@ +[remap] + +importer="gif.animated.texture.plugin" +type="SpriteFrames" +uid="uid://b2pl7kqhl368b" +path="res://.godot/imported/小手_锡箔_hide.gif-4201e7989c93c83131352676000a38e0.tres" + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_锡箔_hide.gif" +dest_files=["res://.godot/imported/小手_锡箔_hide.gif-4201e7989c93c83131352676000a38e0.tres"] + +[params] + diff --git a/asset/art/gif/c02_小手/小手_锡伯_hide/0.png b/asset/art/gif/c02_小手/小手_锡箔_hide/0.png similarity index 100% rename from asset/art/gif/c02_小手/小手_锡伯_hide/0.png rename to asset/art/gif/c02_小手/小手_锡箔_hide/0.png diff --git a/asset/art/gif/c02_小手/小手_锡箔_hide/0.png.import b/asset/art/gif/c02_小手/小手_锡箔_hide/0.png.import new file mode 100644 index 00000000..e1e1a7ee --- /dev/null +++ b/asset/art/gif/c02_小手/小手_锡箔_hide/0.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bqt1yhyta4d62" +path="res://.godot/imported/0.png-38158c30751e97fcd7e83c2125d1c1b7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_锡箔_hide/0.png" +dest_files=["res://.godot/imported/0.png-38158c30751e97fcd7e83c2125d1c1b7.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/c02_小手/小手_锡伯_hide/1.png b/asset/art/gif/c02_小手/小手_锡箔_hide/1.png similarity index 100% rename from asset/art/gif/c02_小手/小手_锡伯_hide/1.png rename to asset/art/gif/c02_小手/小手_锡箔_hide/1.png diff --git a/asset/art/gif/c02_小手/小手_锡箔_hide/1.png.import b/asset/art/gif/c02_小手/小手_锡箔_hide/1.png.import new file mode 100644 index 00000000..dbf675fe --- /dev/null +++ b/asset/art/gif/c02_小手/小手_锡箔_hide/1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://daoj5mr6prf25" +path="res://.godot/imported/1.png-285fa011251b8cead9fde90d82dd7992.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_小手/小手_锡箔_hide/1.png" +dest_files=["res://.godot/imported/1.png-285fa011251b8cead9fde90d82dd7992.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/c02_小手/小手_锡伯_hide/2.png b/asset/art/gif/c02_小手/小手_锡箔_hide/2.png similarity index 100% rename from asset/art/gif/c02_小手/小手_锡伯_hide/2.png rename to asset/art/gif/c02_小手/小手_锡箔_hide/2.png diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/0.png.import b/asset/art/gif/c02_小手/小手_锡箔_hide/2.png.import similarity index 69% rename from asset/art/gif/c02_小手/小手_丢锡箔/0.png.import rename to asset/art/gif/c02_小手/小手_锡箔_hide/2.png.import index 20c2e1f8..2621b9fe 100644 --- a/asset/art/gif/c02_小手/小手_丢锡箔/0.png.import +++ b/asset/art/gif/c02_小手/小手_锡箔_hide/2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://1ysjxy4b7soj" -path="res://.godot/imported/0.png-63c4948c5350c711a00e5ddc1ecc4d09.ctex" +uid="uid://emgp2r2ktdvl" +path="res://.godot/imported/2.png-aacee4242ca2d704167f854d26c8b509.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/0.png" -dest_files=["res://.godot/imported/0.png-63c4948c5350c711a00e5ddc1ecc4d09.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_锡箔_hide/2.png" +dest_files=["res://.godot/imported/2.png-aacee4242ca2d704167f854d26c8b509.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_锡伯_hide/3.png b/asset/art/gif/c02_小手/小手_锡箔_hide/3.png similarity index 100% rename from asset/art/gif/c02_小手/小手_锡伯_hide/3.png rename to asset/art/gif/c02_小手/小手_锡箔_hide/3.png diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/7.png.import b/asset/art/gif/c02_小手/小手_锡箔_hide/3.png.import similarity index 69% rename from asset/art/gif/c02_小手/小手_丢锡箔/7.png.import rename to asset/art/gif/c02_小手/小手_锡箔_hide/3.png.import index 584e121a..527ec491 100644 --- a/asset/art/gif/c02_小手/小手_丢锡箔/7.png.import +++ b/asset/art/gif/c02_小手/小手_锡箔_hide/3.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://n0tcmv8n7kiq" -path="res://.godot/imported/7.png-6c9b805a152e885bc38b086fe7edf4b3.ctex" +uid="uid://dsk4yifbjsdd6" +path="res://.godot/imported/3.png-ba2307b66698528b22121163d0e05bb3.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/7.png" -dest_files=["res://.godot/imported/7.png-6c9b805a152e885bc38b086fe7edf4b3.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_锡箔_hide/3.png" +dest_files=["res://.godot/imported/3.png-ba2307b66698528b22121163d0e05bb3.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_锡伯_hide/4.png b/asset/art/gif/c02_小手/小手_锡箔_hide/4.png similarity index 100% rename from asset/art/gif/c02_小手/小手_锡伯_hide/4.png rename to asset/art/gif/c02_小手/小手_锡箔_hide/4.png diff --git a/asset/art/gif/c02_小手/小手_纸杯_idle/4.png.import b/asset/art/gif/c02_小手/小手_锡箔_hide/4.png.import similarity index 68% rename from asset/art/gif/c02_小手/小手_纸杯_idle/4.png.import rename to asset/art/gif/c02_小手/小手_锡箔_hide/4.png.import index 58e61c2d..ff9f56f3 100644 --- a/asset/art/gif/c02_小手/小手_纸杯_idle/4.png.import +++ b/asset/art/gif/c02_小手/小手_锡箔_hide/4.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://diwgdkwegaqwj" -path="res://.godot/imported/4.png-539f601b304d5848b09e9ba6180ed87f.ctex" +uid="uid://ctbeg8jmbeop0" +path="res://.godot/imported/4.png-059b8a901621c75fc9f50362e726f4b4.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_纸杯_idle/4.png" -dest_files=["res://.godot/imported/4.png-539f601b304d5848b09e9ba6180ed87f.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_锡箔_hide/4.png" +dest_files=["res://.godot/imported/4.png-059b8a901621c75fc9f50362e726f4b4.ctex"] [params] diff --git a/asset/art/gif/c02_小手/小手_锡伯_hide/5.png b/asset/art/gif/c02_小手/小手_锡箔_hide/5.png similarity index 100% rename from asset/art/gif/c02_小手/小手_锡伯_hide/5.png rename to asset/art/gif/c02_小手/小手_锡箔_hide/5.png diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/4.png.import b/asset/art/gif/c02_小手/小手_锡箔_hide/5.png.import similarity index 69% rename from asset/art/gif/c02_小手/小手_丢锡箔/4.png.import rename to asset/art/gif/c02_小手/小手_锡箔_hide/5.png.import index 3e74125f..833a992d 100644 --- a/asset/art/gif/c02_小手/小手_丢锡箔/4.png.import +++ b/asset/art/gif/c02_小手/小手_锡箔_hide/5.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://duumtbv6btf3d" -path="res://.godot/imported/4.png-f028952bc4b2bdf4737053be6a6d3f21.ctex" +uid="uid://b7wawt82udjni" +path="res://.godot/imported/5.png-79b2519ad18d78aebde846e926782d21.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/4.png" -dest_files=["res://.godot/imported/4.png-f028952bc4b2bdf4737053be6a6d3f21.ctex"] +source_file="res://asset/art/gif/c02_小手/小手_锡箔_hide/5.png" +dest_files=["res://.godot/imported/5.png-79b2519ad18d78aebde846e926782d21.ctex"] [params] diff --git a/asset/art/gif/c02_老鼠拖肉/frames.tres b/asset/art/gif/c02_老鼠拖肉/frames.tres new file mode 100644 index 00000000..68ccf1e4 --- /dev/null +++ b/asset/art/gif/c02_老鼠拖肉/frames.tres @@ -0,0 +1,68 @@ +[gd_resource type="SpriteFrames" load_steps=13 format=3 uid="uid://dfayiajfmfax3"] + +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/0.png" id="1_a2pfj"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/0.png" id="1_s8kdl"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/1.png" id="2_2007h"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/1.png" id="2_n5b7f"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/2.png" id="3_4hve7"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/2.png" id="3_t7h8k"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/3.png" id="4_r4e70"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/4.png" id="5_eu3nr"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/5.png" id="6_ksaoy"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/0.png" id="10_aqeq7"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/1.png" id="11_jui2i"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/2.png" id="12_f7f7r"] + +[resource] +animations = [{ +"frames": [{ +"duration": 6.0, +"texture": ExtResource("1_a2pfj") +}, { +"duration": 6.0, +"texture": ExtResource("2_n5b7f") +}, { +"duration": 6.0, +"texture": ExtResource("3_t7h8k") +}, { +"duration": 6.0, +"texture": ExtResource("4_r4e70") +}, { +"duration": 6.0, +"texture": ExtResource("5_eu3nr") +}, { +"duration": 6.0, +"texture": ExtResource("6_ksaoy") +}], +"loop": true, +"name": &"奇怪的肉被拖进去动画", +"speed": 30.0 +}, { +"frames": [{ +"duration": 4.2, +"texture": ExtResource("1_s8kdl") +}, { +"duration": 4.2, +"texture": ExtResource("2_2007h") +}, { +"duration": 4.2, +"texture": ExtResource("3_4hve7") +}], +"loop": true, +"name": &"老鼠被黏住动画", +"speed": 30.0 +}, { +"frames": [{ +"duration": 3.0, +"texture": ExtResource("10_aqeq7") +}, { +"duration": 3.0, +"texture": ExtResource("11_jui2i") +}, { +"duration": 3.0, +"texture": ExtResource("12_f7f7r") +}], +"loop": true, +"name": &"老鼠被黏住动画-(肉被取走)", +"speed": 30.0 +}] diff --git a/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画.gif b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画.gif new file mode 100644 index 00000000..921042de Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画.gif differ diff --git a/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画.gif.import b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画.gif.import new file mode 100644 index 00000000..f665d0a9 --- /dev/null +++ b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画.gif.import @@ -0,0 +1,14 @@ +[remap] + +importer="gif.animated.texture.plugin" +type="SpriteFrames" +uid="uid://xrr8dvp5jd0i" +path="res://.godot/imported/奇怪的肉被拖进去动画.gif-f3f012fd3ccf05c8df9fb2a8e9527af2.tres" + +[deps] + +source_file="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画.gif" +dest_files=["res://.godot/imported/奇怪的肉被拖进去动画.gif-f3f012fd3ccf05c8df9fb2a8e9527af2.tres"] + +[params] + diff --git a/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/0.png b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/0.png new file mode 100644 index 00000000..6fa5be63 Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/0.png differ diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_show/0.png.import b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/0.png.import similarity index 66% rename from asset/art/gif/c02_小手/小手_空手讨东西_show/0.png.import rename to asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/0.png.import index 795b74fd..6d54a25d 100644 --- a/asset/art/gif/c02_小手/小手_空手讨东西_show/0.png.import +++ b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/0.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://djdxo50xydb0c" -path="res://.godot/imported/0.png-0ccf142efe9a5db6e1059e81f5f7fbdb.ctex" +uid="uid://d0yd5scw13wt3" +path="res://.godot/imported/0.png-2ca45260e18e542db87d9fe0489089dc.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_show/0.png" -dest_files=["res://.godot/imported/0.png-0ccf142efe9a5db6e1059e81f5f7fbdb.ctex"] +source_file="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/0.png" +dest_files=["res://.godot/imported/0.png-2ca45260e18e542db87d9fe0489089dc.ctex"] [params] diff --git a/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/1.png b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/1.png new file mode 100644 index 00000000..fb189765 Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/1.png differ diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle/1.png.import b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/1.png.import similarity index 66% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/1.png.import rename to asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/1.png.import index fed0dc24..99823288 100644 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle/1.png.import +++ b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dtbuqb0dikirq" -path="res://.godot/imported/1.png-756df9b6bd0fb189573f65df0bb11bd5.ctex" +uid="uid://dgiylwsifbbxf" +path="res://.godot/imported/1.png-eb0749b8d0522a5ac77693002c48beb3.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/1.png" -dest_files=["res://.godot/imported/1.png-756df9b6bd0fb189573f65df0bb11bd5.ctex"] +source_file="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/1.png" +dest_files=["res://.godot/imported/1.png-eb0749b8d0522a5ac77693002c48beb3.ctex"] [params] diff --git a/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/2.png b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/2.png new file mode 100644 index 00000000..fb54cbbb Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/2.png differ diff --git a/asset/art/gif/c02_小手/小手_老虎钳_idle/2.png.import b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/2.png.import similarity index 66% rename from asset/art/gif/c02_小手/小手_老虎钳_idle/2.png.import rename to asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/2.png.import index b3ef9484..f4a15e69 100644 --- a/asset/art/gif/c02_小手/小手_老虎钳_idle/2.png.import +++ b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://15qwyk3l3cxu" -path="res://.godot/imported/2.png-8b34d9782236a3431d6f6bb4206608c7.ctex" +uid="uid://dms387vcw0tok" +path="res://.godot/imported/2.png-f883e5b4f344d3a9895bc66d0de286c8.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_老虎钳_idle/2.png" -dest_files=["res://.godot/imported/2.png-8b34d9782236a3431d6f6bb4206608c7.ctex"] +source_file="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/2.png" +dest_files=["res://.godot/imported/2.png-f883e5b4f344d3a9895bc66d0de286c8.ctex"] [params] diff --git a/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/3.png b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/3.png new file mode 100644 index 00000000..b2c04cdb Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/3.png differ diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle/3.png.import b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/3.png.import similarity index 66% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/3.png.import rename to asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/3.png.import index a6e4de7f..2e397fb8 100644 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle/3.png.import +++ b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/3.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c3vxlvngycod1" -path="res://.godot/imported/3.png-e952207363557b9a08badb4c297c2188.ctex" +uid="uid://b44dg4381ng4v" +path="res://.godot/imported/3.png-e166c059e8bd5b57fbe895ae076c0e07.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/3.png" -dest_files=["res://.godot/imported/3.png-e952207363557b9a08badb4c297c2188.ctex"] +source_file="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/3.png" +dest_files=["res://.godot/imported/3.png-e166c059e8bd5b57fbe895ae076c0e07.ctex"] [params] diff --git a/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/4.png b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/4.png new file mode 100644 index 00000000..e66681f7 Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/4.png differ diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle/4.png.import b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/4.png.import similarity index 66% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/4.png.import rename to asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/4.png.import index c4fa97f6..c8162a95 100644 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle/4.png.import +++ b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/4.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bk3h2tmldt310" -path="res://.godot/imported/4.png-6b34ebee778725adc2437a12bcdac42d.ctex" +uid="uid://dppbnuiqi6jod" +path="res://.godot/imported/4.png-e5ef6a38793cd2007affbc7b4c83ce31.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/4.png" -dest_files=["res://.godot/imported/4.png-6b34ebee778725adc2437a12bcdac42d.ctex"] +source_file="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/4.png" +dest_files=["res://.godot/imported/4.png-e5ef6a38793cd2007affbc7b4c83ce31.ctex"] [params] diff --git a/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/5.png b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/5.png new file mode 100644 index 00000000..4c7db4f4 Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/5.png differ diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle/5.png.import b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/5.png.import similarity index 66% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/5.png.import rename to asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/5.png.import index 1424fc0e..32e067b5 100644 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle/5.png.import +++ b/asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/5.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c1tpowjra10vc" -path="res://.godot/imported/5.png-cba0a68c61eaf0e476260deff53af501.ctex" +uid="uid://cw0c54jhnxnq7" +path="res://.godot/imported/5.png-7953c5a72d2b7a46a377c648ff42fd0e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/5.png" -dest_files=["res://.godot/imported/5.png-cba0a68c61eaf0e476260deff53af501.ctex"] +source_file="res://asset/art/gif/c02_老鼠拖肉/奇怪的肉被拖进去动画/5.png" +dest_files=["res://.godot/imported/5.png-7953c5a72d2b7a46a377c648ff42fd0e.ctex"] [params] diff --git a/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走).gif b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走).gif new file mode 100644 index 00000000..3bf4c10d Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走).gif differ diff --git a/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走).gif.import b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走).gif.import new file mode 100644 index 00000000..832e02b9 --- /dev/null +++ b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走).gif.import @@ -0,0 +1,14 @@ +[remap] + +importer="gif.animated.texture.plugin" +type="SpriteFrames" +uid="uid://chcboljkhnnsl" +path="res://.godot/imported/老鼠被黏住动画-(肉被取走).gif-02de470b32ed0de9ce13fe4ce790d076.tres" + +[deps] + +source_file="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走).gif" +dest_files=["res://.godot/imported/老鼠被黏住动画-(肉被取走).gif-02de470b32ed0de9ce13fe4ce790d076.tres"] + +[params] + diff --git a/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/0.png b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/0.png new file mode 100644 index 00000000..f1b081fb Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/0.png differ diff --git a/asset/art/gif/c02_小手/小手_纸杯_show、/0.png.import b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/0.png.import similarity index 65% rename from asset/art/gif/c02_小手/小手_纸杯_show、/0.png.import rename to asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/0.png.import index 4209537b..30bb307f 100644 --- a/asset/art/gif/c02_小手/小手_纸杯_show、/0.png.import +++ b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/0.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bk8khafyg4iyk" -path="res://.godot/imported/0.png-78c552d8abac0da618007e9563da2b99.ctex" +uid="uid://fwd6npjeq2gs" +path="res://.godot/imported/0.png-4814953f8fc6915e185980c25e29a9a2.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_纸杯_show、/0.png" -dest_files=["res://.godot/imported/0.png-78c552d8abac0da618007e9563da2b99.ctex"] +source_file="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/0.png" +dest_files=["res://.godot/imported/0.png-4814953f8fc6915e185980c25e29a9a2.ctex"] [params] diff --git a/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/1.png b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/1.png new file mode 100644 index 00000000..3bf8d679 Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/1.png differ diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_show/1.png.import b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/1.png.import similarity index 65% rename from asset/art/gif/c02_小手/小手_空手讨东西_show/1.png.import rename to asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/1.png.import index af22da55..d1130d22 100644 --- a/asset/art/gif/c02_小手/小手_空手讨东西_show/1.png.import +++ b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cmgjnvrxd12ii" -path="res://.godot/imported/1.png-964acc6334946f74c7c23fb1ec979e0a.ctex" +uid="uid://dchbrgkbsojbp" +path="res://.godot/imported/1.png-ac25e92dcb00e5e25afe7ad1eb638f29.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_show/1.png" -dest_files=["res://.godot/imported/1.png-964acc6334946f74c7c23fb1ec979e0a.ctex"] +source_file="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/1.png" +dest_files=["res://.godot/imported/1.png-ac25e92dcb00e5e25afe7ad1eb638f29.ctex"] [params] diff --git a/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/2.png b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/2.png new file mode 100644 index 00000000..53d41ca4 Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/2.png differ diff --git a/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/2.png.import b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/2.png.import new file mode 100644 index 00000000..6bd36ec7 --- /dev/null +++ b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cd3ra2j57fj3l" +path="res://.godot/imported/2.png-be7103654c5c663f90993c39a24a4a64.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画-(肉被取走)/2.png" +dest_files=["res://.godot/imported/2.png-be7103654c5c663f90993c39a24a4a64.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/c02_老鼠拖肉/老鼠被黏住动画.gif b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画.gif new file mode 100644 index 00000000..75e6d8e1 Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画.gif differ diff --git a/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画.gif.import b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画.gif.import new file mode 100644 index 00000000..c2ffb9fa --- /dev/null +++ b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画.gif.import @@ -0,0 +1,14 @@ +[remap] + +importer="gif.animated.texture.plugin" +type="SpriteFrames" +uid="uid://cb2lm0ff4dftc" +path="res://.godot/imported/老鼠被黏住动画.gif-4b006ac1cc74cc95d40698dab60a83f0.tres" + +[deps] + +source_file="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画.gif" +dest_files=["res://.godot/imported/老鼠被黏住动画.gif-4b006ac1cc74cc95d40698dab60a83f0.tres"] + +[params] + diff --git a/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/0.png b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/0.png new file mode 100644 index 00000000..79ef527e Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/0.png differ diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle/0.png.import b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/0.png.import similarity index 67% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/0.png.import rename to asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/0.png.import index 1ac6145c..9ceb5605 100644 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle/0.png.import +++ b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/0.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://88wwo3lv5syi" -path="res://.godot/imported/0.png-08b327a104640724574e265d1d8de136.ctex" +uid="uid://bxx0najeymnmh" +path="res://.godot/imported/0.png-2e8e3f18ac08c30dbdddf781ca1aaba2.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/0.png" -dest_files=["res://.godot/imported/0.png-08b327a104640724574e265d1d8de136.ctex"] +source_file="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/0.png" +dest_files=["res://.godot/imported/0.png-2e8e3f18ac08c30dbdddf781ca1aaba2.ctex"] [params] diff --git a/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/1.png b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/1.png new file mode 100644 index 00000000..fda6710c Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/1.png differ diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/9.png.import b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/1.png.import similarity index 68% rename from asset/art/gif/c02_小手/小手_丢锡箔/9.png.import rename to asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/1.png.import index 13a46617..a163baba 100644 --- a/asset/art/gif/c02_小手/小手_丢锡箔/9.png.import +++ b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b0yck5vqnamd6" -path="res://.godot/imported/9.png-4ef415af60370a8981bfe9396b47f599.ctex" +uid="uid://b6f2oadrjw8md" +path="res://.godot/imported/1.png-48ca500d02727dc28529e22ebe250c99.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/9.png" -dest_files=["res://.godot/imported/9.png-4ef415af60370a8981bfe9396b47f599.ctex"] +source_file="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/1.png" +dest_files=["res://.godot/imported/1.png-48ca500d02727dc28529e22ebe250c99.ctex"] [params] diff --git a/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/2.png b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/2.png new file mode 100644 index 00000000..5af52353 Binary files /dev/null and b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/2.png differ diff --git a/asset/art/gif/c02_小手/小手_空手讨东西_idle/2.png.import b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/2.png.import similarity index 67% rename from asset/art/gif/c02_小手/小手_空手讨东西_idle/2.png.import rename to asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/2.png.import index c9763984..b3e7c7c9 100644 --- a/asset/art/gif/c02_小手/小手_空手讨东西_idle/2.png.import +++ b/asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b0yxeuhbjsjxo" -path="res://.godot/imported/2.png-f120dc99664952a4f800123a19dcbf19.ctex" +uid="uid://cg154icopoipv" +path="res://.godot/imported/2.png-2f6e0010be62f40714d3118ff3cd8338.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_空手讨东西_idle/2.png" -dest_files=["res://.godot/imported/2.png-f120dc99664952a4f800123a19dcbf19.ctex"] +source_file="res://asset/art/gif/c02_老鼠拖肉/老鼠被黏住动画/2.png" +dest_files=["res://.godot/imported/2.png-2f6e0010be62f40714d3118ff3cd8338.ctex"] [params] diff --git a/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-07.png b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-07.png new file mode 100644 index 00000000..8ccae441 Binary files /dev/null and b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-07.png differ diff --git a/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-07.png.import b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-07.png.import new file mode 100644 index 00000000..f3cdb877 --- /dev/null +++ b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-07.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://snm3q333tqhl" +path="res://.godot/imported/动画字幕-07.png-3202a447740fffb557033d3a6ae9ec66.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-07.png" +dest_files=["res://.godot/imported/动画字幕-07.png-3202a447740fffb557033d3a6ae9ec66.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/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-08.png b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-08.png new file mode 100644 index 00000000..972a25ff Binary files /dev/null and b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-08.png differ diff --git a/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-08.png.import b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-08.png.import new file mode 100644 index 00000000..134d0b7c --- /dev/null +++ b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-08.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d4laekws15ap6" +path="res://.godot/imported/动画字幕-08.png-c60b79bb75973b4075d17fc5e6c770a1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-08.png" +dest_files=["res://.godot/imported/动画字幕-08.png-c60b79bb75973b4075d17fc5e6c770a1.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/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-09.png b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-09.png new file mode 100644 index 00000000..b45cf30e Binary files /dev/null and b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-09.png differ diff --git a/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-09.png.import b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-09.png.import new file mode 100644 index 00000000..0ee185ac --- /dev/null +++ b/asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-09.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://5oln8axxcfep" +path="res://.godot/imported/动画字幕-09.png-21a312b2d3ce66fafc486e7bd6ce6502.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c01/s09_黄包车长场景/动画字幕/动画字幕-09.png" +dest_files=["res://.godot/imported/动画字幕-09.png-21a312b2d3ce66fafc486e7bd6ce6502.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/scene/c02/s03_公寓一楼院子/血迹(肉铺门).png b/asset/art/scene/c02/s03_公寓一楼院子/血迹(肉铺门).png new file mode 100644 index 00000000..8703401e Binary files /dev/null and b/asset/art/scene/c02/s03_公寓一楼院子/血迹(肉铺门).png differ diff --git a/asset/art/scene/c02/s03_公寓一楼院子/血迹(肉铺门).png.import b/asset/art/scene/c02/s03_公寓一楼院子/血迹(肉铺门).png.import new file mode 100644 index 00000000..2aa56a55 --- /dev/null +++ b/asset/art/scene/c02/s03_公寓一楼院子/血迹(肉铺门).png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cjth2u1ovlt2h" +path="res://.godot/imported/血迹(肉铺门).png-8c0d53a63aeb0ccd7605ad39710ed30a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s03_公寓一楼院子/血迹(肉铺门).png" +dest_files=["res://.godot/imported/血迹(肉铺门).png-8c0d53a63aeb0ccd7605ad39710ed30a.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/临时草稿/c02_第一章/无头小婵坐二楼.png b/asset/art/scene/c02/s05_一楼内侧楼道/奇怪的肉特写.png similarity index 54% rename from asset/art/临时草稿/c02_第一章/无头小婵坐二楼.png rename to asset/art/scene/c02/s05_一楼内侧楼道/奇怪的肉特写.png index f10155ce..0384ea00 100644 Binary files a/asset/art/临时草稿/c02_第一章/无头小婵坐二楼.png and b/asset/art/scene/c02/s05_一楼内侧楼道/奇怪的肉特写.png differ diff --git a/asset/art/scene/c02/s05_一楼内侧楼道/奇怪的肉特写.png.import b/asset/art/scene/c02/s05_一楼内侧楼道/奇怪的肉特写.png.import new file mode 100644 index 00000000..8c27b0f7 --- /dev/null +++ b/asset/art/scene/c02/s05_一楼内侧楼道/奇怪的肉特写.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ihey3jc27hno" +path="res://.godot/imported/奇怪的肉特写.png-e35efebf3cf92118fdfa8a079d39bc56.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s05_一楼内侧楼道/奇怪的肉特写.png" +dest_files=["res://.godot/imported/奇怪的肉特写.png-e35efebf3cf92118fdfa8a079d39bc56.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/临时草稿/c02_第一章/血脚印.png b/asset/art/scene/c02/s05_一楼内侧楼道/粘鼠板.png similarity index 79% rename from asset/art/临时草稿/c02_第一章/血脚印.png rename to asset/art/scene/c02/s05_一楼内侧楼道/粘鼠板.png index 6d015f6c..8a895b93 100644 Binary files a/asset/art/临时草稿/c02_第一章/血脚印.png and b/asset/art/scene/c02/s05_一楼内侧楼道/粘鼠板.png differ diff --git a/asset/art/scene/c02/s05_一楼内侧楼道/粘鼠板.png.import b/asset/art/scene/c02/s05_一楼内侧楼道/粘鼠板.png.import new file mode 100644 index 00000000..3344a66b --- /dev/null +++ b/asset/art/scene/c02/s05_一楼内侧楼道/粘鼠板.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dcot0rove27rd" +path="res://.godot/imported/粘鼠板.png-f9fb799b78a4844f709d7873de547590.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s05_一楼内侧楼道/粘鼠板.png" +dest_files=["res://.godot/imported/粘鼠板.png-f9fb799b78a4844f709d7873de547590.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/临时草稿/c02_第一章/小婵.png b/asset/art/scene/c02/s05_一楼内侧楼道/血迹(一楼内侧楼道).png similarity index 60% rename from asset/art/临时草稿/c02_第一章/小婵.png rename to asset/art/scene/c02/s05_一楼内侧楼道/血迹(一楼内侧楼道).png index 433b440a..2ed19a5b 100644 Binary files a/asset/art/临时草稿/c02_第一章/小婵.png and b/asset/art/scene/c02/s05_一楼内侧楼道/血迹(一楼内侧楼道).png differ diff --git a/asset/art/scene/c02/s05_一楼内侧楼道/血迹(一楼内侧楼道).png.import b/asset/art/scene/c02/s05_一楼内侧楼道/血迹(一楼内侧楼道).png.import new file mode 100644 index 00000000..aa70ae5c --- /dev/null +++ b/asset/art/scene/c02/s05_一楼内侧楼道/血迹(一楼内侧楼道).png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c3wytxnirtx27" +path="res://.godot/imported/血迹(一楼内侧楼道).png-abc9b6fd98638e28748a216f34b11da9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s05_一楼内侧楼道/血迹(一楼内侧楼道).png" +dest_files=["res://.godot/imported/血迹(一楼内侧楼道).png-abc9b6fd98638e28748a216f34b11da9.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/action_mark/UI场景切换.png b/asset/art/ui/action_mark/UI场景切换.png new file mode 100644 index 00000000..51adc47d Binary files /dev/null and b/asset/art/ui/action_mark/UI场景切换.png differ diff --git a/asset/art/ui/action_mark/UI场景切换.png.import b/asset/art/ui/action_mark/UI场景切换.png.import new file mode 100644 index 00000000..cdcc5ff8 --- /dev/null +++ b/asset/art/ui/action_mark/UI场景切换.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://r0n7qy4kr3w2" +path="res://.godot/imported/UI场景切换.png-69f51699049e2f42aa9d52a0922c37a2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/action_mark/UI场景切换.png" +dest_files=["res://.godot/imported/UI场景切换.png-69f51699049e2f42aa9d52a0922c37a2.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/action_mark/UI开锁.png b/asset/art/ui/action_mark/UI开锁.png new file mode 100644 index 00000000..acaeac8f Binary files /dev/null and b/asset/art/ui/action_mark/UI开锁.png differ diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/1.png.import b/asset/art/ui/action_mark/UI开锁.png.import similarity index 67% rename from asset/art/gif/c02_小手/小手_丢锡箔/1.png.import rename to asset/art/ui/action_mark/UI开锁.png.import index c1e41372..d1ab31c7 100644 --- a/asset/art/gif/c02_小手/小手_丢锡箔/1.png.import +++ b/asset/art/ui/action_mark/UI开锁.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cdr4rbmxoneae" -path="res://.godot/imported/1.png-ab7ceb11d0fb336a6d945d42f199da88.ctex" +uid="uid://bc8sn2v4t1yta" +path="res://.godot/imported/UI开锁.png-938a4953693030df68eaacbabdecf68e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/1.png" -dest_files=["res://.godot/imported/1.png-ab7ceb11d0fb336a6d945d42f199da88.ctex"] +source_file="res://asset/art/ui/action_mark/UI开锁.png" +dest_files=["res://.godot/imported/UI开锁.png-938a4953693030df68eaacbabdecf68e.ctex"] [params] diff --git a/asset/art/ui/action_mark/UI手.png b/asset/art/ui/action_mark/UI手.png new file mode 100644 index 00000000..f716867d Binary files /dev/null and b/asset/art/ui/action_mark/UI手.png differ diff --git a/asset/art/ui/action_mark/UI手.png.import b/asset/art/ui/action_mark/UI手.png.import new file mode 100644 index 00000000..c359cddb --- /dev/null +++ b/asset/art/ui/action_mark/UI手.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://gui0ubwlwoi0" +path="res://.godot/imported/UI手.png-3a01164f0e57fc7fd09d70c7c7c908e3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/action_mark/UI手.png" +dest_files=["res://.godot/imported/UI手.png-3a01164f0e57fc7fd09d70c7c7c908e3.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/action_mark/UI探索.png b/asset/art/ui/action_mark/UI探索.png new file mode 100644 index 00000000..218b8f3e Binary files /dev/null and b/asset/art/ui/action_mark/UI探索.png differ diff --git a/asset/art/gif/c02_小手/小手_丢锡箔/10.png.import b/asset/art/ui/action_mark/UI探索.png.import similarity index 67% rename from asset/art/gif/c02_小手/小手_丢锡箔/10.png.import rename to asset/art/ui/action_mark/UI探索.png.import index bbf5630d..7eb81946 100644 --- a/asset/art/gif/c02_小手/小手_丢锡箔/10.png.import +++ b/asset/art/ui/action_mark/UI探索.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://hg6toep41i7i" -path="res://.godot/imported/10.png-6ae4ae969f1509c4455a72d7d5cbff86.ctex" +uid="uid://dtyg0nugb2tnf" +path="res://.godot/imported/UI探索.png-46d8a913d7d8637a1940170de4980514.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/gif/c02_小手/小手_丢锡箔/10.png" -dest_files=["res://.godot/imported/10.png-6ae4ae969f1509c4455a72d7d5cbff86.ctex"] +source_file="res://asset/art/ui/action_mark/UI探索.png" +dest_files=["res://.godot/imported/UI探索.png-46d8a913d7d8637a1940170de4980514.ctex"] [params] diff --git a/asset/art/ui/action_mark/UI眼睛.png b/asset/art/ui/action_mark/UI眼睛.png new file mode 100644 index 00000000..e1a96688 Binary files /dev/null and b/asset/art/ui/action_mark/UI眼睛.png differ diff --git a/asset/art/ui/action_mark/UI眼睛.png.import b/asset/art/ui/action_mark/UI眼睛.png.import new file mode 100644 index 00000000..33478888 --- /dev/null +++ b/asset/art/ui/action_mark/UI眼睛.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c0rw25jl762a1" +path="res://.godot/imported/UI眼睛.png-6399bc2f11f46d2ec84797d22365592a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/action_mark/UI眼睛.png" +dest_files=["res://.godot/imported/UI眼睛.png-6399bc2f11f46d2ec84797d22365592a.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/action_mark/UI锁.png b/asset/art/ui/action_mark/UI锁.png new file mode 100644 index 00000000..6019ce21 Binary files /dev/null and b/asset/art/ui/action_mark/UI锁.png differ diff --git a/asset/art/ui/action_mark/UI锁.png.import b/asset/art/ui/action_mark/UI锁.png.import new file mode 100644 index 00000000..d1555ed6 --- /dev/null +++ b/asset/art/ui/action_mark/UI锁.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://xcmvfp72l061" +path="res://.godot/imported/UI锁.png-6f56626bb8895c9d5e08b97c9cf4df93.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/action_mark/UI锁.png" +dest_files=["res://.godot/imported/UI锁.png-6f56626bb8895c9d5e08b97c9cf4df93.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/标题字/标题字-10.png b/asset/art/ui/标题字/标题字-10.png new file mode 100644 index 00000000..462f315e Binary files /dev/null and b/asset/art/ui/标题字/标题字-10.png differ diff --git a/asset/art/ui/标题字/标题字-10.png.import b/asset/art/ui/标题字/标题字-10.png.import new file mode 100644 index 00000000..9f9971ef --- /dev/null +++ b/asset/art/ui/标题字/标题字-10.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dq1tfv3vkghpa" +path="res://.godot/imported/标题字-10.png-6708225d4a449e086a56d2d9840f23c1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/标题字/标题字-10.png" +dest_files=["res://.godot/imported/标题字-10.png-6708225d4a449e086a56d2d9840f23c1.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/标题字/标题字-11.png b/asset/art/ui/标题字/标题字-11.png new file mode 100644 index 00000000..aeb72a24 Binary files /dev/null and b/asset/art/ui/标题字/标题字-11.png differ diff --git a/asset/art/ui/标题字/标题字-11.png.import b/asset/art/ui/标题字/标题字-11.png.import new file mode 100644 index 00000000..4f9fe44a --- /dev/null +++ b/asset/art/ui/标题字/标题字-11.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bvjt8iyliunfs" +path="res://.godot/imported/标题字-11.png-2be807bdc3f80be57a1dcd926c55f432.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/标题字/标题字-11.png" +dest_files=["res://.godot/imported/标题字-11.png-2be807bdc3f80be57a1dcd926c55f432.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/标题字/标题字-12.png b/asset/art/ui/标题字/标题字-12.png new file mode 100644 index 00000000..f235926a Binary files /dev/null and b/asset/art/ui/标题字/标题字-12.png differ diff --git a/asset/art/ui/标题字/标题字-12.png.import b/asset/art/ui/标题字/标题字-12.png.import new file mode 100644 index 00000000..54516094 --- /dev/null +++ b/asset/art/ui/标题字/标题字-12.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b0koe7cw0ow5h" +path="res://.godot/imported/标题字-12.png-b489cb5d5288dd8b7cec74ea31d6eccd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/标题字/标题字-12.png" +dest_files=["res://.godot/imported/标题字-12.png-b489cb5d5288dd8b7cec74ea31d6eccd.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/标题字/标题字-13.png b/asset/art/ui/标题字/标题字-13.png new file mode 100644 index 00000000..93cbf16c Binary files /dev/null and b/asset/art/ui/标题字/标题字-13.png differ diff --git a/asset/art/ui/标题字/标题字-13.png.import b/asset/art/ui/标题字/标题字-13.png.import new file mode 100644 index 00000000..c0af28e1 --- /dev/null +++ b/asset/art/ui/标题字/标题字-13.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c42jwf1xl5rf4" +path="res://.godot/imported/标题字-13.png-483c46b234169b0526370660b9842d37.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/标题字/标题字-13.png" +dest_files=["res://.godot/imported/标题字-13.png-483c46b234169b0526370660b9842d37.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/标题字/标题字-14.png b/asset/art/ui/标题字/标题字-14.png new file mode 100644 index 00000000..9836878f Binary files /dev/null and b/asset/art/ui/标题字/标题字-14.png differ diff --git a/asset/art/ui/标题字/标题字-14.png.import b/asset/art/ui/标题字/标题字-14.png.import new file mode 100644 index 00000000..e1dfa1d1 --- /dev/null +++ b/asset/art/ui/标题字/标题字-14.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://two1l5i22l4i" +path="res://.godot/imported/标题字-14.png-9810461a99289df80de7513a4cd6b6db.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/标题字/标题字-14.png" +dest_files=["res://.godot/imported/标题字-14.png-9810461a99289df80de7513a4cd6b6db.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/标题字/标题字-15.png b/asset/art/ui/标题字/标题字-15.png new file mode 100644 index 00000000..8b1f5cc7 Binary files /dev/null and b/asset/art/ui/标题字/标题字-15.png differ diff --git a/asset/art/ui/标题字/标题字-15.png.import b/asset/art/ui/标题字/标题字-15.png.import new file mode 100644 index 00000000..38d43102 --- /dev/null +++ b/asset/art/ui/标题字/标题字-15.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d084tnd1gp4en" +path="res://.godot/imported/标题字-15.png-cb1518b8ea2056da988601c66169417d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/标题字/标题字-15.png" +dest_files=["res://.godot/imported/标题字-15.png-cb1518b8ea2056da988601c66169417d.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/临时草稿/c02_第一章/小婵.png.import b/asset/art/临时草稿/c02_第一章/小婵.png.import deleted file mode 100644 index 81ceaf0c..00000000 --- a/asset/art/临时草稿/c02_第一章/小婵.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bvoo34sy2yvas" -path="res://.godot/imported/小婵.png-03bf9d380fc3eeb7428a96b776df8638.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/c02_第一章/小婵.png" -dest_files=["res://.godot/imported/小婵.png-03bf9d380fc3eeb7428a96b776df8638.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/临时草稿/c02_第一章/小婵拖着柜子.png b/asset/art/临时草稿/c02_第一章/小婵拖着柜子.png deleted file mode 100644 index d6b7f253..00000000 Binary files a/asset/art/临时草稿/c02_第一章/小婵拖着柜子.png and /dev/null differ diff --git a/asset/art/临时草稿/c02_第一章/小婵拖着柜子.png.import b/asset/art/临时草稿/c02_第一章/小婵拖着柜子.png.import deleted file mode 100644 index 80e17884..00000000 --- a/asset/art/临时草稿/c02_第一章/小婵拖着柜子.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cf1ww8wh4tj34" -path="res://.godot/imported/小婵拖着柜子.png-1af3a1eb16af65e924b9b1f6b5481e02.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/c02_第一章/小婵拖着柜子.png" -dest_files=["res://.godot/imported/小婵拖着柜子.png-1af3a1eb16af65e924b9b1f6b5481e02.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/临时草稿/c02_第一章/小蝶拖柜子.png b/asset/art/临时草稿/c02_第一章/小蝶拖柜子.png deleted file mode 100644 index a18e82c9..00000000 Binary files a/asset/art/临时草稿/c02_第一章/小蝶拖柜子.png and /dev/null differ diff --git a/asset/art/临时草稿/c02_第一章/小蝶拖柜子.png.import b/asset/art/临时草稿/c02_第一章/小蝶拖柜子.png.import deleted file mode 100644 index 46bec326..00000000 --- a/asset/art/临时草稿/c02_第一章/小蝶拖柜子.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ijhq1ddie3bs" -path="res://.godot/imported/小蝶拖柜子.png-187a09200af8fa8e477ac2a4f6456ab2.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/c02_第一章/小蝶拖柜子.png" -dest_files=["res://.godot/imported/小蝶拖柜子.png-187a09200af8fa8e477ac2a4f6456ab2.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/临时草稿/c02_第一章/小蝶牵着小婵跑.png b/asset/art/临时草稿/c02_第一章/小蝶牵着小婵跑.png deleted file mode 100644 index b8b82b5b..00000000 Binary files a/asset/art/临时草稿/c02_第一章/小蝶牵着小婵跑.png and /dev/null differ diff --git a/asset/art/临时草稿/c02_第一章/小蝶牵着小婵跑.png.import b/asset/art/临时草稿/c02_第一章/小蝶牵着小婵跑.png.import deleted file mode 100644 index 04e7c530..00000000 --- a/asset/art/临时草稿/c02_第一章/小蝶牵着小婵跑.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://uow4qa8lil76" -path="res://.godot/imported/小蝶牵着小婵跑.png-22b66c5487a5c527afec8eb9e1b485df.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/c02_第一章/小蝶牵着小婵跑.png" -dest_files=["res://.godot/imported/小蝶牵着小婵跑.png-22b66c5487a5c527afec8eb9e1b485df.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/临时草稿/c02_第一章/戏台特写(草稿).png b/asset/art/临时草稿/c02_第一章/戏台特写(草稿).png deleted file mode 100644 index f63e6c89..00000000 Binary files a/asset/art/临时草稿/c02_第一章/戏台特写(草稿).png and /dev/null differ diff --git a/asset/art/临时草稿/c02_第一章/戏台特写(草稿).png.import b/asset/art/临时草稿/c02_第一章/戏台特写(草稿).png.import deleted file mode 100644 index 5acd84aa..00000000 --- a/asset/art/临时草稿/c02_第一章/戏台特写(草稿).png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://2eskbvgquddd" -path="res://.godot/imported/戏台特写(草稿).png-b94c4ff91cca2bd9d90046093a52885f.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/c02_第一章/戏台特写(草稿).png" -dest_files=["res://.godot/imported/戏台特写(草稿).png-b94c4ff91cca2bd9d90046093a52885f.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/临时草稿/c02_第一章/无头小婵坐二楼.png.import b/asset/art/临时草稿/c02_第一章/无头小婵坐二楼.png.import deleted file mode 100644 index ab87dfce..00000000 --- a/asset/art/临时草稿/c02_第一章/无头小婵坐二楼.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://5gubhtifr1sf" -path="res://.godot/imported/无头小婵坐二楼.png-d470fa85930f851f03d17abf9aa1b568.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/c02_第一章/无头小婵坐二楼.png" -dest_files=["res://.godot/imported/无头小婵坐二楼.png-d470fa85930f851f03d17abf9aa1b568.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/临时草稿/c02_第一章/火柴照亮.png b/asset/art/临时草稿/c02_第一章/火柴照亮.png deleted file mode 100644 index 9eb8d036..00000000 Binary files a/asset/art/临时草稿/c02_第一章/火柴照亮.png and /dev/null differ diff --git a/asset/art/临时草稿/c02_第一章/火柴照亮.png.import b/asset/art/临时草稿/c02_第一章/火柴照亮.png.import deleted file mode 100644 index c15ea8c0..00000000 --- a/asset/art/临时草稿/c02_第一章/火柴照亮.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://x5t7r6ntkgou" -path="res://.godot/imported/火柴照亮.png-9ad89b93918666538351c4200b1126ca.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/c02_第一章/火柴照亮.png" -dest_files=["res://.godot/imported/火柴照亮.png-9ad89b93918666538351c4200b1126ca.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/临时草稿/c02_第一章/点火.png b/asset/art/临时草稿/c02_第一章/点火.png deleted file mode 100644 index a05d8fc6..00000000 Binary files a/asset/art/临时草稿/c02_第一章/点火.png and /dev/null differ diff --git a/asset/art/临时草稿/c02_第一章/点火.png.import b/asset/art/临时草稿/c02_第一章/点火.png.import deleted file mode 100644 index 11b03a3b..00000000 --- a/asset/art/临时草稿/c02_第一章/点火.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dhrjla5sbxupv" -path="res://.godot/imported/点火.png-368b4693738262691aa79732cd120256.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/c02_第一章/点火.png" -dest_files=["res://.godot/imported/点火.png-368b4693738262691aa79732cd120256.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/临时草稿/c02_第一章/疯子撞墙.png b/asset/art/临时草稿/c02_第一章/疯子撞墙.png deleted file mode 100644 index fb835903..00000000 Binary files a/asset/art/临时草稿/c02_第一章/疯子撞墙.png and /dev/null differ diff --git a/asset/art/临时草稿/c02_第一章/疯子撞墙.png.import b/asset/art/临时草稿/c02_第一章/疯子撞墙.png.import deleted file mode 100644 index 46697efa..00000000 --- a/asset/art/临时草稿/c02_第一章/疯子撞墙.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://mf6fmndirsiu" -path="res://.godot/imported/疯子撞墙.png-3c9522d6b9bb15eb3042c75060905dca.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/c02_第一章/疯子撞墙.png" -dest_files=["res://.godot/imported/疯子撞墙.png-3c9522d6b9bb15eb3042c75060905dca.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/临时草稿/c02_第一章/血脚印.png.import b/asset/art/临时草稿/c02_第一章/血脚印.png.import deleted file mode 100644 index 485c044d..00000000 --- a/asset/art/临时草稿/c02_第一章/血脚印.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c60erv8i2bvw4" -path="res://.godot/imported/血脚印.png-2c88c6a5c534e220a3da97d2109ffc6e.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/c02_第一章/血脚印.png" -dest_files=["res://.godot/imported/血脚印.png-2c88c6a5c534e220a3da97d2109ffc6e.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/临时草稿/c02_第一章/霸凌小婵.png b/asset/art/临时草稿/c02_第一章/霸凌小婵.png deleted file mode 100644 index 4b8b62fa..00000000 Binary files a/asset/art/临时草稿/c02_第一章/霸凌小婵.png and /dev/null differ diff --git a/asset/art/临时草稿/c02_第一章/霸凌小婵.png.import b/asset/art/临时草稿/c02_第一章/霸凌小婵.png.import deleted file mode 100644 index 636d4189..00000000 --- a/asset/art/临时草稿/c02_第一章/霸凌小婵.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://djatue2o05png" -path="res://.godot/imported/霸凌小婵.png-9fd21707b345eff0a67df7bee49b01e0.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/c02_第一章/霸凌小婵.png" -dest_files=["res://.godot/imported/霸凌小婵.png-9fd21707b345eff0a67df7bee49b01e0.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/临时草稿/小手_idle.png b/asset/art/临时草稿/小手_idle.png deleted file mode 100644 index 8c08aaa2..00000000 Binary files a/asset/art/临时草稿/小手_idle.png and /dev/null differ diff --git a/asset/art/临时草稿/小手_idle.png.import b/asset/art/临时草稿/小手_idle.png.import deleted file mode 100644 index 0d09c09b..00000000 --- a/asset/art/临时草稿/小手_idle.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c8m25yir6mx3n" -path="res://.godot/imported/小手_idle.png-eed8941622aa85dcf3033fc343408d35.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/小手_idle.png" -dest_files=["res://.godot/imported/小手_idle.png-eed8941622aa85dcf3033fc343408d35.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/临时草稿/小手_弹珠.png b/asset/art/临时草稿/小手_弹珠.png deleted file mode 100644 index 01203915..00000000 Binary files a/asset/art/临时草稿/小手_弹珠.png and /dev/null differ diff --git a/asset/art/临时草稿/小手_弹珠.png.import b/asset/art/临时草稿/小手_弹珠.png.import deleted file mode 100644 index a074c4f7..00000000 --- a/asset/art/临时草稿/小手_弹珠.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c37k2ecke8nxd" -path="res://.godot/imported/小手_弹珠.png-b9833d9880c6cced5498d367499dd10f.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/小手_弹珠.png" -dest_files=["res://.godot/imported/小手_弹珠.png-b9833d9880c6cced5498d367499dd10f.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/临时草稿/小手_纸杯.png b/asset/art/临时草稿/小手_纸杯.png deleted file mode 100644 index 9f77e3f2..00000000 Binary files a/asset/art/临时草稿/小手_纸杯.png and /dev/null differ diff --git a/asset/art/临时草稿/小手_纸杯.png.import b/asset/art/临时草稿/小手_纸杯.png.import deleted file mode 100644 index 7443e9e6..00000000 --- a/asset/art/临时草稿/小手_纸杯.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cnbm3w7ip0ugp" -path="res://.godot/imported/小手_纸杯.png-e4871fc2cfeb0a4b2d221dfb4a3cec7c.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/小手_纸杯.png" -dest_files=["res://.godot/imported/小手_纸杯.png-e4871fc2cfeb0a4b2d221dfb4a3cec7c.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/临时草稿/小手_老虎钳.png b/asset/art/临时草稿/小手_老虎钳.png deleted file mode 100644 index 4bb103bd..00000000 Binary files a/asset/art/临时草稿/小手_老虎钳.png and /dev/null differ diff --git a/asset/art/临时草稿/小手_老虎钳.png.import b/asset/art/临时草稿/小手_老虎钳.png.import deleted file mode 100644 index c18fd131..00000000 --- a/asset/art/临时草稿/小手_老虎钳.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dcsuydmx328uf" -path="res://.godot/imported/小手_老虎钳.png-fa821da63b9847f92dd4ed54977c6301.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/小手_老虎钳.png" -dest_files=["res://.godot/imported/小手_老虎钳.png-fa821da63b9847f92dd4ed54977c6301.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/临时草稿/小手_锡箔.png b/asset/art/临时草稿/小手_锡箔.png deleted file mode 100644 index 52151c69..00000000 Binary files a/asset/art/临时草稿/小手_锡箔.png and /dev/null differ diff --git a/asset/art/临时草稿/小手_锡箔.png.import b/asset/art/临时草稿/小手_锡箔.png.import deleted file mode 100644 index df9d3232..00000000 --- a/asset/art/临时草稿/小手_锡箔.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c3e65slphlso1" -path="res://.godot/imported/小手_锡箔.png-eba9a395c0a7338bd477a48910062a08.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/小手_锡箔.png" -dest_files=["res://.godot/imported/小手_锡箔.png-eba9a395c0a7338bd477a48910062a08.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/临时草稿/小蝉.png b/asset/art/临时草稿/小蝉.png deleted file mode 100644 index 2e887ada..00000000 Binary files a/asset/art/临时草稿/小蝉.png and /dev/null differ diff --git a/asset/art/临时草稿/敲门门板.png b/asset/art/临时草稿/敲门门板.png deleted file mode 100644 index f85a736d..00000000 Binary files a/asset/art/临时草稿/敲门门板.png and /dev/null differ diff --git a/asset/art/临时草稿/敲门门板.png.import b/asset/art/临时草稿/敲门门板.png.import deleted file mode 100644 index f70a9d1a..00000000 --- a/asset/art/临时草稿/敲门门板.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://djpmubo5y3jvo" -path="res://.godot/imported/敲门门板.png-f19997d176ee2356ea6fa9c85c047ef4.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/临时草稿/敲门门板.png" -dest_files=["res://.godot/imported/敲门门板.png-f19997d176ee2356ea6fa9c85c047ef4.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/临时草稿/瞎子.png b/asset/art/临时草稿/瞎子.png deleted file mode 100644 index 6b845db7..00000000 Binary files a/asset/art/临时草稿/瞎子.png and /dev/null differ diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index eaeed488..615375a0 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -114,6 +114,7 @@ c02_卫生宣传画,几张卫生宣传画,,, c02_老鼠洞,"一个老鼠洞 在这种楼里挺常见的",,, c02_十几年前的报纸,十几年前的报纸,,, +c02_一楼楼道被挡住,被挡住了,,, c02_火灾等待准备,还没准备好点火呢,,, c02_点火前阻止右移,没时间浪费了!想想办法救出小蝉...,,, c02_绳子剪刀,绳子和剪刀,,, diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index c0b95d9a..6aab2547 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -154,6 +154,8 @@ 几张卫生宣传画 [ID:c02_卫生宣传画] 一个老鼠洞\n在这种楼里挺常见的 [ID:c02_老鼠洞] 十几年前的报纸 [ID:c02_十几年前的报纸] +# c02 内侧楼道 +被挡住了 [ID:c02_一楼楼道被挡住] # c02 火灾 还没准备好点火呢 [ID:c02_火灾等待准备] diff --git a/asset/font/字体/ChillJinshuSongMedium.otf b/asset/font/字体/ChillJinshuSongMedium.otf new file mode 100644 index 00000000..87a246ae Binary files /dev/null and b/asset/font/字体/ChillJinshuSongMedium.otf differ diff --git a/asset/font/字体/ChillJinshuSongMedium.otf.import b/asset/font/字体/ChillJinshuSongMedium.otf.import new file mode 100644 index 00000000..c1dcfa00 --- /dev/null +++ b/asset/font/字体/ChillJinshuSongMedium.otf.import @@ -0,0 +1,35 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://bjmhscwn1ixj1" +path="res://.godot/imported/ChillJinshuSongMedium.otf-719856359d44604e0ec1c8a659d78596.fontdata" + +[deps] + +source_file="res://asset/font/字体/ChillJinshuSongMedium.otf" +dest_files=["res://.godot/imported/ChillJinshuSongMedium.otf-719856359d44604e0ec1c8a659d78596.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/scene/entity/closeup.tscn b/scene/entity/closeup.tscn index abde7247..b9564544 100644 --- a/scene/entity/closeup.tscn +++ b/scene/entity/closeup.tscn @@ -1,30 +1,22 @@ [gd_scene load_steps=9 format=3 uid="uid://dqkxiqbq83cmq"] [ext_resource type="Script" uid="uid://bg8q1leel3kx2" path="res://scene/entity/closeup.gd" id="1_tvfr1"] -[ext_resource type="Texture2D" uid="uid://b343nvvbtpglb" path="res://asset/art/ui/互动提示符/ui 像素版_纯白.png" id="2_tkmwp"] +[ext_resource type="Texture2D" uid="uid://dtyg0nugb2tnf" path="res://asset/art/ui/action_mark/UI探索.png" id="2_dnubm"] [ext_resource type="PackedScene" uid="uid://c85t6stvytvjn" path="res://scene/entity/general/sfx.tscn" id="3_a06pc"] +[ext_resource type="Texture2D" uid="uid://bc8sn2v4t1yta" path="res://asset/art/ui/action_mark/UI开锁.png" id="3_dnubm"] +[ext_resource type="Texture2D" uid="uid://xcmvfp72l061" path="res://asset/art/ui/action_mark/UI锁.png" id="3_y0fbe"] +[ext_resource type="Texture2D" uid="uid://gui0ubwlwoi0" path="res://asset/art/ui/action_mark/UI手.png" id="4_18yy2"] [ext_resource type="PackedScene" uid="uid://c4tipnj1cr1j3" path="res://scene/entity/ux/sign.tscn" id="4_dnubm"] -[sub_resource type="AtlasTexture" id="AtlasTexture_v4bjc"] -atlas = ExtResource("2_tkmwp") -region = Rect2(762, 468, 63, 63) - -[sub_resource type="AtlasTexture" id="AtlasTexture_6c6nh"] -atlas = ExtResource("2_tkmwp") -region = Rect2(498, 555, 51, 54) - -[sub_resource type="AtlasTexture" id="AtlasTexture_78gfp"] -atlas = ExtResource("2_tkmwp") -region = Rect2(762, 468, 63, 63) - [sub_resource type="RectangleShape2D" id="RectangleShape2D_ogin7"] resource_local_to_scene = true size = Vector2(10, 70) [node name="Closeup" type="Sprite2D"] script = ExtResource("1_tvfr1") -unmatched_sign_texture = SubResource("AtlasTexture_v4bjc") -matched_sign_texture = SubResource("AtlasTexture_6c6nh") +unrevealed_sign_texture = ExtResource("2_dnubm") +unmatched_sign_texture = ExtResource("3_dnubm") +matched_sign_texture = ExtResource("4_18yy2") one_shot = false prop_key = "" prop_key2 = "" @@ -40,10 +32,9 @@ file = "" [node name="Sign" parent="." instance=ExtResource("4_dnubm")] unique_name_in_owner = true -lock_on_player_freezed = true [node name="Sprite2D" parent="Sign/TextureContainer" index="0"] -texture = SubResource("AtlasTexture_78gfp") +texture = ExtResource("3_y0fbe") [node name="Area2D" type="Area2D" parent="."] unique_name_in_owner = true diff --git a/scene/entity/interactable.gd b/scene/entity/interactable.gd index 53d7b7dd..26ec467b 100644 --- a/scene/entity/interactable.gd +++ b/scene/entity/interactable.gd @@ -10,6 +10,7 @@ signal interacted_with_key(key) enabled = val if is_node_ready(): _check_sign_display() +@export var unrevealed_sign_texture: Texture2D @export var unmatched_sign_texture: Texture2D @export var matched_sign_texture: Texture2D @export var mute_when_interacted := false @@ -29,6 +30,12 @@ var prop_key3 := "" @onready var area2d = %Area2D as Area2D var ground_archive: GroundArchive +# 尝试互动的次数 +var tried_times: int: + set(val): + tried_times = val + ground_archive.set_pair(name, "tried_times", val) +# 成功互动的次数 var interacted_times: int: set(val): interacted_times = val @@ -48,6 +55,7 @@ func _ready() -> void: sign_mark.enabled = enabled # setup default value ground_archive = ArchiveManager.archive.ground_archive() + tried_times = ground_archive.get_value(name, "tried_times", 0) interacted_times = ground_archive.get_value(name, "interacted_times", 0) if interacted_times and interacted_texture: texture = interacted_texture @@ -72,18 +80,16 @@ func _reset_sign_testure_to_prop(): # 根据当前 prop,调整 sign 所显示的 texture func _set_sign_texture_to_prop(key): - if is_key_matched(key): - sign_mark.sprite2d.texture = matched_sign_texture - else: - sign_mark.sprite2d.texture = unmatched_sign_texture - # if prop_hud.cached_inventory_textures.has(key): - # var prop_texture = prop_hud.cached_inventory_textures[key] - # sign_mark.draw_shadow = true + if tried_times == 0: + # 首次交互前 unrevealed + sign_mark.sprite2d.texture = unrevealed_sign_texture + return + # 目前默认都显示 matched_sign_texture + sign_mark.sprite2d.texture = matched_sign_texture + # if is_key_matched(key): + # sign_mark.sprite2d.texture = matched_sign_texture # else: - # sign_mark.sprite2d.texture = deaulte_sign_texture - # sign_mark.draw_shadow = false - # sign_mark.queue_redraw() - + # sign_mark.sprite2d.texture = unmatched_sign_texture func _on_cancel(_body = null) -> void: # disconnect signal @@ -110,6 +116,7 @@ func is_key_matched(key) -> bool: func _on_interacted() -> void: interact_mutex.lock() + tried_times += 1 if one_shot and interacted_times >= one_shot_max_times: interact_mutex.unlock() return @@ -117,7 +124,7 @@ func _on_interacted() -> void: if not is_key_matched(key): if not mute_when_invalid: sfx_invalid.play() - sign_mark.invalid_shake() + sign_mark.invalid_shake(matched_sign_texture, unmatched_sign_texture) # SceneManager.on_toggle_invalid_prop() interact_mutex.unlock() return diff --git a/scene/entity/interactable.tscn b/scene/entity/interactable.tscn index 5d83798e..6bfbc61a 100644 --- a/scene/entity/interactable.tscn +++ b/scene/entity/interactable.tscn @@ -1,28 +1,28 @@ -[gd_scene load_steps=10 format=3 uid="uid://cw3q5pvciumil"] +[gd_scene load_steps=12 format=3 uid="uid://cw3q5pvciumil"] [ext_resource type="Script" uid="uid://dxyaip4khrkkq" path="res://scene/entity/interactable.gd" id="1_6nrd3"] +[ext_resource type="Texture2D" uid="uid://dtyg0nugb2tnf" path="res://asset/art/ui/action_mark/UI探索.png" id="2_03eog"] [ext_resource type="PackedScene" uid="uid://c85t6stvytvjn" path="res://scene/entity/general/sfx.tscn" id="2_bvj74"] [ext_resource type="Texture2D" uid="uid://b343nvvbtpglb" path="res://asset/art/ui/互动提示符/ui 像素版_纯白.png" id="2_tvf5d"] +[ext_resource type="Texture2D" uid="uid://xcmvfp72l061" path="res://asset/art/ui/action_mark/UI锁.png" id="3_4vlyw"] [ext_resource type="PackedScene" uid="uid://c4tipnj1cr1j3" path="res://scene/entity/ux/sign.tscn" id="3_qsms8"] [ext_resource type="AudioStream" uid="uid://inmdv5gqqius" path="res://asset/audio/sfx/ui/门锁互动.mp3" id="4_n1rbo"] +[ext_resource type="Texture2D" uid="uid://gui0ubwlwoi0" path="res://asset/art/ui/action_mark/UI手.png" id="4_njk43"] [ext_resource type="AudioStream" uid="uid://ccng5y2fip6mc" path="res://asset/audio/sfx/ui/开锁声.mp3" id="5_exp6m"] [sub_resource type="AtlasTexture" id="AtlasTexture_0gwq7"] atlas = ExtResource("2_tvf5d") region = Rect2(762, 468, 63, 63) -[sub_resource type="AtlasTexture" id="AtlasTexture_0ks5m"] -atlas = ExtResource("2_tvf5d") -region = Rect2(498, 555, 51, 54) - [sub_resource type="RectangleShape2D" id="RectangleShape2D_8d3b4"] resource_local_to_scene = true size = Vector2(10, 70) [node name="Interactable" type="Sprite2D"] script = ExtResource("1_6nrd3") -unmatched_sign_texture = SubResource("AtlasTexture_0gwq7") -matched_sign_texture = SubResource("AtlasTexture_0ks5m") +unrevealed_sign_texture = ExtResource("2_03eog") +unmatched_sign_texture = ExtResource("3_4vlyw") +matched_sign_texture = ExtResource("4_njk43") prop_key = "" prop_key2 = "" prop_key3 = "" @@ -37,7 +37,6 @@ file = "开锁声.mp3" [node name="Sign" parent="." instance=ExtResource("3_qsms8")] unique_name_in_owner = true -lock_on_player_freezed = true [node name="Sprite2D" parent="Sign/TextureContainer" index="0"] texture = SubResource("AtlasTexture_0gwq7") diff --git a/scene/entity/local_inspectable.tscn b/scene/entity/local_inspectable.tscn index 357e722c..def8d038 100644 --- a/scene/entity/local_inspectable.tscn +++ b/scene/entity/local_inspectable.tscn @@ -77,11 +77,11 @@ mouse_filter = 2 [node name="ContentLabel" type="Label" parent="InspectLayer/Root/Container"] unique_name_in_owner = true +modulate = Color(1, 1, 1, 0) z_index = 100 custom_minimum_size = Vector2(130, 0) layout_mode = 2 size_flags_horizontal = 4 -text = "123" label_settings = SubResource("LabelSettings_c3c2j") vertical_alignment = 1 autowrap_mode = 3 diff --git a/scene/entity/note.gd b/scene/entity/note.gd index 87e27892..8d2d62f3 100644 --- a/scene/entity/note.gd +++ b/scene/entity/note.gd @@ -34,6 +34,7 @@ var note_key := "" title_filter = val if is_node_ready() and Engine.is_editor_hint(): notify_property_list_changed() +@export var note_sign_texture: Texture2D @onready var sign_mark = %Sign as Sign @onready var area2d = %Area2D as Area2D @@ -49,6 +50,15 @@ var dialogue_res = dialogue_items var interacting = false var mutex = Mutex.new() +var ground_archive: GroundArchive +# 尝试互动的次数 +var tried_times: int: + set(val): + tried_times = val + ground_archive.set_pair(name, "tried_times", val) + if tried_times >= 1 and sign_mark: + sign_mark.sprite2d.texture = note_sign_texture + func _ready() -> void: if Engine.is_editor_hint(): @@ -59,6 +69,10 @@ func _ready() -> void: sign_mark.cancel.connect(_on_cancel) sign_mark.enabled = enabled + # setup default value + ground_archive = ArchiveManager.archive.ground_archive() + tried_times = ground_archive.get_value(name, "tried_times", 0) + func _on_interacted() -> void: if interacting: @@ -66,6 +80,7 @@ func _on_interacted() -> void: if not note_key: printerr("Note key is not set") return + tried_times += 1 %Sfx.play() var _res = dialogue_res var title = note_key diff --git a/scene/entity/note.tscn b/scene/entity/note.tscn index 9c014f9f..2d7bc664 100644 --- a/scene/entity/note.tscn +++ b/scene/entity/note.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=7 format=3 uid="uid://jr1yd46wm5je"] +[gd_scene load_steps=8 format=3 uid="uid://jr1yd46wm5je"] [ext_resource type="Script" uid="uid://clqf6pxusuvoc" path="res://scene/entity/note.gd" id="1_3igk8"] [ext_resource type="PackedScene" uid="uid://c85t6stvytvjn" path="res://scene/entity/general/sfx.tscn" id="2_qocmg"] +[ext_resource type="Texture2D" uid="uid://c0rw25jl762a1" path="res://asset/art/ui/action_mark/UI眼睛.png" id="2_ycvi5"] [ext_resource type="Texture2D" uid="uid://bei1s1uucktso" path="res://asset/art/tool/neutral_point_light.webp" id="3_xb81s"] [ext_resource type="AudioStream" uid="uid://byjcmxy5crce5" path="res://asset/audio/sfx/ui/纸条.mp3" id="3_y3pwa"] [ext_resource type="PackedScene" uid="uid://c4tipnj1cr1j3" path="res://scene/entity/ux/sign.tscn" id="5_dhwp5"] @@ -13,6 +14,7 @@ size = Vector2(20, 60) [node name="Note" type="Sprite2D"] position = Vector2(1, 0) script = ExtResource("1_3igk8") +note_sign_texture = ExtResource("2_ycvi5") note_key = "" [node name="Sfx" parent="." instance=ExtResource("2_qocmg")] @@ -22,7 +24,6 @@ file = "纸条.mp3" [node name="Sign" parent="." instance=ExtResource("5_dhwp5")] unique_name_in_owner = true -lock_on_player_freezed = true [node name="PointLight2D" type="PointLight2D" parent="."] unique_name_in_owner = true diff --git a/scene/entity/pickable.tscn b/scene/entity/pickable.tscn index 73ce9190..7eef14f5 100644 --- a/scene/entity/pickable.tscn +++ b/scene/entity/pickable.tscn @@ -28,6 +28,7 @@ offset_bottom = -24.5 [node name="PointLight2D" type="PointLight2D" parent="."] unique_name_in_owner = true +visible = false scale = Vector2(0.2, 0.2) energy = 0.0 texture = ExtResource("5_yhysn") diff --git a/scene/entity/portal.gd b/scene/entity/portal.gd index 188e6047..6603b20c 100644 --- a/scene/entity/portal.gd +++ b/scene/entity/portal.gd @@ -34,10 +34,12 @@ var target_portal := "none": @export var holding_reason_key := "" @export var default_texture: Texture2D @export var opened_texture: Texture2D +@export var unrevealed_sign_texture: Texture2D @export var default_sign_texture: Texture2D @export var opened_sign_texture: Texture2D @export var matched_sign_texture: Texture2D -@export var closed_sign_texture: Texture2D +@export var locked_sign_texture: Texture2D + var prop_key := "" @export var disable_key_after_used := true @@ -59,6 +61,11 @@ var items: PackedStringArray var ground_archive: GroundArchive +# 尝试互动的次数 +var tried_times: int: + set(val): + tried_times = val + ground_archive.set_pair(name, "tried_times", val) # Called when the node enters the scene tree for the first time. func _ready() -> void: @@ -68,6 +75,7 @@ func _ready() -> void: _reload_items() return ground_archive = ArchiveManager.archive.ground_archive() + tried_times = ground_archive.get_value(name, "tried_times", 0) status = ground_archive.get_value(name, "status", status) if GlobalConfig.DEBUG: print("Portal read status [", name, "] status=", status) @@ -98,13 +106,18 @@ func _check_sign_mark_and_texture(): texture = opened_texture elif default_texture: texture = default_texture - match status: - "locked": - sign_mark.sprite2d.texture = closed_sign_texture - "opened": - sign_mark.sprite2d.texture = opened_sign_texture - "default": - sign_mark.sprite2d.texture = default_sign_texture + if status == "default": + sign_mark.sprite2d.texture = default_sign_texture + else: + # holding 状态下,同样显示 unrevealed_sign_texture + if tried_times == 0 or holding: + sign_mark.sprite2d.texture = unrevealed_sign_texture + else: + match status: + "locked": + sign_mark.sprite2d.texture = locked_sign_texture + "opened": + sign_mark.sprite2d.texture = opened_sign_texture if target_portal == "none" or not enabled: sign_mark.enabled = false else: @@ -115,6 +128,7 @@ var interact_mutex = Mutex.new() func _on_interacted() -> void: + tried_times += 1 if holding: if holding_reason_key: var reason = tr(holding_reason_key) @@ -136,7 +150,7 @@ func _on_interacted() -> void: SceneManager.disable_prop_item(key) else: sfx_locked.global_play() - sign_mark.invalid_shake() + sign_mark.invalid_shake(locked_sign_texture, locked_sign_texture) _check_sign_mark_and_texture() interact_mutex.unlock() # 开锁尝试后,哪怕开锁成功,也需要下次操作再进入,而不是立即传送 @@ -186,10 +200,13 @@ func _reset(_body): # 根据当前 prop,调整 sign 所显示的 texture func _set_sign_texture_to_prop(key): - if not prop_key or prop_key == key: - sign_mark.sprite2d.texture = matched_sign_texture + # if not prop_key or prop_key == key: + # sign_mark.sprite2d.texture = matched_sign_texture + # else: + if tried_times: + sign_mark.sprite2d.texture = locked_sign_texture else: - sign_mark.sprite2d.texture = closed_sign_texture + sign_mark.sprite2d.texture = unrevealed_sign_texture # 暂时不启用自动传送 diff --git a/scene/entity/portal.tscn b/scene/entity/portal.tscn index cbe44629..109ec831 100644 --- a/scene/entity/portal.tscn +++ b/scene/entity/portal.tscn @@ -1,41 +1,29 @@ -[gd_scene load_steps=15 format=3 uid="uid://61pis75a8fdq"] +[gd_scene load_steps=14 format=3 uid="uid://61pis75a8fdq"] [ext_resource type="Script" uid="uid://b2dvvhawm820r" path="res://scene/entity/portal.gd" id="1_jyh6v"] +[ext_resource type="Texture2D" uid="uid://gui0ubwlwoi0" path="res://asset/art/ui/action_mark/UI手.png" id="2_1sj6c"] [ext_resource type="Texture2D" uid="uid://bc4lpa8aao60n" path="res://asset/art/ui/action_mark/传送.png" id="2_ay30q"] +[ext_resource type="Texture2D" uid="uid://r0n7qy4kr3w2" path="res://asset/art/ui/action_mark/UI场景切换.png" id="2_bxihn"] +[ext_resource type="Texture2D" uid="uid://dtyg0nugb2tnf" path="res://asset/art/ui/action_mark/UI探索.png" id="2_fr7ak"] [ext_resource type="PackedScene" uid="uid://c85t6stvytvjn" path="res://scene/entity/general/sfx.tscn" id="3_6khux"] +[ext_resource type="Texture2D" uid="uid://bc8sn2v4t1yta" path="res://asset/art/ui/action_mark/UI开锁.png" id="3_fr7ak"] [ext_resource type="AudioStream" uid="uid://bghyinc16m1nx" path="res://asset/audio/sfx/交互/收起背包.wav" id="4_p48ld"] [ext_resource type="PackedScene" uid="uid://c4tipnj1cr1j3" path="res://scene/entity/ux/sign.tscn" id="4_ty1ds"] -[ext_resource type="Texture2D" uid="uid://b343nvvbtpglb" path="res://asset/art/ui/互动提示符/ui 像素版_纯白.png" id="5_3s5wu"] [ext_resource type="AudioStream" uid="uid://ccng5y2fip6mc" path="res://asset/audio/sfx/ui/开锁声.mp3" id="5_l48hy"] [ext_resource type="AudioStream" uid="uid://c1eftumrd4mgw" path="res://asset/audio/sfx/交互/开门.wav" id="6_p48ld"] [ext_resource type="AudioStream" uid="uid://inmdv5gqqius" path="res://asset/audio/sfx/ui/门锁互动.mp3" id="7_bjcty"] -[sub_resource type="AtlasTexture" id="AtlasTexture_20tmu"] -atlas = ExtResource("5_3s5wu") -region = Rect2(495, 84, 39, 39) - -[sub_resource type="AtlasTexture" id="AtlasTexture_nnhgo"] -atlas = ExtResource("5_3s5wu") -region = Rect2(495, 267, 39, 39) - -[sub_resource type="AtlasTexture" id="AtlasTexture_l8twy"] -atlas = ExtResource("5_3s5wu") -region = Rect2(480, 468, 63, 63) - -[sub_resource type="AtlasTexture" id="AtlasTexture_lxo3t"] -atlas = ExtResource("5_3s5wu") -region = Rect2(762, 468, 63, 63) - [sub_resource type="RectangleShape2D" id="RectangleShape2D_munml"] resource_local_to_scene = true size = Vector2(25, 130) [node name="portal_left" type="Sprite2D"] script = ExtResource("1_jyh6v") -default_sign_texture = SubResource("AtlasTexture_20tmu") -opened_sign_texture = SubResource("AtlasTexture_nnhgo") -matched_sign_texture = SubResource("AtlasTexture_l8twy") -closed_sign_texture = SubResource("AtlasTexture_lxo3t") +unrevealed_sign_texture = ExtResource("2_fr7ak") +default_sign_texture = ExtResource("2_bxihn") +opened_sign_texture = ExtResource("2_bxihn") +matched_sign_texture = ExtResource("3_fr7ak") +locked_sign_texture = ExtResource("3_fr7ak") prop_key = "" [node name="SfxDefault" parent="." instance=ExtResource("3_6khux")] @@ -67,7 +55,7 @@ enabled = false [node name="Sprite2D" parent="Sign/TextureContainer" index="0"] position = Vector2(0, 10) -texture = SubResource("AtlasTexture_20tmu") +texture = ExtResource("2_1sj6c") [node name="PointLight2D" type="PointLight2D" parent="."] unique_name_in_owner = true diff --git a/scene/entity/ux/sign.gd b/scene/entity/ux/sign.gd index c4716adf..56e6a58a 100644 --- a/scene/entity/ux/sign.gd +++ b/scene/entity/ux/sign.gd @@ -172,7 +172,7 @@ func _unhandled_input(event: InputEvent) -> void: if Engine.is_editor_hint() or not enabled or pass_unhandled_input: return # if lock_on_player_freezed and SceneManager.is_palyer_freezed_or_locked(): - # return + # return if SceneManager.get_player().action_locked: return if activated: @@ -203,8 +203,8 @@ func _set_handled(): var shake_tween -# 使用无效道具,抖动提示 -func invalid_shake(): +# 使用无效道具,抖动提示;抖动时使用 texture2d 并且变红为 mod +func invalid_shake(normal_texture: Texture2D = null, invalid_texture: Texture2D = null, mod := Color(1.0, 0.6, 0.6, 1.0)): if shake_tween: shake_tween.kill() # 抖动效果,逐渐减弱 @@ -215,14 +215,18 @@ func invalid_shake(): var origin_pos = Vector2.ZERO var count = int(duration * fps) var delta_t = 1.0 / fps - sprite2d.modulate = Color(1.0, 0.6, 0.6, 1.0) + if invalid_texture: + sprite2d.texture = invalid_texture + sprite2d.modulate = mod for i in range(count): var offset = Vector2(randf_range(-delta, delta), randf_range(-delta, delta)) * exp(-i) shake_tween.tween_property(sprite2d, "position", origin_pos + offset, delta_t).set_trans( Tween.TRANS_CUBIC ) - shake_tween.tween_callback(_reset_modulate) + shake_tween.tween_callback(_reset_sprite2d.bind(normal_texture)) -func _reset_modulate(): - sprite2d.modulate = Color(1.0, 1.0, 1.0, 1.0) +func _reset_sprite2d(texture2d): + sprite2d.modulate = Color.WHITE + if texture2d: + sprite2d.texture = texture2d diff --git a/scene/entity/ux/sign.tscn b/scene/entity/ux/sign.tscn index dc30763f..89b7be5d 100644 --- a/scene/entity/ux/sign.tscn +++ b/scene/entity/ux/sign.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=3 format=3 uid="uid://c4tipnj1cr1j3"] -[ext_resource type="Texture2D" uid="uid://bp8cdf6p8e56a" path="res://asset/art/ui/action_mark/探索ui.png" id="1_40b58"] [ext_resource type="Script" uid="uid://creybi0q3rg38" path="res://scene/entity/ux/sign.gd" id="2_kaoka"] +[ext_resource type="Texture2D" uid="uid://dtyg0nugb2tnf" path="res://asset/art/ui/action_mark/UI探索.png" id="2_y564w"] [node name="Sign" type="Control"] layout_mode = 3 anchors_preset = 0 -scale = Vector2(0.2, 0.2) +scale = Vector2(0.15, 0.15) size_flags_horizontal = 4 size_flags_vertical = 4 mouse_filter = 2 @@ -26,4 +26,4 @@ mouse_filter = 2 unique_name_in_owner = true light_mask = 16 position = Vector2(3.8147e-06, 3.8147e-06) -texture = ExtResource("1_40b58") +texture = ExtResource("2_y564w") diff --git a/scene/ground/ground.gd b/scene/ground/ground.gd index ea5e9ae0..2523c506 100644 --- a/scene/ground/ground.gd +++ b/scene/ground/ground.gd @@ -50,11 +50,21 @@ const FOOTSTEP_AUDIO = { "crawling": preload("res://config/audio/sfx/footstep_crawling.tres"), } +var restarting = false -func _ready() -> void: +func _enter_tree() -> void: # 仅在编辑器中调试时,通过 main 场景启动 if GlobalConfig.DEBUG and (not Engine.is_editor_hint()) and (not get_parent() is GroundLoader): + print("restarting...") call_deferred("_restart_from_main") + restarting= true + return + if camera_focus_marker: + camera_focus_marker.enabled = true + +func _ready() -> void: + if restarting: + print("restarting: skip ground _ready()") return # bg layer 位置,在编辑器中显示在正后方 if Engine.is_editor_hint(): @@ -92,11 +102,6 @@ func _restart_from_main(): get_parent().queue_free() -func _enter_tree() -> void: - if camera_focus_marker: - camera_focus_marker.enabled = true - - func _reset_player_y(): # 从屏幕下边缘算起 if player_y_fixed: diff --git a/scene/ground/scene/animation_root.gd b/scene/ground/scene/animation_root.gd index b571e7d4..bf7e0093 100644 --- a/scene/ground/scene/animation_root.gd +++ b/scene/ground/scene/animation_root.gd @@ -25,6 +25,13 @@ func _default_data() -> Dictionary: func _ready() -> void: + ground = get_node("..") + if not ground: + printerr("ground not found") + return + if ground.restarting: + print("restarting: skip animation root _ready()") + return data.merge(_default_data(), true) if Engine.is_editor_hint(): # notify_property_list_changed() @@ -38,12 +45,10 @@ func _ready() -> void: if data.has(key): data[key] = archive_data[key] # 等待 DeployLayer 先加载完成 - ground = get_node("..") - if ground: - if not ground.is_node_ready(): - ground.ready.connect(_on_ground_ready) - else: - _on_ground_ready() + if not ground.is_node_ready(): + ground.ready.connect(_on_ground_ready) + else: + _on_ground_ready() ready.connect(_on_ready) diff --git a/scene/ground/scene/c01/s07_书店外.tscn b/scene/ground/scene/c01/s07_书店外.tscn index 5c2844c0..f1495ed5 100644 --- a/scene/ground/scene/c01/s07_书店外.tscn +++ b/scene/ground/scene/c01/s07_书店外.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=3 uid="uid://ds2iyfndwamiy"] +[gd_scene load_steps=29 format=3 uid="uid://ds2iyfndwamiy"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_2vqpo"] [ext_resource type="Script" uid="uid://1bq3lbv6of1v" path="res://scene/ground/scene/c01/s07_animation.gd" id="2_dhaq4"] @@ -19,9 +19,9 @@ [ext_resource type="Texture2D" uid="uid://dol25yn3fixim" path="res://asset/art/fog_mask.png" id="9_amurr"] [ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="9_f61dl"] [ext_resource type="PackedScene" uid="uid://b50n0hvs4yh75" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.tscn" id="9_slaub"] -[ext_resource type="Texture2D" uid="uid://b343nvvbtpglb" path="res://asset/art/ui/互动提示符/ui 像素版_纯白.png" id="12_opkwc"] [ext_resource type="Texture2D" uid="uid://cxi0n7ra3blhr" path="res://asset/art/scene/c01/s07_书店外/书店外街道黄昏参考.png" id="12_vjih6"] [ext_resource type="AudioStream" uid="uid://dwvpevfbtqbm1" path="res://asset/audio/sfx/环境音/序章/03_书店外黄昏_舞刀声音.wav" id="14_c7jb6"] +[ext_resource type="Texture2D" uid="uid://dtyg0nugb2tnf" path="res://asset/art/ui/action_mark/UI探索.png" id="14_sqlmr"] [sub_resource type="AtlasTexture" id="AtlasTexture_amurr"] atlas = ExtResource("3_l7171") @@ -56,10 +56,6 @@ animations = [{ "speed": 5.0 }] -[sub_resource type="AtlasTexture" id="AtlasTexture_nnhgo"] -atlas = ExtResource("12_opkwc") -region = Rect2(495, 267, 39, 39) - [sub_resource type="RectangleShape2D" id="RectangleShape2D_na2nu"] resource_local_to_scene = true size = Vector2(25, 130) @@ -140,7 +136,7 @@ holding_reason_key = "c01_s07_需要报纸" enabled = true [node name="Sprite2D" parent="Ground/DeployLayer/portal_2/Sign/TextureContainer" index="0"] -texture = SubResource("AtlasTexture_nnhgo") +texture = ExtResource("14_sqlmr") [node name="CollisionShape2D" parent="Ground/DeployLayer/portal_2/Area2D" index="0"] shape = SubResource("RectangleShape2D_na2nu") diff --git a/scene/ground/scene/c02/s01_街道.tscn b/scene/ground/scene/c02/s01_街道.tscn index 6bd47700..f30f38a3 100644 --- a/scene/ground/scene/c02/s01_街道.tscn +++ b/scene/ground/scene/c02/s01_街道.tscn @@ -25,11 +25,13 @@ texture = ExtResource("2_ni1a4") [node name="portal_left" parent="Ground/DeployLayer" index="0"] position = Vector2(78, 27) immediately = true +matched_sign_texture = null [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(392, 2) target_scene = "c02_s02" target_portal = "left" +matched_sign_texture = null [node name="Note寻人启事" parent="Ground/DeployLayer" index="2" instance=ExtResource("3_6lnxd")] position = Vector2(250, -22) diff --git a/scene/ground/scene/c02/s02_animation.gd b/scene/ground/scene/c02/s02_animation.gd index eb81f07a..e8b4d0e5 100644 --- a/scene/ground/scene/c02/s02_animation.gd +++ b/scene/ground/scene/c02/s02_animation.gd @@ -100,7 +100,6 @@ func check_if_show_shoes(): if interactable.interacted_times > 0: # 如果已经交互过,则不再推鞋子 return - # TODO SceneManager.pop_debug_dialog_info("美术", "推【小鞋子1】的动画待优化") SceneManager.freeze_player(2.0) $"../DeployLayer/Note老鼠洞".enabled = false diff --git a/scene/ground/scene/c02/s02_过道.tscn b/scene/ground/scene/c02/s02_过道.tscn index 3ebd6276..06a6555c 100644 --- a/scene/ground/scene/c02/s02_过道.tscn +++ b/scene/ground/scene/c02/s02_过道.tscn @@ -67,12 +67,12 @@ size = Vector2(10, 70) [sub_resource type="RectangleShape2D" id="RectangleShape2D_mjnwv"] size = Vector2(17, 91) -[sub_resource type="Gradient" id="Gradient_m1xet"] +[sub_resource type="Gradient" id="Gradient_gjwum"] offsets = PackedFloat32Array(0.00928382, 0.681698, 1) colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0) [sub_resource type="GradientTexture2D" id="GradientTexture2D_fvldj"] -gradient = SubResource("Gradient_m1xet") +gradient = SubResource("Gradient_gjwum") width = 500 height = 1000 fill = 1 @@ -108,11 +108,13 @@ offset = Vector2(0, -240) position = Vector2(32, 15) target_scene = "c02_s01" target_portal = "right" +matched_sign_texture = null [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(676, 6) target_scene = "c02_s03" target_portal = "left" +matched_sign_texture = null [node name="WindBlows" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="2"] unique_name_in_owner = true diff --git a/scene/ground/scene/c02/s03_animation.gd b/scene/ground/scene/c02/s03_animation.gd index 9fcc58cd..9e708f0d 100644 --- a/scene/ground/scene/c02/s03_animation.gd +++ b/scene/ground/scene/c02/s03_animation.gd @@ -46,6 +46,9 @@ func _on_ground_ready() -> void: # 火灾开始后,无需 enable counter.get_node("点燃").modulate.a = 1.0 new_bg.modulate.a = 1.0 + $"../DirectionalLight2D".energy = 0 + # 月光 + # $"../AmbientLayer/PointLight2D".energy = 0 else: # 离开后 counter.visible = false @@ -199,10 +202,14 @@ func _on_counter_interacted(): SceneManager.freeze_player(0, 6) ArchiveManager.set_global_entry("c02_burning", true) var new_bg = $"../DeployLayer/火灾背景" + var light = $"../DirectionalLight2D" + # var moon_light = $"../AmbientLayer/PointLight2D" var tween = create_tween() tween.tween_interval(1.5) # 火灾后的背景覆盖上来 tween.tween_property(new_bg, "modulate:a", 1.0, 2.0) + tween.parallel().tween_property(light, "energy", 0.0, 2.0) + # tween.parallel().tween_property(moon_light, "energy", 0.0, 2.0) var flame_sprite = counter.get_node("点燃") tween.parallel().tween_property(flame_sprite, "modulate:a", 1.0, 2.0) await tween.finished diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn index 48e9900e..80852a80 100644 --- a/scene/ground/scene/c02/s03_院子.tscn +++ b/scene/ground/scene/c02/s03_院子.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=62 format=3 uid="uid://djc2uaefhmu7"] +[gd_scene load_steps=64 format=3 uid="uid://djc2uaefhmu7"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_0dylx"] [ext_resource type="Script" uid="uid://dsp5plrdkrsd7" path="res://scene/ground/scene/c02/s03_animation.gd" id="2_dt5aj"] @@ -273,6 +273,18 @@ size = Vector2(250, 50) [sub_resource type="RectangleShape2D" id="RectangleShape2D_rnk1v"] +[sub_resource type="Gradient" id="Gradient_em2ma"] +offsets = PackedFloat32Array(0.00928382, 0.681698, 1) +colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0) + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_plfv5"] +gradient = SubResource("Gradient_em2ma") +width = 500 +height = 1000 +fill = 1 +fill_from = Vector2(0.5, 0.495726) +fill_to = Vector2(1, 1) + [node name="S03" type="Node2D"] metadata/_edit_horizontal_guides_ = [98.0] @@ -306,9 +318,11 @@ autoplay = "一楼二楼外侧楼道拼接-晃脚动画" position = Vector2(25, 3) target_scene = "c02_s02" target_portal = "right" +matched_sign_texture = null [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(2286, 16) +matched_sign_texture = null [node name="portal_1" parent="Ground/DeployLayer" index="2" instance=ExtResource("5_00b7a")] position = Vector2(200, 10) @@ -317,6 +331,7 @@ portal_name = "1" target_scene = "c02_s04" target_portal = "left" status = "opened" +matched_sign_texture = null [node name="portal_2" parent="Ground/DeployLayer" index="3" instance=ExtResource("5_00b7a")] position = Vector2(928, 7) @@ -325,6 +340,7 @@ debug_note = "一楼内侧过道 portal_name = "2" target_scene = "c02_s05" target_portal = "left" +matched_sign_texture = null [node name="portal_3" parent="Ground/DeployLayer" index="4" instance=ExtResource("5_00b7a")] position = Vector2(1704, 14) @@ -333,6 +349,7 @@ portal_name = "3" target_scene = "c02_s10" target_portal = "left" status = "opened" +matched_sign_texture = null [node name="火灾背景" type="Sprite2D" parent="Ground/DeployLayer" index="5"] modulate = Color(1, 1, 1, 0) @@ -382,31 +399,43 @@ frame = 4 [node name="煤油灯" parent="Ground/DeployLayer" index="10" instance=ExtResource("10_jme4f")] position = Vector2(290, 1) +mute_when_interacted = false +interacted_texture = null [node name="煤油灯2" parent="Ground/DeployLayer" index="11" instance=ExtResource("10_jme4f")] position = Vector2(610, 1) gaslight_texture = ExtResource("11_g0qhj") ground_light_texture = ExtResource("12_ni5ro") +mute_when_interacted = false +interacted_texture = null [node name="煤油灯3" parent="Ground/DeployLayer" index="12" instance=ExtResource("10_jme4f")] position = Vector2(857, 1) gaslight_texture = ExtResource("13_hw832") ground_light_texture = ExtResource("14_7pq5y") +mute_when_interacted = false +interacted_texture = null [node name="煤油灯4" parent="Ground/DeployLayer" index="13" instance=ExtResource("10_jme4f")] position = Vector2(1644, -1) gaslight_texture = ExtResource("15_pcpki") ground_light_texture = ExtResource("16_4n8vm") +mute_when_interacted = false +interacted_texture = null [node name="煤油灯5" parent="Ground/DeployLayer" index="14" instance=ExtResource("10_jme4f")] position = Vector2(1887, 0) gaslight_texture = ExtResource("17_hw832") ground_light_texture = ExtResource("18_7pq5y") +mute_when_interacted = false +interacted_texture = null [node name="煤油灯6" parent="Ground/DeployLayer" index="15" instance=ExtResource("10_jme4f")] position = Vector2(2059, 1) gaslight_texture = ExtResource("19_pcpki") ground_light_texture = ExtResource("20_4n8vm") +mute_when_interacted = false +interacted_texture = null [node name="井" type="Sprite2D" parent="Ground/DeployLayer" index="16"] light_mask = 5 @@ -425,7 +454,7 @@ packed_scene = ExtResource("24_0o4rt") [node name="Closeup井" parent="Ground/DeployLayer" index="19" instance=ExtResource("23_81juy")] z_index = 6 -position = Vector2(2072, 47) +position = Vector2(2063, 50) packed_scene = ExtResource("26_yy4fp") [node name="Ambush偷听对话" parent="Ground/DeployLayer" index="20" instance=ExtResource("25_iyaiw")] @@ -722,6 +751,13 @@ frame_progress = 0.378595 [node name="CollisionShape2D" type="CollisionShape2D" parent="Ground/DeployLayer/最终跑路"] shape = SubResource("RectangleShape2D_rnk1v") +[node name="PointLight2D" type="PointLight2D" parent="Ground/AmbientLayer" index="0"] +light_mask = 4 +position = Vector2(2189, -142) +rotation = 0.496352 +energy = 1.2 +texture = SubResource("GradientTexture2D_plfv5") + [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(25, 93) diff --git a/scene/ground/scene/c02/s04_保卫科.tscn b/scene/ground/scene/c02/s04_保卫科.tscn index 4d6752b3..4f8c6534 100644 --- a/scene/ground/scene/c02/s04_保卫科.tscn +++ b/scene/ground/scene/c02/s04_保卫科.tscn @@ -48,9 +48,11 @@ texture = ExtResource("5_cy26p") position = Vector2(67, 29) target_scene = "c02_s03" target_portal = "1" +matched_sign_texture = null [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(551, 22) +matched_sign_texture = null [node name="Closeup折锡纸" parent="Ground/DeployLayer" index="2" instance=ExtResource("6_66gue")] position = Vector2(192, 20) @@ -72,7 +74,6 @@ ground_light_texture = ExtResource("10_svuj3") [node name="小手讨东西" parent="Ground/DeployLayer" index="6" instance=ExtResource("10_a43aq")] position = Vector2(295, -6) -accept_ball_or_plier = true [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(447, 98) diff --git a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn index 702e8df6..6f906e80 100644 --- a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn +++ b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=3 uid="uid://cp8d3ag5nbjq0"] +[gd_scene load_steps=21 format=3 uid="uid://cp8d3ag5nbjq0"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_6w6et"] [ext_resource type="Script" uid="uid://dydpmjpcvt3v1" path="res://scene/ground/scene/c02/s05_animation.gd" id="2_70lf6"] @@ -10,6 +10,9 @@ [ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="8_rcuxq"] [ext_resource type="Texture2D" uid="uid://by506ky6fprab" path="res://asset/art/scene/c02/s07_二楼内侧楼道/fg_前景.png" id="8_tueh3"] [ext_resource type="PackedScene" uid="uid://0sofmhrl358m" path="res://scene/entity/npc.tscn" id="9_8t4w6"] +[ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="10_2yvhw"] +[ext_resource type="PackedScene" uid="uid://jr1yd46wm5je" path="res://scene/entity/note.tscn" id="10_8t4w6"] +[ext_resource type="PackedScene" uid="uid://c1vrp1o8ci512" path="res://scene/ground/script/c02/戏台特写.tscn" id="11_2yvhw"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_n48fn"] @@ -71,9 +74,11 @@ offset = Vector2(0, -240) position = Vector2(24, 8) target_scene = "c02_s03" target_portal = "2" +matched_sign_texture = null [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(700, 17) +matched_sign_texture = null [node name="portal_1" parent="Ground/DeployLayer" index="2" instance=ExtResource("4_tueh3")] position = Vector2(513, 22) @@ -81,6 +86,7 @@ debug_note = "通往 1012 房间" portal_name = "1" target_scene = "c02_s07" target_portal = "right" +matched_sign_texture = null [node name="Ambush桶" parent="Ground/DeployLayer" index="3" instance=ExtResource("8_rcuxq")] position = Vector2(653, 72) @@ -143,6 +149,15 @@ energy = 1.5 range_item_cull_mask = 4 texture = ExtResource("8_mrltr") +[node name="Closeup戏台" parent="Ground/DeployLayer" index="7" instance=ExtResource("10_2yvhw")] +position = Vector2(320, 23) +packed_scene = ExtResource("11_2yvhw") + +[node name="Note一楼内侧通道" parent="Ground/DeployLayer" index="8" instance=ExtResource("10_8t4w6")] +position = Vector2(390, 19) +title_filter = "c02" +note_key = "c02_一楼楼道被挡住" + [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(41, 98) @@ -155,7 +170,7 @@ texture = ExtResource("8_tueh3") points = PackedVector2Array(37, 150, 700, 150) [node name="DirectionalLight2D" parent="Ground" index="9"] -energy = 0.9 +energy = 0.85 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c02/s06_animation.gd b/scene/ground/scene/c02/s06_animation.gd index 1fba1447..0f592a18 100644 --- a/scene/ground/scene/c02/s06_animation.gd +++ b/scene/ground/scene/c02/s06_animation.gd @@ -4,7 +4,7 @@ extends AnimationRoot # 覆盖该方法 func _default_data() -> Dictionary: - return {"c02_final_show": false} + return {} func _ready() -> void: @@ -18,10 +18,9 @@ var ball_game_boys_ambush: Ambush2D var closeup_ball func _on_ground_ready() -> void: - if ArchiveManager.get_global_value("c02_burning") and not data["c02_final_show"]: - ArchiveManager.set_global_entry("c02_burning_end", true) + if ArchiveManager.get_global_value("c02_burning") and not ArchiveManager.get_global_value("c02_burning_end"): # 第一章火灾结束,尾声演出 - _c02_final_show() + _c02_final_show.call_deferred() else: # 否则,隐藏 c02_final 层 $"../DeployLayer/c02_final".visible = false @@ -111,15 +110,16 @@ func _on_ball_game_exit(success = null): # 第一章火灾结束,尾声演出 func _c02_final_show(): + var player = SceneManager.get_player() + player.set_facing_direction(Vector2(-1, 0)) SceneManager.freeze_player(0) play("c02_final_show") - # WARN: 如果不延时,开场直接显示 dialog 可能会显示失败(无报错提示) await get_tree().create_timer(0.1).timeout - SceneManager.get_player().global_position.x = 650 + player.global_position.x = 650 DialogueManager.show_dialogue_balloon(dialogue_c02, "c02_s11_谢幕交谈") func _c02_final_show_end(): SceneManager.release_player() - set_data("c02_final_show", true) + ArchiveManager.set_global_entry("c02_burning_end", true) diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn index afb0f776..92582112 100644 --- a/scene/ground/scene/c02/s06_二楼.tscn +++ b/scene/ground/scene/c02/s06_二楼.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=22 format=3 uid="uid://cootarwb44vvh"] +[gd_scene load_steps=23 format=3 uid="uid://cootarwb44vvh"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_qkymk"] [ext_resource type="Script" uid="uid://cbt0ubygchxvv" path="res://scene/ground/scene/c02/s06_animation.gd" id="2_4dg6u"] @@ -17,105 +17,80 @@ [ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="14_k01ve"] [ext_resource type="SpriteFrames" uid="uid://3nas025c2c5u" path="res://asset/art/gif/c02_杂项/frames.tres" id="14_och2w"] [ext_resource type="SpriteFrames" uid="uid://b0icyhxpj16tv" path="res://asset/art/gif/c02_谢幕演出/frames.tres" id="15_k01ve"] -[ext_resource type="Texture2D" uid="uid://bei1s1uucktso" path="res://asset/art/tool/neutral_point_light.webp" id="16_och2w"] [sub_resource type="Animation" id="Animation_k01ve"] length = 0.001 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("DirectionalLight2D:blend_mode") +tracks/0/path = NodePath("DeployLayer/c02_final/PointLight2D:energy") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 1, -"values": [2] +"update": 0, +"values": [0.0] } tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("DirectionalLight2D:energy") +tracks/1/path = NodePath("DeployLayer/c02_final/瞎子:position") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [1.0] +"values": [Vector2(475, 41.5)] } tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true -tracks/2/path = NodePath("DeployLayer/c02_final/PointLight2D:energy") +tracks/2/path = NodePath("DeployLayer/c02_final/胖子:position") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [0.0] +"values": [Vector2(501, 33.5)] } tracks/3/type = "value" tracks/3/imported = false tracks/3/enabled = true -tracks/3/path = NodePath("DeployLayer/c02_final/瞎子:position") +tracks/3/path = NodePath("DeployLayer/c02_final:visible") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector2(475, 41.5)] +"update": 1, +"values": [false] } tracks/4/type = "value" tracks/4/imported = false tracks/4/enabled = true -tracks/4/path = NodePath("DeployLayer/c02_final/胖子:position") +tracks/4/path = NodePath("DeployLayer/煤油灯:gaslight_energy") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [Vector2(501, 33.5)] +"values": [2.0] } tracks/5/type = "value" tracks/5/imported = false tracks/5/enabled = true -tracks/5/path = NodePath("DeployLayer/c02_final:visible") +tracks/5/path = NodePath("DeployLayer/煤油灯:gaslight_ground_energy") tracks/5/interp = 1 tracks/5/loop_wrap = true tracks/5/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 1, -"values": [false] -} -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("DeployLayer/煤油灯:gaslight_energy") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), "update": 0, -"values": [1.0] -} -tracks/7/type = "value" -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/path = NodePath("DeployLayer/煤油灯:gaslight_ground_energy") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [1.0] +"values": [2.0] } [sub_resource type="Animation" id="Animation_ciatp"] @@ -138,98 +113,74 @@ tracks/0/keys = { tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("DirectionalLight2D:blend_mode") +tracks/1/path = NodePath("DeployLayer/c02_final/PointLight2D:energy") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { -"times": PackedFloat32Array(0, 20.4), -"transitions": PackedFloat32Array(1, 1), -"update": 1, -"values": [1, 2] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("DirectionalLight2D:energy") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0, 0.8, 16.5, 18.5333, 20.4, 20.8667), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1), -"update": 0, -"values": [1.0, 0.5, 0.5, 2.0, 0.0, 1.0] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("DeployLayer/c02_final/PointLight2D:energy") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { "times": PackedFloat32Array(1.13333, 2.53333, 14.8333, 16.6333), "transitions": PackedFloat32Array(1, 1, 1, 1), "update": 0, "values": [0.0, 2.0, 2.0, 0.0] } -tracks/4/type = "value" -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/path = NodePath("DeployLayer/c02_final/瞎子:position") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/keys = { +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("DeployLayer/c02_final/瞎子:position") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { "times": PackedFloat32Array(0, 2.7, 9.1), "transitions": PackedFloat32Array(1, 1, 1), "update": 0, "values": [Vector2(0, 41.5), Vector2(0, 41.5), Vector2(557, 34)] } -tracks/5/type = "value" -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/path = NodePath("DeployLayer/c02_final/胖子:position") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/keys = { +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("DeployLayer/c02_final/胖子:position") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { "times": PackedFloat32Array(0, 2.7, 9.1), "transitions": PackedFloat32Array(1, 1, 1), "update": 0, "values": [Vector2(0, 41.5), Vector2(0, 41.5), Vector2(580, 25)] } -tracks/6/type = "value" -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/path = NodePath("DeployLayer/c02_final:visible") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/keys = { +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("DeployLayer/c02_final:visible") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { "times": PackedFloat32Array(0.0333333, 18.8), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [true, false] } -tracks/7/type = "value" -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/path = NodePath("DeployLayer/煤油灯:gaslight_energy") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/keys = { -"times": PackedFloat32Array(0, 1.3), +tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("DeployLayer/煤油灯:gaslight_energy") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0, 1.33333), "transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [0.0, 1.0] +"values": [0.0, 2.0] } -tracks/8/type = "value" -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/path = NodePath("DeployLayer/煤油灯:gaslight_ground_energy") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/keys = { -"times": PackedFloat32Array(0, 1.26667), +tracks/6/type = "value" +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/path = NodePath("DeployLayer/煤油灯:gaslight_ground_energy") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/keys = { +"times": PackedFloat32Array(0, 1.33333), "transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [0.0, 1.0] +"values": [0.0, 2.0] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"] @@ -238,6 +189,18 @@ _data = { &"c02_final_show": SubResource("Animation_ciatp") } +[sub_resource type="Gradient" id="Gradient_och2w"] +offsets = PackedFloat32Array(0, 0.465517, 0.734748) +colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0.252621, 1, 1, 1, 0) + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_p6da7"] +gradient = SubResource("Gradient_och2w") +width = 400 +height = 300 +fill = 1 +fill_from = Vector2(0.5, 0.5) +fill_to = Vector2(1, 1) + [node name="S06" type="Node2D"] [node name="Ground" parent="." instance=ExtResource("1_qkymk")] @@ -264,9 +227,11 @@ texture = ExtResource("3_och2w") position = Vector2(34, 8) target_scene = "c02_s07" target_portal = "1" +matched_sign_texture = null [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(899, 17) +matched_sign_texture = null [node name="portal_1" parent="Ground/DeployLayer" index="2" instance=ExtResource("4_haidv")] position = Vector2(106, 10) @@ -275,10 +240,13 @@ portal_name = "1" target_scene = "c02_s08" target_portal = "left" status = "locked" +matched_sign_texture = null prop_key = "prop_2014钥匙" [node name="煤油灯" parent="Ground/DeployLayer" index="3" instance=ExtResource("5_3p5ta")] position = Vector2(616, -14) +gaslight_energy = 2.0 +gaslight_ground_energy = 2.0 ground_height_offset = 15.0 [node name="煤油灯2" parent="Ground/DeployLayer" index="4" instance=ExtResource("5_3p5ta")] @@ -353,7 +321,7 @@ visible = false [node name="胖子" type="AnimatedSprite2D" parent="Ground/DeployLayer/c02_final"] position = Vector2(501, 33.5) sprite_frames = ExtResource("15_k01ve") -animation = &"胖子" +animation = &"小婵走路" autoplay = "胖子" [node name="瞎子" type="AnimatedSprite2D" parent="Ground/DeployLayer/c02_final"] @@ -372,7 +340,7 @@ autoplay = "小蝉" position = Vector2(617, -13) color = Color(0.982183, 0.783422, 0.692686, 1) energy = 0.0 -texture = ExtResource("16_och2w") +texture = SubResource("GradientTexture2D_p6da7") [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(41, 98) @@ -385,4 +353,8 @@ texture = ExtResource("5_26mqt") [node name="PlayerLine2D" parent="Ground/ParallaxForeground" index="2"] points = PackedVector2Array(37, 150, 900, 150) +[node name="DirectionalLight2D" parent="Ground" index="9"] +energy = 0.8 +blend_mode = 1 + [editable path="Ground"] diff --git a/scene/ground/scene/c02/s07_二楼内侧楼道.tscn b/scene/ground/scene/c02/s07_二楼内侧楼道.tscn index e66fca42..af6af831 100644 --- a/scene/ground/scene/c02/s07_二楼内侧楼道.tscn +++ b/scene/ground/scene/c02/s07_二楼内侧楼道.tscn @@ -25,12 +25,14 @@ texture = ExtResource("3_t0s64") [node name="portal_left" parent="Ground/DeployLayer" index="0"] position = Vector2(40, 11) +matched_sign_texture = null [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(589, 18) debug_note = "下到一楼内侧楼道" target_scene = "c02_s05" target_portal = "1" +matched_sign_texture = null [node name="portal_1" parent="Ground/DeployLayer" index="2" instance=ExtResource("4_5krke")] position = Vector2(374, 17) @@ -39,13 +41,15 @@ debug_note = "二楼过道 portal_name = "1" target_scene = "c02_s06" target_portal = "left" +matched_sign_texture = null [node name="煤油灯" parent="Ground/DeployLayer" index="3" instance=ExtResource("5_u2dyp")] position = Vector2(163, -7) +mute_when_interacted = false [node name="小手讨东西" parent="Ground/DeployLayer" index="4" instance=ExtResource("6_5krke")] position = Vector2(254, -5) -accept_tin_coin = true +id = 1 enabled = false [node name="Ambush海报" parent="Ground/DeployLayer" index="5" instance=ExtResource("7_6ivku")] @@ -68,7 +72,7 @@ texture = null points = PackedVector2Array(37, 150, 610, 150) [node name="DirectionalLight2D" parent="Ground" index="9"] -energy = 0.7 +energy = 0.85 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c02/s08_瞎子卧室.tscn b/scene/ground/scene/c02/s08_瞎子卧室.tscn index a2c10855..ab860cf8 100644 --- a/scene/ground/scene/c02/s08_瞎子卧室.tscn +++ b/scene/ground/scene/c02/s08_瞎子卧室.tscn @@ -126,9 +126,11 @@ position = Vector2(66, 17) target_scene = "c02_s06" target_portal = "1" status = "opened" +matched_sign_texture = null [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(676, 63) +matched_sign_texture = null [node name="瞎子小蝉对话" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="2"] visible = false diff --git a/scene/ground/scene/c02/s09_裂缝.tscn b/scene/ground/scene/c02/s09_裂缝.tscn index c80c7386..6d0bbaca 100644 --- a/scene/ground/scene/c02/s09_裂缝.tscn +++ b/scene/ground/scene/c02/s09_裂缝.tscn @@ -56,9 +56,11 @@ texture = ExtResource("4_34a6f") position = Vector2(79, 88) target_scene = "c02_s08" target_portal = "right" +matched_sign_texture = null [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(3750, 83) +matched_sign_texture = null [node name="老鼠衔大洋" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="2"] position = Vector2(3229, 68) diff --git a/scene/ground/scene/c02/s10_空房间.tscn b/scene/ground/scene/c02/s10_空房间.tscn index 0964d660..87d769f6 100644 --- a/scene/ground/scene/c02/s10_空房间.tscn +++ b/scene/ground/scene/c02/s10_空房间.tscn @@ -196,9 +196,11 @@ position = Vector2(95, 17.7469) target_scene = "c02_s03" target_portal = "3" status = "opened" +matched_sign_texture = null [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(510, 20.7047) +matched_sign_texture = null [node name="portal_1" parent="Ground/DeployLayer" index="2" instance=ExtResource("4_pde4i")] position = Vector2(364, 47.3251) @@ -207,6 +209,7 @@ enabled = false portal_name = "1" target_scene = "c02_s09" target_portal = "right" +matched_sign_texture = null [node name="墙壁封住" type="Sprite2D" parent="Ground/DeployLayer" index="3"] position = Vector2(356, 35.9719) @@ -267,6 +270,8 @@ position = Vector2(373, -10.8453) gaslight_energy = 2.0 gaslight_ground_energy = 2.0 debug_light_switch = true +mute_when_interacted = false +interacted_texture = null [node name="拼接小猫玩具" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="11"] visible = false diff --git a/scene/ground/scene/c02/s11_一楼火灾.tscn b/scene/ground/scene/c02/s11_一楼火灾.tscn index 440cd8bc..51322722 100644 --- a/scene/ground/scene/c02/s11_一楼火灾.tscn +++ b/scene/ground/scene/c02/s11_一楼火灾.tscn @@ -216,7 +216,6 @@ texture = ExtResource("11_yxsm1") [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(70, 98) -enable_light = null facing_direction = Vector2(1, 0) [node name="FGParallaxLayer" parent="Ground/ParallaxForeground" index="1"] diff --git a/scene/ground/script/c02/s00_煤油灯.tscn b/scene/ground/script/c02/s00_煤油灯.tscn index 601efbc4..9d22e3f4 100644 --- a/scene/ground/script/c02/s00_煤油灯.tscn +++ b/scene/ground/script/c02/s00_煤油灯.tscn @@ -1,23 +1,18 @@ -[gd_scene load_steps=14 format=3 uid="uid://cxw5rovg5mu1a"] +[gd_scene load_steps=15 format=3 uid="uid://cxw5rovg5mu1a"] [ext_resource type="Script" uid="uid://c8vsfqoeu26gk" path="res://scene/ground/script/c02/s00_煤油灯.gd" id="1_0aa53"] [ext_resource type="PackedScene" uid="uid://c85t6stvytvjn" path="res://scene/entity/general/sfx.tscn" id="2_merko"] [ext_resource type="Texture2D" uid="uid://b3qgmrfslj135" path="res://asset/art/scene/c02/s03_公寓一楼院子/光晕/光晕1.png" id="2_uusov"] [ext_resource type="AudioStream" uid="uid://inmdv5gqqius" path="res://asset/audio/sfx/ui/门锁互动.mp3" id="3_1xq2f"] [ext_resource type="Texture2D" uid="uid://c1nrsyh1ss82v" path="res://asset/art/scene/c02/s03_公寓一楼院子/地面物品反光/地反光1.png" id="3_y2gsk"] +[ext_resource type="Texture2D" uid="uid://dtyg0nugb2tnf" path="res://asset/art/ui/action_mark/UI探索.png" id="4_abb1f"] [ext_resource type="PackedScene" uid="uid://c4tipnj1cr1j3" path="res://scene/entity/ux/sign.tscn" id="4_w1aco"] +[ext_resource type="Texture2D" uid="uid://xcmvfp72l061" path="res://asset/art/ui/action_mark/UI锁.png" id="5_l338h"] +[ext_resource type="Texture2D" uid="uid://gui0ubwlwoi0" path="res://asset/art/ui/action_mark/UI手.png" id="6_ivr1s"] [ext_resource type="Texture2D" uid="uid://b343nvvbtpglb" path="res://asset/art/ui/互动提示符/ui 像素版_纯白.png" id="6_y2gsk"] [ext_resource type="SpriteFrames" uid="uid://j5lpwxe8woew" path="res://asset/art/scene/c02/s02_大门过道/火苗.gif" id="8_66xfe"] [ext_resource type="Texture2D" uid="uid://djfn6ya63emu0" path="res://asset/art/scene/c02/s02_大门过道/e_煤油灯座.png" id="10_h0ajm"] -[sub_resource type="AtlasTexture" id="AtlasTexture_h0ajm"] -atlas = ExtResource("6_y2gsk") -region = Rect2(186, 555, 51, 54) - -[sub_resource type="AtlasTexture" id="AtlasTexture_abb1f"] -atlas = ExtResource("6_y2gsk") -region = Rect2(498, 555, 51, 54) - [sub_resource type="RectangleShape2D" id="RectangleShape2D_h0ajm"] resource_local_to_scene = true size = Vector2(5, 70) @@ -30,8 +25,11 @@ region = Rect2(762, 468, 63, 63) script = ExtResource("1_0aa53") gaslight_texture = ExtResource("2_uusov") ground_light_texture = ExtResource("3_y2gsk") -unmatched_sign_texture = SubResource("AtlasTexture_h0ajm") -matched_sign_texture = SubResource("AtlasTexture_abb1f") +unrevealed_sign_texture = ExtResource("4_abb1f") +unmatched_sign_texture = ExtResource("5_l338h") +matched_sign_texture = ExtResource("6_ivr1s") +mute_when_interacted = true +mute_when_invalid = true prop_key = "prop_火柴" prop_key2 = "" prop_key3 = "" diff --git a/scene/ground/script/c02/井特写.tscn b/scene/ground/script/c02/井特写.tscn index 52f95f73..c91d7e03 100644 --- a/scene/ground/script/c02/井特写.tscn +++ b/scene/ground/script/c02/井特写.tscn @@ -1,9 +1,22 @@ -[gd_scene load_steps=3 format=3 uid="uid://drq7ul1eikypv"] +[gd_scene load_steps=5 format=3 uid="uid://drq7ul1eikypv"] [ext_resource type="Script" uid="uid://cvv32irrj7oo5" path="res://scene/ground/script/c02/井特写.gd" id="1_tkhcj"] [ext_resource type="SpriteFrames" uid="uid://3nas025c2c5u" path="res://asset/art/gif/c02_杂项/frames.tres" id="2_tkhcj"] +[sub_resource type="Gradient" id="Gradient_tkhcj"] +offsets = PackedFloat32Array(0, 0.330239, 0.667109) +colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0.470588, 1, 1, 1, 0) + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_hhs3h"] +gradient = SubResource("Gradient_tkhcj") +width = 361 +height = 930 +fill = 1 +fill_from = Vector2(0.414092, 0.722222) +fill_to = Vector2(1, 1) + [node name="井特写" type="CanvasLayer"] +layer = 5 script = ExtResource("1_tkhcj") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] @@ -13,3 +26,20 @@ sprite_frames = ExtResource("2_tkhcj") animation = &"水井特写" autoplay = "水井特写" frame_progress = 0.649972 + +[node name="PointLight2D" type="PointLight2D" parent="."] +position = Vector2(469, 37) +rotation = 0.494425 +energy = 3.0 +range_layer_min = 5 +range_layer_max = 5 +texture = SubResource("GradientTexture2D_hhs3h") +texture_scale = 1.5 +height = 10.0 + +[node name="DirectionalLight2D" type="DirectionalLight2D" parent="."] +position = Vector2(0, 2) +energy = 0.4 +blend_mode = 1 +range_layer_min = 5 +range_layer_max = 5 diff --git a/scene/ground/script/c02/小手_sprite_frames.tres b/scene/ground/script/c02/小手_sprite_frames.tres deleted file mode 100644 index 5984a215..00000000 --- a/scene/ground/script/c02/小手_sprite_frames.tres +++ /dev/null @@ -1,102 +0,0 @@ -[gd_resource type="SpriteFrames" load_steps=7 format=3 uid="uid://cfdr6xe6bjxbf"] - -[ext_resource type="Texture2D" uid="uid://b5psce6mmucc3" path="res://asset/art/scene/c02/小手/小手_idle.png" id="1_i604k"] -[ext_resource type="Texture2D" uid="uid://2eg2tf60mk63" path="res://asset/art/scene/c02/小手/小手(待机).png" id="2_5g3gu"] -[ext_resource type="Texture2D" uid="uid://cadoti5sjaly2" path="res://asset/art/scene/c02/小手/小手_玻璃珠_show.png" id="3_clsyo"] -[ext_resource type="Texture2D" uid="uid://bfygthx56qdix" path="res://asset/art/scene/c02/小手/小手_纸杯_show.png" id="4_lfgph"] -[ext_resource type="Texture2D" uid="uid://by5xehwr2y50m" path="res://asset/art/scene/c02/小手/小手_老虎钳_show.png" id="5_8xk0h"] -[ext_resource type="Texture2D" uid="uid://da0fyixfmy0w4" path="res://asset/art/scene/c02/小手/小手_元宝_show.png" id="6_n5um8"] - -[resource] -animations = [{ -"frames": [{ -"duration": 4.0, -"texture": ExtResource("1_i604k") -}, { -"duration": 4.0, -"texture": ExtResource("2_5g3gu") -}], -"loop": true, -"name": &"小手_idle", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("3_clsyo") -}], -"loop": true, -"name": &"小手_弹珠_hide", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("3_clsyo") -}], -"loop": true, -"name": &"小手_弹珠_idle", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("3_clsyo") -}], -"loop": true, -"name": &"小手_弹珠_show", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("4_lfgph") -}], -"loop": true, -"name": &"小手_纸杯_idle", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("4_lfgph") -}], -"loop": true, -"name": &"小手_纸杯_show", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("5_8xk0h") -}], -"loop": true, -"name": &"小手_老虎钳_hide", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("5_8xk0h") -}], -"loop": true, -"name": &"小手_老虎钳_idle", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("5_8xk0h") -}], -"loop": true, -"name": &"小手_老虎钳_show", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("6_n5um8") -}], -"loop": true, -"name": &"小手_锡箔_drop", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("6_n5um8") -}], -"loop": true, -"name": &"小手_锡箔_hide", -"speed": 5.0 -}] diff --git a/scene/ground/script/c02/小手讨东西.gd b/scene/ground/script/c02/小手讨东西.gd index 5e43eead..baa329e5 100644 --- a/scene/ground/script/c02/小手讨东西.gd +++ b/scene/ground/script/c02/小手讨东西.gd @@ -1,13 +1,14 @@ @tool extends Sprite2D -@export var accept_tin_coin := false -@export var accept_ball_or_plier := false +# 0保卫科 1二楼内侧 +@export_enum("保卫科", "二楼内侧") var id := 0 @export var enabled := true: set(val): enabled = val if is_node_ready(): sign_mark.enabled = val +@export var unrevealed_sign_texture: Texture2D @export var unmatched_sign_texture: Texture2D @export var matched_sign_texture: Texture2D @@ -42,6 +43,11 @@ var tin_coin_drop = false: coin.enabled = val if tin_coin_drop: coin.reset() +# 尝试互动的次数 +var tried_times: int: + set(val): + tried_times = val + ground_archive.set_pair(name, "tried_times", val) var coin: Pickable2D @@ -60,6 +66,7 @@ func _ready() -> void: ground_archive = ArchiveManager.archive.ground_archive() as GroundArchive is_holding_cup = ground_archive.get_value(name, "is_holding_cup", false) holding_prop = ground_archive.get_value(name, "holding_prop", "") + tried_times = ground_archive.get_value(name, "tried_times", 0) if holding_prop == "prop_弹珠": animated_sprite.play("小手_弹珠_idle") @@ -80,6 +87,18 @@ func _reset(_body = null) -> void: prop_hud.current_item_changed.connect(_set_sign_texture_to_prop) +# 在场景中调用该方法,可以跳过小手初次交互的伸出过程 +func do_first_interact(immediatelly := false): + if tried_times > 0: + return + if immediatelly: + animated_sprite.play("小手_idle") + else: + animated_sprite.play("小手_show") + await get_tree().create_timer(2).timeout + _reset_sign_testure_to_prop() + + func _reset_sign_testure_to_prop(): var key = SceneManager.get_current_prop(false) _set_sign_texture_to_prop(key) @@ -87,22 +106,11 @@ func _reset_sign_testure_to_prop(): # 根据当前 prop,调整 sign 所显示的 texture func _set_sign_texture_to_prop(key): - var interactable = false - if holding_prop != "" or is_holding_cup: - # 手持物品/纸杯电话时,允许交互,获得物品/对话 - interactable = true - if key == "prop_锡箔元宝": - interactable = true - elif accept_ball_or_plier and key == "prop_老虎钳": - interactable = ArchiveManager.get_global_value("c02_pliers_to_ball", false) - elif accept_ball_or_plier and key == "prop_弹珠": - interactable = not ArchiveManager.get_global_value("c02_pliers_to_ball", false) - - if interactable: - sign_mark.sprite2d.texture = matched_sign_texture - else: - sign_mark.sprite2d.texture = unmatched_sign_texture - + if tried_times == 0: + # 首次交互前 unrevealed + sign_mark.sprite2d.texture = unrevealed_sign_texture + return + sign_mark.sprite2d.texture = matched_sign_texture func _on_exit(_body = null) -> void: # disconnect signal @@ -136,12 +144,15 @@ var communicating = false func _on_interacted() -> void: if not interact_mutex.try_lock(): return - + tried_times += 1 + if tried_times == 0: + do_first_interact(false) + return if holding_prop != "": # 手持物品时,交互直接给玩家物品 SceneManager.enable_prop_item(holding_prop) holding_prop = "" - animated_sprite.play("小手_idle") + animated_sprite.play("小手_show") interact_mutex.unlock() return @@ -151,12 +162,10 @@ func _on_interacted() -> void: communicating = true # # 走到指定地点 # SceneManager.get_player().walk_to(Vector2(225, 98.0), 1.5) - # await get_tree().create_timer(1.6).timeout - + # await SceneManager.get_player().animation_finished animated_sprite.visible = false # 7 拿起纸杯 8 监听纸杯 SceneManager.freeze_player(0, 7) - await SceneManager.get_player().animation_finished SceneManager.get_player().force_play_animation("c00_吕萍_听纸杯") SceneManager.pop_debug_dialog_info("音效", "纸杯电话童谣") sfx_bgm.play() @@ -168,27 +177,22 @@ func _on_interacted() -> void: return var key = SceneManager.get_current_prop(false) - var interacted_success = false - SceneManager.freeze_player(0) # accept_tin_coin if key == "prop_锡箔元宝": interacted_success = true SceneManager.disable_prop_item("prop_锡箔元宝") - if accept_tin_coin: + if id == 1: # 叠成纸杯电话 animated_sprite.play("小手_锡箔_hide") is_holding_cup = true - # TODO SceneManager.pop_debug_dialog_info("美术", "叠成纸杯: 小手_锡箔_hide + 小手_纸杯_show + 小手_纸杯_idle") - await get_tree().create_timer(1.5).timeout + await get_tree().create_timer(2).timeout + # 稍等片刻再给小鞋子 SceneManager.enable_prop_item("prop_小鞋子1") ArchiveManager.set_global_entry("c02_mouse_follow_player", true) - # 稍等后显示小老鼠 - await get_tree().create_timer(0.5).timeout - SceneManager.pop_debug_dialog_info("美术", "触发⼩⽼⿏跟在玩家身后") var node = get_node("../自动跟随的老鼠") as Node2D if node: node.visible = true @@ -197,8 +201,6 @@ func _on_interacted() -> void: else: # 丢下元宝 animated_sprite.play("小手_锡箔_drop") - # TODO - SceneManager.pop_debug_dialog_info("美术", "丢下元宝: 小手_锡箔_drop + 小手_idle + 落地后的锡箔贴图") # 先设置允许 pickable,然后再设置可见性,等待动画播完再显示 tin_coin_drop = true coin.visible = false @@ -207,19 +209,17 @@ func _on_interacted() -> void: # 是否允许老虎钳换弹珠 var pliers_to_ball = ArchiveManager.get_global_value("c02_pliers_to_ball", false) - if accept_ball_or_plier and key == "prop_老虎钳" and pliers_to_ball: + if id == 0 and key == "prop_老虎钳" and pliers_to_ball: interacted_success = true SceneManager.disable_prop_item("prop_老虎钳") animated_sprite.play("小手_老虎钳_hide") - # TODO SceneManager.pop_debug_dialog_info("美术", "小手_老虎钳_hide + 小手_弹珠_show + 小手_弹珠_idle") await get_tree().create_timer(1.5).timeout holding_prop = "prop_弹珠" - elif accept_ball_or_plier and key == "prop_弹珠" and not pliers_to_ball: + elif id == 0 and key == "prop_弹珠" and not pliers_to_ball: interacted_success = true SceneManager.disable_prop_item("prop_弹珠") animated_sprite.play("小手_弹珠_hide") - # TODO SceneManager.pop_debug_dialog_info("美术", "小手_弹珠_hide + 小手_老虎钳_show + 小手_老虎钳_idle") await get_tree().create_timer(1.5).timeout holding_prop = "prop_老虎钳" @@ -230,7 +230,7 @@ func _on_interacted() -> void: _reset_sign_testure_to_prop() else: sfx_invalid.play() - sign_mark.invalid_shake() + sign_mark.invalid_shake(matched_sign_texture, unmatched_sign_texture) SceneManager.release_player() interact_mutex.unlock() diff --git a/scene/ground/script/c02/小手讨东西.tscn b/scene/ground/script/c02/小手讨东西.tscn index 79715412..8d8a8f97 100644 --- a/scene/ground/script/c02/小手讨东西.tscn +++ b/scene/ground/script/c02/小手讨东西.tscn @@ -1,26 +1,21 @@ -[gd_scene load_steps=17 format=3 uid="uid://xovlfee503a4"] +[gd_scene load_steps=18 format=3 uid="uid://xovlfee503a4"] [ext_resource type="Texture2D" uid="uid://cawpq7rnho5px" path="res://asset/art/scene/c02/小手/洞.png" id="1_47cqy"] [ext_resource type="Script" uid="uid://my5xqi3bkka6" path="res://scene/ground/script/c02/小手讨东西.gd" id="1_n7thl"] [ext_resource type="PackedScene" uid="uid://c85t6stvytvjn" path="res://scene/entity/general/sfx.tscn" id="2_40dr6"] -[ext_resource type="SpriteFrames" uid="uid://cfdr6xe6bjxbf" path="res://scene/ground/script/c02/小手_sprite_frames.tres" id="2_qju37"] +[ext_resource type="Texture2D" uid="uid://dtyg0nugb2tnf" path="res://asset/art/ui/action_mark/UI探索.png" id="3_lr23o"] [ext_resource type="AudioStream" uid="uid://inmdv5gqqius" path="res://asset/audio/sfx/ui/门锁互动.mp3" id="3_n7thl"] +[ext_resource type="Texture2D" uid="uid://xcmvfp72l061" path="res://asset/art/ui/action_mark/UI锁.png" id="4_0tuif"] [ext_resource type="AudioStream" uid="uid://ccng5y2fip6mc" path="res://asset/audio/sfx/ui/开锁声.mp3" id="4_brfob"] [ext_resource type="PackedScene" uid="uid://c4tipnj1cr1j3" path="res://scene/entity/ux/sign.tscn" id="5_3c204"] +[ext_resource type="Texture2D" uid="uid://gui0ubwlwoi0" path="res://asset/art/ui/action_mark/UI手.png" id="5_n2hq3"] [ext_resource type="Texture2D" uid="uid://b343nvvbtpglb" path="res://asset/art/ui/互动提示符/ui 像素版_纯白.png" id="6_r12o8"] [ext_resource type="PackedScene" uid="uid://b50n0hvs4yh75" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.tscn" id="7_brfob"] [ext_resource type="AudioStream" uid="uid://bplhqap5ydh7v" path="res://asset/audio/BGM/摇啊摇_人声.wav" id="7_yatcw"] +[ext_resource type="SpriteFrames" uid="uid://b6nvwset1hwbv" path="res://asset/art/gif/c02_小手/frames.tres" id="9_yatcw"] [ext_resource type="Texture2D" uid="uid://2mjipesnigcr" path="res://asset/art/prop/c02/锡箔元宝.png" id="10_47cqy"] [ext_resource type="PackedScene" uid="uid://dsa6frlw6e6gg" path="res://scene/entity/pickable.tscn" id="12_6lwlv"] -[sub_resource type="AtlasTexture" id="AtlasTexture_3c204"] -atlas = ExtResource("6_r12o8") -region = Rect2(186, 555, 51, 54) - -[sub_resource type="AtlasTexture" id="AtlasTexture_brfob"] -atlas = ExtResource("6_r12o8") -region = Rect2(498, 555, 51, 54) - [sub_resource type="RectangleShape2D" id="RectangleShape2D_yatcw"] resource_local_to_scene = true size = Vector2(10, 70) @@ -32,8 +27,9 @@ region = Rect2(762, 468, 63, 63) [node name="小手讨东西" type="Sprite2D"] texture = ExtResource("1_47cqy") script = ExtResource("1_n7thl") -unmatched_sign_texture = SubResource("AtlasTexture_3c204") -matched_sign_texture = SubResource("AtlasTexture_brfob") +unrevealed_sign_texture = ExtResource("3_lr23o") +unmatched_sign_texture = ExtResource("4_0tuif") +matched_sign_texture = ExtResource("5_n2hq3") [node name="SfxInvalid" parent="." instance=ExtResource("2_40dr6")] stream = ExtResource("3_n7thl") @@ -56,9 +52,10 @@ unique_name_in_owner = true shape = SubResource("RectangleShape2D_yatcw") [node name="小手" parent="." instance=ExtResource("7_brfob")] -sprite_frames = ExtResource("2_qju37") -animation = &"小手_纸杯_idle" -autoplay = "小手_idle" +position = Vector2(2, 19) +sprite_frames = ExtResource("9_yatcw") +animation = &"小手_show" +autostart = false action_configs = Array[Dictionary]([{ "animation_intro": &"小手_弹珠_show", &"animation_next": "小手_弹珠_idle" @@ -80,6 +77,9 @@ action_configs = Array[Dictionary]([{ }, { "animation_intro": &"小手_锡箔_drop", &"animation_next": "小手_idle" +}, { +"animation_intro": "小手_show", +&"animation_next": "小手_idle" }]) [node name="Sign" parent="." instance=ExtResource("5_3c204")] @@ -91,13 +91,13 @@ offset_bottom = -9.0 texture = SubResource("AtlasTexture_47cqy") [node name="Pickable元宝" parent="." instance=ExtResource("12_6lwlv")] -position = Vector2(-25, 94) +position = Vector2(44, 103) prop_key = "prop_锡箔元宝" [node name="Sprite2D" type="Sprite2D" parent="Pickable元宝"] show_behind_parent = true position = Vector2(0, -14) -scale = Vector2(0.25, 0.25) +scale = Vector2(0.15, 0.15) texture = ExtResource("10_47cqy") [editable path="Sign"] diff --git a/scene/ground/script/c02/戏台特写.gd b/scene/ground/script/c02/戏台特写.gd new file mode 100644 index 00000000..105a3cc2 --- /dev/null +++ b/scene/ground/script/c02/戏台特写.gd @@ -0,0 +1,6 @@ +extends CanvasLayer + +signal exit + +func _ready() -> void: + layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME \ No newline at end of file diff --git a/scene/ground/script/c02/戏台特写.gd.uid b/scene/ground/script/c02/戏台特写.gd.uid new file mode 100644 index 00000000..76c05391 --- /dev/null +++ b/scene/ground/script/c02/戏台特写.gd.uid @@ -0,0 +1 @@ +uid://baocsio2v7pme diff --git a/scene/ground/script/c02/戏台特写.tscn b/scene/ground/script/c02/戏台特写.tscn new file mode 100644 index 00000000..d87ac0c3 --- /dev/null +++ b/scene/ground/script/c02/戏台特写.tscn @@ -0,0 +1,28 @@ +[gd_scene load_steps=4 format=3 uid="uid://c1vrp1o8ci512"] + +[ext_resource type="Script" uid="uid://baocsio2v7pme" path="res://scene/ground/script/c02/戏台特写.gd" id="1_eu5r2"] +[ext_resource type="SpriteFrames" uid="uid://3nas025c2c5u" path="res://asset/art/gif/c02_杂项/frames.tres" id="2_timwg"] +[ext_resource type="Texture2D" uid="uid://bu8xfivm2dpp4" path="res://asset/art/scene/c02/旧版/s11_3014回忆版/e_戏台.png" id="3_eu5r2"] + +[node name="戏台特写" type="CanvasLayer"] +script = ExtResource("1_eu5r2") + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +visible = false +position = Vector2(283, 147) +scale = Vector2(1.3, 1.3) +sprite_frames = ExtResource("2_timwg") +animation = &"拿纸杯" +autoplay = "水井特写" + +[node name="Sprite2D" type="Sprite2D" parent="."] +position = Vector2(283, 151) +texture = ExtResource("3_eu5r2") + +[node name="Label" type="Label" parent="."] +offset_left = 254.0 +offset_top = 77.0 +offset_right = 302.0 +offset_bottom = 110.0 +text = "戏台特写 +" diff --git a/scene/ground/script/c02/火灾区域燃烧脚本.gd b/scene/ground/script/c02/火灾区域燃烧脚本.gd index b5d328a3..9edcb178 100644 --- a/scene/ground/script/c02/火灾区域燃烧脚本.gd +++ b/scene/ground/script/c02/火灾区域燃烧脚本.gd @@ -37,4 +37,5 @@ func _on_body_entered(_node = null) -> void: # 透明度逐渐变为 1 tween.tween_property(self, "modulate:a", 1.0, 2.5) # 播放动画 + # light_mask = 17 play(animation) diff --git a/scene/player/main_player.gd b/scene/player/main_player.gd index da539104..705e2ef0 100644 --- a/scene/player/main_player.gd +++ b/scene/player/main_player.gd @@ -263,6 +263,7 @@ func force_play_animation(animation: String) -> void: func set_facing_direction(direction: Vector2) -> void: facing_direction = direction + _play_animation() # func _draw() -> void: