Merge pull request #19 from hikawiier/waaagh

fix  & update

gamedata/cache/style_20190718.css

@@ -414,3 +414,25 @@ span.drop:hover .dropdown-menu{
 	justify-content: center;
 	font: bold 10pt "微软雅黑" serif; color: white; overflow-x:hidden; overflow-y:auto; text-shadow:3px 3px 3px #231e1e; text-align: center;
 }
+/**/
+/*用于显示大头像的样式*/
+span.icon{
+	position: relative;
+}
+/*悬浮在大头像样式上时大头像*/
+span.icon:hover .icona{
+	display: block;
+	background-color: rgba(83, 63, 90, 0.5);
+	border-radius: 10px;
+}
+/*大头像本体样式*/
+.icona{
+	top:-40px;
+	left:-5px;
+	width: 140px; 
+    max-width: 140px; 
+	padding: 5px;
+    position: absolute;
+	z-index:10;
+	display: none;
+}
\ No newline at end of file

include/admin/vnmixlist.php

@@ -138,6 +138,12 @@ function post_back_vn_cache_file($data,$arr,$t=NULL)
 	{
 		include_once($file);
 	}
+
+	//把字符串还原为数组
+	if(!empty($arr['result'][4]))
+	{
+		$arr['result'][4] = get_itmsk_array($arr['result'][4]);
+	}
 	
 	if(isset($t))
 	{

templates/default/npcinfohelp.htm

@@ -6,7 +6,14 @@
 			<table border="1" cellspacing="0" cellpadding="0" valign="middle">
 				<tr>
 					<td>
-						<IMG width=140px src="img/n_$npcinfo[$kind]['sub'][$key]['icon'].gif" border="0" valign="middle"/>
+						<span class="icon">
+							<IMG width=140px src="img/n_$npcinfo[$kind]['sub'][$key]['icon'].gif" border="0" valign="middle"/>
+							<!--{if file_exists('img/n_'.$npcinfo[$kind]['sub'][$key]['icon'].'a.gif')}-->
+								<div class="icona">
+									<IMG class="aicon" width=140px src="img/n_$npcinfo[$kind]['sub'][$key]['icon']a.gif">
+								</div>
+							<!--{/if}-->
+						</span>
 					</td>
 					<td>
 						<table border="1" height=100% width=100% cellspacing="0" cellpadding="0">

vn_postitem.php

@@ -496,7 +496,8 @@ function filter_post_mixlist($vsname0,$vsname1,$vsname2,$vsname3,$vsname4,$vrnam
 		return $vlog;
 	}
 	//检查道具名
-	$vrname = preg_replace('/[,\#;\s\p{Cc}]+|锋利的|电气|毒性|钉|\[.*\]|[\s\t\r\n]|-改|<|>|\"/u','', $vrname);
+	$vrname = preg_replace('/[,\#;\p{Cc}]+|锋利的|电气|毒性|钉|\[.*\]|[\r\n]|-改|<|>|\"/u','', $vrname);
+	$vrname = preg_replace('/^\s+|\s+$/m', '', $vrname);
 	if(empty($vrname) || mb_strlen($vrname,'utf-8')>30)
 	{
 		$vlog .= '<span class="red">错误：'.$result_tips[0].'的名称为空或长度超过了30个字符。</span><br>';