diff --git a/webapp/controller/FriendController.class.php b/webapp/controller/FriendController.class.php index 8dd4c51..36c4406 100644 --- a/webapp/controller/FriendController.class.php +++ b/webapp/controller/FriendController.class.php @@ -75,7 +75,7 @@ class FriendController extends BaseAuthedController { $rank = 1; $seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php'); for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) { - $seaPoint = mt\Season::getOldSeasonPoint($ii); + $seaPoint = mt\SeasonPoint::getOldSeasonPoint($ii); if ($row['integral'] >= $seaPoint['min'] && $row['integral'] <= $seaPoint['max'] || $seaPoint['max'] == -1) { $rank = $ii; diff --git a/webapp/controller/PassController.class.php b/webapp/controller/PassController.class.php index 0a94f59..f0e4eb9 100644 --- a/webapp/controller/PassController.class.php +++ b/webapp/controller/PassController.class.php @@ -104,7 +104,7 @@ class PassController extends BaseAuthedController { $rank_status = 0; $seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php'); for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) { - $seaPoint = mt\Season::getOldSeasonPoint($ii); + $seaPoint = mt\SeasonPoint::getOldSeasonPoint($ii); if ($row['integral'] >= $seaPoint['min'] && $row['integral'] <= $seaPoint['max'] || $row['integral'] >= $seaPoint['min'] && $seaPoint['max'] == -1) { @@ -315,7 +315,7 @@ class PassController extends BaseAuthedController { $level = 0; $seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php'); for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) { - $seaPoint = mt\Season::getOldSeasonPoint($ii); + $seaPoint = mt\SeasonPoint::getOldSeasonPoint($ii); if ($row['integral'] >= $seaPoint['min'] && $row['integral'] <= $seaPoint['max'] || $row['integral'] >= $seaPoint['min'] && $seaPoint['max'] == -1) { @@ -412,7 +412,7 @@ class PassController extends BaseAuthedController { //积分结算 $seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php'); for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) { - $seaPoint = mt\Season::getOldSeasonPoint($ii); + $seaPoint = mt\SeasonPoint::getOldSeasonPoint($ii); if ($row['season_end_score'] >= $seaPoint['min'] && $row['season_end_score'] <= $seaPoint['max'] || $row['season_end_score'] >= $seaPoint['min'] && $seaPoint['max'] == -1) { diff --git a/webapp/controller/RankController.class.php b/webapp/controller/RankController.class.php index c5fcf85..a0fc0cd 100644 --- a/webapp/controller/RankController.class.php +++ b/webapp/controller/RankController.class.php @@ -33,7 +33,7 @@ class RankController extends BaseAuthedController { if ($row) { $seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php'); for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) { - $seaPoint = mt\Season::getOldSeasonPoint($ii); + $seaPoint = mt\SeasonPoint::getOldSeasonPoint($ii); if ($row['integral'] >= $seaPoint['min'] && $row['integral'] <= $seaPoint['max'] || $seaPoint['max'] == -1) { $rank = $ii; @@ -170,7 +170,7 @@ class RankController extends BaseAuthedController { $rank = 0; $seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php'); for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) { - $seaPoint = mt\Season::getOldSeasonPoint($ii); + $seaPoint = mt\SeasonPoint::getOldSeasonPoint($ii); if ($integral_db[$i][8] >= $seaPoint['min'] && $integral_db[$i][8] <= $seaPoint['max'] || $integral_db[$i][8] >= $seaPoint['min'] && $seaPoint['max'] == -1) { diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php index 3eb58e0..9e4f125 100644 --- a/webapp/controller/RoleController.class.php +++ b/webapp/controller/RoleController.class.php @@ -451,7 +451,7 @@ class RoleController extends BaseAuthedController { $season_point_table = require('../res/seasomPoint@seasomPoint.php'); $integral = 0; for ($j = 1; $j <= count($season_point_table); $j++) { - $seasonpoint = mt\Season::getOldSeasonPoint($j); + $seasonpoint = mt\SeasonPoint::getOldSeasonPoint($j); if ($rowUser['integral'] <= $seasonpoint['max'] || $seasonpoint['max'] == -1) { $integral = $seasonpoint['topoint']; @@ -714,7 +714,7 @@ class RoleController extends BaseAuthedController { $is_pro = 0; $seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php'); for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) { - $seaPoint = mt\Season::getOldSeasonPoint($ii); + $seaPoint = mt\SeasonPoint::getOldSeasonPoint($ii); if ($row['integral'] >= $seaPoint['min'] && $row['integral'] <= $seaPoint['max'] || $row['integral'] >= $seaPoint['min'] && $seaPoint['max'] == -1) { $is_pro = $seaPoint['is_protect']; @@ -1656,7 +1656,6 @@ class RoleController extends BaseAuthedController { public function addVideotimes() { $account_id = $_REQUEST['account_id']; - } $conn = $this->getMysql($account_id); if (!$conn) { phpcommon\sendError(ERR_USER_BASE + 1, '没有这个玩家'); diff --git a/webapp/mt/EquipUpgrade.php b/webapp/mt/EquipUpgrade.php index 10e3e6a..e64c044 100644 --- a/webapp/mt/EquipUpgrade.php +++ b/webapp/mt/EquipUpgrade.php @@ -4,7 +4,7 @@ namespace mt; use phpcommon; -class Parameter { +class EquipUpgrade { public static function get($id) { diff --git a/webapp/mt/Season.php b/webapp/mt/Season.php index e6afe31..cd89241 100644 --- a/webapp/mt/Season.php +++ b/webapp/mt/Season.php @@ -11,7 +11,7 @@ class Season { return array_key_exists($id, self::getMetaList()) ? self::getMetaList()[$id] : null; } - protected static function getMeta() + protected static function getMetaList() { if (!self::$metaList) { self::$metaList = getMetaTable('season@season.php'); @@ -21,7 +21,7 @@ class Season { public static function getSeasonRewardByLv($lv) { - $seasonCfg = self::getMeta(); + $seasonCfg = self::getMetaList(); return $seasonCfg; @@ -29,14 +29,14 @@ class Season { public static function getSeasonCfg() { - $seasonCfg = self::getMeta(); + $seasonCfg = self::getMetaList(); return $seasonCfg; } public static function getTaskCfgByID($_itemID) { - $playerSkinCfg = self::getMeta(); + $playerSkinCfg = self::getMetaList(); $itemData = null; foreach($playerSkinCfg as $item) { @@ -58,7 +58,7 @@ class Season { 'open_time' => $meta['time1'], 'end_time' => $meta['time2'], 'reward' => $meta['season_reward'], - 'weekreward' => $meta['week_reward'], + #'weekreward' => $meta['week_reward'], 'season_overreward' => $meta['season_overreward'], 'reward2' => $meta['season_reward2'], );