diff --git a/webapp/controller/ActivityController.class.php b/webapp/controller/ActivityController.class.php index 369fa8c..5c702a0 100644 --- a/webapp/controller/ActivityController.class.php +++ b/webapp/controller/ActivityController.class.php @@ -542,7 +542,7 @@ class ActivityController{ $weight_sum += $l['jilv']; } $random = Rand(1, $weight_sum); - error_log($random); + // error_log($random); for ($ii = 0; $ii < count($lot_array); $ii++) { $l = $this->getLottery($lot_array[$ii]['key']); $weight += $l['jilv']; diff --git a/webapp/controller/PassController.class.php b/webapp/controller/PassController.class.php index 397b50c..28d5a5e 100644 --- a/webapp/controller/PassController.class.php +++ b/webapp/controller/PassController.class.php @@ -86,7 +86,7 @@ class PassController{ if (time() >= strtotime($season['open_time']) && time() <= strtotime($season['end_time'])) { $open_time = strtotime($season['open_time']); $end_time = strtotime($season['end_time']); - $ret = $conn->execScript('UPDATE user SET season_time=:season_time, modify_time=:modify_time ' . + /*$ret = $conn->execScript('UPDATE user SET season_time=:season_time, modify_time=:modify_time ' . ' WHERE accountid=:accountid;', array( ':accountid' => $account_id, @@ -96,7 +96,7 @@ class PassController{ if (!$ret) { die(); return; - } + }*/ $number = $i; $item_multiply = $this->getExplode($season['reward']); //$ii = 0; diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php index 267ea87..d8d30d5 100644 --- a/webapp/controller/RoleController.class.php +++ b/webapp/controller/RoleController.class.php @@ -778,7 +778,7 @@ class RoleController{ protected function createSessionId($accountid, $registertime, $session_key) { $nowtime = time(); - error_log($accountid . 'f3a6a9a5-217a-4079-ab99-b5d69b8212be' . $registertime . $nowtime); + // error_log($accountid . 'f3a6a9a5-217a-4079-ab99-b5d69b8212be' . $registertime . $nowtime); $session_id = $nowtime . '_' . $registertime diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index 364c7c0..d4b5e4c 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -390,7 +390,7 @@ class ShopController{ ':id' => $id )); $price = $i['price']; - if ($it['type'] == 10) { + if ($i['type'] == 10) { $num = $i['bug_groupnum']; } diff --git a/webapp/controller/SignController.class.php b/webapp/controller/SignController.class.php index 9a289f9..ae5a8c9 100644 --- a/webapp/controller/SignController.class.php +++ b/webapp/controller/SignController.class.php @@ -474,12 +474,22 @@ class SignController{ ':accountid' => $account_id, )); if (time() > $rowUser['season_time'] && $rowUser['season_time'] != 0) { - $user_ret = $conn->execScript('UPDATE user SET pass_status=0, score=0, season_status=0, integral=0, season_end_score=:season_end_score, modify_time=:modify_time, season_games=0, sea_max_kill=0, sea_max_hart=0, sea_avg_kill=0, season_win=0 ' . + $season_meta_table = require('../res/season@season.php'); + $end_time = 0; + for ($i = 1; $i <= count($season_meta_table); $i++) { + $season = $this->getSeason($i); + if (time() >= strtotime($season['open_time']) && time() <= strtotime($season['end_time'])) { + $end_time = strtotime($season['end_time']); + break; + } + } + $user_ret = $conn->execScript('UPDATE user SET pass_status=0, score=0, season_status=0, integral=0, season_end_score=:season_end_score, modify_time=:modify_time, season_games=0, sea_max_kill=0, sea_max_hart=0, sea_avg_kill=0, season_win=0, season_time=:season_time ' . ' WHERE accountid=:accountid;', array( ':accountid' => $account_id, ':season_end_score' => $rowUser['integral'], - ':modify_time' => time() + ':modify_time' => time(), + ':season_time' => $end_time )); if (!$user_ret) { die();