From 142c8aad3c5321e9f099f7ff0551567fa2bef9fe Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Sun, 29 Sep 2024 15:47:10 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=8E=89=E8=90=BD=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BD=93=E5=89=8D=E5=85=B3=E5=8D=A1=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Main/AsstProxy.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs
index fefd5cb248..3c0d7bfe7e 100644
--- a/src/MaaWpfGui/Main/AsstProxy.cs
+++ b/src/MaaWpfGui/Main/AsstProxy.cs
@@ -1273,6 +1273,7 @@ namespace MaaWpfGui.Main
                     {
                         string allDrops = string.Empty;
                         var statistics = subTaskDetails!["stats"] ?? new JArray();
+                        var stageInfo = subTaskDetails!["stage"] ?? new JObject();
                         int curTimes = (int)(subTaskDetails["cur_times"] ?? -1);
 
                         foreach (var item in statistics)
@@ -1283,8 +1284,8 @@ namespace MaaWpfGui.Main
                                 itemName = LocalizationHelper.GetString("FurnitureDrop");
                             }
 
-                            int totalQuantity = (int)item["quantity"];
-                            int addQuantity = (int)item["addQuantity"];
+                            int totalQuantity = (int)(item["quantity"] ?? -1);
+                            int addQuantity = (int)(item["addQuantity"] ?? -1);
 
                             allDrops += $"{itemName} : {totalQuantity:#,#}";
                             if (addQuantity > 0)
@@ -1295,15 +1296,18 @@ namespace MaaWpfGui.Main
                             allDrops += "\n";
                         }
 
+                        var stageCode = stageInfo["stageCode"]?.ToString();
                         allDrops = allDrops.EndsWith('\n') ? allDrops.TrimEnd('\n') : LocalizationHelper.GetString("NoDrop");
                         Instances.TaskQueueViewModel.AddLog(
-                            LocalizationHelper.GetString("TotalDrop") + "\n" + allDrops +
-                            (curTimes >= 0 ? $"\n{LocalizationHelper.GetString("CurTimes")} : {curTimes}" : string.Empty));
+                            $"{stageCode} {LocalizationHelper.GetString("TotalDrop")}\n" +
+                            $"{allDrops}{(curTimes >= 0
+                                ? $"\n{LocalizationHelper.GetString("CurTimes")} : {curTimes}"
+                                : string.Empty)}");
                         break;
                     }
 
                 case "EnterFacility":
-                    Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("ThisFacility") + subTaskDetails!["facility"] + " " + (int)subTaskDetails["index"]);
+                    Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("ThisFacility") + subTaskDetails!["facility"] + " " + (int)(subTaskDetails["index"] ?? -1));
                     break;
 
                 case "ProductIncorrect":