diff --git a/languages/en.css b/languages/en.css index 97094759..229a434f 100644 --- a/languages/en.css +++ b/languages/en.css @@ -1,29 +1,14 @@ @charset "utf-8"; -.status.loading-check-version .text::before{ - content: "Checking the data version, please wait..."; -} -.status.loading-mon-info .text::before{ - content: "Loading monster data, please wait..."; -} -.status.loading-skill-info .text::before{ - content: "Loading skill data, please wait..."; -} -.status.prepare-capture .text::before{ - content: "Preparing a screenshot, please wait..."; -} .monster.delay::before{ content: "Prevent\A Delay"; font-size: 22px; } -.monster .level.max::before{ - content: "Lv.Max"; +.monster .level.max::after{ + content: "Max"; } .monster .level::before{ content: "Lv."; } -.monster .id::before{ - content: "No."; -} .team-box-name .box-name::before { content: "Team"; @@ -249,6 +234,9 @@ label[for="merge-skill"]::after{ .control-box .lbl-remove-assist::before{ content: "⛔Remove Assist"; } +.control-box .config-display-list summary::before{ + content:"Display Switchs List"; +} .control-box .show-mon-id-lbl::after{ content:"🆔Show card's ID"; } @@ -318,16 +306,16 @@ label[for="default-level"]::after .search-box::before{ content: "Search Cards"; } -.search-box .attrs-div .fix-main-color-label::after{ +.search-box .attrs-div label[for="fix-main-color"]::after{ content: "The order of the attributes is consistent with the order you selected"; } .search-box .consider-equivalent-awoken-label::after{ content: "Search for Equivalent Awoken"; } -.search-box .include-super-awoken-label::after{ +.search-box label[for="include-super-awoken"]::after{ content: "Including Super Awoken"; } -.search-box .show-official-awoken-sorting-label::after{ +.search-box label[for="show-official-awoken-sorting"]::after{ content: "Use the official Awoken sorting"; } .search-box .search-list-length::before{ @@ -336,22 +324,22 @@ label[for="default-level"]::after .search-box .sort-div::before{ content: "Sort by:"; } -.search-box .sort-reverse-label::after{ +.search-box label[for="sort-reverse"]::after{ content: "Reverse"; } .search-box .additional-div::before{ content: "Additional display:"; } -.search-box .add-show-awoken-label::after{ +.search-box label[for="add-show-awoken"]::after{ content: "Awoken list"; } -.search-box .add-show-CD-label::after{ +.search-box label[for="add-show-CD"]::after{ content: "Cooldown"; } -.search-box .add-show-abilities-label::after{ +.search-box label[for="add-show-abilities"]::after{ content: "Abilities"; } -.search-box .add-show-abilities-with-awoken-label::after{ +.search-box label[for="add-show-abilities-with-awoken"]::after{ content: "Abilities(+Awoken)"; } .attrs-div .attr[data-attr-icon='-1']::before{ @@ -450,7 +438,7 @@ label[for="box-have"]::after { content: "Cards that need this card as evolutionary material"; } -.real-time-change-card-label::after +label[for="real-time-change-card"]::after { content: "Real-Time change card"; } diff --git a/languages/ja.css b/languages/ja.css index beae1b9b..f0f93323 100644 --- a/languages/ja.css +++ b/languages/ja.css @@ -1,28 +1,13 @@ @charset "utf-8"; -.status.loading-check-version .text::before{ - content: "データバージョンをチェックしています。"; -} -.status.loading-mon-info .text::before{ - content: "モンスターデータを読み込んでいます。"; -} -.status.loading-skill-info .text::before{ - content: "スキル データを読み込んでいます。"; -} -.status.prepare-capture .text::before{ - content: "スクリーンショットを準備しています。"; -} .monster.delay::before{ content: "遅 延\A対 策"; } -.monster .level.max::before{ - content: "Lv.最大"; +.monster .level.max::after{ + content: "最大"; } .monster .level::before{ content: "Lv."; } -.monster .id::before{ - content: "No."; -} .team-box-name .box-name::before { content: "チーム"; @@ -242,19 +227,22 @@ label[for="merge-skill"]::after{ .control-box .lbl-remove-assist::before{ content: "⛔アシストを解除"; } -.control-box .show-mon-id-lbl::after{ +.control-box .config-display-list summary::before{ + content:"表示内容の開閉器一覧"; +} +label[for="show-mon-id"]::after{ content:"🆔モンスターIDを表示"; } -.control-box .show-mon-skill-cd-lbl::after{ +label[for="show-mon-skill-cd"]::after{ content:"❄️スキル クールを表示"; } label[for="show-mon-rarity"]::after{ content:"⭐️希少性を表示"; } -.control-box .show-mon-awoken-lbl::after{ +label[for="show-mon-awoken"]::after{ content:"👁️カードの覚醒を表示"; } -.control-box .show-awoken-count-lbl::after{ +label[for="show-awoken-count"]::after{ content:"⚔️総覚醒と能力値の表示"; } label[for="change-swap-to-copy"]::after{ @@ -311,16 +299,16 @@ label[for="default-level"]::after .search-box::before{ content: "モンスターの検索"; } -.search-box .attrs-div .fix-main-color-label::after{ +.search-box .attrs-div label[for="fix-main-color"]::after{ content: "属性の順序は、選択した順序と一致"; } .search-box .consider-equivalent-awoken-label::after{ content: "同時に同等の覚醒を検索"; } -.search-box .include-super-awoken-label::after{ +.search-box label[for="include-super-awoken"]::after{ content: "超覚醒を含む"; } -.search-box .show-official-awoken-sorting-label::after{ +.search-box label[for="show-official-awoken-sorting"]::after{ content: "公式の覚醒ソートを使用"; } .search-box .search-list-length::before{ @@ -329,22 +317,22 @@ label[for="default-level"]::after .search-box .sort-div::before{ content: "並べ替え:"; } -.search-box .sort-reverse-label::after{ +.search-box label[for="sort-reverse"]::after{ content: "逆序"; } .search-box .additional-div::before{ content: "追加の表示:"; } -.search-box .add-show-awoken-label::after{ +.search-box label[for="add-show-awoken"]::after{ content: "覚醒リスト"; } -.search-box .add-show-CD-label::after{ +.search-box label[for="add-show-CD"]::after{ content: "スキルターン"; } -.search-box .add-show-abilities-label::after{ +.search-box label[for="add-show-abilities"]::after{ content: "能力値"; } -.search-box .add-show-abilities-with-awoken-label::after{ +.search-box label[for="add-show-abilities-with-awoken"]::after{ content: "能力値 (+覚醒)"; } .attrs-div .attr[data-attr-icon='-1']::before{ @@ -443,7 +431,7 @@ label[for="box-have"]::after { content: "このカードを進化的な素材として必要とするカード"; } -.real-time-change-card-label::after +label[for="real-time-change-card"]::after { content: "カードを即座に更新"; } diff --git a/languages/ja.js b/languages/ja.js index 01005aba..eedfe766 100644 --- a/languages/ja.js +++ b/languages/ja.js @@ -1,9 +1,16 @@ -const _localTranslating = { +{ +const _localTranslating = { webpage_title: `パズル＆ドラゴンズ${teamsCount}人のチーム図作成ツール`, title_blank: "入力タイトル", detail_blank: "入力詳細", force_reload_data: "データの強制更新", request_input: tp`${'info'}を入力してください`, + status_message: { + loading_check_version: "データバージョンをチェックしています。", + loading_mon_info: "モンスターデータを読み込んでいます。", + loading_skill_info: "スキル データを読み込んでいます。", + prepare_capture: "スクリーンショットを準備しています。", + }, link_read_message: { success: tp`発見 ${'type'} 形式.`, need_user_script: `PADDB はドメイン間であるため、この機能をサポートするには、ユーザー スクリプト マネージャ内にセカンダリ スクリプトをインストールする必要があります。`, @@ -45,6 +52,7 @@ }, } deepMerge(localTranslating, _localTranslating); +} localisation(localTranslating); //大数字缩短长度 diff --git a/languages/ko.css b/languages/ko.css index ef33805c..d080d86d 100644 --- a/languages/ko.css +++ b/languages/ko.css @@ -1,28 +1,13 @@ @charset "utf-8"; -.status.loading-check-version .text::before{ - content: "데이터 버전을 확인 ."; -} -.status.loading-mon-info .text::before{ - content: "몬스터 데이터를 로드 하 고 있습니다."; -} -.status.loading-skill-info .text::before{ - content: "기술 데이터를 로드 하 고 있습니다."; -} -.status.prepare-capture .text::before{ - content: "스크린 샷을 준비 하 고 있습니다."; -} .monster.delay::before{ content: "지 연\A방 지"; } -.monster .level.max::before{ - content: "Lv.최대"; +.monster .level.max::after{ + content: "최대"; } .monster .level::before{ content: "Lv."; } -.monster .id::before{ - content: "No."; -} .team-box-name .box-name::before { content: "팀"; @@ -238,19 +223,22 @@ label[for="merge-skill"]::after{ .control-box .lbl-remove-assist::before{ content: "⛔보조를 해제합"; } -.control-box .show-mon-id-lbl::after{ +.control-box .config-display-list summary::before{ + content:"디스플레이 스위치 목록"; +} +label[for="show-mon-id"]::after{ content:"🆔몬스터 ID 표시"; } -.control-box .show-mon-skill-cd-lbl::after{ +label[for="show-mon-skill-cd"]::after{ content:"❄️스킬의 사용 대기 시간 표시"; } label[for="show-mon-rarity"]::after{ content:"⭐️희귀도 표시"; } -.control-box .show-mon-awoken-lbl::after{ +label[for="show-mon-awoken"]::after{ content:"👁️카드 각성을 표시합"; } -.control-box .show-awoken-count-lbl::after{ +label[for="show-awoken-count"]::after{ content:"⚔️각성 통계 및 기능 값 표시"; } label[for="change-swap-to-copy"]::after{ @@ -307,16 +295,16 @@ label[for="default-level"]::after .search-box::before{ content: "몬스터 검색"; } -.search-box .attrs-div .fix-main-color-label::after{ +.search-box .attrs-div label[for="fix-main-color"]::after{ content: "속성 순서는 선택한 순서와 일치합니다"; } .search-box .consider-equivalent-awoken-label::after{ content: "동시에 해당 경계를 각성"; } -.search-box .include-super-awoken-label::after{ +.search-box label[for="include-super-awoken"]::after{ content: "슈퍼 각성 포함"; } -.search-box .show-official-awoken-sorting-label::after{ +.search-box label[for="show-official-awoken-sorting"]::after{ content: "공식 각성 순서를 사용"; } .search-box .search-list-length::before{ @@ -325,22 +313,22 @@ label[for="default-level"]::after .search-box .sort-div::before{ content: "정렬:"; } -.search-box .sort-reverse-label::after{ +.search-box label[for="sort-reverse"]::after{ content: "역순"; } .search-box .additional-div::before{ content: "추가 표시:"; } -.search-box .add-show-awoken-label::after{ +.search-box label[for="add-show-awoken"]::after{ content: "각성 목록"; } -.search-box .add-show-CD-label::after{ +.search-box label[for="add-show-CD"]::after{ content: "스킬 턴"; } -.search-box .add-show-abilities-label::after{ +.search-box label[for="add-show-abilities"]::after{ content: "능력"; } -.search-box .add-show-abilities-with-awoken-label::after{ +.search-box label[for="add-show-abilities-with-awoken"]::after{ content: "능력 (+각성)"; } .attrs-div .attr[data-attr-icon='-1']::before{ @@ -435,7 +423,7 @@ label[for="not-weapon"]::after { content: "진화 자료로이 카드를 필요로하는 카드"; } -.real-time-change-card-label::after +label[for="real-time-change-card"]::after { content: "카드를 즉시 업데이트"; } diff --git a/languages/ko.js b/languages/ko.js index a9dc6994..888013d3 100644 --- a/languages/ko.js +++ b/languages/ko.js @@ -1,9 +1,16 @@ -const _localTranslating = { +{ +const _localTranslating = { webpage_title: `퍼즐앤드래곤 ${teamsCount} 명의 팀 다이어그램 작성 도구`, title_blank: "입력 제목", detail_blank: "입력 내용", force_reload_data: "데이터 강제 새로 고침", request_input: tp`${'info'}를 입력하십시오`, + status_message: { + loading_check_version: "데이터 버전을 확인 .", + loading_mon_info: "몬스터 데이터를 로드 하 고 있습니다.", + loading_skill_info: "기술 데이터를 로드 하 고 있습니다.", + prepare_capture: "스크린 샷을 준비 하 고 있습니다.", + }, link_read_message: { success: tp`검색 ${'type'} 형식입니다. `, need_user_script: `PADDB는 도메인에 걸쳐 있으므로 이 기능을 지원하려면 사용자 스크립트 관리자 내에 보조 스크립트를 설치해야 합니다.`, @@ -45,6 +52,7 @@ }, } deepMerge(localTranslating, _localTranslating); +} localisation(localTranslating); //大数字缩短长度 diff --git a/languages/zh-TW.css b/languages/zh-TW.css index f67c8160..08a1cded 100644 --- a/languages/zh-TW.css +++ b/languages/zh-TW.css @@ -1,16 +1,4 @@ @charset "utf-8"; -.status.loading-check-version .text::before{ - content: "正在檢查数据版本，請稍候……"; -} -.status.loading-mon-info .text::before{ - content: "正在載入怪物數據，請稍候……"; -} -.status.loading-skill-info .text::before{ - content: "正在載入技能数据，请稍候……"; -} -.status.prepare-capture .text::before{ - content: "正在准備截圖，請稍後……"; -} .help-link::before{ content: "\f05a 幫助和提示"; } @@ -20,15 +8,12 @@ .monster.delay::before{ content: "應 對\A威 嚇"; } -.monster .level.max::before{ - content: "Lv.最大"; +.monster .level.max::after{ + content: "最大"; } .monster .level::before{ content: "Lv."; } -.monster .id::before{ - content: "No."; -} .team-box-name .box-name::before { content: "隊伍"; @@ -248,19 +233,22 @@ label[for="merge-skill"]::after{ .control-box .lbl-remove-assist::before{ content: "⛔解除輔助"; } -.control-box .show-mon-id-lbl::after{ +.control-box .config-display-list summary::before{ + content:"展示內容開關列表"; +} +label[for="show-mon-id"]::after{ content:"🆔顯示怪物ID"; } -.control-box .show-mon-skill-cd-lbl::after{ +label[for="show-mon-skill-cd"]::after{ content:"❄️顯示技能冷卻"; } label[for="show-mon-rarity"]::after{ content:"⭐️顯示稀有度"; } -.control-box .show-mon-awoken-lbl::after{ +label[for="show-mon-awoken"]::after{ content:"👁️顯示卡片覺醒"; } -.control-box .show-awoken-count-lbl::after{ +label[for="show-awoken-count"]::after{ content:"⚔️顯示覺醒統計和能力值"; } label[for="change-swap-to-copy"]::after{ @@ -317,16 +305,16 @@ label[for="default-level"]::after .search-box::before{ content: "搜索怪物"; } -.search-box .attrs-div .fix-main-color-label::after{ +.search-box .attrs-div label[for="fix-main-color"]::after{ content: "強制屬性順序與選擇順序一致"; } .search-box .consider-equivalent-awoken-label::after{ content: "同時搜索等效覺醒"; } -.search-box .include-super-awoken-label::after{ +.search-box label[for="include-super-awoken"]::after{ content: "包括超覺醒"; } -.search-box .show-official-awoken-sorting-label::after{ +.search-box label[for="show-official-awoken-sorting"]::after{ content: "使用官方覺醒排序"; } .search-box .search-list-length::before{ @@ -335,22 +323,22 @@ label[for="default-level"]::after .search-box .sort-div::before{ content: "排序："; } -.search-box .sort-reverse-label::after{ +.search-box label[for="sort-reverse"]::after{ content: "逆序"; } .search-box .additional-div::before{ content: "附加顯示："; } -.search-box .add-show-awoken-label::after{ +.search-box label[for="add-show-awoken"]::after{ content: "覺醒清單"; } -.search-box .add-show-CD-label::after{ +.search-box label[for="add-show-CD"]::after{ content: "技能回合"; } -.search-box .add-show-abilities-label::after{ +.search-box label[for="add-show-abilities"]::after{ content: "能力值"; } -.search-box .add-show-abilities-with-awoken-label::after{ +.search-box label[for="add-show-abilities-with-awoken"]::after{ content: "能力值（+覺醒）"; } .attrs-div .attr[data-attr-icon='-1']::before{ @@ -449,7 +437,7 @@ label[for="box-have"]::after { content: "需要此寵物作為進化素材的寵物"; } -.real-time-change-card-label::after +label[for="real-time-change-card"]::after { content: "即時更新卡片"; } diff --git a/languages/zh-TW.js b/languages/zh-TW.js index 5d90b067..d00a4b0a 100644 --- a/languages/zh-TW.js +++ b/languages/zh-TW.js @@ -1,9 +1,16 @@ -const _localTranslating = { +{ +const _localTranslating = { webpage_title: `龍族拼圖${teamsCount}人隊伍圖製作`, title_blank: "輸入隊伍標題", detail_blank: "輸入説明", force_reload_data: "強制刷新數據", request_input: tp`請輸入${'info'}`, + status_message: { + loading_check_version: "正在檢查數據版本，請稍候……", + loading_mon_info: "正在加載怪物數據，請稍候……", + loading_skill_info: "正在加載技能數據，請稍候……", + prepare_capture: "正在準備截圖，請稍候……", + }, link_read_message: { success: tp`發現 ${'type'} 格式。`, need_user_script: `由於 PADDB 跨域，您需要在用戶腳本管理器內安裝輔助腳本以支持此功能。`, @@ -435,6 +442,7 @@ }; deepMerge(localTranslating, _localTranslating); +} localisation(localTranslating); //大數字縮短長度 diff --git a/languages/zh.css b/languages/zh.css index 9ce8ff9e..54270f2d 100644 --- a/languages/zh.css +++ b/languages/zh.css @@ -1,16 +1,4 @@ @charset "utf-8"; -.status.loading-check-version .text::before{ - content: "正在检查数据版本，请稍候……"; -} -.status.loading-mon-info .text::before{ - content: "正在加载怪物数据，请稍候……"; -} -.status.loading-skill-info .text::before{ - content: "正在加载技能数据，请稍候……"; -} -.status.prepare-capture .text::before{ - content: "正在准备截图，请稍候……"; -} .help-link::before{ content: "\f05a 帮助和提示"; } @@ -20,15 +8,12 @@ .monster.delay::before{ content: "应 对\A威 吓"; } -.monster .level.max::before{ - content: "Lv.最大"; +.monster .level.max::after{ + content: "最大"; } .monster .level::before{ content: "Lv."; } -.monster .id::before{ - content: "No."; -} .team-box-name .box-name::before { content: "队伍"; @@ -247,20 +232,35 @@ label[for="merge-skill"]::after{ .control-box .lbl-remove-assist::before{ content: "⛔解除辅助"; } -.control-box .show-mon-id-lbl::after{ - content:"🆔显示怪物ID"; +.control-box .config-display-list summary::before{ + content:"展示内容开关列表"; } -.control-box .show-mon-skill-cd-lbl::after{ - content:"❄️显示技能冷却"; +label[for="show-card-id"]::after{ + content:"🆔卡片ID"; } -label[for="show-mon-rarity"]::after{ - content:"⭐️显示稀有度"; +label[for="show-card-rarity"]::after{ + content:"⭐️卡片稀有度"; } -.control-box .show-mon-awoken-lbl::after{ - content:"👁️显示卡片觉醒"; +label[for="show-member-skill-cd"]::after{ + content:"❄️队员技能冷却"; } -.control-box .show-awoken-count-lbl::after{ - content:"⚔️显示觉醒统计和能力值"; +label[for="show-member-ability"]::after{ + content:"⚔️队员能力值"; +} +label[for="show-member-awoken"]::after{ + content:"👁️队员觉醒"; +} +label[for="show-3P-team-total-info"]::after{ + content:"队伍信息统计"; +} +label[for="show-team-awoken-count"]::after{ + content:"队伍觉醒计数"; +} +label[for="show-team-awoken-effect"]::after{ + content:"队伍觉醒效果统计"; +} +label[for="show-team-attrtype-count"]::after{ + content:"队伍稀有度、属性与类型计数"; } label[for="change-swap-to-copy"]::after{ content:"拖拽时使用“复制”（或按住 Ctrl）"; @@ -316,16 +316,16 @@ label[for="default-level"]::after .search-box::before{ content: "搜索怪物"; } -.search-box .attrs-div .fix-main-color-label::after{ +.search-box .attrs-div label[for="fix-main-color"]::after{ content: "强制属性顺序与选择顺序一致"; } .search-box .consider-equivalent-awoken-label::after{ content: "同时搜索等效觉醒"; } -.search-box .include-super-awoken-label::after{ +.search-box label[for="include-super-awoken"]::after{ content: "包括超觉醒"; } -.search-box .show-official-awoken-sorting-label::after{ +.search-box label[for="show-official-awoken-sorting"]::after{ content: "使用官方觉醒排序"; } .search-box .search-list-length::before{ @@ -334,22 +334,22 @@ label[for="default-level"]::after .search-box .sort-div::before{ content: "排序："; } -.search-box .sort-reverse-label::after{ +.search-box label[for="sort-reverse"]::after{ content: "逆序"; } .search-box .additional-div::before{ content: "附加显示："; } -.search-box .add-show-awoken-label::after{ +.search-box label[for="add-show-awoken"]::after{ content: "觉醒列表"; } -.search-box .add-show-CD-label::after{ +.search-box label[for="add-show-CD"]::after{ content: "冷却回合"; } -.search-box .add-show-abilities-label::after{ +.search-box label[for="add-show-abilities"]::after{ content: "能力值"; } -.search-box .add-show-abilities-with-awoken-label::after{ +.search-box label[for="add-show-abilities-with-awoken"]::after{ content: "能力值（+觉醒）"; } .attrs-div .attr[data-attr-icon='-1']::before{ @@ -448,7 +448,7 @@ label[for="box-have"]::after { content: "需要此宠物作为进化素材的宠物"; } -.real-time-change-card-label::after +label[for="real-time-change-card"]::after { content: "即时更新卡片"; } diff --git a/languages/zh.js b/languages/zh.js index de91064b..1892bfa9 100644 --- a/languages/zh.js +++ b/languages/zh.js @@ -1,9 +1,16 @@ -const _localTranslating = { +{ +const _localTranslating = { webpage_title: `智龙迷城${teamsCount}人队伍图制作`, title_blank: "输入队伍标题", detail_blank: "输入说明", force_reload_data: "强制刷新数据", request_input: tp`请输入${'info'}`, + status_message: { + loading_check_version: "正在检查数据版本，请稍候……", + loading_mon_info: "正在加载怪物数据，请稍候……", + loading_skill_info: "正在加载技能数据，请稍候……", + prepare_capture: "正在准备截图，请稍候……", + }, link_read_message: { success: tp`发现 ${'type'} 格式。`, need_user_script: `由于 PADDB 跨域，您需要在用户脚本管理器内安装辅助脚本以支持此功能。`, @@ -435,6 +442,7 @@ }, }; deepMerge(localTranslating, _localTranslating); +} localisation(localTranslating); //大数字缩短长度 diff --git a/multi.html b/multi.html index b3287c2d..3b319132 100644 --- a/multi.html +++ b/multi.html @@ -63,17 +63,22 @@ const teamsCount = 2;
- +
-
- - - - -
-
+
+ + + + + + + + + +
+
- +
- +
- - - + + +
- + @@ -1166,14 +1171,14 @@ const teamsCount = 2;
- - - - + + + +
- +
@@ -1234,7 +1239,7 @@ const teamsCount = 2;
- + @@ -1368,8 +1373,8 @@ const teamsCount = 2;
- - + +
diff --git a/script-json_data.js b/script-json_data.js index c115e070..e7135935 100644 --- a/script-json_data.js +++ b/script-json_data.js @@ -19,6 +19,12 @@ let localTranslating = { detail_blank: "Input Detail", force_reload_data: `Force refresh data`, request_input: tp`Please Input ${'info'}`, + status_message: { + loading_check_version: "Checking the data version, please wait...", + loading_mon_info: "Loading monster data, please wait...", + loading_skill_info: "Loading skill data, please wait...", + prepare_capture: "Preparing a screenshot, please wait...", + }, link_read_message: { success: tp`Find the ${'type'} format.`, need_user_script: `Because PADDB is cross-domain, you need to install helper script within the User Script Manager to support this feature.`, diff --git a/script.js b/script.js index 6c7850dc..c88d99a3 100644 --- a/script.js +++ b/script.js @@ -1157,7 +1157,7 @@ function loadData(force = false) //开始读取解析怪物数据 const sourceDataFolder = "monsters-info"; - if (statusLine) statusLine.classList.add("loading-check-version"); + statusLine?.writeText(localTranslating.status_message.loading_check_version); GM_xmlhttpRequest({ method: "GET", url: `${sourceDataFolder}/ckey.json${force?`?t=${_time}`:''}`, //版本文件 @@ -1204,8 +1204,7 @@ function loadData(force = false) lastCkeys.push(lastCurrentCkey); } - if (statusLine) statusLine.classList.remove("loading-check-version"); - if (statusLine) statusLine.classList.add("loading-mon-info"); + statusLine?.writeText(localTranslating.status_message.loading_mon_info); if (!force && db && currentCkey.ckey.card == lastCurrentCkey.ckey.card) { console.debug("Cards ckey相等，直接读取已有的数据。"); const transaction = db.transaction([`cards`]); @@ -1301,9 +1300,7 @@ function loadData(force = false) monstersList.appendChild(fragment); } - if (statusLine) statusLine.classList.remove("loading-mon-info"); - - if (statusLine) statusLine.classList.add("loading-skill-info"); + statusLine?.writeText(localTranslating.status_message.loading_skill_info); if (!force && db && currentCkey.ckey.skill == lastCurrentCkey.ckey.skill) { console.debug("Skills ckey相等，直接读取已有的数据。"); const transaction = db.transaction([`skills`]); @@ -1379,7 +1376,7 @@ function loadData(force = false) } //initialize(); //初始化 - if (statusLine) statusLine.classList.remove("loading-skill-info"); + statusLine?.writeText(); //如果通过的话就载入URL中的怪物数据 let formationBoxHook = setInterval(checkFormationBox, 500); //循环检测formationBox @@ -1790,25 +1787,23 @@ function paddbFotmationToPdfFotmation(obj) return f; } //截图 -function capture() { - statusLine.classList.add("prepare-capture"); - const titleBox = formationBox.querySelector(".title-box"); - const detailBox = formationBox.querySelector(".detail-box"); - const txtTitle = titleBox.querySelector(".title-code"); - const txtDetail = detailBox.querySelector(".detail-code"); +function captureScreenshot(target) { + statusLine?.writeText(localTranslating.status_message.prepare_capture); //去掉可能的空白文字的编辑状态 formationBox.classList.remove("edit-code"); const downLink = controlBox.querySelector(".down-capture"); - html2canvas(formationBox, {backgroundColor: null}).then(canvas => { - canvas.toBlob(function(blob) { - window.URL.revokeObjectURL(downLink.href); - downLink.href = URL.createObjectURL(blob); - downLink.download = `${document.title}.png`; - downLink.click(); - statusLine.classList.remove("prepare-capture"); + setTimeout(()=>{ + html2canvas(target, {backgroundColor: null}).then(canvas => { + canvas.toBlob(function(blob) { + window.URL.revokeObjectURL(downLink.href); + downLink.href = URL.createObjectURL(blob); + downLink.download = `${document.title}.png`; + downLink.click(); + statusLine?.writeText(); + }); + //document.body.appendChild(canvas); }); - //document.body.appendChild(canvas); - }); + },500); } window.onload = initialize; //界面初始化 @@ -1822,6 +1817,10 @@ function initialize() { controlBox = document.body.querySelector(".control-box"); statusLine = controlBox.querySelector(".status"); //显示当前状态的 + statusLine.writeText = function(text) { + this.innerHTML = ''; + if (text) this.textContent = text; + }; formationBox = document.body.querySelector(".formation-box"); editBox = document.body.querySelector(".edit-box"); editBox.editMon = editMember; @@ -1873,20 +1872,8 @@ function initialize() { checkbox.onchange(false); return checkbox; } - //显示ID开关 - const btnShowMonId = initializeSwitch(document.getElementById("show-mon-id")); - - //显示CD开关 - const btnShowMonSkillCd = initializeSwitch(document.getElementById("show-mon-skill-cd")); - - //显示星级开关 - const btnShowMonRarity = initializeSwitch(document.getElementById("show-mon-rarity")); - - //显示卡片觉醒开关 - const btnShowMonAwoken = initializeSwitch(document.getElementById("show-mon-awoken")); - - //3P显示觉醒统计开关 - const btnShowAwokenCount = initializeSwitch(document.getElementById("show-awoken-count")); + const displaySwitchList = Array.from(document.querySelectorAll(".config-display-list .switch-ipt")); + displaySwitchList.forEach(initializeSwitch); //默认等级 const iptDefaultLevel = document.getElementById("default-level"); @@ -5483,52 +5470,50 @@ function refreshAll(formationData) { // txtDetail.onblur(); //这个需要放在显示出来后再改才能生效 } -function awokenSetCount(aicon, number) { - if (!aicon) return; //没有这个觉醒就撤回 - const ali = aicon.parentNode; - const countDom = ali.querySelector(".count"); - countDom.textContent = number; - if (number) - ali.classList.remove(className_displayNone); - else - ali.classList.add(className_displayNone); -} //刷新队伍觉醒统计 function refreshTeamAwokenCount(awokenDom, team) { let fragment = document.createDocumentFragment(); //创建节点用的临时空间 - const awokenUL = fragment.appendChild(awokenDom.querySelector(".awoken-ul")); - const aicons = Array.from(awokenUL.querySelectorAll(`.awoken-icon[data-awoken-icon]`)); - const acs = aicons.map(aicon=>{ - const ai = parseInt(aicon.getAttribute("data-awoken-icon"),10); + official_awoken_sorting.forEach(ak=>{ let totalNum = 0; //搜索等效觉醒 - const equivalentAwoken = equivalent_awoken.find(eak => eak.small === ai || eak.big === ai); - if (equivalentAwoken) - { - if (equivalentAwoken.small === ai) - { - totalNum = awokenCountInTeam(team, equivalentAwoken.small, solo, teamsCount) + - awokenCountInTeam(team, equivalentAwoken.big, solo, teamsCount) * equivalentAwoken.times; - } + const equivalentAwoken = equivalent_awoken.find(eak => eak.small === ak || eak.big === ak); + if (equivalentAwoken?.small === ak) + { //等效觉醒 + totalNum = awokenCountInTeam(team, equivalentAwoken.small, solo, teamsCount) + + awokenCountInTeam(team, equivalentAwoken.big, solo, teamsCount) * equivalentAwoken.times; } else - { - totalNum = awokenCountInTeam(team, ai, solo, teamsCount); + { //普通觉醒 + totalNum = awokenCountInTeam(team, ak, solo, teamsCount); } - awokenSetCount(aicon, totalNum); - return {a:ai,c:totalNum}; + if (totalNum == 0) return; + const li = document.createElement("li"); + li.className = "awoken-count"; + const icon = li.appendChild(document.createElement("icon")); + icon.className = "awoken-icon"; + icon.setAttribute("data-awoken-icon", ak); + const span = li.appendChild(document.createElement("span")); + span.className = "count"; + span.textContent = totalNum; + fragment.appendChild(li); }); - if (acs.every(ac=>ac.c==0)) - { - awokenDom.classList.add(className_displayNone); - } else - { - awokenDom.classList.remove(className_displayNone); - } - awokenDom.appendChild(fragment); + + const awokenUL = awokenDom.querySelector(".awoken-ul"); + awokenUL.innerHTML = ''; + awokenUL.append(fragment); } //刷新阵型觉醒统计 function refreshFormationAwokenCount(awokenDom, teams) { + function awokenSetCount(aicon, number) { + if (!aicon) return; //没有这个觉醒就撤回 + const ali = aicon.parentNode; + const countDom = ali.querySelector(".count"); + countDom.textContent = number; + if (number) + ali.classList.remove(className_displayNone); + else + ali.classList.add(className_displayNone); + } let fragment = document.createDocumentFragment(); //创建节点用的临时空间 const awokenUL = fragment.appendChild(awokenDom.querySelector(".awoken-ul")); diff --git a/solo.html b/solo.html index 1806ce6a..949d3f27 100644 --- a/solo.html +++ b/solo.html @@ -46,18 +46,22 @@ const teamsCount = 1;
- +
-
- - - - - -
-
+
+ + + + + + + + + +
+
- +
    @@ -682,7 +588,7 @@ const teamsCount = 1;
- +
  • @@ -711,9 +617,9 @@ const teamsCount = 1;
- - - + + +
    @@ -991,7 +897,7 @@ const teamsCount = 1;
- + @@ -1002,14 +908,14 @@ const teamsCount = 1;
- - - - + + + +
- +
@@ -1070,7 +976,7 @@ const teamsCount = 1;
- + @@ -1204,8 +1110,8 @@ const teamsCount = 1;
- - + +
diff --git a/style.css b/style.css index 3dd3a502..94b8cd57 100644 --- a/style.css +++ b/style.css @@ -247,10 +247,20 @@ label[for="siwtch-code-mode"]::after { display: none; } -.config-checkbox-ipt{ +.config-display-list:not([open]) { + background-color: #1155AA55; +} + +.switch-ipt{ display:none; } -.config-checkbox-lbl .config-checkbox-lbl-cicle{ +.switch-lbl{ + cursor: pointer; + line-height: 25px; + margin-right: 20px; + display: inline-block; +} +.switch-lbl>circle{ width: 28px; height: 12px; display: inline-block; @@ -259,7 +269,7 @@ label[for="siwtch-code-mode"]::after { border-radius: 16px; margin-right: 5px; } -.config-checkbox-lbl .config-checkbox-lbl-cicle::before{ +.switch-lbl>circle::before{ content:""; width: 20px; height: 20px; @@ -271,38 +281,30 @@ label[for="siwtch-code-mode"]::after { left: -4px; top: -4px; } -.config-checkbox-ipt:checked+.config-checkbox-lbl .config-checkbox-lbl-cicle { +.switch-ipt:checked+.switch-lbl>circle { background: rgba(0,160,216,0.8); } -.config-checkbox-ipt:checked+.config-checkbox-lbl .config-checkbox-lbl-cicle::before { +.switch-ipt:checked+.switch-lbl>circle::before { background: #00A0D8; box-shadow: 0 2px 4px 0 rgba(0,160,216,0.4); left: calc(100% - 16px); } -.config-checkbox-lbl{ - cursor: pointer; - line-height: 25px; - margin-right: 20px; - display: inline-block; -} -.config-checkbox-lbl[for$=and-or]::after{ +.switch-lbl[for$=and-or]::after{ content: "OR"; } -input:checked+ .config-checkbox-lbl[for$=and-or]::after{ +input:checked+ .switch-lbl[for$=and-or]::after{ content: "AND"; } .status{ line-height: 16px; } -/*.status.loading-mon-info .text::before{ - content: "正在加载怪物数据"; -}*/ -.status.loading-check-version .icon, -.status.loading-mon-info .icon, -.status.loading-skill-info .icon, -.status.prepare-capture .icon -{ +.status:empty{ + display: none; +} +/*状态栏不为空时*/ +.status:not(:empty)::before { + content: ""; display: inline-block; width: 16px; height: 16px; @@ -648,10 +650,6 @@ ul{ { color: #FEFF85; } -.monster .level.max::after -{ - display: none; -} .monster .level[data-level-range="110"]{ color: #85BCFF; } @@ -679,15 +677,10 @@ ul{ left: 5px; bottom: 15px; } -body:not(.show-mon-id) .monster .id{ - display: none; -} .monster .id::before{ + content: "No."; font-size: 12px; } -/*.monster .id::before{ - content: "No."; -}*/ .monster .skill-cd{ text-align: right; } @@ -708,11 +701,8 @@ body:not(.show-mon-id) .monster .id{ right:0; bottom:0; } -body:not(.show-mon-skill-cd) .monster .skill-cd.max-skill { - display: none; -} /*显示怪物星级*/ -.show-mon-rarity .monster .rarity::before{ +.monster .rarity::before{ position: absolute; left: 3px; top: 10px; @@ -722,6 +712,17 @@ body:not(.show-mon-skill-cd) .monster .skill-cd.max-skill { -webkit-text-stroke: 1px black; text-shadow: black 1px 1px 1px; } +body:not(.show-card-id) .monster .id, /*卡片id*/ +body:not(.show-card-rarity) .monster .rarity, /*卡片稀有度*/ +body:not(.show-member-skill-cd) .monster .skill-cd.max-skill, /*队员CD*/ +body:not(.show-member-ability) .team-ability, /*队员三维*/ +body:not(.show-member-awoken) :where(.team-assist-awoken , .team-member-awoken, .team-member-types), /*武器觉醒、队员觉醒、队员类型*/ +body:not(.show-team-awoken-count) .team-awoken, /*队伍觉醒统计*/ +body:not(.show-team-attrtype-count) .tIf-addition-info, /*稀有度、属性与类型计数*/ +body:not(.show-team-awoken-effect) .team-awoken-effect /*队伍觉醒效果统计*/ +{ + display: none; +} /*交换队长技的图标*/ .monster .switch-leader @@ -774,18 +775,15 @@ body:not(.show-mon-skill-cd) .monster .skill-cd.max-skill { { opacity: 0.5; } - -body:not(.show-awoken-count):not(.solo) .formation-box .team-total-info, /*单个队伍血量统计*/ -body:not(.show-awoken-count) .formation-box .team-ability, /*单个队伍三维*/ -body:not(.show-awoken-count) .formation-box .team-awoken /*单个队伍觉醒统计*/ +body:not(.show-3P-team-total-info):not(.solo) .formation-box .team-total-info /*3P下隐藏队伍血量统计*/ { - display: none !important; + display: none; } -body:not(.show-awoken-count):not(.solo) .formation-box .team-bigbox +body:not(.show-3P-team-total-info):not(.solo) .formation-box .team-bigbox { margin-bottom: 5px; } -body:not(.show-awoken-count):not(.solo) .formation-box .team-badge +body:not(.show-3P-team-total-info):not(.solo) .formation-box .team-badge { position: absolute; z-index: 10; @@ -1276,7 +1274,6 @@ body:not(.solo) .awoken-icon[data-awoken-icon="64"]::after .team-assist-awoken { margin-top: 3px; - display : none; } .member-awoken .awoken-ul, .member-types .types-ul @@ -1296,20 +1293,6 @@ body:not(.solo) .awoken-icon[data-awoken-icon="64"]::after transform: scale(0.65); margin: calc(-32px * (1 - 0.65) / 2); } -.tIf-addition-info, -.team-assist-awoken, -.team-member-awoken, -.team-member-types -{ - display : none; -} -.show-mon-awoken .tIf-addition-info, -.show-mon-awoken .team-assist-awoken, -.show-mon-awoken .team-member-awoken, -.show-mon-awoken .team-member-types -{ - display : block; -} .show-mon-awoken .monster .super-awoken { filter: grayscale(100%); diff --git a/triple.html b/triple.html index 23bbb51d..dc0b832c 100644 --- a/triple.html +++ b/triple.html @@ -57,18 +57,23 @@ const teamsCount = 3;
- +
-
- - - - - -
-
+
+ + + + + + + + + + +
+
- +
    @@ -1772,7 +1678,7 @@ const teamsCount = 3;
- +
  • @@ -1801,9 +1707,9 @@ const teamsCount = 3;
- - - + + +
    @@ -2081,7 +1987,7 @@ const teamsCount = 3;
- + @@ -2092,14 +1998,14 @@ const teamsCount = 3;
- - - - + + + +
- +
@@ -2160,7 +2066,7 @@ const teamsCount = 3;
- + @@ -2294,8 +2200,8 @@ const teamsCount = 3;
- - + +