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

Merge branch 'ng_diplomacy' of ssh://storage.hided.net:2525/devsam/core into ng_diplomacy

Browse Source
This commit is contained in:
Hide_D
2019-01-29 23:40:35 +09:00
parent 6b02384fb8 65724bcaa7
commit f8bb7aaf30
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func.php
+1 -1
View File
@@ -2560,7 +2560,7 @@ function deleteNation($general) {
$oldNation['aux'] = Json::decode($oldNation['aux']); $oldNation['aux'] = Json::decode($oldNation['aux']);
// 전 장수 재야로 // 전 장수 소속 무소속으로 // 전 장수 재야로 // 전 장수 소속 무소속으로
$query = "update general set belong=0,troop=0,level=0,nation=0,makelimit=12 where nation='{$general['nation']}'"; $query = "update general set belong=0,troop=0,level=0,nation=0,permission='normal',makelimit=12 where nation='{$general['nation']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
// 도시 공백지로 // 도시 공백지로
$query = "update city set nation=0,front=0,gen1=0,gen2=0,gen3=0 where nation='{$general['nation']}'"; $query = "update city set nation=0,front=0,gen1=0,gen2=0,gen3=0 where nation='{$general['nation']}'";
hwe/func_process_personnel.php
+1
View File
@@ -243,6 +243,7 @@ function process_25(&$general) {
'nation'=>$nation['nation'], 'nation'=>$nation['nation'],
'nations'=>Json::encode($joinedNations), 'nations'=>Json::encode($joinedNations),
'level'=>1, 'level'=>1,
'permission'=>'normal',
'experience'=>$db->sqleval('experience + %i', $exp), 'experience'=>$db->sqleval('experience + %i', $exp),
'city'=>$king['city'], 'city'=>$king['city'],
'belong'=>1 'belong'=>1