From 8a99476136f4d68b5d22d8975952520e66bf8fc4 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 14 Nov 2021 02:51:40 +0900 Subject: [PATCH] =?UTF-8?q?game:=20=EB=9E=9C=EB=8D=A4=EC=9E=84=EA=B4=80=20?= =?UTF-8?q?=ED=8F=89=EA=B0=80=20=EA=B8=B0=EC=A4=80=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?-=20=EC=A0=84=ED=88=AC=20=EA=B8=B0=EC=A4=80=EC=9D=84=20?= =?UTF-8?q?=EC=B4=9D=20=EC=A0=84=ED=88=AC=20=EB=8C=80=EC=8B=A0=20=EB=8C=80?= =?UTF-8?q?=EC=9D=B8=20=EC=A0=84=ED=88=AC=EB=A1=9C=20-=20=EB=82=B4?= =?UTF-8?q?=EC=A0=95=20=EB=8A=A5=EB=A0=A5=EC=97=90=20=EB=AC=B4=EB=A0=A5,?= =?UTF-8?q?=20=EC=A7=80=EB=A0=A5=20=EB=B9=84=EC=9C=A8=20=EB=B0=98=EC=98=81?= =?UTF-8?q?=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/Command/General/che_랜덤임관.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hwe/sammo/Command/General/che_랜덤임관.php b/hwe/sammo/Command/General/che_랜덤임관.php index f1f114ce..9faa8d2f 100644 --- a/hwe/sammo/Command/General/che_랜덤임관.php +++ b/hwe/sammo/Command/General/che_랜덤임관.php @@ -183,10 +183,10 @@ class che_랜덤임관 extends Command\GeneralCommand if ($notIn) { $rawGeneralsCnt = $db->query( - "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 100)/(rb.value + 100)*(CASE WHEN g.`npc` < 2 THEN 2 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(g.intel + g.strength + g.leadership / 2)/5 AS develpower + "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 1000)/(rb.value + 1000)*(CASE WHEN g.`npc` < 2 THEN 2 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower FROM general AS g - LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = 'killcrew' - LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = 'deathcrew' + LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = 'killcrew_person' + LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = 'deathcrew_person' LEFT JOIN `nation` AS n ON g.`nation` = n.`nation` WHERE g.`npc` IN (0, 1, 2, 3, 6) AND g.nation != 0 AND n.scout=0 AND n.gennum < %i AND n.nation NOT IN %li GROUP BY g.`nation`", @@ -195,10 +195,10 @@ class che_랜덤임관 extends Command\GeneralCommand ); } else { $rawGeneralsCnt = $db->query( - "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 100)/(rb.value + 100)*(CASE WHEN g.`npc` < 2 THEN 2 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(g.intel + g.strength + g.leadership / 2)/5 AS develpower + "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 100)/(rb.value + 100)*(CASE WHEN g.`npc` < 2 THEN 2 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower FROM general AS g - LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = 'killcrew' - LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = 'deathcrew' + LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = 'killcrew_person' + LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = 'deathcrew_person' LEFT JOIN `nation` AS n ON g.`nation` = n.`nation` WHERE g.`npc` IN (0, 1, 2, 3, 6) AND g.nation != 0 AND n.scout=0 AND n.gennum < %i GROUP BY g.`nation`",