From e3084f04260df0aed06962449eeb4abf541b1c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Mon, 4 Nov 2019 14:14:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=BA=BA=E5=8F=8C?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E6=8D=AE=E4=BA=A4=E6=8D=A2=EF=BC=8C=E4=BA=A4?= =?UTF-8?q?=E6=8D=A2AB=E9=98=9F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 13 +++++++--- languages/en.css | 18 +++++++++----- languages/ja.css | 18 +++++++++----- languages/ko.css | 18 +++++++++----- languages/zh-TW.css | 18 +++++++++----- languages/zh.css | 18 +++++++++----- script.js | 60 ++++++++++++++++++++++++++++++++++++++++++--- solo.html | 12 ++++++--- style.css | 8 ++++-- 9 files changed, 141 insertions(+), 42 deletions(-) diff --git a/index.html b/index.html index 6a9f63aa..ad886e10 100644 --- a/index.html +++ b/index.html @@ -18,9 +18,16 @@ var formation = new Formation(2,5);
- - - +
+ + +
+
+ + + + +
diff --git a/languages/en.css b/languages/en.css index 93e30721..109cfb91 100644 --- a/languages/en.css +++ b/languages/en.css @@ -138,17 +138,23 @@ .control-box .datasource-label::before{ content: "Data source:"; } -.control-box .solo-link::before{ - content: "Jump To Solo Mode"; +.control-box .btn-solo-link::before{ + content: "🧑Jump To Solo Mode"; } -.control-box .multi-link::before{ - content: "Jump To 2-Player Mode"; +.control-box .btn-multi-link::before{ + content: "🧑‍🤝‍🧑Jump To 2-Player Mode"; +} +.control-box .btn-clear-data::before{ + content: "🗑️Clear data"; +} +.control-box .btn-swap-AB-team::before{ + content: "🔄Swap AB Team"; } .control-box .btn-show-mon-id::before{ - content: "Hide monster ID"; + content: "⬜Hide monster ID"; } .not-show-mon-id .control-box .btn-show-mon-id::before{ - content: "Show monster ID"; + content: "🆔Show monster ID"; } .team-info .tIf-total-hp::before{ content: "Total HP(Team Awoken & Badge): "; diff --git a/languages/ja.css b/languages/ja.css index be7edeca..4c047ada 100644 --- a/languages/ja.css +++ b/languages/ja.css @@ -131,17 +131,23 @@ .control-box .datasource-label::before{ content: "データ ソース："; } -.control-box .solo-link::before{ - content: "ソロゲームに移動"; +.control-box .btn-solo-link::before{ + content: "🧑ソロゲームに移動"; } -.control-box .multi-link::before{ - content: "2人協力のゲームに移動"; +.control-box .btn-multi-link::before{ + content: "🧑‍🤝‍🧑2人協力のゲームに移動"; +} +.control-box .btn-clear-data::before{ + content: "🗑️データの消去"; +} +.control-box .btn-swap-AB-team::before{ + content: "🔄交換ABチーム"; } .control-box .btn-show-mon-id::before{ - content: "隠しモンスターID"; + content: "⬜隠しモンスターID"; } .not-show-mon-id .control-box .btn-show-mon-id::before{ - content: "モンスターIDを表示"; + content: "🆔モンスターIDを表示"; } .team-info .tIf-total-hp::before{ content: "合計HP(チーム覚醒とバッジ)："; diff --git a/languages/ko.css b/languages/ko.css index 9ae487fb..48ae8e57 100644 --- a/languages/ko.css +++ b/languages/ko.css @@ -131,17 +131,23 @@ .control-box .datasource-label::before{ content: "데이터 소스："; } -.control-box .solo-link::before{ - content: "싱글 플레이어 게임으로 이동"; +.control-box .btn-solo-link::before{ + content: "🧑싱글 플레이어 게임으로 이동"; } -.control-box .multi-link::before{ - content: "2인 게임으로 이동"; +.control-box .btn-multi-link::before{ + content: "🧑‍🤝‍🧑2인 게임으로 이동"; +} +.control-box .btn-clear-data::before{ + content: "🗑️데이터 지우기"; +} +.control-box .btn-swap-AB-team::before{ + content: "🔄교환 AB 팀"; } .control-box .btn-show-mon-id::before{ - content: "숨겨진 몬스터 ID"; + content: "⬜숨겨진 몬스터 ID"; } .not-show-mon-id .control-box .btn-show-mon-id::before{ - content: "괴물 ID 표시"; + content: "🆔괴물 ID 표시"; } .team-info .tIf-total-hp::before{ content: "총 HP(팀의 각 성과 배지)："; diff --git a/languages/zh-TW.css b/languages/zh-TW.css index a8fd63d1..696557c1 100644 --- a/languages/zh-TW.css +++ b/languages/zh-TW.css @@ -134,17 +134,23 @@ .control-box .datasource-label::before{ content: "數據來源："; } -.control-box .solo-link::before{ - content: "轉到單人遊戲"; +.control-box .btn-solo-link::before{ + content: "🧑轉到單人遊戲"; } -.control-box .multi-link::before{ - content: "轉到2人車隊"; +.control-box .btn-multi-link::before{ + content: "🧑‍🤝‍🧑轉到2人車隊"; +} +.control-box .btn-clear-data::before{ + content: "🗑️清除數據"; +} +.control-box .btn-swap-AB-team::before{ + content: "🔄交換AB隊"; } .control-box .btn-show-mon-id::before{ - content: "隱藏怪物ID"; + content: "⬜隱藏怪物ID"; } .not-show-mon-id .control-box .btn-show-mon-id::before{ - content: "顯示怪物ID"; + content: "🆔顯示怪物ID"; } .team-info .tIf-total-hp::before{ content: "總HP(隊伍覺醒和徽章)："; diff --git a/languages/zh.css b/languages/zh.css index 32972c22..f9799599 100644 --- a/languages/zh.css +++ b/languages/zh.css @@ -134,17 +134,23 @@ .control-box .datasource-label::before{ content: "数据来源："; } -.control-box .solo-link::before{ - content: "转到单人游戏"; +.control-box .btn-solo-link::before{ + content: "🧑转到单人游戏"; } -.control-box .multi-link::before{ - content: "转到2人车队"; +.control-box .btn-multi-link::before{ + content: "🧑‍🤝‍🧑转到2人车队"; +} +.control-box .btn-clear-data::before{ + content: "🗑️清除数据"; +} +.control-box .btn-swap-AB-team::before{ + content: "🔄交换AB队"; } .control-box .btn-show-mon-id::before{ - content: "隐藏怪物ID"; + content: "⬜隐藏怪物ID"; } .not-show-mon-id .control-box .btn-show-mon-id::before{ - content: "显示怪物ID"; + content: "🆔显示怪物ID"; } .team-info .tIf-total-hp::before{ content: "总HP(队伍觉醒和徽章)："; diff --git a/script.js b/script.js index 192475da..80c6ba1d 100644 --- a/script.js +++ b/script.js @@ -133,6 +133,53 @@ function createCardHead(id) changeid({id:id},cdom); return cli; } +//切换怪物ID显示 +function toggleShowMonId() +{ + document.body.classList.toggle('not-show-mon-id'); +} +//清除数据 +function clearData() +{ + location.href=location.href.replace(location.search,''); +} +//交换AB队 +function swapABteam() +{ + if (formation.team.length>0) + { + formation.team[0][0].splice(4, 0, formation.team[0][0].splice(0,1)[0]); //第1个数组基底删掉0并移动到4 + formation.team[0][1].splice(4, 0, formation.team[0][1].splice(0,1)[0]); //第1个数组辅助删掉0并移动到4 + formation.team[1][0].splice(0, 0, formation.team[1][0].splice(4,1)[0]); //第2个数组基底删掉4并移动到0 + formation.team[1][1].splice(0, 0, formation.team[1][1].splice(4,1)[0]); //第2个数组辅助删掉4并移动到0 + formation.team.splice(0,0,formation.team.splice(1,1)[0]); //交换AB队 + } + creatNewUrl(); + history.go(); +} +//在单人和多人之间转移数据 +function swapSingleMulitple() +{ + if (solo) + { + //创建第二支队伍，各4个空的 + formation.team[1] = [ + Array.from(new Array(4)).map(()=>{return new MemberTeam()}), + Array.from(new Array(4)).map(()=>{return new MemberAssist()}) + ]; + //把右边的队长加到第二支队伍最后面 + formation.team[1][0].push(formation.team[0][0].splice(5,1)[0]) + formation.team[1][1].push(formation.team[0][1].splice(5,1)[0]) + }else + { + //把第二支队五的队长添加到最后方 + formation.team[0][0].push(formation.team[1][0][4]); + formation.team[0][1].push(formation.team[1][1][4]); + //删掉第二支队伍 + formation.team.splice(1,1); + } + location.href = creatNewUrl({url:solo?"index.html":"solo.html",notPushState:true}); +} window.onload = function() { var controlBox = document.body.querySelector(".control-box"); @@ -264,10 +311,15 @@ function creatNewUrl(arg){ let language_i18n = arg.language || getQueryString("l") || getQueryString("lang"); //获取参数指定的语言 let datasource = arg.datasource || getQueryString("s"); let outObj = formation.outObj(); - history.pushState(null, null, '?' - + (language_i18n?'l=' + language_i18n + '&':'') - + (datasource&&datasource!="ja"?'s=' + datasource + '&':'') - + 'd=' + encodeURIComponent(JSON.stringify(outObj))); + + let newUrl = (arg.url?arg.url:"") + + '?' + + (language_i18n?'l=' + language_i18n + '&':'') + + (datasource&&datasource!="ja"?'s=' + datasource + '&':'') + + 'd=' + encodeURIComponent(JSON.stringify(outObj)); + + if (!arg.notPushState) history.pushState(null, null, newUrl); + return newUrl; } } //初始化 diff --git a/solo.html b/solo.html index 4fb12033..b624b48d 100644 --- a/solo.html +++ b/solo.html @@ -23,9 +23,15 @@ var formation = new Formation(1,6);
- - - +
+ + +
+
+ + + +
diff --git a/style.css b/style.css index 484701da..99ab90ff 100644 --- a/style.css +++ b/style.css @@ -212,7 +212,7 @@ ul{ font-size: 15px; line-height: 17px; height: 17px; - text-shadow: black 1px 1px 0,black 1px -1px 0,black -1px 1px 0,black -1px -1px 0; + text-shadow: black 0px 0px 2px,black -1px -1px 1px,black 1px 1px 1px; position: absolute; left: 5px; bottom: 15px; @@ -423,12 +423,16 @@ ul{ } .edit-box .search-box .evo-card-list li{ display: inline-block; + width: 75px; + height: 75px; } .edit-box .search-box .evo-card-list .monster{ float: none; + transform: scale(0.75) translate(-13px,-13px); } .edit-box .search-box .evo-card-list .monster .id{ bottom: 5px; + font-size: 20px; } .edit-box .setting-row{ width: 100%; @@ -704,7 +708,7 @@ ul{ content: "Lanuage:"; } .control-box .solo-link,.control-box .multi-link{ - margin-left: 10px; + /*margin-left: 10px;*/ } .control-box .solo-link::before{ content: "Jump To Solo Version";