diff --git a/webapp/controller/RankController.class.php b/webapp/controller/RankController.class.php index 3b65194..5e4405c 100644 --- a/webapp/controller/RankController.class.php +++ b/webapp/controller/RankController.class.php @@ -81,7 +81,7 @@ class RankController{ break; } } - if ($row['avatar_url'] == '') { + if ($row['avatar_url'] == '' || $row['user_name'] == '') { $address = '../res/robot@robot' . 1 . '.php'; $robot_meta_cluster = require($address); $i = Rand(1, 100); @@ -91,8 +91,16 @@ class RankController{ 'name' => $robot_meta['name'], 'avatar_url' => $robot_meta['avatar_url'], ); - $myname = $rob['name']; - $myavatar_url = $rob['avatar_url']; + if ($row['user_name'] == '') { + $myname = $rob['name']; + } else { + $myname = $row['user_name']; + } + if ($row['avatar_url'] == '') { + $myavatar_url = $rob['avatar_url']; + } else { + $myavatar_url = $row['avatar_url']; + } } else { $myname = $row['user_name']; $myavatar_url = $row['avatar_url']; @@ -127,7 +135,7 @@ class RankController{ if ($kill_db[$i][0] == $account_id) { $kill_rank = $i + 1; } - if ($kill_db[$i][2] == '') { + if ($kill_db[$i][2] == '' || $kill_db[$i][1] == '') { if ($kill_db[$i][0] == $account_id) { $name = $myname; $avatar_url = $myavatar_url; @@ -141,8 +149,16 @@ class RankController{ 'name' => $robot_meta['name'], 'avatar_url' => $robot_meta['avatar_url'], ); - $name = $rob['name']; - $avatar_url = $rob['avatar_url']; + if ($kill_db[$i][1] == '') { + $name = $rob['name']; + } else { + $name = $kill_db[$i][1]; + } + if ($kill_db[$i][2] == '') { + $avatar_url = $rob['avatar_url']; + } else { + $avatar_url = $kill_db[$i][2]; + } } } else { $name = $kill_db[$i][1]; @@ -177,7 +193,7 @@ class RankController{ if ($win_db[$i][0] == $account_id) { $win_rank = $i + 1; } - if ($win_db[$i][2] == '') { + if ($win_db[$i][2] == '' || $win_db[$i][1] == '') { if ($win_db[$i][0] == $account_id) { $name = $myname; $avatar_url = $myavatar_url; @@ -191,8 +207,16 @@ class RankController{ 'name' => $robot_meta['name'], 'avatar_url' => $robot_meta['avatar_url'], ); - $name = $rob['name']; - $avatar_url = $rob['avatar_url']; + if ($win_db[$i][1] == '') { + $name = $rob['name']; + } else { + $name = $win_db[$i][1]; + } + if ($win_db[$i][2] == '') { + $avatar_url = $rob['avatar_url']; + } else { + $avatar_url = $win_db[$i][2]; + } } } else { $name = $win_db[$i][1]; @@ -238,7 +262,7 @@ class RankController{ if ($integral_db[$i][0] == $account_id) { $integral_rank = $i + 1; } - if ($integral_db[$i][2] == '') { + if ($integral_db[$i][2] == '' || $integral_db[$i][1] == '') { if ($integral_db[$i][0] == $account_id) { $name = $myname; $avatar_url = $myavatar_url; @@ -252,8 +276,16 @@ class RankController{ 'name' => $robot_meta['name'], 'avatar_url' => $robot_meta['avatar_url'], ); - $name = $rob['name']; - $avatar_url = $rob['avatar_url']; + if ($integral_db[$i][1] == '') { + $name = $rob['name']; + } else { + $name = $integral_db[$i][1]; + } + if ($integral_db[$i][2] == '') { + $avatar_url = $rob['avatar_url']; + } else { + $avatar_url = $integral_db[$i][2]; + } } } else { $name = $integral_db[$i][1];