diff --git a/asset/art/gif/c02_小手/c02_小手_frames.tres b/asset/art/gif/c02_小手/c02_小手_frames.tres index f27ebe5d..e463c14f 100644 --- a/asset/art/gif/c02_小手/c02_小手_frames.tres +++ b/asset/art/gif/c02_小手/c02_小手_frames.tres @@ -1,88 +1,88 @@ [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_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_小手/小手_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/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_qurqp"] -[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_小手/小手_弹珠_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/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_小手/小手_弹珠_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_小手/小手_弹珠_hide/6.png" id="7_405cl"] -[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_小手/小手_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_小手/小手_弹珠_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_小手/小手_纸杯_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_小手/小手_老虎钳_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"] +[ext_resource type="Texture2D" uid="uid://bsxqj8wgg63vt" path="res://asset/art/gif/c02_小手/小手_show/0.png" id="1_6vtg8"] +[ext_resource type="Texture2D" uid="uid://boscia1p7c07d" path="res://asset/art/gif/c02_小手/小手_弹珠_show/0.png" id="1_it2fn"] +[ext_resource type="Texture2D" uid="uid://bhgp2g8chocsq" path="res://asset/art/gif/c02_小手/小手_idle/0.png" id="1_v4n4n"] +[ext_resource type="Texture2D" uid="uid://cvvjyi7h6h4ng" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/0.png" id="1_vye64"] +[ext_resource type="Texture2D" uid="uid://dfn4cp6pguisc" path="res://asset/art/gif/c02_小手/小手_idle/1.png" id="2_8j3gj"] +[ext_resource type="Texture2D" uid="uid://c5nh6rudlyxpd" path="res://asset/art/gif/c02_小手/小手_show/1.png" id="2_8yvfx"] +[ext_resource type="Texture2D" uid="uid://cooclnmo8dn76" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/1.png" id="2_py3b2"] +[ext_resource type="Texture2D" uid="uid://ds5f21agtfxoi" path="res://asset/art/gif/c02_小手/小手_弹珠_show/1.png" id="2_qurqp"] +[ext_resource type="Texture2D" uid="uid://cqebdpcixd32u" path="res://asset/art/gif/c02_小手/小手_弹珠_show/2.png" id="3_vye64"] +[ext_resource type="Texture2D" uid="uid://lhmu3wvi48m4" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/2.png" id="3_wq7ej"] +[ext_resource type="Texture2D" uid="uid://bojwhnqvvge7q" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/3.png" id="4_d07ii"] +[ext_resource type="Texture2D" uid="uid://8kiufjcrksfk" path="res://asset/art/gif/c02_小手/小手_弹珠_show/3.png" id="4_py3b2"] +[ext_resource type="Texture2D" uid="uid://c4pu4amskjxbd" path="res://asset/art/gif/c02_小手/小手_弹珠_show/4.png" id="5_wq7ej"] +[ext_resource type="Texture2D" uid="uid://bmhambop0th5" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/4.png" id="5_yva86"] +[ext_resource type="Texture2D" uid="uid://wxe1202hflal" path="res://asset/art/gif/c02_小手/小手_弹珠_show/5.png" id="6_d07ii"] +[ext_resource type="Texture2D" uid="uid://cjpy0jeqnb51f" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/5.png" id="6_m7y8r"] +[ext_resource type="Texture2D" uid="uid://yiakyu1tfm1t" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/6.png" id="7_405cl"] +[ext_resource type="Texture2D" uid="uid://bequen203kc1h" path="res://asset/art/gif/c02_小手/小手_弹珠_hide/7.png" id="8_0necx"] +[ext_resource type="Texture2D" uid="uid://bxroq27cvsn0j" path="res://asset/art/gif/c02_小手/小手_show/2.png" id="15_oweld"] +[ext_resource type="Texture2D" uid="uid://clh0lf2rqhv2v" path="res://asset/art/gif/c02_小手/小手_show/3.png" id="16_kyunw"] +[ext_resource type="Texture2D" uid="uid://n8w1i70ywklt" path="res://asset/art/gif/c02_小手/小手_show/4.png" id="17_v4n4n"] +[ext_resource type="Texture2D" uid="uid://chsimyvkrtx01" path="res://asset/art/gif/c02_小手/小手_show/5.png" id="18_8j3gj"] +[ext_resource type="Texture2D" uid="uid://08f8syao450t" path="res://asset/art/gif/c02_小手/小手_show/6.png" id="19_ndfcs"] +[ext_resource type="Texture2D" uid="uid://b4omya1mvro6w" path="res://asset/art/gif/c02_小手/小手_show/7.png" id="20_m45x4"] +[ext_resource type="Texture2D" uid="uid://cofvv8kd53ygl" path="res://asset/art/gif/c02_小手/小手_show/8.png" id="21_go2dn"] +[ext_resource type="Texture2D" uid="uid://hbrte1c6hnm7" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/0.png" id="22_x3xqb"] +[ext_resource type="Texture2D" uid="uid://bo8gon3gtclbu" path="res://asset/art/gif/c02_小手/小手_show/9.png" id="22_xiqwu"] +[ext_resource type="Texture2D" uid="uid://dh4yr7mecpi0b" path="res://asset/art/gif/c02_小手/小手_show/10.png" id="23_emris"] +[ext_resource type="Texture2D" uid="uid://jfw6iqgt0an0" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/1.png" id="23_l4o1c"] +[ext_resource type="Texture2D" uid="uid://dmu885oc4xulq" path="res://asset/art/gif/c02_小手/小手_show/11.png" id="24_wejkl"] +[ext_resource type="Texture2D" uid="uid://bx882haqlu0no" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/2.png" id="24_wrggh"] +[ext_resource type="Texture2D" uid="uid://b8khnb4t8dx7u" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/3.png" id="25_a6sa3"] +[ext_resource type="Texture2D" uid="uid://bnts6ilbaft17" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/4.png" id="26_1jnx8"] +[ext_resource type="Texture2D" uid="uid://clriqed0e1ngp" path="res://asset/art/gif/c02_小手/小手_弹珠_idle/5.png" id="27_4q82i"] +[ext_resource type="Texture2D" uid="uid://xl5fv8mm6gw" path="res://asset/art/gif/c02_小手/小手_弹珠_show/6.png" id="35_11vlt"] +[ext_resource type="Texture2D" uid="uid://bkw8dm56oot5t" path="res://asset/art/gif/c02_小手/小手_弹珠_show/7.png" id="36_mc3mq"] +[ext_resource type="Texture2D" uid="uid://cm74p78wv11vl" path="res://asset/art/gif/c02_小手/小手_纸杯_show/4.png" id="45_11vlt"] +[ext_resource type="Texture2D" uid="uid://iig5cxtdixxm" path="res://asset/art/gif/c02_小手/小手_纸杯_show/5.png" id="46_mc3mq"] +[ext_resource type="Texture2D" uid="uid://bv0hqpnpqaevu" path="res://asset/art/gif/c02_小手/小手_纸杯_idle/0.png" id="50_nwjv4"] +[ext_resource type="Texture2D" uid="uid://pnk023884ulg" path="res://asset/art/gif/c02_小手/小手_纸杯_idle/1.png" id="51_6yug8"] +[ext_resource type="Texture2D" uid="uid://rssqa0pgxa5b" path="res://asset/art/gif/c02_小手/小手_纸杯_idle/2.png" id="52_hjmb2"] +[ext_resource type="Texture2D" uid="uid://cv5c25u45bi0h" path="res://asset/art/gif/c02_小手/小手_纸杯_idle/3.png" id="53_vg448"] +[ext_resource type="Texture2D" uid="uid://b40dgwll4w3rb" path="res://asset/art/gif/c02_小手/小手_纸杯_show/0.png" id="56_8wl6b"] +[ext_resource type="Texture2D" uid="uid://cwxf2pnqyggma" path="res://asset/art/gif/c02_小手/小手_纸杯_show/1.png" id="57_rhstw"] +[ext_resource type="Texture2D" uid="uid://dyyrepdth4qqa" path="res://asset/art/gif/c02_小手/小手_纸杯_show/2.png" id="58_rggru"] +[ext_resource type="Texture2D" uid="uid://dq8f2llbx3rc2" path="res://asset/art/gif/c02_小手/小手_纸杯_show/3.png" id="59_0fj2q"] +[ext_resource type="Texture2D" uid="uid://cb64233o57s61" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/2.png" id="59_11vlt"] +[ext_resource type="Texture2D" uid="uid://cfe8bu6lfdfrb" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/0.png" id="60_4i2m0"] +[ext_resource type="Texture2D" uid="uid://bd0rdad08ob06" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/3.png" id="60_mc3mq"] +[ext_resource type="Texture2D" uid="uid://b848bexhs14wu" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/4.png" id="61_6vtg8"] +[ext_resource type="Texture2D" uid="uid://dyf500rtglsxl" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/1.png" id="61_tfi3h"] +[ext_resource type="Texture2D" uid="uid://buadrrx1cll7e" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/5.png" id="62_8yvfx"] +[ext_resource type="Texture2D" uid="uid://kgy18oyw2ach" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/2.png" id="62_txuam"] +[ext_resource type="Texture2D" uid="uid://cu85318jk4406" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/3.png" id="63_2md67"] +[ext_resource type="Texture2D" uid="uid://qhpnhn2ecnhk" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/6.png" id="63_8wl6b"] +[ext_resource type="Texture2D" uid="uid://d4nln3dhs6nsr" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/4.png" id="64_cycr5"] +[ext_resource type="Texture2D" uid="uid://b17h6l48ayvuh" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/7.png" id="64_rhstw"] +[ext_resource type="Texture2D" uid="uid://7mtlvnikj4u" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/5.png" id="65_kh4rf"] +[ext_resource type="Texture2D" uid="uid://dg3xlvngo4lms" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/6.png" id="66_4wps5"] +[ext_resource type="Texture2D" uid="uid://4ynsh1c8gmko" path="res://asset/art/gif/c02_小手/小手_老虎钳_hide/7.png" id="67_oyp1k"] +[ext_resource type="Texture2D" uid="uid://ba1krqd8nyl1g" path="res://asset/art/gif/c02_小手/小手_老虎钳_idle/0.png" id="68_emymg"] +[ext_resource type="Texture2D" uid="uid://ddiw7y48l54x3" path="res://asset/art/gif/c02_小手/小手_老虎钳_idle/1.png" id="69_k1jwp"] +[ext_resource type="Texture2D" uid="uid://cge36n0fvx4lr" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/0.png" id="76_11vlt"] +[ext_resource type="Texture2D" uid="uid://j1tdm4gki4e8" path="res://asset/art/gif/c02_小手/小手_老虎钳_show/1.png" id="77_mc3mq"] +[ext_resource type="Texture2D" uid="uid://c7w1b7mo1gxwj" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/0.png" id="84_8j3gj"] +[ext_resource type="Texture2D" uid="uid://bqt1yhyta4d62" path="res://asset/art/gif/c02_小手/小手_锡箔_hide/0.png" id="84_rggru"] +[ext_resource type="Texture2D" uid="uid://daoj5mr6prf25" path="res://asset/art/gif/c02_小手/小手_锡箔_hide/1.png" id="85_0fj2q"] +[ext_resource type="Texture2D" uid="uid://c2xrxungvy11a" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/1.png" id="85_ndfcs"] +[ext_resource type="Texture2D" uid="uid://emgp2r2ktdvl" path="res://asset/art/gif/c02_小手/小手_锡箔_hide/2.png" id="86_c7p0v"] +[ext_resource type="Texture2D" uid="uid://5m3g5pkodx76" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/2.png" id="86_m45x4"] +[ext_resource type="Texture2D" uid="uid://dn0i6qgh8xnqw" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/3.png" id="87_go2dn"] +[ext_resource type="Texture2D" uid="uid://dsk4yifbjsdd6" path="res://asset/art/gif/c02_小手/小手_锡箔_hide/3.png" id="87_vvqf7"] +[ext_resource type="Texture2D" uid="uid://ctbeg8jmbeop0" path="res://asset/art/gif/c02_小手/小手_锡箔_hide/4.png" id="88_oweld"] +[ext_resource type="Texture2D" uid="uid://xvbqh54dpjxf" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/4.png" id="88_xiqwu"] +[ext_resource type="Texture2D" uid="uid://dc3d84wbb8xw0" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/5.png" id="89_emris"] +[ext_resource type="Texture2D" uid="uid://b7wawt82udjni" path="res://asset/art/gif/c02_小手/小手_锡箔_hide/5.png" id="89_kyunw"] +[ext_resource type="Texture2D" uid="uid://p2dp6mp2snyg" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/6.png" id="90_wejkl"] +[ext_resource type="Texture2D" uid="uid://vwx3542itv2a" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/7.png" id="91_3i5ro"] +[ext_resource type="Texture2D" uid="uid://c1d2t8iy4gvjg" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/8.png" id="92_x16n6"] +[ext_resource type="Texture2D" uid="uid://lutx2s4fce48" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/9.png" id="93_p5nec"] +[ext_resource type="Texture2D" uid="uid://dmsnp66kml14q" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/10.png" id="94_8f805"] +[ext_resource type="Texture2D" uid="uid://bvf1niui2x05" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/11.png" id="95_jk5lw"] +[ext_resource type="Texture2D" uid="uid://dk7tdu4aip06f" path="res://asset/art/gif/c02_小手/小手_锡箔_drop/12.png" id="96_674cr"] [resource] animations = [{ @@ -220,16 +220,16 @@ animations = [{ "speed": 30.0 }, { "frames": [{ -"duration": 6.0, +"duration": 12.0, "texture": ExtResource("50_nwjv4") }, { -"duration": 6.0, +"duration": 7.0, "texture": ExtResource("51_6yug8") }, { -"duration": 6.0, +"duration": 12.0, "texture": ExtResource("52_hjmb2") }, { -"duration": 6.0, +"duration": 7.0, "texture": ExtResource("53_vg448") }], "loop": true, diff --git a/asset/art/gif/c02_谢幕演出/c02_谢幕演出_frames.tres b/asset/art/gif/c02_谢幕演出/c02_谢幕演出_frames.tres index 45ea98b3..d64f77e0 100644 --- a/asset/art/gif/c02_谢幕演出/c02_谢幕演出_frames.tres +++ b/asset/art/gif/c02_谢幕演出/c02_谢幕演出_frames.tres @@ -723,39 +723,39 @@ [ext_resource type="Texture2D" uid="uid://km3jhi1oi5u4" path="res://asset/art/gif/c02_谢幕演出/吕萍小婵跑步/380.png" id="381_it71j"] [ext_resource type="Texture2D" uid="uid://cgv2o6bxoegpy" path="res://asset/art/gif/c02_谢幕演出/吕萍小婵跑步/381.png" id="382_tx2d0"] [ext_resource type="Texture2D" uid="uid://cpsh62hk8xqps" path="res://asset/art/gif/c02_谢幕演出/吕萍小婵跑步/382.png" id="383_8kyih"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手动作/0.png" id="724_met76"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/0.png" id="724_wxytj"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手动作/1.png" id="725_h63qd"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/1.png" id="725_qheme"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手动作/2.png" id="726_swhdm"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/2.png" id="726_ui1r7"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手动作/3.png" id="727_4gavh"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/3.png" id="727_sfanp"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手动作/4.png" id="728_goh3n"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/4.png" id="728_n5ty5"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手动作/5.png" id="729_ixryb"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/5.png" id="729_vxarv"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/6.png" id="730_eawim"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/7.png" id="731_cgdr5"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/8.png" id="732_yoxp8"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手跑步改后/0.png" id="738_eawim"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/0.png" id="738_xv0ps"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/1.png" id="739_3phg4"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手跑步改后/1.png" id="739_cgdr5"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/2.png" id="740_cu80e"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手跑步改后/2.png" id="740_yoxp8"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/3.png" id="741_bwi5l"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手跑步改后/3.png" id="741_m0aa6"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/4.png" id="742_6hoic"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手跑步改后/4.png" id="742_7qmlr"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手跑步改后/5.png" id="743_kuy5h"] +[ext_resource type="Texture2D" uid="uid://dxo626pxfvhyi" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手动作/0.png" id="724_met76"] +[ext_resource type="Texture2D" uid="uid://i1gfa4fri8ry" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/0.png" id="724_wxytj"] +[ext_resource type="Texture2D" uid="uid://lo23ebmh0ua3" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手动作/1.png" id="725_h63qd"] +[ext_resource type="Texture2D" uid="uid://bea25r0rs3ob4" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/1.png" id="725_qheme"] +[ext_resource type="Texture2D" uid="uid://dsg60gt2oxv7k" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手动作/2.png" id="726_swhdm"] +[ext_resource type="Texture2D" uid="uid://da15xvuil8lry" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/2.png" id="726_ui1r7"] +[ext_resource type="Texture2D" uid="uid://g32hk0bx1sbo" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手动作/3.png" id="727_4gavh"] +[ext_resource type="Texture2D" uid="uid://wacuuvoutnpj" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/3.png" id="727_sfanp"] +[ext_resource type="Texture2D" uid="uid://brh2tvg37d0h2" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手动作/4.png" id="728_goh3n"] +[ext_resource type="Texture2D" uid="uid://rwplkt61518g" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/4.png" id="728_n5ty5"] +[ext_resource type="Texture2D" uid="uid://cfoky2qr4nmfa" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手动作/5.png" id="729_ixryb"] +[ext_resource type="Texture2D" uid="uid://cxp8sujfjaowo" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/5.png" id="729_vxarv"] +[ext_resource type="Texture2D" uid="uid://bnqu70p23ma0b" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/6.png" id="730_eawim"] +[ext_resource type="Texture2D" uid="uid://m1t36gg05iwp" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/7.png" id="731_cgdr5"] +[ext_resource type="Texture2D" uid="uid://oe8enrbnxss" path="res://asset/art/gif/c02_谢幕演出/吕萍牵手跑步/8.png" id="732_yoxp8"] +[ext_resource type="Texture2D" uid="uid://7s4fhsbq6yaf" path="res://asset/art/gif/c02_谢幕演出/小婵牵手跑步改后/0.png" id="738_eawim"] +[ext_resource type="Texture2D" uid="uid://718nh6roj77g" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/0.png" id="738_xv0ps"] +[ext_resource type="Texture2D" uid="uid://do6gjn2hgbjvn" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/1.png" id="739_3phg4"] +[ext_resource type="Texture2D" uid="uid://bdpvesin2s3jf" path="res://asset/art/gif/c02_谢幕演出/小婵牵手跑步改后/1.png" id="739_cgdr5"] +[ext_resource type="Texture2D" uid="uid://q3htmq8oapqc" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/2.png" id="740_cu80e"] +[ext_resource type="Texture2D" uid="uid://i5duyxyl6357" path="res://asset/art/gif/c02_谢幕演出/小婵牵手跑步改后/2.png" id="740_yoxp8"] +[ext_resource type="Texture2D" uid="uid://bak7ovy4sdnx2" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/3.png" id="741_bwi5l"] +[ext_resource type="Texture2D" uid="uid://cbptalbp2hx57" path="res://asset/art/gif/c02_谢幕演出/小婵牵手跑步改后/3.png" id="741_m0aa6"] +[ext_resource type="Texture2D" uid="uid://dehymrnu0jlua" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/4.png" id="742_6hoic"] +[ext_resource type="Texture2D" uid="uid://covtda6tr21he" path="res://asset/art/gif/c02_谢幕演出/小婵牵手跑步改后/4.png" id="742_7qmlr"] +[ext_resource type="Texture2D" uid="uid://bls3yloikd0yc" path="res://asset/art/gif/c02_谢幕演出/小婵牵手跑步改后/5.png" id="743_kuy5h"] [ext_resource type="Texture2D" uid="uid://qins2034oklc" path="res://asset/art/gif/c02_谢幕演出/小婵呼吸/0.png" id="743_obx78"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/5.png" id="743_uj788"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/6.png" id="744_6ix4r"] +[ext_resource type="Texture2D" uid="uid://b5odye7vwom3u" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/5.png" id="743_uj788"] +[ext_resource type="Texture2D" uid="uid://c1dqhxkfwq7ts" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/6.png" id="744_6ix4r"] [ext_resource type="Texture2D" uid="uid://clte7w3245gk5" path="res://asset/art/临时草稿/c02_第一章/瞎子静态.png" id="744_bnrfw"] [ext_resource type="Texture2D" uid="uid://bfqscm5f6uis1" path="res://asset/art/gif/c02_谢幕演出/方瞎子呼吸-右/0.png" id="744_ighpp"] [ext_resource type="Texture2D" uid="uid://80i8hhkb6q6d" path="res://asset/art/gif/c02_谢幕演出/小婵呼吸/1.png" id="744_ke7o4"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手小跑/0.png" id="745_6hoic"] +[ext_resource type="Texture2D" uid="uid://b63ir0xlcirgj" path="res://asset/art/gif/c02_谢幕演出/小婵牵手小跑/0.png" id="745_6hoic"] [ext_resource type="Texture2D" uid="uid://565jg4ktibts" path="res://asset/art/gif/c02_谢幕演出/小婵捂脸/0.png" id="745_h0u7m"] [ext_resource type="Texture2D" uid="uid://btlqxqq2b47i7" path="res://asset/art/临时草稿/c02_第一章/胖子静态.png" id="745_hsrnb"] [ext_resource type="Texture2D" uid="uid://cffraix0oq6qs" path="res://asset/art/gif/c02_谢幕演出/方瞎子呼吸-右/1.png" id="745_poi3q"] @@ -764,17 +764,17 @@ [ext_resource type="Texture2D" uid="uid://8yhmmvs5wpyv" path="res://asset/art/gif/c02_谢幕演出/方瞎子走路-右/0.png" id="746_8kyih"] [ext_resource type="Texture2D" uid="uid://dexgflhkltalc" path="res://asset/art/gif/c02_谢幕演出/方瞎子走路-左/0.png" id="746_a2fjn"] [ext_resource type="Texture2D" uid="uid://deyrq0bimi61b" path="res://asset/art/gif/c02_谢幕演出/胖子呼吸/0.png" id="746_hsrnb"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手小跑/1.png" id="746_uj788"] +[ext_resource type="Texture2D" uid="uid://brvfu0k6o52md" path="res://asset/art/gif/c02_谢幕演出/小婵牵手小跑/1.png" id="746_uj788"] [ext_resource type="Texture2D" uid="uid://cokbxpbobtcmo" path="res://asset/art/gif/c02_谢幕演出/方瞎子呼吸-左/0.png" id="746_w4u8u"] [ext_resource type="Texture2D" uid="uid://b3nvbl0apes7h" path="res://asset/art/gif/c02_谢幕演出/小婵走路/1.png" id="746_ybuku"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手小跑/2.png" id="747_6ix4r"] +[ext_resource type="Texture2D" uid="uid://c5j6wmrkf1pul" path="res://asset/art/gif/c02_谢幕演出/小婵牵手小跑/2.png" id="747_6ix4r"] [ext_resource type="Texture2D" uid="uid://bwuhql8rkuevw" path="res://asset/art/gif/c02_谢幕演出/胖子呼吸/1.png" id="747_by5hw"] [ext_resource type="Texture2D" uid="uid://d0ixefd2pg24j" path="res://asset/art/gif/c02_谢幕演出/方瞎子走路-左/1.png" id="747_d1awo"] [ext_resource type="Texture2D" uid="uid://cx81d8hnx60ul" path="res://asset/art/gif/c02_谢幕演出/方瞎子走路-右/1.png" id="747_owu64"] [ext_resource type="Texture2D" uid="uid://dfgpf31gkhpbn" path="res://asset/art/gif/c02_谢幕演出/小婵捂脸/2.png" id="747_ri2jy"] [ext_resource type="Texture2D" uid="uid://bhfo7dbo3dhel" path="res://asset/art/gif/c02_谢幕演出/方瞎子呼吸-左/1.png" id="747_u4p8o"] [ext_resource type="Texture2D" uid="uid://bn5bhsio6jndh" path="res://asset/art/gif/c02_谢幕演出/小婵走路/2.png" id="747_yupub"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c02_谢幕演出/小婵牵手小跑/3.png" id="748_3hef5"] +[ext_resource type="Texture2D" uid="uid://bg6di3dppwr2i" path="res://asset/art/gif/c02_谢幕演出/小婵牵手小跑/3.png" id="748_3hef5"] [ext_resource type="Texture2D" uid="uid://b0svn4a1wghfx" path="res://asset/art/gif/c02_谢幕演出/方瞎子走路-左/2.png" id="748_5qgax"] [ext_resource type="Texture2D" uid="uid://bbk8oh2svmrq4" path="res://asset/art/gif/c02_谢幕演出/方瞎子走路-右/2.png" id="748_w4u8u"] [ext_resource type="Texture2D" uid="uid://dvgi0w1qp2117" path="res://asset/art/gif/c02_谢幕演出/小婵走路/3.png" id="748_x31r2"] @@ -3402,10 +3402,10 @@ animations = [{ "speed": 30.0 }, { "frames": [{ -"duration": 15.0, +"duration": 15.5, "texture": ExtResource("744_ighpp") }, { -"duration": 15.0, +"duration": 15.5, "texture": ExtResource("745_poi3q") }], "loop": true, @@ -3413,10 +3413,10 @@ animations = [{ "speed": 30.0 }, { "frames": [{ -"duration": 15.0, +"duration": 15.5, "texture": ExtResource("746_w4u8u") }, { -"duration": 15.0, +"duration": 15.5, "texture": ExtResource("747_u4p8o") }], "loop": true, @@ -3498,10 +3498,10 @@ animations = [{ "speed": 5.0 }, { "frames": [{ -"duration": 15.0, +"duration": 14.7, "texture": ExtResource("746_hsrnb") }, { -"duration": 15.0, +"duration": 14.7, "texture": ExtResource("747_by5hw") }], "loop": true, diff --git a/asset/art/gif/c02_谢幕演出小蝶分镜/c02_谢幕演出小蝶分镜_frames.tres b/asset/art/gif/c02_谢幕演出小蝶分镜/c02_谢幕演出小蝶分镜_frames.tres index 1ef50730..3c2b1113 100644 --- a/asset/art/gif/c02_谢幕演出小蝶分镜/c02_谢幕演出小蝶分镜_frames.tres +++ b/asset/art/gif/c02_谢幕演出小蝶分镜/c02_谢幕演出小蝶分镜_frames.tres @@ -117,20 +117,32 @@ load_path = "res://.godot/imported/1.png-53b57a801d4b42cb510931084d7602bb.ctex" [resource] animations = [{ "frames": [{ -"duration": 5.0, +"duration": 4.0, "texture": ExtResource("1_4fn1h") }, { -"duration": 5.0, +"duration": 3.0, "texture": ExtResource("2_6d3ut") }, { "duration": 5.0, "texture": ExtResource("3_lghmc") }, { -"duration": 5.0, +"duration": 3.0, "texture": ExtResource("4_ekv8g") }, { -"duration": 5.0, +"duration": 6.0, "texture": ExtResource("5_y4p0u") +}, { +"duration": 8.0, +"texture": ExtResource("2_6d3ut") +}, { +"duration": 10.0, +"texture": ExtResource("5_y4p0u") +}, { +"duration": 7.0, +"texture": ExtResource("2_6d3ut") +}, { +"duration": 2.0, +"texture": ExtResource("1_4fn1h") }], "loop": true, "name": &"嘴巴动效", @@ -413,13 +425,13 @@ animations = [{ "speed": 30.0 }, { "frames": [{ -"duration": 15.0, +"duration": 10.0, "texture": SubResource("CompressedTexture2D_34xfw") }, { -"duration": 15.0, +"duration": 10.0, "texture": SubResource("CompressedTexture2D_jj5v2") }, { -"duration": 15.0, +"duration": 10.0, "texture": SubResource("CompressedTexture2D_o6c7a") }], "loop": false, diff --git a/asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具).png b/asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具).png new file mode 100644 index 00000000..4ba04c81 Binary files /dev/null and b/asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具).png differ diff --git a/asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具).png.import b/asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具).png.import new file mode 100644 index 00000000..cf63044e --- /dev/null +++ b/asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具).png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dhrl5mlivx108" +path="res://.godot/imported/ux_戏台特写(无道具).png-67b9a4ba44b33dfe402edeedd742db17.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具).png" +dest_files=["res://.godot/imported/ux_戏台特写(无道具).png-67b9a4ba44b33dfe402edeedd742db17.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/config/gallery_theme.tres b/config/gallery_theme.tres index edde432b..87409053 100644 --- a/config/gallery_theme.tres +++ b/config/gallery_theme.tres @@ -1,16 +1,54 @@ -[gd_resource type="Theme" load_steps=4 format=3 uid="uid://ro8r1wa1bvua"] +[gd_resource type="Theme" load_steps=7 format=3 uid="uid://ro8r1wa1bvua"] [ext_resource type="FontFile" uid="uid://dr8bp6p7byb37" path="res://asset/font/字体/方正楷体简体.TTF" id="1_aypwd"] -[ext_resource type="Texture2D" uid="uid://ioq21bstunce" path="res://asset/art/ui/style_box/ui_gallery_item_panel.png" id="1_f06v1"] -[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_aypwd"] -texture = ExtResource("1_f06v1") -texture_margin_left = 1.0 -texture_margin_top = 1.0 -texture_margin_right = 1.0 -texture_margin_bottom = 1.0 +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_f06v1"] +bg_color = Color(0.6, 0.6, 0.6, 0) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color(1, 1, 1, 1) +border_blend = true +expand_margin_left = 1.0 +expand_margin_top = 1.0 +expand_margin_right = 1.0 +expand_margin_bottom = 1.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_508w1"] +bg_color = Color(0.6, 0.6, 0.6, 0) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color(1, 1, 1, 1) +border_blend = true + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_aypwd"] +bg_color = Color(0.6, 0.6, 0.6, 0) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color(0.196531, 0.0801087, 0.0529168, 1) +border_blend = true + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_r77y1"] +bg_color = Color(0.6, 0.6, 0.6, 0) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color(0.74978, 0.74978, 0.74978, 1) +border_blend = true + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_aypwd"] [resource] default_font = ExtResource("1_aypwd") default_font_size = 9 -PanelContainer/styles/panel = SubResource("StyleBoxTexture_aypwd") +Button/styles/focus = SubResource("StyleBoxFlat_f06v1") +Button/styles/hover = SubResource("StyleBoxFlat_508w1") +Button/styles/normal = SubResource("StyleBoxFlat_aypwd") +Button/styles/pressed = SubResource("StyleBoxFlat_r77y1") +PanelContainer/styles/panel = SubResource("StyleBoxEmpty_aypwd") diff --git a/scene/gallery/gallery.tscn b/scene/gallery/gallery.tscn index 6846507e..025ef87e 100644 --- a/scene/gallery/gallery.tscn +++ b/scene/gallery/gallery.tscn @@ -46,44 +46,9 @@ columns = 4 [node name="GalleryItem" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")] layout_mode = 2 packed_scene = ExtResource("3_ymhcd") -title = "1234" +title = "偷听" [node name="GalleryItem2" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")] layout_mode = 2 packed_scene = ExtResource("3_ymhcd") -title = "1234" - -[node name="GalleryItem3" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")] -layout_mode = 2 -packed_scene = ExtResource("3_ymhcd") -title = "1234" - -[node name="GalleryItem4" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")] -layout_mode = 2 -packed_scene = ExtResource("3_ymhcd") -title = "1234" - -[node name="GalleryItem5" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")] -layout_mode = 2 -packed_scene = ExtResource("3_ymhcd") -title = "1234" - -[node name="GalleryItem6" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")] -layout_mode = 2 -packed_scene = ExtResource("3_ymhcd") -title = "1234" - -[node name="GalleryItem7" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")] -layout_mode = 2 -packed_scene = ExtResource("3_ymhcd") -title = "1234" - -[node name="GalleryItem8" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")] -layout_mode = 2 -packed_scene = ExtResource("3_ymhcd") -title = "1234" - -[node name="GalleryItem9" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")] -layout_mode = 2 -packed_scene = ExtResource("3_ymhcd") -title = "1234" +title = "偷听" diff --git a/scene/gallery/gallery_item.gd b/scene/gallery/gallery_item.gd index 840a1e83..2e166c43 100644 --- a/scene/gallery/gallery_item.gd +++ b/scene/gallery/gallery_item.gd @@ -1,5 +1,5 @@ @tool -extends Button +extends Container @export var packed_scene: PackedScene: set(val): @@ -16,7 +16,8 @@ extends Button @export_tool_button("重载场景") var reload = _reload_scene @onready var title_label = %Title as Label -@onready var scene_panel = %ScenePanel as Control +@onready var scene_btn = %SceneButton as Button +@onready var scene_holder = %SceneHolder as Control @onready var display_layer = %DisplayLayer as CanvasLayer @@ -24,9 +25,9 @@ func _ready() -> void: display_layer.layer = GlobalConfig.CANVAS_LAYER_GALLERY_CARD title_label.text = title _reload_scene() - mouse_entered.connect(_on_toggle_hover.bind(true)) - mouse_exited.connect(_on_toggle_hover.bind(false)) - pressed.connect(_on_pressed) + scene_btn.mouse_entered.connect(_on_toggle_hover.bind(true)) + scene_btn.mouse_exited.connect(_on_toggle_hover.bind(false)) + scene_btn.pressed.connect(_on_pressed) var current_scene: Node2D @@ -38,8 +39,9 @@ func _reload_scene(): if not packed_scene: return current_scene = packed_scene.instantiate() - scene_panel.add_child(current_scene) - current_scene.scale = Vector2(0.2, 0.2) + scene_holder.add_child(current_scene) + current_scene.scale = Vector2.ONE / 6.0 + current_scene.position = Vector2(0, -7) func _on_toggle_hover(focus: bool): @@ -58,7 +60,7 @@ func _on_pressed(): return displaying = true if current_scene: - current_scene.reparent(display_layer) + current_scene.reparent(display_layer, false) current_scene.scale = Vector2(1, 1) current_scene.position = Vector2.ZERO current_scene.display() diff --git a/scene/gallery/gallery_item.tscn b/scene/gallery/gallery_item.tscn index fbce87c2..21d07d70 100644 --- a/scene/gallery/gallery_item.tscn +++ b/scene/gallery/gallery_item.tscn @@ -1,43 +1,45 @@ [gd_scene load_steps=3 format=3 uid="uid://du6jt6ae5ulvy"] +[ext_resource type="Theme" uid="uid://ro8r1wa1bvua" path="res://config/gallery_theme.tres" id="1_2f468"] [ext_resource type="Script" uid="uid://bk8ton7q8i6hb" path="res://scene/gallery/gallery_item.gd" id="1_2q576"] -[ext_resource type="Theme" uid="uid://ro8r1wa1bvua" path="res://config/gallery_theme.tres" id="1_wb2ol"] -[node name="GalleryItem" type="Button"] -clip_children = 2 -clip_contents = true -custom_minimum_size = Vector2(114, 80) -offset_right = 114.0 -offset_bottom = 80.0 -theme = ExtResource("1_wb2ol") +[node name="GalleryItem" type="PanelContainer"] +offset_right = 96.0 +offset_bottom = 56.0 +mouse_filter = 1 +theme = ExtResource("1_2f468") script = ExtResource("1_2q576") -[node name="BoxContainer" type="VBoxContainer" parent="."] -custom_minimum_size = Vector2(112, 63) +[node name="VBox" type="VBoxContainer" parent="."] layout_mode = 2 -offset_left = 1.0 -offset_top = 1.0 -offset_right = 113.0 -offset_bottom = 79.0 -[node name="ScenePanel" type="Control" parent="BoxContainer"] +[node name="SceneButton" type="Button" parent="VBox"] unique_name_in_owner = true +custom_minimum_size = Vector2(96, 41) +layout_mode = 2 + +[node name="SceneHolder" type="Control" parent="VBox/SceneButton"] +unique_name_in_owner = true +show_behind_parent = true clip_children = 1 clip_contents = true -custom_minimum_size = Vector2(112, 63) -layout_mode = 2 +anchors_preset = 0 +offset_left = 1.0 +offset_top = 1.0 +offset_right = 95.0 +offset_bottom = 40.0 mouse_filter = 1 -[node name="Title" type="Label" parent="BoxContainer"] +[node name="Title" type="Label" parent="VBox"] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 4 -[node name="DisplayLayer" type="CanvasLayer" parent="BoxContainer"] +[node name="DisplayLayer" type="CanvasLayer" parent="VBox"] unique_name_in_owner = true layer = 23 -[node name="ControlMask" type="Control" parent="BoxContainer/DisplayLayer"] +[node name="ControlMask" type="Control" parent="VBox/DisplayLayer"] unique_name_in_owner = true visible = false layout_mode = 3 diff --git a/scene/ground/scene/c02/s06_animation.gd b/scene/ground/scene/c02/s06_animation.gd index 210ea2b8..fc66abb9 100644 --- a/scene/ground/scene/c02/s06_animation.gd +++ b/scene/ground/scene/c02/s06_animation.gd @@ -128,7 +128,7 @@ func _c02_final_show(): # 整体流程:c02_final_show_join - 特写 - c02_final_show_end # test_end: 仅测试特写技术的后半段 var test_end = false - # var test_end = true + test_end = true if test_end: await get_tree().create_timer(2.0).timeout _on_exit_final_show(null) @@ -142,6 +142,7 @@ func _c02_final_show(): func _on_exit_final_show(_arg): + SceneManager.freeze_player(0) # 小蝉动画通过 捂脸-呼吸-移动 来控制 # 胖子与瞎子动画也是如此 var player = SceneManager.get_player() diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn index a88ed546..a4d7024a 100644 --- a/scene/ground/scene/c02/s06_二楼.tscn +++ b/scene/ground/scene/c02/s06_二楼.tscn @@ -540,7 +540,7 @@ tracks/9/keys = { "times": PackedFloat32Array(7.3, 10.2, 11.8667), "transitions": PackedFloat32Array(1, 1, 1), "update": 1, -"values": [2, 2, 1] +"values": [2, 2, 2] } tracks/10/type = "value" tracks/10/imported = false @@ -935,7 +935,7 @@ move_configs = Array[Dictionary]([{ debug_mov_animation = "胖子走路" [node name="吕萍" type="AnimatedSprite2D" parent="Ground/DeployLayer/c02_final"] -position = Vector2(652, 37) +position = Vector2(653, 38) sprite_frames = ExtResource("15_k01ve") animation = &"小蝶蹲下插火柴" autoplay = "小蝶擦火柴呼吸" diff --git a/scene/ground/script/c02/戏台特写.tscn b/scene/ground/script/c02/戏台特写.tscn index 830b23eb..5c615271 100644 --- a/scene/ground/script/c02/戏台特写.tscn +++ b/scene/ground/script/c02/戏台特写.tscn @@ -1,28 +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_杂项/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"] +[ext_resource type="Texture2D" uid="uid://dhrl5mlivx108" path="res://asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具).png" id="3_timwg"] +[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop/特写通用遮罩.png" id="4_ujm2t"] [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="TextureRect" type="TextureRect" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("3_timwg") +expand_mode = 5 +stretch_mode = 5 -[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 = "戏台特写 -" +[node name="TextureRect2" type="TextureRect" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("4_ujm2t") +expand_mode = 5 +stretch_mode = 5 diff --git a/scene/ground/script/c02/谢幕演出.gd b/scene/ground/script/c02/谢幕演出.gd index 80a45c84..6eee02a9 100644 --- a/scene/ground/script/c02/谢幕演出.gd +++ b/scene/ground/script/c02/谢幕演出.gd @@ -42,17 +42,17 @@ func start(): # 配合嘴巴动效 DialogueManager.got_dialogue.connect(_on_got_dialogue) DialogueManager.dialogue_ended.connect(_on_dialogue_ended) - root_match.hide() + root_match.position.y = 100 + # root_match.hide() await create_tween().tween_interval(3.0).finished #### part1: 擦火柴 - root_match.position.y = 100 - $"Sfx擦火柴".play() - await create_tween().tween_interval(0.3).finished - root_match.show() + # $"Sfx擦火柴".play() + # await create_tween().tween_interval(0.3).finished + # root_match.show() # 伸手 var tween = create_tween() tween.tween_property(root_match, "position:y", 0, 2.0) - tween.tween_interval(2.0) + tween.tween_interval(1.0) await tween.finished #### part2: 小蝉浮现,对话 # 小蝉侧过来 diff --git a/scene/settings/settings.gd b/scene/settings/settings.gd index 4b6d50b0..5a745302 100644 --- a/scene/settings/settings.gd +++ b/scene/settings/settings.gd @@ -16,8 +16,8 @@ signal exited @onready var gallery_btn = %GalleryBtn as Button # 音量 DB 偏移 -var sfx_db_offset := 0.0 -var dialog_db_offset := 0.0 +var sfx_db_offset := 6.0 +var dialog_db_offset := -20.0 func _ready(): layer = GlobalConfig.CANVAS_LAYER_SETTINGS