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

GeneralPublicRecord 추가

Browse Source
This commit is contained in:
Hide_D
2018-04-01 18:51:26 +09:00
parent 5860a14dae
commit 1f5f7e3591
29 changed files with 299 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/_admin1_submit.php
+2 -2
View File
@@ -28,7 +28,7 @@ switch($btn) {
$lognum = $admin['historyindex'] + 1;
if($lognum >= 29) { $lognum = 0; }
$history[0] = "<R>★</><S>{$log}</>";
pushHistory($history);
pushWorldHistory($history);
break;
case "변경1":
$query = "update game set starttime='$starttime'";
@@ -101,7 +101,7 @@ switch($btn) {
}
}
$history[] = "<R>★</>턴시간이 <C>$btn</>으로 변경됩니다.";
pushHistory($history);
pushWorldHistory($history);
break;
}
hwe/a_status.php
+2 -2
View File
@@ -53,7 +53,7 @@ $(function(){
<table align=center width=1200 height=520 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
<tr height=520>
<td width=498 valign=top>
<?php AllLog(34); ?>
<?php getGeneralPublicRecordRecent(34); ?>
</td>
<td width=698>
<?=getMapHtml()?>
@@ -61,7 +61,7 @@ $(function(){
</tr>
<tr>
<td colspan=2 valign=top>
<?php History(34); ?>
<?php getWorldHistoryRecent(34); ?>
</td>
</tr>
</table>
hwe/c_myBossInfo.php
+1 -1
View File
@@ -162,7 +162,7 @@ if($btn == "추방") {
addHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D>{$nation['name']}</>에서 추방됨");
pushGenLog($general, $log);
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
}
} elseif($btn == "임명" && $level >= 5 && $level <= 11) {
$query = "select l{$level}set,level,chemi from nation where nation='{$me['nation']}'";
hwe/d_ally.php
+2 -2
View File
@@ -113,8 +113,8 @@ if($ok == "수락") {
pushGenLog($me, $mylog);
pushGenLog($you, $youlog);
//pushAllLog($alllog);
//pushHistory($history, $admin['year'], $admin['month']);
//pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
//pushWorldHistory($history, $admin['year'], $admin['month']);
echo "<script>location.replace('msglist.php');</script>";
hwe/d_cancel.php
+2 -2
View File
@@ -92,8 +92,8 @@ if($ok == "수락") {
pushGenLog($me, $mylog);
pushGenLog($you, $youlog);
pushAllLog($alllog);
pushHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
echo "<script>location.replace('msglist.php');</script>";
hwe/d_cease.php
+2 -2
View File
@@ -97,8 +97,8 @@ if($ok == "수락") {
pushGenLog($me, $mylog);
pushGenLog($you, $youlog);
pushAllLog($alllog);
pushHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
echo "<script>location.replace('msglist.php');</script>";
hwe/d_merge.php
+2 -2
View File
@@ -131,8 +131,8 @@ if($ok == "수락") {
pushGenLog($me, $mylog);
pushGenLog($you, $youlog);
pushAllLog($alllog);
pushHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
echo "<script>location.replace('msglist.php');</script>";
hwe/d_scout.php
+2 -2
View File
@@ -163,8 +163,8 @@ if($ok == "수락" && $me['level'] < 12 && $nation['level'] > 0 && $nation['scou
pushGenLog($me, $mylog);
pushGenLog($you, $youlog);
pushAllLog($alllog);
pushHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
echo "<script>location.replace('msglist.php');</script>";
hwe/d_surrender.php
+2 -2
View File
@@ -121,8 +121,8 @@ if($ok == "수락") {
pushGenLog($me, $mylog);
pushGenLog($you, $youlog);
pushAllLog($alllog);
pushHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
echo "<script>location.replace('msglist.php');</script>";
hwe/func.php
+8 -154
View File
@@ -1136,126 +1136,6 @@ function generalInfo2($connect, $no) {
</table>";
}
function pushTrickLog($log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/_tricklog.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushProcessLog($log) {
$size = count($log);
if($size > 0) {
$date = date('Y_m_d');
$fp = fopen("logs/_{$date}_processlog.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function delStepLog() {
$date = date('Y_m_d');
@unlink("logs/_{$date}_steplog.txt");
}
function pushStepLog($log) {
$date = date('Y_m_d');
$fp = fopen("logs/_{$date}_steplog.txt", "a");
fwrite($fp, $log."\n");
fclose($fp);
}
function pushLockLog($log) {
$size = count($log);
if($size > 0) {
$date = date('Y_m_d');
$fp = fopen("logs/_{$date}_locklog.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushAdminLog($log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/_adminlog.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushAuctionLog($log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/_auctionlog.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushGenLog($general, $log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/gen{$general['no']}.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushBatRes($general, $log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/batres{$general['no']}.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushBatLog($general, $log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/batlog{$general['no']}.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushAllLog($log) {
$text = join("\n", $log)."\n";
file_put_contents(__dir__.'/logs/_alllog.txt', $text, FILE_APPEND);
}
function pushHistory($history, $year=null, $month=null) {
$db = DB::db();
if($year === null || $month === null){
$game = $db->queryFirstRow('SELECT year, month FROM game LIMIT 1');
$year = $game['year'];
$month = $game['month'];
}
$request = array_map(function($text) use ($year, $month) {
return ['year'=>$year, 'month'=>$month, 'text'=>$text];
}, $history);
$db->insert('full_history', $history);
}
function getRawLog($path, $count, $line_length){
//TODO: tail과 유사한 형태로 처리할 수 있는게 나을 듯. 그 이전에 파일 로그는 좀... ㅜㅜ
if(!file_exists($path)){
@@ -1282,22 +1162,6 @@ function TrickLog($count) {
echo $str;
}
function AllLog($count) {
if(!file_exists("logs/_alllog.txt")){
return '';
}
$fp = @fopen("logs/_alllog.txt", "r");
@fseek($fp, -$count*300, SEEK_END);
$file = @fread($fp, $count*300);
@fclose($fp);
$log = explode("\n",$file);
$str = "";
for($i=0; $i < $count; $i++) {
$str .= isset($log[count($log)-2-$i]) ? ConvertLog($log[count($log)-2-$i])."<br>" : "<br>";
}
echo $str;
}
function AuctionLog($count) {
if(!file_exists("logs/_auctionlog.txt")){
return '';
@@ -1312,16 +1176,6 @@ function AuctionLog($count) {
echo $str;
}
function History($count) {
$db = DB::db();
$texts = [];
foreach($db->queryFirstColumn('SELECT `text` from full_history order by id desc limit %i', $count) as $text){
$texts[] = ConvertLog($text);
}
return join('<br>', $texts);
}
function MyLog($no, $count) {
if(!file_exists("logs/gen{$no}.txt")){
return '';
@@ -1923,7 +1777,7 @@ function checkTurn($connect) {
addAge($connect);
// 새해 알림
$alllog[] = "<C>◆</>{$admin['month']}월:<C>{$admin['year']}</>년이 되었습니다.";
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
} elseif($admin['month'] == 4) {
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateQuaterly');
updateQuaterly($connect);
@@ -2202,7 +2056,7 @@ function updateTurntime($connect, $no) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name2']}</>(이)가 <Y>{$general['name']}</>의 육체에서 <S>유체이탈</>합니다!";
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
if($admin['isUnited'] == 0) {
CheckHall($connect, $no);
@@ -2315,7 +2169,7 @@ function updateTurntime($connect, $no) {
}
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
return;
}
@@ -2330,7 +2184,7 @@ function updateTurntime($connect, $no) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>(이)가 <R>은퇴</>하고 그 자손이 유지를 이어받았습니다.";
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
$log[0] = "<C>●</>나이가 들어 <R>은퇴</>하고 자손에게 자리를 물려줍니다.";
pushGenLog($general, $log);
@@ -2537,8 +2391,8 @@ function uniqueItem($connect, $general, $log, $vote=0) {
}
break;
}
pushAllLog($alllog);
pushHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
}
}
return $log;
@@ -2692,7 +2546,7 @@ function deleteNation($connect, $general) {
$query = "delete from diplomacy where me='{$general['nation']}' or you='{$general['nation']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
refreshNationStaticInfo();
}
@@ -2757,7 +2611,7 @@ function nextRuler($connect, $general) {
$history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【유지】</b></><Y>{$nextruler['name']}</>(이)가 <D><b>{$nation['name']}</b></>의 유지를 이어 받았습니다";
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
addNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【유지】</b></><Y>{$nextruler['name']}</>(이)가 <D><b>{$nation['name']}</b></>의 유지를 이어 받음.");
// 장수 삭제 및 부대처리는 checkTurn에서
}
hwe/func_auction.php
+4 -4
View File
@@ -82,8 +82,8 @@ function registerAuction($connect) {
$alllog[0] = "<C>●</>{$admin['month']}월:<C>".GetStuffName($stuff)."</>(이)가 거래장에 등장했습니다!";
$history[0] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【암시장】</b></><Y>ⓝ암시장상인</>(이)가 <C>".GetStuffName($stuff)."</>(을)를 판다는 소문이 돌고 있습니다!";
pushAllLog($alllog);
pushHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
}
}
*/
@@ -205,8 +205,8 @@ function processAuction($connect) {
$alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$auction['name2']}</>(이)가 <C>".GetStuffName($auction['stuff'])."</>(을)를 구매했습니다!";
$history[0] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【암시장】</b></><Y>{$auction['name2']}</>(이)가 <C>".GetStuffName($auction['stuff'])."</>(을)를 구매했습니다!";
pushAllLog($alllog);
pushHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
}
pushGenLog($trader, $traderLog);
pushGenLog($bidder, $bidderLog);
hwe/func_diplomacy.php
+2 -2
View File
@@ -136,8 +136,8 @@ function acceptScout($messageInfo, $general, $msgResponse){
pushGenLog($me, $mylog);
pushGenLog($you, $youlog);
pushAllLog($alllog);
pushHistory($alllog, $year, $month);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($alllog, $year, $month);
return [true, 'success'];
}
hwe/func_gamerule.php
+6 -6
View File
@@ -386,7 +386,7 @@ function preUpdateMonthly($connect) {
$history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<R><b>【고립】</b></><G><b>{$city['name']}</b></>(이)가 보급이 끊겨 <R>미지배</> 도시가 되었습니다.";
}
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
//민심30이하 공백지 처리
$query = "update city set nation='0',gen1='0',gen2='0',gen3='0',conflict='',conflict2='',term=0,front=0 where rate<='30' and supply='0'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -608,7 +608,7 @@ group by A.nation
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
}
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
//사상자 초기화
$query = "update diplomacy set dead=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -781,7 +781,7 @@ function checkMerge($connect) {
pushGenLog($me, $mylog);
pushGenLog($you, $youlog);
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
unset($mylog);
unset($youlog);
unset($history);
@@ -901,7 +901,7 @@ function checkSurrender($connect) {
pushGenLog($me, $mylog);
pushGenLog($you, $youlog);
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
unset($mylog);
unset($youlog);
unset($history);
@@ -985,7 +985,7 @@ function updateNationState($connect) {
$query = "update nation set tech=totaltech/'$gencount',gennum='$gennum' where nation='{$nation['nation']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
}
function checkStatistic($connect) {
@@ -1279,7 +1279,7 @@ function checkEmperior($connect) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【통일】</b></><D><b>{$nation['name']}</b></>(이)가 전토를 통일하였습니다.";
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
//연감 월결산
LogHistory();
hwe/func_history.php
+171 -31
View File
@@ -1,13 +1,142 @@
<?php
namespace sammo;
function getHistory($year, $month) {
function pushTrickLog($log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/_tricklog.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushProcessLog($log) {
$size = count($log);
if($size > 0) {
$date = date('Y_m_d');
$fp = fopen("logs/_{$date}_processlog.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function delStepLog() {
$date = date('Y_m_d');
@unlink("logs/_{$date}_steplog.txt");
}
function pushStepLog($log) {
$date = date('Y_m_d');
$fp = fopen("logs/_{$date}_steplog.txt", "a");
fwrite($fp, $log."\n");
fclose($fp);
}
function pushLockLog($log) {
$size = count($log);
if($size > 0) {
$date = date('Y_m_d');
$fp = fopen("logs/_{$date}_locklog.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushAdminLog($log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/_adminlog.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushAuctionLog($log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/_auctionlog.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushGenLog($general, $log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/gen{$general['no']}.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushBatRes($general, $log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/batres{$general['no']}.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushBatLog($general, $log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/batlog{$general['no']}.txt", "a");
for($i=0; $i < $size; $i++) {
fwrite($fp, $log[$i]."\n");
}
fclose($fp);
}
}
function pushWorldHistory(array $history, $year=null, $month=null) {
$db = DB::db();
if($year === null || $month === null){
$game = $db->queryFirstRow('SELECT year, month FROM game LIMIT 1');
$year = $game['year'];
$month = $game['month'];
}
$request = array_map(function($text) use ($year, $month) {
return ['year'=>$year, 'month'=>$month, 'text'=>$text];
}, array_values($history));
$db->insert('world_history', $request);
}
function getWorldHistoryRecent(int $count) {
$db = DB::db();
$texts = [];
foreach($db->queryFirstColumn('SELECT `text` from world_history order by id desc limit %i', $count) as $text){
$texts[] = ConvertLog($text);
}
return join('<br>', $texts);
}
function getWorldHistoryWithDate($year, $month) {
$db = DB::db();
$texts = [];
foreach(
$db->queryFirstColumn(
'SELECT `text` from full_history where year = %i and month = %i order by id desc',
'SELECT `text` from world_history where year = %i and month = %i order by id desc',
$year,
$month
) as $text
@@ -22,36 +151,47 @@ function getHistory($year, $month) {
return join('<br>', $texts);
}
function getGenHistory($count, $year, $month, $isFirst=0) {
$fp = @fopen("logs/_alllog.txt", "r");
@fseek($fp, -$count*300, SEEK_END);
$file = @fread($fp, $count*300);
@fclose($fp);
$log = explode("\n",$file);
$str = "";
$prefix = "</>{$month}월:";
$year -= 1;
$prefixYear = "</>{$month}월:<C>{$year}</>";
for($i=0; $i < $count; $i++) {
$line = $log[count($log)-2-$i];
if($line == "") {
continue;
}
if(strpos($line, $prefixYear)) {
break;
} elseif(strpos($line, $prefix) || $isFirst == 1) {
$str = ConvertLog($line).'<br>'.$str;
} else {
break;
}
function pushGeneralPublicRecord(array $history, $year=null, $month=null) {
$db = DB::db();
if($year === null || $month === null){
$game = $db->queryFirstRow('SELECT year, month FROM game LIMIT 1');
$year = $game['year'];
$month = $game['month'];
}
if($str == "") {
$str = "<C>●</>{$month}월: 기록 없음";
$str = ConvertLog($str);
$request = array_map(function($text) use ($year, $month) {
return ['year'=>$year, 'month'=>$month, 'text'=>$text];
}, array_values($history));
$db->insert('general_public_record', $request);
}
function getGeneralPublicRecordRecent($count) {
$db = DB::db();
$texts = [];
foreach($db->queryFirstColumn('SELECT `text` from general_public_record order by id desc limit %i', $count) as $text){
$texts[] = ConvertLog($text);
}
return join('<br>', $texts);
}
function getGeneralPublicRecordWithDate($count, $year, $month, $isFirst=0) {
$db = DB::db();
$texts = [];
foreach(
$db->queryFirstColumn(
'SELECT `text` from general_public_record where year = %i and month = %i order by id desc',
$year,
$month
) as $text
){
$texts[] = ConvertLog($text);
}
if(!$texts){
return ConvertLog("<C>●</>{$month}월: 기록 없음");
}
return $str;
}
function LogHistory($isFirst=0) {
@@ -87,8 +227,8 @@ function LogHistory($isFirst=0) {
$map_json = json_encode($map, JSON_UNESCAPED_UNICODE);
$log = getHistory($year, $month);
$genlog = getGenHistory(50, $year, $month, $isFirst);
$log = getWorldHistoryWithDate($year, $month);
$genlog = getGeneralPublicRecordWithDate(50, $year, $month, $isFirst);
$nationStr = "";
$powerStr = "";
hwe/func_npc.php
+1 -1
View File
@@ -148,7 +148,7 @@ function RegGeneral($init,$life,$fiction,$turnterm,$startyear,$year,$gencount,$a
'bornyear'=>$bornyear,
'deadyear'=>$deadyear
]);
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
}
function SetDevelop($connect, $genType, $no, $city, $tech) {
hwe/func_process.php
+3 -3
View File
@@ -1426,7 +1426,7 @@ function process_26($connect, &$general) {
$log = uniqueItem($connect, $general, $log);
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -1674,7 +1674,7 @@ function process_31($connect, &$general) {
$log = checkAbility($connect, $general, $log);
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -2128,7 +2128,7 @@ function process_44($connect, &$general) {
$log = checkAbility($connect, $general, $log);
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
hwe/func_process_chief.php
+29 -29
View File
@@ -443,7 +443,7 @@ function process_52($connect, &$general) {
// $log = checkAbility($connect, $general, $log);
}
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -681,8 +681,8 @@ function process_62($connect, &$general) {
PushMsg(3, $younation['nation'], $general['picture'], $general['imgsvr'], "{$general['name']}:{$nation['name']}▶", $nation['color'], $younation['name'], $younation['color'], $youmsg);
}
pushHistory($history, $admin['year'], $admin['month']);
pushAllLog($alllog);
pushWorldHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -899,8 +899,8 @@ function process_65($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
pushHistory($history, $admin['year'], $admin['month']);
pushAllLog($alllog);
pushWorldHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -985,8 +985,8 @@ function process_66($connect, &$general) {
refreshNationStaticInfo();
}
pushHistory($history, $admin['year'], $admin['month']);
pushAllLog($alllog);
pushWorldHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -1072,8 +1072,8 @@ function process_67($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
pushHistory($history, $admin['year'], $admin['month']);
pushAllLog($alllog);
pushWorldHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -1171,8 +1171,8 @@ function process_68($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
pushHistory($history, $admin['year'], $admin['month']);
pushAllLog($alllog);
pushWorldHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -1271,8 +1271,8 @@ function process_71($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
// pushHistory($history, $admin['year'], $admin['month']);
// pushAllLog($alllog);
// pushWorldHistory($history, $admin['year'], $admin['month']);
// pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -1381,8 +1381,8 @@ function process_72($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
// pushHistory($history, $admin['year'], $admin['month']);
// pushAllLog($alllog);
// pushWorldHistory($history, $admin['year'], $admin['month']);
// pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -1507,8 +1507,8 @@ function process_73($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
// pushHistory($history, $admin['year'], $admin['month']);
// pushAllLog($alllog);
// pushWorldHistory($history, $admin['year'], $admin['month']);
// pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -1645,8 +1645,8 @@ function process_74($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
// pushHistory($history, $admin['year'], $admin['month']);
// pushAllLog($alllog);
// pushWorldHistory($history, $admin['year'], $admin['month']);
// pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -1766,8 +1766,8 @@ function process_75($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
// pushHistory($history, $admin['year'], $admin['month']);
// pushAllLog($alllog);
// pushWorldHistory($history, $admin['year'], $admin['month']);
// pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -1980,8 +1980,8 @@ function process_76($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
// pushHistory($history, $admin['year'], $admin['month']);
// pushAllLog($alllog);
// pushWorldHistory($history, $admin['year'], $admin['month']);
// pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -2103,8 +2103,8 @@ function process_77($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
// pushHistory($history, $admin['year'], $admin['month']);
// pushAllLog($alllog);
// pushWorldHistory($history, $admin['year'], $admin['month']);
// pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -2223,8 +2223,8 @@ function process_78($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
// pushHistory($history, $admin['year'], $admin['month']);
// pushAllLog($alllog);
// pushWorldHistory($history, $admin['year'], $admin['month']);
// pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -2292,7 +2292,7 @@ function process_81($connect, &$general) {
refreshNationStaticInfo();
}
pushHistory($history, $admin['year'], $admin['month']);
pushAllLog($alllog);
pushWorldHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
hwe/func_process_personnel.php
+13 -13
View File
@@ -168,7 +168,7 @@ function process_25($connect, &$general) {
}
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -422,7 +422,7 @@ function process_29($connect, &$general) {
$log = uniqueItem($connect, $general, $log);
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -535,7 +535,7 @@ function process_45($connect, &$general) {
$query = "update nation set totaltech=tech*'$gencount',gennum='$gennum',chemi='{$nation['chemi']}',gold=gold+'$gold',rice=rice+'$rice' where nation='{$general['nation']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -618,8 +618,8 @@ function process_46($connect, &$general) {
$log = uniqueItem($connect, $general, $log, 3);
}
pushHistory($history, $admin['year'], $admin['month']);
pushAllLog($alllog);
pushWorldHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -676,11 +676,11 @@ function process_47($connect, &$general) {
$query = "update diplomacy set state='2',term='0' where me='{$general['nation']}' or you='{$general['nation']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
refreshNationStaticInfo();
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -742,7 +742,7 @@ function process_54($connect, &$general) {
}
pushGenLog($general, $log);
pushGenLog($nextruler, $youlog);
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
}
function process_55($connect, &$general) {
@@ -826,8 +826,8 @@ function process_55($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
}
pushHistory($history, $admin['year'], $admin['month']);
pushAllLog($alllog);
pushWorldHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -875,7 +875,7 @@ function process_56($connect, &$general) {
refreshNationStaticInfo();
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -941,6 +941,6 @@ function process_57($connect, &$general) {
}
pushGenLog($general, $log);
pushGenLog($ruler, $youlog);
pushAllLog($alllog);
pushHistory($history, $admin['year'], $admin['month']);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
}
hwe/func_process_trick.php
+5 -5
View File
@@ -118,7 +118,7 @@ function process_32($connect, &$general) {
$log = checkAbility($connect, $general, $log);
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -266,7 +266,7 @@ function process_33($connect, &$general) {
$log = checkAbility($connect, $general, $log);
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -388,7 +388,7 @@ function process_34($connect, &$general) {
$log = checkAbility($connect, $general, $log);
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -512,7 +512,7 @@ function process_35($connect, &$general) {
$log = checkAbility($connect, $general, $log);
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
@@ -650,6 +650,6 @@ function process_36($connect, &$general) {
$log = checkAbility($connect, $general, $log);
}
pushAllLog($alllog);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushGenLog($general, $log);
}
hwe/func_time_event.php
+4 -4
View File
@@ -37,7 +37,7 @@ function processSpring($connect) {
$admin = MYDB_fetch_array($result);
$history[0] = "<R>★</>{$admin['year']}년 {$admin['month']}월: <S>모두들 즐거운 게임 하고 계신가요? ^^ <Y>삼국일보</> 애독해 주시고, <M>훼접</>은 삼가주세요~</>";
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
}
function processGoldIncome($connect) {
@@ -109,7 +109,7 @@ function processGoldIncome($connect) {
}
$history[0] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<W><b>【지급】</b></>봄이 되어 봉록에 따라 자금이 지급됩니다.";
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
pushAdminLog($adminLog);
}
@@ -401,7 +401,7 @@ function processRiceIncome($connect) {
}
$history[0] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<W><b>【지급】</b></>가을이 되어 봉록에 따라 군량이 지급됩니다.";
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
pushAdminLog($adminLog);
}
@@ -676,5 +676,5 @@ function disaster($connect) {
}
}
pushHistory($disaster, $admin['year'], $admin['month']);
pushWorldHistory($disaster, $admin['year'], $admin['month']);
}
hwe/func_tournament.php
+2 -2
View File
@@ -276,7 +276,7 @@ function startTournament($connect, $auto, $type) {
case 2: $history[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>일기토</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>용사</span>들을 모집하고 있습니다!"; break;
case 3: $history[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>설전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>책사</span>들을 모집하고 있습니다!"; break;
}
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
}
function fillLowGenAll($connect) {
@@ -646,7 +646,7 @@ function setGift($connect, $tnmt_type, $tnmt, $phase) {
$cost2 = $admin['develcost'] * 12;
$history[0] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>{$tp}</> 대회에서 <Y>{$general['name']}</>(이)가 <C>우승</>, <Y>{$general2['name']}</>(이)가 <C>준우승</>을 차지하여 천하에 이름을 떨칩니다!";
$history[1] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>{$tp}</> 대회의 <S>우승자</>에게는 <C>{$cost}</>, <S>준우승자</>에겐 <C>{$cost2}</>의 <S>상금</>과 약간의 <S>명성</>이 주어집니다!";
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
for($i=0; $i < count($genNo); $i++) {
$general['no'] = $genNo[$i];
hwe/index.php
+2 -2
View File
@@ -237,11 +237,11 @@ if(Session::getUserGrade() >= 5) {
<td width=498 align=center id=bg1><b>개인 기록</b></td>
</tr>
<tr>
<td width=498 ><?php AllLog(15); ?></td>
<td width=498 ><?php getGeneralPublicRecordRecent(15); ?></td>
<td width=498 ><?php MyLog($me['no'], 15); ?></td>
</tr>
<tr><td width=998 colspan=2 align=center id=bg1><b>중원 정세</b></td></tr>
<tr><td width=998 colspan=2><?php History(15); ?></td></tr>
<tr><td width=998 colspan=2><?php getWorldHistoryRecent(15); ?></td></tr>
</table>
<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 style=font-size:13px;word-break:break-all; id=bg0>
<tr>
hwe/join_post.php
+2 -2
View File
@@ -235,7 +235,7 @@ if($id_num) {
$log[1] = "<C>●</>{$admin['month']}월:<C>".getGenSpecial($special2)."</> 특기를 가진 <C>천재</>의 등장으로 온 천하가 떠들썩합니다.";
$history[0] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<L><b>【천재】</b></><G><b>{$cityname['name']}</b></>에 천재가 등장했습니다.";
pushHistory($history, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
} else {
$log[0] = "<C>●</>{$admin['month']}월:<G><b>{$cityname['name']}</b></>에서 <Y>{$me['name']}</>(이)라는 호걸이 천하에 이름을 알립니다.";
}
@@ -251,7 +251,7 @@ if($id_num) {
addHistory($me, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".getGenSpecial($special2)."</> 특기를 가진 천재로 탄생.");
}
pushGenLog($me, $mylog);
pushAllLog($log);
pushGeneralPublicRecord($log, $admin['year'], $admin['month']);
$adminLog[0] = "가입 : {$name} // {$me['name']} // {$id} // ".getenv("REMOTE_ADDR");
pushAdminLog($adminLog);
hwe/process_war.php
+9 -9
View File
@@ -113,8 +113,8 @@ function processWar($connect, $general, $city) {
$alllog[] = "<C>●</>{$game['month']}월:병량 부족으로 <G><b>{$city['name']}</b></>의 수비병들이 <R>패퇴</>합니다.";
$history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<M><b>【패퇴】</b></><D><b>{$destnation['name']}</b></>(이)가 병량 부족으로 <G><b>{$city['name']}</b></>(을)를 뺏기고 말았습니다.";
pushGenLog($general, $log);
pushAllLog($alllog);
pushHistory($history);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history);
unset($log);
unset($alllog);
unset($history);
@@ -482,8 +482,8 @@ function processWar($connect, $general, $city) {
pushGenLog($general, $log);
pushBatLog($general, $batlog);
pushBatRes($general, $batres);
pushAllLog($alllog);
pushHistory($history);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
unset($log);
unset($batlog);
unset($batres);
@@ -1495,8 +1495,8 @@ function processWar($connect, $general, $city) {
pushGenLog($general, $log);
pushBatLog($general, $batlog);
pushBatRes($general, $batres);
pushAllLog($alllog);
pushHistory($history);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history);
return $deadAmount;
}
@@ -1607,7 +1607,7 @@ function addConflict($connect, $city, $nationnum, $mykillnum) {
$nation = getNationStaticInfo($nationnum);
$history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<M><b>【분쟁】</b></><D><b>{$nation['name']}</b></>(이)가 <G><b>{$city['name']}</b></> 공략에 가담하여 분쟁이 발생하고 있습니다.";
pushHistory($history);
pushWorldHistory($history);
}
$nationlist[$i] = $nationnum;
@@ -1915,7 +1915,7 @@ function ConquerCity($connect, $game, $general, $city, $nation, $destnation) {
}
pushGenLog($general, $log);
pushAllLog($alllog);
pushHistory($history);
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history);
}
hwe/sammo/Scenario.php
+1 -1
View File
@@ -339,7 +339,7 @@ class Scenario{
pushHistory($this->history, $env['year'], $env['month']);
pushWorldHistory($this->history, $env['year'], $env['month']);
refreshNationStaticInfo();
foreach(getAllNationStaticInfo() as $nation){
hwe/sammo/Scenario/NPC.php
+1 -1
View File
@@ -85,7 +85,7 @@ class NPC{
$db = DB::db();
if($age == \sammo\GameConst::$adultAge && $month == 1){//FIXME: 14가 어디서 튀어나왔나?
\sammo\pushHistory(["<C>●</>1월:<Y>$name</>(이)가 성인이 되어 <S>등장</>했습니다."], $year, $month);
\sammo\pushWorldHistory(["<C>●</>1월:<Y>$name</>(이)가 성인이 되어 <S>등장</>했습니다."], $year, $month);
}
if($this->ego == null){
hwe/select_npc_post.php
+1 -1
View File
@@ -103,7 +103,7 @@ if($admin['npcmode'] != 1) {
$log[0] = "<C>●</>{$admin['month']}월:<Y>{$me['name']}</>의 육체에 <Y>{$member['name']}</>(이)가 <S>빙의</>됩니다!";
addHistory($me, "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y>{$me['name']}</>의 육체에 <Y>{$member['name']}</>(이)가 빙의되다.");
pushGenLog($me, $mylog);
pushAllLog($log);
pushGeneralPublicRecord($log, $admin['year'], $admin['month']);
$adminLog[0] = "가입 : {$me['name']} // {$id} // ".getenv("REMOTE_ADDR");
pushAdminLog($adminLog);
hwe/sql/reset.sql
+4 -1
View File
@@ -41,4 +41,7 @@ DROP TABLE IF EXISTS history;
DROP TABLE IF EXISTS event;
# 전체 이벤트 테이블 삭제(연감 대체?)
DROP TABLE IF EXISTS full_history;
DROP TABLE IF EXISTS world_history;
# 전체 이벤트 테이블 삭제(연감 대체?)
DROP TABLE IF EXISTS general_public_record;
hwe/sql/schema.sql
+14 -1
View File
@@ -609,7 +609,20 @@ ENGINE=InnoDB;
##전체 이벤트 기록 테이블
CREATE TABLE `full_history` (
CREATE TABLE `world_history` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`year` INT(4) NOT NULL,
`month` INT(2) NOT NULL,
`text` TEXT NOT NULL,
PRIMARY KEY (`id`),
INDEX `date` (`year`, `month`, `id`)
)
DEFAULT CHARSET=utf8mb4
ENGINE=InnoDB
;
##장수 동향 테이블
CREATE TABLE `general_public_record` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`year` INT(4) NOT NULL,
`month` INT(2) NOT NULL,