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

fix: check current time for activity_table.json and gacha_table.json

Browse Source 
fix #7747
This commit is contained in:
Constrat
2023-12-23 16:20:23 +01:00
parent 812138fda5
commit 40cbe52c00
6 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resource/global/YoStarEN/resource/version.json
View File

@@ -1,11 +1,11 @@
{
"activity": {
"name": "Lingering Echoes - Rerun",
"time": 1704474000
"name": "Hortus de Escapismo",
"time": 1703160000
},
"gacha": {
"pool": "Here I Stand",
"time": 1699376400
},
"last_updated": "2023-12-22 10:45:43.135"
"last_updated": "2023-12-23 16:10:21.280"
}

6
resource/global/YoStarJP/resource/version.json
View File

@@ -1,11 +1,11 @@
{
"activity": {
"name": "塵影に交わる残響・復刻",
"time": 1704438000
"name": "空想の花庭",
"time": 1703124000
},
"gacha": {
"pool": "真理の在処",
"time": 1699340400
},
"last_updated": "2023-12-22 10:45:43.135"
"last_updated": "2023-12-23 16:10:21.280"
}

6
resource/global/YoStarKR/resource/version.json
View File

@@ -1,11 +1,11 @@
{
"activity": {
"name": "링거링 에코스 (재개방)",
"time": 1704438000
"name": "공상의 정원",
"time": 1703124000
},
"gacha": {
"pool": "진리가 있는 곳",
"time": 1699340400
},
"last_updated": "2023-12-22 10:45:43.135"
"last_updated": "2023-12-23 16:10:21.280"
}

6
resource/global/txwy/resource/version.json
View File

@@ -4,8 +4,8 @@
"time": 1702360800
},
"gacha": {
"pool": "跨年歡慶·相逢",
"time": 1703577600
"pool": "礪火成鋒",
"time": 1702360800
},
"last_updated": "2023-12-22 10:45:43.135"
"last_updated": "2023-12-23 16:10:21.280"
}

2
resource/version.json
View File

@@ -7,5 +7,5 @@
"pool": "枯焰生花",
"time": 1703232000
},
"last_updated": "2023-12-22 10:45:43.135"
"last_updated": "2023-12-23 16:10:21.280"
}

55
tools/ResourceUpdater/main.cpp
View File

@@ -67,7 +67,7 @@ bool update_version_info(const std::filesystem::path& input_dir, const std::file
int main([[maybe_unused]] int argc, char** argv)
{
/* ---- PATH DECLARATION ---- */
// ---- PATH DECLARATION ----
const char* str_exec_path = argv[0];
const auto cur_path = std::filesystem::path(str_exec_path).parent_path();
@@ -93,9 +93,9 @@ int main([[maybe_unused]] int argc, char** argv)
{ "zh_TW", "txwy" },
};
/* ---- METHODS CALLS ---- */
// ---- METHODS CALLS ----
/* Update levels.json from ArknightsGameResource */
// Update levels.json from ArknightsGameResource
std::cout << "------- Update levels.json for Official -------" << std::endl;
if (!update_levels_json(official_data_dir / "levels.json", resource_dir / "Arknights-Tile-Pos")) {
std::cerr << "update levels.json failed" << std::endl;
@@ -110,7 +110,7 @@ int main([[maybe_unused]] int argc, char** argv)
// generate_english_roguelike_stage_name_replacement(official_data_dir / "levels.json", cur_path /
// "en_levels.json");
/* Update infrast data from ArknightsGameResource */
// Update infrast data from ArknightsGameResource
std::cout << "------- Update infrast data for Official -------" << std::endl;
if (!update_infrast_data(official_data_dir / "gamedata" / "excel", resource_dir)) {
std::cerr << "Update infrast data failed" << std::endl;
@@ -120,7 +120,7 @@ int main([[maybe_unused]] int argc, char** argv)
std::cout << "Done" << std::endl;
}
/* Update infrast templates from ArknightsGameResource */
// Update infrast templates from ArknightsGameResource
std::cout << "------- Update infrast templates for Official -------" << std::endl;
if (!update_infrast_templates(official_data_dir / "building_skill", resource_dir / "template" / "infrast")) {
std::cerr << "Update infrast templates failed" << std::endl;
@@ -130,7 +130,7 @@ int main([[maybe_unused]] int argc, char** argv)
std::cout << "Done" << std::endl;
}
/* Update roguelike recruit data from ArknightsGameResource */
// Update roguelike recruit data from ArknightsGameResource
// std::cout << "------- Update roguelike recruit data -------" << std::endl;
// if (!update_roguelike_recruit(arkbot_res_dir, resource_dir, solution_dir)) {
// std::cerr << "Update roguelike recruit data failed" << std::endl;
@@ -139,7 +139,7 @@ int main([[maybe_unused]] int argc, char** argv)
// std::cout << "Done" << std::endl;
//}
/* Update base_name.json from Penguin Stats */
// Update base_name.json from Penguin Stats
std::cout << "------- Update stage.json for Official -------" << std::endl;
if (!update_stages_data(cur_path, resource_dir)) {
std::cerr << "Update stages data failed" << std::endl;
@@ -149,7 +149,7 @@ int main([[maybe_unused]] int argc, char** argv)
std::cout << "Done" << std::endl;
}
/* Update battle chars info for all clients */
// Update battle chars info for all clients
std::cout << "------- Update battle chars info for all clients -------" << std::endl;
if (!update_battle_chars_info(official_data_dir / "gamedata" / "excel", overseas_data_dir, resource_dir)) {
std::cerr << "Update battle chars info failed" << std::endl;
@@ -159,7 +159,7 @@ int main([[maybe_unused]] int argc, char** argv)
std::cout << "Done" << std::endl;
}
/* Update recruitment data from ArknightsGameResource */
// Update recruitment data from ArknightsGameResource
std::cout << "------- Update recruitment data for Official -------" << std::endl;
if (!update_recruitment_data(official_data_dir / "gamedata" / "excel", resource_dir / "recruitment.json", true)) {
std::cerr << "Update recruitment data failed" << std::endl;
@@ -169,7 +169,7 @@ int main([[maybe_unused]] int argc, char** argv)
std::cout << "Done" << std::endl;
}
/* Update recruitment data from ArknightsGameData_YoStar */
// Update recruitment data from ArknightsGameData_YoStar
for (const auto& [in, out] : global_dirs) {
std::cout << "------- Update recruitment data for " << out << "------- " << std::endl;
if (!update_recruitment_data(overseas_data_dir / in / "gamedata" / "excel",
@@ -182,7 +182,7 @@ int main([[maybe_unused]] int argc, char** argv)
}
}
/* Update items template and json from ArknightsGameResource */
// Update items template and json from ArknightsGameResource
std::cout << "------- Update items template and json for Official -------" << std::endl;
if (!update_items_data(official_data_dir, resource_dir)) {
std::cerr << "Update items data failed" << std::endl;
@@ -192,7 +192,7 @@ int main([[maybe_unused]] int argc, char** argv)
std::cout << "Done" << std::endl;
}
/* Update items template and json from ArknightsGameData_YoStar */
// Update items template and json from ArknightsGameData_YoStar
for (const auto& [in, out] : global_dirs) {
std::cout << "------- Update items template and json for " << out << "------- " << std::endl;
if (!update_items_data(overseas_data_dir / in / "gamedata" / "excel",
@@ -205,7 +205,7 @@ int main([[maybe_unused]] int argc, char** argv)
}
}
/* Update roguelike replace for overseas from ArknightsGameData_YoStar */
// Update roguelike replace for overseas from ArknightsGameData_YoStar
for (const auto& [in, out] : global_dirs) {
// Temporary, until roguelike_topic_table is added to arknights-toolbox-update
std::cout << "------- Update roguelike replace for " << out << "------- " << std::endl;
@@ -220,7 +220,7 @@ int main([[maybe_unused]] int argc, char** argv)
}
}
/* Update version info from ArknightsGameData */
// Update version info from ArknightsGameData
std::cout << "------- Update version info for Official -------" << std::endl;
if (!update_version_info(official_data_dir / "gamedata" / "excel", resource_dir)) {
std::cerr << "Update version info failed" << std::endl;
@@ -229,8 +229,7 @@ int main([[maybe_unused]] int argc, char** argv)
else {
std::cout << "Done" << std::endl;
}
/* Update global version info from ArknightsGameData_Yostar */
// Update global version info from ArknightsGameData_Yostar
for (const auto& [in, out] : global_dirs) {
std::cout << "------- Update version info for " << out << "------- " << std::endl;
if (!update_version_info(overseas_data_dir / in / "gamedata" / "excel",
@@ -247,7 +246,7 @@ int main([[maybe_unused]] int argc, char** argv)
return 0;
}
/* ---- METHODS DEFINITIONS ---- */
// ---- METHODS DEFINITIONS ----
bool update_items_data(const std::filesystem::path& input_dir, const std::filesystem::path& output_dir, bool with_imgs)
{
@@ -1150,6 +1149,8 @@ bool check_roguelike_replace_for_overseas(const std::filesystem::path& input_dir
bool update_version_info(const std::filesystem::path& input_dir, const std::filesystem::path& output_dir)
{
uint64_t current_time = (unsigned long)time(NULL);
json::value result;
{
const auto json_path = input_dir / "gacha_table.json";
@@ -1165,21 +1166,21 @@ bool update_version_info(const std::filesystem::path& input_dir, const std::file
pool_count[gacha_info["gachaPoolName"].as_string()]++;
}
uint64_t time = 0;
uint64_t time_var = 0;
std::string pool;
for (auto& gacha_info : gacha_json["gachaPoolClient"].as_array()) {
const auto& pool_name = gacha_info["gachaPoolName"].as_string();
if (pool_count[pool_name] > 5) { // 把常驻池过滤掉
continue;
}
auto cur_time = gacha_info["openTime"].as_unsigned_long_long();
if (time < cur_time) {
time = cur_time;
auto pool_time = gacha_info["openTime"].as_unsigned_long_long();
if ((time_var < pool_time) && (current_time > pool_time)) {
time_var = pool_time;
pool = pool_name;
}
}
result["gacha"]["time"] = time;
result["gacha"]["time"] = time_var;
result["gacha"]["pool"] = pool;
}
{
@@ -1190,7 +1191,7 @@ bool update_version_info(const std::filesystem::path& input_dir, const std::file
return false;
}
uint64_t time = 0;
uint64_t time_var = 0;
std::string name;
auto& activity_json = *activity_json_opt;
@@ -1198,14 +1199,14 @@ bool update_version_info(const std::filesystem::path& input_dir, const std::file
if (!act.at("displayOnHome").as_boolean()) {
continue;
}
auto cur_time = act.at("startTime").as_unsigned_long_long();
if (time < cur_time) {
time = cur_time;
auto activity_time = act.at("startTime").as_unsigned_long_long();
if ((time_var < activity_time) && (current_time > activity_time)) {
time_var = activity_time;
name = act.at("name").as_string();
}
}
result["activity"]["time"] = time;
result["activity"]["time"] = time_var;
result["activity"]["name"] = name;
}
static auto time = asst::utils::get_format_time();