Merge pull request #44 from hikawiier/waaagh

TAT

command.php

@@ -96,7 +96,7 @@ if($hp > 0){
 	//如果身上存在时效性技能，检查技能是否超时
 	if($hp > 0 && !empty($clbpara['lasttimes'])) check_skilllasttimes();
 	//应用眩晕状态效果
-	if($hp > 0 && in_array('inf_dizzy',$clbpara['skill']))
+	if($hp > 0 && !empty($clbpara['skill']) && in_array('inf_dizzy',$clbpara['skill']))
 	{
 		$dizzy_times = (($clbpara['starttimes']['inf_dizzy'] + $clbpara['lasttimes']['inf_dizzy']) - $now)*1000;
 		$log .= '<span class="yellow">你现在处于眩晕状态，什么都做不了！</span><br>眩晕状态持续时间还剩：<span id="timer" class="yellow">'.$dizzy_times.'</span>秒<br><script type="text/javascript">demiSecTimerStarter('.$dizzy_times.');</script>';

game.php

@@ -133,7 +133,18 @@ elseif((strpos($action,'neut')===0)){
 }
 if($hp > 0 && $coldtimeon && $showcoldtimer && $rmcdtime){$log .= "行动冷却时间：<span id=\"timer\" class=\"yellow\">0.0</span>秒<script type=\"text/javascript\">demiSecTimerStarter($rmcdtime);</script><br>";}
 //如果身上存在时效性技能，检查技能是否超时
-if($hp > 0 && !empty($clbpara['lasttimes'])) check_skilllasttimes();
+if($hp > 0 && !empty($clbpara['lasttimes']))
+{
+	$flag = check_skilllasttimes();
+	if($flag)
+	{
+		$pdata = current_player_save();
+		$pdata['clbpara'] = get_clbpara($pdata['clbpara']);
+		extract($pdata);
+		init_playerdata();
+		init_profile();
+	}
+}
 if($hp > 0 && in_array('inf_dizzy',$clbpara['skill']))
 {
 	$dizzy_times = (($clbpara['starttimes']['inf_dizzy'] + $clbpara['lasttimes']['inf_dizzy']) - $now)*1000;

include/game.func.php

@@ -699,6 +699,7 @@ function check_skilllasttimes(&$data=NULL)
 				lostclubskill($sk,$para);
 				$sk_name = $cskills[$sk]['name'];
 				$log.="<span class='yellow'>{$nm}从{$sk_name}状态中恢复了！</span><br>";
+				return 1;
 			}
 		}
 	}