update & fix

gamedata/cache/resources_1.php

@@ -68,7 +68,27 @@ $clubinfo = Array(
 );
 //新游戏开局时会生成的天气：晴天、多云、小雨、暴雨、下雪；
 $rswtharr = Array(0,2,3,4,7);
-$wthinfo = Array('晴天','大晴','多云','小雨','暴雨','台风','雷雨','下雪','起雾','浓雾','<span class="yellow">瘴气</span>','<span class="red">龙卷风</span>','<span class="clan">暴风雪</span>','<span class="blue">冰雹</span>','<span class="linen">离子暴</span>','<span class="green">辐射尘</span>','<span class="purple">臭氧洞</span>','<span class="gold">极光</span>','<span class="minirainbow">光玉雨</span>');
+$wthinfo = Array(
+	0 => '晴天',
+	1 => '大晴',
+	2 => '多云',
+	3 => '小雨',
+	4 => '暴雨',
+	5 => '台风',
+	6 => '雷雨',
+	7 => '下雪',
+	8 => '起雾',
+	9 => '浓雾',
+	10 => '<span class="yellow">瘴气</span>',
+	11 => '<span class="red">龙卷风</span>',
+	12 => '<span class="clan">暴风雪</span>',
+	13 => '<span class="blue">冰雹</span>',
+	14 => '<span class="linen">离子暴</span>',
+	15 => '<span class="green">辐射尘</span>',
+	16 => '<span class="purple">臭氧洞</span>',
+	17 => '<span class="gold">极光</span>',
+	18 => '<span class="minirainbow">光玉雨</span>'
+);
 $sexinfo = Array(0=> '未定', 'm' => '男生', 'f' => '女生');
 $raceinfo = Array(0=> '人类', 1=> '兽人', 2=> '妖精', 3=> '龙', 4=> '鱼人', 5=> 'ＡＩ');
 $hpinfo = Array('<span class="clan">并无大碍</span>','<span class="yellow">伤痕累累</span>','<span class="red">生命危险</span>','<span class="red">已经死亡</span>');
@@ -1190,16 +1210,16 @@ $depots = Array(5,28);
 $shops = Array(0,14,27);
 $hospitals = Array(11,19,32);
 $plsinfo = Array(
-	0=>'无月之影',
-	1=>'端点',
-	2=>'RF高校',
-	3=>'雪之镇',
-	4=>'索拉利斯',
-	5=>'指挥中心',
-	6=>'梦幻馆',
-	7=>'清水池',
-	8=>'白穗神社',
-	9=>'墓地',
+	0=> '无月之影',
+	1=> '端点',
+	2=> 'RF高校',
+	3=> '雪之镇',
+	4=> '索拉利斯',
+	5=> '指挥中心',
+	6=> '梦幻馆',
+	7=> '清水池',
+	8=> '白穗神社',
+	9=> '墓地',
 	10=>'麦斯克林',
 	11=>'对天使用作战本部',
 	12=>'夏之镇',

include/game/revbattle.calc.php

@@ -28,6 +28,8 @@ namespace revbattle
 		# 社团技能对遇敌率的修正
 		$enemyrate = calc_clbskill_meetman_rate($pa,$enemyrate);
 
+		//echo "enemyrate = {$enemyrate}";
+
 		return $enemyrate;
 	}
 
@@ -130,7 +132,7 @@ namespace revbattle
 		# pd持有「天助」时的效果判定：
 		if(!check_skill_unlock('c6_godsend',$pd))
 		{
-			$sk_r = get_skilllvl('c6_godsend','hidegain',$pd['clbpara']);
+			$sk_r = get_skillpara('c6_godsend','hidegain',$pd['clbpara']);
 			if(!empty($sk_r)) $r += $sk_r;
 		}
 		# pd处于「暗杀」状态下的效果判定：

include/news.func.php

@@ -141,9 +141,9 @@ function  nparse_news($start = 0, $range = 0  ){//$type = '') {
 				}
 			} elseif($news == 'death27') {
 				if(($c)&&($c!=' ')){
-					$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>因触发了<span class=\"yellow\">$c</span>设置的陷阱{$d}被杀死";
+					$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>因触发了<span class=\"yellow\">$c</span>设置的陷阱<span class=\"red\">{$d}</span>被杀死";
 				} else {
-					$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>因触发了陷阱{$d}被杀死";
+					$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>因触发了陷阱<span class=\"red\">{$d}</span>被杀死";
 				}
 			} elseif($news == 'death28') {
 				$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>因<span class=\"yellow\">$d</span>意外身亡";

include/roommng.func.php

@@ -18,7 +18,7 @@ function roommng_verify_db_game_structure()
 	$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");
+		$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");
@@ -66,21 +66,31 @@ function roommng_create_new_room(&$udata)
 	}
 
 	# 统计当前已新建房间数量
-	$result = $db->query("SELECT * FROM {$gtablepre}game WHERE groomid>0 ");
+	$result = $db->query("SELECT groomid FROM {$gtablepre}game WHERE groomid>0 ");
 	$now_room_nums = $db->num_rows($result);
 	if($now_room_nums >= $max_rooms)
 	{
 		$rerror = 'room_num_limit';
 		return;
 	}
+	
+	if($now_room_nums)
+	{
+		$room_ids = range(1,$max_rooms);
+		$now_room_ids = $db->fetch_array($result);
+		$new_room_id = array_shift(array_diff($room_ids,$now_room_ids));
+	}
+	else 
+	{
+		$new_room_id = 1;
+	}
 
 	# 新建并初始化房间状态
-	$now_room_nums++;
 	$starttime = $now + $startmin*5;
-	$db->query("INSERT INTO {$gtablepre}game (gamenum,groomid,groomownid,gamestate,starttime) VALUES ('1','$now_room_nums','{$udata['username']}','0','$starttime')");
-	
+	$db->query("INSERT INTO {$gtablepre}game (gamenum,groomid,groomownid,gamestate,starttime) VALUES ('1','$new_room_id','{$udata['username']}','0','$starttime')");
+
 	# 加入房间
-	roommng_join_room($now_room_nums,$udata);
+	roommng_join_room($new_room_id,$udata);
 
 	return;
 }