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

장수명을 9글자까지 반영할 수 있도록 수정하고. 레이아웃 틀어지지 않도록 수정 진행중

Browse Source
This commit is contained in:
Hide_D
2018-05-30 02:47:33 +09:00
parent a95903ceff
commit 317c42b384
17 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
f_install/sql/common_schema.sql
+1
View File
@@ -29,6 +29,7 @@ CREATE TABLE `member` (
`NAME` VARCHAR(64) NOT NULL,
`PICTURE` VARCHAR(64) NULL DEFAULT 'default.jpg',
`IMGSVR` INT(1) NULL DEFAULT '0',
`acl` TEXT NOT NULL COMMENT 'json',
`GRADE` INT(1) NULL DEFAULT '1',
`REG_NUM` INT(3) NULL DEFAULT '0',
`REG_DATE` DATETIME NOT NULL,
hwe/_admin8.php
+2 -2
View File
@@ -65,8 +65,8 @@ $sel[$type] = "selected";
<table width=1000 align=center class='tb_layout bg0'>
<tr><td colspan=9 align=center bgcolor=blue>외 교 관 계</td></tr>
<tr>
<td width=100 align=center id=bg1>국 가 명</td>
<td width=100 align=center id=bg1>국 가 명</td>
<td width=130 align=center id=bg1>국 가 명</td>
<td width=130 align=center id=bg1>국 가 명</td>
<td width=80 align=center id=bg1>상 태</td>
<td width=60 align=center id=bg1>기 간</td>
<td align=center id=bg1>비 고</td>
hwe/b_chiefcenter.php
+10 -10
View File
@@ -152,16 +152,16 @@ for($k=0; $k < 2; $k++) {
$tn1 = $turn[$l1][$i]??"-";
echo "
<tr>
<td width=28 align=center id=bg0><b>$j</b></td>
<td width=58 align=center bgcolor=black><b>$td4</b></td>
<td width=173 align=center height=24 style=table-layout:fixed; id=bg2>$tn4</td>
<td width=58 align=center bgcolor=black><b>$td3</b></td>
<td width=173 align=center height=24 style=table-layout:fixed; id=bg2>$tn3</td>
<td width=58 align=center bgcolor=black><b>$td2</b></td>
<td width=173 align=center height=24 style=table-layout:fixed; id=bg2>$tn2</td>
<td width=58 align=center bgcolor=black><b>$td1</b></td>
<td width=173 align=center height=24 style=table-layout:fixed; id=bg2>$tn1</td>
<td width=28 align=center id=bg0><b>$j</b></td>
<td width=20 align=center id=bg0><b>$j</b></td>
<td width=43 align=center bgcolor=black><b>$td4</b></td>
<td width=192 align=center height=24 style=table-layout:fixed; id=bg2>$tn4</td>
<td width=43 align=center bgcolor=black><b>$td3</b></td>
<td width=192 align=center height=24 style=table-layout:fixed; id=bg2>$tn3</td>
<td width=43 align=center bgcolor=black><b>$td2</b></td>
<td width=192 align=center height=24 style=table-layout:fixed; id=bg2>$tn2</td>
<td width=43 align=center bgcolor=black><b>$td1</b></td>
<td width=192 align=center height=24 style=table-layout:fixed; id=bg2>$tn1</td>
<td width=20 align=center id=bg0><b>$j</b></td>
</tr>
";
if($totaldate[$l4]??'') { $totaldate[$l4] = addTurn($totaldate[$l4], $admin['turnterm']); }
hwe/b_dipcenter.php
+2 -2
View File
@@ -58,7 +58,7 @@ if ($me['level'] >= 5) {
<table align=center width=1000 class='tb_layout bg0'>
<tr><td colspan=9 align=center bgcolor=blue>외 교 관 계</td></tr>
<tr>
<td width=100 align=center class=bg1>국 가 명</td>
<td width=130 align=center class=bg1>국 가 명</td>
<td width=50 align=center class=bg1>국력</td>
<td width=40 align=center class=bg1>장수</td>
<td width=40 align=center class=bg1>속령</td>
@@ -219,7 +219,7 @@ if ($budgetricediff > 0) {
<tr><td colspan=2 align=center bgcolor=orange>국 가 방 침 &amp; 임관 권유 메세지</td></tr>
<tr><td colspan=2 class=bg1>국가 방침 <textarea <?=$read?> maxlength=1000 rows="5" style="color:white;background-color:black;width:830px;" name=msg><?=$nation['msg']?></textarea><input type=<?=$btn?> name=btn value=국가방침></td></tr>
<tr><td colspan=2 class=bg1>임관 권유 <input type=text <?=$read?> maxlength=500 style=color:white;background-color:black;width:830px; name=scoutmsg value='<?=$nation['scoutmsg']?>'><input type=<?=$btn?> name=btn value=임관권유></td></tr>
<tr><td colspan=2>900 x 200px 넘는 크기를 점유할 시 통보없이 제한될 수 있습니다.</td></tr>
<tr><td colspan=2>870 x 200px 넘는 크기를 점유할 시 통보없이 제한될 수 있습니다.</td></tr>
<tr><td colspan=2 height=10></td></tr>
<tr><td colspan=2 align=center bgcolor=green>예 산 &amp; 정 책</td></tr>
<tr>
hwe/b_nationboard.php
+1 -1
View File
@@ -28,7 +28,7 @@ $me = MYDB_fetch_array($result);
</head>
<body>
<table align=center width=1000 class='tb_layout bg0'>
<table width=1000 class='tb_layout bg0'>
<tr><td>회 의 실<br><?=backButton()?></td></tr>
<form name=form1 method=post action=c_nationboard.php>
<tr><td align=center>
hwe/b_troop.php
+13 -11
View File
@@ -31,6 +31,7 @@ $troopcount = MYDB_num_rows($result);
</head>
<body>
<div style="width:1000px;margin:auto;">
<table width=1000 class='tb_layout bg0'>
<tr><td>부 대 편 성<br><?=backButton()?></td></tr>
</table>
@@ -38,10 +39,10 @@ $troopcount = MYDB_num_rows($result);
<table class='tb_layout bg0'>
<tr>
<td width=64 class='bg1 center'>선 택</td>
<td width=98 class='bg1 center'>부 대 정 보</td>
<td width=64 class='bg1 center'>부 대 장</td>
<td width=662 class='bg1 center' style=table-layout:fixed;word-break:break-all;>장 수</td>
<td width=98 class='bg1 center' style=table-layout:fixed;word-break:break-all;>부대장행동</td>
<td width=130 class='bg1 center'>부 대 정 보</td>
<td width=100 class='bg1 center'>부 대 장</td>
<td width=576 class='bg1 center' style=table-layout:fixed;word-break:break-all;>장 수</td>
<td width=130 class='bg1 center' style=table-layout:fixed;word-break:break-all;>부대장행동</td>
</tr>
<?php
for($i=0; $i < $troopcount; $i++) {
@@ -82,7 +83,7 @@ for($i=0; $i < $troopcount; $i++) {
<td align=center rowspan=2><input "; echo $i==0?"checked ":""; echo "type=radio name=troop value='{$troop['troop']}'></td>
<td align=center >{$troop['name']}<br>【 $cityname 】</td>
<td height=64 style='background:no-repeat center url(\"{$imageTemp}/{$picture}\");background-size:64px;'>&nbsp;</td>
<td rowspan=2 width=662>$genlist</td>
<td rowspan=2 width=62>$genlist</td>
<td rowspan=2>$turn</td>
</tr>
<tr><td align=center><font size=2>【턴】".substr($turntime, 14)."</font></td><td align=center><font size=1>$name</font></td></tr>
@@ -93,7 +94,7 @@ for($i=0; $i < $troopcount; $i++) {
<td align=center rowspan=2>&nbsp;</td>
<td align=center >{$troop['name']}<br>【 $cityname 】</td>
<td height=64 style='background:no-repeat center url(\"{$imageTemp}/{$picture}\");background-size:64px;'>&nbsp;</td>
<td rowspan=2 width=662>$genlist</td>
<td rowspan=2 width=576>$genlist</td>
<td rowspan=2>";
if($troop['no'] == $me['no']) {
@@ -101,7 +102,7 @@ for($i=0; $i < $troopcount; $i++) {
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$genCount = MYDB_num_rows($genresult);
echo "
<select name=gen size=3 style=color:white;background-color:black;font-size:13px;width:98px;>";
<select name=gen size=3 style=color:white;background-color:black;font-size:13px;width:128px;>";
for($k=0; $k < $genCount; $k++) {
$general = MYDB_fetch_array($genresult);
echo "
@@ -109,7 +110,7 @@ for($i=0; $i < $troopcount; $i++) {
}
echo "
</select><br>
<input type=submit name=btn value='부 대 추 방' style=width:100px;height:25px;>";
<input type=submit name=btn value='부 대 추 방' style=width:130px;height:25px;>";
} else {
echo $turn;
}
@@ -138,10 +139,10 @@ echo "
<br>";
echo "
<table align=center width=1000 class='tb_layout bg0'>
<table width=1000 class='tb_layout bg0'>
<tr>
<td width=80 id=bg1>부 대 명</td>
<td width=100><input type=text style=color:white;background-color:black; size=12 maxlength=6 name=name></td>";
<td width=130><input type=text style=color:white;background-color:black; size=18 maxlength=9 name=name></td>";
if($me['troop'] == 0) {
echo "
<td><input type=submit name=btn value='부 대 창 설'></td>";
@@ -154,11 +155,12 @@ echo "
</table>";
?>
<table align=center width=1000 class='tb_layout bg0'>
<table width=1000 class='tb_layout bg0'>
<tr><td><?=backButton()?></td></tr>
<tr><td><?=banner()?> </td></tr>
</table>
</form>
</div>
</body>
</html>
hwe/c_double.php
+2 -2
View File
@@ -49,7 +49,7 @@ if($command == 46) {
$name = str_replace(" ", "", $name);
$name = str_replace("　", "뷁", $name);
if($name == "") { $name = "무명"; }
$name = StringUtil::subStringForWidth($name, 0, 12);
$name = StringUtil::subStringForWidth($name, 0, 18);
$db->update('general', [
'makenation'=>$name
@@ -77,7 +77,7 @@ if($command == 53) {
$nationname = str_replace(" ", "", $nationname);
$nationname = str_replace("　", "뷁", $nationname);
if($nationname == "") { $nationname = "무명"; }
$nationname = StringUtil::subStringForWidth($nationname, 0, 12);
$nationname = StringUtil::subStringForWidth($nationname, 0, 18);
$query = "update general set makenation='{$nationname}' where level>=5 and nation='{$me['nation']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
hwe/commandlist.php
+4 -4
View File
@@ -108,10 +108,10 @@ function myCommandList() {
$turndate = substr($totaldate,11, 5);
echo "
<tr height=28>
<td width=30 align=center height=24 id=bg0><b>$j</b></td>
<td width=75 align=center height=24 id=bg1><b>{$year}年 {$month}月</b></td>
<td width=45 align=center bgcolor=black><b>$turndate</b></td>
<td width=137 align=center height=24 style=table-layout:fixed;>$turn[$i]</td>
<td width=25 align=center height=24 id=bg0><b>$j</b></td>
<td width=70 align=center height=24 id=bg1><b>{$year}年 {$month}月</b></td>
<td width=42 align=center bgcolor=black><b>$turndate</b></td>
<td width=150 align=center height=24 style=table-layout:fixed;>$turn[$i]</td>
</tr>";
$month++;
$totaldate = addTurn($totaldate, $admin['turnterm']);
hwe/func_command.php
+4 -4
View File
@@ -287,8 +287,8 @@ function getCoreTurn($nation, $level) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
if($fourth == 1) { $str[$i] = "【{$general['name']}】에게 금 {$double}00을 포상"; }
else { $str[$i] = "【{$general['name']}】에게 쌀 {$double}00을 포상"; }
if($fourth == 1) { $str[$i] = "【{$general['name']}】에게 금 {$double}00 포상"; }
else { $str[$i] = "【{$general['name']}】에게 쌀 {$double}00 포상"; }
break;
case 24: //몰수
$fourth = $command[3];
@@ -299,8 +299,8 @@ function getCoreTurn($nation, $level) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
if($fourth == 1) { $str[$i] = "【{$general['name']}】에게서 금 {$double}00을 몰수"; }
else { $str[$i] = "【{$general['name']}】에게서 쌀 {$double}00을 몰수"; }
if($fourth == 1) { $str[$i] = "【{$general['name']}】의 금 {$double}00 몰수"; }
else { $str[$i] = "【{$general['name']}】의 쌀 {$double}00 몰수"; }
break;
case 27: //발령
$third = $command[2];
hwe/func_tournament.php
+1 -1
View File
@@ -175,7 +175,7 @@ function printRow($k, $npc, $name, $abil, $tgame, $win, $draw, $lose, $gd, $gl,
if($prmt > 0) { $name = "<font color=orange>".$name."</font>"; }
elseif($npc >= 2) { $name = "<font color=cyan>".$name."</font>"; }
elseif($npc == 1) { $name = "<font color=skyblue>".$name."</font>"; }
echo "<tr align=center><td id=bg2>$k</td><td>$name</td><td>$abil</td><td>$tgame</td><td>$win</td><td>$draw</td><td>$lose</td><td>$gd</td><td>$gl</td></tr>";
echo "<tr align=center><td id=bg2>$k</td><td style='font-size:80%;'>$name</td><td>$abil</td><td>$tgame</td><td>$win</td><td>$draw</td><td>$lose</td><td>$gd</td><td>$gl</td></tr>";
}
function printFighting($tournament, $phase) {
hwe/join.php
+1 -1
View File
@@ -93,7 +93,7 @@ for ($i=0; $i < $nationcount; $i++) {
<tr>
<td width=498 align=right id=bg1>장수명</td>
<td colspan=2>
<input type=text name=name maxlength=6 size=12 style=color:white;background-color:black; value=<?=$member['name']?>>(6글자 이내)
<input type=text name=name maxlength=9 size=18 style=color:white;background-color:black; value=<?=$member['name']?>>(9글자 이내)
</td>
</tr>
<?php
hwe/join_post.php
+1 -1
View File
@@ -102,7 +102,7 @@ if (mb_strlen($name) < 1) {
</script>");
exit;
}
if (mb_strlen($name) > 6) {
if (mb_strlen($name) > 9) {
echo("<script>
window.alert('이름이 유효하지 않습니다. 다시 가입해주세요!')
history.go(-1)
hwe/processing.php
+5 -5
View File
@@ -979,7 +979,7 @@ function command_25($turn, $command) {
!!!는 방랑군을 포함한 랜덤임관입니다. 유니크를 기대하신다면!<br>
???는 방랑군을 제외한 랜덤임관입니다. 유니크 혜택은 없습니다.<br>
임관 금지이거나 초기 제한중인 국가는 붉은색 배경으로 표시됩니다.<br>
900px x 200px 넘는 높이를 점유할 시 통보없이 제한될 수 있습니다.<br>
870px x 200px 넘는 높이를 점유할 시 통보없이 제한될 수 있습니다.<br>
<form name=form1 action=c_double.php method=post>
<select name=double size=1 style=color:white;background-color:black>
<option value=99 style=color:white;background-color:black;>!!!</option>
@@ -990,9 +990,9 @@ function command_25($turn, $command) {
$nation = MYDB_fetch_array($result);
if($nation['scoutmsg'] == "") {
$scoutStr .= "<tr><td align=center width=100 style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</td><td width=900 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>-</td></tr>";
$scoutStr .= "<tr><td align=center width=130 style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</td><td width=870 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>-</td></tr>";
} else {
$scoutStr .= "<tr><td align=center width=100 style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</td><td width=900 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>".$nation['scoutmsg']."</td></tr>";
$scoutStr .= "<tr><td align=center width=130 style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</td><td width=870 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>".$nation['scoutmsg']."</td></tr>";
}
if($gameStor->year < $gameStor->startyear+3 && $nation['gennum'] >= 10) {
@@ -1584,7 +1584,7 @@ function command_46($turn, $command) {
- 명 가 : <font color=cyan>기술↑ 인구↑</font> <font color=magenta>쌀수입↓ 수성↓</font><br>
<form name=form1 action=c_double.php method=post>
국명 : <input type=text name=name size=12 maxlength=6 style=text-align:right;color:white;background-color:black>
국명 : <input type=text name=name size=18 maxlength=9 style=text-align:right;color:white;background-color:black>
색깔 : <select name=double size=1>
<?php
foreach(GetNationColors() as $idx=>$color) {
@@ -1930,7 +1930,7 @@ function command_53($turn, $command) {
echo "
</select>
통합국명 : <input type=text name=nationname size=12 maxlength=6 style=text-align:right;color:white;background-color:black>
통합국명 : <input type=text name=nationname size=18 maxlength=9 style=text-align:right;color:white;background-color:black>
<input type=submit value=통합제의>
<input type=hidden name=command value=$command>";
for($i=0; $i < count($turn); $i++) {
i_entrance/entrance.php
+1 -1
View File
@@ -68,7 +68,7 @@ if ($userGrade >= 5) {
<caption class="bg2 section_title with_border">서 버 선 택</caption>
<colgroup>
<col style="width:100px;" />
<col style="width:400px;" />
<col style="width:375px;" />
<col style="width:66px;" />
<col/>
<col style="width:120px;" />
js/install.js
+1 -1
View File
@@ -133,7 +133,7 @@ $(document).ready( function () {
},
nickname:{
required: true,
maxlength: 6,
maxlength: 9,
}
},
messages: {
js/join.js
+1 -1
View File
@@ -28,7 +28,7 @@ $(document).ready( function () {
},
nickname:{
required: true,
maxlength: 6,
maxlength: 9,
remote: {
url: "j_check_dup.php",
type: "post",
oauth_kakao/lib.join.php
+1 -1
View File
@@ -25,7 +25,7 @@ function checkNicknameDup($nickname){
}
$length = mb_strlen($nickname, 'utf-8');
if($length < 1 || $length > 6){
if($length < 1 || $length > 9){
return '적절하지 않은 길이입니다.';
}