From b520541e9d2c8ffbf040eda09da21dbd483cd690 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Fri, 28 Jan 2022 17:47:46 +0800
Subject: [PATCH] =?UTF-8?q?feat.=E7=95=8C=E9=9D=A2=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=82=89=E9=B8=BD=E6=88=98=E6=96=97=E5=85=B3=E5=8D=A1=E5=90=8D?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RoguelikeBattleTaskPlugin.cpp             |  9 ++++++++-
 src/MeoAsstGui/Helper/AsstProxy.cs            | 19 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
index 4719c8e5d0..ea051fe8ff 100644
--- a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
+++ b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
@@ -69,13 +69,20 @@ bool asst::RoguelikeBattleTaskPlugin::get_stage_info()
             }
             m_side_tile_info = std::move(side_info);
             calced = true;
-            Log.info("stage info getted, name: ", tr.text, ", tiles_size: ", m_side_tile_info.size());
+            auto cb_info = basic_info_with_what("StageInfo");
+            auto& details = cb_info["details"];
+            details["name"] = tr.text;
+            details["size"] = m_side_tile_info.size();
+            callback(AsstMsg::SubTaskExtraInfo, cb_info);
             break;
         }
         if (calced) {
             break;
         }
     }
+    if (!calced) {
+        callback(AsstMsg::SubTaskExtraInfo, basic_info_with_what("StageInfoError"));
+    }
 
     return calced;
 }
diff --git a/src/MeoAsstGui/Helper/AsstProxy.cs b/src/MeoAsstGui/Helper/AsstProxy.cs
index 367d74fc8e..9bdefc6baa 100644
--- a/src/MeoAsstGui/Helper/AsstProxy.cs
+++ b/src/MeoAsstGui/Helper/AsstProxy.cs
@@ -294,9 +294,9 @@ namespace MeoAsstGui
                         mainModel.AddLog("已放弃本次探索");
                         break;
 
-                    case "Roguelike1StartAction":
-                        mainModel.AddLog("开始战斗");
-                        break;
+                    //case "Roguelike1StartAction":
+                    //    mainModel.AddLog("开始战斗");
+                    //    break;
 
                     case "Roguelike1MissionCompletedFlag":
                         mainModel.AddLog("战斗完成");
@@ -444,6 +444,19 @@ namespace MeoAsstGui
                         mainModel.AddLog("可用干员不足", "darkred");
                     }
                     break;
+
+                /* Roguelike */
+                case "StageInfo":
+                    {
+                        mainModel.AddLog("开始战斗：" + subTaskDetails["name"]);
+                    }
+                    break;
+
+                case "StageInfoError":
+                    {
+                        mainModel.AddLog("关卡识别错误", "darkred");
+                    }
+                    break;
             }
         }