diff --git a/hwe/b_auction.php b/hwe/b_auction.php index f040eeb8..1be193b4 100644 --- a/hwe/b_auction.php +++ b/hwe/b_auction.php @@ -88,13 +88,12 @@ $count = MYDB_num_rows($result); $chk = 0; for ($i=0; $i < $count; $i++) { $auction = MYDB_fetch_array($result); - $itemname = GetStuffName($auction['stuff']); $radio = ""; $alert = ""; $alert2 = ""; if ($auction['no1'] == $me['no']) { $radio = " disabled"; - } elseif ($auction['no2'] > 0 && $auction['amount'] * 2 <= $auction['value'] && $auction['stuff'] == 0) { + } elseif ($auction['no2'] > 0 && $auction['amount'] * 2 <= $auction['value']) { $radio = " disabled"; $alert = ""; $alert2 = ""; @@ -108,15 +107,13 @@ for ($i=0; $i < $count; $i++) { } $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001; $pv = substr((string)$pv, 0, 4); - if ($auction['stuff'] != 0) { - $pv = '-'; - } + echo " {$auction['no']} {$auction['name1']} - {$itemname} + 쌀 {$auction['amount']} 금 {$auction['cost']} {$alert}금 {$auction['value']}{$alert2} @@ -143,9 +140,7 @@ for ($i=0; $i < $count; $i++) { 거래등록 　종료: 턴 후 - 　물품: + 　물품: 쌀 　판매량: 　시작가: 　즉구가: @@ -186,13 +181,12 @@ $count = MYDB_num_rows($result); $chk = 0; for ($i=0; $i < $count; $i++) { $auction = MYDB_fetch_array($result); - $itemname = GetStuffName($auction['stuff']); $radio = ""; $alert = ""; $alert2 = ""; if ($auction['no1'] == $me['no']) { $radio = " disabled"; - } elseif ($auction['no2'] > 0 && $auction['amount'] >= $auction['value'] * 2 && $auction['stuff'] == 0) { + } elseif ($auction['no2'] > 0 && $auction['amount'] >= $auction['value'] * 2) { $radio = " disabled"; $alert = ""; $alert2 = ""; @@ -206,15 +200,12 @@ for ($i=0; $i < $count; $i++) { } $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001; $pv = substr((string)$pv, 0, 4); - if ($auction['stuff'] != 0) { - $pv = '-'; - } echo " {$auction['no']} {$auction['name1']} - {$itemname} + 쌀 {$auction['amount']} 금 {$auction['cost']} {$alert}금 {$auction['value']}{$alert2} @@ -241,9 +232,7 @@ for ($i=0; $i < $count; $i++) { 거래등록 　종료: 턴 후 - 　물품: + 　물품: 쌀 　구입량: 　시작가: 　즉구가: diff --git a/hwe/c_auction.php b/hwe/c_auction.php index 0e41cb38..3c49ba74 100644 --- a/hwe/c_auction.php +++ b/hwe/c_auction.php @@ -11,7 +11,6 @@ $v->rule('integer', [ 'topv', 'value', 'term', - 'stuff', 'sel' ]); @@ -21,7 +20,6 @@ $cost = Util::getReq('cost', 'int'); $topv = Util::getReq('topv', 'int'); $value = Util::getReq('value', 'int'); $term = Util::getReq('term', 'int'); -$stuff = Util::getReq('stuff', 'int'); $sel = Util::getReq('sel', 'int'); $msg = ''; @@ -66,10 +64,6 @@ if ($session->userGrade >= 5) { } if ($btn == "판매") { - if ($stuff != 0) { - $msg = "ㆍ현재 쌀만 거래 가능합니다."; - $valid = 0; - } if ($term < 0 || $term > 24) { $msg = "ㆍ종료기한은 1 ~ 24 턴 이어야 합니다."; $valid = 0; @@ -101,7 +95,6 @@ if ($btn == "판매") { 'type'=>0, 'no1'=>$me['no'], 'name1'=>$me['name'], - 'stuff'=>$stuff, 'amount'=>$amount, 'cost'=>$cost, 'value'=>$cost, @@ -119,12 +112,6 @@ if ($btn == "판매") { $msg = "ㆍ종료된 거래입니다."; $valid = 0; } - /* - if($stuff != 0) { - $msg = "ㆍ현재 쌀만 거래 가능합니다."; - $valid = 0; - } - */ if ($auction['no2'] > 0 && $value <= $auction['value']) { $msg = "ㆍ현재판매가보다 높게 입찰해야 합니다."; $valid = 0; @@ -166,10 +153,6 @@ if ($btn == "판매") { ], 'no=%i', $sel); } } elseif ($btn == "구매") { - if ($stuff != 0) { - $msg2 = "ㆍ현재 쌀만 거래 가능합니다."; - $valid = 0; - } if ($term < 0 || $term > 24) { $msg2 = "ㆍ종료기한은 1 ~ 24 턴 이어야 합니다."; $valid = 0; @@ -202,7 +185,6 @@ if ($btn == "판매") { 'type'=>1, 'no1'=>$me['no'], 'name1'=>$me['name'], - 'stuff'=>$stuff, 'amount'=>$amount, 'cost'=>$cost, 'value'=>$cost, @@ -220,10 +202,6 @@ if ($btn == "판매") { $msg2 = "ㆍ종료된 거래입니다."; $valid = 0; } - if ($stuff != 0) { - $msg2 = "ㆍ현재 쌀만 거래 가능합니다."; - $valid = 0; - } if ($auction['no2'] > 0 && $value >= $auction['value']) { $msg2 = "ㆍ현재구매가보다 낮게 입찰해야 합니다."; $valid = 0; diff --git a/hwe/func_auction.php b/hwe/func_auction.php index 62b1f216..06719dfb 100644 --- a/hwe/func_auction.php +++ b/hwe/func_auction.php @@ -1,21 +1,6 @@ 20000) { $general['rice'] = 20000; } - $count = $db->queryFirstField('SELECT count(*) FROM auction WHERE type=0 AND stuff=0 AND no1=0'); + $count = $db->queryFirstField('SELECT count(*) FROM auction WHERE type=0 AND no1=0'); $count += 5; // 판매건 등록 if(rand()%$count == 0) { @@ -53,11 +38,11 @@ function registerAuction() { $term = 3 + rand() % 10; $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term); - $query = "insert into auction (type, no1, name1, stuff, amount, cost, value, topv, expire) values (0, '0', 'ⓝ상인', '0', '$amount', '$cost', '$cost', '$topv', '$date')"; + $query = "insert into auction (type, no1, name1, amount, cost, value, topv, expire) values (0, '0', 'ⓝ상인', '$amount', '$cost', '$cost', '$topv', '$date')"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } - $count = $db->queryFirstField('SELECT count(*) FROM auction WHERE type=1 AND stuff=0 AND no1=0'); + $count = $db->queryFirstField('SELECT count(*) FROM auction WHERE type=1 AND no1=0'); $count += 5; // 구매건 등록 if(rand()%$count == 0) { @@ -75,7 +60,7 @@ function registerAuction() { $term = 3 + rand() % 10; $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term); - $query = "insert into auction (type, no1, name1, stuff, amount, cost, value, topv, expire) values (1, '0', 'ⓝ상인', '0', '$amount', '$cost', '$cost', '$topv', '$date')"; + $query = "insert into auction (type, no1, name1, amount, cost, value, topv, expire) values (1, '0', 'ⓝ상인', '0', '$cost', '$cost', '$topv', '$date')"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } } @@ -106,42 +91,54 @@ function processAuction() { $josaYi1 = JosaUtil::pick($auction['name1'], '이'); $josaYi2 = JosaUtil::pick($auction['name2'], '이'); - // 유닉템 처리 - if($auction['stuff'] != 0) { - if($auction['no2'] == 0) { - $josaUl = JosaUtil::pick(GetStuffName($auction['stuff']), '을'); - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}{$josaYi1} ".GetStuffName($auction['stuff'])."{$josaUl} 판매, 그러나 입찰자 부재"; - pushAuctionLog($auctionLog); - } else { - $trader['no'] = 0; - $trader['name'] = 'ⓝ암시장상인'; - $trader['gold'] = 99999999; - $trader['rice'] = 99999999; - - $query = "select no,name,gold,rice from general where no='{$auction['no2']}'"; + // 쌀 처리 + if($auction['no2'] == 0) { + // 상인건수가 아닌것만 출력 + if($auction['no1'] != 0) { + $query = "select no from general where no='{$auction['no1']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $bidder = MYDB_fetch_array($result); + $trader = MYDB_fetch_array($result); - $sel1 = $auction['stuff'] % 10; - $sel2 = intdiv($auction['stuff'], 10); - switch($sel1) { - case 1: $type = "weap"; break; - case 2: $type = "book"; break; - case 3: $type = "horse"; break; - case 4: $type = "item"; break; + $traderLog[0] = "◆입찰자 부재로 {$auction['no']}번 거래 유찰!"; + if($auction['type'] == 0) { + $josaUlRice = JosaUtil::pick($auction['amount'], '을'); + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 판매, 그러나 입찰자 부재"; + } else { + $josaUlRice = JosaUtil::pick($auction['amount'], '을'); + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 유찰 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 구매, 그러나 입찰자 부재"; } - // 이미 유닉템이 풀렸는지 검사 - $query = "select no from general where {$type}='$sel2'"; + pushGenLog($trader, $traderLog); + pushAuctionLog($auctionLog); + } + } else { + if($auction['no1'] == 0) { + $trader['no'] = 0; + $trader['name'] = 'ⓝ상인'; + $trader['gold'] = 99999; + $trader['rice'] = 99999; + } else { + $query = "select no,name,gold,rice from general where no='{$auction['no1']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $count = MYDB_num_rows($result); + $trader = MYDB_fetch_array($result); + } - // 판매거래만 존재 - if($count > 0) { - $traderLog[0] = "◆{$auction['no']}번 거래 유찰! 이미 아이템을 누군가가 가로챘습니다!"; - $bidderLog[0] = "◆{$auction['no']}번 거래 유찰! 이미 아이템을 누군가가 가로챘습니다!"; - $josaUl = JosaUtil::pick(GetStuffName($auction['stuff']), '을'); + $query = "select no,name,gold,rice from general where no='{$auction['no2']}'"; + $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $bidder = MYDB_fetch_array($result); + //판매거래 + if($auction['type'] == 0) { + if($auction['amount'] > $trader['rice'] - 1000) { + $gold = Util::round($auction['value'] * 0.01); + $trader['gold'] -= $gold; + if($trader['gold'] < 0) $trader['gold'] = 0; + $query = "update general set gold='{$trader['gold']}' where no='{$auction['no1']}'"; + MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + + $josaUlRice = JosaUtil::pick($auction['amount'], '을'); $josaRo = JosaUtil::pick($auction['value'], '로'); - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}{$josaYi1} ".GetStuffName($auction['stuff'])."$josaUl 판매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 입찰, 그러나 아이템 이미 매진!"; + $traderLog[0] = "◆판매자의 군량 부족으로 {$auction['no']}번 거래 유찰! 벌금 {$gold}"; + $bidderLog[0] = "◆판매자의 군량 부족으로 {$auction['no']}번 거래 유찰!"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 판매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 입찰, 그러나 판매자 군량부족, 벌금 {$gold}"; } elseif($auction['value'] > $bidder['gold'] - 1000) { $gold = Util::round($auction['value'] * 0.01); $bidder['gold'] -= $gold; @@ -149,165 +146,82 @@ function processAuction() { $query = "update general set gold='{$bidder['gold']}' where no='{$auction['no2']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $traderLog[0] = "◆입찰자의 자금 부족으로 {$auction['no']}번 ".GetStuffName($auction['stuff'])." 거래 유찰!"; - $bidderLog[0] = "◆입찰자의 자금 부족으로 {$auction['no']}번 ".GetStuffName($auction['stuff'])." 거래 유찰! 벌금 {$gold}"; - $josaUl = JosaUtil::pick(GetStuffName($auction['stuff']), '을'); + $josaUlRice = JosaUtil::pick($auction['amount'], '을'); $josaRo = JosaUtil::pick($auction['value'], '로'); - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}{$josaYi1} ".GetStuffName($auction['stuff'])."$josaUl 판매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 입찰, 그러나 입찰자 자금부족, 벌금 {$gold}"; + $traderLog[0] = "◆입찰자의 자금 부족으로 {$auction['no']}번 거래 유찰!"; + $bidderLog[0] = "◆입찰자의 자금 부족으로 {$auction['no']}번 거래 유찰! 벌금 {$gold}"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 판매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 입찰, 그러나 입찰자 자금부족, 벌금 {$gold}"; } else { - $josaUl = JosaUtil::pick(GetStuffName($auction['stuff']), '을'); $josaUlGold = JosaUtil::pick($auction['value'], '을'); + $josaUlRice = JosaUtil::pick($auction['amount'], '을'); $josaRo = JosaUtil::pick($auction['value'], '로'); - $traderLog[0] = "◆{$auction['no']}번 거래 성사로 ".GetStuffName($auction['stuff'])."$josaUl 판매, 금 {$auction['value']}{$josaUlGold} 획득!"; - $bidderLog[0] = "◆{$auction['no']}번 거래 성사로 금 {$auction['value']}{$josaUlGold} 지불, ".GetStuffName($auction['stuff'])." 구입!"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 성사 : {$auction['name1']}{$josaYi1} ".GetStuffName($auction['stuff'])."$josaUl 판매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 구매"; - $auctionLog[0] .= " ★ 아이템 거래 ★"; - - $query = "update general set gold=gold-'{$auction['value']}',{$type}='$sel2' where no='{$auction['no2']}'"; + $traderLog[0] = "◆{$auction['no']}번 거래 성사로 쌀 {$auction['amount']}{$josaUlRice} 판매, 금 {$auction['value']}{$josaUlGold} 획득!"; + $bidderLog[0] = "◆{$auction['no']}번 거래 성사로 금 {$auction['value']}{$josaUlGold} 지불, 쌀 {$auction['amount']}{$josaUlRice} 구입!"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 성사 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 판매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 구매"; + if($auction['value'] >= $auction['amount'] * 2) { + $auctionLog[0] .= " ★ 최고가 거래 ★"; + } elseif($auction['value'] >= $auction['topv']) { + $auctionLog[0] .= " ★ 즉시구매가 거래 ★"; + } elseif($auction['value'] * 2 <= $auction['amount']) { + $auctionLog[0] .= " ★ 최저가 거래 ★"; + } + $query = "update general set gold=gold+'{$auction['value']}',rice=rice-'{$auction['amount']}' where no='{$auction['no1']}'"; + MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $query = "update general set gold=gold-'{$auction['value']}',rice=rice+'{$auction['amount']}' where no='{$auction['no2']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - - $alllog[0] = "●{$admin['month']}월:{$auction['name2']}{$josaYi2} ".GetStuffName($auction['stuff'])."$josaUl 구매했습니다!"; - $history[0] = "●{$admin['year']}년 {$admin['month']}월:【암시장】{$auction['name2']}{$josaYi2} ".GetStuffName($auction['stuff'])."$josaUl 구매했습니다!"; - pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']); - pushWorldHistory($history, $admin['year'], $admin['month']); } pushGenLog($trader, $traderLog); pushGenLog($bidder, $bidderLog); pushAuctionLog($auctionLog); - } - } else { - // 쌀 처리 - if($auction['no2'] == 0) { - // 상인건수가 아닌것만 출력 - if($auction['no1'] != 0) { - $query = "select no from general where no='{$auction['no1']}'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $trader = MYDB_fetch_array($result); - - $traderLog[0] = "◆입찰자 부재로 {$auction['no']}번 거래 유찰!"; - if($auction['type'] == 0) { - $josaUlRice = JosaUtil::pick($auction['amount'], '을'); - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 판매, 그러나 입찰자 부재"; - } else { - $josaUlRice = JosaUtil::pick($auction['amount'], '을'); - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 유찰 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 구매, 그러나 입찰자 부재"; - } - pushGenLog($trader, $traderLog); - pushAuctionLog($auctionLog); - } + //구매거래 } else { - if($auction['no1'] == 0) { - $trader['no'] = 0; - $trader['name'] = 'ⓝ상인'; - $trader['gold'] = 99999; - $trader['rice'] = 99999; + if($auction['amount'] > $bidder['rice'] - 1000) { + $gold = Util::round($auction['value'] * 0.01); + $bidder['gold'] -= $gold; + if($bidder['gold'] < 0) $bidder['gold'] = 0; + $query = "update general set gold='{$bidder['gold']}' where no='{$auction['no2']}'"; + MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + + $josaUlRice = JosaUtil::pick($auction['amount'], '을'); + $josaRo = JosaUtil::pick($auction['value'], '로'); + $traderLog[0] = "◆입찰자의 군량 부족으로 {$auction['no']}번 거래 유찰!"; + $bidderLog[0] = "◆입찰자의 군량 부족으로 {$auction['no']}번 거래 유찰! 벌금 {$gold}"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 유찰 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 구매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 입찰, 그러나 입찰자 군량부족, 벌금 {$gold}"; + } elseif($auction['value'] > $trader['gold'] - 1000) { + $gold = Util::round($auction['value'] * 0.01); + $trader['gold'] -= $gold; + if($trader['gold'] < 0) $trader['gold'] = 0; + $query = "update general set gold='{$trader['gold']}' where no='{$auction['no1']}'"; + MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + + $josaUlRice = JosaUtil::pick($auction['amount'], '을'); + $josaRo = JosaUtil::pick($auction['value'], '로'); + $traderLog[0] = "◆구매자의 자금 부족으로 {$auction['no']}번 거래 유찰! 벌금 {$gold}"; + $bidderLog[0] = "◆구매자의 자금 부족으로 {$auction['no']}번 거래 유찰!"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 유찰 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 구매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 입찰, 그러나 구매자 자금부족, 벌금 {$gold}"; } else { - $query = "select no,name,gold,rice from general where no='{$auction['no1']}'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $trader = MYDB_fetch_array($result); - } - - $query = "select no,name,gold,rice from general where no='{$auction['no2']}'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $bidder = MYDB_fetch_array($result); - //판매거래 - if($auction['type'] == 0) { - if($auction['amount'] > $trader['rice'] - 1000) { - $gold = Util::round($auction['value'] * 0.01); - $trader['gold'] -= $gold; - if($trader['gold'] < 0) $trader['gold'] = 0; - $query = "update general set gold='{$trader['gold']}' where no='{$auction['no1']}'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - - $josaUlRice = JosaUtil::pick($auction['amount'], '을'); - $josaRo = JosaUtil::pick($auction['value'], '로'); - $traderLog[0] = "◆판매자의 군량 부족으로 {$auction['no']}번 거래 유찰! 벌금 {$gold}"; - $bidderLog[0] = "◆판매자의 군량 부족으로 {$auction['no']}번 거래 유찰!"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 판매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 입찰, 그러나 판매자 군량부족, 벌금 {$gold}"; - } elseif($auction['value'] > $bidder['gold'] - 1000) { - $gold = Util::round($auction['value'] * 0.01); - $bidder['gold'] -= $gold; - if($bidder['gold'] < 0) $bidder['gold'] = 0; - $query = "update general set gold='{$bidder['gold']}' where no='{$auction['no2']}'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - - $josaUlRice = JosaUtil::pick($auction['amount'], '을'); - $josaRo = JosaUtil::pick($auction['value'], '로'); - $traderLog[0] = "◆입찰자의 자금 부족으로 {$auction['no']}번 거래 유찰!"; - $bidderLog[0] = "◆입찰자의 자금 부족으로 {$auction['no']}번 거래 유찰! 벌금 {$gold}"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 판매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 입찰, 그러나 입찰자 자금부족, 벌금 {$gold}"; - } else { - $josaUlGold = JosaUtil::pick($auction['value'], '을'); - $josaUlRice = JosaUtil::pick($auction['amount'], '을'); - $josaRo = JosaUtil::pick($auction['value'], '로'); - $traderLog[0] = "◆{$auction['no']}번 거래 성사로 쌀 {$auction['amount']}{$josaUlRice} 판매, 금 {$auction['value']}{$josaUlGold} 획득!"; - $bidderLog[0] = "◆{$auction['no']}번 거래 성사로 금 {$auction['value']}{$josaUlGold} 지불, 쌀 {$auction['amount']}{$josaUlRice} 구입!"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 성사 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 판매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 구매"; - if($auction['value'] >= $auction['amount'] * 2) { - $auctionLog[0] .= " ★ 최고가 거래 ★"; - } elseif($auction['value'] >= $auction['topv']) { - $auctionLog[0] .= " ★ 즉시구매가 거래 ★"; - } elseif($auction['value'] * 2 <= $auction['amount']) { - $auctionLog[0] .= " ★ 최저가 거래 ★"; - } - $query = "update general set gold=gold+'{$auction['value']}',rice=rice-'{$auction['amount']}' where no='{$auction['no1']}'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $query = "update general set gold=gold-'{$auction['value']}',rice=rice+'{$auction['amount']}' where no='{$auction['no2']}'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $josaUlGold = JosaUtil::pick($auction['value'], '을'); + $josaUlRice = JosaUtil::pick($auction['amount'], '을'); + $josaRo = JosaUtil::pick($auction['value'], '로'); + $traderLog[0] = "◆{$auction['no']}번 거래 성사로 금 {$auction['value']}{$josaUlGold} 지불, 쌀 {$auction['amount']}{$josaUlRice} 구입!"; + $bidderLog[0] = "◆{$auction['no']}번 거래 성사로 쌀 {$auction['amount']}{$josaUlRice} 판매, 금 {$auction['value']}{$josaUlGold} 획득!"; + $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 성사 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 구매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 판매"; + if($auction['value'] >= $auction['amount'] * 2) { + $auctionLog[0] .= " ★ 최고가 거래 ★"; + } elseif($auction['value'] * 2 <= $auction['amount']) { + $auctionLog[0] .= " ★ 최저가 거래 ★"; + } elseif($auction['value'] <= $auction['topv']) { + $auctionLog[0] .= " ★ 즉시구매가 거래 ★"; } - pushGenLog($trader, $traderLog); - pushGenLog($bidder, $bidderLog); - pushAuctionLog($auctionLog); - //구매거래 - } else { - if($auction['amount'] > $bidder['rice'] - 1000) { - $gold = Util::round($auction['value'] * 0.01); - $bidder['gold'] -= $gold; - if($bidder['gold'] < 0) $bidder['gold'] = 0; - $query = "update general set gold='{$bidder['gold']}' where no='{$auction['no2']}'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $josaUlRice = JosaUtil::pick($auction['amount'], '을'); - $josaRo = JosaUtil::pick($auction['value'], '로'); - $traderLog[0] = "◆입찰자의 군량 부족으로 {$auction['no']}번 거래 유찰!"; - $bidderLog[0] = "◆입찰자의 군량 부족으로 {$auction['no']}번 거래 유찰! 벌금 {$gold}"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 유찰 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 구매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 입찰, 그러나 입찰자 군량부족, 벌금 {$gold}"; - } elseif($auction['value'] > $trader['gold'] - 1000) { - $gold = Util::round($auction['value'] * 0.01); - $trader['gold'] -= $gold; - if($trader['gold'] < 0) $trader['gold'] = 0; - $query = "update general set gold='{$trader['gold']}' where no='{$auction['no1']}'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - - $josaUlRice = JosaUtil::pick($auction['amount'], '을'); - $josaRo = JosaUtil::pick($auction['value'], '로'); - $traderLog[0] = "◆구매자의 자금 부족으로 {$auction['no']}번 거래 유찰! 벌금 {$gold}"; - $bidderLog[0] = "◆구매자의 자금 부족으로 {$auction['no']}번 거래 유찰!"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 유찰 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 구매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 입찰, 그러나 구매자 자금부족, 벌금 {$gold}"; - } else { - $josaUlGold = JosaUtil::pick($auction['value'], '을'); - $josaUlRice = JosaUtil::pick($auction['amount'], '을'); - $josaRo = JosaUtil::pick($auction['value'], '로'); - $traderLog[0] = "◆{$auction['no']}번 거래 성사로 금 {$auction['value']}{$josaUlGold} 지불, 쌀 {$auction['amount']}{$josaUlRice} 구입!"; - $bidderLog[0] = "◆{$auction['no']}번 거래 성사로 쌀 {$auction['amount']}{$josaUlRice} 판매, 금 {$auction['value']}{$josaUlGold} 획득!"; - $auctionLog[0] = "◆{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매 성사 : {$auction['name1']}{$josaYi1} 쌀 {$auction['amount']}{$josaUlRice} 구매, {$auction['name2']}{$josaYi2} 금 {$auction['value']}{$josaRo} 판매"; - if($auction['value'] >= $auction['amount'] * 2) { - $auctionLog[0] .= " ★ 최고가 거래 ★"; - } elseif($auction['value'] * 2 <= $auction['amount']) { - $auctionLog[0] .= " ★ 최저가 거래 ★"; - } elseif($auction['value'] <= $auction['topv']) { - $auctionLog[0] .= " ★ 즉시구매가 거래 ★"; - } - - $query = "update general set gold=gold-'{$auction['value']}',rice=rice+'{$auction['amount']}' where no='{$auction['no1']}'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $query = "update general set gold=gold+'{$auction['value']}',rice=rice-'{$auction['amount']}' where no='{$auction['no2']}'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - } - pushGenLog($trader, $traderLog); - pushGenLog($bidder, $bidderLog); - pushAuctionLog($auctionLog); + $query = "update general set gold=gold-'{$auction['value']}',rice=rice+'{$auction['amount']}' where no='{$auction['no1']}'"; + MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $query = "update general set gold=gold+'{$auction['value']}',rice=rice-'{$auction['amount']}' where no='{$auction['no2']}'"; + MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } + pushGenLog($trader, $traderLog); + pushGenLog($bidder, $bidderLog); + pushAuctionLog($auctionLog); } } } diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql index 3e18686c..1bf390ea 100644 --- a/hwe/sql/schema.sql +++ b/hwe/sql/schema.sql @@ -506,7 +506,6 @@ create table auction ( type int(6) default 0, no1 int(6) default 0, name1 char(64) default '-', - stuff int(6) default 0, amount int(6) default 0, cost int(6) default 0, value int(6) default 0,