Commit 9a15d1e1 authored by hisuinohoshi's avatar hisuinohoshi

fix

修复:
NPC击杀玩家时也会尝试判断完成成就的问题(成就可能会算到和NPC同名的账户身上…^ ^;);
修复了祖传的管理后台杀人加幸存数的问题;
parent 9d3d5dec
...@@ -44,7 +44,7 @@ if($command == 'kill' || $command == 'live' || $command == 'del') { ...@@ -44,7 +44,7 @@ if($command == 'kill' || $command == 'live' || $command == 'del') {
$operlist[${'npc_'.$i}] = $npcdata[$i]['name'].'(PID:'.$npcdata[$i]['pid'].')'; $operlist[${'npc_'.$i}] = $npcdata[$i]['name'].'(PID:'.$npcdata[$i]['pid'].')';
$npcdata[$i]['hp'] = $npcdata[$i]['mhp']; $npcdata[$i]['hp'] = $npcdata[$i]['mhp'];
$npcdata[$i]['state'] = 0; $npcdata[$i]['state'] = 0;
$deathnum --;$alivenum++; $deathnum --; //$alivenum++;
adminlog('livenpc',$npcdata[$i]['name']); adminlog('livenpc',$npcdata[$i]['name']);
}else{ }else{
$gfaillist[] = $npcdata[$i]['name'].'(PID:'.$npcdata[$i]['pid'].')'; $gfaillist[] = $npcdata[$i]['name'].'(PID:'.$npcdata[$i]['pid'].')';
...@@ -55,7 +55,7 @@ if($command == 'kill' || $command == 'live' || $command == 'del') { ...@@ -55,7 +55,7 @@ if($command == 'kill' || $command == 'live' || $command == 'del') {
$operlist[${'npc_'.$i}] = $npcdata[$i]['name'].'(PID:'.$npcdata[$i]['pid'].')'; $operlist[${'npc_'.$i}] = $npcdata[$i]['name'].'(PID:'.$npcdata[$i]['pid'].')';
$npcdata[$i]['hp'] = 0; $npcdata[$i]['hp'] = 0;
$npcdata[$i]['state'] = 16; $npcdata[$i]['state'] = 16;
$deathnum --;$alivenum++; $deathnum ++;//$alivenum++;
adminlog('delnpc',$npcdata[$i]['name']); adminlog('delnpc',$npcdata[$i]['name']);
}else{ }else{
$operlist2[${'npc_'.$i}] = $npcdata[$i]['name'].'(PID:'.$npcdata[$i]['pid'].')'; $operlist2[${'npc_'.$i}] = $npcdata[$i]['name'].'(PID:'.$npcdata[$i]['pid'].')';
......
...@@ -57,7 +57,7 @@ if($command == 'kill' || $command == 'live' || $command == 'del') { ...@@ -57,7 +57,7 @@ if($command == 'kill' || $command == 'live' || $command == 'del') {
$operlist[${'pc_'.$i}] = $pcdata[$i]['name']; $operlist[${'pc_'.$i}] = $pcdata[$i]['name'];
$pcdata[$i]['hp'] = 0; $pcdata[$i]['hp'] = 0;
$pcdata[$i]['state'] = 16; $pcdata[$i]['state'] = 16;
$deathnum --;$alivenum++; $deathnum ++;$alivenum--;
adminlog('delpc',$pcdata[$i]['name']); adminlog('delpc',$pcdata[$i]['name']);
addnews($now,'death16',$pcdata[$i]['name']); addnews($now,'death16',$pcdata[$i]['name']);
}else{ }else{
......
...@@ -600,9 +600,12 @@ ...@@ -600,9 +600,12 @@
get_killer_rp($pa,$pd,$active); get_killer_rp($pa,$pd,$active);
# 执行死亡事件(灵魂绑定等) # 执行死亡事件(灵魂绑定等)
check_death_events($pa,$pd,$active); check_death_events($pa,$pd,$active);
# 检查成就 # 检查成就 大补丁:击杀者是玩家时才会检查成就
include_once GAME_ROOT.'./include/game/achievement.func.php'; if(!$pa['type'])
check_battle_achievement($pa['name'],$pd['type'],$pd['name'],$pa['wep_name']); {
include_once GAME_ROOT.'./include/game/achievement.func.php';
check_battle_achievement($pa['name'],$pd['type'],$pd['name'],$pa['wep_name']);
}
# 保存游戏进行状态 # 保存游戏进行状态
include_once GAME_ROOT.'./include/system.func.php'; include_once GAME_ROOT.'./include/system.func.php';
save_gameinfo(); save_gameinfo();
......
...@@ -168,7 +168,8 @@ function nparse_news($start = 0, $range = 0 ){//$type = '') { ...@@ -168,7 +168,8 @@ function nparse_news($start = 0, $range = 0 ){//$type = '') {
} else { } else {
$newsinfo .= "<li>{$hour}{$min}{$sec}秒,<span class=\"yellow\">$a</span>因<span class=\"red\">不明原因</span>死亡"; $newsinfo .= "<li>{$hour}{$min}{$sec}秒,<span class=\"yellow\">$a</span>因<span class=\"red\">不明原因</span>死亡";
} }
$dname = $typeinfo[$b].' '.$a; if($b) $dname = $typeinfo[$b].' '.$a;
else $dname = $typeinfo[0].' '.$a;
// if($b == 0) { // if($b == 0) {
// //$dname = $a; // //$dname = $a;
// $lwresult = $db->query("SELECT lastword FROM {$tablepre}users WHERE username = '$a'"); // $lwresult = $db->query("SELECT lastword FROM {$tablepre}users WHERE username = '$a'");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment