diff --git a/hwe/battle_simulator.php b/hwe/battle_simulator.php index bfe34b3c..1ae1c74b 100644 --- a/hwe/battle_simulator.php +++ b/hwe/battle_simulator.php @@ -437,8 +437,8 @@ $startYear = $gameStor->getValue('startyear'); 전투 일시 전투 횟수 전투 페이즈 - 준 피해 - 받은 피해 + 준 피해0 (0 ~ 0) + 받은 피해0 (0 ~ 0) 출병자 군량 소모 수비자 군량 소모 공격자 스킬 diff --git a/hwe/j_simulate_battle.php b/hwe/j_simulate_battle.php index ce6e1e9c..059130d3 100644 --- a/hwe/j_simulate_battle.php +++ b/hwe/j_simulate_battle.php @@ -345,6 +345,13 @@ $lastWarLog = []; $attackerKilled = 0; $attackerDead = 0; +$attackerMaxKilled = 0; +$attackerMinKilled = PHP_INT_MAX; + +$attackerMaxDead = 0; +$attackerMinDead = PHP_INT_MAX; + + $attackerAvgRice = 0; $defenderAvgRice = 0; @@ -366,8 +373,17 @@ foreach(range(1, $repeatCnt) as $repeatIdx){ $avgPhase += $attacker->getPhase() / $repeatCnt; - $attackerKilled += $attacker->getKilled() / $repeatCnt; - $attackerDead += $attacker->getDead() / $repeatCnt; + $killed = $attacker->getKilled(); + $dead = $attacker->getDead(); + + $attackerKilled += $killed / $repeatCnt; + $attackerDead += $dead / $repeatCnt; + + $attackerMaxKilled = max($attackerMaxKilled, $killed); + $attackerMinKilled = min($attackerMinKilled, $killed); + + $attackerMaxDead = max($attackerMaxDead, $dead); + $attackerMinDead = min($attackerMinDead, $dead); $attackerAvgRice += $attackerRice / $repeatCnt; $defenderAvgRice += $defenderRice / $repeatCnt; @@ -409,7 +425,11 @@ Json::die([ 'avgWar'=>$avgWar, 'phase'=>$avgPhase, 'killed'=>$attackerKilled, + 'maxKilled'=>$attackerMaxKilled, + 'minKilled'=>$attackerMinKilled, 'dead'=>$attackerDead, + 'maxDead'=>$attackerMaxDead, + 'minDead'=>$attackerMinDead, 'attackerRice'=>$attackerAvgRice, 'defenderRice'=>$defenderAvgRice, 'attackerSkills'=>$attackerActivatedSkills, diff --git a/hwe/js/battle_simulator.js b/hwe/js/battle_simulator.js index ac4c0e67..5791ba9c 100644 --- a/hwe/js/battle_simulator.js +++ b/hwe/js/battle_simulator.js @@ -701,7 +701,24 @@ jQuery(function($){ $('#result_warcnt').html(toPretty(result.avgWar)); $('#result_phase').html(toPretty(result.phase)); $('#result_killed').html(toPretty(result.killed)); + if(result.minKilled != result.maxKilled){ + $('#result_maxKilled').html(toPretty(result.maxKilled)); + $('#result_minKilled').html(toPretty(result.minKilled)); + $('#result_varKilled').show(); + } + else{ + $('#result_varKilled').hide(); + } $('#result_dead').html(toPretty(result.dead)); + if(result.minDead != result.maxDead){ + $('#result_maxDead').html(toPretty(result.maxDead)); + $('#result_minDead').html(toPretty(result.minDead)); + $('#result_varDead').show(); + } + else{ + $('#result_varDead').hide(); + } + $('#result_attackerRice').html(toPretty(result.attackerRice)); $('#result_defenderRice').html(toPretty(result.defenderRice)); $('#result_attackerSkills').html(parseSkillCount(result.attackerSkills));