diff --git a/monsters-info/ckey.json b/monsters-info/ckey.json index 5502b487..8eb25aca 100644 --- a/monsters-info/ckey.json +++ b/monsters-info/ckey.json @@ -1 +1,26 @@ -[{"code":"ja","ckey":{"card":"186da01f08ed72289f6773793564384d","skill":"3820d1b718b51824fc0d3aadefb2eb6f"},"updateTime":1676536625356},{"code":"en","ckey":{"card":"24cdd9efe2912958c15f4ef725586400","skill":"1577d8e41d83a382d466d23335017d24"},"updateTime":1676536625356},{"code":"ko","ckey":{"card":"06e3e6f9035523d447ec0c39f15a9991","skill":"76b6ae56c534699009288fbf145b5c86"},"updateTime":1676536625356}] \ No newline at end of file +[ + { + "code": "ja", + "ckey": { + "card": "186da01f08ed72289f6773793564384d", + "skill": "3820d1b718b51824fc0d3aadefb2eb6f" + }, + "updateTime": 1676536625356 + }, + { + "code": "en", + "ckey": { + "card": "24cdd9efe2912958c15f4ef725586400", + "skill": "1577d8e41d83a382d466d23335017d24" + }, + "updateTime": 1676536625356 + }, + { + "code": "ko", + "ckey": { + "card": "06e3e6f9035523d447ec0c39f15a9991", + "skill": "76b6ae56c534699009288fbf145b5c86" + }, + "updateTime": 1676536625356 + } +] \ No newline at end of file diff --git a/monsters-info/extractByNode.js b/monsters-info/extractByNode.js index cda03e3f..5896c381 100644 --- a/monsters-info/extractByNode.js +++ b/monsters-info/extractByNode.js @@ -295,7 +295,7 @@ fs.readFile('./ckey.json', 'utf-8', function (err, data) { } } } - fs.writeFile('./ckey.json', JSON.stringify(ckeyObjs), function (err) { + fs.writeFile('./ckey.json', JSON.stringify(ckeyObjs, null, '\t'), function (err) { if (err) { console.error(err); } diff --git a/monsters-info/official-API/parseCard.js b/monsters-info/official-API/parseCard.js index fb95bf9d..cd5efb80 100644 --- a/monsters-info/official-API/parseCard.js +++ b/monsters-info/official-API/parseCard.js @@ -74,8 +74,6 @@ class Card{ card.types.some(t=>[0,12,14,15].includes(t)); //0進化用;12能力覺醒用;14強化合成用;15販賣用默认合并 card.is8Latent = Boolean(flags & 1<<5); //是否支持8个潜觉 card.skillBanner = Boolean(flags & 1<<6); //是否有技能横幅 - card.attrs = card.attrs.filter(n=>n>=0); //attr里面去掉-1 - card.types = card.types.filter(n=>n>=0); //type里面去掉-1 card.altName = data[i++].split("|").filter(str=>str.length); //替换名字(分类标签) card.limitBreakIncr = data[i++]; //110级增长 @@ -85,8 +83,16 @@ class Card{ card.searchFlags = [data[i++], data[i++]]; //队长技搜索类型,解析写在这里会导致文件太大,所以写到前端去了 card.gachaId = data[i++]; //目前猜测是桶ID card.unk08 = data[i++]; //未知08 - if ((i + 1) < data.length) - console.log(`有新增数据/residue data for #${card.id}: ${i} ${data.length}`); + card.attrs.push(data[i++]); //属性3 + + card.attrs = card.attrs.filter(Number.isInteger); + if (card.attrs.indexOf(-1)>0) + card.attrs = card.attrs.slice(0,card.attrs.indexOf(-1)); //attr里面去掉-1之后的 + card.types = card.types.filter(Number.isInteger); + if (card.types.indexOf(-1)>0) + card.types = card.types.slice(0,card.types.indexOf(-1)); //type里面去掉-1 + if (i < data.length) + console.log(`有新增数据/residue data for #${card.id}: ${i} ${data[i]}`); } } //对于Nodejs输出成模块 diff --git a/monsters-info/official-API/test-mon.html b/monsters-info/official-API/test-mon.html index ae997c7a..2ad275ea 100644 --- a/monsters-info/official-API/test-mon.html +++ b/monsters-info/official-API/test-mon.html @@ -79,7 +79,7 @@ function g(id) m[41],m[42],m[43],m[44],m[45], //进化素材ID 1-5 ); } -fetch("ko-card.json").then(async response=>{ +fetch("ja-card.json").then(async response=>{ const originalJSON = await response.json(); cards = originalJSON.card; pcards = cards.map(c=>{