diff --git a/webapp/controller/BaseController.class.php b/webapp/controller/BaseController.class.php index 55438c5f..24a86121 100644 --- a/webapp/controller/BaseController.class.php +++ b/webapp/controller/BaseController.class.php @@ -411,7 +411,7 @@ class BaseController { } public static function _switchIsOpen($name) { - myself()->_callServiceStatic('ServerSwitchService', 'switchIsOpen', $name); + return myself()->_callServiceStatic('ServerSwitchService', 'switchIsOpen', $name); } public function _mergeAlikeItemKey($items){ diff --git a/webapp/controller/OtherController.class.php b/webapp/controller/OtherController.class.php index 80997778..dc0035ff 100644 --- a/webapp/controller/OtherController.class.php +++ b/webapp/controller/OtherController.class.php @@ -353,28 +353,7 @@ class OtherController extends BaseAuthedController { $temp['state'] = $nowTimeOffset >= $dailyOpenTimeOffset && $nowTimeOffset <= $dailyEndTimeOffset ? 1 : 0; } - $isOpen = true; - switch ($modeMeta['mapMode']) { - case mt\MapMode::GOLD_MODE: - { - $isOpen = myself()->_switchIsOpen('bigEventBoxDrop'); - } - break; - case mt\MapMode::BET_MODE: - { - $isOpen = myself()->_switchIsOpen('bountyMode'); - } - break; - case mt\MapMode::TREASURE_BOX_MODE: - { - $isOpen = myself()->_switchIsOpen('bigEventMode'); - } - break; - default: - { - } - break; - } + $isOpen = mt\MapMode::isOpen($modeMeta); if ($isOpen) { array_push( $modeList, diff --git a/webapp/mt/MapMode.php b/webapp/mt/MapMode.php index c1349b93..17f90c81 100644 --- a/webapp/mt/MapMode.php +++ b/webapp/mt/MapMode.php @@ -67,6 +67,36 @@ class MapMode return true; } + public static function isOpen($meta) + { + if (!$meta['is_open']) { + return false; + } + $isOpen = true; + switch ($meta['mapMode']) { + case self::GOLD_MODE: + { + $isOpen = myself()->_switchIsOpen('goldMode'); + } + break; + case self::BET_MODE: + { + $isOpen = myself()->_switchIsOpen('bountyMode'); + } + break; + case self::TREASURE_BOX_MODE: + { + $isOpen = myself()->_switchIsOpen('bigEventMode'); + } + break; + default: + { + } + break; + } + return $isOpen; + } + protected static function getMetaList() { if (!self::$metaList) {