diff --git a/images/icon-abilities.png b/images/icon-abilities.png new file mode 100644 index 00000000..4010ffdb Binary files /dev/null and b/images/icon-abilities.png differ diff --git a/images/project file/icon-abilities.fw.png b/images/project file/icon-abilities.fw.png new file mode 100644 index 00000000..4fda3ee7 Binary files /dev/null and b/images/project file/icon-abilities.fw.png differ diff --git a/languages/en.css b/languages/en.css index 3b9ab104..d43fa70d 100644 --- a/languages/en.css +++ b/languages/en.css @@ -14,21 +14,7 @@ { content: "Assist"; } -.abilitys .hp::before, -.search-mon-list .hp-preview::before -{ - content: "HP:"; -} -.abilitys .atk::before, -.search-mon-list .atk-preview::before -{ - content: "ATK:"; -} -.abilitys .rcv::before, -.search-mon-list .rcv-preview::before -{ - content: "RCV:"; -} + .search-mon-list .index-preview::before { content: "Weit:"; diff --git a/languages/ja.css b/languages/ja.css index 7148b836..64b7cf91 100644 --- a/languages/ja.css +++ b/languages/ja.css @@ -16,21 +16,7 @@ label[for="languages"]::after{ { content: "継承"; } -.abilitys .hp::before, -.search-mon-list .hp-preview::before -{ - content: "HP:"; -} -.abilitys .atk::before, -.search-mon-list .atk-preview::before -{ - content: "攻撃:"; -} -.abilitys .rcv::before, -.search-mon-list .rcv-preview::before -{ - content: "回復:"; -} + .search-mon-list .index-preview::before { content: "加重:"; diff --git a/languages/ko.css b/languages/ko.css index d9761ba6..df406afd 100644 --- a/languages/ko.css +++ b/languages/ko.css @@ -16,21 +16,7 @@ label[for="languages"]::after{ { content: "돕다"; } -.abilitys .hp::before, -.search-mon-list .hp-preview::before -{ - content: "HP:"; -} -.abilitys .atk::before, -.search-mon-list .atk-preview::before -{ - content: "공격:"; -} -.abilitys .rcv::before, -.search-mon-list .rcv-preview::before -{ - content: "회복:"; -} + .search-mon-list .index-preview::before { content: "가중:"; diff --git a/languages/language-list.js b/languages/language-list.js index 2d86eb65..964a7cd6 100644 --- a/languages/language-list.js +++ b/languages/language-list.js @@ -1,31 +1,38 @@ const languageList = [ { name:"English",i18n:"en",searchlist:["en","ja"], - guideURL:id=>`https://ilmina.com/#/CARD/${id}` //or (id,name)=>`http://www.puzzledragonx.com/en/search.asp?q=${name}` + guideURL:sanbonGuideUrl //or (id,name)=>`http://www.puzzledragonx.com/en/search.asp?q=${name}` }, { name:"中文(傳統)",i18n:"zh-hant",i18n_RegExp:/^zh-(?:hant-)?(TW|HK)/i,searchlist:["cht","ja"], - guideURL:id=>`https://pad.chesterip.cc/${id}/` + guideURL:mydelfGuideUrl }, { name:"中文(简体)",i18n:"zh-hans",i18n_RegExp:/^zh-(?:hans-)?/i,searchlist:["chs","ja"], - guideURL:id=>{ - const url = new URL(location); - url.searchParams.set("guide",1); - url.searchParams.set("id",id); - return url; - } + guideURL:mydelfGuideUrl }, { name:"日本語",i18n:"ja",searchlist:["ja"], - guideURL:id=>`https://pad.chesterip.cc/${id}` + guideURL:sanbonGuideUrl }, { name:"한국어",i18n:"ko",searchlist:["ko","ja"], - guideURL:id=>`http://www.thisisgame.com/pad/info/monster/detail.php?code=${id}` + guideURL:sanbonGuideUrl }, - /*{ - name:"Debug用",i18n:"zh-CN",searchlist:["chs","ja"], - guideURL:id=>`https://pad.skyozora.com/pets/${id}` - },*/ -]; \ No newline at end of file +]; +function sanbonTranslateRegion(code) { + switch (code) { + case "ja": return "jp"; + case "ko": return "kr"; + case "en": return "na"; + } +}; +function sanbonGuideUrl(id) { + return `https://sanbon.me/${sanbonTranslateRegion(currentDataSource.code)}/monster/${id}`; +} +function mydelfGuideUrl(id) { + const url = new URL(location); + url.searchParams.set("guide",1); + url.searchParams.set("id",id); + return url; +} \ No newline at end of file diff --git a/languages/zh-hans.css b/languages/zh-hans.css index f2eed9e2..d25c3435 100644 --- a/languages/zh-hans.css +++ b/languages/zh-hans.css @@ -22,21 +22,7 @@ label[for="languages"]::after{ { content: "辅助"; } -.abilitys .hp::before, -.search-mon-list .hp-preview::before -{ - content: "HP:"; -} -.abilitys .atk::before, -.search-mon-list .atk-preview::before -{ - content: "攻击:"; -} -.abilitys .rcv::before, -.search-mon-list .rcv-preview::before -{ - content: "回复:"; -} + .search-mon-list .index-preview::before { content: "加权:"; diff --git a/languages/zh-hant.css b/languages/zh-hant.css index 758fd91e..3b776d41 100644 --- a/languages/zh-hant.css +++ b/languages/zh-hant.css @@ -22,21 +22,7 @@ label[for="languages"]::after{ { content: "輔助"; } -.abilitys .hp::before, -.search-mon-list .hp-preview::before -{ - content: "HP:"; -} -.abilitys .atk::before, -.search-mon-list .atk-preview::before -{ - content: "攻擊:"; -} -.abilitys .rcv::before, -.search-mon-list .rcv-preview::before -{ - content: "回復:"; -} + .search-mon-list .index-preview::before { content: "加權:"; diff --git a/script-json_data.js b/script-json_data.js index 67b2f48a..6b77e946 100644 --- a/script-json_data.js +++ b/script-json_data.js @@ -219,7 +219,7 @@ let localTranslating = { }, target: { unknown: tp`Unkown Target`, - self: tp`card's`, + self: tp`card self`, team: tp`team`, team_last: tp`the lastest member`, team_leader: tp`leader`, @@ -460,7 +460,7 @@ let localTranslating = { [127]: tp`${'icon'}Enhanced Stats`, [128]: tp`${'icon'}Yang Protection`, [129]: tp`${'icon'}Yin Protection`, - [130]: tp`${'icon'}After-Ripening`, + [130]: tp`${'icon'}Aging`, } }, }; diff --git a/service-worker.js b/service-worker.js index a2696a71..f85df924 100644 --- a/service-worker.js +++ b/service-worker.js @@ -6067,7 +6067,7 @@ const cachesMap = new Map([ ], [ "sound/voice/ja/padv2191.wav", - "143e052f3c15efaadaf7eaae277c68e7" + "d07c2fc9a621d4345c053f3d2187a937" ], [ "sound/voice/ja/padv2192.wav", @@ -29499,7 +29499,7 @@ const cachesMap = new Map([ ], [ "script-json_data.js", - "e3cb9b6edd812eb327b009bdb3a29de3" + "2f5f48b59f9ca1a21ae43c31302967a0" ], [ "script-skill-parser.js", @@ -29523,7 +29523,7 @@ const cachesMap = new Map([ ], [ "style.css", - "54495620612baaeaeb84b12faef72840" + "c8d9587db44037d77eb90855dd510d25" ], [ "temp.js", @@ -29535,7 +29535,7 @@ const cachesMap = new Map([ ], [ "languages/en.css", - "fde2b88a3e18da448f3e21bd2bc27b53" + "67b83a234625b0eaf862297381468b99" ], [ "languages/en.js", @@ -29543,7 +29543,7 @@ const cachesMap = new Map([ ], [ "languages/ja.css", - "c9c450cef95c5b704c088f62937e0e7f" + "e26f6a6dd6b37dcd037d96aedc66ed2f" ], [ "languages/ja.js", @@ -29551,7 +29551,7 @@ const cachesMap = new Map([ ], [ "languages/ko.css", - "646f55f9fb8f1c837728d5532df2fa64" + "809fde0cadfafb0ded31cc52b411578b" ], [ "languages/ko.js", @@ -29559,11 +29559,11 @@ const cachesMap = new Map([ ], [ "languages/language-list.js", - "b15a6e0512c5b47b1b15fc62c4ed70ad" + "f2ab23759b3b9df77280d29ba8731872" ], [ "languages/zh-hans.css", - "20d7b43ffdeb787917a889ba5cfb72f4" + "49081d87502177cf042475908a7e0141" ], [ "languages/zh-hans.js", @@ -29571,7 +29571,7 @@ const cachesMap = new Map([ ], [ "languages/zh-hant.css", - "2544ec0cb4e96f1b3ea7b76df3561246" + "7ef1f9d1e3cce4af1eef45fed616a693" ], [ "languages/zh-hant.js", @@ -29625,6 +29625,10 @@ const cachesMap = new Map([ "images/icon-76board.png", "ff4b12c1e21b77fca60ff7b1c7e2766f" ], + [ + "images/icon-abilities.png", + "b6f43dd28ac7711f5e9fea933b6a0f6f" + ], [ "images/icon-add-combo.png", "905398205a46fcbbf94c91126b748b4f" @@ -29867,7 +29871,7 @@ const cachesMap = new Map([ ], [ "doc/images/bluestacks-vhd-mount-vhd-failed.webp", - "e41f2de6990b34ae7995a5acb0e3ea0c" + "7941862be127cb177b86ea4cc2877134" ], [ "doc/images/bluestacks-vhd-open-disk-management.webp", diff --git a/style.css b/style.css index d4ceb75f..4a4c1ece 100644 --- a/style.css +++ b/style.css @@ -1324,16 +1324,58 @@ body:not(.solo) .awoken-icon[data-awoken-icon="64"]::after width: var(--head-block-width); display: inline-block; } +.abilitys :where( + .hp, + .atk, + .rcv, +), +.search-mon-list :where( + .hp-preview, + .atk-preview, + .rcv-preview, +) +{ + display: flex; + align-items: center; +} +.abilitys :where( + .hp, + .atk, + .rcv, +)::before, +.search-mon-list :where( + .hp-preview, + .atk-preview, + .rcv-preview, +)::before +{ + content: ""; + width: 1em; + height: 1em; + background-image: url(images/icon-abilities.png); + background-size: 1em auto; + background-position-x: 0; +} +.abilitys .hp::before, +.search-mon-list .hp-preview::before +{ + background-position-y: calc(-1em * 0); +} +.abilitys .atk::before, +.search-mon-list .atk-preview::before +{ + background-position-y: calc(-1em * 1); +} +.abilitys .rcv::before, +.search-mon-list .rcv-preview::before +{ + background-position-y: calc(-1em * 2); +} .team-ability .enable-bouns { color: cornflowerblue; } -.abilitys>div::before -{ - font-size: 0.75em; - width: 3em; - display: inline-block; -} + /*.abilitys .hp::before{ content: "HP:"; } @@ -1664,8 +1706,7 @@ label[for="search-string"]::before { { font-size: 14px; } -.cd-preview::before, -.abilities-preview>li::before +.cd-preview::before { font-size: 10px; display: inline-block;