diff --git a/sql/gamedb.sql b/sql/gamedb.sql index 1346fbb..3ffb0a2 100644 --- a/sql/gamedb.sql +++ b/sql/gamedb.sql @@ -73,6 +73,7 @@ CREATE TABLE `user` ( `score` int(11) NOT NULL DEFAULT '0' COMMENT '通行证积分', `season_status` int(11) NOT NULL DEFAULT '0' COMMENT '赛季奖励状态', `first_gift` int(11) NOT NULL DEFAULT '0' COMMENT '首充礼包领取状态', + `season_time` int(11) NOT NULL DEFAULT '0' COMMENT '赛季结束时间', PRIMARY KEY (`idx`), UNIQUE KEY `accountid` (`accountid`) ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; diff --git a/webapp/controller/PassController.class.php b/webapp/controller/PassController.class.php index c7a024a..b86dc91 100644 --- a/webapp/controller/PassController.class.php +++ b/webapp/controller/PassController.class.php @@ -146,17 +146,17 @@ class PassController{ $drop_multiply = array(); $status = 0; $seaReward = $this->getSeasonReward($id - 1); - if ($row['score'] >= $seaReward['point'] && $seaReward['point'] != -1) { + if ($row['score'] >= $seaReward['point'] && $seaReward['point'] >= 0) { $level = $seaReward['level']; $pass_score = $row['score'] - $seaReward['point']; $max_pass_score = $seaReward['point']; } //如果是最大等级,则返回上一级的最大值 - if ($seaReward['point'] == -1) { + if ($max_pass_score == -1) { $seaR = $this->getSeasonReward($id - 2); $sum_score = $seaR['point']; } else { - $sum_score = $seaR['point']; + $sum_score = $seaReward['point']; } $rowPass = $conn->execQueryOne('SELECT active_status, honor_status ' . ' FROM passinfo WHERE accountid=:accountid AND passid=:passid;',