fix

Fixed a oversight where "y" is not in the club20 element mix pool.
Fixed a logical oversight regarding legality of elements

gamedata/cache/elementmix_1.php

@@ -296,9 +296,9 @@
 		//冲击：随机1个价值在20以上特征+1个随机“攻击”标签特征
 		Array('stuff'=>Array(0=>'tags_W',1=>'v_20'),'result'=>'N','obbs'=>50),
 		//贯穿：重击辅助+随机2个价值在30以上的次要特征
-		Array('stuff'=>Array(0=>'c',1=>'v_30',2=>'v_30'),'result'=>'n','obbs'=>66),
+		Array('stuff'=>Array(0=>'c',1=>'v_30',2=>'v_30'),'result'=>'n','obbs'=>45),
 		//破格：陷阱探测+随机2个价值在30以上的次要特征
-		Array('stuff'=>Array(0=>'M',1=>'v_30',2=>'v_30'),'result'=>'n','obbs'=>66),
+		Array('stuff'=>Array(0=>'M',1=>'v_30',2=>'v_30'),'result'=>'y','obbs'=>45),
 		//属性防御：随机1个价值在30以上+2个随机“防御”标签特征
 		Array('stuff'=>Array(0=>'v_30',1=>'tags_D',2=>'tags_D'),'result'=>'a','obbs'=>50),
 		//全系防御：随机2个价值在30以上的次要特征+1个随机“防御”标签特征

include/game/elementmix.func.php

@@ -396,7 +396,11 @@
 		if($itmer > 98 || $itmer < 1) $itmer = 55;
 		$emixarr = Array(); $emixnums = Array(); $farr = Array();
 		# 检查素材合法性
-		$domkey = Array(); $domnum = 0;
+		//$domkey = Array(); $domnum = 0;
+		arsort($nums);
+		$domid = array_key_first($nums);
+		$domkey = Array($domid);
+		$domnum = $nums[$domid];
 		for($i = 0; $i<= count($list); $i++)
 		{
 			if(isset($list[$i]) && !empty($nums[$i]))
@@ -414,10 +418,14 @@
 					return;
 				}
 				# 检查是否为主元素
-				if($emixnums[$i] >= $domnum - 10)
+//				if($emixnums[$i] >= $domnum - 10)
+//				{
+//					$domnum = $emixnums[$i];
+//					$domkey[] = $i;
+//				}
+				if(!in_array($i,$domkey) && $emixnums[$i] >= $domnum - 10)
 				{
-					$domnum = $emixnums[$i];
-					$domkey[] = $i;
+				    $domkey[] = $i;
 				}
 			}
 		}