修复getOldSeasonPoint
This commit is contained in:
parent
f23cc45d70
commit
a7df1cfcd9
@ -75,7 +75,7 @@ class FriendController extends BaseAuthedController {
|
|||||||
$rank = 1;
|
$rank = 1;
|
||||||
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
||||||
for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) {
|
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']
|
if ($row['integral'] >= $seaPoint['min'] && $row['integral'] <= $seaPoint['max']
|
||||||
|| $seaPoint['max'] == -1) {
|
|| $seaPoint['max'] == -1) {
|
||||||
$rank = $ii;
|
$rank = $ii;
|
||||||
|
@ -104,7 +104,7 @@ class PassController extends BaseAuthedController {
|
|||||||
$rank_status = 0;
|
$rank_status = 0;
|
||||||
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
||||||
for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) {
|
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']
|
if ($row['integral'] >= $seaPoint['min'] && $row['integral'] <= $seaPoint['max']
|
||||||
|| $row['integral'] >= $seaPoint['min'] && $seaPoint['max'] == -1)
|
|| $row['integral'] >= $seaPoint['min'] && $seaPoint['max'] == -1)
|
||||||
{
|
{
|
||||||
@ -315,7 +315,7 @@ class PassController extends BaseAuthedController {
|
|||||||
$level = 0;
|
$level = 0;
|
||||||
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
||||||
for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) {
|
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']
|
if ($row['integral'] >= $seaPoint['min'] && $row['integral'] <= $seaPoint['max']
|
||||||
|| $row['integral'] >= $seaPoint['min'] && $seaPoint['max'] == -1)
|
|| $row['integral'] >= $seaPoint['min'] && $seaPoint['max'] == -1)
|
||||||
{
|
{
|
||||||
@ -412,7 +412,7 @@ class PassController extends BaseAuthedController {
|
|||||||
//积分结算
|
//积分结算
|
||||||
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
||||||
for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) {
|
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']
|
if ($row['season_end_score'] >= $seaPoint['min'] && $row['season_end_score'] <= $seaPoint['max']
|
||||||
|| $row['season_end_score'] >= $seaPoint['min'] && $seaPoint['max'] == -1)
|
|| $row['season_end_score'] >= $seaPoint['min'] && $seaPoint['max'] == -1)
|
||||||
{
|
{
|
||||||
|
@ -33,7 +33,7 @@ class RankController extends BaseAuthedController {
|
|||||||
if ($row) {
|
if ($row) {
|
||||||
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
||||||
for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) {
|
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']
|
if ($row['integral'] >= $seaPoint['min'] && $row['integral'] <= $seaPoint['max']
|
||||||
|| $seaPoint['max'] == -1) {
|
|| $seaPoint['max'] == -1) {
|
||||||
$rank = $ii;
|
$rank = $ii;
|
||||||
@ -170,7 +170,7 @@ class RankController extends BaseAuthedController {
|
|||||||
$rank = 0;
|
$rank = 0;
|
||||||
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
||||||
for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) {
|
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']
|
if ($integral_db[$i][8] >= $seaPoint['min'] && $integral_db[$i][8] <= $seaPoint['max']
|
||||||
|| $integral_db[$i][8] >= $seaPoint['min'] && $seaPoint['max'] == -1)
|
|| $integral_db[$i][8] >= $seaPoint['min'] && $seaPoint['max'] == -1)
|
||||||
{
|
{
|
||||||
|
@ -451,7 +451,7 @@ class RoleController extends BaseAuthedController {
|
|||||||
$season_point_table = require('../res/seasomPoint@seasomPoint.php');
|
$season_point_table = require('../res/seasomPoint@seasomPoint.php');
|
||||||
$integral = 0;
|
$integral = 0;
|
||||||
for ($j = 1; $j <= count($season_point_table); $j++) {
|
for ($j = 1; $j <= count($season_point_table); $j++) {
|
||||||
$seasonpoint = mt\Season::getOldSeasonPoint($j);
|
$seasonpoint = mt\SeasonPoint::getOldSeasonPoint($j);
|
||||||
if ($rowUser['integral'] <= $seasonpoint['max'] ||
|
if ($rowUser['integral'] <= $seasonpoint['max'] ||
|
||||||
$seasonpoint['max'] == -1) {
|
$seasonpoint['max'] == -1) {
|
||||||
$integral = $seasonpoint['topoint'];
|
$integral = $seasonpoint['topoint'];
|
||||||
@ -714,7 +714,7 @@ class RoleController extends BaseAuthedController {
|
|||||||
$is_pro = 0;
|
$is_pro = 0;
|
||||||
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
$seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
|
||||||
for ($ii = 1; $ii <= count($seaPoint_meta_table); $ii++) {
|
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']
|
if ($row['integral'] >= $seaPoint['min'] && $row['integral'] <= $seaPoint['max']
|
||||||
|| $row['integral'] >= $seaPoint['min'] && $seaPoint['max'] == -1) {
|
|| $row['integral'] >= $seaPoint['min'] && $seaPoint['max'] == -1) {
|
||||||
$is_pro = $seaPoint['is_protect'];
|
$is_pro = $seaPoint['is_protect'];
|
||||||
@ -1656,7 +1656,6 @@ class RoleController extends BaseAuthedController {
|
|||||||
public function addVideotimes()
|
public function addVideotimes()
|
||||||
{
|
{
|
||||||
$account_id = $_REQUEST['account_id'];
|
$account_id = $_REQUEST['account_id'];
|
||||||
}
|
|
||||||
$conn = $this->getMysql($account_id);
|
$conn = $this->getMysql($account_id);
|
||||||
if (!$conn) {
|
if (!$conn) {
|
||||||
phpcommon\sendError(ERR_USER_BASE + 1, '没有这个玩家');
|
phpcommon\sendError(ERR_USER_BASE + 1, '没有这个玩家');
|
||||||
|
@ -4,7 +4,7 @@ namespace mt;
|
|||||||
|
|
||||||
use phpcommon;
|
use phpcommon;
|
||||||
|
|
||||||
class Parameter {
|
class EquipUpgrade {
|
||||||
|
|
||||||
public static function get($id)
|
public static function get($id)
|
||||||
{
|
{
|
||||||
|
@ -11,7 +11,7 @@ class Season {
|
|||||||
return array_key_exists($id, self::getMetaList()) ? self::getMetaList()[$id] : null;
|
return array_key_exists($id, self::getMetaList()) ? self::getMetaList()[$id] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static function getMeta()
|
protected static function getMetaList()
|
||||||
{
|
{
|
||||||
if (!self::$metaList) {
|
if (!self::$metaList) {
|
||||||
self::$metaList = getMetaTable('season@season.php');
|
self::$metaList = getMetaTable('season@season.php');
|
||||||
@ -21,7 +21,7 @@ class Season {
|
|||||||
|
|
||||||
public static function getSeasonRewardByLv($lv)
|
public static function getSeasonRewardByLv($lv)
|
||||||
{
|
{
|
||||||
$seasonCfg = self::getMeta();
|
$seasonCfg = self::getMetaList();
|
||||||
|
|
||||||
return $seasonCfg;
|
return $seasonCfg;
|
||||||
|
|
||||||
@ -29,14 +29,14 @@ class Season {
|
|||||||
|
|
||||||
public static function getSeasonCfg()
|
public static function getSeasonCfg()
|
||||||
{
|
{
|
||||||
$seasonCfg = self::getMeta();
|
$seasonCfg = self::getMetaList();
|
||||||
|
|
||||||
return $seasonCfg;
|
return $seasonCfg;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getTaskCfgByID($_itemID)
|
public static function getTaskCfgByID($_itemID)
|
||||||
{
|
{
|
||||||
$playerSkinCfg = self::getMeta();
|
$playerSkinCfg = self::getMetaList();
|
||||||
$itemData = null;
|
$itemData = null;
|
||||||
foreach($playerSkinCfg as $item)
|
foreach($playerSkinCfg as $item)
|
||||||
{
|
{
|
||||||
@ -58,7 +58,7 @@ class Season {
|
|||||||
'open_time' => $meta['time1'],
|
'open_time' => $meta['time1'],
|
||||||
'end_time' => $meta['time2'],
|
'end_time' => $meta['time2'],
|
||||||
'reward' => $meta['season_reward'],
|
'reward' => $meta['season_reward'],
|
||||||
'weekreward' => $meta['week_reward'],
|
#'weekreward' => $meta['week_reward'],
|
||||||
'season_overreward' => $meta['season_overreward'],
|
'season_overreward' => $meta['season_overreward'],
|
||||||
'reward2' => $meta['season_reward2'],
|
'reward2' => $meta['season_reward2'],
|
||||||
);
|
);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user