Merge branch 'master' of github.com:Mapaler/PADDashFormation

.gitignore

@@ -11,3 +11,4 @@
 /fonts/.font-spider
 /images/*.fw.png
 /monsters-info/package-lock.json
+/monsters-info/official-API/*-player-data-*.json

monsters-info/ckey.json

@@ -1 +1 @@
-[{"code":"ja","ckey":{"card":"6eccaf48a81812b00745b45595d04247","skill":"b6accb9055bae3c3dd7a4590244227df"},"updateTime":1643387670679},{"code":"en","ckey":{"card":"6f2da38337ae55e26de806b5955bdbdf","skill":"35e1d4111c0abb91e725e143179f247f"},"updateTime":1643386967111},{"code":"ko","ckey":{"card":"56ff57a4cb28b33c843eef12a99e04d4","skill":"55e4d0b7d515f57090dd76a23c917c1e"},"updateTime":1643386967111}]
+[{"code":"ja","ckey":{"card":"8fab10410029f684ff9620f0c8260ec5","skill":"8f6a2c5adba524673b736b16c6863c4b"},"updateTime":1644158615540},{"code":"en","ckey":{"card":"d26b1dda29417791debc29d386940f02","skill":"ff076b4e7cbb222e365df5a0b3086291"},"updateTime":1644158615540},{"code":"ko","ckey":{"card":"bdb3e3662fd4f454928f8b97004bda1c","skill":"342e20f2a967f9bb39aacdd6d48acc06"},"updateTime":1644158615540}]

script-universal_function.js

@@ -1020,8 +1020,8 @@ function countTeamHp(memberArr, leader1id, leader2id, solo, noAwoken = false) {
 				}
 				break;
 			}
-			case 217:{ //队员为指定类型，不包括双方队长，且队员数大于0
-				let cardsArr = memberArr.filter(m => m.id > 0).map(m => Cards[m.id]); //所有的卡片
+			case 217:{ //限定队伍星级，不包括好友队长
+				let cardsArr = memberArr.slice(0, 5).filter(m => m.id > 0).map(m => Cards[m.id]); //所有的卡片
 				const rarityCount = cardsArr.reduce((pre,member)=>{
 					const card = Cards[member.id] || Cards[0];
 					return pre + card.rarity;

script.js

@@ -4606,7 +4606,7 @@ function refreshTeamTotalHP(totalDom, team, teamIdx) {
 	if (tRarityDom)
 	{
 		const rarityDoms = tRarityDom.querySelector(".rarity");
-		const rarityCount = team_2p.reduce((pre,member)=>{
+		const rarityCount = team[0].slice(0,5).reduce((pre,member)=>{
 			if (member.id <= 0) return pre;
 			const card = Cards[member.id] || Cards[0];
 			return pre + card.rarity;