diff --git a/src/router/global.rs b/src/router/global.rs index 65cac53..27806b1 100644 --- a/src/router/global.rs +++ b/src/router/global.rs @@ -135,6 +135,26 @@ pub fn give_item(master_item_id: i64, amount: i64, user: &mut JsonValue) { } } +pub fn give_points(master_item_id: i64, amount: i64, user: &mut JsonValue) { + let mut has = false; + for (_j, dataa) in user["point_list"].members_mut().enumerate() { + if dataa["type"].as_i64().unwrap() == master_item_id { + has = true; + dataa["amount"] = (dataa["amount"].as_i64().unwrap() + amount).into(); + if dataa["amount"].as_i64().unwrap() > 2000000000 { + dataa["amount"] = (2000000000).into(); + } + } + break; + } + if !has { + user["point_list"].push(object!{ + type: master_item_id, + amount: amount + }).unwrap(); + } +} + // true - added // false - already has pub fn give_character(id: String, user: &mut JsonValue) -> bool { diff --git a/src/router/live.rs b/src/router/live.rs index 933d24a..9efa50d 100644 --- a/src/router/live.rs +++ b/src/router/live.rs @@ -263,23 +263,7 @@ pub fn end(req: HttpRequest, body: String) -> HttpResponse { let user2 = userdata::get_acc_home(&key); let mut user = userdata::get_acc(&key); - let mut has = false; - for (_j, data) in user["point_list"].members_mut().enumerate() { - if data["type"].as_i64().unwrap() == 1 { - has = true; - data["amount"] = (data["amount"].as_i64().unwrap() + 50000).into(); - if data["amount"].as_i64().unwrap() > 2000000000 { - data["amount"] = (2000000000).into(); - } - } - break; - } - if !has { - user["point_list"].push(object!{ - type: 1, - amount: 5000 - }).unwrap(); - } + global::give_points(1, 10000, &mut user); global::give_item(16005003, 10, &mut user); global::give_item(17001003, 2, &mut user);