game 테이블의 img를 show_img_level로 변경

twe/func.php

@@ -956,7 +956,7 @@ function generalInfo($connect, $no, $skin) {
     else                        { $general['mode'] = "<font color=red>수비 안함</font>"; }
 
     $weapImage = "{$images}/weap{$general['crewtype']}.jpg";
-    if($admin['img'] < 2) { $weapImage = "{$image}/default.jpg"; };
+    if($admin['show_img_level'] < 2) { $weapImage = "{$image}/default.jpg"; };
     $imageTemp = GetImageURL($general['imgsvr']);
     echo "<table width=498 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
     <tr>
@@ -1248,25 +1248,13 @@ function pushBatLog($general, $log) {
 }
 
 function pushAllLog($log) {
-    $size = count($log);
+    $text = join("\n", $log)."\n";
-    if($size > 0) {
+    file_put_contents(__dir__.'/logs/_alllog.txt', $text, FILE_APPEND);
-        $fp = fopen("logs/_alllog.txt", "a");
-        for($i=0; $i < $size; $i++) {
-            fwrite($fp, $log[$i]."\n");
-        }
-        fclose($fp);
-    }
 }
 
 function pushHistory($history) {
-    $size = count($history);
+    $text = join("\n", $history)."\n";
-    if($size > 0) {
+    file_put_contents(__dir__.'/logs/_history.txt', $text, FILE_APPEND);
-        $fp = fopen("logs/_history.txt", "a");
-        for($i=0; $i < $size; $i++) {
-            fwrite($fp, $history[$i]."\n");
-        }
-        fclose($fp);
-    }
 }
 
 function getRawLog($path, $count, $line_length, $skin){

twe/func_regnpc.php

@@ -8,7 +8,7 @@ function RegNPC($connect) {
     $admin = MYDB_fetch_array($result);
 
     $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];
-    $img = $admin['img'];
+    $img = $admin['show_img_level'];
 //                                                                    상성      이름       사진 국가  도시   통  무  지 급 출생 사망    꿈     특기
     RegGeneral($connect,0,0,$fiction,$turnterm,$startyear,$year,1001,   1,    "소제1",$img,1001,  0,    "-", 20, 11, 48, 0, 168, 190, "유지",    "-");
     RegGeneral($connect,0,0,$fiction,$turnterm,$startyear,$year,1002,   1,     "헌제",$img,1002,  0,    "-", 17, 13, 61, 0, 170, 250, "안전",    "-", "한 왕실을 구해줄 이는 진정 없는 것인가...");

twe/install.php

@@ -143,20 +143,20 @@ if(Session::getUserGrade(true) < 5){
                     </div>
 
                     <div class="form-group row">
-                        <label for="img" class="col-sm-3 col-form-label">이미지 표기</label>
+                        <label for="show_img_level" class="col-sm-3 col-form-label">이미지 표기</label>
                         <div class="col-sm-9">
                             <div class="btn-group btn-group-toggle" data-toggle="buttons">
                                 <label class="btn btn-secondary">
-                                    <input type="radio" name="img" value="0">안함
+                                    <input type="radio" name="show_img_level" value="0">안함
                                 </label>
                                 <label class="btn btn-secondary">
-                                    <input type="radio" name="img" value="1">전콘
+                                    <input type="radio" name="show_img_level" value="1">전콘
                                 </label>
                                 <label class="btn btn-secondary active">
-                                    <input type="radio" name="img" value="2" checked>전콘, 병종
+                                    <input type="radio" name="show_img_level" value="2" checked>전콘, 병종
                                 </label>
                                 <label class="btn btn-secondary">
-                                    <input type="radio" name="img" value="3">전콘, 병종, NPC
+                                    <input type="radio" name="show_img_level" value="3">전콘, 병종, NPC
                                 </label>
                             </div>
                         </div>

twe/join.php

@@ -231,7 +231,7 @@ for($i=0; $i < $nationcount; $i++) {
             </td>
         </tr>
 <?php
-if($admin['img'] >= 1 && $member['grade'] >= 1 && $member['picture'] != "") {
+if($admin['show_img_level'] >= 1 && $member['grade'] >= 1 && $member['picture'] != "") {
     $imageTemp = GetImageURL($member['imgsvr']);
     echo "
         <tr>

twe/join_post.php

@@ -174,7 +174,7 @@ if($id_num) {
     }
 
     //특회 전콘
-    if($admin['img'] >= 1 && $member['grade'] >= 1 && $member['picture'] != "" && $pic == 1) {
+    if($admin['show_img_level'] >= 1 && $member['grade'] >= 1 && $member['picture'] != "" && $pic == 1) {
         $face = $member['picture'];
         $imgsvr = $member['imgsvr'];
     } else {

twe/old/j_old_install2.php

@@ -10,7 +10,7 @@ $scenario = Util::array_get($_POST['scenario'],'0');
 $fiction = Util::array_get($_POST['fiction'],'0');
 $extend = Util::array_get($_POST['extend'],'0');
 $npcmode = Util::array_get($_POST['npcmode'],'0');
-$img = Util::array_get($_POST['img'],'0');
+$img = Util::array_get($_POST['show_img_level'],'0');
 
 if(Session::getUserGrade(true) < 5){
     die('관리자 아님');

twe/processing.php

@@ -426,7 +426,7 @@ function calc(cost, formnum) {
             $cst = round($cst);
             $l = $color[$i];
             $weapImage = "{$images}/weap{$i}.jpg";
-            if($admin['img'] < 2) { $weapImage = "{$image}/default.jpg"; }
+            if($admin['show_img_level'] < 2) { $weapImage = "{$image}/default.jpg"; }
             echo "
     <tr height=64 bgcolor=$l>
         <td background={$weapImage} align=center></td>
@@ -476,7 +476,7 @@ function calc(cost, formnum) {
             $cst = round($cst);
             $l = $color[$i];
             $weapImage = "{$images}/weap{$i}.jpg";
-            if($admin['img'] < 2) { $weapImage = "{$image}/default.jpg"; }
+            if($admin['show_img_level'] < 2) { $weapImage = "{$image}/default.jpg"; }
             echo "
     <tr height=64 bgcolor=$l>
         <td background={$weapImage} align=center></td>
@@ -526,7 +526,7 @@ function calc(cost, formnum) {
             $cst = round($cst);
             $l = $color[$i];
             $weapImage = "{$images}/weap{$i}.jpg";
-            if($admin['img'] < 2) { $weapImage = "{$image}/default.jpg"; }
+            if($admin['show_img_level'] < 2) { $weapImage = "{$image}/default.jpg"; }
             echo "
     <tr height=64 bgcolor=$l>
         <td background={$weapImage} align=center></td>
@@ -576,7 +576,7 @@ function calc(cost, formnum) {
             $cst = round($cst);
             $l = $color[$i];
             $weapImage = "{$images}/weap{$i}.jpg";
-            if($admin['img'] < 2) { $weapImage = "{$image}/default.jpg"; }
+            if($admin['show_img_level'] < 2) { $weapImage = "{$image}/default.jpg"; }
             echo "
     <tr height=64 bgcolor=$l>
         <td background={$weapImage} align=center></td>
@@ -626,7 +626,7 @@ function calc(cost, formnum) {
             $cst = round($cst);
             $l = $color[$i];
             $weapImage = "{$images}/weap{$i}.jpg";
-            if($admin['img'] < 2) { $weapImage = "{$image}/default.jpg"; }
+            if($admin['show_img_level'] < 2) { $weapImage = "{$image}/default.jpg"; }
             echo "
     <tr height=64 bgcolor=$l>
         <td background={$weapImage} align=center></td>
@@ -860,7 +860,7 @@ function calc(cost, formnum) {
             $cst = round($cst);
             $l = $color[$i];
             $weapImage = "{$images}/weap{$i}.jpg";
-            if($admin['img'] < 2) { $weapImage = "{$image}/default.jpg"; }
+            if($admin['show_img_level'] < 2) { $weapImage = "{$image}/default.jpg"; }
             echo "
     <tr height=64 bgcolor=$l>
         <td background={$weapImage} align=center></td>
@@ -910,7 +910,7 @@ function calc(cost, formnum) {
             $cst = round($cst);
             $l = $color[$i];
             $weapImage = "{$images}/weap{$i}.jpg";
-            if($admin['img'] < 2) { $weapImage = "{$image}/default.jpg"; }
+            if($admin['show_img_level'] < 2) { $weapImage = "{$image}/default.jpg"; }
             echo "
     <tr height=64 bgcolor=$l>
         <td background={$weapImage} align=center></td>
@@ -960,7 +960,7 @@ function calc(cost, formnum) {
             $cst = round($cst);
             $l = $color[$i];
             $weapImage = "{$images}/weap{$i}.jpg";
-            if($admin['img'] < 2) { $weapImage = "{$image}/default.jpg"; }
+            if($admin['show_img_level'] < 2) { $weapImage = "{$image}/default.jpg"; }
             echo "
     <tr height=64 bgcolor=$l>
         <td background={$weapImage} align=center></td>
@@ -1010,7 +1010,7 @@ function calc(cost, formnum) {
             $cst = round($cst);
             $l = $color[$i];
             $weapImage = "{$images}/weap{$i}.jpg";
-            if($admin['img'] < 2) { $weapImage = "{$image}/default.jpg"; }
+            if($admin['show_img_level'] < 2) { $weapImage = "{$image}/default.jpg"; }
             echo "
     <tr height=64 bgcolor=$l>
         <td background={$weapImage} align=center></td>
@@ -1060,7 +1060,7 @@ function calc(cost, formnum) {
             $cst = round($cst);
             $l = $color[$i];
             $weapImage = "{$images}/weap{$i}.jpg";
-            if($admin['img'] < 2) { $weapImage = "{$image}/default.jpg"; }
+            if($admin['show_img_level'] < 2) { $weapImage = "{$image}/default.jpg"; }
             echo "
     <tr height=64 bgcolor=$l>
         <td background={$weapImage} align=center></td>

twe/scenario_1.php

@@ -45,7 +45,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //역사모드1 : 184년 황건적의 난
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_10.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //역사모드10 : 225년 칠종칠금
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_11.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //역사모드11 : 228년 출사표
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_12.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //IF모드1 : 191년 백마장군의 위세
 
 //국가1 원소 국가2 공손찬 국가3 동탁 국가4 원술 국가5 유언 국가6 마등 국가7 유표

twe/scenario_2.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_190A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //역사모드2 : 190년 반동탁연합
 
 //국가1 동탁 국가2 원소 국가3 유표 국가4 조조 국가5 유언 국가6 원술 국가7 손견

twe/scenario_20.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = 1;    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //가상모드1 : 180년 영웅 난무
 
 //////////////////////////외교//////////////////////////////////////////////////

twe/scenario_21.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = 1;    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //가상모드1 : 180년 영웅 집결
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_23.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = 1;    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //가상모드3 : 180년 영웅 시대
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_25.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = 1;    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //가상모드5 : 180년 영웅독존
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_26.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = 1;    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //가상모드6 : 180년 무풍지대
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_27.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = 1;    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //가상모드7 : 180년 가요대잔치
 /*
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_28.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = 1;    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //가상모드8 : 180년 확산성 밀리언 아서
 /*
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_3.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //역사모드3 : 194년 군웅할거
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_4.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //역사모드4 : 196년 황제는 허도로
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_5.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //역사모드5 : 200년 관도대전
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_6.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //역사모드6 : 202년 원가의 분열
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_7.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //역사모드7 : 207년 적벽대전
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_8.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //역사모드8 : 213년 익주 공방전
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/scenario_9.php

@@ -44,7 +44,7 @@ $query = "select startyear,year,month,turnterm,scenario,extend,fiction,img from
 $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 $fiction = $admin['fiction'];    $turnterm = $admin['turnterm'];    $startyear = $admin['startyear'];    $year = $admin['year'];    $extend = $admin['extend'];
-$img = $admin['img'];
+$img = $admin['show_img_level'];
 //역사모드9 : 219년 삼국정립
 
 //////////////////////////국가1/////////////////////////////////////////////////

twe/schema.php

@@ -584,17 +584,18 @@ $emperior_schema = "
 $diplomacy_schema = "
 
   create table diplomacy (
-    no int(6) not null auto_increment,
+    `no` INT(6) NOT NULL AUTO_INCREMENT,
-    me int(6) default 0,
+    `me` INT(6) NOT NULL,
-    you int(6) default 0,
+    `you` INT(6) NOT NULL,
-    state int(6) default 0,
+    `state` INT(6) NULL DEFAULT '0',
-    term int(6) default 0,
+    `term` INT(6) NULL DEFAULT '0',
-    dead int(8) default 0,
+    `dead` INT(8) NULL DEFAULT '0',
-    fixed char(128) default '',
+    `fixed` CHAR(128) NULL DEFAULT '',
-    reserved char(128) default '',
+    `reserved` CHAR(128) NULL DEFAULT '',
-    showing datetime,
+    `showing` DATETIME NULL DEFAULT NULL,
 
-    PRIMARY KEY (no)
+    PRIMARY KEY (`no`),
+	  UNIQUE INDEX `me` (`me`, `you`)
     ) ENGINE=INNODB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=UTF8
 
     ";
@@ -702,3 +703,17 @@ $history_schema = "
 
     ";
 
+///////////////////////////////////////////////////////////////////////////
+// 이벤트 핸들러 테이블
+///////////////////////////////////////////////////////////////////////////
+
+$event_schema = "
+    CREATE TABLE `event` (
+      `id` INT(11) NOT NULL AUTO_INCREMENT,
+      `condition` MEDIUMTEXT NOT NULL COMMENT 'json',
+      `action` MEDIUMTEXT NOT NULL COMMENT 'json',
+      PRIMARY KEY (`id`)
+    )
+    ENGINE=InnoDB
+    ";
+    

twe/select_npc.php

@@ -83,7 +83,7 @@ for($i=0; $i < $nationcount; $i++) {
             <td colspan=2 align=center id=bg1>장수 선택</td>
         </tr>
 <?php
-if($admin['img'] >= 3) {
+if($admin['show_img_level'] >= 3) {
 ?>
         <tr>
             <td width=498 align=right rowspan=2 height=64 id=bg1>장수</td>