2024年12月27日

monsters-info/ckey.json

@@ -2,25 +2,25 @@
 	{
 		"code": "ja",
 		"ckey": {
-			"card": "f05e9660c73f0b7f99ab322d6a398927",
+			"card": "78146af576119f5a3bf17e6c3cc2cf03",
-			"skill": "cce9ac41e9cdaf68bc8c595b157ab260"
+			"skill": "66c5c17735d2ffceebac43362ca53b18"
 		},
-		"updateTime": 1735032991170
+		"updateTime": 1735300948948
 	},
 	{
 		"code": "en",
 		"ckey": {
-			"card": "bc117df39a2b808cc244b939d732aa3a",
+			"card": "0d48edbbae376ba9428bb79a3bcaa051",
 			"skill": "b86857371e3ef81697734c5b60347867"
 		},
-		"updateTime": 1735032991170
+		"updateTime": 1735300948948
 	},
 	{
 		"code": "ko",
 		"ckey": {
-			"card": "cd8617edbeb1bbc6e15ec676df87a548",
+			"card": "5759f373e600c2eed77db1839afe099b",
 			"skill": "c0245a555867b9ad28f2fc2d3bcf5699"
 		},
-		"updateTime": 1735032991170
+		"updateTime": 1735300948948
 	}
 ]

monsters-info/custom/chs.json

@@ -70230,6 +70230,14 @@
 			"超转生进化"
 		]
 	},
+	{
+		"id": 9798,
+		"name": "超转生貂蝉",
+		"tags": [
+			"三国演义",
+			"超转生进化"
+		]
+	},
 	{
 		"id": 9799,
 		"name": "罗亚奥古＆诺切纳斯",
@@ -71716,6 +71724,13 @@
 			"星机神"
 		]
 	},
+	{
+		"id": 9999,
+		"name": "希洛普",
+		"tags": [
+			"神UP限定宠物"
+		]
+	},
 	{
 		"id": 10000,
 		"name": "原初的火龙・提拉",
@@ -71723,6 +71738,20 @@
 			"御三家"
 		]
 	},
+	{
+		"id": 10001,
+		"name": "原初的水龙・普莱希",
+		"tags": [
+			"御三家"
+		]
+	},
+	{
+		"id": 10002,
+		"name": "原初的木龙・布拉基",
+		"tags": [
+			"御三家"
+		]
+	},
 	{
 		"id": 10003,
 		"name": "无心的退魔师・星奈",
@@ -75283,6 +75312,14 @@
 			"饰品装备"
 		]
 	},
+	{
+		"id": 10500,
+		"name": "超转生浓姬",
+		"tags": [
+			"日本战国",
+			"超转生进化"
+		]
+	},
 	{
 		"id": 10562,
 		"name": "流华＆美月",
@@ -82046,6 +82083,11 @@
 			"希石"
 		]
 	},
+	{
+		"id": 11580,
+		"name": "泽特和希洛普",
+		"tags": []
+	},
 	{
 		"id": 11584,
 		"name": "百连刚的战斧",

script-json_data.js

@@ -556,9 +556,11 @@ const PAD_PASS_BADGE = 1<<7 | 1; //本程序的月卡徽章编号，129
 const official_badge_sorting = [ //20是没有启用的全属性徽章，现在也不在游戏内显示了
 	  1, 22, 23,  2,  3,  4,  5,  6,
 	  7,  8,  9, 11, 17, 18, 19, 21,
-	 10, 12, 13, 14, 24, 25, 26, 27,
+	 10, 12, 13, 14, 41, 42, 43, 44,
+	 45, 46, 47, 48, 24, 25, 26, 27,
 	 28, 29, 30, 31, 15, 16, 32, 33,
 	 34, 35, 36, 37, 38, 39, 40, 49,
+	 50,
 	PAD_PASS_BADGE,
 ]
 //官方的觉醒排列顺序

script.js

@@ -1085,16 +1085,6 @@ Formation.pdcBadgeMap = [
 	{pdf:31,pdc:29}, //叛逆的鲁鲁修
 	{pdf:15,pdc:30}, //漫威
 	{pdf:16,pdc:31}, //泳装
-	{pdf:32,pdc:32}, //怪物猎人
-	{pdf:33,pdc:33}, //三丽鸥
-	{pdf:34,pdc:34}, //咒术回战
-	{pdf:35,pdc:35}, //万圣节
-	{pdf:36,pdc:36}, //数码宝贝
-	{pdf:37,pdc:37}, //diss你
-	{pdf:38,pdc:38}, //GungHo本家
-	{pdf:39,pdc:39}, //周刊少年Magazine
-	{pdf:40,pdc:40}, //圣诞节
-	{pdf:41,pdc:49}, //GA文库
 ];
 //pdc的潜觉对应数字
 Formation.pdcLatentMap = [
@@ -1205,7 +1195,7 @@ Formation.prototype.getPdcQrStr = function()
 
 	const pdcTeamsStrArr = this.teams.map((t,idx,arr)=>{
 		let teamArr = [
-			Formation.pdcBadgeMap.find(badge=>badge.pdf === t[2])?.pdc || 0 //徽章
+			Formation.pdcBadgeMap.find(badge=>badge.pdf === t[2])?.pdc || t[2] //徽章
 		];
 		const membersArr = t[0];
 		const assistArr = t[1];
@@ -2472,7 +2462,7 @@ function pdcFotmationToPdfFotmation(inputString)
 		const membersArr = t[0];
 		const assistArr = t[1];
 		//队伍徽章
-		t[2] = pdcTeam.badge === 0 ? 0 : Formation.pdcBadgeMap.find(badge=>badge.pdc === pdcTeam.badge).pdf;
+		t[2] = Formation.pdcBadgeMap.find(badge=>badge.pdc === pdcTeam.badge)?.pdf || pdcTeam.badge;
 		pdcTeam.members.forEach((member)=>{
 			const m = membersArr[member.get(15) || 0];
 			const a = assistArr[member.get(15) || 0];
@@ -7556,6 +7546,7 @@ function refreshTeamTotalHP(totalDom, team, teamIdx) {
 				case 47: return member.card.types.includes(2) ? 1.05 : 1; //体力属性
 				case 48: return member.card.types.includes(3) ? 1.05 : 1; //回复属性
 				case 49: return member.card.collabId === 116 ? 1.15 : 1; //GA文库
+				case 50: return member.card.gachaIds.includes(0) ? 1.15 : 1; //正月(新年)
 				default: return 1;
 			}
 		}

service-worker.js

@@ -391,7 +391,7 @@ const cachesMap = new Map([
 	],
 	[
 		"images/cards_ja/CARDS_098.PNG",
-		"cf75083024bbdb6158be7408b0392857"
+		"6e8e6e7e833d8532303a005755fa70a8"
 	],
 	[
 		"images/cards_ja/CARDS_099.PNG",
@@ -403,7 +403,7 @@ const cachesMap = new Map([
 	],
 	[
 		"images/cards_ja/CARDS_101.PNG",
-		"b65f9faa86d1b012d61dbe42cf7a1d9d"
+		"adff84cac63d19fd387fdcf48910fb8b"
 	],
 	[
 		"images/cards_ja/CARDS_102.PNG",
@@ -419,11 +419,11 @@ const cachesMap = new Map([
 	],
 	[
 		"images/cards_ja/CARDS_105.PNG",
-		"14e554af73d36ec2f64fcbcd524bb15a"
+		"91468c2b922a03a1dbe840b5c702f1c4"
 	],
 	[
 		"images/cards_ja/CARDS_106.PNG",
-		"0e9e9b3b1b56a469a77a40d07f0477f8"
+		"bbc0e8bbaf75cde015bf03356227577a"
 	],
 	[
 		"images/cards_ja/CARDS_107.PNG",
@@ -431,7 +431,7 @@ const cachesMap = new Map([
 	],
 	[
 		"images/cards_ja/CARDS_108.PNG",
-		"d0c3401c705fa38b07b001d6a5b78634"
+		"b6ea608bcc63b2c841d5af525555b41f"
 	],
 	[
 		"images/cards_ja/CARDS_109.PNG",
@@ -463,7 +463,7 @@ const cachesMap = new Map([
 	],
 	[
 		"images/cards_ja/CARDS_116.PNG",
-		"a100037bf0bb67e210c906873805c835"
+		"793baaf3f483a4daf1faecb083394f09"
 	],
 	[
 		"images/cards_ja/CARDS_117.PNG",
@@ -483,7 +483,11 @@ const cachesMap = new Map([
 	],
 	[
 		"images/cards_ja/CARDS_121.PNG",
-		"4baa7f1aad3f67d5f02e125a28325e9f"
+		"3651912d1ce4980c2bb49a1b0e26984c"
+	],
+	[
+		"images/cards_ja/CARDS_122.PNG",
+		"2dfe449d1a028eebfadee5deb3f7c4a4"
 	],
 	[
 		"sound/voice/ja/padv001.wav",
@@ -14281,6 +14285,14 @@ const cachesMap = new Map([
 		"sound/voice/ja/padv4061.wav",
 		"fbc488c33da1c6588d8eb73cdb2f43d8"
 	],
+	[
+		"sound/voice/ja/padv4062.wav",
+		"e47bab2367dbd0edd7db0a6725b05920"
+	],
+	[
+		"sound/voice/ja/padv4064.wav",
+		"474c5db64759c5fc9af359a6f5cfe6aa"
+	],
 	[
 		"sound/voice/ja/padv407.wav",
 		"e8ef867dda64c148f9c40b2954a82adf"
@@ -41279,7 +41291,7 @@ const cachesMap = new Map([
 	],
 	[
 		"script-json_data.js",
-		"a6d45be5ada6ff8fd191ed60402223ad"
+		"247299273c6251939382cc9bfc3ecf41"
 	],
 	[
 		"script-skill-parser.js",
@@ -41291,7 +41303,7 @@ const cachesMap = new Map([
 	],
 	[
 		"script.js",
-		"451c75307a755fb6ac22ffdf31b42c78"
+		"8737430570f968954c3afb79f64f12b5"
 	],
 	[
 		"solo.html",
@@ -41383,7 +41395,7 @@ const cachesMap = new Map([
 	],
 	[
 		"images/badge.png",
-		"663436e50b6981a43b0c7f165b98929d"
+		"4574cefa80e48a6bf111ca2a5276dc28"
 	],
 	[
 		"images/brown-button.svg",