v20 图标用上正式版；龙和神的顺序更换

languages/zh.js

@@ -335,8 +335,8 @@
 			[80]: tp`${'icon'}4色`,
 			[81]: tp`${'icon'}5色`,
 			[82]: tp`${'icon'}12珠`,
-			[83]: tp`${'icon'}附加神类型`,
-			[84]: tp`${'icon'}附加龙类型`,
+			[83]: tp`${'icon'}附加龙类型`,
+			[84]: tp`${'icon'}附加神类型`,
 			[85]: tp`${'icon'}附加恶魔类型`,
 			[86]: tp`${'icon'}附加机械类型`,
 			[87]: tp`${'icon'}附加平衡类型`,

script-json_data.js

@@ -351,8 +351,8 @@ let localTranslating = {
 			[80]: tp`${'icon'}4 Att. Enhanced Attack`,
 			[81]: tp`${'icon'}5 Att. Enhanced Attack`,
 			[82]: tp`${'icon'}Super Enhanced Matching`,
-			[83]: tp`${'icon'}Append God Type`,
-			[84]: tp`${'icon'}Append Dragon Type`,
+			[83]: tp`${'icon'}Append Dragon Type`,
+			[84]: tp`${'icon'}Append God Type`,
 			[85]: tp`${'icon'}Append Devil Type`,
 			[86]: tp`${'icon'}Append Machine Type`,
 			[87]: tp`${'icon'}Append Balanced Type`,
@@ -425,7 +425,7 @@ const official_awoken_sorting = [
 		   1,  2,  3, 46, 47, 39, 40, 41, 42,
 		  65, 66, 67,  9, 71, 72, 30, 64, 63,
 		  73, 74, 75, 76, 77, 78, 79, 80, 81,
-		  82, 83, 84, 85, 86, 87, 88, 89, 90,
+		  82, 84, 83, 85, 86, 87, 88, 89, 90,
 		  91, 92, 93, 94, 95, 96
 ];
 

script-universal_function.js

@@ -354,7 +354,6 @@ function dbDelete (db, tableName, keys) {
 }
 
 function latentUseHole(latentId) {
-	let num = 1;
 	switch (true) {
 		case (latentId === 12):
 		case (latentId >= 16 && latentId <= 36):

script.js

@@ -152,18 +152,8 @@ Member.prototype.getAttrsTypesWithWeapon = function(assist) {
 		if (changeAttr) attrs[1] = changeAttr - 91;
 		//添加类型
 		let appendTypes = assistCard.awakenings.filter(ak=>ak >= 83 && ak <= 90);
-		appendTypes = appendTypes.map(type=>{
-			switch (type) {
-				case 83: {return 5;}
-				case 84: {return 4;}
-				case 85: {return 7;}
-				case 86: {return 8;}
-				case 87: {return 1;}
-				case 88: {return 6;}
-				case 89: {return 2;}
-				case 90: {return 3;}
-			}
-		});
+		appendTypes = appendTypes.map(type=>
+			typekiller_for_type.find(t=>(type - 45) === t.awoken).type);
 		for (let appendType of appendTypes) {
 			types.add(appendType);
 		}