From 8b1fa6c9ac065ac98544174dc5a1203ee2a85a01 Mon Sep 17 00:00:00 2001 From: ninemine <1371605831@qq.com> Date: Sat, 15 Nov 2025 21:25:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D=E9=99=B7?= =?UTF-8?q?=E9=98=B1=E6=94=BE=E7=BD=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plugins/WPSGardenSystem/garden_plugin_base.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Plugins/WPSGardenSystem/garden_plugin_base.py b/Plugins/WPSGardenSystem/garden_plugin_base.py index 660ad96..4fbf80b 100644 --- a/Plugins/WPSGardenSystem/garden_plugin_base.py +++ b/Plugins/WPSGardenSystem/garden_plugin_base.py @@ -527,12 +527,14 @@ class WPSGardenBase(WPSAPI): remaining = plot["remaining_fruit"] theft_users = len(json.loads(plot["theft_users"])) if plot.get("theft_users") else 0 trap_info = "" - if show_trap and plot.get("trap_item_id"): - trap_durability = int(plot.get("trap_durability", 0)) - from .garden_models import GARDEN_TRAPS_DICT - trap = GARDEN_TRAPS_DICT.get(plot["trap_item_id"]) - if trap: - trap_info = f"｜陷阱：{trap.display_name}({trap_durability}次)" + if show_trap: + trap_item_id = plot.get("trap_item_id") + if trap_item_id and isinstance(trap_item_id, str) and trap_item_id.strip(): + trap_durability = int(plot.get("trap_durability", 0)) + from .garden_models import GARDEN_TRAPS_DICT + trap = GARDEN_TRAPS_DICT.get(trap_item_id) + if trap: + trap_info = f"｜陷阱：{trap.display_name}({trap_durability}次)" status = f"✅ 已成熟（成熟于 {formatted_time}）" lines.append( f"- 地块 {idx}｜{name}｜{status}｜剩余果实 {remaining}｜被偷次数 {theft_users}{trap_info}"