Merge branch 'master' into skillParser

languages/zh-CN.js

@@ -1491,6 +1491,9 @@ function parseSkillDescription(skill) {
 		case 219: //192同时消除多色中所有色,219任意消除多色中1色
 			str = `相连消除${sk[1]}个或以上的${getOrbsAttrString(sk[0], true)}宝珠时，结算时连击数+${sk[2]}`;
 			break;
+		case 220: //192同时消除多色中所有色,219任意消除多色中1色
+			str = `以L字形消除5个${getOrbsAttrString(sk[0], true)}宝珠时，结算时连击数+${sk[1]}`;
+			break;
 		case 223:
 			str = `${sk[0]}连击以上时，追加${sk[1].bigNumberToString()}点固定伤害`;
 			break;
@@ -1780,6 +1783,8 @@ function parseSkillDescription(skill) {
 						case 210:
 						case 219:
 							return skill.params[2];
+						case 220:
+							return skill.params[1];
 						default:
 							return 0;
 					}
@@ -1807,6 +1812,8 @@ function parseSkillDescription(skill) {
 						case 210:
 						case 219:
 							return skill.params[2];
+						case 220:
+							return skill.params[1];
 						default:
 							return 0;
 					}

monsters-info/ckey.json

@@ -1 +1 @@
-[{"code":"ja","ckey":{"card":"b3a39d6fe841e766a542c932b3e0f080","skill":"6ef371bfce0084638a4c243f814143a4"},"updateTime":1621018378016},{"code":"en","ckey":{"card":"35fb6953644a8b75b21af43cf88943d3","skill":"5a683f088a059b862c71d84407f5169f"},"updateTime":1621018378016},{"code":"ko","ckey":{"card":"e377facf7976cc96c526dfc795f7d572","skill":"fe00fb8954aa860c667d6dbf00618f96"},"updateTime":1621018378016}]
+[{"code":"ja","ckey":{"card":"8de4a614b8ffb6c6e27a25709cd5dc56","skill":"c1a7af48e57ee62978a4a9433a1278d7"},"updateTime":1621594259951},{"code":"en","ckey":{"card":"8f5f7caf7edc1d5975cf521495b15fd3","skill":"f08d827519bac1ae82136e754cf6e3f1"},"updateTime":1621516446591},{"code":"ko","ckey":{"card":"3fd940f80df23cafaaff41185acc4ba7","skill":"c391be53515691e1f5b23d4fc6a0455b"},"updateTime":1621516446591}]

script-universal_function.js

@@ -762,7 +762,7 @@ function tIf_Effect_poisonNoEffect(leader1id, leader2id) {
 }
 //计算队伍的+C
 function tIf_Effect_addCombo(leader1id, leader2id) {
-	const searchTypeArray = [192, 194, 206, 209, 210, 219];
+	const searchTypeArray = [192, 194, 206, 209, 210, 219, 220];
 	const ls1 = getCardLeaderSkills(Cards[leader1id], searchTypeArray)[0];
 	const ls2 = getCardLeaderSkills(Cards[leader2id], searchTypeArray)[0];
 
@@ -779,6 +779,8 @@ function tIf_Effect_addCombo(leader1id, leader2id) {
 			case 210:
 			case 219:
 				return skill.params[2];
+			case 220:
+				return skill.params[1];
 			default:
 				return 0;
 		}