From ff35d2d44b03f8c9105b6e27c62d76c2a95961f9 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 19 Sep 2024 15:27:17 +0800 Subject: [PATCH] 1 --- webapp/controller/UserController.class.php | 3 +++ webapp/models/Circuit.php | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php index 33e30d0c..9603a20d 100644 --- a/webapp/controller/UserController.class.php +++ b/webapp/controller/UserController.class.php @@ -376,6 +376,7 @@ class UserController extends BaseAuthedController { { $userInfo['total_lucky'] = Hero::getAccountLuckyTemp(); $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo); + $userInfo['circuit_score'] = myself()->_callModelStatic('Circuit', 'getCurrentMyScore'); } $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']); if (!$heroDb) { @@ -414,6 +415,7 @@ class UserController extends BaseAuthedController { { $userInfo['total_lucky'] = Hero::getAccountLuckyTemp(); $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo); + $userInfo['circuit_score'] = myself()->_callModelStatic('Circuit', 'getCurrentMyScore'); } $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']); if (!$heroDb) { @@ -453,6 +455,7 @@ class UserController extends BaseAuthedController { { $userInfo['total_lucky'] = Hero::getAccountLuckyTemp(); $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo); + $userInfo['circuit_score'] = myself()->_callModelStatic('Circuit', 'getCurrentMyScore'); } $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $heroUniId); if (!$heroDb) { diff --git a/webapp/models/Circuit.php b/webapp/models/Circuit.php index 8a95288d..1dc93791 100644 --- a/webapp/models/Circuit.php +++ b/webapp/models/Circuit.php @@ -41,4 +41,12 @@ class Circuit extends BaseModel return $row ? $row['cumulative_score'] : 0; } -} \ No newline at end of file + public static function getCurrentMyScore(){ + $circuitMeta = myself()->_callMtStatic('CircuitTime', 'getCurrentCircuit'); + if (empty($circuitMeta)) { + return 0; + } + return self::getMyScore($circuitMeta['circuit_season']); + } + +}