diff --git a/webapp/controller/GameOverController.class.php b/webapp/controller/GameOverController.class.php index 561e8c1..b915068 100644 --- a/webapp/controller/GameOverController.class.php +++ b/webapp/controller/GameOverController.class.php @@ -129,7 +129,7 @@ class GameOverController{ $rank = $_REQUEST['rank']; $type = 0; $coin = 0; - $score = 0; + $score = 5; $kills = 0; if (isset($_REQUEST['type'])) { $type = $_REQUEST['type']; @@ -138,7 +138,7 @@ class GameOverController{ $ar = $this->getRankReward($rank); $coin = $ar['zbmode_param']; if (isset($_REQUEST['kills'])) { - $score = $_REQUEST['kills'] * 10; + $score = $_REQUEST['kills'] * 10 + $score; } } //道具物品 diff --git a/webapp/controller/RankController.class.php b/webapp/controller/RankController.class.php index a07d618..ac60f98 100644 --- a/webapp/controller/RankController.class.php +++ b/webapp/controller/RankController.class.php @@ -122,66 +122,12 @@ class RankController{ ini_set('memory_limit','3072M'); //击杀榜 $r = $this->getRedis(); - /*$channel = phpcommon\extractChannel($account_id); - $kill_rank_db = $r->get("game2004api:kill_rank_" . $channel); - $kill_db = json_decode($kill_rank_db); - $i = 0; - foreach ($kill_db as $kill) { - $name = ''; - $avatar_url = ''; - if ($i > 49) { - break; - } - if ($kill_db[$i][0] == $account_id) { - $kill_rank = $i + 1; - } - if ($kill_db[$i][2] == '' || $kill_db[$i][1] == '') { - if ($kill_db[$i][0] == $account_id) { - $name = $myname; - $avatar_url = $myavatar_url; - } else { - $address = '../res/robot@robot' . 1 . '.php'; - $robot_meta_cluster = require($address); - $j = Rand(1, 100); - $robot_id = 1000 + $j; - $robot_meta = getRobotConfig($robot_meta_cluster, $robot_id); - $rob = array( - 'name' => $robot_meta['name'], - 'avatar_url' => $robot_meta['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]; - $avatar_url = $kill_db[$i][2]; - } - $url = urldecode($avatar_url); - array_push($kill_list, array( - 'account_id' => $kill_db[$i][0], - 'name' => $name, - 'avatar_url' => $url, - 'kill' => $kill_db[$i][3], - 'alive'=> $kill_db[$i][4], - 'harm' => $kill_db[$i][5], - 'win_rate' => $kill_db[$i][6], - 'win_game' => $kill_db[$i][7], - )); - $i++; - - }*/ - //胜场榜 $channel = phpcommon\extractChannel($account_id); $win_rank_db = $r->get("game2004api:win_rank_" . $channel); + if ($_SERVER['HTTP_HOST'] == 'game2001api-banshu.kingsome.cn') { + $win_rank_db = $r->get("game2004api_2001:win_rank_" . $channel); + } $win_db = json_decode($win_rank_db); $i = 0; foreach ($win_db as $win) { @@ -239,6 +185,9 @@ class RankController{ //积分榜 $channel = phpcommon\extractChannel($account_id); $integral_rank_db = $r->get("game2004api:integral_rank_" . $channel); + if ($_SERVER['HTTP_HOST'] == 'game2001api-banshu.kingsome.cn') { + $integral_rank_db = $r->get("game2004api_2001:integral_rank_" . $channel); + } $integral_db = json_decode($integral_rank_db); $i = 0; foreach ($integral_db as $integral) { diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php index 591e30c..781c9ec 100644 --- a/webapp/controller/RoleController.class.php +++ b/webapp/controller/RoleController.class.php @@ -615,7 +615,7 @@ class RoleController{ $ar = $this->getRankReward($rank); $coin_num = $ar['zbmode_param']; $kills = $_REQUEST['kills']; - $row = $conn->execQueryOne('SELECT daily_time, coin_num, biogame_times FROM user WHERE accountid=:accountid;', + $row = $conn->execQueryOne('SELECT daily_time, coin_num, biogame_times, kills FROM user WHERE accountid=:accountid;', array( ':accountid' => $account_id )); @@ -637,7 +637,7 @@ class RoleController{ if ($daily_time == 0 || ($nowTime - phpcommon\getdayseconds($daily_time) > 0)) { $daily_time = time(); } - $ret = $conn->execScript('UPDATE user SET coin_num=:coin_num, modify_time=:modify_time, daily_time=:daily_time, biogame_times=:biogame_times ' . + $ret = $conn->execScript('UPDATE user SET coin_num=:coin_num, modify_time=:modify_time, kills=:kills, daily_time=:daily_time, biogame_times=:biogame_times ' . 'WHERE accountid=:accountid;', array( ':accountid' => $account_id, @@ -645,6 +645,7 @@ class RoleController{ ':modify_time' => time(), ':daily_time' => $daily_time, ':biogame_times' => $row['biogame_times'] + 1, + ':kills' => $row['kills'] + $kills, )); if (!$ret) { die();