Fix timing of pulling clear_count

This commit is contained in:
Ethan O'Brien 2024-06-23 10:10:40 -05:00 committed by GitHub
parent f527c43797
commit 6575ea1eb0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -540,7 +540,6 @@ fn live_end(req: &HttpRequest, body: &str, skipped: bool) -> JsonValue {
} else { } else {
update_live_data(&mut user, &body, true) update_live_data(&mut user, &body, true)
}; };
let clear_count = get_clear_count(body["master_live_id"].as_i64().unwrap(), &user);
//1273009, 1273010, 1273011, 1273012 //1273009, 1273010, 1273011, 1273012
let mut cleared_missions = items::advance_variable_mission(1105001, 1105017, 1, &mut user_missions); let mut cleared_missions = items::advance_variable_mission(1105001, 1105017, 1, &mut user_missions);
@ -557,10 +556,12 @@ fn live_end(req: &HttpRequest, body: &str, skipped: bool) -> JsonValue {
let missions; let missions;
if skipped { if skipped {
live_completed(body["master_live_id"].as_i64().unwrap(), live["level"].as_i32().unwrap(), false, live["high_score"].as_i64().unwrap(), user["user"]["id"].as_i64().unwrap()); live_completed(body["master_live_id"].as_i64().unwrap(), live["level"].as_i32().unwrap(), false, live["high_score"].as_i64().unwrap(), user["user"]["id"].as_i64().unwrap());
let clear_count = get_clear_count(body["master_live_id"].as_i64().unwrap(), &user);
missions = get_live_mission_completed_ids(&user, body["master_live_id"].as_i64().unwrap(), live["high_score"].as_i64().unwrap(), live["max_combo"].as_i64().unwrap(), clear_count, live["level"].as_i64().unwrap(), false, false).unwrap_or(array![]); missions = get_live_mission_completed_ids(&user, body["master_live_id"].as_i64().unwrap(), live["high_score"].as_i64().unwrap(), live["max_combo"].as_i64().unwrap(), clear_count, live["level"].as_i64().unwrap(), false, false).unwrap_or(array![]);
} else { } else {
live_completed(body["master_live_id"].as_i64().unwrap(), body["level"].as_i32().unwrap(), false, body["live_score"]["score"].as_i64().unwrap(), user["user"]["id"].as_i64().unwrap()); live_completed(body["master_live_id"].as_i64().unwrap(), body["level"].as_i32().unwrap(), false, body["live_score"]["score"].as_i64().unwrap(), user["user"]["id"].as_i64().unwrap());
let clear_count = get_clear_count(body["master_live_id"].as_i64().unwrap(), &user);
let is_full_combo = (body["live_score"]["good"].as_i32().unwrap_or(1) + body["live_score"]["bad"].as_i32().unwrap_or(1) + body["live_score"]["miss"].as_i32().unwrap_or(1)) == 0; let is_full_combo = (body["live_score"]["good"].as_i32().unwrap_or(1) + body["live_score"]["bad"].as_i32().unwrap_or(1) + body["live_score"]["miss"].as_i32().unwrap_or(1)) == 0;