From e236317f2a37a445ad49caa126bdc63997393ea5 Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Fri, 17 Mar 2023 18:58:14 +0800
Subject: [PATCH] 1

---
 webapp/controller/BattleController.class.php |   4 +-
 webapp/services/BattleDataService.php        | 165 ++++++++++---------
 2 files changed, 85 insertions(+), 84 deletions(-)

diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php
index 27bc1984..45695b56 100644
--- a/webapp/controller/BattleController.class.php
+++ b/webapp/controller/BattleController.class.php
@@ -73,7 +73,7 @@ class BattleController extends BaseAuthedController {
         if ($data) {
             $teamList = $data['team_list'];
         }
-        error_log(json_encode($teamList));
+//        error_log(json_encode($teamList));
         $battleDataService = new services\BattleDataService();
         $battleDataService->teamList = $teamList;
         $battleDataService->updateBattleData();
@@ -87,7 +87,7 @@ class BattleController extends BaseAuthedController {
                 'modifytime' => $this->_getNowTime(),
             )
         );
-        error_log(json_encode($battleDataService->getReward()));
+//        error_log(json_encode($battleDataService->getReward()));
         $data = array(
             'reward' => $battleDataService->getReward()
         );
diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php
index 6fc5e899..65bcae7f 100644
--- a/webapp/services/BattleDataService.php
+++ b/webapp/services/BattleDataService.php
@@ -126,11 +126,12 @@ class BattleDataService extends BaseService {
 
 
         //录入战斗记录
-        $this->saveBattleHistory();
+//        $this->saveBattleHistory();
 
         switch ($matchMode) {
         case self::MATCH_MODE_PVP:
         {
+            error_log('updateBattleData1');
             //匹配赛模式
             $this->updatePvpData();
 //            $this->rewardCegPvp();
@@ -667,87 +668,87 @@ 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));
-
-        error_log('updateBattleData3');
-        $this->currSeasonMeta = mt\RankSeason::getCurrentSeason();
-//        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');
-            $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),
-                )
-            );
-        }
+//        $hisBattleData = Battle::getMyBattleData();
+//        if (!isset($hisBattleData)) {
+//            $hisBattleData = array(
+//                'createtime' => myself()->_getNowTime(),
+//                'modifytime' => myself()->_getNowTime()
+//            );
+//        }
+//        $this->apply($hisBattleData);
+//        Battle::add(json_encode($hisBattleData));
+//
+//        error_log('updateBattleData3');
+//        $this->currSeasonMeta = mt\RankSeason::getCurrentSeason();
+////        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');
+//            $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),
+//                )
+//            );
+//        }
     }
 
     private function updatePveData()