Merge pull request #102 from hikawiier/waaagh

Add rooms

Merge pull request #102 from hikawiier/waaagh
Add rooms
91ce4ec7 · Nemo Ma · GitHub · 7b0452a0 · 72f2017d · 91ce4ec7
Commit 91ce4ec7 authored Apr 01, 2023 by Nemo Ma Committed by GitHub Apr 01, 2023
49 changed files
--- a/admin.php
+++ b/admin.php
@@ -24,7 +24,7 @@ $admin_cmd_list = Array(
 );

 if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); }
-$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$cuser'");
+$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
 if(!$db->num_rows($result)) { gexit($_ERROR['login_check'],__file__,__line__); }
 $udata = $db->fetch_array($result);
 if($udata['password'] != $cpass) { gexit($_ERROR['wrong_pw'], __file__, __line__); }

--- a/alive.php
+++ b/alive.php
@@ -8,9 +8,9 @@ require './include/game/special.func.php';
 //unset($_GET);

 if(!isset($alivemode) || $alivemode == 'last'){
-	$result = $db->query("SELECT * FROM {$tablepre}users RIGHT JOIN {$tablepre}players ON {$tablepre}players.name={$tablepre}users.username WHERE {$tablepre}players.type=0 AND {$tablepre}players.hp>0 ORDER BY {$tablepre}players.money DESC, {$tablepre}players.killnum DESC LIMIT $alivelimit");
+	$result = $db->query("SELECT * FROM {$gtablepre}users RIGHT JOIN {$tablepre}players ON {$tablepre}players.name={$gtablepre}users.username WHERE {$tablepre}players.type=0 AND {$tablepre}players.hp>0 ORDER BY {$tablepre}players.money DESC, {$tablepre}players.killnum DESC LIMIT $alivelimit");
 }elseif($alivemode == 'all'){
-	$result = $db->query("SELECT * FROM {$tablepre}users RIGHT JOIN {$tablepre}players ON {$tablepre}players.name={$tablepre}users.username WHERE {$tablepre}players.type=0 AND {$tablepre}players.hp>0 ORDER BY {$tablepre}players.money DESC, {$tablepre}players.killnum DESC");
+	$result = $db->query("SELECT * FROM {$gtablepre}users RIGHT JOIN {$tablepre}players ON {$tablepre}players.name={$gtablepre}users.username WHERE {$tablepre}players.type=0 AND {$tablepre}players.hp>0 ORDER BY {$tablepre}players.money DESC, {$tablepre}players.killnum DESC");
 }else{
 	echo 'error';
 	exit();
@@ -24,7 +24,7 @@ while($apdata = $db->fetch_array($result)) {
 	} else{
 		$apdata['apm'] = 0;
 	}
-	//	$result3 = $db->query("SELECT motto FROM {$tablepre}users WHERE username = '".$apdata['name']."'");
+	//	$result3 = $db->query("SELECT motto FROM {$gtablepre}users WHERE username = '".$apdata['name']."'");
 //	$apdata['motto'] = $db->result($result3, 0);

 	$alivedata[$apdata['pid']] = $apdata;
@@ -70,7 +70,7 @@ if($gamblingon){
 		elseif($gbpool >= 8000 && $wager>50) { $gbinfo .= '本局总奖池已经超过8000切糕上限，此时每人最多只能下注50切糕！'; }
 		else
 		{
-			$uresult = $db->query("SELECT * FROM {$tablepre}users WHERE username='$cuser'");
+			$uresult = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
 			if(!$db->num_rows($uresult)) 
 			{ 
 				$gbinfo .= $_ERROR['login_check']; 
@@ -93,7 +93,7 @@ if($gamblingon){
 							$gbinfo .= '选择对象有误，请检查输入。<br>'; 
 							goto gb_result;
 						}
-						$bresult = $db->query("SELECT * FROM {$tablepre}players LEFT JOIN {$tablepre}users ON {$tablepre}players.name={$tablepre}users.username WHERE {$tablepre}players.pid='$bet'");
+						$bresult = $db->query("SELECT * FROM {$tablepre}players LEFT JOIN {$gtablepre}users ON {$tablepre}players.name={$gtablepre}users.username WHERE {$tablepre}players.pid='$bet'");
 						if(!$db->num_rows($bresult)) 
 						{ 
 							$gbinfo .= '选择的对象不存在。<br>'; 
@@ -160,7 +160,7 @@ if($gamblingon){
 							//扣除切糕
 							$cost_credits2 = round($iteminfo['price']*$bnum/$credits2_values);
 							$credits2 -= $cost_credits2;
-							$db->query("UPDATE {$tablepre}users SET credits2='$credits2' WHERE uid='$uid'");
+							$db->query("UPDATE {$gtablepre}users SET credits2='$credits2' WHERE uid='$uid'");
 							//发news
 							$gbinfo .= "花费{$cost_credits2}切糕购买了{$bnum}份{$iteminfo['item']}。<br>";
 							addnews($now,'gpost',$sponsor_title.' '.$udata['username'],$iteminfo['item'],$bdata['nick'].' '.$bdata['name'],$bdata['pls'],$bnum);
@@ -209,7 +209,7 @@ if($gamblingon){
 												//$alivedata[$bet]['odds'] = podds($alivedata[$bet]);
 											}
 											
-											$db->query("UPDATE {$tablepre}users SET credits2='$credits2' WHERE uid='$uid'");
+											$db->query("UPDATE {$gtablepre}users SET credits2='$credits2' WHERE uid='$uid'");
 										}else{$gbinfo .= '数据库错误，请联系管理员。';}									
 									}
 								}else{//未下注
@@ -229,7 +229,7 @@ if($gamblingon){
 											//$alivedata[$bet]['odds'] = podds($alivedata[$bet]);
 										}
 										
-										$db->query("UPDATE {$tablepre}users SET credits2='$credits2' WHERE uid='$uid'");
+										$db->query("UPDATE {$gtablepre}users SET credits2='$credits2' WHERE uid='$uid'");
 									}else{$gbinfo .= '数据库错误，请联系管理员。';}
 								}
 							}

--- a/chat.php
+++ b/chat.php
@@ -13,7 +13,7 @@ if(($sendmode == 'send')&&$chatmsg) {
 	$result = $db->query("SELECT pid FROM {$tablepre}players WHERE name='$cuser' AND type='0'");
 	if(!$db->num_rows($result)) exit('Not in game.');
 	if(strpos($chatmsg,'/') === 0) {
-		$result = $db->query("SELECT groupid FROM {$tablepre}users WHERE username='$cuser'");
+		$result = $db->query("SELECT groupid FROM {$gtablepre}users WHERE username='$cuser'");
 		$groupid = $db->result($result);
 		if($groupid > 1) {
 			if(strpos($chatmsg,'/post') === 0) {

--- a/clear.php
+++ b/clear.php
@@ -41,10 +41,10 @@ echo 'a';
 //include GAME_ROOT.'./gamedata/gameinfo.php';
 echo $q.'<br>';
 //echo $db->query($q);
-$q = "UPDATE {$tablepre}users SET achievement='' WHERE uid>0";
+$q = "UPDATE {$gtablepre}users SET achievement='' WHERE uid>0";
 echo $db->query($q);
-$q = "ALTER TABLE {$tablepre}users ADD titles text NOT NULL default '' AFTER achievement";
+$q = "ALTER TABLE {$gtablepre}users ADD titles text NOT NULL default '' AFTER achievement";
 //echo $db->query($q);
-$q = "ALTER TABLE {$tablepre}users ADD title text NOT NULL default '' AFTER title";
+$q = "ALTER TABLE {$gtablepre}users ADD title text NOT NULL default '' AFTER title";
 //echo $db->query($q);
 ?>
\ No newline at end of file
--- a/command.php
+++ b/command.php
@@ -19,7 +19,7 @@ if(!$pdata) { header("Location: valid.php");exit(); }

 //判断是否密码错误
 if($pdata['pass'] != $cpass) {
-	$tr = $db->query("SELECT `password` FROM {$tablepre}users WHERE username='$cuser'");
+	$tr = $db->query("SELECT `password` FROM {$gtablepre}users WHERE username='$cuser'");
 	$tp = $db->fetch_array($tr);
 	$password = $tp['password'];
 	if($password == $cpass) {

--- a/dbup.php
+++ b/dbup.php
@@ -5,7 +5,7 @@ define('CURSCRIPT', 'dbup');
 require './include/common.inc.php';

 if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); }
-$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$cuser'");
+$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
 if(!$db->num_rows($result)) { gexit($_ERROR['login_check'],__file__,__line__); }
 $udata = $db->fetch_array($result);
 if($udata['password'] != $cpass) { gexit($_ERROR['wrong_pw'], __file__, __line__); }
@@ -48,144 +48,162 @@ require config('resources',$gamecfg);
 require config('gamecfg',$gamecfg);*/

 //include GAME_ROOT.'./gamedata/gameinfo.php';
-/*$q = "ALTER TABLE {$tablepre}winners ADD killnum2 smallint unsigned NOT NULL default 0 AFTER killnum";
+/*$q = "ALTER TABLE {$gtablepre}winners ADD killnum2 smallint unsigned NOT NULL default 0 AFTER killnum";
 echo $q.'<br>';
 echo $db->query($q);
-$q = "ALTER TABLE {$tablepre}users ADD credits2 mediumint NOT NULL default 0 AFTER credits";
+$q = "ALTER TABLE {$gtablepre}users ADD credits2 mediumint NOT NULL default 0 AFTER credits";
 echo $q.'<br>';
 echo $db->query($q);*/

 //winner表新增字段
-$result = $db->query("DESCRIBE {$tablepre}winners nick");
-if(!$db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}winners ADD nick text not null AFTER type");
-$result = $db->query("DESCRIBE {$tablepre}winners ss");
-if(!$db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}winners ADD ss mediumint unsigned NOT NULL default '0' AFTER msp");
-$result = $db->query("DESCRIBE {$tablepre}winners mss");
-if(!$db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}winners ADD mss smallint unsigned NOT NULL default '0' AFTER ss");
-$result = $db->query("DESCRIBE {$tablepre}winners skillpoint");
-if(!$db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}winners ADD skillpoint smallint unsigned NOT NULL default '0' AFTER nick");
-$result = $db->query("DESCRIBE {$tablepre}winners teamMate");
-if(!$db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}winners ADD teamMate text NOT NULL default '' AFTER teamPass");
-$result = $db->query("DESCRIBE {$tablepre}winners teamIcon");
-if(!$db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}winners ADD teamIcon smallint unsigned NOT NULL default '0' AFTER teamMate");
-$result = $db->query("DESCRIBE {$tablepre}winners clbpara");
-if(!$db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}winners ADD clbpara text NOT NULL AFTER teamMate");
+$result = $db->query("DESCRIBE {$gtablepre}winners nick");
+if(!$db->num_rows($result)) $db->query("ALTER TABLE {$gtablepre}winners ADD nick text not null AFTER type");
+$result = $db->query("DESCRIBE {$gtablepre}winners ss");
+if(!$db->num_rows($result)) $db->query("ALTER TABLE {$gtablepre}winners ADD ss mediumint unsigned NOT NULL default '0' AFTER msp");
+$result = $db->query("DESCRIBE {$gtablepre}winners mss");
+if(!$db->num_rows($result)) $db->query("ALTER TABLE {$gtablepre}winners ADD mss smallint unsigned NOT NULL default '0' AFTER ss");
+$result = $db->query("DESCRIBE {$gtablepre}winners skillpoint");
+if(!$db->num_rows($result)) $db->query("ALTER TABLE {$gtablepre}winners ADD skillpoint smallint unsigned NOT NULL default '0' AFTER nick");
+$result = $db->query("DESCRIBE {$gtablepre}winners teamMate");
+if(!$db->num_rows($result)) $db->query("ALTER TABLE {$gtablepre}winners ADD teamMate text NOT NULL default '' AFTER teamPass");
+$result = $db->query("DESCRIBE {$gtablepre}winners teamIcon");
+if(!$db->num_rows($result)) $db->query("ALTER TABLE {$gtablepre}winners ADD teamIcon smallint unsigned NOT NULL default '0' AFTER teamMate");
+$result = $db->query("DESCRIBE {$gtablepre}winners clbpara");
+if(!$db->num_rows($result)) $db->query("ALTER TABLE {$gtablepre}winners ADD clbpara text NOT NULL AFTER teamMate");

 //以下内容均为chatGPT生成，让我们对新时代的赛博苦力致以敬意：
-$db->query("ALTER TABLE {$tablepre}winners MODIFY wep char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY wepk char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY wepe int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY weps char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY wepsk char(40) NOT NULL default ''");
-
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arb char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arbk char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arbe int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arbs char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arbsk char(40) NOT NULL default ''");
-
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arh char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arhk char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arhe int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arhs char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arhsk char(40) NOT NULL default ''");
-
-$db->query("ALTER TABLE {$tablepre}winners MODIFY ara char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arak char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arae int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY aras char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arask char(40) NOT NULL default ''");
-
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arf char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arfk char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arfe int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arfs char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arfsk char(40) NOT NULL default ''");
-
-$db->query("ALTER TABLE {$tablepre}winners MODIFY art char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY artk char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arte int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY arts char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY artsk char(40) NOT NULL default ''");
-
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itm0 char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmk0 char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itme0 int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itms0 char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmsk0 char(40) NOT NULL default ''");
-
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itm1 char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmk1 char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itme1 int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itms1 char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmsk1 char(40) NOT NULL default ''");
-
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itm2 char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmk2 char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itme2 int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itms2 char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmsk2 char(40) NOT NULL default ''");
-
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itm3 char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmk3 char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itme3 int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itms3 char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmsk3 char(40) NOT NULL default ''");
-
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itm4 char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmk4 char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itme4 int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itms4 char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmsk4 char(40) NOT NULL default ''");
-
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itm5 char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmk5 char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itme5 int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itms5 char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmsk5 char(40) NOT NULL default ''");
-
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itm6 char(30) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmk6 char(40) NOT NULL default ''");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itme6 int(10) unsigned NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itms6 char(10) NOT NULL DEFAULT '0'");
-$db->query("ALTER TABLE {$tablepre}winners MODIFY itmsk6 char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY wep char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY wepk char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY wepe int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY weps char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY wepsk char(40) NOT NULL default ''");
+
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arb char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arbk char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arbe int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arbs char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arbsk char(40) NOT NULL default ''");
+
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arh char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arhk char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arhe int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arhs char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arhsk char(40) NOT NULL default ''");
+
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY ara char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arak char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arae int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY aras char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arask char(40) NOT NULL default ''");
+
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arf char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arfk char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arfe int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arfs char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arfsk char(40) NOT NULL default ''");
+
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY art char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY artk char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arte int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY arts char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY artsk char(40) NOT NULL default ''");
+
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itm0 char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmk0 char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itme0 int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itms0 char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmsk0 char(40) NOT NULL default ''");
+
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itm1 char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmk1 char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itme1 int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itms1 char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmsk1 char(40) NOT NULL default ''");
+
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itm2 char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmk2 char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itme2 int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itms2 char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmsk2 char(40) NOT NULL default ''");
+
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itm3 char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmk3 char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itme3 int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itms3 char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmsk3 char(40) NOT NULL default ''");
+
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itm4 char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmk4 char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itme4 int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itms4 char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmsk4 char(40) NOT NULL default ''");
+
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itm5 char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmk5 char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itme5 int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itms5 char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmsk5 char(40) NOT NULL default ''");
+
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itm6 char(30) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmk6 char(40) NOT NULL default ''");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itme6 int(10) unsigned NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itms6 char(10) NOT NULL DEFAULT '0'");
+$db->query("ALTER TABLE {$gtablepre}winners MODIFY itmsk6 char(40) NOT NULL default ''");


 //user表结构变动
-$result = $db->query("DESCRIBE {$tablepre}users volume");
-if($db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}users DROP volume");
-$result = $db->query("DESCRIBE {$tablepre}users achrev");
-if(!$db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}users ADD achrev text NOT NULL default '' AFTER achievement");
-$result = $db->query("DESCRIBE {$tablepre}users daily");
-if(!$db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}users ADD daily varchar(255) NOT NULL DEFAULT '' AFTER achrev");
+$result = $db->query("DESCRIBE {$gtablepre}users volume");
+if($db->num_rows($result)) $db->query("ALTER TABLE {$gtablepre}users DROP volume");
+$result = $db->query("DESCRIBE {$gtablepre}users achrev");
+if(!$db->num_rows($result)) $db->query("ALTER TABLE {$gtablepre}users ADD achrev text NOT NULL default '' AFTER achievement");
+$result = $db->query("DESCRIBE {$gtablepre}users daily");
+if(!$db->num_rows($result)) $db->query("ALTER TABLE {$gtablepre}users ADD daily varchar(255) NOT NULL DEFAULT '' AFTER achrev");
+$result = $db->query("DESCRIBE {$gtablepre}users roomid");
+if(!$db->num_rows($result))
+{
+	$db->query("ALTER TABLE {$gtablepre}users ADD roomid tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER groupid");
+	echo "向users表中添加了字段roomid<br>";
+}

 //game表结构变动
-$db->query("ALTER TABLE {$tablepre}game DROP gamevars");
-$db->query("ALTER TABLE {$tablepre}game ADD gamevars text NOT NULL AFTER combonum");
-$result = $db->query("DESCRIBE {$tablepre}game lastupdate");
+$db->query("ALTER TABLE {$gtablepre}game DROP gamevars");
+$db->query("ALTER TABLE {$gtablepre}game ADD gamevars text NOT NULL AFTER combonum");
+$result = $db->query("DESCRIBE {$gtablepre}game lastupdate");
 if($db->num_rows($result))
 {
-	$db->query("ALTER TABLE {$tablepre}game DROP lastupdate");
+	$db->query("ALTER TABLE {$gtablepre}game DROP lastupdate");
 	echo "从game表中删去了字段lastupdate<br>";
 }
-$result = $db->query("DESCRIBE {$tablepre}game hdamage");
+$result = $db->query("DESCRIBE {$gtablepre}game hdamage");
 if(!$db->num_rows($result))
 {
-	$db->query("ALTER TABLE {$tablepre}game ADD hdamage int(10) unsigned NOT NULL DEFAULT '0' AFTER hack");
+	$db->query("ALTER TABLE {$gtablepre}game ADD hdamage int(10) unsigned NOT NULL DEFAULT '0' AFTER hack");
 	echo "向game表中添加了字段hdamage<br>";
 }
-$result = $db->query("DESCRIBE {$tablepre}game hplayer");
+$result = $db->query("DESCRIBE {$gtablepre}game hplayer");
 if(!$db->num_rows($result))
 {
-	$db->query("ALTER TABLE {$tablepre}game ADD hplayer char(15) NOT NULL DEFAULT '' AFTER hdamage");
+	$db->query("ALTER TABLE {$gtablepre}game ADD hplayer char(15) NOT NULL DEFAULT '' AFTER hdamage");
 	echo "向game表中添加了字段hplayer<br>";
 }
-$result = $db->query("DESCRIBE {$tablepre}game noisevars");
+$result = $db->query("DESCRIBE {$gtablepre}game noisevars");
 if(!$db->num_rows($result))
 {
-	$db->query("ALTER TABLE {$tablepre}game ADD noisevars varchar(1000) NOT NULL DEFAULT '' AFTER gamevars");
+	$db->query("ALTER TABLE {$gtablepre}game ADD noisevars varchar(1000) NOT NULL DEFAULT '' AFTER gamevars");
 	echo "向game表中添加了字段noisevars<br>";
 }
+$result = $db->query("DESCRIBE {$gtablepre}game groomid");
+if(!$db->num_rows($result))
+{
+	$db->query("ALTER TABLE {$gtablepre}game ADD groomid tinyint(3) unsigned NOT NULL DEFAULT '0' '' AFTER gamestate");
+	echo "向game表中添加了字段groomid<br>";
+}
+$result = $db->query("DESCRIBE {$gtablepre}game groomnums");
+if(!$db->num_rows($result))
+{
+	$db->query("ALTER TABLE {$gtablepre}game ADD groomnums tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER groomid");
+	echo "向game表中添加了字段groomnums<br>";
+}

 echo "Update Fish.<br>";
 ?>
\ No newline at end of file
--- a/end.php
+++ b/end.php
@@ -10,7 +10,7 @@ if(!$db->num_rows($result)) { header("Location: index.php");exit(); }

 $pdata = $db->fetch_array($result);
 if($pdata['pass'] != $cpass) {
-	$tr = $db->query("SELECT `password` FROM {$tablepre}users WHERE username='$cuser'");
+	$tr = $db->query("SELECT `password` FROM {$gtablepre}users WHERE username='$cuser'");
 	$tp = $db->fetch_array($tr);
 	$password = $tp['password'];
 	if($password == $cpass) {
@@ -24,7 +24,7 @@ extract($pdata);
 init_playerdata();

 if($hp<=0 || $state>=10) {
-	$result = $db->query("SELECT lastword FROM {$tablepre}users WHERE username='$name'");
+	$result = $db->query("SELECT lastword FROM {$gtablepre}users WHERE username='$name'");
 	$motto = $db->result($result,0);
 	$dtime = date("Y年m月d日H时i分s秒",$endtime);
 	if($bid) {

--- a/gambling.php
+++ b/gambling.php
@@ -9,7 +9,7 @@ if(!$cuser||!$cpass) { $gbinfo .= $_ERROR['no_login']; }
 elseif($gamestate < 20) { $gbinfo .= $_ERROR['no_start']; }
 elseif($gamestate < 30) { $gbinfo .= '游戏还未停止激活，不可进行下注！'; }
 else{
-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$cuser'");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
 	if(!$db->num_rows($result)) { $gbinfo .= $_ERROR['login_check']; }
 	$udata = $db->fetch_array($result);
 	if($udata['password'] != $cpass) { $gbinfo .= $_ERROR['wrong_pw']; }

--- a/game.php
+++ b/game.php
@@ -20,7 +20,7 @@ if(!$pdata) { header("Location: valid.php");exit(); }

 //$pdata = $db->fetch_array($result);
 if($pdata['pass'] != $cpass) {
-	$tr = $db->query("SELECT `password` FROM {$tablepre}users WHERE username='$cuser'");
+	$tr = $db->query("SELECT `password` FROM {$gtablepre}users WHERE username='$cuser'");
 	$tp = $db->fetch_array($tr);
 	$password = $tp['password'];
 	if($password == $cpass) {

--- a/gamedata/cache/gamecfg_1.php
+++ b/gamedata/cache/gamecfg_1.php
@@ -163,4 +163,7 @@ $no_self_sponsored = 0;
 //游戏新开局时向场内投入的bot数量
 $rsgame_bots = 4;

+//房间数量上限
+$max_rooms = 3;
+
 ?>
--- a/gamedata/cache/style_20190718.css
+++ b/gamedata/cache/style_20190718.css
@@ -75,6 +75,20 @@ table.dialogue {
 	border-color: rgba(196, 196, 196, 0.8);
 }

+table.infotable {
+	float: left;
+	margin-top: 10px;
+	position:relative;
+	text-align: center;
+	border-radius: 3px; 
+	border:2px solid rgba(225, 124, 226, 0.25);
+}
+table.infotable td,
+table.infotable th {
+	text-align: center;
+	border:1px solid rgba(225, 124, 226, 0.4);
+}
+
 .typewriter {
 	color: #fff;
 	overflow: hidden; /* Ensures the content is not revealed until the animation */

--- a/gamedata/sql/all.sql
+++ b/gamedata/sql/all.sql
@@ -62,6 +62,8 @@ DROP TABLE IF EXISTS `acbra2_game`;
 CREATE TABLE `acbra2_game` (
  `gamenum` mediumint(8) unsigned NOT NULL DEFAULT '0',
  `gamestate` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `groomid` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `groomnums` tinyint(3) unsigned NOT NULL DEFAULT '0',
  `starttime` int(10) unsigned NOT NULL DEFAULT '0',
  `winmode` tinyint(3) unsigned NOT NULL DEFAULT '0',
  `winner` char(15) NOT NULL DEFAULT '',
@@ -85,7 +87,7 @@ CREATE TABLE `acbra2_game` (
  `bdown` tinyint(1) unsigned NOT NULL DEFAULT '0',
  `ldown` tinyint(1) unsigned NOT NULL DEFAULT '0',
  `kdown` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`gamenum`)
+  PRIMARY KEY (`groomid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;

@@ -363,6 +365,7 @@ CREATE TABLE `acbra2_users` (
  `username` char(15) NOT NULL DEFAULT '',
  `password` char(32) NOT NULL DEFAULT '',
  `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `roomid` tinyint(3) unsigned NOT NULL DEFAULT '0',
  `lastgame` smallint(5) unsigned NOT NULL DEFAULT '0',
  `ip` char(15) NOT NULL DEFAULT '',
  `credits` int(10) NOT NULL DEFAULT '0',

--- a/include/admin/gamecheck.php
+++ b/include/admin/gamecheck.php
@@ -27,19 +27,19 @@ if($gamestate >= 20){
 	$cmd_info = "当前游戏未开始！";
 }

-//$db->query("ALTER TABLE {$tablepre}winners ADD itmsk6 char(5) not null default '' AFTER itmsk5");
-//$db->query("ALTER TABLE {$tablepre}winners ADD itms6 char(5) not null default '0' AFTER itmsk5");
-//$db->query("ALTER TABLE {$tablepre}winners ADD itme6 mediumint unsigned NOT NULL default '0' AFTER itmsk5");
-//$db->query("ALTER TABLE {$tablepre}winners ADD itmk6 char(5) not null default '' AFTER itmsk5");
-//$db->query("ALTER TABLE {$tablepre}winners ADD itm6 CHAR( 30 ) NOT NULL default '' AFTER itmsk5");
-//$db->query("ALTER TABLE {$tablepre}winners CHANGE itme0 itme0 mediumint unsigned NOT NULL default '0'");
-//$db->query("ALTER TABLE {$tablepre}winners CHANGE itme1 itme1 mediumint unsigned NOT NULL default '0'");
-//$db->query("ALTER TABLE {$tablepre}winners CHANGE itme2 itme2 mediumint unsigned NOT NULL default '0'");
-//$db->query("ALTER TABLE {$tablepre}winners CHANGE itme3 itme3 mediumint unsigned NOT NULL default '0'");
-//$db->query("ALTER TABLE {$tablepre}winners CHANGE itme4 itme4 mediumint unsigned NOT NULL default '0'");
-//$db->query("ALTER TABLE {$tablepre}winners CHANGE itme5 itme5 mediumint unsigned NOT NULL default '0'");
-//$db->query("ALTER TABLE {$tablepre}users ADD validgames smallint unsigned NOT NULL default '0' AFTER credits");
-//$db->query("ALTER TABLE {$tablepre}users ADD wingames smallint unsigned NOT NULL default '0' AFTER validgames");
+//$db->query("ALTER TABLE {$gtablepre}winners ADD itmsk6 char(5) not null default '' AFTER itmsk5");
+//$db->query("ALTER TABLE {$gtablepre}winners ADD itms6 char(5) not null default '0' AFTER itmsk5");
+//$db->query("ALTER TABLE {$gtablepre}winners ADD itme6 mediumint unsigned NOT NULL default '0' AFTER itmsk5");
+//$db->query("ALTER TABLE {$gtablepre}winners ADD itmk6 char(5) not null default '' AFTER itmsk5");
+//$db->query("ALTER TABLE {$gtablepre}winners ADD itm6 CHAR( 30 ) NOT NULL default '' AFTER itmsk5");
+//$db->query("ALTER TABLE {$gtablepre}winners CHANGE itme0 itme0 mediumint unsigned NOT NULL default '0'");
+//$db->query("ALTER TABLE {$gtablepre}winners CHANGE itme1 itme1 mediumint unsigned NOT NULL default '0'");
+//$db->query("ALTER TABLE {$gtablepre}winners CHANGE itme2 itme2 mediumint unsigned NOT NULL default '0'");
+//$db->query("ALTER TABLE {$gtablepre}winners CHANGE itme3 itme3 mediumint unsigned NOT NULL default '0'");
+//$db->query("ALTER TABLE {$gtablepre}winners CHANGE itme4 itme4 mediumint unsigned NOT NULL default '0'");
+//$db->query("ALTER TABLE {$gtablepre}winners CHANGE itme5 itme5 mediumint unsigned NOT NULL default '0'");
+//$db->query("ALTER TABLE {$gtablepre}users ADD validgames smallint unsigned NOT NULL default '0' AFTER credits");
+//$db->query("ALTER TABLE {$gtablepre}users ADD wingames smallint unsigned NOT NULL default '0' AFTER validgames");

 include template('admin_menu');


--- a/include/admin/gmlist.php
+++ b/include/admin/gmlist.php
@@ -3,7 +3,7 @@ if(!defined('IN_ADMIN')) {
 	exit('Access Denied');
 }

-$result = $db->query("SELECT uid,username,groupid FROM {$tablepre}users WHERE groupid > 1 ORDER BY groupid DESC");
+$result = $db->query("SELECT uid,username,groupid FROM {$gtablepre}users WHERE groupid > 1 ORDER BY groupid DESC");
 while($gm = $db->fetch_array($result)) {
 	$gmdata[$gm['uid']] = $gm;
 }
@@ -15,7 +15,7 @@ if($command == 'add') {
 	} elseif ($addgroup < 2 || $addgroup >= $mygroup || $addgroup > 10) {
 		$cmd_info =  '权限设置错误！';
 	} else {
-		$result = $db->query("SELECT uid,username,groupid FROM {$tablepre}users WHERE username='$addname'");
+		$result = $db->query("SELECT uid,username,groupid FROM {$gtablepre}users WHERE username='$addname'");
 		if(!$db->num_rows($result)) { 
 			$cmd_info =  '此账号不存在。'; 
 		} else {
@@ -24,7 +24,7 @@ if($command == 'add') {
 				$cmd_info =  '此账号已经是管理员！'; 
 			}else{
 				$uid = $newgm['uid'];
-				$db->query("UPDATE {$tablepre}users SET groupid='$addgroup' WHERE uid='$uid'");
+				$db->query("UPDATE {$gtablepre}users SET groupid='$addgroup' WHERE uid='$uid'");
 				adminlog('addgm',$addname,$addgroup);
 				$cmd_info =  "管理员 {$addname} 添加成功，权限等级：{$addgroup}";
 				$newgm['groupid'] = $addgroup;
@@ -40,7 +40,7 @@ if($command == 'add') {
 		if($gmdata[$adminuid]['groupid'] >= $mygroup){
 			$cmd_info = "权限不够，不能删除管理员 {$gmdata[$adminuid]['username']}！";
 		} else {
-			$db->query("UPDATE {$tablepre}users SET groupid=1 WHERE uid='$uid'");
+			$db->query("UPDATE {$gtablepre}users SET groupid=1 WHERE uid='$uid'");
 			adminlog('delgm',$gmdata[$adminuid]['username']);
 			$cmd_info =  "管理员 {$gmdata[$adminuid]['username']} 的管理权限被删除！";
 			unset($gmdata[$adminuid]);
@@ -58,7 +58,7 @@ if($command == 'add') {
 		} elseif($gmdata[$adminuid]['groupid'] >= $mygroup) {
 			$cmd_info =  "权限不够，不能编辑管理员 {$editname} ！<br>";
 		} else {
-			$db->query("UPDATE {$tablepre}users SET groupid='$editgroup' WHERE uid='$adminuid'");
+			$db->query("UPDATE {$gtablepre}users SET groupid='$editgroup' WHERE uid='$adminuid'");
 			adminlog('editgm',$gmdata[$adminuid]['username'],$editgroup);
 			$cmd_info =  "管理员 {$gmdata[$adminuid]['username']} 权限修改成功，权限等级：{$editgroup}";
 			$gmdata[$adminuid]['groupid'] = $editgroup;

--- a/include/admin/urlist.php
+++ b/include/admin/urlist.php
@@ -12,12 +12,12 @@ if($urcmd){
 			$urorder = 'uid';
 		}
 		$urorder2 = $urorder2 == 'ASC' ? 'ASC' : 'DESC';
-		$result = $db->query("SELECT * FROM {$tablepre}users ORDER BY $urorder $urorder2, uid DESC LIMIT $start,$showlimit");	
+		$result = $db->query("SELECT * FROM {$gtablepre}users ORDER BY $urorder $urorder2, uid DESC LIMIT $start,$showlimit");	
 	}elseif($pagecmd == 'find'){
 		if($checkmode == 'ip') {
-			$result = $db->query("SELECT * FROM {$tablepre}users WHERE ip LIKE '%{$checkinfo}%' ORDER BY uid DESC LIMIT $start,$showlimit");
+			$result = $db->query("SELECT * FROM {$gtablepre}users WHERE ip LIKE '%{$checkinfo}%' ORDER BY uid DESC LIMIT $start,$showlimit");
 		} else {
-			$result = $db->query("SELECT * FROM {$tablepre}users WHERE username LIKE '%{$checkinfo}%' ORDER BY uid DESC LIMIT $start,$showlimit");
+			$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username LIKE '%{$checkinfo}%' ORDER BY uid DESC LIMIT $start,$showlimit");
 		}
 	}
 	if(!$db->num_rows($result)) {
@@ -83,7 +83,7 @@ if($urcmd == 'ban' || $urcmd == 'unban' || $urcmd == 'del' || $urcmd == 'checkac
 							}
 						}
 						$new_ach = json_encode($new_ach);
-						$db->query("UPDATE {$tablepre}users SET achrev='$new_ach' WHERE username='".$n."'" );
+						$db->query("UPDATE {$gtablepre}users SET achrev='$new_ach' WHERE username='".$n."'" );
 					}
 					//$new_ach = '';
 				}
@@ -99,13 +99,13 @@ if($urcmd == 'ban' || $urcmd == 'unban' || $urcmd == 'del' || $urcmd == 'checkac
 		$cmd_info = '';
 		if($urcmd == 'ban'){
 			$operword = '封停';
-			$qryword = "UPDATE {$tablepre}users SET groupid='0' ";
+			$qryword = "UPDATE {$gtablepre}users SET groupid='0' ";
 		}elseif($urcmd == 'unban'){
 			$operword = '解封';
-			$qryword = "UPDATE {$tablepre}users SET groupid='1' ";
+			$qryword = "UPDATE {$gtablepre}users SET groupid='1' ";
 		}elseif($urcmd == 'del'){
 			$operword = '删除';
-			$qryword = "DELETE FROM {$tablepre}users ";
+			$qryword = "DELETE FROM {$gtablepre}users ";
 		}elseif($urcmd == 'checkach'){
 			$cmd_info .= " 帐户 $opernames 调整了成就储存结构";
 		}
@@ -128,12 +128,12 @@ if($urcmd == 'ban' || $urcmd == 'unban' || $urcmd == 'del' || $urcmd == 'checkac
 	}
 	$urcmd = 'list';
 }  elseif($urcmd == 'del2') {
-	$result = $db->query("SELECT username,uid FROM {$tablepre}users WHERE lastgame = 0 AND groupid<='$mygroup' LIMIT 1000");
+	$result = $db->query("SELECT username,uid FROM {$gtablepre}users WHERE lastgame = 0 AND groupid<='$mygroup' LIMIT 1000");
 	while($ddata = $db->fetch_array($result)){
 		$n = $ddata['username'];$u = $ddata['uid'];
 		adminlog('delur',$n);
 		echo " 帐户 $n 被删除。<br>";
-		$db->query("DELETE FROM {$tablepre}users WHERE uid='$u'");
+		$db->query("DELETE FROM {$gtablepre}users WHERE uid='$u'");
 	}
 }elseif(strpos($urcmd ,'edit')===0) {
 	$uid = explode('_',$urcmd);
@@ -161,10 +161,10 @@ if($urcmd == 'ban' || $urcmd == 'unban' || $urcmd == 'del' || $urcmd == 'checkac
 		}
 		if(!empty(${'pass_'.$no})){
 			$urpass = md5(${'pass_'.$no});
-			$db->query("UPDATE {$tablepre}users SET motto='$urmotto',killmsg='$urkillmsg',lastword='$urlastword',icon='$uricon',gender='$urgender',password='$urpass',credits='$urcredits',credits2='$urcredits2' ,nicks='$urnicks' ,achievement='$urach' WHERE uid='$uid'");
+			$db->query("UPDATE {$gtablepre}users SET motto='$urmotto',killmsg='$urkillmsg',lastword='$urlastword',icon='$uricon',gender='$urgender',password='$urpass',credits='$urcredits',credits2='$urcredits2' ,nicks='$urnicks' ,achievement='$urach' WHERE uid='$uid'");
 			$cmd_info = "帐户 ".$urdata[$no]['username']." 的密码及其他信息已修改！";
 		}else{
-			$db->query("UPDATE {$tablepre}users SET motto='$urmotto',killmsg='$urkillmsg',lastword='$urlastword',icon='$uricon',gender='$urgender',credits='$urcredits',credits2='$urcredits2' ,nicks='$urnicks' ,achievement='$urach' WHERE uid='$uid'");
+			$db->query("UPDATE {$gtablepre}users SET motto='$urmotto',killmsg='$urkillmsg',lastword='$urlastword',icon='$uricon',gender='$urgender',credits='$urcredits',credits2='$urcredits2' ,nicks='$urnicks' ,achievement='$urach' WHERE uid='$uid'");
 			$cmd_info = "帐户 ".$urdata[$no]['username']." 的信息已修改！";
 		}		
 	}

--- a/include/admin/vnmixlist.php
+++ b/include/admin/vnmixlist.php
@@ -77,7 +77,7 @@ if(strpos($vncmd ,'del')===0)
 		$earr['itmsk'] = $flag['result'][4];
 		$earr['istatus'] = 0;
 		// 保存至数据库
-		$db->array_insert("{$tablepre}vnmixitem", $earr);
+		$db->array_insert("{$gtablepre}vnmixitem", $earr);
 	}
 	adminlog('回退了配方',$vresult);
 	$cmd_info = "已回退配方{$earr['itm']}！";

--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -54,44 +54,61 @@ require config('dialogue',$gamecfg);
 require config('audio',$gamecfg);
 require config('tooltip',$gamecfg);

-//include GAME_ROOT.'./gamedata/combatinfo.php';
+$gtablepre = $tablepre;

 ob_start();

-if(CURSCRIPT !== 'chat'){
-	//if($gzipcompress && function_exists('ob_gzhandler') && CURSCRIPT != 'wap') {
-	//	ob_start('ob_gzhandler');
-	//} else {
-	//	$gzipcompress = 0;
-	//	ob_start();
-	//}
-	
-	//$gamestate状态：0-上局游戏结束；10-新游戏准备阶段；20-游戏开放激活；30-游戏停止激活；40-游戏连斗；50-游戏死斗。
-	//$pt = getmicrotime();
-	
+$cuser = & ${$tablepre.'user'};
+$cpass = & ${$tablepre.'pass'};
+
+$roomlist = Array();
+$result = $db->query("SELECT * FROM {$gtablepre}game WHERE groomid>0");
+while($roominfo = $db->fetch_array($result))
+{
+	# 房间内没有人时自动关闭房间
+	if(!$roominfo['groomnums'])
+	{
+		$db->query("DELETE FROM {$gtablepre}game WHERE groomid = {$roominfo['groomid']}");
+	}
+	else
+	{
+		$roomlist[$roominfo['groomid']] = $roominfo;
+	}
+}
+
+if($cuser)
+{
+	$tr = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
+	$tp = $db->fetch_array($tr);
+}
+
+$rid = isset($tp['roomid']) ? $tp['roomid'] : 0;
+$groomid = $rid;
+
+if(!empty($rid))
+{
+	$result = $db->query("SELECT * FROM {$gtablepre}game WHERE groomid='$rid'");
+	if(!$db->num_rows($result))
+	{
+		$gr = $db->query("SELECT gamenum FROM {$gtablepre}game WHERE groomid=0");
+		$gnums = $db->fetch_array($gr)[0] + $rid;
+		$starttime = $now + $startmin*5;
+		$db->query("INSERT INTO {$gtablepre}game (gamenum,groomid,groomnums,gamestate,starttime) VALUES ('$gnums','$rid','1','0','$starttime')");
+	}
+}
+
+$tablepre = !empty($rid) ? $tablepre.'s'.$rid.'_' : $tablepre;
+
+if(CURSCRIPT !== 'chat')
+{
 	$plock=fopen(GAME_ROOT.'./gamedata/process.lock','ab');
 	flock($plock,LOCK_EX);
 	load_gameinfo();
 	$lostfocus = false;
-	
-//	$losttime = $now - $lastupdate;
-//	if($losttime >= $lostfocusmin * 60){
-//		$result = $db->query("SELECT pid FROM {$tablepre}players WHERE endtime > '$lastupdate' AND type = '0'");
-//		if(!$db->num_rows($result)){//满足失去焦点的判定条件
-//			$lostfocus = true;
-//			echo 'LOST FOCUS:'.$losttime;
-//			if($now - $afktime > $losttime){
-//				$afktime = $now;
-//				addnews();
-//			}
-//		}
-//	}
-
-	//include GAME_ROOT.'./gamedata/gameinfo.php';
 	$ginfochange = false;
-//	$old_gamestate = $gamestate;
-//	$old_areanum = $areanum;
-	if(!$gamestate) { //判定游戏准备
+	//判定游戏准备
+	if(!$gamestate)
+	{ 
 		if(($starttime)&&($now > $starttime - $startmin*60)) {
 			$gamenum++;
 			$gamestate = 10;
@@ -105,7 +122,9 @@ if(CURSCRIPT !== 'chat'){
 			$ginfochange = true;
 		}
 	}
-	if($gamestate == 10) {//判定游戏开始
+	//判定游戏开始
+	if($gamestate == 10) 
+	{
 		if($now >= $starttime) {
 			$gamestate = 20;
 			//save_gameinfo();
@@ -117,40 +136,29 @@ if(CURSCRIPT !== 'chat'){
 			$ginfochange = true;
 		}
 	}
-	//if (($gamestate > 10)&&($now > $areatime)) {
-	//	include_once GAME_ROOT.'./include/system.func.php';
-	//	addarea($areatime);
-	//	save_gameinfo();
-	//}
-	//$combatinfo = file_get_contents(GAME_ROOT.'./gamedata/combatinfo.php');
-	//list($hdamage,$hplayer,$noisetime,$noisepls,$noiseid,$noiseid2,$noisemode) = explode(',',$combatinfo);
-	if (($gamestate > 10)&&($now > $areatime)) {//判定增加禁区
+	//判定增加禁区
+	if (($gamestate > 10)&&($now > $areatime)) {
 		include_once GAME_ROOT.'./include/system.func.php';
 		while($now>$areatime){
 			$o_areatime = $areatime;
 			$areatime += $areahour*60;
-			//save_gameinfo();
 			add_once_area($o_areatime);
 			$areawarn = 0;
-			//save_gameinfo();
 			$ginfochange = true;
-	//		testlog('禁区增加');
 		}
-		//addarea($areatime);
-	}elseif(($gamestate > 10)&&($now > $areatime - $areawarntime)&&(!$areawarn)){//判定警告增加禁区
+	//判定警告增加禁区	
+	}elseif(($gamestate > 10)&&($now > $areatime - $areawarntime)&&(!$areawarn)){
 		include_once GAME_ROOT.'./include/system.func.php';
 		areawarn();
-		//save_gameinfo();
 		$ginfochange = true;
 	}
-	
+
 	if($gamestate == 20) {
 		$arealimit = $arealimit > 0 ? $arealimit : 1; 
 		if(($validnum <= 0)&&($areanum >= $arealimit*$areaadd)) {//判定无人参加并结束游戏
 			gameover($areatime-3599,'end4');
 		} elseif(($areanum >= $arealimit*$areaadd) || ($validnum >= $validlimit)) {//判定游戏停止激活
 			$gamestate = 30;
-			//save_gameinfo();
 			$ginfochange = true;
 		}
 	}
@@ -174,21 +182,10 @@ if(CURSCRIPT !== 'chat'){
 		$ginfochange = true;
 	}
 	
-//	if((($gamestate == 30)&&($alivenum <= $combolimit))||($deathlimit&&($gamestate < 40)&&($gamestate >= 20)&&($deathnum >= $deathlimit))) {//判定进入连斗
-//		$gamestate = 40;
-//		//save_gameinfo();
-//		//$db->query("UPDATE {$tablepre}players SET teamID='',teamPass='' WHERE type=0 ");
-//		addnews($now,'combo');
-//		systemputchat($now,'combo');
-//		$ginfochange = true;
-//	}
-	
 	if (($gamestate >= 40)&&($now > $afktime + $antiAFKertime * 60)) {//判定自动反挂机
 		include_once GAME_ROOT.'./include/system.func.php';
 		antiAFK();
 		$afktime = $now;
-		//echo 'afk';
-		//save_gameinfo();
 		$ginfochange = true;
 	}
 	
@@ -196,7 +193,6 @@ if(CURSCRIPT !== 'chat'){
 		if($alivenum <= 1) {
 			include_once GAME_ROOT.'./include/system.func.php';
 			gameover();
-	//		testlog('游戏结束');
 		}
 	}
 	
@@ -206,27 +202,4 @@ if(CURSCRIPT !== 'chat'){
 	
 	fclose($plock); 
 }
-
-if (CURSCRIPT == 'botservice')
-{
-	$cuser = $botname;
-	$cpass = $botpass;
-}
-else
-{
-	$cuser = & ${$tablepre.'user'};
-	$cpass = & ${$tablepre.'pass'};
-}
-
-//function testlog($name){
-//	global $month,$day,$hour,$min,$sec,$old_gamestate,$gamestate,$old_areanum,$areanum,$pt;
-//	//$a = file_get_contents(GAME_ROOT.'./gamedata/gameinfo.php');
-//	$pt2 = getmicrotime();
-//	$nowtime = "{$month}月{$day}日{$hour}时{$min}分{$sec}秒；{$pt} {$pt2}";
-//	$a = "{$nowtime}\n {$name}\n 『旧游戏状态:{$old_gamestate}；新游戏状态:{$gamestate}』\n 『旧禁区数目:{$old_areanum}；新禁区数目:{$areanum}』\n\n";
-//	$filec = file_get_contents(GAME_ROOT.'./log.txt');
-//	$a = $a.$filec;
-//	file_put_contents(GAME_ROOT.'./log.txt',$a);
-//	return;
-//}
 ?>
--- a/include/game.func.php
+++ b/include/game.func.php
@@ -641,7 +641,7 @@ function create_dummy_playerdata($clb=0)
 //通过名字抓取指定玩家数据，只能抓玩家
 function fetch_playerdata_by_name($n)
 {
-	global $db,$tablepre;
+	global $db,$gtablepre,$tablepre;
 	$result = $db->query("SELECT * FROM {$tablepre}players WHERE name = '$n' AND type = 0");
 	if(!$db->num_rows($result)) return NULL;
 	$data = $db->fetch_array($result);
@@ -654,7 +654,7 @@ function fetch_playerdata_by_name($n)
 //通过pid抓取指定玩家/NPC数据
 function fetch_playerdata_by_pid($pid)
 {
-	global $db,$tablepre;
+	global $db,$gtablepre,$tablepre;
 	$result = $db->query("SELECT * FROM {$tablepre}players WHERE pid = '$pid'");
 	if(!$db->num_rows($result)) return NULL;
 	$data = $db->fetch_array($result);
@@ -666,7 +666,7 @@ function fetch_playerdata_by_pid($pid)
 }
 //用于将指定player数据存回数据库
 function player_save($data){
-	global $db,$tablepre;
+	global $db,$gtablepre,$tablepre;
 	$ndata = Array();
 	if(isset($data['pid'])){
 		$pid = $data['pid'];

--- a/include/game/achievement.func.php
+++ b/include/game/achievement.func.php
--- a/include/game/clubslct.func.php
+++ b/include/game/clubslct.func.php
@@ -21,10 +21,10 @@ function swap(&$a,&$b)

 function getclub($who, &$c1, &$c2, &$c3)
 {
-	global $db,$tablepre,$starttime,$validtime;
-	$result = $db->query("SELECT gid FROM {$tablepre}winners ORDER BY gid desc LIMIT 1");
+	global $db,$gtablepre,$tablepre,$starttime,$validtime;
+	$result = $db->query("SELECT gid FROM {$gtablepre}winners ORDER BY gid desc LIMIT 1");
 	$t=$db->fetch_array($result); $curgid=$t['gid']+1;
-	$result = $db->query("SELECT uid FROM {$tablepre}users WHERE username='$who'");
+	$result = $db->query("SELECT uid FROM {$gtablepre}users WHERE username='$who'");
 	$t=$db->fetch_array($result); $curuid=$t['uid']+2;
 	$result = $db->query("SELECT pid FROM {$tablepre}players WHERE name='$who' AND type=0");
 	$t=$db->fetch_array($result); $curpid=$t['pid']+3;

--- a/include/game/itemmain.func.php
+++ b/include/game/itemmain.func.php
@@ -138,13 +138,25 @@ function trap(&$data=NULL){
 	$selflag = $itmsk0 == $pid ? true : false;
 	$dice=diceroll(99);

-	if($playerflag && !$selflag){
+	if($playerflag && !$selflag)
+	{
 		$result = $db->query("SELECT * FROM {$tablepre}players WHERE pid='$itmsk0'");
 		$wdata = $db->fetch_array($result);
-		$trname = $wdata['name'];$trtype = $wdata['type'];$trperfix = '<span class="yellow">'.$trname.'</span>设置的';
-	}elseif($selflag){
+		if(!empty($wdata))
+		{
+			$trname = $wdata['name'];$trtype = $wdata['type'];$trperfix = '<span class="yellow">'.$trname.'</span>设置的';
+		}
+		else 
+		{
+			$trname = $trtype = $trperfix = '';
+		}
+	}
+	elseif($selflag)
+	{
 		$trname = $name;$trtype = 0;$trperfix = '你自己设置的';
-	}else{
+	}
+	else
+	{
 		$trname = $trtype = $trperfix = '';
 	}


--- a/include/game/revattr.func.php
+++ b/include/game/revattr.func.php
@@ -1221,15 +1221,18 @@
 				foreach($inf_att as $ipt => $times)
 				{
 					$which = 'ar'.$ipt;
-					if(!isset(${'temp_'.$which.'s'})) ${'temp_'.$which.'s'} = $pd[$which.'s'];
-					if(${'temp_'.$which.'s'} > 0)
+					# 没有装备或装备耐久为0的情况下，受伤
+					if(empty($pd[$which.'s']) || $pd[$which.'k'] == 'DN' || (!empty($pd[$which.'sdmg']) && $pd[$which.'s'] < $pd[$which.'sdmg']))
 					{
-						${'temp_'.$which.'s'} -= $times;
-						$pd['armor_hurt'][$which] += $times;
+						$pd['inf_hurt'][$ipt] = 1;
+
 					}
+					# 否则扣除装备耐久
 					else
 					{
-						$pd['inf_hurt'][$ipt] = 1;
+						if(!isset($pd[$which.'sdmg'])) $pd[$which.'sdmg'] = 0;
+						$pd[$which.'sdmg'] += $times;
+						$pd['armor_hurt'][$which] += $times;
 					}
 				}
 			}

--- a/include/game/revcombat.func.php
+++ b/include/game/revcombat.func.php
@@ -741,7 +741,7 @@
 	# 再重复一遍：这里的第一个参数指的是杀人者(敌对方)视角，第二个参数指的是死者(受到伤害者)视角。
 	function pre_kill_events(&$pa,&$pd,$active,$death) 
 	{
-		global $log, $now, $db, $tablepre, $typeinfo, $lwinfo;
+		global $log, $now, $db, $gtablepre, $tablepre, $typeinfo, $lwinfo;
 		
 		// 登记死法
 		// 传入了数字编号死法
@@ -784,7 +784,7 @@
 		//初始化玩家遗言
 		else 
 		{
-			$result = $db->query ( "SELECT lastword FROM {$tablepre}users WHERE username ='$dname'");
+			$result = $db->query ( "SELECT lastword FROM {$gtablepre}users WHERE username ='$dname'");
 			$lastword = $db->result ( $result, 0 );
 		}
 		//向聊天框发送遗言
@@ -884,7 +884,7 @@
 	# 执行死透了后的事件：
 	function final_kill_events(&$pa,&$pd,$active,$last=0)
 	{
-		global $log,$now,$alivenum,$deathnum;
+		global $log,$now,$alivenum,$deathnum,$db,$gtablepre,$tablepre;

 		if(empty($pa['nm'])) $pa['nm'] = $active && !$pa['type'] ? '你' : $pa['name'];
 		if(empty($pd['nm'])) $pd['nm'] = !$active && !$pd['type'] ? '你' : $pd['name'];
@@ -912,7 +912,7 @@
 		{
 			global $db,$tablepre;
 			$pname = $pa['name'];
-			$result = $db->query("SELECT killmsg FROM {$tablepre}users WHERE username = '$pname'");
+			$result = $db->query("SELECT killmsg FROM {$gtablepre}users WHERE username = '$pname'");
 			$killmsg = $db->result($result,0);
 			if(!empty($killmsg)) $log .= "<span class=\"evergreen\">{$pa['nm']}对{$pd['nm']}说：“{$killmsg}”</span><br>";
 		}

--- a/include/game/special.func.php
+++ b/include/game/special.func.php
@@ -8,9 +8,9 @@ if(!defined('IN_GAME')) {
 include_once GAME_ROOT.'./include/game/titles.func.php';

 function getword(){
-	global $db,$tablepre,$name,$motto,$lastword,$killmsg;
+	global $db,$gtablepre,$tablepre,$name,$motto,$lastword,$killmsg;
 	
-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$name'");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$name'");
 	$userinfo = $db->fetch_array($result);
 	$motto = $userinfo['motto'];
 	$lastword = $userinfo['lastword'];
@@ -19,9 +19,9 @@ function getword(){
 }

 function chgword($nmotto,$nlastword,$nkillmsg) {
-	global $db,$tablepre,$name,$log;
+	global $db,$gtablepre,$tablepre,$name,$log;
 	
-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$name'");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$name'");
 	$userinfo = $db->fetch_array($result);

 //	foreach ( Array('<','>',';',',','\\\'','\\"') as $value ) {
@@ -47,14 +47,14 @@ function chgword($nmotto,$nlastword,$nkillmsg) {
 		$log .= $nkillmsg == '' ? '杀人留言已清空。' : '杀人留言变更为<span class="yellow">'.$nkillmsg.'</span>。<br>';
 	}

-	$db->query("UPDATE {$tablepre}users SET motto='$nmotto', lastword='$nlastword', killmsg='$nkillmsg' WHERE username='$name'");
+	$db->query("UPDATE {$gtablepre}users SET motto='$nmotto', lastword='$nlastword', killmsg='$nkillmsg' WHERE username='$name'");
 	
 	$mode = 'command';
 	return;
 }

 function chgpassword($oldpswd,$newpswd,$newpswd2){
-	global $db,$tablepre,$name,$log;
+	global $db,$gtablepre,$tablepre,$name,$log;
 	
 	if (!$oldpswd || !$newpswd || !$newpswd2){
 		$log .= '放弃了修改密码。<br />';
@@ -68,11 +68,11 @@ function chgpassword($oldpswd,$newpswd,$newpswd2){
 	
 	$oldpswd = md5($oldpswd);$newpswd = md5($newpswd);
 	
-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$name'");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$name'");
 	$userinfo = $db->fetch_array($result);
 	
 	if($oldpswd == $userinfo['password']){
-		$db->query("UPDATE {$tablepre}users SET `password` ='$newpswd' WHERE username='$name'");
+		$db->query("UPDATE {$gtablepre}users SET `password` ='$newpswd' WHERE username='$name'");
 		$log .= '<span class="yellow">密码已修改！</span><br />';
 		
 		//include_once GAME_ROOT.'./include/global.func.php';
@@ -87,7 +87,7 @@ function chgpassword($oldpswd,$newpswd,$newpswd2){
 	}
 }
 function oneonone($sb,$sf){
-	global $db,$gold,$mode,$now,$tablepre,$log,$name,$art,$arte,$artk,$arts,$artsk;
+	global $db,$gold,$mode,$now,$gtablepre,$tablepre,$log,$name,$art,$arte,$artk,$arts,$artsk;
 	$mode = 'command';
 	if($sb == $sf){
 		$log .= "不能自我约战。<br>";
@@ -118,10 +118,10 @@ function oneonone($sb,$sf){
 		$log .= "需要携带1500G才能约战。<br>";
 		return;
 	}
-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$sb'");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$sb'");
 	$edata = $db->fetch_array($result);
 	$a1=$edata['ip'];
-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$sf'");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$sf'");
 	$edata = $db->fetch_array($result);
 	$a2=$edata['ip'];
 	if($a1 == $a2){

--- a/include/game/titles.func.php
+++ b/include/game/titles.func.php
@@ -8,9 +8,9 @@ if(!defined('IN_GAME')) {
 //反正应该不会重复获得头衔……偷懒
 //还是会重复的 反正没什么工作量
 function get_title($t,$n){
-	global $gamecfg,$name,$db,$tablepre;
+	global $gamecfg,$name,$db,$gtablepre;
 	require config("gamecfg",$gamecfg);
-	$result = $db->query("SELECT nicks FROM {$tablepre}users WHERE username = '$n'");
+	$result = $db->query("SELECT nicks FROM {$gtablepre}users WHERE username = '$n'");
 	$k = $db->result($result, 0);
 	if (strpos($k,$t)===false){
 		$cf = GAME_ROOT.'./gamedata/clearlog.php';
@@ -18,7 +18,7 @@ function get_title($t,$n){
 		writeover($cf,$d,'ab+');
 		$k=$k.'/'.$t;
 	}
-	$db->query("UPDATE {$tablepre}users SET nicks='$k' WHERE username='".$n."'" );
+	$db->query("UPDATE {$gtablepre}users SET nicks='$k' WHERE username='".$n."'" );
 }

 //格式化头衔tooltip

--- a/include/global.func.php
+++ b/include/global.func.php
@@ -106,8 +106,8 @@ function content($file = '') {
 }

 function gsetcookie($var, $value, $life = 0, $prefix = 1) {
-	global $tablepre, $cookiedomain, $cookiepath, $now, $_SERVER;
-	setcookie(($prefix ? $tablepre : '').$var, $value,
+	global $gtablepre, $cookiedomain, $cookiepath, $now, $_SERVER;
+	setcookie(($prefix ? $gtablepre : '').$var, $value,
 		$life ? $now + $life : 0, $cookiepath,
 		$cookiedomain, $_SERVER['SERVER_PORT'] == 443 ? 1 : 0);
 }
@@ -199,61 +199,25 @@ function compatible_json_encode($data){	//自动选择使用内置函数或者
 	return $jdata;	
 }

-//function addnews($t = '', $n = '', $a = '',$b = '', $c = '', $d = '') {
-//	global $now,$db,$tablepre;
-//	$t = $t ? $t : $now;
-//	$newsfile = GAME_ROOT.'./gamedata/newsinfo.php';
-//	$newsdata = readover($newsfile); //file_get_contents($newsfile);
-//	if(is_array($a)) {
-//		$news = "$t,$n,".implode('-',$a).",$b,$c,$d,\n";
-//	} elseif(isset($n)) {
-//		$news = "$t,$n,$a,$b,$c,$d,\n";
-//	}
-//	$newsdata = substr_replace($newsdata,$news,53,0);
-//	writeover($newsfile,$newsdata,'wb');
-//	
-//	if(strpos($n,'death11') === 0  || strpos($n,'death32') === 0) {
-//		$result = $db->query("SELECT lastword FROM {$tablepre}users WHERE username = '$a'");
-//		$lastword = $db->result($result, 0);
-//		//$result = $db->query("SELECT pls FROM {$tablepre}players WHERE name = '$a' AND type = '$b'");
-//		//$pls = $db->result($result, 0);
-//		$db->query("INSERT INTO {$tablepre}chat (type,`time`,send,recv,msg) VALUES ('3','$t','$a','$c','$lastword')");
-//	}	elseif(strpos($n,'death15') === 0 || strpos($n,'death16') === 0) {
-//		$result = $db->query("SELECT lastword FROM {$tablepre}users WHERE username = '$a'");
-//		$lastword = $db->result($result, 0);
-//		$result = $db->query("SELECT pls FROM {$tablepre}players WHERE name = '$a' AND type = '$b'");
-//		$pls = $db->result($result, 0);
-//		$db->query("INSERT INTO {$tablepre}chat (type,`time`,send,recv,msg) VALUES ('3','$t','$a','$pls','$lastword')");
-//	}
-//}
-
 //----------------------------------------
 //              重要游戏函数
 //----------------------------------------

 function addnews($t = 0, $n = '',$a='',$b='',$c = '', $d = '', $e = '') {
-	global $now,$db,$tablepre;
+	global $now,$db,$tablepre,$gtablepre;
 	$t = $t ? $t : $now;
 	$newsfile = GAME_ROOT.'./gamedata/newsinfo.php';
 	touch($newsfile);
 	if(is_array($a)){
 		$a=implode('_',$a);
 	}
-//	$newsfile = GAME_ROOT.'./gamedata/newsinfo.php';
-//	$newsdata = readover($newsfile); //file_get_contents($newsfile);
-//	if(is_array($a)) {
-//		$news = "$t,$n,".implode('-',$a).",$b,$c,$d,\n";
-//	} elseif(isset($n)) {
-//		$news = "$t,$n,$a,$b,$c,$d,\n";
-//	}
-//	$newsdata = substr_replace($newsdata,$news,53,0);
-//	writeover($newsfile,$newsdata,'wb');
+
 	if(strpos($n,'death11') === 0  || strpos($n,'death32') === 0) {
-		$result = $db->query("SELECT lastword FROM {$tablepre}users WHERE username = '$a'");
+		$result = $db->query("SELECT lastword FROM {$gtablepre}users WHERE username = '$a'");
 		$e = $lastword = $db->result($result, 0);
 		$db->query("INSERT INTO {$tablepre}chat (type,`time`,send,recv,msg) VALUES ('3','$t','$a','$c','$lastword')");
 	}	elseif(strpos($n,'death15') === 0 || strpos($n,'death16') === 0) {
-		$result = $db->query("SELECT lastword FROM {$tablepre}users WHERE username = '$a'");
+		$result = $db->query("SELECT lastword FROM {$gtablepre}users WHERE username = '$a'");
 		$e = $lastword = $db->result($result, 0);
 		$result = $db->query("SELECT pls FROM {$tablepre}players WHERE name = '$a' AND type = '0'");
 		$place = $db->result($result, 0);
@@ -263,11 +227,7 @@ function addnews($t = 0, $n = '',$a='',$b='',$c = '', $d = '', $e = '') {
 }

 function logsave($pid,$time,$log = '',$type = 's'){
-//	$logfile = GAME_ROOT."./gamedata/log/$pid.log";
-//	$date = date("H:i:s",$time);
-//	$logdata = "{$date}，{$log}<br>\n";
-//	writeover($logfile,$logdata,'ab+');
-	
+
 	global $db,$tablepre;
 	$ldata['toid']=$pid;
 	$ldata['type']=$type;
@@ -280,10 +240,10 @@ function logsave($pid,$time,$log = '',$type = 's'){
 }

 function load_gameinfo() {
-	global $now,$db,$tablepre;
-	global $gamenum,$gamestate,$lastupdate,$starttime,$winmode,$winner,$arealist,$areanum,$areatime,$areawarn,$validnum,$alivenum,$deathnum,$afktime,$optime,$weather,$hack,$combonum,$gamevars;
+	global $now,$db,$gtablepre,$tablepre;
+	global $groomid,$gamenum,$gamestate,$lastupdate,$starttime,$winmode,$winner,$arealist,$areanum,$areatime,$areawarn,$validnum,$alivenum,$deathnum,$afktime,$optime,$weather,$hack,$combonum,$gamevars;
 	global $hdamage,$hplayer,$noisetime,$noisepls,$noiseid,$noiseid2,$noisemode;
-	$result = $db->query("SELECT * FROM {$tablepre}game");
+	$result = $db->query("SELECT * FROM {$gtablepre}game WHERE groomid = {$groomid}");
 	$gameinfo = $db->fetch_array($result);
 	if(!empty($gameinfo)) extract($gameinfo);
 	$arealist = explode(',',$gameinfo['arealist']);
@@ -291,38 +251,13 @@ function load_gameinfo() {
 	$noisevars = json_decode($noisevars,true);
 	if(!empty($noisevars)) extract($noisevars);
 	if(isset($gamevars['sanmaact']) && isset($gamevars['sanmadead'])) unset($gamevars['sanmaact']);
-	/*$gamenum = $gameinfo['gamenum'];
-	$gamestate = $gameinfo['gamestate'];
-	//$lastupdate = $gameinfo['lastupdate'];
-	$starttime = $gameinfo['starttime'];
-	$winmode = $gameinfo['winmode'];
-	$winner = $gameinfo['winner'];
-	$arealist = explode(',',$gameinfo['arealist']);
-	$areanum = $gameinfo['areanum'];
-	$areatime = $gameinfo['areatime'];
-	$areawarn = $gameinfo['areawarn'];
-	$validnum = $gameinfo['validnum'];
-	$alivenum = $gameinfo['alivenum'];
-	$deathnum = $gameinfo['deathnum'];
-	$afktime = $gameinfo['afktime'];
-	$optime = $gameinfo['optime'];
-	$weather = $gameinfo['weather'];
-	$hack = $gameinfo['hack'];
-	$gamevars = $gameinfo['gamevars'];
-	$gamevars = json_decode($gamevars,true);
-	$noisevars = $gameinfo['noisevars'];
-	$noisevars = json_decode($noisevars,true);
-	extract($noisevars);
-	$hplayer = $gameinfo['hplayer'];
-	$hdamage = $gameinfo['hdamage'];
-	if(isset($gamevars['sanmaact']) && isset($gamevars['sanmadead'])) unset($gamevars['sanmaact']);
-	$combonum = $gameinfo['combonum'];*/
 	return Array($gamestate,$gamevars);
 }

-function save_gameinfo() {
-	global $now,$db,$tablepre;
-	global $gamenum,$gamestate,$lastupdate,$starttime,$winmode,$winner,$arealist,$areanum,$areatime,$areawarn,$validnum,$alivenum,$deathnum,$afktime,$optime,$weather,$hack,$combonum,$gamevars;
+function save_gameinfo() 
+{
+	global $now,$db,$gtablepre,$tablepre;
+	global $groomid,$gamenum,$gamestate,$lastupdate,$starttime,$winmode,$winner,$arealist,$areanum,$areatime,$areawarn,$validnum,$alivenum,$deathnum,$afktime,$optime,$weather,$hack,$combonum,$gamevars;
 	if(!isset($gamenum)||!isset($gamestate)){return;}
 	if($alivenum < 0){$alivenum = 0;}
 	if($deathnum < 0){$deathnum = 0;}
@@ -349,27 +284,15 @@ function save_gameinfo() {
 	$gameinfo['gamevars'] = json_encode($gamevars,JSON_UNESCAPED_UNICODE);
 	$gameinfo['hack'] = $hack;
 	$gameinfo['combonum'] = $combonum;
-	$db->array_update("{$tablepre}game",$gameinfo,1);
-	/*
-	$gameinfo = "<?php\n\nif(!defined('IN_GAME')){exit('Access Denied');}\n\n\$gamenum = {$gamenum};\n\$gamestate = {$gamestate};\n\$starttime = {$starttime};\n\$winmode = {$winmode};\n\$winner = '{$winner}';\n\$arealist = array(".implode(',',$arealist).");\n\$areanum = {$areanum};\n\$areatime = {$areatime};\n\$weather = {$weather};\n\$hack = {$hack};\n\$validnum = {$validnum};\n\$alivenum = {$alivenum};\n\$deathnum = {$deathnum};\n\$afktime = {$afktime};\n\$optime = {$optime};\n\n?>";
-	$dir = GAME_ROOT.'./gamedata/';
-	if($fp = fopen("{$dir}gameinfo.php", 'w')) {
-		if(flock($fp,LOCK_EX)) {
-			fwrite($fp, $gameinfo);
-		} else {
-			exit("Couldn't save the game's info !");
-		}
-		fclose($fp);
-	} else {
-		gexit('Can not write to cache files, please check directory ./gamedata/ .', __file__, __line__);
-	}*/
+
+	$db->array_update("{$gtablepre}game",$gameinfo,"groomid = {$groomid}");
 	return;
 }



 function save_combatinfo(){
-	global $db,$tablepre,$gamenum,$hdamage,$hplayer,$noisevars,$noisetime,$noisepls,$noiseid,$noiseid2,$noisemode;
+	global $db,$gtablepre,$groomid,$gamenum,$hdamage,$hplayer,$noisevars,$noisetime,$noisepls,$noiseid,$noiseid2,$noisemode;
 	if(!$hdamage){$hdamage = 0;}
 	if(!$noisetime){$noisetime = 0;}
 	if(!$noisepls){$noisepls = 0;}
@@ -387,20 +310,8 @@ function save_combatinfo(){
 	foreach(array('hdamage','hplayer','noisevars') as $nval){
 		$nginfo[$nval] = $$nval;
 	}
-	$db->array_update("{$tablepre}game",$nginfo,1);
-	/*$combatinfo = "<?php\n\nif(!defined('IN_GAME')){exit('Access Denied');}\n\n\$hdamage = {$hdamage};\n\$hplayer = '{$hplayer}';\n\$noisetime = {$noisetime};\n\$noisepls = {$noisepls};\n\$noiseid = {$noiseid};\n\$noiseid2 = {$noiseid2};\n\$noisemode = '{$noisemode}';\n\n?>";
-	//$combatinfo = "{$hdamage},{$hplayer},{$noisetime},{$noisepls},{$noiseid},{$noiseid2},{$noisemode},\n";
-	$dir = GAME_ROOT.'./gamedata/';
-	if($fp = fopen("{$dir}combatinfo.php", 'w')) {
-		if(flock($fp,LOCK_EX)) {
-			fwrite($fp, $combatinfo);
-		} else {
-			exit("Couldn't save combat info !");
-		}
-		fclose($fp);
-	} else {
-		gexit('Can not write to cache files, please check directory ./gamedata/ .', __file__, __line__);
-	}*/
+
+	$db->array_update("{$gtablepre}game",$nginfo,"groomid = {$groomid}");
 	return;
 }

@@ -549,7 +460,7 @@ function putmicrotime($t_s,$t_e,$file,$info)
 //格式化储存player表 可能也是四面的遗产
 function update_db_player_structure($type=0)
 {
-	global $db,$tablepre,$checkstr;
+	global $db,$gtablepre,$tablepre,$checkstr;
 	$db_player_structure = $db_player_structure_types = $tpldata = Array();
 	
 	$dps_need_update = 0;//判定是否需要更新玩家字段
@@ -561,9 +472,9 @@ function update_db_player_structure($type=0)
 	
 	if($dps_need_update){//如果要更新，直接新建一个表，不需要依赖已有的players表
 		$sql = file_get_contents($sql_file);
-		$sql = str_replace("\r", "\n", str_replace(' bra_', ' '.$tablepre.'tmp_', $sql));
+		$sql = str_replace("\r", "\n", str_replace(' bra_', ' '.$gtablepre.'tmp_', $sql));
 		$db->queries($sql);
-		$result = $db->query("DESCRIBE {$tablepre}tmp_players");
+		$result = $db->query("DESCRIBE {$gtablepre}tmp_players");
 		while ($sttdata = $db->fetch_array($result))
 		{
 			global ${$sttdata['Field']}; 

--- a/include/news.func.php
+++ b/include/news.func.php
@@ -176,7 +176,7 @@ function  nparse_news($start = 0, $range = 0  ){//$type = '') {
 			else $dname = $typeinfo[0].' '.$a;
 //			if($b == 0) {
 //				//$dname = $a;
-//				$lwresult = $db->query("SELECT lastword FROM {$tablepre}users WHERE username = '$a'");
+//				$lwresult = $db->query("SELECT lastword FROM {$gtablepre}users WHERE username = '$a'");
 //				$lastword = $db->result($lwresult, 0);
 //			} else {
 //				//$dname = $typeinfo[$b].' '.$a;

--- a/include/roommng.func.php
+++ b/include/roommng.func.php
+<?php
+
+if(!defined('IN_GAME')) {
+	exit('Access Denied');
+}
+
+
+
+?>
--- a/include/state.func.php
+++ b/include/state.func.php
@@ -8,7 +8,7 @@ function death($death, $kname = '', $ktype = 0, $annex = '',&$data=NULL)
 {
 	//global $name, $state, $deathtime, $type, $lvl, $bid, $hp, $mhp, $wp, $wk, $wg, $wc, $wd, $wf, $sp, $msp, $club, $pls , $nick;

-	global $now, $db, $tablepre, $alivenum, $deathnum, $killmsginfo, $typeinfo, $weather;
+	global $now, $db, $tablepre, $gtablepre, $alivenum, $deathnum, $killmsginfo, $typeinfo, $weather;

 	if(!isset($data))
 	{
@@ -83,7 +83,7 @@ function death($death, $kname = '', $ktype = 0, $annex = '',&$data=NULL)
 	
 	$killmsg = '';
 	if ($ktype == 0 && $kname) {
-		$result = $db->query ( "SELECT killmsg FROM {$tablepre}users WHERE username = '$kname'" );
+		$result = $db->query ( "SELECT killmsg FROM {$gtablepre}users WHERE username = '$kname'" );
 		$killmsg = $db->result ( $result, 0 );
 	} elseif ($ktype != 0 && $kname) {
 		$killmsg = $killmsginfo [$ktype];
@@ -94,7 +94,7 @@ function death($death, $kname = '', $ktype = 0, $annex = '',&$data=NULL)
 	}
 	
 	if (! $type) {
-		$result = $db->query ( "SELECT lastword FROM {$tablepre}users WHERE username = '$name'" );
+		$result = $db->query ( "SELECT lastword FROM {$gtablepre}users WHERE username = '$name'" );
 		$lastword = $db->result ( $result, 0 );
 		$lwname = $typeinfo [$type] . ' ' . $name;
 		/*$result = $db->query("SELECT pls FROM {$tablepre}players WHERE name = '$name' AND type = '$type'");
@@ -173,7 +173,8 @@ function death($death, $kname = '', $ktype = 0, $annex = '',&$data=NULL)


 function kill($death, $dname, $dtype = 0, $dpid = 0, $annex = '', &$revival_flag=0) {
-	global $now, $db, $tablepre, $alivenum, $deathnum, $name, $w_state, $type, $pid, $typeinfo, $pls, $lwinfo, $w_achievement;
+	global $now, $db, $tablepre, $gtablepre;
+	global $alivenum, $deathnum, $name, $w_state, $type, $pid, $typeinfo, $pls, $lwinfo, $w_achievement;
 	global $weather;
 	
 	if (! $death || ! $dname) {
@@ -203,7 +204,7 @@ function kill($death, $dname, $dtype = 0, $dpid = 0, $annex = '', &$revival_flag
 	}
 	
 	$killmsg = '';
-	$result = $db->query ( "SELECT killmsg FROM {$tablepre}users WHERE username = '$name'" );
+	$result = $db->query ( "SELECT killmsg FROM {$gtablepre}users WHERE username = '$name'" );
 	$killmsg = $db->result ( $result, 0 );
 	
 	if (! $dtype) {
@@ -224,7 +225,7 @@ function kill($death, $dname, $dtype = 0, $dpid = 0, $annex = '', &$revival_flag
 		$db->query ( "INSERT INTO {$tablepre}chat (type,`time`,send,recv,msg) VALUES ('3','$now','$lwname','$pls','$lastword')" );
 	} else {
 		$lwname = $typeinfo [$dtype] . ' ' . $dname;
-		$result = $db->query ( "SELECT lastword FROM {$tablepre}users WHERE username = '$dname'" );
+		$result = $db->query ( "SELECT lastword FROM {$gtablepre}users WHERE username = '$dname'" );
 		$lastword = $db->result ( $result, 0 );
 		
 		$db->query ( "INSERT INTO {$tablepre}chat (type,`time`,send,recv,msg) VALUES ('3','$now','$lwname','$pls','$lastword')" );

--- a/include/system.func.php
+++ b/include/system.func.php
@@ -5,7 +5,7 @@ if(!defined('IN_GAME')) {
 }

 function rs_game($mode = 0) {
-	global $db,$tablepre,$gamecfg,$now,$gamestate,$plsinfo,$typeinfo,$areanum,$areaadd,$afktime,$combonum,$deathlimit;
+	global $db,$gtablepre,$tablepre,$groomid,$gamecfg,$now,$gamestate,$plsinfo,$typeinfo,$areanum,$areaadd,$afktime,$combonum,$deathlimit;
 //	$stime=getmicrotime();
 	$dir = GAME_ROOT.'./gamedata/';
 	$sqldir = GAME_ROOT.'./gamedata/sql/';
@@ -44,8 +44,6 @@ function rs_game($mode = 0) {
 		$gamevars = Array();
 		save_gameinfo();
 		
-		
-		
 	}
 	if ($mode & 2) {
 		//echo " - 禁区初始化 - ";
@@ -327,7 +325,7 @@ function rs_sttime() {

 function add_once_area($atime) {
 	//实际上GAMEOVER的判断是在common.inc.php里
-	global $db,$tablepre,$now,$gamestate,$areaesc,$arealist,$areanum,$arealimit,$areaadd,$plsinfo,$weather,$hack,$validnum,$alivenum,$deathnum;
+	global $db,$gtablepre,$tablepre,$now,$gamestate,$areaesc,$arealist,$areanum,$arealimit,$areaadd,$plsinfo,$weather,$hack,$validnum,$alivenum,$deathnum;
 	global $gamevars,$deepzones,$sentinel_typelist,$npc_away_from_deepzones;
 	
 	if (($gamestate > 10)&&($now > $atime)) {
@@ -458,7 +456,7 @@ function duel($time = 0,$keyitm = ''){
 //------游戏结束------
 //模式：0保留：程序故障；1：全部死亡；2：最后幸存；3：禁区解除；4：无人参加；5：核爆全灭；6：GM中止
 function gameover($time = 0, $mode = '', $winname = '') {
-	global $gamestate,$winmode,$alivenum,$winner,$now,$gamenum,$db,$tablepre,$gamenum,$starttime,$validnum,$hdamage,$hplayer;
+	global $gamestate,$winmode,$alivenum,$winner,$now,$gamenum,$db,$gtablepre,$tablepre,$gamenum,$starttime,$validnum,$hdamage,$hplayer;
 	if($gamestate < 10){return;}
 	if((!$mode)||(($mode==2)&&(!$winname))) {//在没提供游戏结束模式的情况下，自行判断模式
 		if($validnum <= 0) {//无激活者情况下，全部死亡
@@ -487,13 +485,13 @@ function gameover($time = 0, $mode = '', $winname = '') {
 		$winner = $winname;
 	}
 	$time = $time ? $time : $now;
-	$result = $db->query("SELECT gid FROM {$tablepre}winners ORDER BY gid DESC LIMIT 1");//判断当前游戏局数是否正确，以优胜列表为准
+	$result = $db->query("SELECT gid FROM {$gtablepre}winners ORDER BY gid DESC LIMIT 1");//判断当前游戏局数是否正确，以优胜列表为准
 	if($db->num_rows($result)&&($gamenum <= $db->result($result, 0))) {
 		$gamenum = $db->result($result, 0) + 1;
 	}
 	if($winmode == 4){//无人参加；不需要记录任何资料
 		$getime = $time;
-		$db->query("INSERT INTO {$tablepre}winners (gid,wmode,vnum,getime) VALUES ('$gamenum','$winmode','$validnum','$getime')");
+		$db->query("INSERT INTO {$gtablepre}winners (gid,wmode,vnum,getime) VALUES ('$gamenum','$winmode','$validnum','$getime')");
 	}	elseif(($winmode == 0)||($winmode == 1)||($winmode == 6)){//程序故障、全部死亡、GM中止，不需要记录优胜者资料
 		$gstime = $starttime;
 		$getime = $time;
@@ -502,7 +500,7 @@ function gameover($time = 0, $mode = '', $winname = '') {
 		$hk = $db->fetch_array($result);
 		$hkill = $hk['killnum'];
 		$hkp = $hk['name'];
-		$db->query("INSERT INTO {$tablepre}winners (gid,wmode,vnum,gtime,gstime,getime,hdmg,hdp,hkill,hkp) VALUES ('$gamenum','$winmode','$validnum','$gtime','$gstime','$getime','$hdamage','$hplayer','$hkill','$hkp')");
+		$db->query("INSERT INTO {$gtablepre}winners (gid,wmode,vnum,gtime,gstime,getime,hdmg,hdp,hkill,hkp) VALUES ('$gamenum','$winmode','$validnum','$gtime','$gstime','$getime','$hdamage','$hplayer','$hkill','$hkp')");
 	} else {//最后幸存、锁定解除、核爆全灭，需要记录优胜者资料
 		$result = $db->query("SELECT * FROM {$tablepre}players WHERE name='$winner' AND type=0");
 		$pdata = $db->fetch_array($result);
@@ -526,7 +524,7 @@ function gameover($time = 0, $mode = '', $winname = '') {
 				}
 			}
 		}
-		$result2 = $db->query("SELECT motto FROM {$tablepre}users WHERE username='$winner'");
+		$result2 = $db->query("SELECT motto FROM {$gtablepre}users WHERE username='$winner'");
 		$pdata['motto'] = $db->result($result2, 0);
 		$result3 = $db->query("SELECT name,killnum FROM {$tablepre}players WHERE type=0 order by killnum desc, lvl desc limit 1");
 		$hk = $db->fetch_array($result3);
@@ -541,7 +539,7 @@ function gameover($time = 0, $mode = '', $winname = '') {
 		$pdata['hdp'] = $hplayer;
 		$pdata['teamMate'] = !empty($team_mates) && count($team_mates)>1 ? implode("+",$team_mates) : '';
 		//$pdata['teamIcon'] = !empty($team_mates) ? 1 : 0;
-		$db->query("INSERT INTO {$tablepre}winners (gid,nick,name,pass,type,endtime,gd,sNo,icon,club,hp,mhp,sp,msp,ss,mss,att,def,pls,lvl,`exp`,money,bid,inf,rage,pose,tactic,killnum,killnum2,state,wp,wk,wg,wc,wd,wf,teamID,teamPass,teamMate,teamIcon,wep,wepk,wepe,weps,arb,arbk,arbe,arbs,arh,arhk,arhe,arhs,ara,arak,arae,aras,arf,arfk,arfe,arfs,art,artk,arte,arts,itm0,itmk0,itme0,itms0,itm1,itmk1,itme1,itms1,itm2,itmk2,itme2,itms2,itm3,itmk3,itme3,itms3,itm4,itmk4,itme4,itms4,itm5,itmk5,itme5,itms5,itm6,itmk6,itme6,itms6,motto,wmode,vnum,gtime,gstime,getime,hdmg,hdp,hkill,hkp,wepsk,arbsk,arhsk,arask,arfsk,artsk,itmsk0,itmsk1,itmsk2,itmsk3,itmsk4,itmsk5,itmsk6) VALUES ('".$gamenum."','".$pdata['nick']."','".$pdata['name']."','".$pdata['pass']."','".$pdata['type']."','".$pdata['endtime']."','".$pdata['gd']."','".$pdata['sNo']."','".$pdata['icon']."','".$pdata['club']."','".$pdata['hp']."','".$pdata['mhp']."','".$pdata['sp']."','".$pdata['msp']."','".$pdata['ss']."','".$pdata['mss']."','".$pdata['att']."','".$pdata['def']."','".$pdata['pls']."','".$pdata['lvl']."','".$pdata['exp']."','".$pdata['money']."','".$pdata['bid']."','".$pdata['inf']."','".$pdata['rage']."','".$pdata['pose']."','".$pdata['tactic']."','".$pdata['killnum']."','".$pdata['killnum2']."','".$pdata['state']."','".$pdata['wp']."','".$pdata['wk']."','".$pdata['wg']."','".$pdata['wc']."','".$pdata['wd']."','".$pdata['wf']."','".$pdata['teamID']."','".$pdata['teamPass']."','".$pdata['teamMate']."','".$pdata['teamIcon']."','".$pdata['wep']."','".$pdata['wepk']."','".$pdata['wepe']."','".$pdata['weps']."','".$pdata['arb']."','".$pdata['arbk']."','".$pdata['arbe']."','".$pdata['arbs']."','".$pdata['arh']."','".$pdata['arhk']."','".$pdata['arhe']."','".$pdata['arhs']."','".$pdata['ara']."','".$pdata['arak']."','".$pdata['arae']."','".$pdata['aras']."','".$pdata['arf']."','".$pdata['arfk']."','".$pdata['arfe']."','".$pdata['arfs']."','".$pdata['art']."','".$pdata['artk']."','".$pdata['arte']."','".$pdata['arts']."','".$pdata['itm0']."','".$pdata['itmk0']."','".$pdata['itme0']."','".$pdata['itms0']."','".$pdata['itm1']."','".$pdata['itmk1']."','".$pdata['itme1']."','".$pdata['itms1']."','".$pdata['itm2']."','".$pdata['itmk2']."','".$pdata['itme2']."','".$pdata['itms2']."','".$pdata['itm3']."','".$pdata['itmk3']."','".$pdata['itme3']."','".$pdata['itms3']."','".$pdata['itm4']."','".$pdata['itmk4']."','".$pdata['itme4']."','".$pdata['itms4']."','".$pdata['itm5']."','".$pdata['itmk5']."','".$pdata['itme5']."','".$pdata['itms5']."','".$pdata['itm6']."','".$pdata['itmk6']."','".$pdata['itme6']."','".$pdata['itms6']."','".$pdata['motto']."','".$pdata['wmode']."','".$pdata['vnum']."','".$pdata['gtime']."','".$pdata['gstime']."','".$pdata['getime']."','".$pdata['hdmg']."','".$pdata['hdp']."','".$pdata['hkill']."','".$pdata['hkp']."','".$pdata['wepsk']."','".$pdata['arbsk']."','".$pdata['arhsk']."','".$pdata['arask']."','".$pdata['arfsk']."','".$pdata['artsk']."','".$pdata['itmsk0']."','".$pdata['itmsk1']."','".$pdata['itmsk2']."','".$pdata['itmsk3']."','".$pdata['itmsk4']."','".$pdata['itmsk5']."','".$pdata['itmsk6']."')");
+		$db->query("INSERT INTO {$gtablepre}winners (gid,nick,name,pass,type,endtime,gd,sNo,icon,club,hp,mhp,sp,msp,ss,mss,att,def,pls,lvl,`exp`,money,bid,inf,rage,pose,tactic,killnum,killnum2,state,wp,wk,wg,wc,wd,wf,teamID,teamPass,teamMate,teamIcon,wep,wepk,wepe,weps,arb,arbk,arbe,arbs,arh,arhk,arhe,arhs,ara,arak,arae,aras,arf,arfk,arfe,arfs,art,artk,arte,arts,itm0,itmk0,itme0,itms0,itm1,itmk1,itme1,itms1,itm2,itmk2,itme2,itms2,itm3,itmk3,itme3,itms3,itm4,itmk4,itme4,itms4,itm5,itmk5,itme5,itms5,itm6,itmk6,itme6,itms6,motto,wmode,vnum,gtime,gstime,getime,hdmg,hdp,hkill,hkp,wepsk,arbsk,arhsk,arask,arfsk,artsk,itmsk0,itmsk1,itmsk2,itmsk3,itmsk4,itmsk5,itmsk6) VALUES ('".$gamenum."','".$pdata['nick']."','".$pdata['name']."','".$pdata['pass']."','".$pdata['type']."','".$pdata['endtime']."','".$pdata['gd']."','".$pdata['sNo']."','".$pdata['icon']."','".$pdata['club']."','".$pdata['hp']."','".$pdata['mhp']."','".$pdata['sp']."','".$pdata['msp']."','".$pdata['ss']."','".$pdata['mss']."','".$pdata['att']."','".$pdata['def']."','".$pdata['pls']."','".$pdata['lvl']."','".$pdata['exp']."','".$pdata['money']."','".$pdata['bid']."','".$pdata['inf']."','".$pdata['rage']."','".$pdata['pose']."','".$pdata['tactic']."','".$pdata['killnum']."','".$pdata['killnum2']."','".$pdata['state']."','".$pdata['wp']."','".$pdata['wk']."','".$pdata['wg']."','".$pdata['wc']."','".$pdata['wd']."','".$pdata['wf']."','".$pdata['teamID']."','".$pdata['teamPass']."','".$pdata['teamMate']."','".$pdata['teamIcon']."','".$pdata['wep']."','".$pdata['wepk']."','".$pdata['wepe']."','".$pdata['weps']."','".$pdata['arb']."','".$pdata['arbk']."','".$pdata['arbe']."','".$pdata['arbs']."','".$pdata['arh']."','".$pdata['arhk']."','".$pdata['arhe']."','".$pdata['arhs']."','".$pdata['ara']."','".$pdata['arak']."','".$pdata['arae']."','".$pdata['aras']."','".$pdata['arf']."','".$pdata['arfk']."','".$pdata['arfe']."','".$pdata['arfs']."','".$pdata['art']."','".$pdata['artk']."','".$pdata['arte']."','".$pdata['arts']."','".$pdata['itm0']."','".$pdata['itmk0']."','".$pdata['itme0']."','".$pdata['itms0']."','".$pdata['itm1']."','".$pdata['itmk1']."','".$pdata['itme1']."','".$pdata['itms1']."','".$pdata['itm2']."','".$pdata['itmk2']."','".$pdata['itme2']."','".$pdata['itms2']."','".$pdata['itm3']."','".$pdata['itmk3']."','".$pdata['itme3']."','".$pdata['itms3']."','".$pdata['itm4']."','".$pdata['itmk4']."','".$pdata['itme4']."','".$pdata['itms4']."','".$pdata['itm5']."','".$pdata['itmk5']."','".$pdata['itme5']."','".$pdata['itms5']."','".$pdata['itm6']."','".$pdata['itmk6']."','".$pdata['itme6']."','".$pdata['itms6']."','".$pdata['motto']."','".$pdata['wmode']."','".$pdata['vnum']."','".$pdata['gtime']."','".$pdata['gstime']."','".$pdata['getime']."','".$pdata['hdmg']."','".$pdata['hdp']."','".$pdata['hkill']."','".$pdata['hkp']."','".$pdata['wepsk']."','".$pdata['arbsk']."','".$pdata['arhsk']."','".$pdata['arask']."','".$pdata['arfsk']."','".$pdata['artsk']."','".$pdata['itmsk0']."','".$pdata['itmsk1']."','".$pdata['itmsk2']."','".$pdata['itmsk3']."','".$pdata['itmsk4']."','".$pdata['itmsk5']."','".$pdata['itmsk6']."')");
 	}
 	
 	//存在获胜者数据时 检查获胜者结局成就
@@ -638,7 +636,7 @@ function movehtm($atime = 0) {
 }

 function addnpc($type,$sub,$num,$time = 0,$clbstatus=NULL,$aitem=NULL,$apls=NULL) {
-	global $now,$db,$tablepre,$log,$plsinfo,$typeinfo,$arealist,$areanum,$gamecfg;
+	global $now,$db,$gtablepre,$tablepre,$log,$plsinfo,$typeinfo,$arealist,$areanum,$gamecfg;
 	global $hidding_typelist,$deepzones;
 	$time = $time == 0 ? $now : $time;
 	$plsnum = sizeof($plsinfo);
@@ -766,7 +764,7 @@ function addnpc($type,$sub,$num,$time = 0,$clbstatus=NULL,$aitem=NULL,$apls=NULL
 }

 function evonpc($type,$name){
-	global $now,$db,$tablepre,$log,$plsinfo,$typeinfo,$enpcinfo,$gamecfg;
+	global $now,$db,$gtablepre,$tablepre,$log,$plsinfo,$typeinfo,$enpcinfo,$gamecfg;
 	if(!$type || !$name){return false;}
 	if(empty($enpcinfo)){
 		include_once config('evonpc',$gamecfg);
@@ -823,7 +821,7 @@ function evonpc($type,$name){
 }

 function antiAFK($timelimit = 0){
-	global $now,$db,$tablepre,$antiAFKertime,$alivenum,$deathnum;
+	global $now,$db,$gtablepre,$tablepre,$antiAFKertime,$alivenum,$deathnum;
 	if(empty($timelimit)){
 		$timelimit = $antiAFKertime;
 	}
@@ -850,9 +848,9 @@ function antiAFK($timelimit = 0){
 }

 function set_credits(){
-	global $db,$tablepre,$winmode,$gamenum,$winner,$pdata,$gamblingon;
+	global $db,$gtablepre,$tablepre,$winmode,$gamenum,$winner,$pdata,$gamblingon;
 	$clist = $creditlist = $updatelist = Array();
-	$result = $db->query("SELECT * FROM {$tablepre}users RIGHT JOIN {$tablepre}players ON {$tablepre}players.name={$tablepre}users.username WHERE {$tablepre}players.type='0'");
+	$result = $db->query("SELECT * FROM {$gtablepre}users RIGHT JOIN {$tablepre}players ON {$tablepre}players.name={$gtablepre}users.username WHERE {$tablepre}players.type='0'");
 	while($data = $db->fetch_array($result)){
 		$clist[$data['name']] = $data;
 	}
@@ -869,24 +867,24 @@ function set_credits(){
 			'validgames' => $validgames,
 		);
 	}
-	$db->multi_update("{$tablepre}users", $updatelist,'username');
+	$db->multi_update("{$gtablepre}users", $updatelist,'username');
 	if($gamblingon){//赌注系统开启
 		$updatelist2 = get_gambling_result($clist,$winner,$winmode);
 		if($updatelist2){//必须分两次，因为涉及字段不同
-			$db->multi_update("{$tablepre}users", $updatelist2,'username');
+			$db->multi_update("{$gtablepre}users", $updatelist2,'username');
 		}
 	}
 	//var_dump($updatelist);
 	
 	
-	//$db->multi_update("{$tablepre}users", $updatelist2, 'username');
-	//$db->multi_update("{$tablepre}users", $updatelist2, 'username');
+	//$db->multi_update("{$gtablepre}users", $updatelist2, 'username');
+	//$db->multi_update("{$gtablepre}users", $updatelist2, 'username');
 //	$result = $db->query("SELECT * FROM {$tablepre}players WHERE type='0'");
 //	$list = $creditlist = $updatelist = Array();
 //	while($data = $db->fetch_array($result)){
 //		$list[$data['name']]['players'] = $data;
 //	}	
-//	$result = $db->query("SELECT * FROM {$tablepre}users WHERE lastgame='$gamenum'");
+//	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE lastgame='$gamenum'");
 //	while($data = $db->fetch_array($result)){
 //		$list[$data['username']]['users'] = $data;
 //	}
@@ -906,7 +904,7 @@ function set_credits(){
 //			}			
 //		}
 //	}
-//	$db->multi_update("{$tablepre}users", $updatelist, 'username');
+//	$db->multi_update("{$gtablepre}users", $updatelist, 'username');
 //	if(!empty($udghkey)){
 //		$udghkey = implode(',',$udghkey);
 //		$db->multi_update("{$tablepre}players", $upghlist, 'name', "name IN ($udghkey)");
@@ -922,12 +920,12 @@ function set_credits(){
 	//{
 		//$v=$val; 
 		//normalize_achievement($v,$c1,$c2);
-		//$res = $db->query("SELECT * FROM {$tablepre}users WHERE username='".$key."'" );
+		//$res = $db->query("SELECT * FROM {$gtablepre}users WHERE username='".$key."'" );
 		//$data=$db->fetch_array($res);
 		//$c1+=$data['credits']; $c2+=$data['credits2'];
-		//$db->query("UPDATE {$tablepre}users SET achievement='$v' WHERE username='".$key."'" );
-		//$db->query("UPDATE {$tablepre}users SET credits='$c1' WHERE username='".$key."'" );
-		//$db->query("UPDATE {$tablepre}users SET credits2='$c2' WHERE username='".$key."'" );
+		//$db->query("UPDATE {$gtablepre}users SET achievement='$v' WHERE username='".$key."'" );
+		//$db->query("UPDATE {$gtablepre}users SET credits='$c1' WHERE username='".$key."'" );
+		//$db->query("UPDATE {$gtablepre}users SET credits2='$c2' WHERE username='".$key."'" );
 	//}
 	return;
 }
@@ -963,7 +961,7 @@ function get_credit_up($data,$winner = '',$winmode = 0){
 }

 function get_gambling_result($clist, $winner='',$winmode=''){
-	global $db,$tablepre,$hdamage,$validnum,$now,$areanum,$areaadd;
+	global $db,$tablepre,$gtablepre,$hdamage,$validnum,$now,$areanum,$areaadd;
 	$gblog = '';
 	$gbfile = GAME_ROOT.TPLDIR.'/lastgb.htm';
 	if(!in_array($winmode,Array(2,3,5,7))){//无人获胜，全部赌注被冴冴吃掉
@@ -1019,7 +1017,7 @@ function get_gambling_result($clist, $winner='',$winmode=''){
 			if($bwlist){
 				$bnlist = array_keys($bwlist);
 				$bnstr = "('".implode("','",$bnlist)."')";
-				$result2 = $db->query("SELECT uid,username,credits2 FROM {$tablepre}users WHERE username IN $bnstr");
+				$result2 = $db->query("SELECT uid,username,credits2 FROM {$gtablepre}users WHERE username IN $bnstr");
 				while($udata = $db->fetch_array($result2)){
 					$bwlist[$udata['username']]['credits2'] = $udata['credits2'];
 				}
@@ -1045,7 +1043,7 @@ function get_gambling_result($clist, $winner='',$winmode=''){
 					if(is_array($updatelist) && isset($updatelist[$winner]['credits2'])){
 						$updatelist[$winner]['credits2'] += $wcrup;
 					}else{
-						$result3 = $db->query("SELECT uid,username,credits2 FROM {$tablepre}users WHERE username='$winner'");
+						$result3 = $db->query("SELECT uid,username,credits2 FROM {$gtablepre}users WHERE username='$winner'");
 						$wdata = $db->fetch_array($result3);
 						$updatelist[$winner] = Array('username' => $winner, 'credits2' => $wdata['credits2'] + $wcrup);
 					}
@@ -1064,7 +1062,7 @@ function get_gambling_result($clist, $winner='',$winmode=''){
 				if(is_array($updatelist) && isset($updatelist[$winner]['credits2'])){
 					$updatelist[$winner]['credits2'] += $wcrup;
 				}else{
-					$result3 = $db->query("SELECT uid,username,credits2 FROM {$tablepre}users WHERE username='$winner'");
+					$result3 = $db->query("SELECT uid,username,credits2 FROM {$gtablepre}users WHERE username='$winner'");
 					$wdata = $db->fetch_array($result3);
 					$updatelist[$winner] = Array('username' => $winner, 'credits2' => $wdata['credits2'] + $wcrup);
 				}

--- a/include/vnworld/vnmix.func.php
+++ b/include/vnworld/vnmix.func.php
@@ -39,11 +39,11 @@ function parse_queue_vnmix_info($carr)
 # 从数据库中读取全部或指定待审核配方文件
 function get_queue_vnmix_list($id=NULL)
 {
-	global $db,$tablepre;
+	global $db,$tablepre,$gtablepre;
 	if(isset($id))
 	{
 		$id = (int)$id;
-		$result = $db->query("SELECT * FROM {$tablepre}vnmixitem WHERE iid={$id}");
+		$result = $db->query("SELECT * FROM {$gtablepre}vnmixitem WHERE iid={$id}");
 		if($db->num_rows($result))
 		{
 			return $db->fetch_array($result);
@@ -51,7 +51,7 @@ function get_queue_vnmix_list($id=NULL)
 	}
 	else 
 	{
-		$result = $db->query("SELECT * FROM {$tablepre}vnmixitem ");
+		$result = $db->query("SELECT * FROM {$gtablepre}vnmixitem ");
 		if($db->num_rows($result))
 		{ 
 			while($t = $db->fetch_array($result,MYSQLI_ASSOC))

--- a/index.php
+++ b/index.php
@@ -17,10 +17,55 @@ if($gamestate > 10) {
 	}
 }

-
 $adminmsg = file_get_contents('./gamedata/adminmsg.htm') ;
 $systemmsg = file_get_contents('./gamedata/systemmsg.htm') ;
-include template('index');
+
+if(!empty($roomact))
+{
+	if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); }
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
+	if(!$db->num_rows($result)) { gexit($_ERROR['login_check'],__file__,__line__); }
+	$udata = $db->fetch_array($result);
+	if($udata['password'] != $cpass) { gexit($_ERROR['wrong_pw'], __file__, __line__); }
+	if($udata['groupid'] <= 0) { gexit($_ERROR['user_ban'], __file__, __line__); }
+
+	if(strpos($roomact,'join') !== false)
+	{
+		if(!empty($udata['roomid'])) gexit('你已经在房间里了，想加入其它房间要先从当前房间退出。', __file__, __line__);
+		$join_id = (int)str_replace("join","",$roomact);
+		if(in_array($join_id,range(1,$max_rooms)))
+		{
+			$db->query("UPDATE {$gtablepre}users SET roomid = {$join_id} WHERE username='$cuser'");
+			$result = $db->query("SELECT groomnums FROM {$gtablepre}game WHERE groomid = {$join_id}");
+			if($db->num_rows($result)) 
+			{ 
+				$join_nums = $db->fetch_array($result)[0] + 1;
+				$db->query("UPDATE {$gtablepre}game SET groomnums = {$join_nums} WHERE groomid = {$join_id}");
+			}
+		}
+		else 
+		{
+			gexit('要加入的房间不存在！', __file__, __line__);
+		}
+	}
+	if($roomact == 'exit')
+	{
+		if(empty($udata['roomid'])) gexit('你没有在任何房间里！', __file__, __line__);
+
+		$result = $db->query("SELECT groomnums FROM {$gtablepre}game WHERE groomid = {$udata['roomid']}");
+		if($db->num_rows($result)) 
+		{ 
+			$join_nums = $db->fetch_array($result)[0] - 1;
+			$db->query("UPDATE {$gtablepre}game SET groomnums = {$join_nums} WHERE groomid = {$udata['roomid']}");
+		}
+
+		$db->query("UPDATE {$gtablepre}users SET roomid = 0 WHERE username='$cuser'");
+	}
+}
+else 
+{
+	include template('index');
+}

 ?>


--- a/install/bra.sql
+++ b/install/bra.sql
@@ -5,26 +5,35 @@

 DROP TABLE IF EXISTS bra_game;
 CREATE TABLE bra_game (
-  gamenum mediumint(8) unsigned NOT NULL default 0,
-  gamestate tinyint unsigned NOT NULL default 0,
-  starttime int(10) unsigned NOT NULL default 0,
-  winmode tinyint unsigned NOT NULL default 0,
-  winner char(15) NOT NULL default '',
-  arealist varchar(255) NOT NULL default '',
-  areanum tinyint unsigned NOT NULL default 0,
-  areatime int(10) unsigned NOT NULL default 0,
-  areawarn tinyint unsigned NOT NULL default 0,
-  validnum smallint unsigned NOT NULL default 0,
-  alivenum smallint unsigned NOT NULL default 0,
-  deathnum smallint unsigned NOT NULL default 0,
-  afktime int(10) unsigned NOT NULL default 0,
-  optime int(10) unsigned NOT NULL default 0,
-  weather tinyint unsigned NOT NULL default 0,
-  hack tinyint(1) unsigned NOT NULL default 0,
-  combonum smallint unsigned NOT NULL default 0,
-  gamevars int unsigned NOT NULL default 0,
+  `gamenum` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `gamestate` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `groomid` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `groomnums` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `starttime` int(10) unsigned NOT NULL DEFAULT '0',
+  `winmode` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `winner` char(15) NOT NULL DEFAULT '',
+  `arealist` varchar(255) NOT NULL DEFAULT '',
+  `areanum` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `areatime` int(10) unsigned NOT NULL DEFAULT '0',
+  `areawarn` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `validnum` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `alivenum` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `deathnum` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `afktime` int(10) unsigned NOT NULL DEFAULT '0',
+  `optime` int(10) unsigned NOT NULL DEFAULT '0',
+  `weather` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `hack` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `hdamage` int(10) unsigned NOT NULL DEFAULT '0',
+  `hplayer` char(15) NOT NULL DEFAULT '',
+  `combonum` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `gamevars` text NOT NULL,
+  `noisevars` varchar(1000) NOT NULL DEFAULT '',
+  `rdown` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `bdown` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `ldown` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `kdown` tinyint(1) unsigned NOT NULL DEFAULT '0',

-  PRIMARY KEY  (gamenum)
+  PRIMARY KEY (`groomid`)

 ) TYPE=MyISAM;

@@ -41,26 +50,28 @@ INSERT INTO bra_game (gamenum) VALUES (0);

 DROP TABLE IF EXISTS bra_users;
 CREATE TABLE bra_users (
-  uid mediumint(8) unsigned NOT NULL auto_increment,
-  username char(15) NOT NULL default '',
-  `password` char(32) NOT NULL default '',
-  groupid tinyint unsigned NOT NULL default 0,
-  lastgame smallint unsigned NOT NULL default 0,
-  ip char(15) NOT NULL default '',
-  credits mediumint unsigned NOT NULL default 0,
-  credits2 mediumint unsigned NOT NULL default 0,
-  achievement text NOT NULL default '',
-  nick text NOT NULL default '',
-  nicks text NOT NULL default '',
-  validgames smallint unsigned NOT NULL default 0,
-  wingames smallint unsigned NOT NULL default 0,
-  gender char(1) NOT NULL default 0,
-  icon tinyint unsigned NOT NULL default 0,
-  club tinyint unsigned NOT NULL default 0,
-  motto char(30) NOT NULL default '',
-  killmsg char(30) NOT NULL default '',
-  lastword char(30) NOT NULL default '',
-  
+  `uid` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `username` char(15) NOT NULL DEFAULT '',
+  `password` char(32) NOT NULL DEFAULT '',
+  `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `roomid` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `lastgame` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ip` char(15) NOT NULL DEFAULT '',
+  `credits` int(10) NOT NULL DEFAULT '0',
+  `credits2` mediumint(9) NOT NULL DEFAULT '0',
+  `achievement` text NOT NULL,
+  `achrev` text NOT NULL,
+  `daily` varchar(255) NOT NULL DEFAULT '',
+  `nick` text NOT NULL,
+  `nicks` text NOT NULL,
+  `validgames` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `wingames` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `gender` char(1) NOT NULL DEFAULT '0',
+  `icon` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `club` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `motto` char(30) NOT NULL DEFAULT '',
+  `killmsg` char(30) NOT NULL DEFAULT '',
+  `lastword` char(30) NOT NULL DEFAULT '',
  PRIMARY KEY  (uid),
  UNIQUE KEY username (username)

@@ -78,117 +89,128 @@ CREATE TABLE bra_users (

 DROP TABLE IF EXISTS bra_winners;
 CREATE TABLE bra_winners (
-  gid mediumint unsigned NOT NULL default 0,
-  type tinyint unsigned NOT NULL default 0,
-  name char(15) NOT NULL default '',
-  pass char(32) NOT NULL default '',
-  gd char(1) NOT NULL default 'm',
-  sNo smallint unsigned NOT NULL default 0,
-  icon tinyint unsigned NOT NULL default 0,
-  club tinyint unsigned NOT NULL default 0,
-  endtime int(10) unsigned NOT NULL default 0,
-  hp smallint unsigned NOT NULL default 0,
-  mhp smallint unsigned NOT NULL default 0,
-  sp smallint unsigned NOT NULL default 0,
-  msp smallint unsigned NOT NULL default 0,
-  att smallint unsigned NOT NULL default 0,
-  def smallint unsigned NOT NULL default 0,
-  pls tinyint unsigned NOT NULL default 0,
-  lvl tinyint unsigned NOT NULL default 0,
-  `exp` smallint unsigned NOT NULL default 0,
-  money smallint unsigned NOT NULL default 0,
-  bid smallint unsigned NOT NULL default 0,
-  `inf` char(10) not null default '',
-  rage tinyint unsigned NOT NULL default 0,
-  pose tinyint(1) unsigned NOT NULL default 0,
-  tactic tinyint(1) unsigned NOT NULL default 0,
-  killnum smallint unsigned NOT NULL default 0,
-  killnum2 smallint unsigned NOT NULL default 0,
-  state tinyint unsigned NOT NULL default 0,
-  `wp` smallint unsigned not null default 0,
-  `wk` smallint unsigned not null default 0,
-  `wg` smallint unsigned not null default 0,
-  `wc` smallint unsigned not null default 0,
-  `wd` smallint unsigned not null default 0,
-  `wf` smallint unsigned not null default 0,
-  `teamID` char(15) not null default '',
-  `teamPass` char(15) not null default '',
+  `gid` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `nick` text NOT NULL,
+  `skillpoint` smallint unsigned NOT NULL default '0',
+  `name` char(15) NOT NULL DEFAULT '',
+  `pass` char(32) NOT NULL DEFAULT '',
+  `gd` char(1) NOT NULL DEFAULT 'm',
+  `sNo` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `icon` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `club` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `endtime` int(10) unsigned NOT NULL DEFAULT '0',
+  `hp` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `mhp` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `sp` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `msp` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ss` smallint unsigned NOT NULL default '0',
+  `mss` smallint unsigned NOT NULL default '0',
+  `att` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `def` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `pls` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `lvl` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `exp` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `money` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `bid` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `inf` char(10) NOT NULL DEFAULT '',
+  `rage` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `pose` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `tactic` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `killnum` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `killnum2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `state` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `wp` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `wk` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `wg` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `wc` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `wd` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `wf` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `teamID` char(15) NOT NULL DEFAULT '',
+  `teamPass` char(15) NOT NULL DEFAULT '',
+  `teamMate` text NOT NULL default '',
+  `teamIcon` smallint unsigned NOT NULL default '0',
  wep char(30) NOT NULL default '',
-  wepk char(5) not null default '',
-  wepe mediumint unsigned NOT NULL default 0,
-  weps char(5) not null default 0,
-  wepsk char(5) not null default '',
+  wepk char(40) not null default '',
+  wepe int(10) unsigned NOT NULL DEFAULT '0',
+  weps char(10) not null default '0',
+  wepsk char(40) not null default '',
+  wep2 char(30) NOT NULL default '',
+  wep2k char(40) not null default '',
+  wep2e int(10) unsigned NOT NULL DEFAULT '0',
+  wep2s char(10) not null default '0',
+  wep2sk char(40) not null default '',
  arb char(30) NOT NULL default '',
-  arbk char(5) not null default '',
-  arbe mediumint unsigned NOT NULL default 0,
-  arbs char(5) not null default 0,
-  arbsk char(5) not null default '',
+  arbk char(40) not null default '',
+  arbe int(10) unsigned NOT NULL DEFAULT '0',
+  arbs char(10) not null default '0',
+  arbsk char(40) not null default '',
  arh char(30) NOT NULL default '',
-  arhk char(5) not null default '',
-  arhe mediumint unsigned NOT NULL default 0,
-  arhs char(5) not null default 0,
-  arhsk char(5) not null default '',
+  arhk char(40) not null default '',
+  arhe int(10) unsigned NOT NULL DEFAULT '0',
+  arhs char(10) not null default '0',
+  arhsk char(40) not null default '',
  ara char(30) NOT NULL default '',
-  arak char(5) not null default '',
-  arae mediumint unsigned NOT NULL default 0,
-  aras char(5) not null default 0,
-  arask char(5) not null default '',
+  arak char(40) not null default '',
+  arae int(10) unsigned NOT NULL DEFAULT '0',
+  aras char(10) not null default '0',
+  arask char(40) not null default '',
  arf char(30) NOT NULL default '',
-  arfk char(5) not null default '',
-  arfe mediumint unsigned NOT NULL default 0,
-  arfs char(5) not null default 0,
-  arfsk char(5) not null default '',
+  arfk char(40) not null default '',
+  arfe int(10) unsigned NOT NULL DEFAULT '0',
+  arfs char(10) not null default '0',
+  arfsk char(40) not null default '',
  art char(30) NOT NULL default '',
-  artk char(5) not null default '',
-  arte mediumint unsigned NOT NULL default 0,
-  arts char(5) not null default 0,
-  artsk char(5) not null default '',
+  artk char(40) not null default '',
+  arte int(10) unsigned NOT NULL DEFAULT '0',
+  arts char(10) not null default '0',
+  artsk char(40) not null default '',
  itm0 char(30) NOT NULL default '',
-  itmk0 char(5) not null default '',
-  itme0 mediumint unsigned NOT NULL default 0,
-  itms0 char(5) not null default 0,
-  itmsk0 char(5) not null default '',
+  itmk0 char(40) not null default '',
+  itme0 int(10) unsigned NOT NULL DEFAULT '0',
+  itms0 char(10) not null default '0',
+  itmsk0 char(40) not null default '',
  itm1 char(30) NOT NULL default '',
-  itmk1 char(5) not null default '',
-  itme1 mediumint unsigned NOT NULL default 0,
-  itms1 char(5) not null default 0,
-  itmsk1 char(5) not null default '',
+  itmk1 char(40) not null default '',
+  itme1 int(10) unsigned NOT NULL DEFAULT '0',
+  itms1 char(10) not null default '0',
+  itmsk1 char(40) not null default '',
  itm2 char(30) NOT NULL default '',
-  itmk2 char(5) not null default '',
-  itme2 mediumint unsigned NOT NULL default 0,
-  itms2 char(5) not null default 0,
-  itmsk2 char(5) not null default '',
+  itmk2 char(40) not null default '',
+  itme2 int(10) unsigned NOT NULL DEFAULT '0',
+  itms2 char(10) not null default '0',
+  itmsk2 char(40) not null default '',
  itm3 char(30) NOT NULL default '',
-  itmk3 char(5) not null default '',
-  itme3 mediumint unsigned NOT NULL default 0,
-  itms3 char(5) not null default 0,
-  itmsk3 char(5) not null default '',
+  itmk3 char(40) not null default '',
+  itme3 int(10) unsigned NOT NULL DEFAULT '0',
+  itms3 char(10) not null default '0',
+  itmsk3 char(40) not null default '',
  itm4 char(30) NOT NULL default '',
-  itmk4 char(5) not null default '',
-  itme4 mediumint unsigned NOT NULL default 0,
-  itms4 char(5) not null default 0,
-  itmsk4 char(5) not null default '',
+  itmk4 char(40) not null default '',
+  itme4 int(10) unsigned NOT NULL DEFAULT '0',
+  itms4 char(10) not null default '0',
+  itmsk4 char(40) not null default '',
  itm5 char(30) NOT NULL default '',
-  itmk5 char(5) not null default '',
-  itme5 mediumint unsigned NOT NULL default 0,
-  itms5 char(5) not null default 0,
-  itmsk5 char(5) not null default '',
+  itmk5 char(40) not null default '',
+  itme5 int(10) unsigned NOT NULL DEFAULT '0',
+  itms5 char(10) not null default '0',
+  itmsk5 char(40) not null default '',
  itm6 char(30) NOT NULL default '',
-  itmk6 char(5) not null default '',
-  itme6 mediumint unsigned NOT NULL default 0,
-  itms6 char(5) not null default 0,
-  itmsk6 char(5) not null default '',
-  motto char(30) NOT NULL default '',
-  wmode tinyint unsigned NOT NULL default 0,
-  vnum smallint unsigned NOT NULL default 0,
-  gtime int(10) unsigned NOT NULL default 0,
-  gstime int(10) unsigned NOT NULL default 0,
-  getime int(10) unsigned NOT NULL default 0,
-  hdmg int unsigned NOT NULL default 0,
-  hdp char(15) NOT NULL default '',
-  hkill smallint unsigned NOT NULL default 0,
-  hkp char(15) NOT NULL default '',
-
+  itmk6 char(40) not null default '',
+  itme6 int(10) unsigned NOT NULL DEFAULT '0',
+  itms6 char(10) not null default '0',
+  itmsk6 char(40) not null default '',
+  `motto` char(30) NOT NULL DEFAULT '',
+  `wmode` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `vnum` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `gtime` int(10) unsigned NOT NULL DEFAULT '0',
+  `gstime` int(10) unsigned NOT NULL DEFAULT '0',
+  `getime` int(10) unsigned NOT NULL DEFAULT '0',
+  `hdmg` int(10) unsigned NOT NULL DEFAULT '0',
+  `hdp` char(15) NOT NULL DEFAULT '',
+  `hkill` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `hkp` char(15) NOT NULL DEFAULT '',
+  
  UNIQUE KEY (gid)
 ) TYPE=MyISAM;


--- a/login.php
+++ b/login.php
@@ -98,7 +98,7 @@ if(preg_match($iplimit,$onlineip)){

 //	foreach($iplimit as $value){
 //		$ippart=explode('.',$value);
-//		if(count($ippart)>1 && count($ippart)<4){//֤IP2-4
+//		if(count($ippart)>1 && count($ippart)<4){//��֤IP����2-4��
 //			$value=str_replace('*','',implode('.',$ippart));
 //			if(strpos($onlineip,$value)===0){
 //				gexit($_ERROR['banned_ip'],__file__,__line__);
@@ -116,11 +116,11 @@ $groupid = 1;
 $credits = 0;
 $gender = 0;

-$result = $db->query("SELECT * FROM {$tablepre}users WHERE username = '$username'");
+$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username = '$username'");
 if(!$db->num_rows($result)) {
 	gexit($_ERROR['user_not_exists'],__file__,__line__);
 	//$groupid = 1;
-	//$db->query("INSERT INTO {$tablepre}users (username,`password`,groupid,ip,credits,gender) VALUES ('$username', '$password', '$groupid', '$onlineip', '$credits', '$gender')");
+	//$db->query("INSERT INTO {$gtablepre}users (username,`password`,groupid,ip,credits,gender) VALUES ('$username', '$password', '$groupid', '$onlineip', '$credits', '$gender')");
 } else {
 	$userdata = $db->fetch_array($result);
 	if($userdata['groupid'] <= 0){
@@ -129,7 +129,17 @@ if(!$db->num_rows($result)) {
 		gexit($_ERROR['wrong_pw'],__file__,__line__);
 	}
 }
-$db->query("UPDATE {$tablepre}users SET ip='$onlineip' WHERE username = '$username'");
+# 重新登录后退出当前房间
+if(!empty($userdata['roomid']))
+{
+	$result = $db->query("SELECT groomnums FROM {$gtablepre}game WHERE groomid = {$userdata['roomid']}");
+	if($db->num_rows($result)) 
+	{ 
+		$join_nums = $db->fetch_array($result)[0] - 1;
+		$db->query("UPDATE {$gtablepre}game SET groomnums = {$join_nums} WHERE groomid = {$userdata['roomid']}");
+	}
+}
+$db->query("UPDATE {$gtablepre}users SET ip='$onlineip',roomid=0 WHERE username = '$username'");
 gsetcookie('user',$username);
 gsetcookie('pass',$password);
 //}

--- a/login_old.php
+++ b/login_old.php
@@ -54,10 +54,10 @@ if(!$username||!$password){
 	$credits = 0;
 	$gender = 0;

-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE username = '$username'");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username = '$username'");
 	if(!$db->num_rows($result)) {
 		$groupid = 1;
-		$db->query("INSERT INTO {$tablepre}users (username,`password`,groupid,ip,credits,gender) VALUES ('$username', '$password', '$groupid', '$onlineip', '$credits', '$gender')");
+		$db->query("INSERT INTO {$gtablepre}users (username,`password`,groupid,ip,credits,gender) VALUES ('$username', '$password', '$groupid', '$onlineip', '$credits', '$gender')");
 	} else {
 		$userdata = $db->fetch_array($result);
 		if($userdata['groupid'] <= 0){

--- a/rank.php
+++ b/rank.php
@@ -6,7 +6,7 @@ require './include/common.inc.php';
 require './include/game.func.php';
 include_once GAME_ROOT.'./include/game/titles.func.php';

-$result = $db->query("SELECT COUNT(*) FROM {$tablepre}users");
+$result = $db->query("SELECT COUNT(*) FROM {$gtablepre}users");
 $count = $db->result($result,0);
 if($ranklimit < 1){$ranklimit = 1;}
 //$ostart = -1;
@@ -41,12 +41,12 @@ if($ranklimit < 1){$ranklimit = 1;}
 //}

 if(!isset($checkmode) || $checkmode == 'credits'){
-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE validgames>0 ORDER BY credits DESC, credits2 DESC, wingames DESC, uid ASC LIMIT $ranklimit");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE validgames>0 ORDER BY credits DESC, credits2 DESC, wingames DESC, uid ASC LIMIT $ranklimit");
 }elseif($checkmode == 'credits2'){
-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE validgames>0 ORDER BY credits2 DESC, credits DESC, wingames DESC, uid ASC LIMIT $ranklimit");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE validgames>0 ORDER BY credits2 DESC, credits DESC, wingames DESC, uid ASC LIMIT $ranklimit");
 }elseif($checkmode == 'winrate'){
 	$mingames = $winratemingames >= 1 ? $winratemingames : 1;
-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE validgames>='$mingames' ORDER BY (wingames/validgames) DESC, credits DESC, credits2 DESC, uid ASC LIMIT $ranklimit");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE validgames>='$mingames' ORDER BY (wingames/validgames) DESC, credits DESC, credits2 DESC, uid ASC LIMIT $ranklimit");
 }
 $rankdata = Array();
 $n = 1;
@@ -63,7 +63,7 @@ while($data = $db->fetch_array($result)){
 }

 if(isset($schname) && !empty($schname)){
-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$schname'");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$schname'");
 	if(!$db->num_rows($result)){
 	}
 }
@@ -84,10 +84,10 @@ if(isset($checkmode)){
 function schname($schname){
 	global $db,$tablepre;
 	$schrst = Array();
-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$schname'");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$schname'");
 	if($db->num_rows($result)){
 		$schobj = $db->fetch_array($result);
-		$result2=$db->query("SELECT COUNT FROM {$tablepre}users WHERE ");
+		$result2=$db->query("SELECT COUNT FROM {$gtablepre}users WHERE ");
 	}
 }
 ?>
\ No newline at end of file
--- a/register.php
+++ b/register.php
@@ -32,7 +32,7 @@ if(!isset($cmd)){
 	}elseif(preg_match($iplimit,$onlineip)){
 		$gamedata['innerHTML']['info'] = $_ERROR['ip_banned'];
 	}else{
-		$result = $db->query("SELECT * FROM {$tablepre}users WHERE username = '$username'");
+		$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username = '$username'");
 		if($db->num_rows($result) > 0) {
 			$gamedata['innerHTML']['info'] = $_ERROR['name_exists'];
 		}else{//现在开始注册
@@ -41,8 +41,8 @@ if(!isset($cmd)){
 			$password = md5($npass);
 			$nick='参展者';
 			$nicks='参展者';
-			$result = $db->query("INSERT INTO {$tablepre}users (username,password,groupid,ip,credits,gender,icon,motto,killmsg,lastword) VALUES ('$username', '$password', '$groupid', '$onlineip', '$credits', '$gender', '$icon', '$motto', '$killmsg', '$lastword')");
-			$db->query("UPDATE {$tablepre}users SET nick='$nick', nicks='$nicks' WHERE username='".$username."'" );
+			$result = $db->query("INSERT INTO {$gtablepre}users (username,password,groupid,ip,credits,gender,icon,motto,killmsg,lastword) VALUES ('$username', '$password', '$groupid', '$onlineip', '$credits', '$gender', '$icon', '$motto', '$killmsg', '$lastword')");
+			$db->query("UPDATE {$gtablepre}users SET nick='$nick', nicks='$nicks' WHERE username='".$username."'" );
 			if($result){
 				$gamedata['innerHTML']['info'] = $_INFO['reg_success'];
 				$ustate = 'check';

--- a/sp_ilist.php
+++ b/sp_ilist.php
@@ -5,7 +5,7 @@ define('CURSCRIPT', 'sp_ilist');
 require './include/common.inc.php';

 if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); }
-$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$cuser'");
+$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
 if(!$db->num_rows($result)) { gexit($_ERROR['login_check'],__file__,__line__); }
 $udata = $db->fetch_array($result);
 if($udata['password'] != $cpass) { gexit($_ERROR['wrong_pw'], __file__, __line__); }

--- a/stat.php
+++ b/stat.php
@@ -6,7 +6,7 @@ require './include/common.inc.php';

 $k=(int)$_GET['lim'];

-$result = $db->query("SELECT ip FROM {$tablepre}users WHERE lastgame>='$k'");
+$result = $db->query("SELECT ip FROM {$gtablepre}users WHERE lastgame>='$k'");

 $cnt=0;


--- a/templates/default/index.htm
+++ b/templates/default/index.htm
@@ -8,7 +8,15 @@
 	<tr>
 		<td><span class="yellow">{lang now}：</span></td>
 		<td style="text-align:left;"><span class="evergreen">{lang gamedate}</span></td>
-		<td rowspan="4" style="width:400px;vertical-align:top;text-align:left;padding:0 0 0 25px;"><span class="evergreen">$adminmsg</span></td>
+		<td rowspan="4" style="width:400px;vertical-align:top;text-align:left;padding:0 0 0 25px;">
+			<span class="evergreen">
+				$adminmsg
+			</span>
+			<br>
+			<span class="evergreen">
+				{template roomlist}
+			</span>
+		</td>
 	</tr>
 	<tr>
 		<td><span class="yellow">{lang systemmsg}：</span></td>
@@ -17,6 +25,9 @@
 	<tr>
 		<td><span class="yellow">{lang gameinfo}：</span></td>
 		<td style="text-align:left;"><span class="evergreen"><span class="evergreen2">{lang numinfo}{$gstate[$gamestate]}</span></span></td>
+		<td rowspan="4" style="float: right;">
+			
+		</td>
 	</tr>
 	<tr>
 		<td colspan="2" style="vertical-align:top;">
@@ -38,9 +49,13 @@
 				<!--{/if}-->
 				</div>
 				<div>
-				上局结果：<span id="lastwin">$gwin[$winmode]</span>
-				<!--{if $winner}-->
-				，优胜者：<span id="lastwinner">$winner</span>
+				<!--{if $rid}-->
+					<span class="yellow">当前房间：{$rid} 号</span> 
+				<!--{else}-->
+					上局结果：<span id="lastwin">$gwin[$winmode]</span>
+					<!--{if $winner}-->
+					，优胜者：<span id="lastwinner">$winner</span>
+					<!--{/if}-->
 				<!--{/if}-->
 				</div>
 				

--- a/templates/default/itemmix_tips.htm
+++ b/templates/default/itemmix_tips.htm
@@ -27,15 +27,6 @@
 	<!--{/if}-->
 <!--{elseif $itemcmd == 'elementmix'}-->
 	<style>
-		table.infotable {
-			float: left;
-			margin-top: 10px;
-			position:relative;
-			text-align: center;
-			border-radius: 3px; 
-			border:2px solid rgba(225, 124, 226, 0.25);
-		}
-		table.infotable td,
 		table.infotable th {
 			width: 55px;
 			text-align: center;

--- a/templates/default/roomlist.htm
+++ b/templates/default/roomlist.htm
+<span class="evergreen">当前房间列表：<br>（房间状态更新可能存在延迟，如果发现房间状态不对请刷新几次）</span><br>
+<div style="height:5px;">&nbsp;</div>
+<form method="post" name="roomact" onsubmit="return false;" >
+<input type="hidden" name="roomact" id="roomact" value="">
+<div class="scroll-pane-roomlist" style="width:520px;max-height:300px;"> 
+
+	<table CellSpacing=0 CellPadding=0 class="infotable">
+		<tr>
+			<td class="b1" width="60px">编号</td>
+			<!--<td class="b1" width="80px">游戏模式</td>-->
+			<td class="b1" width="60px">状态</td>
+			<!--<td class="b1" width="120px">创建者/房主</td>-->
+			<td class="b1" width="60px">人数</td>
+			<!--<td class="b1" width="120px">运行时间</td>-->
+			<td class="b1" width="80px">操作</td>
+		</tr>
+		<!--{loop range(1,$max_rooms) $rkey}-->
+		<tr>
+			<td class="b3" width="60px" height="30px">
+				$rkey
+			</td>
+			<!--<td class="b3" width="80px">游戏模式</td>-->
+			<td class="b3" width="60px">
+				<!--{if !empty($roomlist[$rkey]['gamestate'])}-->
+					$gstate[$roomlist[$rkey]['gamestate']]
+				<!--{else}-->
+					<span class="grey">未开启</span>
+				<!--{/if}-->
+			</td>
+			<!--<td class="b3" width="120px">
+					房主
+			</td>-->
+			<td class="b3" width="60px">
+				<!--{if !empty($roomlist[$rkey]['groomnums'])}-->
+					<span class="yellow">$roomlist[$rkey]['groomnums']</span>
+				<!--{else}-->
+					<span class="grey">-</span>
+				<!--{/if}-->
+			</td>
+			<!--<td class="b3" width="120px">运行时间</td>-->
+			<td class="b3" width="80px">
+				<!--{if !empty($rid)}-->
+					<!--{if $rid == $rkey}-->
+						<input type="button" value="退出房间" onclick="$('roomact').value='exit';postCmd('roomact','index.php');setTimeout(function(){window.location.href='index.php';},300);disabled=true;" >
+					<!--{else}-->
+						<span class="grey">-</span>
+					<!--{/if}-->
+				<!--{else}-->
+					<input type="button" value="加入房间" onclick="$('roomact').value='join{$rkey}';postCmd('roomact','index.php');setTimeout(function(){window.location.href='index.php';},300);disabled=true;" >
+				<!--{/if}-->
+			</td>
+		</tr>
+		<!--{/loop}-->
+	</table>
+</div>
+</form>
+<div style="height:5px;">&nbsp;</div>
\ No newline at end of file
--- a/user.php
+++ b/user.php
@@ -8,7 +8,7 @@ include_once GAME_ROOT.'./include/game/titles.func.php';

 if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); }

-$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$cuser'");
+$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
 if(!$db->num_rows($result)) { gexit($_ERROR['login_check'],__file__,__line__); }
 $udata = $db->fetch_array($result);
 if($udata['password'] != $cpass) { gexit($_ERROR['wrong_pw'], __file__, __line__); }
@@ -75,7 +75,7 @@ if($mode == 'edit') {
 	if ($icon>$iconlimit) $icon=0;
 	$volume = round($volume/100,2); $volume = round(min(1,max(0,$volume)),2);
 	gsetcookie('volume',$volume,86400*30,0);
-	$db->query("UPDATE {$tablepre}users SET gender='$gender', icon='$icon',{$passqry}motto='$motto',  killmsg='$killmsg', lastword='$lastword', credits='$credits', credits2='$credits2' ,nick='$nick' WHERE username='$cuser'");
+	$db->query("UPDATE {$gtablepre}users SET gender='$gender', icon='$icon',{$passqry}motto='$motto',  killmsg='$killmsg', lastword='$lastword', credits='$credits', credits2='$credits2' ,nick='$nick' WHERE username='$cuser'");
 	if($db->affected_rows()){
 		$gamedata['innerHTML']['info'] .= $_INFO['data_success'];
 	}else{

--- a/user_profile.php
+++ b/user_profile.php
@@ -11,7 +11,7 @@ if (empty($_REQUEST["playerID"]))
 {
 	if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); }

-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$cuser'");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
 	if(!$db->num_rows($result)) { gexit($_ERROR['login_check'],__file__,__line__); }
 	$udata = $db->fetch_array($result);
 	if($udata['password'] != $cpass) { gexit($_ERROR['wrong_pw'], __file__, __line__); }
@@ -23,7 +23,7 @@ if (empty($_REQUEST["playerID"]))
 else
 {
 	$uname=$_REQUEST["playerID"];
-	$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$uname'");
+	$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$uname'");
 	if(!$db->num_rows($result)) { gexit($_ERROR['user_not_exists'],__file__,__line__); }
 	$udata = $db->fetch_array($result);
 	extract($udata);
@@ -96,7 +96,7 @@ if(!empty($udata['achievement']) && empty($udata['achrev']))
 		}
 	}
 	$new_ach = json_encode($new_ach);
-	$db->query("UPDATE {$tablepre}users SET achrev='$new_ach' WHERE username='".$udata['username']."'" );
+	$db->query("UPDATE {$gtablepre}users SET achrev='$new_ach' WHERE username='".$udata['username']."'" );
 	$cpl = Array(); $prc = Array();
 }
 //解析成就的完成情况

--- a/valid.php
+++ b/valid.php
@@ -10,7 +10,7 @@ if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); }
 if($gamestate < 20) { gexit($_ERROR['no_start'],__file__,__line__); }
 //if($gamestate >= 30) { gexit($_ERROR['valid_stop'],__file__,__line__); }

-$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$cuser'");
+$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
 if(!$db->num_rows($result)) { gexit($_ERROR['login_check'],__file__,__line__); }
 $udata = $db->fetch_array($result);
 $wingames = $udata['wingames'];
@@ -23,7 +23,7 @@ if($gamestate >= 30 && $udata['groupid'] < 6 && $cuser != $gamefounder) {

 if($mode == 'enter') {
 	if($iplimit) {
-		$result = $db->query("SELECT * FROM {$tablepre}users AS u, {$tablepre}players AS p WHERE u.ip='{$udata['ip']}' AND ( u.username=p.name AND p.type=0)");
+		$result = $db->query("SELECT * FROM {$gtablepre}users AS u, {$tablepre}players AS p WHERE u.ip='{$udata['ip']}' AND ( u.username=p.name AND p.type=0)");
 		if($db->num_rows($result) > $iplimit) { gexit($_ERROR['ip_limit'],__file__,__line__); }
 	}	

@@ -61,13 +61,13 @@ if($mode == 'enter') {
 			}
 		}
 		$new_ach = json_encode($new_ach);
-		$db->query("UPDATE {$tablepre}users SET achrev='$new_ach' WHERE username='".$udata['username']."'" );
+		$db->query("UPDATE {$gtablepre}users SET achrev='$new_ach' WHERE username='".$udata['username']."'" );
 		$cpl = Array(); $prc = Array();
 	}

 	//$ip = real_ip();
 	$ip = $udata['ip'];
-	$db->query("UPDATE {$tablepre}users SET gender='$gender', nick='$nick', icon='$icon', motto='$motto', killmsg='$killmsg', lastword='$lastword' WHERE username='".$udata['username']."'" );
+	$db->query("UPDATE {$gtablepre}users SET gender='$gender', nick='$nick', icon='$icon', motto='$motto', killmsg='$killmsg', lastword='$lastword' WHERE username='".$udata['username']."'" );
 	if($validnum >= $validlimit) {
 		gexit($_ERROR['player_limit'],__file__, __line__);
 	}
@@ -116,7 +116,7 @@ if($mode == 'enter') {
 	$achievement = $udata['achievement'];
 	if (!valid_achievement($achievement)) {
 		$achievement=init_achievement($achievement);
-		$db->query("UPDATE {$tablepre}users SET achievement='$achievement' WHERE username='".$name."'" );		//如果第一次游戏，初始化成就
+		$db->query("UPDATE {$gtablepre}users SET achievement='$achievement' WHERE username='".$name."'" );		//如果第一次游戏，初始化成就
 	}*/
 	for ($i=0; $i<=6; $i++){$itm[$i] = $itmk[$i] = $itmsk[$i] = ''; $itme[$i] = $itms[$i] = 0;}
 	$itm[1] = '面包'; $itmk[1] = 'HH'; $itme[1] = 120; $itms[1] = 15;
@@ -256,7 +256,7 @@ if($mode == 'enter') {
 	if (($nicks=='')||($nick=='')){
 		$nick='参展者';
 		$nicks='参展者';
-		$db->query("UPDATE {$tablepre}users SET nick='$nick', nicks='$nicks' WHERE username='".$udata['username']."'" );
+		$db->query("UPDATE {$gtablepre}users SET nick='$nick', nicks='$nicks' WHERE username='".$udata['username']."'" );
 	}else{
 		if (strpos($nicks,$nick)===false){
 			$nick='弱子';
@@ -306,7 +306,7 @@ if($mode == 'enter') {
 	if(!empty($ndata)) $db->array_insert("{$tablepre}players", $ndata);
 	
 	//$db->query("INSERT INTO {$tablepre}players (name,pass,type,endtime,validtime,gd,sNo,icon,club,hp,mhp,sp,msp,att,def,pls,lvl,`exp`,money,bid,inf,rage,pose,tactic,killnum,state,wp,wk,wg,wc,wd,wf,teamID,teamPass,wep,wepk,wepe,weps,arb,arbk,arbe,arbs,arh,arhk,arhe,arhs,ara,arak,arae,aras,arf,arfk,arfe,arfs,art,artk,arte,arts,itm0,itmk0,itme0,itms0,itm1,itmk1,itme1,itms1,itm2,itmk2,itme2,itms2,itm3,itmk3,itme3,itms3,itm4,itmk4,itme4,itms4,itm5,itmk5,itme5,itms5,itm6,itmk6,itme6,itms6,wepsk,arbsk,arhsk,arask,arfsk,artsk,itmsk0,itmsk1,itmsk2,itmsk3,itmsk4,itmsk5,itmsk6,nick,nicks) VALUES ('$name','$pass','$type','$endtime','$validtime','$gd','$sNo','$icon','$club','$hp','$mhp','$sp','$msp','$att','$def','$pls','$lvl','$exp','$money','$bid','$inf','$rage','$pose','$tactic','$state','$killnum','$wp','$wk','$wg','$wc','$wd','$wf','$teamID','$teamPass','$wep','$wepk','$wepe','$weps','$arb','$arbk','$arbe','$arbs','$arh','$arhk','$arhe','$arhs','$ara','$arak','$arae','$aras','$arf','$arfk','$arfe','$arfs','$art','$artk','$arte','$arts','$itm[0]','$itmk[0]','$itme[0]','$itms[0]','$itm[1]','$itmk[1]','$itme[1]','$itms[1]','$itm[2]','$itmk[2]','$itme[2]','$itms[2]','$itm[3]','$itmk[3]','$itme[3]','$itms[3]','$itm[4]','$itmk[4]','$itme[4]','$itms[4]','$itm[5]','$itmk[5]','$itme[5]','$itms[5]','$itm[6]','$itmk[6]','$itme[6]','$itms[6]','$wepsk','$arbsk','$arhsk','$arask','$arfsk','$artsk','$itmsk[0]','$itmsk[1]','$itmsk[2]','$itmsk[3]','$itmsk[4]','$itmsk[5]','$itmsk[6]','$nick','$nicks')");
-	$db->query("UPDATE {$tablepre}users SET lastgame='$gamenum' WHERE username='$name'");
+	$db->query("UPDATE {$gtablepre}users SET lastgame='$gamenum' WHERE username='$name'");
 	global $nick;
 	if($udata['groupid'] >= 6 || $cuser == $gamefounder){
 		addnews($now,'newgm',$nickinfo.' '.$name,"{$sexinfo[$gd]}{$sNo}号",$ip,$nick);

--- a/vn_postitem.php
+++ b/vn_postitem.php
@@ -9,7 +9,7 @@ include_once GAME_ROOT.'./include/vnworld/vnmix.func.php';
 /*** 登陆检测 ***/
 if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); }

-$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$cuser'");
+$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
 if(!$db->num_rows($result)) { gexit($_ERROR['login_check'],__file__,__line__); }
 $udata = $db->fetch_array($result);
 if($udata['password'] != $cpass) { gexit($_ERROR['wrong_pw'], __file__, __line__); }
@@ -95,7 +95,7 @@ if(isset($exmode))
 			goto error_flag;
 		}
 		// 通过检查，更新对应配方
-		$db->array_update("{$tablepre}vnmixitem",$earr,"iid = '$edit_id'");
+		$db->array_update("{$gtablepre}vnmixitem",$earr,"iid = '$edit_id'");
 		// 保存对应log
 		if($gmflag) vn_adminlog('编辑了配方',$edit_result);
 		$vlog .= '<span class="yellow">成功编辑了配方！</span><br>';
@@ -105,7 +105,7 @@ if(isset($exmode))
 	# 提交删除
 	elseif($exmode == 'dp')
 	{
-		$db->query("DELETE FROM {$tablepre}vnmixitem WHERE iid = '$edit_id'");
+		$db->query("DELETE FROM {$gtablepre}vnmixitem WHERE iid = '$edit_id'");
 		if($gmflag) vn_adminlog('删除了配方',$edit_result);
 		$vlog = '删除了配方。<br>';
 		$vdata['url'] = 'vnworld.php?vtips=2';
@@ -125,13 +125,13 @@ if(isset($exmode))
 				goto error_flag;
 			}
 			writeover_vn_mixilst($earr);
-			$db->query("DELETE FROM {$tablepre}vnmixitem WHERE iid = '$edit_id'");
+			$db->query("DELETE FROM {$gtablepre}vnmixitem WHERE iid = '$edit_id'");
 			$vdata['url'] = 'vnworld.php?vtips=3&vcs='.$edit_st.'';
 		}
 		# 审核不通过
 		else 
 		{
-			$db->query("UPDATE {$tablepre}vnmixitem SET istatus = '$edit_st' WHERE iid = '$edit_id'");
+			$db->query("UPDATE {$gtablepre}vnmixitem SET istatus = '$edit_st' WHERE iid = '$edit_id'");
 			$vdata['url'] = 'vnworld.php?vtips=4&vcs='.$edit_st.'';
 		}
 		if($gmflag) vn_adminlog('改变了以下配方状态',$edit_result,$edit_st);
@@ -162,10 +162,10 @@ elseif($vnmode=='postmode')
 	// 参数合法，补全剩余参数
 	$earr['creator'] = $udata['username']; $earr['istatus'] = 0; 
 	// 保存至数据库
-	$db->array_insert("{$tablepre}vnmixitem", $earr);
+	$db->array_insert("{$gtablepre}vnmixitem", $earr);
 	// 结算切糕
 	$c2 -= $vnmix_c2_cost;
-	$db->query("UPDATE {$tablepre}users SET credits2='$c2' WHERE uid='$cid'");
+	$db->query("UPDATE {$gtablepre}users SET credits2='$c2' WHERE uid='$cid'");
 	$vlog .= '<span class="yellow">成功保存了配方！当前切糕数：'.$c2.'</span><br>';
 	$vdata['url'] = 'vnworld.php?vtips=0';
 	goto error_flag;

--- a/vndbup.php
+++ b/vndbup.php
@@ -5,13 +5,13 @@ define('CURSCRIPT', 'dbup');
 require './include/common.inc.php';

 if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); }
-$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$cuser'");
+$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
 if(!$db->num_rows($result)) { gexit($_ERROR['login_check'],__file__,__line__); }
 $udata = $db->fetch_array($result);
 if($udata['password'] != $cpass) { gexit($_ERROR['wrong_pw'], __file__, __line__); }
 elseif(($udata['groupid'] <= 1)&&($cuser!==$gamefounder)) { gexit($_ERROR['no_admin'], __file__, __line__); }

-$query = $db->query("SHOW TABLES LIKE '{$tablepre}vnmixitem'", 'SILENT');
+$query = $db->query("SHOW TABLES LIKE '{$gtablepre}vnmixitem'", 'SILENT');
 //print_r($query);
 if(!$db->num_rows($query))
 {
@@ -39,7 +39,7 @@ if(!$db->num_rows($query))
 			$vr['itme'] = $arr['result'][2] ?: '';
 			$vr['itms'] = $arr['result'][3] ?: '';
 			$vr['itmsk'] = $arr['result'][4] ? implode('',$arr['result'][4]) : '';
-			$db->array_insert("{$tablepre}vnmixitem",$vr);
+			$db->array_insert("{$gtablepre}vnmixitem",$vr);
 		}
 		echo "Old data clear.<br>";
 	}

--- a/vnworld.php
+++ b/vnworld.php
@@ -9,7 +9,7 @@ require config('vnworld',$gamecfg);
 /*** 登陆检测 ***/
 if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); }

-$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$cuser'");
+$result = $db->query("SELECT * FROM {$gtablepre}users WHERE username='$cuser'");
 if(!$db->num_rows($result)) { gexit($_ERROR['login_check'],__file__,__line__); }
 $udata = $db->fetch_array($result);
 if($udata['password'] != $cpass) { gexit($_ERROR['wrong_pw'], __file__, __line__); }

--- a/winner.php
+++ b/winner.php
@@ -7,7 +7,7 @@ include_once GAME_ROOT.'./include/game/titles.func.php';

 if(!isset($command)){$command = 'ref';}
 if($command == 'info') {
-	$result = $db->query("SELECT * FROM {$tablepre}winners WHERE gid='$gnum' LIMIT 1");
+	$result = $db->query("SELECT * FROM {$gtablepre}winners WHERE gid='$gnum' LIMIT 1");
 	$pdata = $db->fetch_array($result);
 	$pdata['gdate'] = floor($pdata['gtime']/3600).':'.floor($pdata['gtime']%3600/60).':'.($pdata['gtime']%60);
 	$pdata['gsdate'] = date("m/d/Y H:i:s",$pdata['gstime']);
@@ -24,9 +24,9 @@ if($command == 'info') {
 	}
 } else {
 	if(!isset($start) || !$start){
-		$result = $db->query("SELECT gid,name,nick,icon,gd,wep,wmode,teamID,teamMate,teamIcon,getime,motto,hdp,hdmg,hkp,hkill FROM {$tablepre}winners ORDER BY gid desc LIMIT $winlimit");
+		$result = $db->query("SELECT gid,name,nick,icon,gd,wep,wmode,teamID,teamMate,teamIcon,getime,motto,hdp,hdmg,hkp,hkill FROM {$gtablepre}winners ORDER BY gid desc LIMIT $winlimit");
 	} else {
-		$result = $db->query("SELECT gid,name,nick,icon,gd,wep,wmode,teamID,teamMate,teamIcon,getime,motto,hdp,hdmg,hkp,hkill FROM {$tablepre}winners WHERE gid<='$start' ORDER BY gid desc LIMIT $winlimit");
+		$result = $db->query("SELECT gid,name,nick,icon,gd,wep,wmode,teamID,teamMate,teamIcon,getime,motto,hdp,hdmg,hkp,hkill FROM {$gtablepre}winners WHERE gid<='$start' ORDER BY gid desc LIMIT $winlimit");
 	}
 	while($wdata = $db->fetch_array($result)) {
 		$wdata['date'] = date("Y-m-d",$wdata['getime']);