diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php
index 35c2e3ce..b521e533 100644
--- a/webapp/services/BattleDataService.php
+++ b/webapp/services/BattleDataService.php
@@ -668,87 +668,89 @@ class BattleDataService extends BaseService {
     {
 
         error_log('updateBattleData2');
-//        $hisBattleData = Battle::getMyBattleData();
-//        if (!isset($hisBattleData)) {
-//            $hisBattleData = array(
-//                'createtime' => myself()->_getNowTime(),
-//                'modifytime' => myself()->_getNowTime()
-//            );
-//        }
-//        $this->apply($hisBattleData);
-//        Battle::add(json_encode($hisBattleData));
+        $hisBattleData = Battle::getMyBattleData();
+        if (!isset($hisBattleData)) {
+            $hisBattleData = array(
+                'createtime' => myself()->_getNowTime(),
+                'modifytime' => myself()->_getNowTime()
+            );
+        }
+        $this->apply($hisBattleData);
+        Battle::add(json_encode($hisBattleData));
+        error_log('updateBattleData:'.json_encode($hisBattleData));
 //
 //        error_log('updateBattleData3');
-//        $this->currSeasonMeta = mt\RankSeason::getCurrentSeason();
+        $this->currSeasonMeta = mt\RankSeason::getCurrentSeason();
+        error_log('currSeasonMeta:'.$this->currSeasonMeta['id']);
 ////        if ( $this->currSeasonMeta &&  myself()->_getV(TN_RANK_STATUS, 0 ) == 0) {
-//        if ( $this->currSeasonMeta ) {
-//            $this->seasonDb = Season::find($this->currSeasonMeta['id']);
-//            if (!$this->seasonDb) {
-//                Season::add($this->currSeasonMeta['id']);
-//                $this->seasonDb = Season::find($this->currSeasonMeta['id']);
-//            }
-//            if (!$this->seasonDb) {
-//                return;
-//            }
-//            error_log('updateBattleData4');
+        if ( $this->currSeasonMeta ) {
+            $this->seasonDb = Season::find($this->currSeasonMeta['id']);
+            if (!$this->seasonDb) {
+                Season::add($this->currSeasonMeta['id']);
+                $this->seasonDb = Season::find($this->currSeasonMeta['id']);
+            }
+            if (!$this->seasonDb) {
+                return;
+            }
+            error_log('updateBattleData4');
 //            $this->updateScore();
-//            $seasonBattleData = json_decode($this->seasonDb['battle_data'], true);
-//            if (!isset($seasonBattleData['today_data'])) {
-//                $seasonBattleData['today_data'] = array(
-//                    'createtime' => myself()->_getNowTime(),
-//                    'modifytime' => myself()->_getNowTime()
-//                );
-//            }
-//            if (!isset($seasonBattleData['season_data'])) {
-//                $seasonBattleData['season_data'] = array(
-//                    'createtime' => myself()->_getNowTime(),
-//                    'modifytime' => myself()->_getNowTime()
-//                );
-//            }
-//            if (!isset($seasonBattleData['his_week_data'])) {
-//                $seasonBattleData['his_week_data'] = array(
-//                );
-//            }
-//            if (!isset($seasonBattleData['this_week_data'])) {
-//                $seasonBattleData['this_week_data'] = array(
-//                    'createtime' => myself()->_getNowTime(),
-//                    'modifytime' => myself()->_getNowTime()
-//                );
-//            }
-//            if (myself()->_getDaySeconds($seasonBattleData['today_data']['modifytime']) <
-//                myself()->_getNowDaySeconds()) {
-//                $seasonBattleData['today_data'] = array(
-//                    'createtime' => $seasonBattleData['today_data']['createtime'],
-//                    'modifytime' => myself()->_getNowTime()
-//                );
-//            }
-//            if (myself()->_getDaySeconds($seasonBattleData['this_week_data']['modifytime']) <
-//                myself()->_getMondaySeconds()) {
-//                $seasonBattleData['this_week_data'] = array(
-//                    'createtime' => $seasonBattleData['this_week_data']['createtime'],
-//                    'modifytime' => myself()->_getNowTime()
-//                );
-//            }
-//            $oldSeasonDataKills = getXVal($seasonBattleData['season_data'], 'total_kills_times', 0);
-//            $this->apply($seasonBattleData['season_data']);
-//            $newSeasonDataKills = getXVal($seasonBattleData['season_data'], 'total_kills_times', 0);
-//            if ($newSeasonDataKills > $oldSeasonDataKills) {
-//                Season::update($this->currSeasonMeta['id'], array(
-//                    'kills_modifytime' => myself()->_getNowTime(),
-//                ));
-//                Battle::update(array(
-//                    'kills_modifytime' => myself()->_getNowTime(),
-//                ));
-//            }
-//            $this->apply($seasonBattleData['today_data']);
-//            $this->apply($seasonBattleData['this_week_data']);
-//            Season::update(
-//                $this->currSeasonMeta['id'],
-//                array(
-//                    'battle_data' => json_encode($seasonBattleData),
-//                )
-//            );
-//        }
+            $seasonBattleData = json_decode($this->seasonDb['battle_data'], true);
+            if (!isset($seasonBattleData['today_data'])) {
+                $seasonBattleData['today_data'] = array(
+                    'createtime' => myself()->_getNowTime(),
+                    'modifytime' => myself()->_getNowTime()
+                );
+            }
+            if (!isset($seasonBattleData['season_data'])) {
+                $seasonBattleData['season_data'] = array(
+                    'createtime' => myself()->_getNowTime(),
+                    'modifytime' => myself()->_getNowTime()
+                );
+            }
+            if (!isset($seasonBattleData['his_week_data'])) {
+                $seasonBattleData['his_week_data'] = array(
+                );
+            }
+            if (!isset($seasonBattleData['this_week_data'])) {
+                $seasonBattleData['this_week_data'] = array(
+                    'createtime' => myself()->_getNowTime(),
+                    'modifytime' => myself()->_getNowTime()
+                );
+            }
+            if (myself()->_getDaySeconds($seasonBattleData['today_data']['modifytime']) <
+                myself()->_getNowDaySeconds()) {
+                $seasonBattleData['today_data'] = array(
+                    'createtime' => $seasonBattleData['today_data']['createtime'],
+                    'modifytime' => myself()->_getNowTime()
+                );
+            }
+            if (myself()->_getDaySeconds($seasonBattleData['this_week_data']['modifytime']) <
+                myself()->_getMondaySeconds()) {
+                $seasonBattleData['this_week_data'] = array(
+                    'createtime' => $seasonBattleData['this_week_data']['createtime'],
+                    'modifytime' => myself()->_getNowTime()
+                );
+            }
+            $oldSeasonDataKills = getXVal($seasonBattleData['season_data'], 'total_kills_times', 0);
+            $this->apply($seasonBattleData['season_data']);
+            $newSeasonDataKills = getXVal($seasonBattleData['season_data'], 'total_kills_times', 0);
+            if ($newSeasonDataKills > $oldSeasonDataKills) {
+                Season::update($this->currSeasonMeta['id'], array(
+                    'kills_modifytime' => myself()->_getNowTime(),
+                ));
+                Battle::update(array(
+                    'kills_modifytime' => myself()->_getNowTime(),
+                ));
+            }
+            $this->apply($seasonBattleData['today_data']);
+            $this->apply($seasonBattleData['this_week_data']);
+            Season::update(
+                $this->currSeasonMeta['id'],
+                array(
+                    'battle_data' => json_encode($seasonBattleData),
+                )
+            );
+        }
     }
 
     private function updatePveData()