feat: 争锋频道：蜜果城

MAA.sln.DotSettings

@@ -1,4 +1,4 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EN/@EntryIndexedValue">EN</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KR/@EntryIndexedValue">KR</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JP/@EntryIndexedValue">JP</s:String>
@@ -30,6 +30,8 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=SSS/@EntryIndexedValue">SSS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=WSA/@EntryIndexedValue">WSA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=XYAZ/@EntryIndexedValue">XYAZ</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=_0040ALL_0040/@EntryIndexedValue">@ALL@</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=_0040AT_0040/@EntryIndexedValue">@AT@</s:String>
 	<s:Boolean x:Key="/Default/GrammarAndSpelling/GrammarChecking/Exceptions/=Github/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/GrammarAndSpelling/GrammarChecking/Exceptions/=_4E00_9375_8F2A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/GrammarAndSpelling/GrammarChecking/Exceptions/=_591C_95F4_6A21_5F0F/@EntryIndexedValue">True</s:Boolean>

resource/tasks/MiniGame/ALL.json

@@ -0,0 +1,73 @@
+{
+    "MiniGame@ALL@GreenGrass@DuelChannel@Begin": {
+        "doc": "争锋频道：青草城",
+        "algorithm": "OcrDetect",
+        "action": "ClickSelf",
+        "text": ["加入赛事"],
+        "roi": [1072, 581, 201, 125],
+        "next": ["MiniGame@ALL@GreenGrass@DuelChannel@ChooseMode", "MiniGame@ALL@GreenGrass@DuelChannel@Begin"]
+    },
+    "MiniGame@ALL@GreenGrass@DuelChannel@ChooseMode": {
+        "algorithm": "OcrDetect",
+        "action": "ClickSelf",
+        "text": ["自娱自乐"],
+        "roi": [228, 584, 864, 58],
+        "next": ["MiniGame@ALL@GreenGrass@DuelChannel@Enter"]
+    },
+    "MiniGame@ALL@GreenGrass@DuelChannel@Enter": {
+        "algorithm": "OcrDetect",
+        "action": "ClickSelf",
+        "text": ["开始", "游戏"],
+        "roi": [1107, 499, 157, 157],
+        "next": ["MiniGame@ALL@GreenGrass@DuelChannel@Loading"]
+    },
+    "MiniGame@ALL@GreenGrass@DuelChannel@Loading": {
+        "algorithm": "JustReturn",
+        "postDelay": 2000,
+        "next": [
+            "MiniGame@ALL@GreenGrass@DuelChannel@ChooseFlag",
+            "MiniGame@ALL@GreenGrass@DuelChannel@Enter",
+            "MiniGame@ALL@GreenGrass@DuelChannel@End",
+            "MiniGame@ALL@GreenGrass@DuelChannel@Loading"
+        ]
+    },
+    "MiniGame@ALL@GreenGrass@DuelChannel@ChooseFlag": {
+        "algorithm": "OcrDetect",
+        "text": ["剩余礼物"],
+        "roi": [562, 0, 184, 125],
+        "next": [
+            "MiniGame@ALL@GreenGrass@DuelChannel@ChooseLeft",
+            "MiniGame@ALL@GreenGrass@DuelChannel@ChooseRight",
+            "MiniGame@ALL@GreenGrass@DuelChannel@ChooseRandom"
+        ]
+    },
+    "MiniGame@ALL@GreenGrass@DuelChannel@ChooseLeft": {
+        "algorithm": "MatchTemplate",
+        "template": "MiniGame@ALL@GreenGrass@DuelChannel@duck.png",
+        "roi": [13, 118, 54, 394],
+        "action": "ClickRect",
+        "specificRect": [65, 608, 44, 63],
+        "next": ["MiniGame@ALL@GreenGrass@DuelChannel@Loading"]
+    },
+    "MiniGame@ALL@GreenGrass@DuelChannel@ChooseRight": {
+        "algorithm": "MatchTemplate",
+        "template": "MiniGame@ALL@GreenGrass@DuelChannel@duck.png",
+        "roi": [1201, 117, 58, 386],
+        "action": "ClickRect",
+        "specificRect": [1156, 596, 56, 84],
+        "next": ["MiniGame@ALL@GreenGrass@DuelChannel@Loading"]
+    },
+    "MiniGame@ALL@GreenGrass@DuelChannel@ChooseRandom": {
+        "algorithm": "JustReturn",
+        "action": "ClickRect",
+        "specificRect": [65, 608, 44, 63],
+        "next": ["MiniGame@ALL@GreenGrass@DuelChannel@Loading"]
+    },
+    "MiniGame@ALL@GreenGrass@DuelChannel@End": {
+        "algorithm": "OcrDetect",
+        "action": "ClickSelf",
+        "roi": [1010, 611, 212, 109],
+        "text": ["返回主页"],
+        "next": ["MiniGame@ALL@GreenGrass@DuelChannel@Begin", "MiniGame@ALL@GreenGrass@DuelChannel@End"]
+    }
+}

resource/tasks/tasks.json

@@ -5008,77 +5008,6 @@
         "roi": [740, 565, 300, 65],
         "preDelay": 200
     },
-    "GreenGrass@DuelChannel@Begin": {
-        "doc": "争锋频道：青草城",
-        "algorithm": "OcrDetect",
-        "action": "ClickSelf",
-        "text": ["加入赛事"],
-        "roi": [1072, 581, 201, 125],
-        "next": ["GreenGrass@DuelChannel@ChooseMode", "GreenGrass@DuelChannel@Begin"]
-    },
-    "GreenGrass@DuelChannel@ChooseMode": {
-        "algorithm": "OcrDetect",
-        "action": "ClickSelf",
-        "text": ["自娱自乐"],
-        "roi": [228, 584, 864, 58],
-        "next": ["GreenGrass@DuelChannel@Enter"]
-    },
-    "GreenGrass@DuelChannel@Enter": {
-        "algorithm": "OcrDetect",
-        "action": "ClickSelf",
-        "text": ["开始", "游戏"],
-        "roi": [1107, 499, 157, 157],
-        "next": ["GreenGrass@DuelChannel@Loading"]
-    },
-    "GreenGrass@DuelChannel@Loading": {
-        "algorithm": "JustReturn",
-        "postDelay": 2000,
-        "next": [
-            "GreenGrass@DuelChannel@ChooseFlag",
-            "GreenGrass@DuelChannel@Enter",
-            "GreenGrass@DuelChannel@End",
-            "GreenGrass@DuelChannel@Loading"
-        ]
-    },
-    "GreenGrass@DuelChannel@ChooseFlag": {
-        "algorithm": "OcrDetect",
-        "text": ["剩余礼物"],
-        "roi": [562, 0, 184, 125],
-        "next": [
-            "GreenGrass@DuelChannel@ChooseLeft",
-            "GreenGrass@DuelChannel@ChooseRight",
-            "GreenGrass@DuelChannel@ChooseRandom"
-        ]
-    },
-    "GreenGrass@DuelChannel@ChooseLeft": {
-        "algorithm": "MatchTemplate",
-        "template": "GreenGrass@DuelChannel@duck.png",
-        "roi": [13, 118, 54, 394],
-        "action": "ClickRect",
-        "specificRect": [65, 608, 44, 63],
-        "next": ["GreenGrass@DuelChannel@Loading"]
-    },
-    "GreenGrass@DuelChannel@ChooseRight": {
-        "algorithm": "MatchTemplate",
-        "template": "GreenGrass@DuelChannel@duck.png",
-        "roi": [1201, 117, 58, 386],
-        "action": "ClickRect",
-        "specificRect": [1156, 596, 56, 84],
-        "next": ["GreenGrass@DuelChannel@Loading"]
-    },
-    "GreenGrass@DuelChannel@ChooseRandom": {
-        "algorithm": "JustReturn",
-        "action": "ClickRect",
-        "specificRect": [65, 608, 44, 63],
-        "next": ["GreenGrass@DuelChannel@Loading"]
-    },
-    "GreenGrass@DuelChannel@End": {
-        "algorithm": "OcrDetect",
-        "action": "ClickSelf",
-        "roi": [1010, 611, 212, 109],
-        "text": ["返回主页"],
-        "next": ["GreenGrass@DuelChannel@Begin", "GreenGrass@DuelChannel@End"]
-    },
     "Store@Begin": {
         "doc": "绿票、黄票商店",
         "algorithm": "JustReturn",

src/MaaWpfGui/Res/Localizations/en-us.xaml

@@ -772,8 +772,10 @@ The video aspect ratio needs to be 16:9 without interference factors such as bla
     <system:String x:Key="MiniGameName">Mini Game Name</system:String>
     <system:String x:Key="MiniGame@AT@ConversationRoom">AT - Mikage Consultation Office - Mini Game</system:String>
     <system:String x:Key="MiniGame@AT@ConversationRoomTip" xml:space="preserve">Start the task from the event screen (there is a ｢Open for Business｣ button in the bottom right corner).</system:String>
-    <system:String x:Key="MiniGameNameGreenGrass">Contest Channel: Green Grass City (Unofficial)</system:String>
-    <system:String x:Key="MiniGameNameGreenGrassTip" xml:space="preserve">Manually skip the tutorial dialogue, then you can exit directly.&#10;Start the task from the event screen (there is a ｢Join Event｣ button in the bottom right corner).&#10;&#10;Follow the Duck Lord's choice.</system:String>
+    <system:String x:Key="MiniGame@ALL@GreenGrass">Contest Channel: Green Grass City (Unofficial)</system:String>
+    <system:String x:Key="MiniGame@ALL@GreenGrassTip" xml:space="preserve">Manually skip the tutorial dialogue, then you can exit directly.&#10;Start the task from the event screen (there is a ｢Join Event｣ button in the bottom right corner).&#10;&#10;Follow the Duck Lord's choice.</system:String>
+    <system:String x:Key="MiniGame@ALL@HoneyFruit">Contest Channel:（Unofficial）</system:String>
+    <system:String x:Key="MiniGame@ALL@HoneyFruitTip" xml:space="preserve">{key=MiniGame@ALL@GreenGrassTip}</system:String>
     <system:String x:Key="MiniGameNameGreenTicketStore">Green Ticket Store</system:String>
     <system:String x:Key="MiniGameNameGreenTicketStoreTip" xml:space="preserve">Buy everything on the 1st floor.&#10;Buy Headhunting Permits and Recruitment Permits on the 2nd floor.</system:String>
     <system:String x:Key="MiniGameNameYellowTicketStore">Yellow Ticket Store</system:String>

src/MaaWpfGui/Res/Localizations/ja-jp.xaml

@@ -772,8 +772,10 @@ C:\\leidian\\LDPlayer9
     <system:String x:Key="MiniGameName">ミニゲーム名</system:String>
     <system:String x:Key="MiniGame@AT@ConversationRoom">AT - 相談室</system:String>
     <system:String x:Key="MiniGame@AT@ConversationRoomTip" xml:space="preserve">イベント画面（右下角に ｢営業開始｣ ボタンがあります）でタスクを開始します。</system:String>
-    <system:String x:Key="MiniGameNameGreenGrass">対決チャンネル：グリーングラスシティ（非公式）</system:String>
-    <system:String x:Key="MiniGameNameGreenGrassTip" xml:space="preserve">手動でチュートリアルの会話をスキップし、直接退出することができます。&#10;イベント画面（右下角に「イベントに参加」ボタンがあります）でタスクを開始します。&#10;&#10;ダック卿の選択をフォローする。</system:String>
+    <system:String x:Key="MiniGame@ALL@GreenGrass">対決チャンネル：グリーングラスシティ（非公式）</system:String>
+    <system:String x:Key="MiniGame@ALL@GreenGrassTip" xml:space="preserve">手動でチュートリアルの会話をスキップし、直接退出することができます。&#10;イベント画面（右下角に「イベントに参加」ボタンがあります）でタスクを開始します。&#10;&#10;ダック卿の選択をフォローする。</system:String>
+    <system:String x:Key="MiniGame@ALL@HoneyFruit">対決チャンネル：（非公式）</system:String>
+    <system:String x:Key="MiniGame@ALL@HoneyFruitTip" xml:space="preserve">{key=MiniGame@ALL@GreenGrassTip}</system:String>
     <system:String x:Key="MiniGameNameGreenTicketStore">緑チケット商店</system:String>
     <system:String x:Key="MiniGameNameGreenTicketStoreTip" xml:space="preserve">1階は全部購入。&#10;2階はスカウト券と求人票を購入のみ。</system:String>
     <system:String x:Key="MiniGameNameYellowTicketStore">黄チケット商店</system:String>

src/MaaWpfGui/Res/Localizations/ko-kr.xaml

@@ -772,8 +772,10 @@ C:\\leidian\\LDPlayer9
     <system:String x:Key="MiniGameName">미니 게임 이름</system:String>
     <system:String x:Key="MiniGame@AT@ConversationRoom">AT (허) - 상담실 (비공식)</system:String>
     <system:String x:Key="MiniGame@AT@ConversationRoomTip" xml:space="preserve">이벤트 메인 화면에서 임무를 시작하세요 (오른쪽 아래 ｢영업 시작｣)</system:String>
-    <system:String x:Key="MiniGameNameGreenGrass">대결 채널: 그린그래스 시티 (비공식)</system:String>
-    <system:String x:Key="MiniGameNameGreenGrassTip" xml:space="preserve">튜토리얼 대화를 수동으로 건너뛴 후, 바로 종료할 수 있어요&#10;이벤트 메인 화면에서 임무를 시작하세요 (오른쪽 아래 ｢이벤트 참가｣)&#10;&#10;덕로드만 믿고 따라가면 손해는 없을거에요</system:String>
+    <system:String x:Key="MiniGame@ALL@GreenGrass">대결 채널: 그린그래스 시티 (비공식)</system:String>
+    <system:String x:Key="MiniGame@ALL@GreenGrassTip" xml:space="preserve">튜토리얼 대화를 수동으로 건너뛴 후, 바로 종료할 수 있어요&#10;이벤트 메인 화면에서 임무를 시작하세요 (오른쪽 아래 ｢이벤트 참가｣)&#10;&#10;덕로드만 믿고 따라가면 손해는 없을거에요</system:String>
+    <system:String x:Key="MiniGame@ALL@HoneyFruit">대결 채널: (비공식)</system:String>
+    <system:String x:Key="MiniGame@ALL@HoneyFruitTip" xml:space="preserve">{key=MiniGame@ALL@GreenGrassTip}</system:String>
     <system:String x:Key="MiniGameNameGreenTicketStore">자격증명서 상점</system:String>
     <system:String x:Key="MiniGameNameGreenTicketStoreTip" xml:space="preserve">1단계는 전부 구매하고&#10;2단계는 헤드헌팅 허가증과 모집 허가증을 구매해요</system:String>
     <system:String x:Key="MiniGameNameYellowTicketStore">고급증명서 상점</system:String>

src/MaaWpfGui/Res/Localizations/zh-cn.xaml

@@ -772,8 +772,10 @@ C:\\leidian\\LDPlayer9。\n
     <system:String x:Key="MiniGameName">小游戏名称</system:String>
     <system:String x:Key="MiniGame@AT@ConversationRoom">AT-相谈室</system:String>
     <system:String x:Key="MiniGame@AT@ConversationRoomTip" xml:space="preserve">在活动主界面（右下角有 ｢开始营业｣ 处）开始任务。</system:String>
-    <system:String x:Key="MiniGameNameGreenGrass">争锋频道：青草城</system:String>
-    <system:String x:Key="MiniGameNameGreenGrassTip" xml:space="preserve">手动跳过教程对话，然后可以直接退出。&#10;在活动主界面（右下角有 ｢加入赛事｣ 处）开始任务。&#10;&#10;跟着鸭总喝口汤。</system:String>
+    <system:String x:Key="MiniGame@ALL@GreenGrass">争锋频道：青草城</system:String>
+    <system:String x:Key="MiniGame@ALL@GreenGrassTip" xml:space="preserve">手动跳过教程对话，然后可以直接退出。&#10;在活动主界面（右下角有 ｢加入赛事｣ 处）开始任务。&#10;&#10;跟着鸭总喝口汤。</system:String>
+    <system:String x:Key="MiniGame@ALL@HoneyFruit">争锋频道：蜜果城</system:String>
+    <system:String x:Key="MiniGame@ALL@HoneyFruitTip" xml:space="preserve">{key=MiniGame@ALL@GreenGrassTip}</system:String>
     <system:String x:Key="MiniGameNameGreenTicketStore">绿票商店</system:String>
     <system:String x:Key="MiniGameNameGreenTicketStoreTip" xml:space="preserve">1层全买。&#10;2层买寻访凭证和招聘许可。</system:String>
     <system:String x:Key="MiniGameNameYellowTicketStore">黄票商店</system:String>

src/MaaWpfGui/Res/Localizations/zh-tw.xaml

@@ -771,8 +771,10 @@ C:\\leidian\\LDPlayer9。\n
     <system:String x:Key="MiniGameName">小遊戲名稱</system:String>
     <system:String x:Key="MiniGame@AT@ConversationRoom">AT-相談室</system:String>
     <system:String x:Key="MiniGame@AT@ConversationRoomTip" xml:space="preserve">在活動主介面（右下角有「開始營業」處）開始任務。</system:String>
-    <system:String x:Key="MiniGameNameGreenGrass">爭鋒頻道：青草城</system:String>
-    <system:String x:Key="MiniGameNameGreenGrassTip" xml:space="preserve">手動跳過教學對話，然後可以直接退出。&#10;在活動主介面（右下角有「加入賽事」處）開始任務。&#10;&#10;跟著鴨總喝口湯。</system:String>
+    <system:String x:Key="MiniGame@ALL@GreenGrass">爭鋒頻道：青草城</system:String>
+    <system:String x:Key="MiniGame@ALL@GreenGrassTip" xml:space="preserve">手動跳過教學對話，然後可以直接退出。&#10;在活動主介面（右下角有「加入賽事」處）開始任務。&#10;&#10;跟著鴨總喝口湯。</system:String>
+    <system:String x:Key="MiniGame@ALL@HoneyFruit">爭鋒頻道：蜜果城</system:String>
+    <system:String x:Key="MiniGame@ALL@HoneyFruitTip" xml:space="preserve">{key=MiniGame@ALL@GreenGrassTip}</system:String>
     <system:String x:Key="MiniGameNameGreenTicketStore">綠票商店</system:String>
     <system:String x:Key="MiniGameNameGreenTicketStoreTip" xml:space="preserve">1 層全買。&#10;2 層買尋訪憑證和招聘許可。</system:String>
     <system:String x:Key="MiniGameNameYellowTicketStore">黃票商店</system:String>

src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs

@@ -1180,12 +1180,13 @@ namespace MaaWpfGui.ViewModels.UI
 
         public static ObservableCollection<CombinedData> MiniGameTaskList { get; } =
         [
+            new() { Display = LocalizationHelper.GetString("MiniGame@ALL@HoneyFruit"), Value = "MiniGame@ALL@GreenGrass@DuelChannel@Begin" },
             new() { Display = LocalizationHelper.GetString("MiniGameNameSsStore"), Value = "SS@Store@Begin" },
             new() { Display = LocalizationHelper.GetString("MiniGameNameGreenTicketStore"), Value = "GreenTicket@Store@Begin" },
             new() { Display = LocalizationHelper.GetString("MiniGameNameYellowTicketStore"), Value = "YellowTicket@Store@Begin" },
             new() { Display = LocalizationHelper.GetString("MiniGameNameRAStore"), Value = "RA@Store@Begin" },
             new() { Display = LocalizationHelper.GetString("MiniGame@AT@ConversationRoom"), Value = "MiniGame@AT@ConversationRoom" },
-            new() { Display = LocalizationHelper.GetString("MiniGameNameGreenGrass"), Value = "GreenGrass@DuelChannel@Begin" },
+            new() { Display = LocalizationHelper.GetString("MiniGame@ALL@GreenGrass"), Value = "MiniGame@ALL@GreenGrass@DuelChannel@Begin" },
         ];
 
         private string _miniGameTaskName = ConfigurationHelper.GetGlobalValue(ConfigurationKeys.MiniGameTaskName, "SS@Store@Begin");
@@ -1222,7 +1223,7 @@ namespace MaaWpfGui.ViewModels.UI
                 "YellowTicket@Store@Begin" => LocalizationHelper.GetString("MiniGameNameYellowTicketStoreTip"),
                 "RA@Store@Begin" => LocalizationHelper.GetString("MiniGameNameRAStoreTip"),
                 "MiniGame@AT@ConversationRoom" => LocalizationHelper.GetString("MiniGame@AT@ConversationRoomTip"),
-                "GreenGrass@DuelChannel@Begin" => LocalizationHelper.GetString("MiniGameNameGreenGrassTip"),
+                "MiniGame@ALL@GreenGrass@DuelChannel@Begin" => LocalizationHelper.GetString("MiniGame@ALL@GreenGrassTip"),
                 _ => string.Empty,
             };
         }