Merge branch 'hjb' of git.kingsome.cn:server/game2006api into hjb

webapp/controller/OtherController.class.php

@@ -5,6 +5,7 @@ require_once('mt/RankSeason.php');
 require_once('mt/HashRateCommon.php');
 require_once('mt/ActivityRewards.php');
 require_once('mt/MapMode.php');
+require_once('mt/ServerTaskTime.php');
 
 require_once('models/Mission.php');
 require_once('models/Fragment.php');
@@ -14,6 +15,7 @@ require_once('models/RankingSetRecord.php');
 require_once('models/Staking.php');
 require_once('models/SeasonRanking.php');
 require_once('models/RewardsCec.php');
+require_once('models/GlobalData.php');
 
 use models\SignLog;
 use phpcommon\SqlHelper;
@@ -24,6 +26,8 @@ use models\RankingSetRecord;
 use models\Staking;
 use models\SeasonRanking;
 use models\RewardsCec;
+use models\GlobalData;
+
 class OtherController extends BaseAuthedController {
     const MISSION = 1;
     const PIECE = 2;
@@ -181,7 +185,18 @@ class OtherController extends BaseAuthedController {
     public function getMapModeList()
     {
         $modeList = array();
-        foreach (mt\MapMode::getMetaList() as $modeMeta) {
+        $taskStatus = GlobalData::getServerTaskStatus();
+        $taskMeta = mt\ServerTaskTime::getCurrentTime();
+        mt\MapMode::traverseMeta(function($modeMeta) use(&$modeList, &$taskMeta, $taskStatus){
+            if ($modeMeta['is_open']) {
+                if ($modeMeta['limit_time']) {
+                    if (empty($taskStatus)) {
+                        return true;
+                    }
+                    if (myself()->_getNowTime() <= strtotime($taskMeta['obtain_end_time'])) {
+                        return true;
+                    }
+                }
                 array_push(
                     $modeList,
                     array(
@@ -189,6 +204,8 @@ class OtherController extends BaseAuthedController {
                     )
                 );
             }
+            return true;
+        });
         $this->_rspData(array(
             'mode_list' => $modeList
         ));

webapp/mt/MapMode.php

@@ -25,7 +25,14 @@ class MapMode
         return  array();
     }
 
-
+    public static function traverseMeta($cb)
+    {
+        foreach (self::getMetaList() as $meta) {
+            if (!$cb($meta)) {
+                break;
+            }
+        }
+    }
 
     protected static function getMetaList()
     {