diff --git a/src/MeoAssistance/AsstDef.h b/src/MeoAssistance/AsstDef.h index 0d7569a7ce..4d7f02224f 100644 --- a/src/MeoAssistance/AsstDef.h +++ b/src/MeoAssistance/AsstDef.h @@ -276,7 +276,6 @@ namespace asst }; struct InfrastOperMoodInfo { - std::string hash; // 干员部分立绘的hash,作为唯一标识 InfrastSmileyInfo smiley; double percentage = 0; // 心情进度条的百分比 Rect rect; diff --git a/src/MeoAssistance/InfrastMoodImageAnalyzer.cpp b/src/MeoAssistance/InfrastMoodImageAnalyzer.cpp index 7dd35de8d1..32a20a18f3 100644 --- a/src/MeoAssistance/InfrastMoodImageAnalyzer.cpp +++ b/src/MeoAssistance/InfrastMoodImageAnalyzer.cpp @@ -12,12 +12,11 @@ bool asst::InfrastMoodImageAnalyzer::analyze() mood_detect(); mood_analyze(); - hash_calc(); selected_analyze(); working_analyze(); for (auto&& info : m_result) { - log.trace(info.hash, info.rect.to_string(), + log.trace(info.rect.to_string(), "smiley:", (int)info.smiley.type, "mood:", info.percentage, "selected:", info.selected, "working:", info.working); } @@ -48,7 +47,6 @@ bool asst::InfrastMoodImageAnalyzer::mood_detect() const auto upper_task_ptr = resource.task().task_ptr("InfrastSkillsUpper"); const auto lower_task_ptr = resource.task().task_ptr("InfrastSkillsLower"); const auto prg_task_ptr = resource.task().task_ptr("InfrastOperMoodProgressBar"); - Rect progress_rect_move = prg_task_ptr->rect_move; std::vector roi_vec = { @@ -172,20 +170,6 @@ bool asst::InfrastMoodImageAnalyzer::mood_analyze() return false; } -bool asst::InfrastMoodImageAnalyzer::hash_calc() -{ - const auto hash_task_ptr = resource.task().task_ptr("InfrastSkillsHash"); - Rect hash_rect_move = hash_task_ptr->rect_move; - - for (auto&& info : m_result) { - Rect hash_rect = hash_rect_move; - hash_rect.x += info.smiley.rect.x; - hash_rect.y += info.smiley.rect.y; - info.hash = calc_name_hash(hash_rect); - } - return true; -} - bool asst::InfrastMoodImageAnalyzer::selected_analyze() { const auto selected_task_ptr = std::dynamic_pointer_cast( diff --git a/src/MeoAssistance/InfrastMoodImageAnalyzer.h b/src/MeoAssistance/InfrastMoodImageAnalyzer.h index e3b5f133a2..d2685f0a62 100644 --- a/src/MeoAssistance/InfrastMoodImageAnalyzer.h +++ b/src/MeoAssistance/InfrastMoodImageAnalyzer.h @@ -14,7 +14,7 @@ namespace asst void sort_result(); - const std::vector& get_result() const noexcept + auto get_result() const noexcept -> const std::vector& { return m_result; } @@ -32,7 +32,6 @@ namespace asst bool mood_detect(); bool mood_analyze(); - bool hash_calc(); bool selected_analyze(); bool working_analyze();