From 5ac4988ea40ebce9cd15ce04763ca048e1f1584c Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Fri, 21 Feb 2025 19:08:13 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=8B=86=E5=88=86=20OF-1=20=E4=B8=8E?=
 =?UTF-8?q?=20=E8=AE=BF=E9=97=AE=E5=A5=BD=E5=8F=8B=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Main/AsstProxy.cs | 54 ++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs
index 7836e65cf0..a854dd8039 100644
--- a/src/MaaWpfGui/Main/AsstProxy.cs
+++ b/src/MaaWpfGui/Main/AsstProxy.cs
@@ -760,23 +760,6 @@ namespace MaaWpfGui.Main
                                 Instances.TaskQueueViewModel.IncreaseCustomInfrastPlanIndex();
                                 Instances.TaskQueueViewModel.RefreshCustomInfrastPlanIndexByPeriod();
                                 break;
-
-                            case "Mall":
-                                {
-                                    if (TaskQueueViewModel.FightTask.Stage != string.Empty && TaskQueueViewModel.MallTask.CreditFightTaskEnabled)
-                                    {
-                                        TaskQueueViewModel.MallTask.LastCreditFightTaskTime = DateTime.UtcNow.ToYjDate().ToFormattedString();
-                                        Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("CompleteTask") + LocalizationHelper.GetString("CreditFight"));
-                                    }
-
-                                    if (TaskQueueViewModel.MallTask.CreditVisitFriendsEnabled)
-                                    {
-                                        TaskQueueViewModel.MallTask.LastCreditVisitFriendsTime = DateTime.UtcNow.ToYjDate().ToFormattedString();
-                                        Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("CompleteTask") + LocalizationHelper.GetString("Visiting"));
-                                    }
-
-                                    break;
-                                }
                         }
 
                         if (taskChain == "Fight" && SanityReport.HasSanityReport)
@@ -1233,16 +1216,39 @@ namespace MaaWpfGui.Main
             switch (subTask)
             {
                 case "ProcessTask":
+                    var taskchain = details["taskchain"]?.ToString();
+                    switch (taskchain)
                     {
-                        string taskName = details!["details"]!["task"]!.ToString();
-                        int execTimes = (int)details!["details"]!["exec_times"]!;
+                        case "Roguelike":
+                            {
+                                var taskName = details!["details"]!["task"]!.ToString();
+                                int execTimes = (int)details!["details"]!["exec_times"]!;
+
+                                if (taskName == "StartExplore")
+                                {
+                                    Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("BegunToExplore") + $" {execTimes} " + LocalizationHelper.GetString("UnitTime"), UiLogColor.Info);
+                                }
 
-                        switch (taskName)
-                        {
-                            case "StartExplore":
-                                Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("BegunToExplore") + $" {execTimes} " + LocalizationHelper.GetString("UnitTime"), UiLogColor.Info);
                                 break;
-                        }
+                            }
+
+                        case "Mall":
+                            {
+                                var taskName = details["details"]!["task"]!.ToString();
+                                switch (taskName)
+                                {
+                                    case "EndOfActionThenStop":
+                                        TaskQueueViewModel.MallTask.LastCreditFightTaskTime = DateTime.UtcNow.ToYjDate().ToFormattedString();
+                                        Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("CompleteTask") + LocalizationHelper.GetString("CreditFight"));
+                                        break;
+                                    case "VisitLimited" or "VisitNextBlack":
+                                        TaskQueueViewModel.MallTask.LastCreditVisitFriendsTime = DateTime.UtcNow.ToYjDate().ToFormattedString();
+                                        Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("CompleteTask") + LocalizationHelper.GetString("Visiting"));
+                                        break;
+                                }
+
+                                break;
+                            }
                     }
 
                     break;