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

makenation 텍스트에 null이 들어가는경우(??)에도 우회 동작.

Browse Source 
변환 스크립트에서 숫자 장수명 대응
This commit is contained in:
Hide_D
2018-06-11 20:27:55 +09:00
parent c65d6565df
commit d1d81e03d1
3 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/commandlist.php
+1 -3
View File
@@ -76,9 +76,7 @@ function myCommandList() {
// 명령 목록 // 명령 목록
$admin = $gameStor->getValues(['year','month','turnterm']); $admin = $gameStor->getValues(['year','month','turnterm']);
$query = "select no,turntime,term,turn0,turn1,turn2,turn3,turn4,turn5,turn6,turn7,turn8,turn9,turn10,turn11,turn12,turn13,turn14,turn15,turn16,turn17,turn18,turn19,turn20,turn21,turn22,turn23 from general where owner='{$userID}'"; $me = $db->queryFirstRow("SELECT `no`,turntime,term,turn0,turn1,turn2,turn3,turn4,turn5,turn6,turn7,turn8,turn9,turn10,turn11,turn12,turn13,turn14,turn15,turn16,turn17,turn18,turn19,turn20,turn21,turn22,turn23 FROM general WHERE `owner`=%s", $userID);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
if(!$me){ if(!$me){
echo "로그인 되어있지 않습니다."; echo "로그인 되어있지 않습니다.";
return; return;
hwe/func_command.php
+6 -10
View File
@@ -183,12 +183,10 @@ function getTurn(array $general, $type, $font=1) {
$str[$i] = "하야"; $str[$i] = "하야";
break; break;
case 46: //건국 case 46: //건국
$query = "select makenation from general where no='{$general['no']}'"; $nationName = $db->queryFirstField('SELECT makenation FROM general WHERE `no`=%i', $general['no'])??'';
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
$josaUl = JosaUtil::pick($general['makenation'], '을'); $josaUl = JosaUtil::pick($nationName, '을');
$str[$i] = "【{$general['makenation']}】{$josaUl} 건국"; $str[$i] = "【{$nationName}】{$josaUl} 건국";
break; break;
case 47: //방랑 case 47: //방랑
$str[$i] = "방랑"; $str[$i] = "방랑";
@@ -342,15 +340,13 @@ function getCoreTurn($nation, $level) {
$str[$i] = "【{$nation['name']}】에게 국고 {$third} 병량 {$fourth} 원조"; $str[$i] = "【{$nation['name']}】에게 국고 {$third} 병량 {$fourth} 원조";
break; break;
case 53: //통합제의 case 53: //통합제의
$query = "select makenation from general where level='$level' and nation='{$nation['nation']}'"; $nationName = $db->queryFirstField('SELECT makenation FROM general WHERE `level`=%i AND `nation`=%i', $level, $nation['nation'])??'';
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
$double = (int)$command[1]; $double = (int)$command[1];
$nation = getNationStaticInfo($double); $nation = getNationStaticInfo($double);
$josaRo = JosaUtil::pick($general['makenation'], '로'); $josaRo = JosaUtil::pick($nationName, '로');
$str[$i] = "【{$nation['name']}】에 【{$general['makenation']}】{$josaRo} 통합 제의"; $str[$i] = "【{$nation['name']}】에 【{$nationName}】{$josaRo} 통합 제의";
break; break;
case 61: //불가침제의 case 61: //불가침제의
$third = $command[2]; $third = $command[2];
src/conv_general_stat.py
+18 -17
View File
@@ -17,8 +17,9 @@ nationLevelMap = {
'방랑군':0 '방랑군':0
} }
print(sys.argv[1]) xlsxpath = sys.argv[1]
wb = xlrd.open_workbook(sys.argv[1]) print(xlsxpath)
wb = xlrd.open_workbook(xlsxpath)
def extractNationList(nationSheet): def extractNationList(nationSheet):
jsonNationList = [] jsonNationList = []
@@ -78,10 +79,10 @@ def extractGeneralList(generalSheet, nationList={}):
row[0] = int(row[0]) row[0] = int(row[0])
#이름 #이름
row[1] = row[1].strip() row[1] = str(row[1]).strip()
if row[1] == '': if row[1] == '':
continue continue
print(row[1])
#전콘 #전콘
row[2] = str(row[2]).strip() row[2] = str(row[2]).strip()
if row[2].isdigit(): if row[2].isdigit():
@@ -144,19 +145,19 @@ nationInfo = extractNationList(wb.sheet_by_name('국가'))
generalList = extractGeneralList(wb.sheet_by_name('장수 목록'), nationInfo) generalList = extractGeneralList(wb.sheet_by_name('장수 목록'), nationInfo)
with open('%s.json'%xlsxpath, 'wt', encoding='utf-8') as fp:
fp.write(' "nation":[\n ')
fp.write(',\n '.join([json.dumps(nation, ensure_ascii=False) for nation in nationInfo]))
fp.write('\n ],\n')
print(' "nation":[\n ', end='') fp.write(' "diplomacy":[],\n')
print(',\n '.join([json.dumps(nation, ensure_ascii=False) for nation in nationInfo]))
print(' ],')
print(' "diplomacy":[],') fp.write(' "general":[\n ')
fp.write(',\n '.join([json.dumps(general, ensure_ascii=False) for general in generalList]))
fp.write('\n ],\n')
print(' "general":[\n ', end='') if '확장 장수 목록' in wb.sheet_names():
print(',\n '.join([json.dumps(general, ensure_ascii=False) for general in generalList])) generalExList = extractGeneralList(wb.sheet_by_name('확장 장수 목록'), nationInfo)
print(' ],') fp.write(' "general_ex":[\n ')
fp.write(',\n '.join([json.dumps(general, ensure_ascii=False) for general in generalExList]))
if '확장 장수 목록' in wb.sheet_names(): fp.write('\n ],\n')
generalExList = extractGeneralList(wb.sheet_by_name('확장 장수 목록'), nationInfo)
print(' "general_ex":[\n ', end='')
print(',\n '.join([json.dumps(general, ensure_ascii=False) for general in generalExList]))
print(' ],')