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

colset을 can_change_flag로 변경.

Browse Source
This commit is contained in:
Hide_D
2018-03-28 20:39:12 +09:00
parent e8e18c059f
commit 4326530dec
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twe/func.php
+2 -2
View File
@@ -758,7 +758,7 @@ function CoreCommandTable($connect) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result); $me = MYDB_fetch_array($result);
$query = "select level,colset from nation where nation='{$me['nation']}'"; $query = "select level,can_change_flag from nation where nation='{$me['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result); $nation = MYDB_fetch_array($result);
@@ -832,7 +832,7 @@ function CoreCommandTable($connect) {
addCommand("급습/1턴(전략{$term})", 78, $valid); addCommand("급습/1턴(전략{$term})", 78, $valid);
commandGroup("", 1); commandGroup("", 1);
commandGroup("====== 기 타 ======"); commandGroup("====== 기 타 ======");
if($nation['colset'] > 0) { if($nation['can_change_flag'] > 0) {
addCommand("국기 변경", 81, 1); addCommand("국기 변경", 81, 1);
} else { } else {
addCommand("국기 변경", 81, 0); addCommand("국기 변경", 81, 0);
twe/func_process_chief.php
+3 -3
View File
@@ -2244,7 +2244,7 @@ function process_81($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result); $city = MYDB_fetch_array($result);
$query = "select nation,colset,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; $query = "select nation,can_change_flag,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result); $nation = MYDB_fetch_array($result);
@@ -2258,7 +2258,7 @@ function process_81($connect, &$general) {
$log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. 국기변경 실패. <1>$date</>"; $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. 국기변경 실패. <1>$date</>";
} elseif($general['level'] < 5) { } elseif($general['level'] < 5) {
$log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 국기변경 실패. <1>$date</>"; $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 국기변경 실패. <1>$date</>";
} elseif($nation['colset'] <= 0) { } elseif($nation['can_change_flag'] <= 0) {
$log[] = "<C>●</>{$admin['month']}월:더이상 변경이 불가능합니다. 국기변경 실패. <1>$date</>"; $log[] = "<C>●</>{$admin['month']}월:더이상 변경이 불가능합니다. 국기변경 실패. <1>$date</>";
} else { } else {
$log[] = "<C>●</>{$admin['month']}월:<font color={$color}><b>국기</b></font>를 변경합니다. <1>$date</>"; $log[] = "<C>●</>{$admin['month']}월:<font color={$color}><b>국기</b></font>를 변경합니다. <1>$date</>";
@@ -2284,7 +2284,7 @@ function process_81($connect, &$general) {
addNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y>{$general['name']}</>(이)가 <font color={$color}><b>국기</b></font>를 변경"); addNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y>{$general['name']}</>(이)가 <font color={$color}><b>국기</b></font>를 변경");
//국기변경 //국기변경
$query = "update nation set color='$color',colset=colset-1 where nation='{$nation['nation']}'"; $query = "update nation set color='$color',can_change_flag=can_change_flag-1 where nation='{$nation['nation']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//경험치, 공헌치 //경험치, 공헌치
twe/schema.php
+1 -1
View File
@@ -181,7 +181,7 @@ $nation_schema = "
create table nation ( create table nation (
nation int(6) not null auto_increment, nation int(6) not null auto_increment,
`name` CHAR(64) NOT NULL COLLATE 'utf8_bin', `name` CHAR(64) NOT NULL COLLATE 'utf8_bin',
color char(10) not null, colset int(1) default 1, color char(10) not null, can_change_flag int(1) default 1,
onlinegen varchar(1024) default '', onlinegen varchar(1024) default '',
msg text default '', msg text default '',
capital int(1) default 0, capset int(1) default 0, capital int(1) default 0, capset int(1) default 0,