Merge branch 'master' into service-worker

4 years ago · dc01694d47
--- a/monsters-info/ckey.json
+++ b/monsters-info/ckey.json
@@ -1 +1 @@
 [{"code":"ja","ckey":{"card":"a582fefca4032f76caa0a0d3eb69b11c","skill":"40c8561ff200e76159c7bb779222331e"},"updateTime":1633095955999},{"code":"en","ckey":{"card":"b65fb4e8f9804cdcb89dd4004dac205d","skill":"1d36659ae49f1229620336fe847cfbed"},"updateTime":1633095955999},{"code":"ko","ckey":{"card":"09ac70f1cc55b69074792653a9add3cb","skill":"f7a588f1c0793abd2a358ee578007385"},"updateTime":1633095955999}]
 [{"code":"ja","ckey":{"card":"28284805d53fc5163d87344b472872a7","skill":"40c8561ff200e76159c7bb779222331e"},"updateTime":1633184217324},{"code":"en","ckey":{"card":"797846c47dd54b3b7a7257ec89f906bd","skill":"1d36659ae49f1229620336fe847cfbed"},"updateTime":1633184217324},{"code":"ko","ckey":{"card":"8a24c6d7a0ab138f02332e8f3bc46a01","skill":"f7a588f1c0793abd2a358ee578007385"},"updateTime":1633184217324}]
--- a/monsters-info/custom/chs.json
+++ b/monsters-info/custom/chs.json
--- a/monsters-info/custom/cht.json
+++ b/monsters-info/custom/cht.json
--- a/monsters-info/mon_en.json
+++ b/monsters-info/mon_en.json
--- a/monsters-info/mon_ja.json
+++ b/monsters-info/mon_ja.json
--- a/monsters-info/mon_ko.json
+++ b/monsters-info/mon_ko.json
--- a/script-skill-parser.js
+++ b/script-skill-parser.js
@@ -1122,8 +1122,8 @@ const parsers = {
 		return [
 			powerUp(flags(attrs), flags(types), p.mul({ atk: mul1 || 100 }), less1 ? c.hp(0, percent1) : c.hp(percent1, 100)),
 			powerUp(flags(attrs), flags(types), p.mul({ atk: mul2 || 100 }), less1 ?
 			(less2 ? c.hp(percent1, percent2) : c.hp(percent2, 100)) :
 			(less2 ? c.hp(0, percent2) : c.hp(percent2, percent1))
 				(less2 ? c.hp(percent1, percent2) : c.hp(percent2, 100)) :
 				(less2 ? c.hp(0, percent2) : c.hp(percent2, percent1 - 1))
 			),
 		];
 	},