From 317c42b384b74e9445de3b879f8ded850a601b08 Mon Sep 17 00:00:00 2001 From: hide_d Date: Wed, 30 May 2018 02:47:33 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=A5=EC=88=98=EB=AA=85=EC=9D=84=209?= =?UTF-8?q?=EA=B8=80=EC=9E=90=EA=B9=8C=EC=A7=80=20=EB=B0=98=EC=98=81?= =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=ED=95=98=EA=B3=A0.=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=ED=8B=80=EC=96=B4=EC=A7=80=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f_install/sql/common_schema.sql | 1 + hwe/_admin8.php | 4 ++-- hwe/b_chiefcenter.php | 20 ++++++++++---------- hwe/b_dipcenter.php | 4 ++-- hwe/b_nationboard.php | 2 +- hwe/b_troop.php | 24 +++++++++++++----------- hwe/c_double.php | 4 ++-- hwe/commandlist.php | 8 ++++---- hwe/func_command.php | 8 ++++---- hwe/func_tournament.php | 2 +- hwe/join.php | 2 +- hwe/join_post.php | 2 +- hwe/processing.php | 10 +++++----- i_entrance/entrance.php | 2 +- js/install.js | 2 +- js/join.js | 2 +- oauth_kakao/lib.join.php | 2 +- 17 files changed, 51 insertions(+), 48 deletions(-) diff --git a/f_install/sql/common_schema.sql b/f_install/sql/common_schema.sql index d03df143..5336d17b 100644 --- a/f_install/sql/common_schema.sql +++ b/f_install/sql/common_schema.sql @@ -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, diff --git a/hwe/_admin8.php b/hwe/_admin8.php index 0ed8eeba..d12a259e 100644 --- a/hwe/_admin8.php +++ b/hwe/_admin8.php @@ -65,8 +65,8 @@ $sel[$type] = "selected"; - - + + diff --git a/hwe/b_chiefcenter.php b/hwe/b_chiefcenter.php index b2222b62..0111f6d1 100644 --- a/hwe/b_chiefcenter.php +++ b/hwe/b_chiefcenter.php @@ -152,16 +152,16 @@ for($k=0; $k < 2; $k++) { $tn1 = $turn[$l1][$i]??"-"; echo " - - - - - - - - - - + + + + + + + + + + "; if($totaldate[$l4]??'') { $totaldate[$l4] = addTurn($totaldate[$l4], $admin['turnterm']); } diff --git a/hwe/b_dipcenter.php b/hwe/b_dipcenter.php index 280a4e78..ad0810f0 100644 --- a/hwe/b_dipcenter.php +++ b/hwe/b_dipcenter.php @@ -58,7 +58,7 @@ if ($me['level'] >= 5) {
외 교 관 계
국 가 명국 가 명국 가 명국 가 명 상 태 기 간 비 고
$j$td4$tn4$td3$tn3$td2$tn2$td1$tn1$j$j$td4$tn4$td3$tn3$td2$tn2$td1$tn1$j
- + @@ -219,7 +219,7 @@ if ($budgetricediff > 0) { - + diff --git a/hwe/b_nationboard.php b/hwe/b_nationboard.php index 1bdd6ccc..fc34a633 100644 --- a/hwe/b_nationboard.php +++ b/hwe/b_nationboard.php @@ -28,7 +28,7 @@ $me = MYDB_fetch_array($result); -
외 교 관 계
국 가 명국 가 명 국력 장수 속령
국 가 방 침 & 임관 권유 메세지
국가 방침 name=btn value=국가방침>
임관 권유 maxlength=500 style=color:white;background-color:black;width:830px; name=scoutmsg value=''> name=btn value=임관권유>
900 x 200px 넘는 크기를 점유할 시 통보없이 제한될 수 있습니다.
870 x 200px 넘는 크기를 점유할 시 통보없이 제한될 수 있습니다.
예 산 & 정 책
+
회 의 실
diff --git a/hwe/b_troop.php b/hwe/b_troop.php index 97ffa2d8..f0f49679 100644 --- a/hwe/b_troop.php +++ b/hwe/b_troop.php @@ -31,6 +31,7 @@ $troopcount = MYDB_num_rows($result); +
부 대 편 성
@@ -38,10 +39,10 @@ $troopcount = MYDB_num_rows($result); - - - - + + + + - + @@ -93,7 +94,7 @@ for($i=0; $i < $troopcount; $i++) { - + - - - - + + + + "; $month++; $totaldate = addTurn($totaldate, $admin['turnterm']); diff --git a/hwe/func_command.php b/hwe/func_command.php index 2107b8ac..7e56d9bb 100644 --- a/hwe/func_command.php +++ b/hwe/func_command.php @@ -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]; diff --git a/hwe/func_tournament.php b/hwe/func_tournament.php index ac32e4dd..8e48e288 100644 --- a/hwe/func_tournament.php +++ b/hwe/func_tournament.php @@ -175,7 +175,7 @@ function printRow($k, $npc, $name, $abil, $tgame, $win, $draw, $lose, $gd, $gl, if($prmt > 0) { $name = "".$name.""; } elseif($npc >= 2) { $name = "".$name.""; } elseif($npc == 1) { $name = "".$name.""; } - echo ""; + echo ""; } function printFighting($tournament, $phase) { diff --git a/hwe/join.php b/hwe/join.php index 7c38ef31..6ff18164 100644 --- a/hwe/join.php +++ b/hwe/join.php @@ -93,7 +93,7 @@ for ($i=0; $i < $nationcount; $i++) { "); exit; } -if (mb_strlen($name) > 6) { +if (mb_strlen($name) > 9) { echo("
선 택부 대 정 보부 대 장장 수부대장행동부 대 정 보부 대 장장 수부대장행동
{$troop['name']}
【 $cityname 】		  $genlist$genlist $turn
【턴】".substr($turntime, 14)."$name
  {$troop['name']}
【 $cityname 】		  $genlist$genlist "; 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 " - "; for($k=0; $k < $genCount; $k++) { $general = MYDB_fetch_array($genresult); echo " @@ -109,7 +110,7 @@ for($i=0; $i < $troopcount; $i++) { } echo "
- "; + "; } else { echo $turn; } @@ -138,10 +139,10 @@ echo "
"; echo " - +
- "; + "; if($me['troop'] == 0) { echo " "; @@ -154,11 +155,12 @@ echo "
부 대 명
"; ?> - +
+ diff --git a/hwe/c_double.php b/hwe/c_double.php index f80ac357..941a619e 100644 --- a/hwe/c_double.php +++ b/hwe/c_double.php @@ -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),""); diff --git a/hwe/commandlist.php b/hwe/commandlist.php index 665d5065..fe7b7651 100644 --- a/hwe/commandlist.php +++ b/hwe/commandlist.php @@ -108,10 +108,10 @@ function myCommandList() { $turndate = substr($totaldate,11, 5); echo "
$j{$year}年 {$month}月$turndate$turn[$i]$j{$year}年 {$month}月$turndate$turn[$i]
$k$name$abil$tgame$win$draw$lose$gd$gl
$k$name$abil$tgame$win$draw$lose$gd$gl
장수명 - >(6글자 이내) + >(9글자 이내)