Commit 91391883 authored by hisuinohoshi's avatar hisuinohoshi

fix fix

变化:
- 小幅度上调了各类型枪械弹匣容量;

修正:
- 入场时角色数据不完整的问题;
parent 2c143b37
...@@ -92,7 +92,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -92,7 +92,7 @@ function itemuse($itmn,&$data=NULL) {
// 装备道具时,进行单次套装检测 // 装备道具时,进行单次套装检测
include_once GAME_ROOT.'./include/game/itemmain.func.php'; include_once GAME_ROOT.'./include/game/itemmain.func.php';
reload_single_set_item($pdata,$eqp,$itm,1); reload_single_set_item($data,$eqp,$itm,1);
${$eqp} = $itm; ${$eqp} = $itm;
${$eqp.'k'} = $itmk; ${$eqp.'k'} = $itmk;
...@@ -107,9 +107,9 @@ function itemuse($itmn,&$data=NULL) { ...@@ -107,9 +107,9 @@ function itemuse($itmn,&$data=NULL) {
// 替换装备时,进行单次套装检测 // 替换装备时,进行单次套装检测
// 先检测目前穿的装备 // 先检测目前穿的装备
include_once GAME_ROOT.'./include/game/itemmain.func.php'; include_once GAME_ROOT.'./include/game/itemmain.func.php';
reload_single_set_item($pdata,$eqp,${$eqp}); reload_single_set_item($data,$eqp,${$eqp});
// 再检测要替换的装备,类型为1,表示装备 // 再检测要替换的装备,类型为1,表示装备
reload_single_set_item($pdata,$eqp,$itm,1); reload_single_set_item($data,$eqp,$itm,1);
$itmt = ${$eqp}; $itmt = ${$eqp};
$itmkt = ${$eqp.'k'}; $itmkt = ${$eqp.'k'};
...@@ -292,9 +292,9 @@ function itemuse($itmn,&$data=NULL) { ...@@ -292,9 +292,9 @@ function itemuse($itmn,&$data=NULL) {
} }
$edata['wep_name'] = $itm; $edata['wep_name'] = $itm;
include_once GAME_ROOT.'./include/state.func.php'; include_once GAME_ROOT.'./include/state.func.php';
$last = pre_kill_events($edata,$pdata,0,'poison'); $last = pre_kill_events($edata,$data,0,'poison');
if($itmsk == $pdata['pid']) $last = 0; if($itmsk == $data['pid']) $last = 0;
final_kill_events($edata,$pdata,0,$last); final_kill_events($edata,$data,0,$last);
player_save($edata); //current_player_save(); player_save($edata); //current_player_save();
} else { } else {
//$bid = 0; //$bid = 0;
...@@ -332,7 +332,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -332,7 +332,7 @@ function itemuse($itmn,&$data=NULL) {
if ($exp >= $upexp) { if ($exp >= $upexp) {
include_once GAME_ROOT . './include/state.func.php'; include_once GAME_ROOT . './include/state.func.php';
lvlup_rev($pdata,$pdata,1); lvlup_rev($data,$data,1);
} }
if ($itms != $nosta) { if ($itms != $nosta) {
$itms --; $itms --;
...@@ -351,7 +351,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -351,7 +351,7 @@ function itemuse($itmn,&$data=NULL) {
} }
if (strpos ($wepk,'WG')===false){ if (strpos ($wepk,'WG')===false){
if ($itmk=='GBh'){ if ($itmk=='GBh'){
$bulletnum = 1; $bulletnum = 3;
}else{ }else{
$log .= "<span class=\"red\">枪械类型和弹药类型不匹配。</span><br>"; $log .= "<span class=\"red\">枪械类型和弹药类型不匹配。</span><br>";
$mode = 'command'; $mode = 'command';
...@@ -364,7 +364,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -364,7 +364,7 @@ function itemuse($itmn,&$data=NULL) {
return; return;
} elseif (strpos ( $wepsk, 'e' ) !== false || strpos ( $wepsk, 'w' ) !== false) { } elseif (strpos ( $wepsk, 'e' ) !== false || strpos ( $wepsk, 'w' ) !== false) {
if ($itmk == 'GBe') { if ($itmk == 'GBe') {
$bulletnum = 10; $bulletnum = 18;
} else { } else {
$log .= "<span class=\"red\">枪械类型和弹药类型不匹配。</span><br>"; $log .= "<span class=\"red\">枪械类型和弹药类型不匹配。</span><br>";
$mode = 'command'; $mode = 'command';
...@@ -372,7 +372,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -372,7 +372,7 @@ function itemuse($itmn,&$data=NULL) {
} }
} elseif (strpos ( $wepsk, 'i' ) !== false || strpos ( $wepsk, 'u' ) !== false) { } elseif (strpos ( $wepsk, 'i' ) !== false || strpos ( $wepsk, 'u' ) !== false) {
if ($itmk == 'GBi') { if ($itmk == 'GBi') {
$bulletnum = 10; $bulletnum = 18;
} else { } else {
$log .= "<span class=\"red\">枪械类型和弹药类型不匹配。</span><br>"; $log .= "<span class=\"red\">枪械类型和弹药类型不匹配。</span><br>";
$mode = 'command'; $mode = 'command';
...@@ -381,7 +381,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -381,7 +381,7 @@ function itemuse($itmn,&$data=NULL) {
} else { } else {
if (strpos ( $wepsk, 'r' ) !== false) { if (strpos ( $wepsk, 'r' ) !== false) {
if ($itmk == 'GBr') { if ($itmk == 'GBr') {
$bulletnum = 20; $bulletnum = 24;
} else { } else {
$log .= "<span class=\"red\">枪械类型和弹药类型不匹配。</span><br>"; $log .= "<span class=\"red\">枪械类型和弹药类型不匹配。</span><br>";
$mode = 'command'; $mode = 'command';
...@@ -389,7 +389,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -389,7 +389,7 @@ function itemuse($itmn,&$data=NULL) {
} }
} else { } else {
if ($itmk == 'GB') { if ($itmk == 'GB') {
$bulletnum = 6; $bulletnum = 12;
} else { } else {
$log .= "<span class=\"red\">枪械类型和弹药类型不匹配。</span><br>"; $log .= "<span class=\"red\">枪械类型和弹药类型不匹配。</span><br>";
$mode = 'command'; $mode = 'command';
...@@ -790,7 +790,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -790,7 +790,7 @@ function itemuse($itmn,&$data=NULL) {
if ($exp >= $upexp) { if ($exp >= $upexp) {
include_once GAME_ROOT . './include/state.func.php'; include_once GAME_ROOT . './include/state.func.php';
lvlup_rev($pdata,$pdata,1); lvlup_rev($data,$data,1);
} }
} }
if ($itms != $nosta) { if ($itms != $nosta) {
...@@ -1472,7 +1472,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -1472,7 +1472,7 @@ function itemuse($itmn,&$data=NULL) {
$log .= '你突然感觉到一种不可思议的力量贯通全身!<br>'; $log .= '你突然感觉到一种不可思议的力量贯通全身!<br>';
$wp = $wk = $wg = $wc = $wd = $wf = 8010; $wp = $wk = $wg = $wc = $wd = $wf = 8010;
$att = $def = 13337; $att = $def = 13337;
changeclub(15,$pdata); changeclub(15,$data);
addnews ( $now, 'suisidefail',$nickinfo.' '.$name ); addnews ( $now, 'suisidefail',$nickinfo.' '.$name );
$itm = $itmk = $itmsk = ''; $itm = $itmk = $itmsk = '';
$itme = $itms = 0; $itme = $itms = 0;
...@@ -1558,7 +1558,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -1558,7 +1558,7 @@ function itemuse($itmn,&$data=NULL) {
include_once GAME_ROOT . './include/state.func.php'; include_once GAME_ROOT . './include/state.func.php';
death ( 'SCP', '', 0, $itm ); death ( 'SCP', '', 0, $itm );
} else { } else {
changeclub(17,$pdata); changeclub(17,$data);
addnews ( $now, 'notworthit', $nickinfo.' '.$name ); addnews ( $now, 'notworthit', $nickinfo.' '.$name );
} }
$itms --; $itms --;
...@@ -1949,7 +1949,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -1949,7 +1949,7 @@ function itemuse($itmn,&$data=NULL) {
$log .= '你突然感觉到一种不可思议的力量贯通全身!<br>'; $log .= '你突然感觉到一种不可思议的力量贯通全身!<br>';
$wp = $wk = $wg = $wc = $wd = $wf = 8010; $wp = $wk = $wg = $wc = $wd = $wf = 8010;
$att = $def = 13337; $att = $def = 13337;
changeclub(15,$pdata); changeclub(15,$data);
addnews ( $now, 'suisidefail',$nickinfo.' '.$name ); addnews ( $now, 'suisidefail',$nickinfo.' '.$name );
} }
elseif ($itme == 17 || $itme > 22){ //状态机社团以及不存在的社团 elseif ($itme == 17 || $itme > 22){ //状态机社团以及不存在的社团
...@@ -1978,7 +1978,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -1978,7 +1978,7 @@ function itemuse($itmn,&$data=NULL) {
【其之零】一切都是数字的假象而已。<br> 【其之零】一切都是数字的假象而已。<br>
正在你回味着这句话的时候,一切已经恢复如初。"; 正在你回味着这句话的时候,一切已经恢复如初。";
//社团变更 //社团变更
changeclub(20,$pdata); changeclub(20,$data);
//获取初始元素与第一条配方 //获取初始元素与第一条配方
$dice = rand(0,5); $dice2 = rand(0,1); $dice3 = rand(0,3); $dice = rand(0,5); $dice2 = rand(0,1); $dice3 = rand(0,3);
${'element'.$dice} += 500+$dice; ${'element'.$dice} += 500+$dice;
...@@ -1996,7 +1996,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -1996,7 +1996,7 @@ function itemuse($itmn,&$data=NULL) {
$log .="再等等吧……<br>"; $log .="再等等吧……<br>";
} }
else{//直接将社团卡的效果写入玩家club else{//直接将社团卡的效果写入玩家club
changeclub($itme,$pdata); changeclub($itme,$data);
$log .="你的称号被改动了!"; $log .="你的称号被改动了!";
} }
//销毁物品 //销毁物品
...@@ -2083,7 +2083,7 @@ function itemuse($itmn,&$data=NULL) { ...@@ -2083,7 +2083,7 @@ function itemuse($itmn,&$data=NULL) {
$log.="<br>获得了<span class='sparkle'>{$sparkle}元素口袋{$sparkle}</span>!<br>"; $log.="<br>获得了<span class='sparkle'>{$sparkle}元素口袋{$sparkle}</span>!<br>";
$log.="……这到底是怎么一回事呢?<br><br>"; $log.="……这到底是怎么一回事呢?<br><br>";
//社团变更 //社团变更
changeclub(20,$pdata); changeclub(20,$data);
//获取初始元素与第一条配方 //获取初始元素与第一条配方
$dice = rand(0,5); $dice = rand(0,5);
//global ${'element'.$dice}; //global ${'element'.$dice};
......
...@@ -304,10 +304,12 @@ if($mode == 'enter') { ...@@ -304,10 +304,12 @@ if($mode == 'enter') {
} }
# 格式化插入player数据 # 格式化插入player数据
$ndata = update_db_player_structure(); $ndata = update_db_player_structure(1);
foreach($ndata as $key) foreach($ndata as $key => $type)
{ {
if(isset($$key)) $ndata[$key] = $$key; if(isset($$key)) $ndata[$key] = $$key;
elseif(strpos($type,'int')!==false) $ndata[$key] = 0;
else $ndata[$key] = '';
} }
# 初始化套装信息 # 初始化套装信息
......
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