Merge pull request #60 from hikawiier/waaagh

rev achievement phase 0.999

command.php

@@ -10,11 +10,12 @@ require GAME_ROOT.'./include/game.func.php';
 //判断是否进入游戏
 if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); } 
 
-$result = $db->query("SELECT * FROM {$tablepre}players WHERE name = '$cuser' AND type = 0");
+//$result = $db->query("SELECT * FROM {$tablepre}players WHERE name = '$cuser' AND type = 0");
+$pdata = fetch_playerdata_by_name($cuser);
 
-if(!$db->num_rows($result)) { header("Location: valid.php");exit(); }
+if(!$pdata) { header("Location: valid.php");exit(); }
 
-$pdata = $db->fetch_array($result);
+//$pdata = $db->fetch_array($result);
 
 //判断是否密码错误
 if($pdata['pass'] != $cpass) {

dbup.php

@@ -154,6 +154,8 @@ $result = $db->query("DESCRIBE {$tablepre}users volume");
 if($db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}users DROP volume");
 $result = $db->query("DESCRIBE {$tablepre}users achrev");
 if(!$db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}users ADD achrev text NOT NULL default '' AFTER achievement");
+$result = $db->query("DESCRIBE {$tablepre}users daily");
+if(!$db->num_rows($result)) $db->query("ALTER TABLE {$tablepre}users ADD daily varchar(255) NOT NULL DEFAULT '' AFTER achrev");
 
 //game表结构变动
 $db->query("ALTER TABLE {$tablepre}game DROP gamevars");

game.php

@@ -14,10 +14,11 @@ if(isset($mode) && $mode == 'quit') {
 	exit();
 
 }
-$result = $db->query("SELECT * FROM {$tablepre}players WHERE name = '$cuser' AND type = 0");
-if(!$db->num_rows($result)) { header("Location: valid.php");exit(); }
+//$result = $db->query("SELECT * FROM {$tablepre}players WHERE name = '$cuser' AND type = 0");
+$pdata = fetch_playerdata_by_name($cuser);
+if(!$pdata) { header("Location: valid.php");exit(); }
 
-$pdata = $db->fetch_array($result);
+//$pdata = $db->fetch_array($result);
 if($pdata['pass'] != $cpass) {
 	$tr = $db->query("SELECT `password` FROM {$tablepre}users WHERE username='$cuser'");
 	$tp = $db->fetch_array($tr);

gamedata/cache/gamecfg_1.php

@@ -126,8 +126,10 @@ $hack_obbs = 40;
 //电子设备充电上限，包括电脑和雷达
 $elec_cap = 5;
 
-//成就总数
+//成就总数（已废弃）
 $achievement_count=140;
+//每日任务刷新间隔（单位：秒）：
+$reset_daily_cd = 21600;
 
 //场外支援系统 允许购买的道具类型
 $gshoplist = Array

gamedata/cache/setitems_1.php

+<?php
+if(!defined('IN_GAME')) exit('Access Denied');
+
+# 套装相关配置文件
+
+# 套装部件登记：（部位 → 装备名 → 对应套装编号）
+$set_items = Array
+(
+	'wep' => Array
+	(
+		'节操炸弹' => 'jc',
+		'寂寞' => 'jm',
+		'幻之刃' => 'fan',
+		'幻之使魔' => 'fan',
+		'永恒之桶' => 'ete',
+		'新华里的投入' => 'xhl',
+		'新华里的震撼' => 'xhl',
+		'新华里的乱舞' => 'xhl',
+		'新华里的手势' => 'xhl',
+		'新华里的呐喊' => 'xhl',
+		'新华里的眼神' => 'xhl',
+	),
+
+	'arb' => Array
+	(
+		'节操' => 'jc',
+		'幻之甲' => 'fan',
+		'永恒之甲' => 'ete',
+		'新华里的西服' => 'xhl',
+	),
+
+	'arh' => Array
+	(
+		'节操' => 'jc',
+		'寂寞' => 'jm',
+		'幻之盔' => 'fan',
+		'永恒之盔' => 'ete',
+		'新华里的领带' => 'xhl',
+	),
+
+	'ara' => Array
+	(
+		'节操' => 'jc',
+		'寂寞' => 'jm',
+		'幻之手镯' => 'fan',
+		'永恒之手镯' => 'ete',
+		'新华里的手表' => 'xhl',
+	),
+
+	'arf' => Array
+	(
+		'节操' => 'jc',
+		'寂寞' => 'jm',
+		'幻之靴' => 'fan',
+		'永恒之靴' => 'ete',
+		'新华里的皮鞋' => 'xhl',
+	),
+
+	'art' => Array
+	(
+		'节操' => 'jc',
+		'新华里的增员' => 'xhl',
+	),
+);
+
+# 套装登记：
+$set_items_info = Array
+(
+	'jc' => Array
+	(
+		// 套装名：
+		'name' => '有节操！',
+		// 套装组件上下限
+		'active' => Array(1,6),
+		// 套装奖励：
+		// 套装奖励介绍：
+	),
+	'jm' => Array
+	(
+		'name' => '是寂寞...',
+		'active' => Array(1,4),
+	),
+	'xhl' => Array
+	(
+		'name' => '业务员',
+		'active' => Array(1,6),
+	),
+	'fan' => Array
+	(
+		'name' => '幻想之遗',
+		'active' => Array(1,5),
+	),
+	'ete' => Array
+	(
+		'name' => '永恒之物',
+		'active' => Array(1,5),
+	),
+);
+
+
+?>

gamedata/cache/style_20190718.css

@@ -377,7 +377,7 @@ span[tooltip]:hover:before {
 	/*background-clip: border-box; background-color: rgba(198, 114, 199, 0.8);*/
 	background-color:rgba(0,0,0,0.8); *BACKGROUND: rgb(0,0,0); *filter:alpha(opacity=70); 
 	border-radius: 3px; border:2px solid rgba(225, 124, 226, 0.4);	
-	transform: translate(40px, -5px);
+	transform: translate(25px, 25px);
     width:max-content; max-width: 175px; position: absolute; z-index: 50;
 }
 

gamedata/sql/all.sql

@@ -366,6 +366,8 @@ CREATE TABLE `acbra2_users` (
   `credits` int(10) NOT NULL DEFAULT '0',
   `credits2` mediumint(9) NOT NULL DEFAULT '0',
   `achievement` text NOT NULL,
+  `achrev` text NOT NULL,
+  `daily` varchar(255) NOT NULL DEFAULT '',
   `nick` text NOT NULL,
   `nicks` text NOT NULL,
   `volume` smallint(3) unsigned NOT NULL default '20',

include/common.inc.php

@@ -10,6 +10,7 @@ if(version_compare(PHP_VERSION, '4.3.0', '<')) {
 	exit('PHP version must >= 4.3.0!');
 }
 require GAME_ROOT.'./include/global.func.php';
+require GAME_ROOT.'./include/resources.func.php';
 require GAME_ROOT.'./include/game/revclubskills.func.php';
 require GAME_ROOT.'./include/game/dice.func.php';
 error_reporting(E_ALL);

include/game.func.php

@@ -714,6 +714,23 @@ function check_skilllasttimes(&$data=NULL)
 	return $pure_flag;
 }
 
+//通过名字抓取指定玩家数据，只能抓玩家
+function fetch_playerdata_by_name($n)
+{
+	global $db,$tablepre;
+	$result = $db->query("SELECT * FROM {$tablepre}players WHERE name = '$n' AND type = 0");
+	if(!$db->num_rows($result)) return NULL;
+	$pdata = $db->fetch_array($result);
+	if(!empty($pdata['clbpara'])) $pdata['clbpara'] = get_clbpara($pdata['clbpara']);
+	//套装效果刷新
+	include_once GAME_ROOT.'./include/game/itemmain.func.php';
+	reload_set_items($pdata);
+	//检查杂项成就
+	include_once GAME_ROOT.'./include/game/achievement.func.php';
+	check_misc_achievement_rev($pdata);
+	return $pdata;
+}
+
 //通过pid抓取指定玩家/NPC数据
 function fetch_playerdata_by_pid($pid)
 {
@@ -722,6 +739,8 @@ function fetch_playerdata_by_pid($pid)
 	if(!$db->num_rows($result)) return NULL;
 	$pdata = $db->fetch_array($result);
 	if(!empty($pdata['clbpara'])) $pdata['clbpara'] = get_clbpara($pdata['clbpara']);
+	include_once GAME_ROOT.'./include/game/itemmain.func.php';
+	reload_set_items($pdata);
 	return $pdata;
 }
 //用于读取当前玩家数据的数组结构（不进行过滤）

include/game/item.func.php

@@ -8,7 +8,7 @@ include_once GAME_ROOT.'./include/game/titles.func.php';
 include_once GAME_ROOT.'./include/game/clubslct.func.php';
 
 function itemuse($itmn) {
-	global $mode, $log, $nosta, $pid, $name, $state, $now,$nick,$achievement,$club, $pdata;
+	global $mode, $log, $nosta, $pid, $name, $state, $now,$nick,$achievement,$club,$clbpara,$pdata;
 
 	$nickinfo = get_title_desc($nick);
 
@@ -75,6 +75,11 @@ function itemuse($itmn) {
 			$itmnumlimit = $itme>=$itms ? $itms : $itme;
 		}
 		if (($noeqp && strpos ( ${$eqp.'k'}, $noeqp ) === 0) || ! ${$eqp.'s'}) {
+			
+			// 装备道具时，进行单次套装检测
+			include_once GAME_ROOT.'./include/game/itemmain.func.php';
+			reload_single_set_item($pdata,$eqp,$itm,1);
+
 			${$eqp} = $itm;
 			${$eqp.'k'} = $itmk;
 			${$eqp.'e'} = $itme;
@@ -84,6 +89,14 @@ function itemuse($itmn) {
 			$itm = $itmk = $itmsk = '';
 			$itme = $itms = 0;
 		} else {
+
+			// 替换装备时，进行单次套装检测
+			// 先检测目前穿的装备
+			include_once GAME_ROOT.'./include/game/itemmain.func.php';
+			reload_single_set_item($pdata,$eqp,${$eqp});
+			// 再检测要替换的装备，类型为1，表示装备
+			reload_single_set_item($pdata,$eqp,$itm,1);
+
 			$itmt = ${$eqp};
 			$itmkt = ${$eqp.'k'};
 			$itmet = ${$eqp.'e'};
@@ -114,6 +127,8 @@ function itemuse($itmn) {
 			$sp = $sp > $msp ? $msp : $sp;
 			$oldsp = $sp - $oldsp;
 			$log .= "你使用了<span class=\"red\">$itm</span>，恢复了<span class=\"yellow\">$oldsp</span>点体力。<br>";
+			//吃了无毒果酱
+			if($itm == '桔黄色的果酱') $clbpara['achvars']['eat_jelly'] = 1;
 			if ($itms != $nosta) {
 				$itms --;
 				if ($itms <= 0) {
@@ -201,6 +216,8 @@ function itemuse($itmn) {
 			$hp = $hp > $mhp ? $mhp : $hp;
 			$oldhp = $hp - $oldhp;
 			$log .= "你使用了<span class=\"red\">$itm</span>，恢复了<span class=\"yellow\">$oldhp</span>点生命和<span class=\"yellow\">$oldsp</span>点体力。<br>";
+			//吃了无毒的围棋子饼干 真勇啊！
+			if($itm == '像围棋子一样的饼干') $clbpara['achvars']['eat_weiqi'] = 1;
 			if ($itms != $nosta) {
 				$itms --;
 				if ($itms <= 0) {
@@ -260,6 +277,12 @@ function itemuse($itmn) {
 				$log .= "你被毒死了！";
 			}
 		}
+		else
+		{
+			//吃了像围棋子一样的饼干但是活下来了……怎么做到的！
+			if($itm == '像围棋子一样的饼干') $clbpara['achvars']['eat_weiqi'] = 1;
+			if($itm == '桔黄色的果酱') $clbpara['achvars']['eat_jelly'] = 1;
+		}
 		if ($itms != $nosta) {
 			$itms --;
 			if ($itms <= 0) {
@@ -1161,7 +1184,7 @@ function itemuse($itmn) {
 			$cnum = $db->affected_rows ();
 			addnews ( $now, 'corpseclear', $nickinfo.' '.$name, $cnum );
 			$log .= "使用了<span class=\"yellow\">$itm</span>。<br>突然刮起了一阵怪风，吹走了地上的{$cnum}具尸体！<br>";
-			$itms --;
+			$itms --; $isk = $cnum;
 			
 		} elseif ($itm == '天候棒') {
 			global $weather, $wthinfo, $name;
@@ -1914,6 +1937,10 @@ function itemuse($itmn) {
 			global $clbpara;
 			$log.="【DEBUG】你目前的播放列表还原为了默认播放列表！<br>";
 			unset($clbpara['event_bgmbook']);
+		} elseif ($itm == '成就重置装置'){
+			//使用会重置对应属性编号的成就进度
+			include_once GAME_ROOT.'./include/game/achievement.func.php';
+			reset_achievement_rev($itmsk,$name);
 		} elseif ($itm == '测试用元素口袋'){
 			global $elements_info;
 			$log.="【DEBUG】你不知道从哪里摸出来一大堆元素！<br>";

include/game/itemmain.func.php

@@ -294,7 +294,13 @@ function itemget() {
 function itemdrop($item) {
 	global $db,$log,$mode,$pls,$tablepre;
 
-	if($item == 'wep'){
+	if(strpos($item,'itm')===false)
+	{
+		$log .= '只能丢弃包裹内的道具！<br>';
+		$mode = 'command';
+		return;
+	}
+	/*if($item == 'wep'){
 		global $wep,$wepk,$wepe,$weps,$wepsk;
 		$itm = & $wep;
 		$itmk = & $wepk;
@@ -310,7 +316,7 @@ function itemdrop($item) {
 		$itms = & ${'ar'.$itmn.'s'};
 		$itmsk = & ${'ar'.$itmn.'sk'};
 
-	} elseif(strpos($item,'itm') === 0) {
+	} else*/if(strpos($item,'itm') === 0) {
 		$itmn = substr($item,3,1);
 		global ${'itm'.$itmn},${'itmk'.$itmn},${'itme'.$itmn},${'itms'.$itmn},${'itmsk'.$itmn};
 		$itm = & ${'itm'.$itmn};
@@ -338,7 +344,7 @@ function itemdrop($item) {
 			drop_itembag();
 		}
 	}
-if(($itmk=='XX')||(($itmk=='XY'))){
+	if(($itmk=='XX')||(($itmk=='XY'))){
 		$log .= '该物品不能丢弃。<br>';
 		$mode = 'command';
 		return;
@@ -373,7 +379,7 @@ if(($itmk=='XX')||(($itmk=='XY'))){
 }
 
 function itemoff($item){
-	global $log,$mode,$cmd,$itm0,$itmk0,$itme0,$itms0,$itmsk0;
+	global $log,$mode,$cmd,$itm0,$itmk0,$itme0,$itms0,$itmsk0,$pdata;
 
 	if($item == 'wep'){
 		global $wep,$wepk,$wepe,$weps,$wepsk;
@@ -401,6 +407,10 @@ function itemoff($item){
 		$mode = 'command';
 		return;
 	}
+
+	//卸下装备时，进行单次套装检测
+	reload_single_set_item($pdata,$item,$itm);
+
 	$log .= "你卸下了装备<span class=\"yellow\">$itm</span>。<br>";
 
 	$itm0 = $itm;
@@ -1157,6 +1167,66 @@ function getcorpse($item){
 	return;
 }
 
+# 初始化玩家/NPC数据时，重载套装效果
+function reload_set_items(&$pa)
+{
+	# 身上登记过套装效果，先重置
+	if(!empty($pa['clbpara']['setitems']))
+	{
+		# TODO：失去对应的套装效果
+	}
+	$pa['clbpara']['setitems'] = Array();
+
+	$set_items = get_set_items();
+	$equip_list = get_equip_list();
+	# 遍历身上的装备信息 检查是否为套装的组成部分
+	foreach($equip_list as $eqp)
+	{
+		if(!empty($pa[$eqp.'s']) && isset($set_items[$eqp][$pa[$eqp]]))
+		{
+			$sid = $set_items[$eqp][$pa[$eqp]];
+			$pa['clbpara']['setitems'][$sid] += 1;
+		}
+	}
+	# 身上存在套装效果
+	if(!empty($pa['clbpara']['setitems']))
+	{
+		//获得对应的套装效果
+
+	}
+	return;
+}
+
+# 装备/替换/破坏装备时，进行单件套装效果变更
+# eqp → 装备部位；eqm → 装备名；active 1 → 装备；active 0 → 卸下/损坏
+function reload_single_set_item(&$pa,$eqp,$enm,$active=0)
+{
+	global $log;
+	$set_items = get_set_items();
+	# 检查装备是否为套装组成部分
+	if(isset($set_items[$eqp][$enm]))
+	{
+		$sid = $set_items[$eqp][$enm];
+		$set_items_info = get_set_items_info();
+		if($active)
+		{
+			$pa['clbpara']['setitems'][$sid] += 1;
+			$nownums = $pa['clbpara']['setitems'][$sid];
+			//获得对应的套装效果
+			//$log .= "激活了套装{$set_items_info[$sid]['name']}{$nownums}件套的效果。<br>";
+			//检查是否解锁对应套装成就
+		}
+		else
+		{
+			$pa['clbpara']['setitems'][$sid] -= 1;
+			$nownums = $pa['clbpara']['setitems'][$sid];
+			//失去对应的套装效果
+			//$log .= "套装{$set_items_info[$sid]['name']}组件数-1，重新激活{$nownums}件套的效果。<br>";
+		}
+	}
+	return;
+}
+
 //武器损耗&消耗计算：force_imp：强制扣除武器效果；check_sk：是否在武器毁坏时重新检查属性数组$pa['ex_keys']
 function weapon_loss(&$pa,$hurtvalue,$force_imp=0,$check_sk=0)
 {
@@ -1249,6 +1319,9 @@ function armor_hurt(&$pa,$which,$hurtvalue,$check_sk=0)
 			//剔除防具属性
 			if($check_sk && !empty($pa[$which.'sk'])) unset_ex_from_array($pa,get_itmsk_array($pa[$which.'sk']));
 
+			//装备损坏后 重新检查套装属性
+			reload_single_set_item($pa,$which,$pa[$which]);
+
 			if($which == 'arb')
 			{
 				$pa[$which] = '内衣'; $pa[$which.'k'] = 'DN';

include/game/revattr.func.php

@@ -173,6 +173,10 @@
 			$flag = attr_extra_89_cagedbird($pd,$pa,$active);
 			if($flag < 0) return $flag;
 		}
+
+		# 检查成就503
+		if(!empty($pa['arbs']) && $pa['arb'] == '【智代专用熊装】') attr_ach53_check($pa,$pd,$active);
+		if(!empty($pd['arbs']) && $pd['arb'] == '【智代专用熊装】') attr_ach53_check($pd,$pa,$active);
 	
 		return 1;
 	}
@@ -1524,6 +1528,10 @@
 				$pa['hp'] -= $hp_d;
 			}
 		}
+
+		# 检查成就502
+		if ($pa['wep_name'] == '翼人的羽毛') $pa['clbpara']['achvars']['ach502'] = $pa['final_damage'];
+
 		return;
 	}
 

include/game/revattr_extra.func.php

@@ -770,4 +770,22 @@
 		return;
 	}
 
+	function attr_ach53_check(&$pa,&$pd,$active)
+	{
+		if(!empty($pa['arbs']) && $pa['arb'] == '【智代专用熊装】')
+		{
+			// 必须连续攻击同一个对象
+			if(!empty($pa['clbpara']['achvars']['ach503']) && $pa['clbpara']['achvars']['ach503']['a'] == $pd['pid'])
+			{
+				$pa['clbpara']['achvars']['ach503']['t'] += 1;
+			}
+			else 
+			{
+				$pa['clbpara']['achvars']['ach503']['a'] = $pd['pid'];
+				$pa['clbpara']['achvars']['ach503']['t'] = 1;
+			}
+		}
+		return;
+	}
+
 ?>
\ No newline at end of file

include/game/revcombat.func.php

@@ -385,9 +385,9 @@
 		battle_finish_flag:
 
 		# 检查战斗中出现的杂项成就
-		include_once GAME_ROOT.'./include/game/achievement.func.php';
-		if(!$pa['type']) check_misc_achievement_rev($pa);
-		if(!$pd['type']) check_misc_achievement_rev($pd);
+		//include_once GAME_ROOT.'./include/game/achievement.func.php';
+		//if(!$pa['type']) check_misc_achievement_rev($pa);
+		//if(!$pd['type']) check_misc_achievement_rev($pd);
 
 		# 如果战斗中出现了死者 更新action标记
 		if ($active) 
@@ -1009,11 +1009,20 @@
 		}
 
 		# 保存击杀女主的记录
-		if($pd['type'] == 14) $pa['clbpara']['achvars']['kill_n14'] += 1;
+		if($pd['type'] == 14)
+		{
+			$pa['clbpara']['achvars']['kill_n14'] += 1;
+			# 不一定是一击秒杀……但是先这样吧^ ^;
+			if($pd['name'] == '守卫者 静流' && $pa['final_damage'] >= $pd['mhp']) $pa['clbpara']['achvars']['ach505'] = 1;
+		}
 
 		# 保存击杀种火或小兵的记录
 		if(empty($pa['clbpara']['achvars']['kill_minion']) && ($pd['type'] == 90 || $pd['type'] == 91 || $pd['type'] == 92)) $pa['clbpara']['achvars']['kill_minion'] = 1;
 
+		# 成就504，保存在RF高校用过的武器记录
+		if($pa['pls'] == 2) $pa['clbpara']['achvars']['ach504'][$pa['wep_kind']] = 1;
+
+
 		# 快递被劫事件：
 		if(isset($pd['clbpara']['post'])) 
 		{	
@@ -1282,6 +1291,10 @@
 				shuffle($weplist);
 				$chosen = $weplist[0];$c = $chosen[0];
 				//var_dump($chosen);
+				//刷新套装效果
+				include_once GAME_ROOT.'./include/game/itemmain.func.php';
+				reload_single_set_item($pa,'wep',$oldwep);
+				reload_single_set_item($pa,'wep',$chosen[1],1);
 				$pa['itm'.$c] = $pa['wep']; $pa['itmk'.$c] = $pa['wepk']; $pa['itmsk'.$c] = $pa['wepsk'];
 				$pa['itme'.$c] = $pa['wepe']; $pa['itms'.$c] = $pa['weps'];
 				$pa['wep'] = $chosen[1]; $pa['wepk'] = $chosen[2]; $pa['wepe'] = $chosen[3]; $pa['weps'] = $chosen[4]; $pa['wepsk'] = $chosen[5];

include/game/song.inc.php

@@ -9,6 +9,7 @@
 	global $att,$def;
 	global $wep,$wepk,$weps,$wepes,$wepsk;
 	global $rp;
+	global $pdata;
 	
 	//登记非功能性地点信息时合并隐藏地点
 	foreach($hplsinfo as $hgroup=>$hpls) $plsinfo += $hpls;
@@ -24,6 +25,9 @@
 		$log.="需要<span class=\"yellow\">{$r}</span>歌魂才能唱这首歌！<br>";
 		return;
 	}
+
+	// 记录唱歌动作
+	$pdata['clbpara']['achvars']['sing'] = 1;
 	
 	if ($sn=="Alicemagic"){
 		$log.="♪你說過在哭泣之後應該可以破涕而笑♪<br>

include/resources.func.php

+<?php
+
+if(!defined('IN_GAME')) {
+	exit('Access Denied');
+}
+# TODO: NO GLOBAL
+
+# resources_1.php
+function get_equip_list()
+{
+	//装备列表
+	$equip_list = Array('wep','arb','arh','ara','arf','art');
+	return $equip_list;
+}
+
+# achievement_1.php
+function get_achtype()
+{
+	include config("achievement",1);
+	return $ach_type;
+}
+function get_hidden_achtype()
+{
+	include config("achievement",1);
+	return $hidden_ach_type;
+}
+function get_achlist($a=NULL)
+{
+	include config("achievement",1);
+	if(isset($a) && isset($ach_list[$a])) return $ach_list[$a];
+	return $ach_list;
+}
+
+# setitems_1.php
+function get_set_items()
+{
+	include config('setitems',1);
+	return $set_items;
+}
+function get_set_items_info()
+{
+	include config('setitems',1);
+	return $set_items_info;
+}
+
+
+?>

include/system.func.php

@@ -542,10 +542,12 @@ function gameover($time = 0, $mode = '', $winname = '') {
 		$db->query("INSERT INTO {$tablepre}winners (gid,nick,name,pass,type,endtime,gd,sNo,icon,club,hp,mhp,sp,msp,ss,mss,att,def,pls,lvl,`exp`,money,bid,inf,rage,pose,tactic,killnum,killnum2,state,wp,wk,wg,wc,wd,wf,teamID,teamPass,teamMate,teamIcon,wep,wepk,wepe,weps,arb,arbk,arbe,arbs,arh,arhk,arhe,arhs,ara,arak,arae,aras,arf,arfk,arfe,arfs,art,artk,arte,arts,itm0,itmk0,itme0,itms0,itm1,itmk1,itme1,itms1,itm2,itmk2,itme2,itms2,itm3,itmk3,itme3,itms3,itm4,itmk4,itme4,itms4,itm5,itmk5,itme5,itms5,itm6,itmk6,itme6,itms6,motto,wmode,vnum,gtime,gstime,getime,hdmg,hdp,hkill,hkp,wepsk,arbsk,arhsk,arask,arfsk,artsk,itmsk0,itmsk1,itmsk2,itmsk3,itmsk4,itmsk5,itmsk6) VALUES ('".$gamenum."','".$pdata['nick']."','".$pdata['name']."','".$pdata['pass']."','".$pdata['type']."','".$pdata['endtime']."','".$pdata['gd']."','".$pdata['sNo']."','".$pdata['icon']."','".$pdata['club']."','".$pdata['hp']."','".$pdata['mhp']."','".$pdata['sp']."','".$pdata['msp']."','".$pdata['ss']."','".$pdata['mss']."','".$pdata['att']."','".$pdata['def']."','".$pdata['pls']."','".$pdata['lvl']."','".$pdata['exp']."','".$pdata['money']."','".$pdata['bid']."','".$pdata['inf']."','".$pdata['rage']."','".$pdata['pose']."','".$pdata['tactic']."','".$pdata['killnum']."','".$pdata['killnum2']."','".$pdata['state']."','".$pdata['wp']."','".$pdata['wk']."','".$pdata['wg']."','".$pdata['wc']."','".$pdata['wd']."','".$pdata['wf']."','".$pdata['teamID']."','".$pdata['teamPass']."','".$pdata['teamMate']."','".$pdata['teamIcon']."','".$pdata['wep']."','".$pdata['wepk']."','".$pdata['wepe']."','".$pdata['weps']."','".$pdata['arb']."','".$pdata['arbk']."','".$pdata['arbe']."','".$pdata['arbs']."','".$pdata['arh']."','".$pdata['arhk']."','".$pdata['arhe']."','".$pdata['arhs']."','".$pdata['ara']."','".$pdata['arak']."','".$pdata['arae']."','".$pdata['aras']."','".$pdata['arf']."','".$pdata['arfk']."','".$pdata['arfe']."','".$pdata['arfs']."','".$pdata['art']."','".$pdata['artk']."','".$pdata['arte']."','".$pdata['arts']."','".$pdata['itm0']."','".$pdata['itmk0']."','".$pdata['itme0']."','".$pdata['itms0']."','".$pdata['itm1']."','".$pdata['itmk1']."','".$pdata['itme1']."','".$pdata['itms1']."','".$pdata['itm2']."','".$pdata['itmk2']."','".$pdata['itme2']."','".$pdata['itms2']."','".$pdata['itm3']."','".$pdata['itmk3']."','".$pdata['itme3']."','".$pdata['itms3']."','".$pdata['itm4']."','".$pdata['itmk4']."','".$pdata['itme4']."','".$pdata['itms4']."','".$pdata['itm5']."','".$pdata['itmk5']."','".$pdata['itme5']."','".$pdata['itms5']."','".$pdata['itm6']."','".$pdata['itmk6']."','".$pdata['itme6']."','".$pdata['itms6']."','".$pdata['motto']."','".$pdata['wmode']."','".$pdata['vnum']."','".$pdata['gtime']."','".$pdata['gstime']."','".$pdata['getime']."','".$pdata['hdmg']."','".$pdata['hdp']."','".$pdata['hkill']."','".$pdata['hkp']."','".$pdata['wepsk']."','".$pdata['arbsk']."','".$pdata['arhsk']."','".$pdata['arask']."','".$pdata['arfsk']."','".$pdata['artsk']."','".$pdata['itmsk0']."','".$pdata['itmsk1']."','".$pdata['itmsk2']."','".$pdata['itmsk3']."','".$pdata['itmsk4']."','".$pdata['itmsk5']."','".$pdata['itmsk6']."')");
 	}
 	
-	//检查成就
-	include_once GAME_ROOT.'./include/game/achievement.func.php';
-	check_end_achievement_rev($winner,$winmode,$pdata);
-	
+	//存在获胜者数据时 检查获胜者结局成就
+	if(!empty($pdata))
+	{
+		include_once GAME_ROOT.'./include/game/achievement.func.php';
+		check_end_achievement_rev($winner,$winmode,$pdata);
+	}
 	
 	rs_sttime();//重置游戏开始时间和当前游戏状态
 	$gamestate = 0;

templates/default/achievement_208.htm

+<table>
+<tr>
+    <!--{eval $alvl = $cpl[$aid] == 999 ? $alist[$aid]['lvl'] : $cpl[$aid]; $rlvl = $cpl[$aid] == 999 ? $alist[$aid]['lvl']-1 : $cpl[$aid];}-->
+    <td>
+        <!--{if file_exists("img/ach/".$aid."_".$alvl.".gif") }-->
+            <!-- 存在预设的对应阶段图标 -->
+            <img src="img/ach/{$aid}_{$alvl}.gif">
+        <!--{elseif file_exists("img/ach/".$aid."_".$rlvl.".gif") }-->
+            <!-- 完成后的成就，不存在完成阶段图标，但是存在上一阶段图标 -->
+            <img src="img/ach/{$aid}_{$rlvl}.gif">
+        <!--{elseif $alvl && file_exists("img/ach/".$aid.".gif") }-->
+            <!-- 没有定义阶段，但是有通用阶段图标 -->
+            <img src="img/ach/{$aid}.gif">
+        <!--{else}-->
+            <!-- 否则使用默认图标 -->
+            <!--{if !empty($alvl) }-->
+                <img src="img/ach/D.gif">
+            <!--{else}-->
+                <img src="img/ach/N.gif">
+            <!--{/if}-->
+        <!--{/if}-->
+    </td>
+    <td class="ach_cont">
+        <!-- 当前阶段成就名 -->
+        <span class="ach_title">
+        <!--{if empty($alist[$aid]['name'][$alvl]) }-->
+        <b>{$alist[$aid]['name'][$rlvl]}</b>
+        <!--{else}-->
+        <b>{$alist[$aid]['name'][$alvl]}</b>
+        <!--{/if}-->
+        </span>
+        <!--{if !empty($alist[$aid]['lvldesc'][$alvl]) }-->
+            <!-- 存在预设的对应阶段的完成状态描述文本 -->
+            {$alist[$aid]['lvlname'][$alvl]}
+        <!--{elseif !empty($alist[$aid]['lvldesc'][$rlvl]) }-->
+            {$alist[$aid]['lvlname'][$rlvl]}
+        <!--{else}-->
+            <!-- 否则使用默认描述文本 -->
+            <!--{if ($alvl == $alist[$aid]['lvl']) }-->
+                <span class="lime">[完成]</span>
+            <!--{elseif (!empty($alvl))}-->
+                <span class="clan">[进行中]</span>
+            <!--{else}-->
+                <span class="red">[未完成]</span>
+            <!--{/if}-->
+        <!--{/if}-->
+        <br>
+        <!-- 当前阶段成就完成情况 -->
+        <font color="yellow">
+        <!--{eval $nums = is_array($prc[208]) ? count($prc[208]) : 0; }-->
+        <!--{if $nums>0 }-->
+            <!--{eval $sname = "已集齐套装：\r";}-->
+            <!--{loop $prc[208] $sid}-->
+                 <!--{eval $sname .= get_set_items_info()[$sid]['name']."\r";}-->
+            <!--{/loop}-->
+        <!--{/if}-->
+               <span <!--{if !empty($sname) }-->tooltip="{$sname}"<!--{/if}-->>已集齐套装种类：{$nums}种</span>
+        </font>
+        <br>
+        <!-- 当前阶段达成奖励 -->
+        <font color="olive">
+            奖励：
+            <!--{if $alist[$aid]['c1'][$rlvl] }-->
+                积分{$alist[$aid]['c1'][$rlvl]}
+            <!--{/if}-->
+
+            <!--{if $alist[$aid]['c2'][$rlvl] }-->
+                切糕{$alist[$aid]['c2'][$rlvl]}
+            <!--{/if}-->
+
+            <!--{if $alist[$aid]['title'][$rlvl] }-->
+                <span class="evergreen">称号 {$alist[$aid]['title'][$rlvl]}</span>
+            <!--{/if}-->
+        </font>
+        <br>
+        <!-- 当前阶段达成需求描述 -->
+        {$alist[$aid]['desc'][$rlvl]} 
+</td>
+</tr>
+</table>

templates/default/achievement_temp.htm

@@ -47,7 +47,10 @@
         <br>
         <!-- 当前阶段成就完成情况 -->
         <font color="yellow">
-        <!--{if !empty($alist[$aid]['request'][$alvl]) }-->
+        <!--{if !empty($alist[$aid]['request']) && !is_array($alist[$aid]['request']) }-->
+                <!--{eval $areq = $alist[$aid]['request']; $areq = str_replace("[:request:]",$prc[$aid],$areq);}-->
+                {$areq} 
+        <!--{elseif !empty($alist[$aid]['request'][$alvl]) }-->
                 <!--{eval $areq = $alist[$aid]['request'][$alvl]; $areq = str_replace("[:request:]",$prc[$aid],$areq);}-->
                 {$areq} 
         <!--{elseif !empty($alist[$aid]['request'][$rlvl]) }-->

templates/default/dialogue.htm

@@ -4,23 +4,25 @@
 
 <!-- 对白分段显示 -->
 <!--{loop $dialogues[$dialogue_id] $dkey $dinfo}-->
-<div id="d{$dkey}" <!--{if $dkey == 0}--> style="" <!--{else}-->  style="display: none;"  <!--{/if}-->>
-    <table class="map" border="1" style="text-align: center;"><tr>
-    <!-- 带头像对白 -->
-    <!--{if isset($dialogue_icon[$dialogue_id][$dkey])}--> 
-        <td>
-            <img style="width:140px;height:80px;" src="$dialogue_icon[$dialogue_id][$dkey]">
-        </td>
-        <td style="border: 1px; width:280px;height:80px;text-align: left; padding: 3% 6%;">
-            $dinfo
-        </td>
-    <!-- 无头像对白 -->
-    <!--{else}-->
-        <td class="" style="width:320px;height:80px;text-align: center; padding: 3% 6%;">
-            $dinfo
-        </td>
-    <!--{/if}--> 
-    </tr></table>
+<div id="d{$dkey}" <!--{if $dkey == 0}--> class="ach_box" style="border:0; text-align: center; min-height: min-content; width: max-content; max-width: 560px;" <!--{else}-->  style="display: none;"  <!--{/if}-->>
+    <table>
+        <tr>
+        <!-- 带头像对白 -->
+        <!--{if isset($dialogue_icon[$dialogue_id][$dkey])}--> 
+            <td>
+                <img style="width:140px;height:80px;" src="$dialogue_icon[$dialogue_id][$dkey]">
+            </td>
+            <td class="ach-cont" style="border: 1px; width:280px;height:80px;text-align: left; padding: 3% 6%;">
+                $dinfo
+            </td>
+        <!-- 无头像对白 -->
+        <!--{else}-->
+            <td class="ach-cont" style="width:320px;height:80px;text-align: center; padding: 3% 6%;">
+                $dinfo
+            </td>
+        <!--{/if}--> 
+        </tr>
+    </table>
     <br>
     <!--{if $dkey > 0}-->
         <input type="button" class="cmdbutton" style="margin-right: 5%;" value="上一页" onclick="changePages($dkey,$dkey-1);">

templates/default/itemdrop.htm

 你想丢掉什么？<br><br>
 <input type="hidden" name="mode" value="itemmain">
 <input type="radio" name="command" id="menu" value="menu" checked><a onclick=sl('menu'); href="javascript:void(0);" >返回</a><br><br>
-<!--{if $weps && $wepe}-->
-<input type="radio" name="command" id="wep" value="dropwep"><a onclick=sl('wep'); href="javascript:void(0);" >$wep/$wepe/$weps </a><br>
-<!--{/if}-->
-<!--{if $arbs && $arbe}-->
-<input type="radio" name="command" id="arb" value="droparb"><a onclick=sl('arb'); href="javascript:void(0);" >$arb/$arbe/$arbs </a><br>
-<!--{/if}-->
-<!--{if $arhs}-->
-<input type="radio" name="command" id="arh" value="droparh"><a onclick=sl('arh'); href="javascript:void(0);" >$arh/$arhe/$arhs </a><br>
-<!--{/if}-->
-<!--{if $aras}-->
-<input type="radio" name="command" id="ara" value="dropara"><a onclick=sl('ara'); href="javascript:void(0);" >$ara/$arae/$aras </a><br>
-<!--{/if}-->
-<!--{if $arfs}-->
-<input type="radio" name="command" id="arf" value="droparf"><a onclick=sl('arf'); href="javascript:void(0);" >$arf/$arfe/$arfs </a><br>
-<!--{/if}-->
-<!--{if $arts}-->
-<input type="radio" name="command" id="art" value="dropart"><a onclick=sl('art'); href="javascript:void(0);" >$art/$arte/$arts </a><br>
-<!--{/if}-->
 <!--{if $itms1}-->
 <input type="radio" name="command" id="itm1" value="dropitm1"><a onclick=sl('itm1'); href="javascript:void(0);" >$itm1/$itme1/$itms1 </a><br>
 <!--{/if}-->

templates/default/itemmerge.htm

-你想要合并什么？<br>
+你打算怎么整理？<br>
 
 <input type="hidden" name="mode" value="itemmain">
 <input type="radio" name="command" id="menu" value="menu" checked><a onclick=sl('menu'); href="javascript:void(0);" >返回</a><br><br>
-<input type="radio" name="command" id="itemmerge" value="itemmerge"><a onclick=sl('itemmerge'); href="javascript:void(0);">合并</a>
-<br>
-<select name="merge1" onclick=sl('itemmerge'); href="javascript:void(0);">
-<option value="0">■ 道具一 ■<br />
-<!--{if $itms1}--><option value="1">$itm1/$itme1/$itms1<br /><!--{/if}-->
-<!--{if $itms2}--><option value="2">$itm2/$itme2/$itms2<br /><!--{/if}-->
-<!--{if $itms3}--><option value="3">$itm3/$itme3/$itms3<br /><!--{/if}-->
-<!--{if $itms4}--><option value="4">$itm4/$itme4/$itms4<br /><!--{/if}-->
-<!--{if $itms5}--><option value="5">$itm5/$itme5/$itms5<br /><!--{/if}-->
-<!--{if $itms6}--><option value="6">$itm6/$itme6/$itms6<br /><!--{/if}-->
-</select>
-<br>
+
+<!-- 合并道具 -->
+<input type="radio" name="command" id="itemmerge" value="itemmerge"><a onclick=sl('itemmerge'); href="javascript:void(0);">合并道具</a>
+<div style="padding: 5px;">
+    <span class="grey">将两个可堆叠道具合并在一起。</span><br>
+    <select name="merge1" onclick=sl('itemmerge'); href="javascript:void(0);">
+    <option value="0">■ 道具一 ■<br />
+    <!--{if $itms1}--><option value="1">$itm1/$itme1/$itms1<br /><!--{/if}-->
+    <!--{if $itms2}--><option value="2">$itm2/$itme2/$itms2<br /><!--{/if}-->
+    <!--{if $itms3}--><option value="3">$itm3/$itme3/$itms3<br /><!--{/if}-->
+    <!--{if $itms4}--><option value="4">$itm4/$itme4/$itms4<br /><!--{/if}-->
+    <!--{if $itms5}--><option value="5">$itm5/$itme5/$itms5<br /><!--{/if}-->
+    <!--{if $itms6}--><option value="6">$itm6/$itme6/$itms6<br /><!--{/if}-->
+    </select>
+    <br><br>
+    <select name="merge2" onclick=sl('itemmerge'); href="javascript:void(0);">
+        <option value="0">■ 道具二 ■<br />
+        <!--{if $itms1}--><option value="1">$itm1/$itme1/$itms1<br /><!--{/if}-->
+        <!--{if $itms2}--><option value="2">$itm2/$itme2/$itms2<br /><!--{/if}-->
+        <!--{if $itms3}--><option value="3">$itm3/$itme3/$itms3<br /><!--{/if}-->
+        <!--{if $itms4}--><option value="4">$itm4/$itme4/$itms4<br /><!--{/if}-->
+        <!--{if $itms5}--><option value="5">$itm5/$itme5/$itms5<br /><!--{/if}-->
+        <!--{if $itms6}--><option value="6">$itm6/$itme6/$itms6<br /><!--{/if}-->
+        </select>
+</div>
+
 <br>
-<select name="merge2" onclick=sl('itemmerge'); href="javascript:void(0);">
-<option value="0">■ 道具二 ■<br />
-<!--{if $itms1}--><option value="1">$itm1/$itme1/$itms1<br /><!--{/if}-->
-<!--{if $itms2}--><option value="2">$itm2/$itme2/$itms2<br /><!--{/if}-->
-<!--{if $itms3}--><option value="3">$itm3/$itme3/$itms3<br /><!--{/if}-->
-<!--{if $itms4}--><option value="4">$itm4/$itme4/$itms4<br /><!--{/if}-->
-<!--{if $itms5}--><option value="5">$itm5/$itme5/$itms5<br /><!--{/if}-->
-<!--{if $itms6}--><option value="6">$itm6/$itme6/$itms6<br /><!--{/if}-->
-</select>
+
+<!-- 交换道具位置 -->
+<input type="radio" name="command" id="itemmove" value="itemmove"><a onclick=sl('itemmove'); href="javascript:void(0);">移动道具</a>
+<div style="padding: 5px;">
+    <span class="grey">先选择要移位的道具，再选择要移动到的位置。</span><br>
+    将：
+    <select name="from">
+    <option value="0">■ 道  具 ■
+        <!--{if $itms1}--><option value="1">$itm1/$itme1/$itms1<!--{/if}-->
+        <!--{if $itms2}--><option value="2">$itm2/$itme2/$itms2<!--{/if}-->
+        <!--{if $itms3}--><option value="3">$itm3/$itme3/$itms3<!--{/if}-->
+        <!--{if $itms4}--><option value="4">$itm4/$itme4/$itms4<!--{/if}-->
+        <!--{if $itms5}--><option value="5">$itm5/$itme5/$itms5<!--{/if}-->
+        <!--{if $itms6}--><option value="6">$itm6/$itme6/$itms6<!--{/if}-->
+    </select>
+    <br>
+    移动至/与之交换：
+    <select name="to">
+    <option value="0">■ 位  置 ■
+        <!--{if $itms1}--><option value="1">包裹1：$itm1/$itme1/$itms1<!--{else}--><option value="1">包裹1<!--{/if}-->
+        <!--{if $itms2}--><option value="2">包裹2：$itm2/$itme2/$itms2<!--{else}--><option value="2">包裹2<!--{/if}-->
+        <!--{if $itms3}--><option value="3">包裹3：$itm3/$itme3/$itms3<!--{else}--><option value="3">包裹3<!--{/if}-->
+        <!--{if $itms4}--><option value="4">包裹4：$itm4/$itme4/$itms4<!--{else}--><option value="4">包裹4<!--{/if}-->
+        <!--{if $itms5}--><option value="5">包裹5：$itm5/$itme5/$itms5<!--{else}--><option value="5">包裹5<!--{/if}-->
+        <!--{if $itms6}--><option value="6">包裹6：$itm6/$itme6/$itms6<!--{else}--><option value="6">包裹6<!--{/if}-->
+    </select>
+</div>
+
 <br>
+
 <input type="button" class="cmdbutton" name="submit" value="提交" onclick="postCmd('gamecmd','command.php');this.disabled=true;">
\ No newline at end of file

templates/default/profile.htm

@@ -57,7 +57,7 @@
 									</td>
 									<td width=55px background="img/state2.gif" style="position:relative;background-repeat:no-repeat;background-position:left top;">
 										<div style="border:0; margin:0; cellspacing:0; cellpadding:0; position:absolute;top:0px;right:55px;z-index:1;">
-											$newhpimg
+											<span <!--{if $inf}-->tooltip="消耗{$inf_sp}点体力，点击红色准星图标包扎伤口"<!--{/if}-->>$newhpimg</span>
 										</div>
 									</td>
 								</tr>
@@ -184,9 +184,20 @@
           		<tr>
     						<TD class=b2 height="26"><span><!--{if $wepk_words}-->$wepk_words<!--{else}-->$mltwk<!--{/if}--></span></TD>
                 <TD class=b3>
-                	<!--{if CURSCRIPT == 'game' && $mode == 'command' && $wepe}--><span><input type="button" value="卸下" onclick="$('mode').value='itemmain';$('command').value='offwep';postCmd('gamecmd','command.php');return false;"</span><!--{/if}-->
-                	<span><!--{if $weps}-->$wep_words<!--{else}-->$nowep<!--{/if}--></span>
-					<!--{if CURSCRIPT == 'game' && $mode == 'command'}--><span class="eicon" onclick="$('mode').value='itemmain';$('command').value='changewep';postCmd('gamecmd','command.php');return false;">🔃</span><!--{/if}-->
+					<span <!--{if CURSCRIPT == 'game' && $mode == 'command' && $wep2e}-->tooltip="副武器栏：{$wep2}"<!--{/if}-->>
+                	<!--{if CURSCRIPT == 'game' && $mode == 'command' && $wepe}-->
+						<span>
+							<input type="button" value="卸下" onclick="$('mode').value='itemmain';$('command').value='offwep';postCmd('gamecmd','command.php');return false;">
+						</span>
+					<!--{/if}-->				
+                	<span>
+						<!--{if $weps}-->
+						$wep_words
+						<!--{else}-->
+						$nowep
+						<!--{/if}-->
+					</span>
+					</span>
                 </TD>
                 <TD class=b3><span>$wepsk_words</span></TD>
                 <TD class=b3><span>$wepe</span></TD>

templates/default/sp_terminal.htm

 <dialog id="terminal" style="max-width: 90%;max-height: 80%;">
-<!-- 宽度设计：战场地图478px 控制菜单120px 间距10px-->
+<!-- 宽度设计：战场地图476+2px 控制菜单118+2px 间距10px-->
 <div style="text-align: center; width: 608px;">
     <!-- 背景音乐 -->
     <div>
@@ -9,14 +9,14 @@
         <span class="grey">正在播放：～ <span id="bgmname">$bgmname</span> ～</span>
     </div>
     <!-- 战场地图 -->
-    <div style="width: 478px; float: left; margin-right: 5px;">
+    <div style="width: 476px; float: left; margin-right: 5px;border-radius: 3px; border:2px solid rgba(225, 124, 226, 0.2);	">
         <!--{eval $mapdata = init_mapdata();}-->
         $mapdata 
     </div>
     <!-- 控制菜单 -->
-    <div style="width: 120px; float: right; margin-left: 5px;">
+    <div style="width: 118px; float: right; margin-left: 5px;">
         <!-- 音乐控制指令 -->
-        <table border="1" cellspacing="0" cellpadding="0" style="position:relative;">
+        <table cellspacing="0" cellpadding="0" style="position:relative;border-radius: 3px; border:2px solid rgba(225, 124, 226, 0.2);">
             <tr>
                 <TD colspan="2" class="b1" style="width: 120px; height: 24px;">播放控制</TD>
             </tr>
@@ -43,13 +43,13 @@
         <!--{if !isset($clbpara['console'])}-->
         <!--<div style="position:relative; height:100%; width:100%;">
         <div class="blurtext">-->
-        <table border="1" cellspacing="0" cellpadding="0" style="position:relative;">
+        <table cellspacing="0" cellpadding="0" style="position:relative;">
             <tr width="120" height="328" rowspan="7" class="map">
                 <td colspan="2" width="120" height="328" class="lockmap"></td>
             </tr>
         </table>
         <!--{else}-->
-        <table border="1" cellspacing="0" cellpadding="0" style="position:relative;">
+        <table cellspacing="0" cellpadding="0" style="position:relative;border-radius: 3px; border:2px solid rgba(225, 124, 226, 0.2);">
             <tr>
                 <TD colspan="2" class=b1 style="width: 120px; height: 24px;">可用信道</TD>
             </tr>

templates/default/user_profile.htm

@@ -24,8 +24,20 @@
 		<!--{loop $atype $tid $tarr}-->
 		<tr>
 			<td>
-				<div class="subtitle" align="left">{$tarr['name']}</div>
-				<div style="margin-left: 6px;" align="left">{$tarr['desc']}</div>
+				<div class="subtitle" align="left">
+					{$tarr['name']}
+				</div>
+				<div style="margin-left: 6px;" align="left">
+					<!--{if ($tid == 'daily' && $curuser) }-->
+						<!--{if $reset_daily_flag}-->
+							{$reset_daily_flag}
+						<!--{elseif !isset($_REQUEST["action"])}-->
+							<button type="button" onclick="window.location.href='user_profile.php?action=refdaily';this.disabled=true">点击获得新的每日挑战</button>
+						<!--{/if}-->
+						<br>
+					<!--{/if}-->
+					{$tarr['desc']}
+				</div>
 			</td>
 		</tr>
 		<tr>
@@ -43,7 +55,6 @@
 						<!--{else}-->
 							<td width="300" align="left" valign="top">
 								<div class="ach_box" align="left" valign="top">
-								<!--成就编号{$aid}加载错误。<br>请联系管理员。-->
 								<!--{eval include template('achievement_temp');}-->
 								</div>
 							</td>

user_profile.php

@@ -39,12 +39,28 @@ $winning_rate=$validgames?round($wingames/$validgames*100)."%":'0%';
 include_once GAME_ROOT.'./include/game/achievement.func.php';
 $ach=$udata['achievement'];
 $n=$udata['username'];
+//本人访问账户页面时，初始化每日任务相关参数
+if($curuser)
+{
+	$dailyarr = check_daily_achievement($n);
+	if(isset($_REQUEST["action"]) && $_REQUEST["action"]=="refdaily" && !$dailyarr[0])
+	{
+		$dailyarr = reset_daily_achievement($n);
+	}
+	if($dailyarr[0])
+	{
+		list($min,$hour,$day,$month,$year)=explode(',',date("i,H,j,n,Y",$dailyarr[0]));
+		$reset_daily_flag = $year."年".$month."月".$day."日".$hour."时".$min."分";
+		$reset_daily_flag = "<span class=\"yellow\">下次可获取每日挑战时间：".$reset_daily_flag."</span>";
+	}
+	$dailyarr = $dailyarr[1];
+}
+//访问它人账户页面时，只显示获取过的每日任务
+else 
+{
+	$dailyarr = check_daily_achievement($n,1);
+}
 if(!empty($udata['achrev'])) $udata['achrev'] = json_decode($udata['achrev'],true);
-/*if (!valid_achievement($ach)) {
-	$ach=init_achievement($ach);
-	$db->query("UPDATE {$tablepre}users SET achievement='$ach' WHERE username='$n'" );	
-}*/ //已废弃
-
 // 访问账户页面时，检查是否需要转化新版成就数据结构
 if(!empty($udata['achievement']) && empty($udata['achrev']))
 {
@@ -83,21 +99,12 @@ if(!empty($udata['achievement']) && empty($udata['achrev']))
 	$db->query("UPDATE {$tablepre}users SET achrev='$new_ach' WHERE username='".$udata['username']."'" );
 	$cpl = Array(); $prc = Array();
 }
-//解析成就的完成情况//已废弃
-/*global $achievement_count;
-require config("gamecfg",$gamecfg);
-for ($i=0; $i<$achievement_count; $i++)
-{
-	$cpl[$i]=check_achievement($i,$n);
-	$prc[$i]=fetch_achievement($i,$n);
-	//$ncp[$i]['s'] = $cpl[$i];
-	//$ncp[$i]['v'] = $prc[$i];
-}*/
-//$ncp = json_encode($ncp);
-//$db->query("UPDATE {$tablepre}users SET achrev='$ncp' WHERE username='$n'" );	
 //解析成就的完成情况
 $alist = get_achlist();
 $atype = get_achtype();
+$h_atype = get_hidden_achtype();
+//判断是否存在每日任务
+$atype['daily']['ach'] = empty($dailyarr[0]) ? Array() : $dailyarr;
 foreach($alist as $aid => $arr)
 {
 	$cpl[$aid] = isset($udata['achrev'][$aid]['l']) ? $udata['achrev'][$aid]['l'] : 0;
@@ -105,5 +112,12 @@ foreach($alist as $aid => $arr)
 	if(isset($alist[$aid]['lvl']) && $cpl[$aid] == $alist[$aid]['lvl']) $cpl[$aid] = 999;
 	$prc[$aid] = isset($udata['achrev'][$aid]['v']) ? $udata['achrev'][$aid]['v'] : 0;
 }
+//判断是否存在完成的隐藏成就
+foreach($h_atype as $hid => $htype)
+{
+	if($cpl[$hid] == 999) $atype[$htype]['ach'][] = $hid;
+}
 include template('user_profile');
 
+
+

valid.php

@@ -290,6 +290,11 @@ if($mode == 'enter') {
 	{
 		if(isset($$key)) $ndata[$key] = $$key; 
 	}
+
+	# 初始化套装信息
+	include_once GAME_ROOT.'./include/game/itemmain.func.php';
+	reload_set_items($ndata);
+
 	$ndata = player_format_with_db_structure($ndata);
 	if(!empty($ndata)) $db->array_insert("{$tablepre}players", $ndata);