From 98d2b3ce0d096f0a91211496c1c9ffa7c0f5ab44 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 22 Nov 2021 11:24:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90getEquip=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/controller/EquipController.class.php | 34 +++-------------- .../controller/GameOverController.class.php | 19 +--------- webapp/controller/RoleController.class.php | 17 +-------- webapp/mt/Equip.php | 37 +++++++++++++++---- 4 files changed, 38 insertions(+), 69 deletions(-) diff --git a/webapp/controller/EquipController.class.php b/webapp/controller/EquipController.class.php index 5df42bc1..fcffb412 100644 --- a/webapp/controller/EquipController.class.php +++ b/webapp/controller/EquipController.class.php @@ -3,6 +3,8 @@ require 'classes/Quest.php'; require 'classes/AddReward.php'; +require_once('mt/Equip.php'); + class EquipController extends BaseAuthedController { @@ -23,32 +25,6 @@ class EquipController extends BaseAuthedController { return $it; } - protected function getEquip($equip_id) - { - $g_conf_equip_cluster = require('../res/equip@equip.php'); - $equip_conf = getEquipConfig($g_conf_equip_cluster, $equip_id); - if (!$equip_conf) { - return null; - } - $e = array( - 'id' => $equip_conf['id'], - 'upgrade_priority' => $equip_conf['upgrade_priority'], - 'equip_upgrade' => $equip_conf['equip_upgrade'], - 'level_gold_cost' => $equip_conf['level_gold_cost'], - 'max_level' => $equip_conf['max_level'], - 'equip_upgradematerial' => $equip_conf['equip_upgradematerial'], - 'equip_upgradetime' => $equip_conf['equip_upgradetime'], - 'diamond_cost' => $equip_conf['diamond_cost'], - 'reduce_time' => $equip_conf['reduce_time'], - 'diamond_time' => $equip_conf['diamond_time'], - 'upgrade_gold' => $equip_conf['upgrade_gold'], - 'promote_gold' => $equip_conf['promote_gold'], - 'promote_material' => $equip_conf['promote_material'], - 'real_index_id' => $equip_conf['real_index_id'], - ); - return $e; - } - protected function getExplode($string) { $delim = "|"; @@ -180,7 +156,7 @@ class EquipController extends BaseAuthedController { return; } - $e = $this->getEquip($id); + $e = mt\Equip::getOldEquip($id); if (!$e) { phpcommon\sendError(ERR_USER_BASE + 2, '没有这个装备'); return; @@ -315,7 +291,7 @@ class EquipController extends BaseAuthedController { phpcommon\sendError(ERR_USER_BASE + 2, '没有这个玩家'); return; } - $e = $this->getEquip($equip_id); + $e = mt\Equip::getOldEquip($equip_id); if (!$e) { phpcommon\sendError(ERR_USER_BASE + 2, '没有这个装备'); return; @@ -545,7 +521,7 @@ class EquipController extends BaseAuthedController { } $lv = $row['lv']; - $e = $this->getEquip($equip_id); + $e = mt\Equip::getOldEquip($equip_id); if (!$e) { phpcommon\sendError(ERR_USER_BASE + 2, '没有这个装备'); return; diff --git a/webapp/controller/GameOverController.class.php b/webapp/controller/GameOverController.class.php index aae83319..4828a70a 100644 --- a/webapp/controller/GameOverController.class.php +++ b/webapp/controller/GameOverController.class.php @@ -7,6 +7,7 @@ require_once 'metatable/parameter.php'; require_once('mt/Parameter.php'); require_once('mt/Drop.php'); require_once('mt/RankReward.php'); +require_once('mt/Equip.php'); class GameOverController extends BaseAuthedController { @@ -39,24 +40,6 @@ class GameOverController extends BaseAuthedController { return $arr; } - protected function getEquip($equip_id) - { - $g_conf_equip_cluster = require('../res/equip@equip.php'); - $equip_conf = getEquipConfig($g_conf_equip_cluster, $equip_id); - $e = array( - 'id' => $equip_conf['id'], - 'upgrade_priority' => $equip_conf['upgrade_priority'], - 'equip_upgrade' => $equip_conf['equip_upgrade'], - 'level_gold_cost' => $equip_conf['level_gold_cost'], - 'max_level' => $equip_conf['max_level'], - 'equip_upgradematerial' => $equip_conf['equip_upgradematerial'], - 'equip_upgradetime' => $equip_conf['equip_upgradetime'], - 'diamond_cost' => $equip_conf['diamond_cost'], - 'drop_id' => $equip_conf['drop_id'] - ); - return $e; - } - public function firstRewardInfo() { $account_id = $_REQUEST['account_id']; diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php index c57fc9a5..f3821854 100644 --- a/webapp/controller/RoleController.class.php +++ b/webapp/controller/RoleController.class.php @@ -10,6 +10,7 @@ require_once('mt/EquipUpgrade.php'); require_once('mt/Season.php'); require_once('mt/SeasonPoint.php'); require_once('mt/RankReward.php'); +require_once('mt/Equip.php'); class RoleController extends BaseAuthedController { @@ -26,20 +27,6 @@ class RoleController extends BaseAuthedController { return $arr; } - protected function getEquip($equip_id) - { - $g_conf_equip_cluster = require('../res/equip@equip.php'); - $equip_conf = getEquipConfig($g_conf_equip_cluster, $equip_id); - if (!$equip_conf) { - return null; - } - $e = array( - 'id' => $equip_conf['id'], - 'promote_gold' => $equip_conf['promote_gold'], - ); - return $e; - } - public function roleInfo() { @@ -1367,7 +1354,7 @@ class RoleController extends BaseAuthedController { $num = $p3['param_value']; $e = mt\EquipUpgrade::getOldEquipUp($rowEquip['id']); - $eg = $this->getEquip($rowEquip['id']); + $eg = mt\Equip::getOldEquip($rowEquip['id']); if (!$e || !$eg) { phpcommon\sendError(ERR_USER_BASE + 3, '没有这个装备'); return; diff --git a/webapp/mt/Equip.php b/webapp/mt/Equip.php index 8fc39ab7..ae9bd2ad 100644 --- a/webapp/mt/Equip.php +++ b/webapp/mt/Equip.php @@ -6,19 +6,42 @@ use phpcommon; class Equip { - public static function get($equipId) + public static function get($id) { - return self::getMeta()[$equipId]; + return array_key_exists($id, self::getMetaList()) ? self::getMetaList()[$id] : null; } - protected static function getMeta() + public static function getOldEquip($id) { - if (!self::$meta) { - self::$meta = getMetaTable('Equip@Equip.php'); + $meta = self::get($id); + return array( + 'id' => $equip_conf['id'], + 'upgrade_priority' => $equip_conf['upgrade_priority'], + 'equip_upgrade' => $equip_conf['equip_upgrade'], + 'level_gold_cost' => $equip_conf['level_gold_cost'], + 'max_level' => $equip_conf['max_level'], + 'equip_upgradematerial' => $equip_conf['equip_upgradematerial'], + 'equip_upgradetime' => $equip_conf['equip_upgradetime'], + 'diamond_cost' => $equip_conf['diamond_cost'], + 'drop_id' => $equip_conf['drop_id'], + 'reduce_time' => $equip_conf['reduce_time'], + 'diamond_time' => $equip_conf['diamond_time'], + 'upgrade_gold' => $equip_conf['upgrade_gold'], + 'promote_gold' => $equip_conf['promote_gold'], + 'promote_material' => $equip_conf['promote_material'], + 'real_index_id' => $equip_conf['real_index_id'], + 'promote_gold' => $equip_conf['promote_gold'], + ); + } + + protected static function getMetaList() + { + if (!self::$metaList) { + self::$metaList = getMetaTable('equip@equip.php'); } - return self::$meta; + return self::$metaList; } - protected static $meta; + protected static $metaList; }