fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev

Browse Source
This commit is contained in:
Shawnsdaddy
2022-05-23 03:05:12 -07:00
parent c4442ee1f0 f9be730eab
commit 6079d970c1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resource/tasks.json
View File

@@ -5494,7 +5494,7 @@
]
},
"Roguelike1StageTrader": {
"Doc": "诡异行商（交易所）",
"Doc": "诡意行商（交易所）",
"action": "ClickSelf",
"cache": false,
"roi": [

4
src/MeoAsstGui/Helper/AsstProxy.cs
View File

@@ -320,7 +320,7 @@ namespace MeoAsstGui
break;
case "Roguelike1StageTraderEnter":
mainModel.AddLog("关卡：诡异行商");
mainModel.AddLog("关卡：诡意行商");
break;
case "Roguelike1StageSafeHouseEnter":
@@ -500,7 +500,7 @@ namespace MeoAsstGui
break;
case "BattleAction":
copilotModel.AddLog("当然步骤：" + subTaskDetails["description"].ToString());
copilotModel.AddLog("当前步骤：" + subTaskDetails["description"].ToString());
break;
}
}

8
src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
View File

@@ -77,10 +77,10 @@ namespace MeoAsstGui
new CombData { Display = "1-7", Value = "1-7" },
// “愚人号” 活动关卡
new CombData { Display = "SN-8", Value = "SN-8" },
new CombData { Display = "SN-9", Value = "SN-9" },
new CombData { Display = "SN-10", Value = "SN-10" },
//new CombData { Display = "SN-8", Value = "SN-8" },
//new CombData { Display = "SN-9", Value = "SN-9" },
//new CombData { Display = "SN-10", Value = "SN-10" },
//// “风雪过境” 活动关卡
//new CombData { Display = "BI-7", Value = "BI-7" },
//new CombData { Display = "BI-8", Value = "BI-8" }