From 0601feb1bdf42b6fe9c36c48d630994313c4228c Mon Sep 17 00:00:00 2001 From: cakipaul Date: Sat, 6 Sep 2025 16:37:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=AB=A0hotfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../c03_胖子游戏第三段/水中肉/0.png | Bin 737 -> 699 bytes .../c03_胖子游戏第三段/水中肉/1.png | Bin 807 -> 766 bytes asset/dialogue/c03.csv | 2 +- asset/dialogue/inspect_content.csv | 5 ++--- asset/dialogue/inspect_content.dialogue | 8 ++------ asset/dialogue/item_description.csv | 12 ++++++++++++ asset/dialogue/item_description.dialogue | 2 ++ scene/ground/scene/c02/s04_保卫科.gd | 6 +++++- scene/ground/scene/c03/s04_李癞房间.tscn | 7 +------ scene/ground/script/c02/s03_event第三章开幕.gd | 2 +- .../ground/script/c03/s03_closeup癞子纸人.tscn | 10 ++++++---- .../script/c03/s04_closeup整理麻将游戏.gd | 5 ++++- scene/ground/script/c03/s04_closeup柜子.tscn | 10 +++------- scene/ux/prop_hud.gd | 2 ++ 14 files changed, 41 insertions(+), 30 deletions(-) diff --git a/asset/art/gif/c03_胖子游戏/c03_胖子游戏第三段/水中肉/0.png b/asset/art/gif/c03_胖子游戏/c03_胖子游戏第三段/水中肉/0.png index 41dd68f3ff50e2e16ca9bef937a4afd5d62f7f34..c8e00d5bc70e3643c98b1d9b0105f7b35871b021 100644 GIT binary patch delta 662 zcmV;H0%`r>1-k{1F@JSQL_t(|obBAPPTN2n$MGMi3PSCGJQa0D7LVX}U}EcYl&M46 zGPUYMbYSyqFfpPQF)&qOiWopu8E}`L>pFM7b8wRL@%?Nl!LslFlXL&`B@zGt0001? zwl;kNSijReuOw+N%k*}Cf9d1=xV+T;^|d7F%hQuJO9U)oAAh#DE7xmp4h}m1cQ4DF zuiee(l2nJQ3jup!xrfn-fjaQ#Ne`&E;dFwMg=! zB>!YN=6Op>k{jecU6?`GRwtQ(bxod)kS~}LwBe0@K))769V}Of%*5JsV!p85lx4DW zqIDbPAlfF)yG7w`^?i2!c6BxcZaJeHw2+Q$2n1>vqkkDh6D(8scF+h!oPvsSIGHTm zHNHPSQc!q#Lt+b;LCD~<)&8jYHktH3$fu(tU6iFVNzG|?*E6w@^(vMP#&4m3?ZAch zW#&1UZ!Xk#A(W7f+u+5UN|g!ayP{Zlz0WV|nT683`MiEGEXB230NqwrC=)cZiy+iP zYc0yPLw|s-aU51!q@mWV2onG+?hG$bXrnbmgSD}MwJ(xxaXC||+HEvb&-qz$>0e`I zj$<|oEc={xtwlY}^QyU{q5VaNpXcY2=n{Rp=C;3kHdUq`W}`q?keWj0#Vaplb1-Zd w-`tnp#^ip{*dF$;rGRG1!uO>F0+pUWtoX%@w-20)N&o-=07*qoM6N<$g5E?)82|tP delta 700 zcmV;t0z>_~1>psdF@Kv$L_t(|obB8{PTW8k1@OlzS!5*zxC%;*tQ^62ph9VKj-)^- zLbnx&LqsT@FOUOJQ6d5qRM8?4EfiUyP~bEf$BgHn7q2}tyk7_2we0zxyfgN<3lI?z z5fKp)xmp?e0H}YvSylqTTAJd`#>T??`EhcB-xn7Efc=LDWq+0!u!wyejY{3N*PENh z_pYU>cH8Z21^`vKOc=0d#uU0bQvh|rQeDLuFsitQPtbiV5)ly*5fKp)5fKp)5fKp) zkq+A}Jo9aP+qq@tLs58NKkpAP7I!x{WwO5B7;h1%tLfCb4_$k+&q4F{z+$DkLS0R# zRU5L7+`_C1+kbIU008zps_ToP4-YIQNe*2!1FM@n z3oc(UWzf18{D2Oh{VKNti)_#yDW-m=R|!Aa(@t2ljbDPtxJ8I)qkrx6$WlG z!3~@@_nCTs2Pb?^#f?8rfc;3YY2sF6P(Qy?o5k z@K)rHny=$=>z#br+QM;BAO%pLW}BXgxpWQiwn6wB1(XBlx-JvX!EAG(Hti??Ll(Nu zi#GvE5r4|JdEVIG<`?zEjndoMta>mE_|+{yW=kuS2%6|3a5b0iMd>;OxM~c;Qj65p zJu8NZh?IC`c!pdTT3sx#1`C*cl3Xn=W&)H+Z87zfpCt$WFRa9VM5Dl>&uM!t>TZ^m z^^OMliw-}JjsS3#Xk(h&{%N_W67>*`0;V9Z2L1(*F@Ly8L_t(|obB8{Zrd;v2JkN#92D(fXo|-SfzTuP4w*6(=rM|R z>d>HzrxrOxhiJ^o8Vbxr0(O7sEfu2QCe zNGR;x@56jdsIJMJNNm2z@|Zs-DAp6{b!iWyi_u+)`V$n$;-T720L z==E~h1+qeRlvXvlg*%oti)nspyCJ`#MiUgPH}%cJxy8wJ#Y*}n!H6Zg-c8wGD@E@Ag)lE ze7d;kz48j#ui|Phe@FUH&9~Xid(fM+v;SVts|t5bg9?B;%{JW=>$?%kkmYTsczWPM z*JZLvpnuMV)IBN@`Uhvgzb%A!O~a67Dth5oKr5kCZ}6JvVbePdRH=3gklWr0B|(#r zh0@zrY}=Hjt@jRK$7>p@wWEMWS# zh}#jvtbq2>u$Xdnmgr6wi=CVPx}o=JM=k1AT~fDd%Z&bE@0tbxSBXBZx$R@mMU~V; zLgfmQDs*1F_d=?JVfyf{zI0CRca3$^Ki1ffQb5_V@O5l4Q04gza?SphdL;#r00000 LNkvXXu0mjfyDw#@ delta 770 zcmV+d1O5E|1*Zm(F@NDnL_t(|obBAfYTGaz2Jo+irG)N~8Vb#^hhp{!d550L80;~| zb|^cn?2^;Q9%7W;`T~0ZKf*|RE-7@RJ*FQjeo}gfUEf&0IJV6SMxb; z7YqElxBviretgtsi2+O4+s)0!yVCQ61LLuyENlGR?P37{Rk%zTur*@}oy-)#reNvr zVhk8nT*D_ceJv6Z5fKp)5fKp)5fKp)5k-wp!voW%v(%-dbk%}C!BqUdxhaP`JGJo^ zff601CQaR@A%6!g*b_^ge5Vra$0llrsV;0G1}(S~N}YPg62ZEg&5Xxw=Q)6*GS4yQCtSfz{oy(EN#h zAmz7|ZN%hS_eQh$`_|uycdB!uzC}5Rx=HhJGO_L@*=!lM3K+OZoBGl@xv%T%p}()O@2w|&0sG4h3{-ml0QOS}r3t4!-v9sr07*qoM6N<$f_XD^ AY5)KL diff --git a/asset/dialogue/c03.csv b/asset/dialogue/c03.csv index e8914f36..69c3d0e8 100644 --- a/asset/dialogue/c03.csv +++ b/asset/dialogue/c03.csv @@ -90,7 +90,7 @@ c03_麻将游戏_胖子23,他妈的，不玩了不玩了，今天一把都没胡 c03_麻将游戏_瞎子17,我也得早点回去，没准小蝉今儿个能回来，我总惦记着回去看看。,窝阿要早眼回起了，万一倒小蝉回来了呢，窝心里老是放伐落。,方启钊,, c03_麻将游戏_李氏22,天黑了，你们回去都小心着点。,天夜了，纳回起路浪当心点哦。,李兰,, c03_麻将游戏_癞子20,嘶...,嘶...,王守义,, -c03_肉铺胖子_4,？？？,xxx,张文开,, +c03_肉铺胖子_4,偷东西？,xxx,张文开,, c03_囚室通风管道偷听_李氏1,我不认！,侬叫我哪能相信伐子！,李兰,, c03_囚室通风管道偷听_李氏2,我弟弟才十六岁，不抽烟不吃酒不打牌，性子也好，都说他将来是当个能人的料！,我阿弟只有十六岁，又不吃香烟不吃老酒不打牌，脾气也好，都讲他下趟老有出息的！,李兰,, c03_囚室通风管道偷听_李氏3,怎么就、怎么就...,哪能就、就...,李兰,, diff --git a/asset/dialogue/inspect_content.csv b/asset/dialogue/inspect_content.csv index 2e1b71b9..7d5c1e76 100644 --- a/asset/dialogue/inspect_content.csv +++ b/asset/dialogue/inspect_content.csv @@ -63,10 +63,9 @@ c02_议论文字25,养妖怪,,,,Keeping a demon c03_肉铺账本1,十月,,,, c03_肉铺账本2,十日 新货到 猪肉五斤,,,, c03_肉铺账本3,十一日 自留 猪肉一斤,,,, -c03_肉铺账本4,十五日 赠远山兄 猪肉二斤,,,, +c03_肉铺账本4,十五日 赠启钊兄 猪肉二斤,,,, c03_肉铺账本5,十七日 卖保卫科国栋兄 猪肉一斤,,,, c03_肉铺账本6,二十日 卖三〇三三 猪肉一斤,,,, c03_肉铺账本7,二十五日 新货到 米肉二十斤 自留 米肉五斤,,,, -c03_肉铺账本8,二十六日 赠远山兄 米肉二斤,,,, +c03_肉铺账本8,二十六日 赠启钊兄 米肉二斤,,,, c03_肉铺账本9,二十七日 卖三〇一二 米肉一斤,,,, -c03_s04_柜子照片,吾唯一至亲 李二弟,,,, diff --git a/asset/dialogue/inspect_content.dialogue b/asset/dialogue/inspect_content.dialogue index 58dd8828..60f2d19b 100644 --- a/asset/dialogue/inspect_content.dialogue +++ b/asset/dialogue/inspect_content.dialogue @@ -89,14 +89,10 @@ 十月[ID:c03_肉铺账本1] 十日 新货到 猪肉五斤[ID:c03_肉铺账本2] 十一日 自留 猪肉一斤[ID:c03_肉铺账本3] -十五日 赠远山兄 猪肉二斤[ID:c03_肉铺账本4] +十五日 赠启钊兄 猪肉二斤[ID:c03_肉铺账本4] 十七日 卖保卫科国栋兄 猪肉一斤[ID:c03_肉铺账本5] 二十日 卖三〇三三 猪肉一斤[ID:c03_肉铺账本6] 二十五日 新货到 米肉二十斤 自留 米肉五斤[ID:c03_肉铺账本7] -二十六日 赠远山兄 米肉二斤[ID:c03_肉铺账本8] +二十六日 赠启钊兄 米肉二斤[ID:c03_肉铺账本8] 二十七日 卖三〇一二 米肉一斤[ID:c03_肉铺账本9] => END - -~ c03_其他特写等内容 -吾唯一至亲 李二弟[ID:c03_s04_柜子照片] -=> END \ No newline at end of file diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index 47a44ad8..539b1513 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -61,6 +61,7 @@ ui_center_notify_c03准备研磨,已准备好研磨,,,,, ui_center_notify_c03粘刀把,按 E 粘上刀把,,,,, ui_center_notify_c03绞肉机缺少转轮,缺少配件，暂时不能用,,,,, ui_center_notify_c03绞肉机安装转轮,按 E 安装转轮,,,,, +ui_center_notify_c04放肉煮肉,按 E 放入鲜肉,,,,, ui_获得,获得,,,,, ui_退出,退出,,,,,Exit ui_阅读,阅读,,,,,Read @@ -151,12 +152,17 @@ prop_2013钥匙,2013钥匙,,,[#texture=c03/胖子的钥匙.png],, prop_2013钥匙_说明,肮脏生锈的钥匙，标着「2013」的房间号码,,,,, prop_药方,药方,,,[#texture=c03/药方.png][#inspect=c03/ux_药方.png],, prop_药方_说明,生姜两片{br}竹叶十片去尖{br}经霜三年的甘蔗{br}蟋蟀一对 注：要原配，即本在一窠中者{br}金钱鼠尾辫一副 注：生剪 烧成灰兑水送服,,,,, +prop_药方_详情,show,,,,, prop_转轮,转轮,,,[#texture=c03/转轮.png],, prop_转轮_说明,一个厚重的金属转轮，表面布满了奇怪的划痕和难以辨认的符号，似乎是某种机关的核心部件,,,,, prop_新鲜的肉,新鲜的肉,,,[#texture=c03/新鲜的肉.png],, prop_新鲜的肉_说明,一块色泽鲜红的肉，看起来很新鲜，但凑近闻却没有任何血腥味，反而有种奇怪的甜香,,,,, prop_符纸钥匙,符纸钥匙,,,[#texture=c03/符纸钥匙.png][#inspect=c03/ux_符纸钥匙.png],, prop_符纸钥匙_说明,用朱砂绘制着符文的黄纸折叠成的钥匙，与其说是用来开锁，不如说是为了镇压锁住的东西,,,,, +prop_煮熟的肉,煮熟的肉,,,[#texture=c04/煮熟的肉.png],, +prop_煮熟的肉_说明,煮熟的肉,,,,, +prop_九宫格块,九宫格块,,,[#texture=c04/九宫格块.png],, +prop_九宫格块_说明,九宫格块,,,,, prop_院长的信,院长的信,,,[#texture=c01/院长的信物品.png][#inspect=c01/院长的信.png],,Director's Letter prop_院长的信_说明,小萍：{br}你现下境况如何？{br}你虽离开浦育院已久，但我始终没有忘记为你祈祷。{br}愿上帝保佑你走向真正光明的道路。我相信这也是当年你父亲将你托付给我时的殷切愿景。{br}你既已成人，无论你的父母出于何种理由选择与你分离，你都应当拥有知晓真相的权利，所以我将公寓地址附在了信后，除此之外，我亦知之甚少。{br}若有闲暇，欢迎你回浦育院看看。{br}院长童玉君{br}民国二十年十月十五日{br}公寓地址 芦昌路26弄3号,,,,,"Xiao Ping:{br}How are you faring now?{br}Though you left Puyu Orphanage long ago, I have never forgotten to pray for you.{br}May God bless you to walk the path of true enlightenment. I believe this was also your father's earnest wish when he entrusted you to my care.{br}Now that you are grown, regardless of whatever reasons your parents had for separating from you, you deserve the right to know the truth. I have attached the apartment address to this letter, though I know little beyond this.{br}If you have time, you are welcome to visit Puyu Orphanage.{br}Director Tong Yujun{br}October 15th, Year 20 of the Republic{br}Apartment Address: No. 3, Lane 26, Luchang Road" prop_船票,船票,,,[#texture=c02/船票.png],,Boat Ticket @@ -365,3 +371,9 @@ c03_冷飕飕风吹过,...{br}这股风...,,,,, c03_保卫科_李癞拜老鼠精,？！{br}他们这是...在拜那幅像？,,,,, c03_小手洞1,洞里有很浓的血腥味...,,,,, c04_鬼打墙_开始os,当年他们是有多恨我们家？,,,,, +c04_鬼打墙_首次开门,回家了...,,,,, +c04_鬼打墙_首次传送,？？？,,,,, +c04_鬼打墙_走向楼梯,不，我不想听它们的。,,,,, +c04_鬼打墙_再次开门,不会是...鬼打墙吧？,,,,, +c04_鬼打墙_全部交互完,...,,,,, +c04_鬼打墙_捂眼,我记得...{br}捂眼静心，或许有用。,,,,, diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index b8e7c3c5..646d5ddd 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -179,6 +179,7 @@ 肮脏生锈的钥匙，标着「2013」的房间号码[ID:prop_2013钥匙_说明] 药方[#texture=c03/药方.png][#inspect=c03/ux_药方.png][ID:prop_药方] 生姜两片{br}竹叶十片去尖{br}经霜三年的甘蔗{br}蟋蟀一对 注：要原配，即本在一窠中者{br}金钱鼠尾辫一副 注：生剪 烧成灰兑水送服[ID:prop_药方_说明] +show[ID:prop_药方_详情] 转轮[#texture=c03/转轮.png][ID:prop_转轮] 一个厚重的金属转轮，表面布满了奇怪的划痕和难以辨认的符号，似乎是某种机关的核心部件[ID:prop_转轮_说明] 新鲜的肉[#texture=c03/新鲜的肉.png][ID:prop_新鲜的肉] @@ -444,6 +445,7 @@ skip[ID:prop_沾血的老虎钳_详情] # s09 棺材房 棺材上刻有长命百岁，好怪...[ID:c03_s09_棺材上刻的文字] 不知道是谁的干尸...[ID:c03_s09_胖子干尸] +刀把 [ID:c03_s09_刀使用提示] # s10-12 胖子游戏1-3 [wave]当兵去，当兵饿不死[/wave][ID:c03_s10_label1] [wave]活[/wave][ID:c03_s10_label2] diff --git a/scene/ground/scene/c02/s04_保卫科.gd b/scene/ground/scene/c02/s04_保卫科.gd index 1eb27314..5c1c6bc0 100644 --- a/scene/ground/scene/c02/s04_保卫科.gd +++ b/scene/ground/scene/c02/s04_保卫科.gd @@ -41,9 +41,13 @@ func _on_ground_ready() -> void: # 第二章之后关闭 closeup折锡纸 if EventManager.get_chapter_stage() >= 3: + # 第三章重置花名册交互状态（icount 重置为 0） + if not ArchiveManager.get_global_value("c03_namebook_icount_reseted"): + closeup花名册.icount = 0 + ArchiveManager.set_global_entry("c03_namebook_icount_reseted", true) # 第二章不说花名册的事 closeup花名册.first_interact_os_key = "" - closeup折锡纸.enabled = false + closeup折锡纸.enabled = false func _on_closeup_tin_coin_exited(arg = null): diff --git a/scene/ground/scene/c03/s04_李癞房间.tscn b/scene/ground/scene/c03/s04_李癞房间.tscn index 5f488248..90f1dd34 100644 --- a/scene/ground/scene/c03/s04_李癞房间.tscn +++ b/scene/ground/scene/c03/s04_李癞房间.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=34 format=3 uid="uid://c7c88hg2cl1j7"] +[gd_scene load_steps=33 format=3 uid="uid://c7c88hg2cl1j7"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_byh4s"] [ext_resource type="Script" uid="uid://byw2swgt783oa" path="res://scene/ground/scene/c03/s04_李癞房间.gd" id="2_vjibx"] @@ -11,7 +11,6 @@ [ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="6_dbkw8"] [ext_resource type="PackedScene" uid="uid://n75766ui6udi" path="res://scene/ground/script/c03/s04_closeup整理麻将游戏.tscn" id="7_jmyby"] [ext_resource type="PackedScene" uid="uid://cua3uqy4btxqn" path="res://scene/ground/script/c03/s04_closeup麻将出千游戏.tscn" id="8_jmyby"] -[ext_resource type="PackedScene" uid="uid://dsa6frlw6e6gg" path="res://scene/entity/pickable.tscn" id="9_m8bf2"] [ext_resource type="PackedScene" uid="uid://t61o0vpm0e11" path="res://scene/ground/script/c03/s04_closeup李氏纸人.tscn" id="10_o2w5q"] [ext_resource type="Script" uid="uid://bbfyvhhhcdet8" path="res://scene/ground/script/c03/s04_event_李氏纸人相关.gd" id="11_4umel"] [ext_resource type="Texture2D" uid="uid://p7eeml2vadvc" path="res://asset/art/scene/c03/s04_李癞房间/李氏纸人.png" id="11_7d7lv"] @@ -124,10 +123,6 @@ event_name = &"c03_li_paperwoman" event_stages = Array[int]([4, 5]) metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" -[node name="Pickable香" parent="Ground/DeployLayer/Event李氏纸人相关" instance=ExtResource("9_m8bf2")] -position = Vector2(47, 29) -prop_key = "prop_一把香" - [node name="花圈" type="Sprite2D" parent="Ground/DeployLayer/Event李氏纸人相关"] position = Vector2(404, -33) texture = ExtResource("12_r0k7c") diff --git a/scene/ground/script/c02/s03_event第三章开幕.gd b/scene/ground/script/c02/s03_event第三章开幕.gd index b79c4ef6..ca1744db 100644 --- a/scene/ground/script/c02/s03_event第三章开幕.gd +++ b/scene/ground/script/c02/s03_event第三章开幕.gd @@ -53,7 +53,7 @@ func intro_c04() -> void: camera.apply_limits(default_limit) SceneManager.unlock_player() EventManager.set_stage("c03_intro_c04", 1) - ArchiveManager.set_chapter_if_greater(4) + # ArchiveManager.set_chapter_if_greater(4) func start_conversation() -> void: diff --git a/scene/ground/script/c03/s03_closeup癞子纸人.tscn b/scene/ground/script/c03/s03_closeup癞子纸人.tscn index 37bbb2b0..701f480c 100644 --- a/scene/ground/script/c03/s03_closeup癞子纸人.tscn +++ b/scene/ground/script/c03/s03_closeup癞子纸人.tscn @@ -96,7 +96,7 @@ tracks/5/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [Color(1, 1, 1, 1)] +"values": [Color(1, 1, 1, 0)] } tracks/6/type = "value" tracks/6/imported = false @@ -205,10 +205,10 @@ tracks/6/path = NodePath("头受伤/伤口血迹:modulate") tracks/6/interp = 2 tracks/6/loop_wrap = true tracks/6/keys = { -"times": PackedFloat32Array(0.733333, 2), -"transitions": PackedFloat32Array(1, 1), +"times": PackedFloat32Array(0, 0.733333, 2), +"transitions": PackedFloat32Array(1, 1, 1), "update": 0, -"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)] +"values": [Color(1, 1, 1, 0.00582516), Color(1, 1, 1, 0), Color(1, 1, 1, 1)] } tracks/7/type = "value" tracks/7/imported = false @@ -364,6 +364,7 @@ position = Vector2(249, 114) texture = ExtResource("9_eqvmt") [node name="伤口血迹" type="Sprite2D" parent="头受伤"] +modulate = Color(1, 1, 1, 0) position = Vector2(249, 114) texture = ExtResource("10_eqvmt") @@ -377,6 +378,7 @@ rotation = 0.0950055 texture = ExtResource("9_yixv2") [node name="头" type="TextureRect" parent="."] +visible = false anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 diff --git a/scene/ground/script/c03/s04_closeup整理麻将游戏.gd b/scene/ground/script/c03/s04_closeup整理麻将游戏.gd index e744d641..16159e83 100644 --- a/scene/ground/script/c03/s04_closeup整理麻将游戏.gd +++ b/scene/ground/script/c03/s04_closeup整理麻将游戏.gd @@ -154,10 +154,13 @@ func _toggle_activation_for_all(activated: bool) -> void: func _check_if_success() -> void: success = true + var answers = answer_of_in_hand_mahjongs.keys() for hb in hand_mahjongs_btn: - if not hb.texture_normal in answer_of_in_hand_mahjongs: + if not hb.texture_normal in answers: success = false break + else: + answers.erase(hb.texture_normal) if success: var animation_player = $AnimationPlayer as AnimationPlayer $SfxSuccess.play() diff --git a/scene/ground/script/c03/s04_closeup柜子.tscn b/scene/ground/script/c03/s04_closeup柜子.tscn index ed5c490d..df551915 100644 --- a/scene/ground/script/c03/s04_closeup柜子.tscn +++ b/scene/ground/script/c03/s04_closeup柜子.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=3 uid="uid://b6ymfeft65wof"] +[gd_scene load_steps=12 format=3 uid="uid://b6ymfeft65wof"] [ext_resource type="Script" uid="uid://bp23kh1gi3asj" path="res://scene/ground/script/c03/s04_closeup柜子.gd" id="1_2ow0y"] [ext_resource type="Texture2D" uid="uid://dluphta2op6kq" path="res://asset/art/scene/c03/s04_李癞房间/柜子特写/背景.png" id="2_rmoey"] @@ -12,9 +12,6 @@ [ext_resource type="Script" uid="uid://dpocj5al0rvai" path="res://ui/text_helper.gd" id="10_qfnr1"] [ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="11_qfnr1"] -[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_kxw4a"] -load_path = "res://.godot/imported/李弟照片.png-a0ec640e11a2d503cb3a6496ecfadf81.ctex" - [node name="Closeup柜子" type="CanvasLayer"] script = ExtResource("1_2ow0y") metadata/_edit_horizontal_guides_ = [38.0] @@ -69,7 +66,7 @@ light_mask = 33 energy = 2.0 range_layer_max = 10 range_item_cull_mask = 32 -texture = SubResource("CompressedTexture2D_kxw4a") +texture = ExtResource("4_qfnr1") [node name="碗" type="Sprite2D" parent="."] position = Vector2(432, 201) @@ -121,10 +118,9 @@ offset_right = 41.5 offset_bottom = 45.0 grow_horizontal = 2 grow_vertical = 2 -text = "吾唯一至亲 李二弟" +text = "吾唯一至亲 李志成" horizontal_alignment = 1 script = ExtResource("10_qfnr1") -translation_key = "c03_s04_柜子照片" [node name="遮罩" type="TextureRect" parent="."] anchors_preset = 15 diff --git a/scene/ux/prop_hud.gd b/scene/ux/prop_hud.gd index 07e9b9c2..f95f3956 100644 --- a/scene/ux/prop_hud.gd +++ b/scene/ux/prop_hud.gd @@ -619,6 +619,8 @@ func inspect_item(prop_key: String, display_obtained := true, as_important_item inspector.pop_prop_inspection(prop_key, texture, true, describe_content) # 检阅详情后增加记笔记动作 inspector.quit_and_hidden.connect(_play_action_note, CONNECT_ONE_SHOT) + else: + printerr("ImportantPropItem %s invalid display_mode:" % prop_key, display_mode) else: inspector.pop_prop_inspection(prop_key, texture, display_obtained, describe_content)