From 6f87db20c635c7646c82bfcea4ede16f1b231d19 Mon Sep 17 00:00:00 2001 From: cakipaul Date: Tue, 4 Feb 2025 19:50:48 +0800 Subject: [PATCH] =?UTF-8?q?prop=20hud=20=E5=8F=B3=E4=BE=A7=E5=B1=95?= =?UTF-8?q?=E5=BC=80=E5=88=86=E6=A0=8F=EF=BC=9A=E8=A2=AB=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E9=A1=B9+=E5=8F=B3=E4=BE=A7=E5=B1=95=E5=BC=80=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=EF=BC=8C=E5=8F=B3=E4=BE=A7=E5=8C=BA=E5=9F=9F=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=80=89=E4=B8=AD=E9=81=93=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asset/art/ui/hud/select_mark.png | Bin 0 -> 405 bytes asset/art/ui/hud/select_mark.png.import | 34 +++++ asset/art/ui/hud/selecting_bg.png | Bin 0 -> 4832 bytes asset/art/ui/hud/selecting_bg.png.import | 34 +++++ scene/prop/prop_hud.gd | 177 +++++++++++++++-------- scene/prop/prop_hud.tscn | 93 ++++++++++-- scene/prop/prop_inventory_resource.gd | 3 +- scene/prop/test_hbox.gd | 2 +- 8 files changed, 268 insertions(+), 75 deletions(-) create mode 100644 asset/art/ui/hud/select_mark.png create mode 100644 asset/art/ui/hud/select_mark.png.import create mode 100644 asset/art/ui/hud/selecting_bg.png create mode 100644 asset/art/ui/hud/selecting_bg.png.import diff --git a/asset/art/ui/hud/select_mark.png b/asset/art/ui/hud/select_mark.png new file mode 100644 index 0000000000000000000000000000000000000000..a1d35cdc9ec1d86d845a696cf031c9ce99bf9b9b GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^O(4v{1|++f1^xml#^NA%Cx&(BWL^T<{+=$5Ar*7p z-a6ZR$UuVS0%PC|>4m#YCY{?PE+3Y3Sn7v?ebxImj z=cRXL`=75k_453Kcanc@so1!u`iU>JHTrQ+<;v=FFMqs9sA>PCR3UXHaPPULt^rLu zwXXmE(&f3*c+%+;b%*2{Rk|FObEpKeSh*^6DqYZI@)T+G6ZBZbQPSlw>7aP<9OIgO zyNzR`ZfnKWJ*Yh)0(3WVVBh&mx3+EBw)dCaielZ%hwt&%)!VIqJ^%Vg%YUc8C_UJF zOylr#sgqwU-j`LRcR2{TE(m6sq`@>-X@ZO33lX@hc3pnas;oZoobt2PR*HJHN*3GZ ztuESo`oGka#J*Rh+uRjSKIqomzQKRSa--#UFT9)S!uf2nFoXXmW;2W2$k|&Qr-2;n M>FVdQ&MBb@07uxN-2eap literal 0 HcmV?d00001 diff --git a/asset/art/ui/hud/select_mark.png.import b/asset/art/ui/hud/select_mark.png.import new file mode 100644 index 00000000..d749b544 --- /dev/null +++ b/asset/art/ui/hud/select_mark.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c0gjes4a8ou3b" +path="res://.godot/imported/select_mark.png-3482e4ba252b94def00b26feddc6d4da.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/ui/hud/select_mark.png" +dest_files=["res://.godot/imported/select_mark.png-3482e4ba252b94def00b26feddc6d4da.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/hud/selecting_bg.png b/asset/art/ui/hud/selecting_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..ce7f00750ac4ed69fb54bfa5b3518c4eaaff863c GIT binary patch literal 4832 zcmV<65+Ch}P)Px{nn^@KRCt{2T|J8&#}+-ah$lr}C88367rfyEC3=}*6N3VQ66N{{YbSPKp-AWj za$@gKP`-&lfkDZFv*$$MP!HDNq}XIvk@W)W1yi@@^zD1=qo-$PwL1rf?yjz{?o;=x zs%B<}Eha^b@u-w1gmAcyz5u|^x*ED}SSN`&YzdwaF~%cJZ0UN7PXw%*V~j^~E$20= zdllG9@QM*aINVC@6~m^a)xuVSCx%7tCROwn6T%~LOYRlHmdGu(*d)eCpbm$o@6~eH zn3EM_{C-ny=fH%ume~TAmsmk9S>8m(Wg~mE1h0Z9>m^w)ZCZ)_}nY~&X zF~;x55L{Cx_fjsy3$q5F_0f4Zh1r-wOjHQr-&1wQnyk;IuL42}x96pW5Dq;OFU$1g zD1tR&jNea5^d?~qCMMA$-b16hKcI3awdG0}Ex|(QRU+3zPO1f3nlFn4S3}!RvBQ>K z-GryS3VT=b2QHJXofJ&2kU7@zTA~j}*7-WxU02&188}QLldJD7QNI~pc%hSZe~LcT z^sPq1KUwLXicIU;N?&&fk_(4&eYN_%WIqm4JqP97E5yjSI6JXnq`AN@YLJwKqk-bC_f%s|0>& za?STWsbKPINBgpq4bs<~_Rx}=@*Y#R$0?7tn~(K#jqRt^C+ptY2nL1^=A~KpTF9d%###sl%2MgssFJj=sy~v)k~Y<+V<-Y!%|?mbRxQT3 z(OO^(v_zF&fOd2y2r;rRNZVFc!B)tm%AUj+yYrMsRP%s*Zd2D=8t`MZ(aI&bF#4g1 z*JX6sDLqe5{dsL$eGwJxomYQ* zrH<5e(wQ{K)@P}$TwihnC+FyRs@ovjA{SVYYqlL@JP0A2)c627u!CroH3=^1{gyb? zs;Bm$avkS#nhZ-qb2d`v^MYR8hg-tpXV%dx1H+!l#ywX zQc_tu6te2Fkn`*_ZHssO7z;`6=A=D)UNTuFSY=!rT%+H0o|*x`80%ILTVcx{yW;SpoipR3O+H}xQ12D#@RO|U27V_f{)%g?FY+R(})x+ToBOu{nc zE-^S>19+&82qFBU`yE0!96ghzU)q?EN6szJn)B62aIWrB|8sTZ@_79&VN4mq!&FB{ zD4**#T!Jk(T&Gub^j&3|*?vvf!Y^6BaL=2rsaMCoULRWqpO*YmI9lpoI`5II`P$Jp zb>m!_R+kl0yPuBlj5N1XUOKl|3U_Mj%+*!W0IjOJ)aRV{@6_`;#`qwmJ&-y$@4yC^ zY^!G*3lI4Y2C@85xd*cPVKj0tW2C|g*%MWI`6jv2 zw)Ik5UtrFQ_6A{1Sfukw-c5VZ)W?Up!9VjJQdMF;WJ=RE)gsfC;9NUeL$o+2wIP_~ zt<^?Tc+f5ICR+qC#s?vUUs9geT8hmb9l5|+rzh-VL3Br^A?dCpX`Am|TNtASN-DTi zZXL)ygR;X%Na2#kj#N|{nU(~@cb*1PU79%X+GMB7a_XFZH4&lPUowoD44y-%B>I=s z--nhB-f4C5RoW32(#vX?CA!x+EA;R}GAraM4Tdqco7)&u$0ks#vBrJ@{1CuCtKihg zklAGbpRmmU&^Dc-fc5MhmiGQm$Z*cyD4LL5R&ta;qb>DaolZ z8Jj|Bu$cs__;w#k4XeD}AYj{^Q`K9Hhv$!YK249{7~_)=!YeI}A%r8Etr8De6InCi zvBeUgsmbi@6{A~hNRs#}#`r{MN~1$hY%pqPv$j|QYI5TNr?F7-c}Fl2c%MecUzn5i z7fEpEJUMoV<6=F#wIz8ZXdXZ&GajaC%Iy3AOYoDVqPf7In3M9S)2=7ET7o;Z?v&f2 z0A*u&M@M&`^T~C|i+%~<7RrQJ_SlnHCV6Y8CqQn(D7T~IC4gILp85#D-Sj~Sfo(Dq znVYJ#=BmBp77fTP-mr?+li1&3ZhK#nB;PW^C9%h{_>kSbVcg$J@;D4uk1R)P#-Wjl zvHqg6x40r>>F|(3soZ+7MXsE0Q4b;aAt&m1IL3Ii!{k!l-vIocJ_7kB-GE%(NIGR{ z&N*LOax0MD>udDMea-i+36NQed+$^FZvg(FN`6oGj{|*^POl`P?`R3Ml$O-@76ue~ zJ@47d3-q0=`?TQy8-RaOejXtwNfk>4Pg1%x{7y?VK}&E;OnmJfFC#<(l=OO=7DR$2 z@l~qu5Wu-gv`0Kn$XB9=cQeH zcr#Y4#=WUZEsuw&Gv5zg~Pi1A3v*%MikMOuDke=KyXu_AMucdX=e0+LyWa$)j~ows_I! zMD9xfcMWoZIl1R_o%57)lN;6ogcTB5d%HNV*Y1^rWpityn{GWg6?lThV#DvW%TlCv zAM*u?8Y!;bS?Q7N)p?~Q)I+P}3T9~r>vIgHQ?50cHEPZJxvFwj@Mgg|n6_Vd0uZmkS%KmybHG{uH2;bx~Si3v~H`4JfrLq0BJZF8* z4e2eje0+z+&)ZuhpQ`IUb*%>r51^bwC4`EUiWGmuoODjtWpc2H)hd0EURo?LAZFD4 z5gKnf5twhfJ4xGghdeniKC`bK)`)YvhZ0Z)SWK%_c5Npw6d$C7t0 z&J>e7qcpjm!4HvY!lr6z_6X6?3kpoE_M)x2L`6%c6PoWO>b6 za#^Zb%3DyB=vpVLv=7UJwI}OyUVupZrn$n~aBOhsf336!6^iXyvtPQbSC@h&au>jz zbgl_`kA<@(dD)9*H4Q9?ZN&$5-i1__)aInp+9E4uYdWI0&34{&u8={Fc;JUxjjJ-J z)X|@HI;VN|Kf&|TJ=9KaL(26N-)4}DYGJ-KFkne6x>+w)8vr=u@dj+D^wkIv*e|em3F^a{^}o{)>f^ zC1A(uJ%({G6F9?=P;U~XW|}e}5h*0gF@*49e%Yn}I4B&-|0I(`?f)jd)z@0Wc_Kqg zZgRj5LI}^WP`kZ4V~mf);bQ4k^>n5{RCGGt!JOm^%+>ZT=7h2u77rTehe_-_>0kak zveFZnbatLT0Qet(kBN+kImuGz(-6Xo5W)*Nr|0_y^PR3D?E?vKg?^xc_bPT3$-@T4 zwU(#rOooU=y%F+Lox4;{9IHnF{srJaFculOUZV|}grJhAn<$N~`e>Osh<^_FVNHB*rm)H6I)?wS zyo%U+SV-YpBoz&EwwSzh-Fe>z;XOyo>6%{Z1LmR2*9J+QtX8s*{2`V9 zR<6a-O6l4jk9MpW%ltvKI|z)42@bC${{0HTnc-zug9d|0lGsuXznG-nAfmL+$>MvI zNBbBb$qu`D^Ezp~f@id+ON>nLZ_~gkV7{xkg=P9GsJ4!*&KbDp~Pnl0OEol6?pO>P25BX!Wem1wvK}VV9L$0Qf)Q$dhwx6q+{x0000 void: if Engine.is_editor_hint(): return - # read prop containers，第一个为 head 跳过, 最后一个为 tail 跳过 - for id in range(props_hbox.get_child_count() - 2): - var container = props_hbox.get_child(id + 1) + # read prop containers + for id in range(props_bag.get_child_count()): + var container = props_bag.get_child(id) prop_containers.append(container) container.get_child(0).get_child(0).pressed.connect(_on_prop_pressed.bind(id)) + display_prop.pressed.connect(_on_prop_pressed.bind(-1)) _load_items() _load_from_archive() - props_scroll.scroll_horizontal = PROP_CONTAINER_X - focus_exited.connect(_on_focus_exited) + selecting_bg.modulate.a = 0.0 + prop_scroll.scroll_horizontal = PROP_CONTAINER_X + props_bag_scroll.scroll_horizontal = 0.0 + props_bag_scroll.custom_minimum_size.x = 0.0 + # focus_exited.connect(_on_focus_exited) # 存档更新时，从存档加载 prop ArchiveManager.archive_loaded.connect(_load_from_archive) # tween timer @@ -83,11 +102,6 @@ func _ready() -> void: mouse_exited.connect(_on_mouse_exited) -func _on_focus_exited() -> void: - if selected: - selected = false - - func _load_items(): var id = item_config_res.titles["PropItems"] var current_line = item_config_res.lines[id] @@ -154,53 +168,70 @@ func _load_texture_cache() -> void: func _update_prop_display_with_texture(): if not inventory: return - var prop = prop_containers[0].get_child(0).get_child(0) as TextureButton # 在没有道具时，展示空手 placeholder if inventory.enabled_items.size() == 0: - prop.texture_normal = preload("res://asset/art/ui/hud/placeholder.png") - prop.size = Vector2(PROP_CONTROL_X, PROP_CONTROL_X) - prop.scale = Vector2(1.0, 1.0) + display_prop.texture_normal = preload("res://asset/art/ui/hud/placeholder.png") + display_prop.size = Vector2(PROP_CONTROL_X, PROP_CONTROL_X) + display_prop.scale = Vector2(1.0, 1.0) title_label.text = tr("prop_空手") - return + else: + var key = inventory.current_item_key() + _display_texture_by_key(display_prop, key) + title_label.text = tr(key) + # 选中标记 select_mark; 如果被 free 掉，则重新创建 + if select_mark and is_instance_valid(select_mark): + var parent = select_mark.get_parent() + if parent: + parent.remove_child(select_mark) + else: + select_mark = TextureRect.new() + select_mark.custom_minimum_size = Vector2(PROP_CONTAINER_X, PROP_CONTAINER_X) + select_mark.texture = preload("res://asset/art/ui/hud/select_mark.png") + # bag for i in range(prop_containers.size()): - var id = wrapi(inventory.current_index + i, 0, inventory.enabled_items.size()) - var item = items_dict[inventory.enabled_items[id]] - prop = prop_containers[i].get_child(0).get_child(0) as TextureButton - if i == 0: - title_label.text = tr(item.key) - if item.key in cached_inventory_textures: - prop.texture_normal = cached_inventory_textures[item.key] - var t_size = prop.texture_normal.get_size() - var max_x = max(t_size.x, t_size.y) - var p_scale = min(PROP_CONTROL_X / t_size.x, PROP_CONTROL_X / t_size.y) - prop.scale = Vector2(p_scale, p_scale) - prop.size = Vector2(max_x, max_x) - else: - printerr("PropHUD: Texture not found! key=", item.key) - prop.texture_normal = null - props_scroll.scroll_horizontal = PROP_CONTAINER_X + var id = wrapi(i, 0, inventory.enabled_items.size()) + var key = inventory.enabled_items[id] + var button = prop_containers[i].get_child(0).get_child(0) as TextureButton + _display_texture_by_key(button, key) + if id == inventory.current_index: + prop_containers[i].get_child(0).add_child(select_mark) + prop_scroll.scroll_horizontal = PROP_CONTAINER_X + # props_bag_scroll.scroll_horizontal = 0.0 + + +func _display_texture_by_key(button, key) -> void: + if not key: + button.texture_normal = null + return + var item = items_dict[key] + button.texture_normal = cached_inventory_textures[item.key] + var t_size = button.texture_normal.get_size() + var max_x = max(t_size.x, t_size.y) + var p_scale = min(PROP_CONTROL_X / t_size.x, PROP_CONTROL_X / t_size.y) + button.scale = Vector2(p_scale, p_scale) + button.size = Vector2(max_x, max_x) func on_left_pressed() -> void: if locked: return sfx_click.play() - _mouse_moved_on_listening() if inventory.index_wrap_add(-1): - selected = false + selected = true _update_prop_display_with_texture() _tween_container(true) + _mouse_moved_on_listening() func on_right_pressed() -> void: if locked: return sfx_click.play() - _mouse_moved_on_listening() if inventory.index_wrap_add(1): - selected = false + selected = true _update_prop_display_with_texture() _tween_container(false) + _mouse_moved_on_listening() func _tween_container(left_to_right := true) -> void: @@ -208,11 +239,11 @@ func _tween_container(left_to_right := true) -> void: container_tween.kill() container_tween = create_tween() if left_to_right: - props_scroll.scroll_horizontal = 2 * PROP_CONTAINER_X + prop_scroll.scroll_horizontal = 2 * PROP_CONTAINER_X else: - props_scroll.scroll_horizontal = 0.0 + prop_scroll.scroll_horizontal = 0.0 # 通过 Head 与 Tail 占位符，实现滚动效果；否则会导致卡在边界上，无法滚动 - container_tween.tween_property(props_scroll, "scroll_horizontal", PROP_CONTAINER_X, 0.2) + container_tween.tween_property(prop_scroll, "scroll_horizontal", PROP_CONTAINER_X, 0.2) func _on_prop_pressed(id := 0) -> void: @@ -221,33 +252,55 @@ func _on_prop_pressed(id := 0) -> void: sfx_click.play() if GlobalConfig.DEBUG: print("PropHUD Panel pressed.") - if not selected: - focus_mode = FOCUS_ALL - grab_focus() - selected = true - inventory.current_index += id + focus_mode = FOCUS_ALL + grab_focus() + selected = true + if id >= 0: + inventory.current_index = id _update_prop_display_with_texture() _mouse_moved_on_listening(true) +var prop_blink: Tween var tween_scroll: Tween func _toggle_scroll(fold := true) -> void: + if prop_blink and prop_blink.is_running(): + prop_blink.kill() if tween_scroll and tween_scroll.is_running(): tween_scroll.kill() + # PROP_CONTAINER_X + 10. 为hud的两侧留出的空间 if fold: + # kill blink + select_mark.modulate.a = 1.0 + selecting_bg.modulate.a = 0.0 + # fold tween_scroll = create_tween() - tween_scroll.tween_property(props_scroll, "custom_minimum_size:x", PROP_CONTAINER_X, 0.5) + tween_scroll.tween_property(props_bag_scroll, "custom_minimum_size:x", 0.0, 0.5) tween_scroll.parallel().tween_property( hud_rect, "custom_minimum_size:x", PROP_CONTAINER_X + 10., 0.5 ) else: - # 保持最小宽度 - var x_size = max(1, prop_containers.size()) * PROP_CONTAINER_X + # blink + if prop_containers.size() > 0: + prop_blink = create_tween().set_loops(0) + prop_blink.tween_property(select_mark, "modulate:a", 0.6, 1.).set_ease( + Tween.EASE_IN_OUT + ) + prop_blink.parallel().tween_property(selecting_bg, "modulate:a", 0.2, 1.).set_ease( + Tween.EASE_IN_OUT + ) + prop_blink.tween_property(select_mark, "modulate:a", 1., 1.).set_ease(Tween.EASE_IN_OUT) + prop_blink.parallel().tween_property(selecting_bg, "modulate:a", .6, 1.).set_ease( + Tween.EASE_IN_OUT + ) + # unfold + var bag_x = prop_containers.size() * PROP_CONTAINER_X + var hud_x = bag_x + PROP_CONTAINER_X + 10. tween_scroll = create_tween() - tween_scroll.tween_property(props_scroll, "custom_minimum_size:x", x_size, 0.5) - tween_scroll.parallel().tween_property(hud_rect, "custom_minimum_size:x", x_size + 10., 0.5) + tween_scroll.tween_property(props_bag_scroll, "custom_minimum_size:x", bag_x, 0.5) + tween_scroll.parallel().tween_property(hud_rect, "custom_minimum_size:x", hud_x, 0.5) func _on_mouse_entered() -> void: @@ -355,13 +408,13 @@ func _align_container_size() -> void: # 判断是否需要添加新的 prop container while inventory.enabled_items.size() > prop_containers.size(): append_prop_container() - # 判断是否需要删除 prop container，最少保留一个 - while inventory.enabled_items.size() < prop_containers.size() and prop_containers.size() > 1: + # 判断是否需要删除 prop container，不保留余数 + while inventory.enabled_items.size() < prop_containers.size(): remove_prop_container() if displaying: _mouse_moved_on_listening() # 如果正在展示，则更新 scroll 长度 - if displaying and props_scroll.custom_minimum_size.x > PROP_CONTAINER_X: + if displaying and props_bag_scroll.custom_minimum_size.x > 0.0: _toggle_scroll(false) @@ -378,17 +431,15 @@ func append_prop_container() -> void: prop.stretch_mode = TextureButton.STRETCH_KEEP_ASPECT_CENTERED control.add_child(prop) # 添加到 hbox: container -> control -> prop - props_hbox.add_child(container) - # 放在 Tail 占位符 之前 - props_hbox.move_child(container, -2) + props_bag.add_child(container) prop.pressed.connect(_on_prop_pressed.bind(prop_containers.size() - 1)) func remove_prop_container() -> void: - if prop_containers.size() <= 1: + if prop_containers.size() == 0: return var container = prop_containers.pop_back() - props_hbox.remove_child(container) + props_bag.remove_child(container) container.queue_free() diff --git a/scene/prop/prop_hud.tscn b/scene/prop/prop_hud.tscn index 1f1de8cb..bd089dc8 100644 --- a/scene/prop/prop_hud.tscn +++ b/scene/prop/prop_hud.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://dc778gsjfr3ky"] +[gd_scene load_steps=14 format=3 uid="uid://dc778gsjfr3ky"] [ext_resource type="Script" path="res://scene/prop/prop_hud.gd" id="1_bbv0a"] [ext_resource type="Texture2D" uid="uid://dok08tovej18w" path="res://asset/art/ui/hud/normal_left.png" id="2_bjc2b"] @@ -6,6 +6,8 @@ [ext_resource type="Texture2D" uid="uid://c45k7ncg6xhpv" path="res://asset/art/ui/hud/pressed_left.png" id="3_fca7p"] [ext_resource type="Texture2D" uid="uid://c2jq2neda32ix" path="res://asset/art/ui/hud/Prop.png" id="5_6tt77"] [ext_resource type="Texture2D" uid="uid://0uwun1mo726u" path="res://asset/art/prop/c02/绳子物品.png" id="6_0m706"] +[ext_resource type="Texture2D" uid="uid://d4nxjk0127u23" path="res://asset/art/ui/hud/selecting_bg.png" id="6_5ixbr"] +[ext_resource type="Texture2D" uid="uid://c0gjes4a8ou3b" path="res://asset/art/ui/hud/select_mark.png" id="7_53yeo"] [ext_resource type="FontFile" uid="uid://dr8bp6p7byb37" path="res://asset/font/字体/方正楷体简体.TTF" id="10_mye4q"] [ext_resource type="Texture2D" uid="uid://c1ogeaa836kry" path="res://asset/art/ui/hud/normal_right.png" id="10_vkaik"] [ext_resource type="Script" path="res://scene/prop/test_hbox.gd" id="11_008sv"] @@ -80,7 +82,11 @@ theme_override_constants/margin_top = 5 theme_override_constants/margin_right = 5 theme_override_constants/margin_bottom = 5 -[node name="PropScrollContainer" type="ScrollContainer" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer"] +layout_mode = 2 +theme_override_constants/separation = 0 + +[node name="PropScrollContainer" type="ScrollContainer" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer"] unique_name_in_owner = true custom_minimum_size = Vector2(130, 130) layout_mode = 2 @@ -91,26 +97,45 @@ scroll_horizontal = 130 horizontal_scroll_mode = 3 vertical_scroll_mode = 0 -[node name="PropsHBox" type="HBoxContainer" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/PropScrollContainer"] +[node name="PropHBox" type="HBoxContainer" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropScrollContainer"] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 0 theme_override_constants/separation = 0 -[node name="Head" type="Control" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/PropScrollContainer/PropsHBox"] +[node name="Head" type="Control" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropScrollContainer/PropHBox"] custom_minimum_size = Vector2(130, 130) layout_mode = 2 -[node name="PropContainer" type="CenterContainer" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/PropScrollContainer/PropsHBox"] +[node name="PropContainer" type="CenterContainer" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropScrollContainer/PropHBox"] custom_minimum_size = Vector2(130, 130) layout_mode = 2 size_flags_horizontal = 4 -[node name="Control" type="Control" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/PropScrollContainer/PropsHBox/PropContainer"] +[node name="Control" type="Control" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropScrollContainer/PropHBox/PropContainer"] custom_minimum_size = Vector2(110, 110) layout_mode = 2 -[node name="Prop" type="TextureButton" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/PropScrollContainer/PropsHBox/PropContainer/Control"] +[node name="SelectingBG" type="TextureRect" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropScrollContainer/PropHBox/PropContainer/Control"] +unique_name_in_owner = true +self_modulate = Color(0.837083, 0.510264, 0.465919, 1) +custom_minimum_size = Vector2(120, 120) +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -65.0 +offset_top = -65.0 +offset_right = 65.0 +offset_bottom = 65.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("6_5ixbr") + +[node name="DiaplayProp" type="TextureButton" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropScrollContainer/PropHBox/PropContainer/Control"] +unique_name_in_owner = true layout_mode = 0 offset_right = 146.0 offset_bottom = 146.0 @@ -118,10 +143,60 @@ scale = Vector2(0.75, 0.75) texture_normal = ExtResource("6_0m706") stretch_mode = 5 -[node name="Tail" type="Control" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/PropScrollContainer/PropsHBox"] +[node name="Tail" type="Control" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropScrollContainer/PropHBox"] custom_minimum_size = Vector2(130, 130) layout_mode = 2 +[node name="PropsBagScroll" type="ScrollContainer" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer"] +unique_name_in_owner = true +custom_minimum_size = Vector2(130, 130) +layout_mode = 2 +size_flags_horizontal = 0 +size_flags_vertical = 4 +mouse_filter = 2 +horizontal_scroll_mode = 3 +vertical_scroll_mode = 0 + +[node name="PropsBag" type="HBoxContainer" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropsBagScroll"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 0 +theme_override_constants/separation = 0 + +[node name="PropContainer" type="CenterContainer" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropsBagScroll/PropsBag"] +custom_minimum_size = Vector2(130, 130) +layout_mode = 2 +size_flags_horizontal = 4 + +[node name="Control" type="Control" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropsBagScroll/PropsBag/PropContainer"] +custom_minimum_size = Vector2(110, 110) +layout_mode = 2 + +[node name="Prop" type="TextureButton" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropsBagScroll/PropsBag/PropContainer/Control"] +layout_mode = 0 +offset_right = 146.0 +offset_bottom = 146.0 +scale = Vector2(0.75, 0.75) +texture_normal = ExtResource("6_0m706") +stretch_mode = 5 + +[node name="SelectMark" type="TextureRect" parent="VBoxContainer/HBoxContainer/HudRect/MarginContainer/HBoxContainer/PropsBagScroll/PropsBag/PropContainer/Control"] +unique_name_in_owner = true +custom_minimum_size = Vector2(130, 130) +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -65.0 +offset_top = -65.0 +offset_right = 65.0 +offset_bottom = 65.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("7_53yeo") + [node name="RightMargin" type="MarginContainer" parent="VBoxContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 0 @@ -138,7 +213,7 @@ texture_pressed = ExtResource("11_a512b") stretch_mode = 5 [node name="MarginContainer2" type="MarginContainer" parent="VBoxContainer"] -custom_minimum_size = Vector2(170, 0) +custom_minimum_size = Vector2(165, 0) layout_mode = 2 size_flags_horizontal = 0 mouse_filter = 2 diff --git a/scene/prop/prop_inventory_resource.gd b/scene/prop/prop_inventory_resource.gd index b3d5c216..c5085769 100644 --- a/scene/prop/prop_inventory_resource.gd +++ b/scene/prop/prop_inventory_resource.gd @@ -2,8 +2,7 @@ class_name PropInventory extends Resource signal current_item_changed(prop_key: String) -# prop_空手 默认就存在，并且不可删除 -@export var enabled_items := ["prop_空手"] +@export var enabled_items := [] @export var current_index := 0: set(val): if current_index != val: diff --git a/scene/prop/test_hbox.gd b/scene/prop/test_hbox.gd index 33d85943..66603c2a 100644 --- a/scene/prop/test_hbox.gd +++ b/scene/prop/test_hbox.gd @@ -1,6 +1,6 @@ extends HBoxContainer -var items := ["prop_令牌", "prop_令牌", "prop_信碎片1", "prop_火柴", "prop_绳子", "prop_1012钥匙", "prop_老虎钳"] +var items := ["prop_令牌", "prop_信碎片1", "prop_火柴", "prop_绳子", "prop_令牌", "prop_1012钥匙", "prop_老虎钳"] var id := 0