devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

선양 버그 수정..

Browse Source
This commit is contained in:
Hide_D
2020-05-01 16:02:36 +09:00
parent 0882e06adc
commit 75934fc5ae
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func.php
+3 -2
View File
@@ -1634,7 +1634,8 @@ function nextRuler(General $general) {
//npc or npc유저인 경우 후계 찾기 //npc or npc유저인 경우 후계 찾기
if($general->getVar('npc') > 0) { if($general->getVar('npc') > 0) {
$candidate = $db->queryFirstRow( $candidate = $db->queryFirstRow(
'SELECT no,name,nation,officer_level,IF(ABS(affinity-%i)>75,150-ABS(affinity-%i),ABS(affinity-%i)) as npcmatch2 from general where nation=%i and officer_level!=12 and npc>0 order by npcmatch2,rand() LIMIT 1', 'SELECT no,name,officer_level,IF(ABS(affinity-%i)>75,150-ABS(affinity-%i),ABS(affinity-%i)) as npcmatch2 from general where nation=%i and officer_level!=12 and npc>0 order by npcmatch2,rand() LIMIT 1',
$general->getVar('affinity'),
$general->getVar('affinity'), $general->getVar('affinity'),
$general->getVar('affinity'), $general->getVar('affinity'),
$nationID $nationID
@@ -1669,7 +1670,7 @@ function nextRuler(General $general) {
$db->update('general', [ $db->update('general', [
'officer_level'=>12, 'officer_level'=>12,
'officer_city'=>0, 'officer_city'=>0,
], 'no=%i', $nextRulerID); ], 'no=%i AND nation=%i', $nextRulerID, $nationID);
if($db->affectedRows()==0){ if($db->affectedRows()==0){
throw new \RuntimeException('선양되지 않음'); throw new \RuntimeException('선양되지 않음');
} }
hwe/sammo/General.php
+1
View File
@@ -534,6 +534,7 @@ class General implements iAction{
$officerLevel = $this->getVar('officer_level'); $officerLevel = $this->getVar('officer_level');
if($officerLevel == 12) { if($officerLevel == 12) {
nextRuler($this); nextRuler($this);
$this->setVar('officer_level', 1);
} }
// 부대 처리 // 부대 처리