jyp9/core
1
0
Fork 0
forked from devsam/core
Code Pull Requests Activity

현재까지 작업 분량 반영

Browse Source
This commit is contained in:
Hide_D
2018-05-20 02:23:44 +09:00
parent fab0495a39
commit af9df325f0
13 changed files with 15 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/b_chiefcenter.php
+1 -3
View File
@@ -35,9 +35,7 @@ else { $btn = "hidden"; $btn2 = "hidden"; }
$date = date('Y-m-d H:i:s');
// 명령 목록
$query = "select year,month,turnterm from game limit 1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$admin = $gameStor->getValues(['year','month','turnterm']);
$query = "
select nation,level,
hwe/b_dipcenter.php
+2 -6
View File
@@ -68,9 +68,7 @@ if ($me['level'] >= 5) {
<td align=center class=bg1>비 고</td>
</tr>
<?php
$query = "select year,month from game limit 1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$admin = MYDB_fetch_array($result);
$admin = $gameStor->getValues(['year','month']);
$query = "select nation,name,color,power,gennum from nation order by power desc";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
@@ -187,9 +185,7 @@ $query = "select nation,name,color,type,msg,gold,rice,bill,rate,scout,war,scoutm
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$nation = MYDB_fetch_array($result);
$query = "select gold_rate,rice_rate from game limit 1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$admin = MYDB_fetch_array($result);
$admin = $gameStor->getValues(['gold_rate','rice_rate']);
// 금 수지
$deadIncome = getDeadIncome($nation['nation'], $nation['type'], $admin['gold_rate']);
hwe/b_diplomacy.php
-4
View File
@@ -13,10 +13,6 @@ $connect=$db->get();
increaseRefresh("중원정보", 1);
$query = "select turnterm from game limit 1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,nation from general where owner='{$userID}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
hwe/b_myKingdomInfo.php
+1 -3
View File
@@ -66,9 +66,7 @@ $query = "select sum(crew) as totcrew,sum(leader)*100 as maxcrew from general wh
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
$query = "select gold_rate,rice_rate from game limit 1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$admin = $gameStor->getValues(['gold_rate','rice_rate']);
// 금 수지
$deadIncome = getDeadIncome($nation['nation'], $nation['type'], $admin['gold_rate']);
hwe/b_myPage.php
+1 -1
View File
@@ -57,7 +57,7 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
], 'owner=%i', $userID);
if($me['npc'] == 1 && $detachNPC){
$turnterm = $db->queryFirstField('SELECT turnterm FROM game LIMIT 1');
$turnterm = $gameStor->turnterm;
if($turnterm < 10){
$targetKillTurn = 30 / $turnterm;
hwe/c_auction.php
+2 -4
View File
@@ -39,9 +39,7 @@ $connect=$db->get();
increaseRefresh("입찰", 1);
$query = "select turnterm from game limit 1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$admin = MYDB_fetch_array($result);
$turnterm = $gameStor->turnterm;
$query = "select no,name,gold,rice,special from general where owner='{$userID}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
@@ -57,7 +55,7 @@ $bidCount = MYDB_num_rows($result);
$btCount = $tradeCount + $bidCount;
$unit = $admin['turnterm'] * 60;
$unit = $turnterm * 60;
$amount = Util::round($amount / 10) * 10;
$cost = Util::round($cost / 10) * 10;
hwe/c_betting.php
+1 -1
View File
@@ -42,7 +42,7 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
increaseRefresh("베팅", 1);
$tournament = $db->queryFirstField('SELECT tournament FROM game LIMIT 1');
$tournament = $gameStor->tournament;
if($tournament != 6) {
header('Location: b_betting.php');
exit();
hwe/c_myBossInfo.php
+1 -3
View File
@@ -21,9 +21,7 @@ $db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env');
$connect=$db->get();
$query = "select startyear,year,month,scenario from game limit 1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$admin = $gameStor->getValues(['startyear','year','month','scenario']);
$query = "select no,nation,level from general where owner='{$userID}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
hwe/c_vacation.php
+2 -8
View File
@@ -9,16 +9,10 @@ $userID = Session::getUserID();
$db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env');
$connect=$db->get();
$query = "select killturn from game limit 1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$killturn = $gameStor->killturn;
$admin['killturn'] *= 3;
$query = "update general set killturn='{$admin['killturn']}' where owner='{$userID}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$db->update('general', ['killturn'=>$killturn*3], 'owner=%i', $userID);
header('location:b_myPage.php');
hwe/c_vote.php
+1 -5
View File
@@ -48,11 +48,7 @@ else if($btn == "댓글" && $comment != "") {
if($admin['votecomment'] != "") { $admin['votecomment'] .= "|"; }
$admin['votecomment'] .= "{$nation['name']}:{$me['name']}:{$comment}";
$query = "update game set votecomment='{$admin['votecomment']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gameStor->votecomment = $admin['votecomment'];
}
if($session->userGrade < 5){
hwe/commandlist.php
+1 -3
View File
@@ -74,9 +74,7 @@ function myCommandList() {
$date = date('Y-m-d H:i:s');
// 명령 목록
$query = "select year,month,turnterm from game limit 1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$admin = $gameStor->getValues(['year','month','turnterm']);
$query = "select no,turntime,term,turn0,turn1,turn2,turn3,turn4,turn5,turn6,turn7,turn8,turn9,turn10,turn11,turn12,turn13,turn14,turn15,turn16,turn17,turn18,turn19,turn20,turn21,turn22,turn23 from general where owner='{$userID}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
hwe/func_process_chief.php
+1 -1
View File
@@ -893,7 +893,7 @@ function process_64(&$general) {
$db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env');
$date = substr($general['turntime'],11,5);
list($year, $month, $turnterm) = $db->queryFirstList('SELECT year,month,turnterm FROM game LIMIT 1');
list($year, $month, $turnterm) = $gameStor->getValuesAsArray(['year','month','turnterm']);
if($general['level'] < 5 || $general['nation']==0) {
pushGenLog($general, ["<C>●</>{$month}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>"]);
hwe/process_war.php
+1 -3
View File
@@ -13,9 +13,7 @@ function processWar($general, $city) {
$date = substr($general['turntime'],11,5);
$query = "select * from game limit 1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$game_env = MYDB_fetch_array($result);
$game_env = $gameStor->getAll();
$year = $game_env['year'];
$month = $game_env['month'];