diff --git a/server/game2006service/services/FormulaService.js b/server/game2006service/services/FormulaService.js new file mode 100644 index 00000000..e69de29b diff --git a/server/game2006service/tasks/damping.js b/server/game2006service/tasks/damping.js new file mode 100644 index 00000000..e69de29b diff --git a/webapp/controller/RankingController.class.php b/webapp/controller/RankingController.class.php index d640a592..edd956bb 100644 --- a/webapp/controller/RankingController.class.php +++ b/webapp/controller/RankingController.class.php @@ -114,6 +114,8 @@ class RankingController extends BaseAuthedController { public function resetRankGainAward(){ $userInfo = $this->_getOrmUserInfo(); + $lastSeasonRank = $userInfo['rank']; + $lastSeasonScore = $userInfo['score']; $currSeasonMeta = mt\RankSeason::getCurrentSeason(); if ($currSeasonMeta && $userInfo['last_season_id'] > 0 && $currSeasonMeta['id'] > $userInfo['last_season_id']) { $rank = $userInfo['rank']; @@ -140,6 +142,13 @@ class RankingController extends BaseAuthedController { } $this->_setV(TN_RANK_STATUS, 0, 0); $this->_rspData([ + 'data'=> array( + 'last_rank'=>$lastSeasonRank, + 'last_score'=>$lastSeasonScore, + 'current_rank'=>$dropRankMeta['id'], + 'current_score'=>$dropRankMeta['rank_score'], + 'award' => $award + ), 'property_chg' => $propertyChgService->toDto(), ]); } diff --git a/webapp/models/NftActive.php b/webapp/models/NftActive.php index 3b0b5500..3845cb41 100644 --- a/webapp/models/NftActive.php +++ b/webapp/models/NftActive.php @@ -28,7 +28,7 @@ class NftActive extends BaseModel 'account_id' => myself()->_getAccountId(), 'uniid' =>$data['uniid'], 'token_id' =>$data['token_id']?$data['token_id']:'', - 'daytime' =>strtotime(date('Y-m-d',myself()->_getNowTime())), + 'daytime' =>myself()->_getDaySeconds(myself()->_getNowTime()), 'token_type' =>$data['token_type'], 'createtime' => myself()->_getNowTime(), 'modifytime' => myself()->_getNowTime(),