Push webui

src/router/databases/csv-en/title_screen.csv

@@ -1,6 +1,6 @@
-_id,_prefabName,_masterBgmId,_priority,_masterReleaseLabelId
-1,DefaultTitle1,21000001,0,1
-2,DefaultTitle2,21000001,0,1
-3,DefaultTitle3,21000001,0,1
-4,DefaultTitle4,21000001,0,1
-5,DefaultTitle5,21000001,0,1
+_id,_imageName,_logoX,_logoY,_masterBgmId,_priority,_masterReleaseLabelId
+1,titlescreen_0001,181,-112,21000001,0,1
+2,titlescreen_0002,-609.44,300.61,21000001,0,1
+3,titlescreen_0003,0,264,21000001,0,1
+4,titlescreen_0004,-343,-282.61,21000001,0,1
+5,titlescreen_0005,0,346,21000001,0,1

src/router/databases/csv/title_screen.csv

@@ -1,6 +1,6 @@
-_id,_prefabName,_masterBgmId,_priority,_masterReleaseLabelId
-1,DefaultTitle1,21000001,0,1
-2,DefaultTitle2,21000001,0,1
-3,DefaultTitle3,21000001,0,1
-4,DefaultTitle4,21000001,0,1
-5,DefaultTitle5,21000001,0,1
+_id,_imageName,_logoX,_logoY,_masterBgmId,_priority,_masterReleaseLabelId
+1,titlescreen_0001,181,-112,21000001,0,1
+2,titlescreen_0002,-609.44,300.61,21000001,0,1
+3,titlescreen_0003,0,264,21000001,0,1
+4,titlescreen_0004,-343,-282.61,21000001,0,1
+5,titlescreen_0005,0,346,21000001,0,1

src/router/databases/schemas.json

@@ -5676,9 +5676,17 @@
           "type": "uint"
         },
         {
-          "name": "_prefabName",
+          "name": "_imageName",
           "type": "string"
         },
+        {
+          "name": "_logoX",
+          "type": "float"
+        },
+        {
+          "name": "_logoY",
+          "type": "float"
+        },
         {
           "name": "_masterBgmId",
           "type": "uint"

src/router/web.rs

@@ -57,13 +57,21 @@ fn query_i64(req: &HttpRequest, key: &str, def: i64) -> i64 {
 
 fn player_key(req: &HttpRequest) -> Option<String> {
     let key = global::get_login(req.headers(), "");
+    if !key.is_empty() {
+        return Some(key);
+    }
+    let uid = global::get_uid(req.headers());
+    if uid == 0 {
+        return None;
+    }
+    let key = userdata::get_login_token(uid);
     if key.is_empty() { None } else { Some(key) }
 }
 
 fn read_set(req: &HttpRequest) -> HashSet<i64> {
     match player_key(req) {
-    Some(key) => { println!("Player has key"); userdata::get_acc_home(&key)["home"]["read_announcement_ids"].members().filter_map(|v| v.as_i64()).collect()},
-        None => { println!("No player key"); HashSet::new() }
+        Some(key) => userdata::get_acc_home(&key)["home"]["read_announcement_ids"].members().filter_map(|v| v.as_i64()).collect(),
+        None => HashSet::new()
     }
 }