Merge branch 'master' into skillParser

help.md

@@ -2,7 +2,10 @@
 ======
 * 直接复制网址即可分享组队或自己添加收藏夹保存。你可以使用*短网址服务*进一步缩短网址。  
 Copy the URL directly to share the Formation, or add a Bookmark to archives. You can use any *Short URL Service* to further shorten the URL.  
-![分享组队](document/tips-share.png)
+![分享组队](document/tips-share.png)  
+你也可以使用浏览器扩展生成二维码来分享网址。  
+You can also share the URL in QR code by browser extensions.  
+![生成二维码](document/tips-qrcode.png)
 * 使用后退即可撤销上一次修改。  
 Use back to undo the last edit.  
 ![撤銷修改](document/tips-undo.png)

languages/zh-CN.js

@@ -732,11 +732,12 @@ function parseSkillDescription(skill) {
 			{
 				if (hasDiffOrbs)
 				{//「光光火/光火火」組合的3COMBO時，所有寵物的攻擊力3.5倍；「光光火火」組合的4COMBO或以上時，所有寵物的攻擊力6倍 
-					str = `${strArr.map(a=>nb(a, attrsName)).join("、")}中${sk[5]}串同时攻击时，所有宠物的攻击力×${sk[6]/100}倍，每多1串+${sk[7]/100}倍，最大${strArr.length}串时×${(sk[6]+sk[7]*(strArr.length-sk[5]))/100}倍`;
+					str = `${strArr.map(a=>nb(a, attrsName)).join("、")}中${sk[5]}串同时攻击时，所有宠物的攻击力×${sk[6]/100}倍`;
 				}else
 				{//木寶珠有2COMBO時，所有寵物的攻擊力3倍，每多1COMBO+4倍，最大5COMBO時15倍 
-					str = `${nb(strArr[0], attrsName).join("、")}宝珠有${sk[5]}串时，所有宠物的攻击力×${sk[6]/100}倍，每多1串+${sk[7]/100}倍，最大${strArr.length}串时×${(sk[6]+sk[7]*(strArr.length-sk[5]))/100}倍`;
+					str = `${nb(strArr[0], attrsName).join("、")}宝珠有${sk[5]}串时，所有宠物的攻击力×${sk[6]/100}倍`;
 				}
+				if (sk[7]) str += `，每多1串+${sk[7]/100}倍，最大${strArr.length}串时×${(sk[6]+sk[7]*(strArr.length-sk[5]))/100}倍`;
 			}else
 			{
 				if (hasDiffOrbs)
@@ -1264,6 +1265,7 @@ function parseSkillDescription(skill) {
 			str = `<span class="spColor">【操作时间固定${sk[0]}秒】</span>`;
 			if (sk[1] || sk[2]) str += `${getAttrTypeString(flags(sk[1]),flags(sk[2]))}宠物`;
 			if (sk[3] || sk[4] || sk[5]) str += "的"+getFixedHpAtkRcvString({hp:sk[3],atk:sk[4],rcv:sk[5]});
+			if (sk[6]) str += `，受到的${getAttrTypeString(flags(sk[6]))}属性伤害减少${sk[7]}%`;
 			break;
 		case 179:
 			str = `${sk[0]}回合内，每回合回复${sk[1]?`${sk[1].bigNumberToString()}点`:` HP 上限 ${sk[2]}%`}的 HP`;
@@ -1617,6 +1619,9 @@ function parseSkillDescription(skill) {
 			case 163: //无条件盾，属性个数不固定
 				scale = (allAttr && (sk[5] & 31) != 31) ? 0 : sk[6]/100;
 				break;
+			case 178: //无条件盾，属性个数不固定
+				scale = (allAttr && (sk[6] & 31) != 31) ? 0 : sk[7]/100;
+				break;
 			case 130: //血线下 + 属性个数不固定
 			case 131: //血线上 + 属性个数不固定
 				scale = (noHPneed || allAttr && (sk[5] & 31) != 31) ? 0 : sk[6]/100;

monsters-info/ckey.json

@@ -1 +1 @@
-[{"code":"ja","ckey":{"card":"a442ae9a64910478cb9ab1951a1626c4","skill":"0430113377aa1261574116935ad402dd"},"updateTime":1617964794910},{"code":"en","ckey":{"card":"8838dee4c0e07f12b8d6cd55fdd0f959","skill":"6c1a77e57ad68aa12347a0ec798c68e9"},"updateTime":1617883383834},{"code":"ko","ckey":{"card":"3898af2e88068048513d4d8f865853f1","skill":"0670e1555e1e5a332f9d41dd0bf5db16"},"updateTime":1617883383834}]
+[{"code":"ja","ckey":{"card":"d67bce748f4f9a21ffdbbbdda8f5e954","skill":"90de76ed858236283c3375b28d1908de"},"updateTime":1619201587645},{"code":"en","ckey":{"card":"9fe908706553186f9fb8bca48935b595","skill":"1b8982bce6fc6abe9755d0837a924f14"},"updateTime":1619172877295},{"code":"ko","ckey":{"card":"9f403c9f5aa33c7802018a707df30c12","skill":"ec626f8a8fff38b226eb548e47010f98"},"updateTime":1619172877295}]

monsters-info/official-API/test-mon.html

@@ -30,10 +30,11 @@ var GM_xmlhttpRequest = function(GM_param) {
 
 function g(id)
 {
+	let m = cards[id];
+	
 	console.log("原始数组",m);
 	console.log("已解析对象",pcards[id]); //输出人家大佬的格式
 
-	let m = cards[id];
 	var pn = ["火","水","木","光","暗"];
 	var p = [pn[m[2]]||"无", pn[m[3]]||"无"];
 	var tn = ["0进化","1平衡","2体力","3回复","4龙","5神","6攻击","7恶魔","8机械","9","10","11","12觉醒","13","14强化","15卖钱"];
@@ -92,7 +93,6 @@ GM_xmlhttpRequest({
 			card.unk06bin = card.unk06.toString(2);
 			card.unk07bin = card.unk07.toString(2);
 			card.unk08bin = card.unk08.toString(2); //已知一些flag
-			card.unk09bin = card.unk09.toString(2);
 			return card;
 		});
 	},

script-json_data.js

@@ -59,7 +59,16 @@ const equivalent_awoken = [
 	{small:21,big:56,times:2}, //SB
 ];
 //官方的觉醒排列顺序
-const official_awoken_sorting = [21,19,43,45,10,11,12,13,49,56,53,61,50,52,68,69,70,28,27,48,62,57,58,60,59,54,55,14,15,16,17,18,29,20,44,51,22,23,24,25,26,32,31,33,34,4,5,6,7,8,35,36,37,38,1,2,3,46,47,39,40,41,42,65,66,67,9,71,72,30,64,63,73,74,75,76,77,78];
+const official_awoken_sorting = [
+          21, 19, 43, 45, 10, 11, 12, 13, 49,
+          56, 53, 61, 50, 52, 68, 69, 70, 28,
+          27, 48, 62, 57, 58, 60, 59, 54, 55,
+          14, 15, 16, 17, 18, 29, 20, 44, 51,
+          22, 23, 24, 25, 26, 32, 31, 33, 34,
+           4,  5,  6,  7,  8, 35, 36, 37, 38,
+           1,  2,  3, 46, 47, 39, 40, 41, 42,
+          65, 66, 67,  9, 71, 72, 30, 64, 63,
+          73, 74, 75, 76, 77, 78];
 //排序程序列表
 const sort_function_list = [
 	{tag:"sort_none",name:"无",function:()=>0},

script-universal_function.js

@@ -968,7 +968,7 @@ function getReduceRange(reduceScales)
 }
 //获取盾减伤比例组
 function getReduceScales(leaderid) {
-	const searchTypeArray = [16, 17, 36, 38, 43, 129, 163, 130, 131, 151, 169, 198, 170, 182, 193, 171, 183];
+	const searchTypeArray = [16, 17, 36, 38, 43, 129, 163, 130, 131, 178, 151, 169, 198, 170, 182, 193, 171, 183];
 	const lss = getCardLeaderSkills(Cards[leaderid], searchTypeArray);
 	
 	function leaderReduceScale(ls) {
@@ -1042,6 +1042,10 @@ function getReduceScales(leaderid) {
 					}
 				}
 				break;
+			case 178: //无条件盾，属性个数不固定
+				reduce.scale = (sk[7] || 0) / 100;
+				reduce.attrs = 0 | sk[6];
+				break;
 			case 151: //十字心触发
 			case 169: //C触发
 			case 198: //回血触发

script.js

@@ -3128,7 +3128,7 @@ function refreshMenberAwoken(menberAwokenDom, assistAwokenDom, team, idx) {
 	if ((solo || teamsCount === 3) && memberData.sawoken >= 0) menberAwokens.push(Cards[memberData.id].superAwakenings[memberData.sawoken]);
 	//menberAwokens.sort();
 	//武器觉醒
-	let assistAwokens = Cards[assistData.id].awakenings.slice(0,assistData.awoken);
+	let assistAwokens = Cards[assistData.id > 0 ? assistData.id : 0].awakenings.slice(0,assistData.awoken);
 	if (!assistAwokens.includes(49)) assistAwokens = []; //清空非武器的觉醒
 	//assistAwokens.sort();
 	/*if (assistAwokens.includes(49))