Merge pull request #71 from hikawiier/waaagh

update help.htm

gamedata/cache/clubskills_1.php

@@ -12,7 +12,7 @@ $club_skillslist = Array
 	4  => Array('s_hp','s_ad','f_heal','c4_stable','c4_break','c4_aiming','c4_loot','c4_roar','c4_sniper','c4_headshot'), #'狙击鹰眼',
 	5  => Array('s_hp','s_ad','f_heal','c5_sneak','c5_caution','c5_review','c5_focus','c5_higheg','c5_double'), #'拆弹专家',
 	6  => Array('s_hp','s_ad','f_heal','c6_godluck','c6_godsend','c6_godbless','c6_godpow','c6_godeyes','c6_justice'), #'宛如疾风',
-	7  => Array('s_hp','s_ad','f_heal','c7_radar','c7_shield','c7_electric','c7_field','c7_emp','c7_overload'), #'锡安成员',
+	7  => Array('s_hp','s_ad','f_heal','c7_radar','c7_shield','c7_electric','c7_field','c7_overload','c7_emp'), #'锡安成员',
 	8  => Array('s_hp','s_ad','f_heal'), #'黑衣组织',
 	9  => Array('s_hp','s_ad','f_heal','c9_spirit','c9_lb','c9_iceheart','c9_charge','c9_heartfire'), #'超能力者',
 	10 => Array('s_hp','s_ad','f_heal'), #'高速成长',

help.php

@@ -258,7 +258,7 @@ A:active {
 P{ line-height:16px
 }
 
-DIV {
+DIV.help {
 	PADDING-LEFT: 1em;PADDING-right: 1em
 }
 

include/game.func.php

@@ -470,95 +470,6 @@ function init_clubskillsdata($sk,$data)
 	elseif(array_key_exists($sk,$cskills))
 	{
 		return $sk;
-		/*global $cskills;
-		# 要检查的技能没有登记过 视为无效技能
-		if(!array_key_exists($sk,$cskills)) return 0;
-		if(!empty($data)) $data['clbpara'] = get_clbpara($data['clbpara']);
-		# 获取技能信息
-		$cskill = $cskills[$sk];
-		$sk_name = $cskill['name'];
-		# 技能存在等级时
-		if(isset($cskill['maxlvl']))
-		{
-			$max_lvl_flag = 0;
-			$now_clvl = get_skilllvl($sk,$data);
-			if($now_clvl >= $cskill['maxlvl']) $max_lvl_flag = 1;
-		}
-		# 获取技能描述
-		$sk_desc = parse_skilldesc($sk,$data);
-		# 生成技能模板
-		$sk_temp = <<<EOT
-<tr>
-    <td class="b1" width="40">
-        <span>{$sk_name}</span>
-    </td>
-	<td>
-EOT;
-		# 检查技能是否存在解锁条件
-		if(!empty($cskill['unlock']))
-		{
-			# 检查技能是否解锁，返回值不为0则未解锁
-			$unlock_flag = check_skill_unlock($sk,$data);
-			if($unlock_flag)
-			{
-				if(is_array($unlock_flag))
-				{
-					$unlock_cd = $unlock_flag[1]; $unlock_flag = $unlock_flag[0];
-				}
-				$unlock_flag = is_array($cskill['lockdesc']) ? $cskill['lockdesc'][$unlock_flag] : $cskill['lockdesc'];
-				if(isset($unlock_cd)) $unlock_flag = str_replace("[:cd:]","$unlock_cd",$unlock_flag);
-				$sk_temp .= <<<EOT
-                <div style="position:relative; height:100%; width:100%;" onmouseover="skill_unacquired_mouseover.call(this,event)" onmouseout="skill_unacquired_mouseout.call(this,event)">
-                <div class="skill_unacquired">
-EOT;
-			}
-		}
-		$sk_temp .= <<<EOT
-        <table class="skilltable">
-            <tr>
-                <td class="skilldesc_left b3">
-                    <span class="skilldesc">
-                    {$sk_desc}
-                    </span>
-                </td>
-				<td class="skilldesc_right b3"> \r
-EOT;
-		# 检查技能是否存在复数输入框
-		if(!empty($cskill['num_input']) && empty($max_lvl_flag))
-		{
-			$sk_temp .= "<input type=\"number\" name=\"upgskill_{$sk}_nums\" style=\"width:40px\" value=\"1\"> \r";
-		}
-		# 检查技能是否存在操作按钮
-		if(!empty($cskill['input']) && empty($max_lvl_flag))
-		{
-			$sk_input = $cskill['input'];
-			$sk_temp .= "<input type=\"button\" onclick=\"$('mode').value='revskpts';$('command').value='upgskill_{$sk}';postCmd('gamecmd','command.php');this.disabled=true;\" value=\"{$sk_input}\"> \r";
-		}
-		$sk_temp .= <<<EOT
-				</td>
-			</tr>
-        </table>
-EOT;
-		if(!empty($cskill['unlock']) && $unlock_flag)
-		{
-			$sk_temp .= <<<EOT
-			</div>
-			<div class="skill_unacquired_hint">
-				<table class="skilltable">
-					<tr>
-EOT;
-			$sk_temp .= "<td valign=\"center\" align=\"center\"><span class=\"yellow\">{$unlock_flag}</span></td>";	
-			$sk_temp .= "
-					</tr>
-			</table>
-		</div>
-	</div>";
-		}
-		$sk_temp .= "</tr>";
-		//$htm_sk_dir = GAME_ROOT.TPLDIR.'/'.$sk_dir.'.htm';
-		//writeover($htm_sk_dir,$sk_temp);
-		//return $sk_dir;
-		return $sk_temp;*/
 	}
 	return 0;
 }
@@ -612,6 +523,45 @@ function check_skilllasttimes(&$data)
 	return $data['pure_flag'];
 }
 
+function create_dummy_playerdata($clb=0)
+{
+	$data = update_db_player_structure(1);
+	foreach($data as $key => $type)
+	{
+		if(strpos($type,'int')!==false) $v=0;
+		else $v='';
+		$data[$key] = $v;
+	}
+	$data['clbpara'] = get_clbpara($data['clbpara']);
+	if(!empty($clb))
+	{
+		include_once GAME_ROOT.'./include/game/clubslct.func.php';
+		changeclub($clb,$data);
+		switch ($clb) {
+			case 1:
+				$data['wepk'] = 'WP';
+				break;
+			case 2:
+				$data['wepk'] = 'WK';
+				break;
+			case 3:
+				$data['wepk'] = 'WC';
+				break;
+			case 4:
+				$data['wepk'] = 'WG';
+				break;
+			case 5:
+				$data['wepk'] = 'WD';
+				break;
+			case 9:
+				$data['wepk'] = 'WF';
+				break;
+			default:
+				$data['wepk'] = 'WN';
+		}
+	}
+	return $data;
+}
 //通过名字抓取指定玩家数据，只能抓玩家
 function fetch_playerdata_by_name($n)
 {
@@ -625,7 +575,6 @@ function fetch_playerdata_by_name($n)
 	reload_set_items($pdata);
 	return $pdata;
 }
-
 //通过pid抓取指定玩家/NPC数据
 function fetch_playerdata_by_pid($pid)
 {
@@ -639,26 +588,6 @@ function fetch_playerdata_by_pid($pid)
 	reload_set_items($pdata);
 	return $pdata;
 }
-//用于读取当前玩家数据的数组结构（不进行过滤）
-function current_player_load(){
-	$data = update_db_player_structure();
-	foreach($data as $key)
-	{
-		global $$key;
-		$data[$key]= $$key;
-	}
-	return $data;
-}
-//用于将当前玩家数据保存至数据库（会进行过滤）
-function current_player_save(){
-	global $db,$tablepre;
-	$pdata = current_player_load();
-	$pdata = player_format_with_db_structure($pdata);
-	$pid = $pdata['pid'];
-	$db->array_update("{$tablepre}players",$pdata,"pid='$pid'");
-	if(!empty($pdata['clbpara'])) $pdata['clbpara'] = get_clbpara($pdata['clbpara']);
-	return $pdata;
-}
 //用于将指定player数据存回数据库
 function player_save($data){
 	global $db,$tablepre;
@@ -674,18 +603,6 @@ function player_save($data){
 	}
 	return;
 }
-//用于刷新当前玩家数据（待修改）
-function player_load($data)
-{
-	$ndata = player_format_with_db_structure($data);
-	foreach ($ndata as $key => $value)
-	{
-		global $$key;
-		$$key = $value;
-		if($key == 'clbpara' && !empty($$key)) $$key = get_clbpara($$key);
-	}
-	return;
-}
 
 function w_save($id){
 	global $db,$tablepre,$w_name,$w_pass,$w_type,$w_endtime,$w_deathtime,$w_gd,$w_sNo,$w_icon,$w_club,$w_hp,$w_mhp,$w_sp,$w_msp,$w_att,$w_def,$w_pls,$w_lvl,$w_exp,$w_money,$w_bid,$w_inf,$w_rage,$w_pose,$w_tactic,$w_killnum,$w_state,$w_wp,$w_wk,$w_wg,$w_wc,$w_wd,$w_wf,$w_teamID,$w_teamPass,$w_wep,$w_wepk,$w_wepe,$w_weps,$w_arb,$w_arbk,$w_arbe,$w_arbs,$w_arh,$w_arhk,$w_arhe,$w_arhs,$w_ara,$w_arak,$w_arae,$w_aras,$w_arf,$w_arfk,$w_arfe,$w_arfs,$w_art,$w_artk,$w_arte,$w_arts,$w_itm0,$w_itmk0,$w_itme0,$w_itms0,$w_itm1,$w_itmk1,$w_itme1,$w_itms1,$w_itm2,$w_itmk2,$w_itme2,$w_itms2,$w_itm3,$w_itmk3,$w_itme3,$w_itms3,$w_itm4,$w_itmk4,$w_itme4,$w_itms4,$w_itm5,$w_itmk5,$w_itme5,$w_itms5,$w_itm6,$w_itmk6,$w_itme6,$w_itms6,$w_wepsk,$w_arbsk,$w_arhsk,$w_arask,$w_arfsk,$w_artsk,$w_itmsk0,$w_itmsk1,$w_itmsk2,$w_itmsk3,$w_itmsk4,$w_itmsk5,$w_itmsk6,$w_rp,$w_action,$w_achievement,$w_skillpoint;

include/game/clubslct.func.php

@@ -77,7 +77,7 @@ function updateskill(&$data=NULL)
 	if ($club==2) $wk+=50;
 	if ($club==3) $wc+=50;
 	if ($club==4) $wg+=50;
-	if ($club==5) $wd+=40;
+	if ($club==5) $wd+=50;
 	if ($club==9) $wf+=40;
 	if ($club==11) $money+=680;
 	if ($club==16) { $wp+=25; $wk+=25; $wc+=25; $wg+=25; $wd+=25; $wf+=25; }

include/game/item.func.php

@@ -1396,7 +1396,7 @@ function itemuse($itmn) {
 				$log .= '你突然感觉到一种不可思议的力量贯通全身！<br>';
 				$wp = $wk = $wg = $wc = $wd = $wf = 8010;
 				$att = $def = 13337;
-				changeclub(15);
+				changeclub(15,$pdata);
 				addnews ( $now, 'suisidefail',$nickinfo.' '.$name );
 				$itm = $itmk = $itmsk = '';
 				$itme = $itms = 0;
@@ -1482,7 +1482,7 @@ function itemuse($itmn) {
 				include_once GAME_ROOT . './include/state.func.php';
 				death ( 'SCP', '', 0, $itm );
 			} else {
-				changeclub(17);
+				changeclub(17,$pdata);
 				addnews ( $now, 'notworthit', $nickinfo.' '.$name );
 			}
 			$itms --;
@@ -1863,7 +1863,7 @@ function itemuse($itmn) {
 				$log .= '你突然感觉到一种不可思议的力量贯通全身！<br>';
 				$wp = $wk = $wg = $wc = $wd = $wf = 8010;
 				$att = $def = 13337;
-				changeclub(15);
+				changeclub(15,$pdata);
 				addnews ( $now, 'suisidefail',$nickinfo.' '.$name );
 			}
 			elseif ($itme == 17 || $itme > 22){ //状态机社团以及不存在的社团
@@ -1892,7 +1892,7 @@ function itemuse($itmn) {
 				【其之零】一切都是数字的假象而已。<br>
 				正在你回味着这句话的时候，一切已经恢复如初。";
 				//社团变更
-				changeclub(20);
+				changeclub(20,$pdata);
 				//获取初始元素与第一条配方
 				$dice = rand(0,5);
 				global ${'element'.$dice},$clbpara;
@@ -1908,7 +1908,7 @@ function itemuse($itmn) {
 				$log .="再等等吧……<br>";
 			}
 			else{//直接将社团卡的效果写入玩家club
-				changeclub($itme);
+				changeclub($itme,$pdata);
 				$log .="你的称号被改动了！";
 			}
 			//销毁物品
@@ -1990,7 +1990,7 @@ function itemuse($itmn) {
 			$log.="<br>获得了<span class='sparkle'>{$sparkle}元素口袋{$sparkle}</span>！<br>";
 			$log.="……这到底是怎么一回事呢？<br><br>";
 			//社团变更
-			changeclub(20);
+			changeclub(20,$pdata);
 			//获取初始元素与第一条配方
 			$dice = rand(0,5);
 			global ${'element'.$dice};

include/game/itemplace.func.php

@@ -37,7 +37,7 @@ function get_npc_helpinfo($nlist,$tooltip=1)
 								break;
 							}
 						}
-						if($snpc['gd'] == 'm' || $snpc['gd'] == 'f')
+						if(isset($snpc['gd']))
 						{
 							$snpc['gd'] = $snpc['gd']=='m' ? '男' : '女';
 						}
@@ -85,10 +85,6 @@ function get_npc_helpinfo($nlist,$tooltip=1)
 									if(!empty($snpc[$k_value])) $snpc[$k_value] = parse_info_desc($snpc[$k_value],'k');
 								}
 							}
-							else 
-							{
-								$snpc[$t1.$t2] = '-';
-							}
 						}
 						$tnlist[$i][$tsub][$n] = $snpc;
 						unset($snpc);

include/game/revcombat.func.php

@@ -1144,8 +1144,10 @@
 				
 				if ($skname == 'all') {
 					$lvupskill += rand ( 2, 4 );
-				} elseif ($skname == 'wd' || $skname == 'wf') {
+				}elseif ($skname == 'wf') {
 					$lvupskill += rand ( 3, 5 );
+				}elseif ($skname == 'wd') {
+					$lvupskill += rand ( 6, 8 );
 				}elseif($skname){
 					$lvupskill += rand ( 4, 6 );
 				}

include/global.func.php

@@ -669,73 +669,6 @@ function parse_info_desc($info,$type,$vars='',$short=0)
 	return $info;
 }
 
-//为显示在主界面、尸体发现界面、游戏帮助界面的道具名、道具类、道具属性添加额外描述
-//传入$n=道具名/类/属性；$t='m'(使用名称数组)/'k'(类别)/'sk'(属性)；$short=1(传入的$n为数组情况下才有效，缩写属性)；$class(如果传入的$n没有匹配的样式,则应用该样式)
-function parse_itm_desc($n,$t,$s=0,$c=NULL)
-{
-	global $iteminfo,$itemspkinfo,$cskills;
-	global $tps_name,$tps_ik,$tps_isk,$tps_names;
-	$span = "<span "; $p1 = "tooltip=\""; $p2 = "class=\""; $ret1 = ''; $ret2 = ''; $ret = '';
-	switch($t)
-	{
-		//处理类别
-		case $t=='k':
-			if(isset($tps_ik[$n]['title'])) $ret1 = $tps_ik[$n]['title']."\"";				
-			if(isset($tps_ik[$n]['class'])) $ret2 = $tps_ik[$n]['class']."\"";
-			$n = $iteminfo[$n];
-			break;
-		//处理属性
-		case $t=='sk':
-			if($short && is_array($n) && count($n)>1)
-			{
-				$sk1 = $itemspkinfo[current($n)]; $sk2 = $itemspkinfo[end($n)]; $skn = '';
-				foreach($n as $sk_value)
-				{
-					if(!empty($skn)) $skn .='+'.$itemspkinfo[$sk_value];
-					else $skn = $itemspkinfo[$sk_value];
-				}
-				$ret1=$skn; $n = $sk1.'+...+'.$sk2; $ret1.= "\"";
-			}
-			else
-			{
-				if(isset($tps_isk[$n]['title'])) $ret1= $tps_isk[$n]['title']."\"";
-				if(isset($tps_isk[$n]['class'])) $ret2= $tps_isk[$n]['class']."\"";
-				$n = $itemspkinfo[$n];
-			}
-			break;
-		//处理名字
-		case $t=='m':
-			$fn = preg_replace('/锋利的|电气|毒性|\[.*\]|-改/', '', $n);
-			if(isset($tps_name[$fn]))
-			{
-				if(is_array($tps_name[$fn]))
-				{
-					if(isset($tps_name[$fn]['title'])) $ret1= $tps_name[$fn]['title']."\"";
-					if(isset($tps_name[$fn]['class'])) $ret2= $tps_name[$fn]['class']."\"";
-				}
-				elseif(isset($tps_names[$tps_name[$fn]]))
-				{	//使用可复用描述 越来越离谱了
-					if(isset($tps_names[$tps_name[$fn]]['title'])) $ret1= $tps_names[$tps_name[$fn]]['title']."\"";
-					if(isset($tps_names[$tps_name[$fn]]['class'])) $ret2= $tps_names[$tps_name[$fn]]['class']."\"";
-				}
-			}
-			break;
-	}
-	$ret = $span;
-	if(!empty($ret1)) $ret .= $p1.$ret1;
-	if(isset($c))
-	{
-		$ret2 = $c."\"";
-		$ret .= $p2.$ret2;
-	}
-	elseif(!empty($ret2))
-	{
-		$ret .= $p2.$ret2;
-	}
-	$ret .= ">".$n."</span>";
-	return $ret;
-}
-
 //----------------------------------------
 //              字符串处理
 //----------------------------------------

templates/default/npcinfohelp.htm

@@ -33,7 +33,7 @@
 									数目
 								</td>
 								<td width=100px align="center" class="b3">
-									<!--{if $npcdescription[$kind][$ksub][$key]['count']>0}-->
+									<!--{if !empty($npcdescription[$kind][$ksub][$key]['count'])}-->
 										$npcdescription[$kind][$ksub][$key]['count']
 									<!--{else}-->
 										-
@@ -176,7 +176,11 @@
 									手臂装备
 								</td>
 								<td width=505px align="center" class="b3">
+									<!--{if !empty($npcinfo[$kind][$ksub][$key]['ara'])}-->
 									$npcinfo[$kind][$ksub][$key]['ara']/$npcinfo[$kind][$ksub][$key]['arae']/$npcinfo[$kind][$ksub][$key]['aras']<!--{if isset($npcinfo[$kind][$ksub][$key]['arask_words'])}-->/$npcinfo[$kind][$ksub][$key]['arask_words']<!--{/if}-->
+									<!--{else}-->
+									-/-/-
+									<!--{/if}-->
 								</td>
 							</tr>
 							<tr>
@@ -192,7 +196,11 @@
 									饰品 
 								</td>
 								<td width=505px align="center" class="b3">
-									$npcinfo[$kind][$ksub][$key]['art']/$npcinfo[$kind][$ksub][$key]['artk']<!--{if isset($npcinfo[$kind][$ksub][$key]['artsk_words'])}-->/$npcinfo[$kind][$ksub][$key]['artsk_words']<!--{/if}-->
+									<!--{if !empty($npcinfo[$kind][$ksub][$key]['art'])}-->
+										$npcinfo[$kind][$ksub][$key]['art']/$npcinfo[$kind][$ksub][$key]['artk']<!--{if isset($npcinfo[$kind][$ksub][$key]['artsk_words'])}-->/$npcinfo[$kind][$ksub][$key]['artsk_words']<!--{/if}-->
+									<!--{else}-->
+										-/-/-
+									<!--{/if}-->
 								</td>
 							</tr>
 							<!--{loop $itemlst $id $vid}-->

templates/default/skillhelp.htm

+<!--{loop $club_skillslist $clb $vars}-->
+<dialog id="skillhelp-c{$clb}" style="width: 568px; max-width: 90%;max-height: 80%;">
+
+<p style="margin-left:0px; margin-top:0px; margin-right:0px; margin-bottom:0px;">
+<!--{eval $uidata = create_dummy_playerdata($clb);}-->
+    以下是「{$clubinfo[$clb]}」的称号技能列表：<br><br>
+    <table class="skilltable" style="width:559px">
+        <tr>
+            <td class="b1" width="40">
+                <span>名称</span>
+            </td>
+            <td class="b1">
+                <span>技能详情</span>
+            </td>
+        </tr>
+        <!--{loop $uidata['clbpara']['skill'] $sknm}-->
+        <!--{eval $skdata = init_clubskillsdata($sknm,$uidata);}-->
+            <!--{if is_array($skdata)}-->
+                <!--{eval include template($skdata[0]);}-->
+            <!--{elseif !empty($skdata)}-->
+                <!--{eval $skid = $skdata;include template('skill_temp');}-->
+            <!--{/if}-->
+        <!--{/loop}-->
+    </table>
+    <br>提示：点击技能界面外任意位置或按ESC键即可返回主界面<br>
+</p>
+<img class="dialog-background" src="img/profile.gif" onclick="closeDialog($('skillhelp-c{$clb}'));this.disabled=true;">
+</dialog>
+<!--{/loop}-->
\ No newline at end of file

templates/default/skillpage.htm

@@ -16,7 +16,7 @@
                 <span>技能详情</span>
             </td>
         </tr>
-        <!--{loop $clbpara['skill'] $sknm}-->
+        <!--{loop $uidata['clbpara']['skill'] $sknm}-->
         <!--{eval $skdata = init_clubskillsdata($sknm,$uidata);}-->
             <!--{if is_array($skdata)}-->
                 <!--{eval include template($skdata[0]);}-->