Merge pull request #63 from hikawiier/waaagh

fix

include/game.func.php

@@ -297,13 +297,13 @@ function init_battle_rev($pa,$pd,$ismeet=0)
 	global $sdata,$tdata,$battle_title,$hpcolor;
 	include_once GAME_ROOT.'./include/init.func.php';
 	//初始化头像显示
-	init_icon_states($pa,$ismeet); init_icon_states($pd,$ismeet);
+	init_icon_states($pa,1); init_icon_states($pd,$ismeet);
 	//初始化状态显示
-	init_hp_states($pa,$ismeet); init_hp_states($pd,$ismeet);
+	init_hp_states($pa,1); init_hp_states($pd,$ismeet);
 	//初始化武器信息
-	init_wep_states($pa,$ismeet); init_wep_states($pd,$ismeet);
+	init_wep_states($pa,1); init_wep_states($pd,$ismeet);
 	//初始化异常状态信息
-	init_inf_states($pa,$ismeet); init_inf_states($pd,$ismeet);
+	init_inf_states($pa,1); init_inf_states($pd,$ismeet);
 	//传参
 	$sdata = $pa; $tdata = $pd;
 }

include/init.func.php

@@ -6,17 +6,19 @@ if(!defined('IN_GAME')) {
 
 function init_icon_states(&$pa,$ismeet=0)
 {
-	global $sexinfo,$fog;
+	global $sexinfo,$typeinfo,$fog;
 	//雾天显示？？？
 	if($fog && !$ismeet)
 	{
-		$pa['sNoinfo'] = '？？？';
+		$pa['typeinfo'] = '？？？';
+		$pa['sNoinfo'] = '';
 		$pa['iconImg'] = 'question.gif';
 		$pa['iconImgB'] = '';
 		return;
 	}
 	//更新编号情报
 	$pa['sNoinfo'] = "(".$sexinfo[$pa['gd']].$pa['sNo']."号)";
+	$pa['typeinfo'] = $typeinfo[$pa['type']];
 	//更新头像情报
 	$itype = $pa['type'] > 0 ? 'n' : $pa['gd'];
 	$iname = $itype.'_'.$pa['icon']; 
@@ -39,7 +41,6 @@ function init_hp_states(&$pa,$ismeet=0)
 		$pa['hpstate'] = '？？？';
 		$pa['spstate'] = '？？？';
 		$pa['ragestate'] = '？？？';
-		$pa['name'] = '';
 		return;
 	}
 	if($pa['hp'] <= 0)
@@ -96,6 +97,7 @@ function init_wep_states(&$pa,$ismeet=0)
 	global $wepeinfo,$fog;
 	if($fog && !$ismeet)
 	{
+		$pa['wepestate'] = '？？？';
 		$pa['wep_words'] = '？？？';
 		$pa['wepk_words'] = '？？？';
 		return;
@@ -124,12 +126,20 @@ function init_wep_states(&$pa,$ismeet=0)
 
 function init_inf_states(&$pa,$ismeet=0)
 {
-	global $infinfo,$fog;
+	global $infinfo,$poseinfo,$tacinfo,$fog;
 	if($fog && !$ismeet)
 	{
+		$pa['nameinfo'] = '？？？';
+		$pa['lvlinfo'] = '？？？';
+		$pa['poseinfo'] = '？？？';
+		$pa['tacinfo'] = '？？？';
 		$pa['infdata'] = '？？？';
 		return;
 	}
+	$pa['nameinfo'] = $pa['name'];
+	$pa['lvlinfo'] = 'Lv. '.$pa['lvl'];
+	$pa['poseinfo'] = $poseinfo[$pa['pose']];
+	$pa['tacinfo'] = $tacinfo[$pa['tactic']];
 	//更新受伤状态
 	if($pa['inf']) 
 	{

templates/default/battle_rev.htm

@@ -20,9 +20,9 @@
 		<td colspan=2 width=580px>
 			<table border="0" cellspacing="0" height=75px width=580px cellpadding="0" width="100%" valign="middle">
 				<tr>
-					<td class="b1" colspan=2 height=20px><span>Lv. $tdata['lvl']</span></td>											
-					<td class="b1" colspan=2><span>$tdata['name']</span></td>											
-					<td class="b1" colspan=2><span>{$typeinfo[$tdata['type']]}{$tdata['sNoinfo']}</span><!--{if $sdata['club']==19}--> 【<span class="lime">报应点数：<span id="anum">$tdata['rp']</span></span>】<!--{/if}--></td>											
+					<td class="b1" colspan=2 height=20px><span>$tdata['lvlinfo']</span></td>											
+					<td class="b1" colspan=2><span>$tdata['nameinfo']</span></td>											
+					<td class="b1" colspan=2><span>{$tdata['typeinfo']}{$tdata['sNoinfo']}</span><!--{if $sdata['club']==19}--> 【<span class="lime">报应点数：<span id="anum">$tdata['rp']</span></span>】<!--{/if}--></td>											
 				</tr>
 				<tr>
 					<td class="b2" width=70px height=20px><span>{lang rage}</span></td>
@@ -42,9 +42,9 @@
 				</tr>
 				<tr>
 					<td class="b2" height=20px><span>{lang tactic}</span></td>
-					<td class="b3"><span><!--{if $tdata['tactic'] >= 0}-->$tacinfo[$tdata['tactic']]<!--{else}-->？？？<!--{/if}--></span></td>
+					<td class="b3"><span>$tdata['tacinfo']</span></td>
 					<td class="b2"><span>{lang pose}</span></td>
-					<td class="b3"><span><!--{if $tdata['pose'] >= 0}-->$poseinfo[$tdata['pose']]<!--{else}-->？？？<!--{/if}--></span></td>
+					<td class="b3"><span>$tdata['poseinfo']</span></td>
 					<td height="20px" class="b2"><span>{lang inf}</span></td>
 					<td class="b3"><span>$tdata['infdata']</span></td>
 				</tr>