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

fix: all operators are marked as new for overseas clients (Toolbox-Recruitment) (#6009)

Browse Source
This commit is contained in:
MistEO
2023-08-20 21:48:51 +08:00
committed by GitHub
parent a61d8fd631 e873a98ba6
commit 2c8c9121df
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MaaCore/Config/Miscellaneous/RecruitConfig.cpp
View File

@@ -24,6 +24,7 @@ bool asst::RecruitConfig::parse(const json::value& json)
for (const json::value& oper : json.at("operators").as_array()) {
Recruitment oper_temp;
oper_temp.name = oper.at("name").as_string();
oper_temp.id = oper.at("id").as_string();
oper_temp.level = oper.at("rarity").as_integer();
for (const json::value& tag_value : oper.at("tags").as_array()) {

3
src/MaaCore/Config/Miscellaneous/RecruitConfig.h
View File

@@ -17,6 +17,7 @@ namespace asst
struct Recruitment
{
std::string name;
std::string id;
int level = 0;
std::unordered_set<std::string> tags;
@@ -39,7 +40,7 @@ namespace asst
friend bool operator==(const Recruitment& lhs, const Recruitment& rhs)
{
return lhs.name == rhs.name && lhs.level == rhs.level;
return lhs.id == rhs.id && lhs.level == rhs.level;
}
};

1
src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp
View File

@@ -439,6 +439,7 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc
for (const Recruitment& oper_info : ranges::reverse_view(comb.opers)) { // print reversely
json::value oper_json;
oper_json["name"] = oper_info.name;
oper_json["id"] = oper_info.id;
oper_json["level"] = oper_info.level;
opers_json_vector.emplace_back(std::move(oper_json));
}

7
src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs
View File

@@ -297,15 +297,16 @@ namespace MaaWpfGui.ViewModels.UI
foreach (var oper in (JArray)combs["opers"])
{
int oper_level = (int)oper["level"];
string oper_id = oper["id"].ToString();
string oper_name = oper["name"].ToString();
string potential = string.Empty;
if (RecruitmentShowPotential && OperBoxPotential != null && (tag_level >= 4 || oper_level == 1))
{
if (OperBoxPotential.ContainsKey(oper_name))
if (OperBoxPotential.ContainsKey(oper_id))
{
potential = " ( " + OperBoxPotential[oper_name] + " )";
potential = " ( " + OperBoxPotential[oper_id] + " )";
}
else
{
@@ -533,7 +534,7 @@ namespace MaaWpfGui.ViewModels.UI
_operBoxPotential = new Dictionary<string, int>();
foreach (JObject operBoxData in OperBoxDataArray.Cast<JObject>())
{
_operBoxPotential.Add((string)operBoxData["name"], (int)operBoxData["potential"]);
_operBoxPotential.Add((string)operBoxData["id"], (int)operBoxData["potential"]);
}
}