Merge branch 'master' into skillParser

languages/zh-CN.js

@@ -1482,12 +1482,18 @@ function parseSkillDescription(skill) {
 		case 214: //封自己的技能
 			str = `${sk[0]}回合内，玩家自身队伍无法使用主动技能`;
 			break;
+		case 215: //十字属性珠+C
+			str = `${sk[0]}回合内，${getOrbsAttrString(sk[1])}宝珠无法消除`;
+			break;
 		case 218: //坐自己
 			str = `自身以外的宠物技能坐下↓${sk[0]}${sk[0]!=sk[1]?`~${sk[1]}`:""}回合`;
 			break;
 		case 219: //192同时消除多色中所有色,219任意消除多色中1色
 			str = `相连消除${sk[1]}个或以上的${getOrbsAttrString(sk[0], true)}宝珠时，结算时连击数+${sk[2]}`;
 			break;
+		case 223:
+			str = `${sk[0]}连击以上时，追加${sk[1].bigNumberToString()}点固定伤害`;
+			break;
 		default:
 			str = `未知的技能类型${type}(No.${id})`;
 			//开发部分
@@ -1715,7 +1721,7 @@ function parseSkillDescription(skill) {
 		{name:"不做筛选",function:cards=>cards},
 		{group:"======队长技======", functions: [
 			{name:"队长技固伤追击（按伤害排序）",function:cards=>{
-				const searchTypeArray = [199,200,201];
+				const searchTypeArray = [199,200,201,223];
 				function getSkillFixedDamage(skill)
 				{
 					switch (skill.type)
@@ -1724,6 +1730,8 @@ function parseSkillDescription(skill) {
 							return skill.params[2];
 						case 201:
 							return skill.params[5];
+						case 223:
+							return skill.params[1];
 						default:
 							return 0;
 					}
@@ -1737,7 +1745,7 @@ function parseSkillDescription(skill) {
 					return a_pC - b_pC;
 				});
 			},addition:card=>{
-				const searchTypeArray = [199,200,201];
+				const searchTypeArray = [199,200,201,223];
 				function getSkillFixedDamage(skill)
 				{
 					switch (skill.type)
@@ -1746,6 +1754,8 @@ function parseSkillDescription(skill) {
 							return skill.params[2];
 						case 201:
 							return skill.params[5];
+						case 223:
+							return skill.params[1];
 						default:
 							return 0;
 					}
@@ -2530,6 +2540,16 @@ function parseSkillDescription(skill) {
 					return subskills.some(subskill=>subskill.type == searchType);
 				}
 			})},
+			{name:"自封消珠（能干啥？）",function:cards=>cards.filter(card=>{
+				const searchType = 215;
+				const skill = Skills[card.activeSkillId];
+				if (skill.type == searchType)
+					return true;
+				else if (skill.type == 116 || skill.type == 118){
+					const subskills = skill.params.map(id=>Skills[id]);
+					return subskills.some(subskill=>subskill.type == searchType);
+				}
+			})},
 		]},
 		{group:"-----锁珠类-----", functions: [
 			{name:"解锁",function:cards=>cards.filter(card=>{

monsters-info/ckey.json

@@ -1 +1 @@
-[{"code":"ja","ckey":{"card":"7572ab70fa51242d817b07250d693eba","skill":"060aa289cd1ae538c902525765f0346c"},"updateTime":1620902682954},{"code":"en","ckey":{"card":"c0b0e9c4dd22f35422a0450e73806e85","skill":"5a683f088a059b862c71d84407f5169f"},"updateTime":1620902594821},{"code":"ko","ckey":{"card":"73fef85983612858a53b4d58e8d494e6","skill":"9fb2ba91e51ba5ab9a44d2b37b575b0b"},"updateTime":1620902594821}]
+[{"code":"ja","ckey":{"card":"137f2f6d136bf7f64375e437b8d8c5ca","skill":"6ef371bfce0084638a4c243f814143a4"},"updateTime":1620989173501},{"code":"en","ckey":{"card":"ee750db546bff3985b906f211f4f13f2","skill":"5a683f088a059b862c71d84407f5169f"},"updateTime":1620989173501},{"code":"ko","ckey":{"card":"f25b1573fd324ac51bc48c886aad6c58","skill":"fe00fb8954aa860c667d6dbf00618f96"},"updateTime":1620989173501}]

script-universal_function.js

@@ -788,7 +788,7 @@ function tIf_Effect_addCombo(leader1id, leader2id) {
 }
 //计算队伍的追打
 function tIf_Effect_inflicts(leader1id, leader2id) {
-	const searchTypeArray = [199, 200, 201];
+	const searchTypeArray = [199, 200, 201, 223];
 	const ls1 = getCardLeaderSkills(Cards[leader1id], searchTypeArray)[0];
 	const ls2 = getCardLeaderSkills(Cards[leader2id], searchTypeArray)[0];
 
@@ -800,6 +800,8 @@ function tIf_Effect_inflicts(leader1id, leader2id) {
 				return skill.params[2];
 			case 201:
 				return skill.params[5];
+			case 223:
+				return skill.params[1];
 			default:
 				return 0;
 		}