From 02c0f7ad313716c6e9c67216a1a209c48147d634 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 20 Sep 2022 10:36:42 +0800 Subject: [PATCH] `1 --- webapp/mt/PveGeminiMode.php | 7 ++++--- webapp/services/BattleDataService.php | 6 ++---- webapp/services/FormulaService.php | 2 ++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/webapp/mt/PveGeminiMode.php b/webapp/mt/PveGeminiMode.php index 19af938c..b060f307 100644 --- a/webapp/mt/PveGeminiMode.php +++ b/webapp/mt/PveGeminiMode.php @@ -14,9 +14,10 @@ class PveGeminiMode { public static function calcStar($meta, $score) { $strs = explode('|', $meta['score_reward']); - for ($i = 0; i < count($strs) && $i < 3; ++$i) { - if ($score > $strs[i]) { - return i + 1; + error_log(json_encode($strs)); + for ($i = count($strs) - 1; $i >= 0; --$i) { + if ($score > $strs[$i]) { + return min($i + 1, 3); } } return 0; diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php index cc169029..db0e6eac 100644 --- a/webapp/services/BattleDataService.php +++ b/webapp/services/BattleDataService.php @@ -150,7 +150,7 @@ class BattleDataService extends BaseService { //pve $this->updatePveData(); if ($this->pveGeminiMeta && - $this->pveGeminiMetaMode) { + $this->pveGeminiModeMeta) { $this->rewardCegPve(); $this->rewardFragmentPve(); } @@ -500,12 +500,10 @@ class BattleDataService extends BaseService { $this->pveGeminiMeta = null; } } - error_log(json_encode($this->pveGeminiMeta)); - $this->pveGeminiMetaMode = mt\PveGeminiMode::get($instanceMode); + $this->pveGeminiModeMeta = mt\PveGeminiMode::get($instanceMode); if ($this->pveGeminiModeMeta) { $this->instanceRank = mt\PveGeminiMode::calcStar($this->pveGeminiModeMeta, $pveRankScore); } - error_log(json_encode($this->pveGeminiMetaMode)); if (getReqVal('pve_kill_boss', 0) == 1) { if ($this->pveGeminiMeta) { myself()->_updateUserInfo(array( diff --git a/webapp/services/FormulaService.php b/webapp/services/FormulaService.php index 1f2660d4..b0726390 100644 --- a/webapp/services/FormulaService.php +++ b/webapp/services/FormulaService.php @@ -166,6 +166,7 @@ class FormulaService extends BaseService { $heroProbability = min($heroFragmentNum / $onlineNum * $dropRate * ($instanceRankRate + $bossReward*0.2) * pow(2, $todayPveBattleTimes - $todayPveGetFragmentNum - 1), 1); + error_log(json_encode(func_get_args())); return max(0, $heroProbability); } @@ -185,6 +186,7 @@ class FormulaService extends BaseService { $gunProbability = min($gunFragmentNum / $onlineNum * $dropRate * ($instanceRankRate + $bossReward*0.2) * pow(2, $todayPveBattleTimes - $todayPveGetFragmentNum - 1), 1); + error_log(json_encode(func_get_args())); return max(0, $gunProbability); }