From 7d8889cc6f6ab00f98c0fdac454457663c49976e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Sun, 30 May 2021 04:34:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B0=8DPDC=E4=BA=8C?= =?UTF-8?q?=E7=B6=AD=E7=A2=BC=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + languages/en.css | 25 ++- languages/ja.css | 25 ++- languages/ko.css | 25 ++- languages/zh-TW.css | 25 ++- languages/zh.css | 25 ++- multi.html | 29 ++-- script-universal_function.js | 15 +- script.js | 325 ++++++++++++++++++++++++----------- solo.html | 29 ++-- style.css | 52 +++++- triple.html | 29 ++-- 12 files changed, 454 insertions(+), 151 deletions(-) diff --git a/README.md b/README.md index a4e00773..747fe348 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ Please refer to existing files. # 使用开源软件 | Open source software used * [Puzzle-and-Dragons-Texture-Tool](//github.com/codywatts/Puzzle-and-Dragons-Texture-Tool) //Extract Images * [pad-rikuu](//github.com/kiootic/pad-rikuu) //Parse data +* [zxing-js](//github.com/zxing-js/library) //Read, Write QR Code * [html2canvas](//github.com/niklasvh/html2canvas) //Capture Image * [aaa](//github.com/jy4340132/aaa) //Play voice(ADPCM wav) * [Zpix (最像素)](//github.com/SolidZORO/zpix-pixel-font) //Pixel Font diff --git a/languages/en.css b/languages/en.css index e456b749..853e05a4 100644 --- a/languages/en.css +++ b/languages/en.css @@ -508,6 +508,16 @@ .control-box .btn-qrcode::before{ content: "\f029 QR Code"; } + +.read-qr-box::before +{ + content: "Read QR code:"; +} +.save-qr-box::before +{ + content: "Generate QR code:"; +} + .formation-from-qrcode::before { content: "A formation link read from a QR code"; @@ -516,7 +526,7 @@ label[for="sourceSelect"]::before { content: "Video source selection:"; } -#qr-code-frame .save-qr-svg::before +#qr-code-frame .save-qr-img::before { content: "\f0c7 Save QR code image"; } @@ -524,7 +534,20 @@ label[for="sourceSelect"]::before { content: "\f030 Scan with the camera"; } +#qr-code-frame .read-qr-camera.running::before +{ + content: "\f28d Stop using the camera"; +} #qr-code-frame .read-qr-file::before { content: "\f1c5 Read the image file"; +} + +label[for="qr-data-type-pdf"]::before +{ + content: "This Formation Picture Maker"; +} +label[for="qr-data-type-pdc"]::before +{ + content: "P&D Damage Caculater (PDC)"; } \ No newline at end of file diff --git a/languages/ja.css b/languages/ja.css index 4b3d9d01..f9707a78 100644 --- a/languages/ja.css +++ b/languages/ja.css @@ -475,6 +475,16 @@ .control-box .btn-qrcode::before{ content: "\f029 QRコード"; } + +.read-qr-box::before +{ + content: "QRコードを読み取る:"; +} +.save-qr-box::before +{ + content: "QRコードを生成します:"; +} + .formation-from-qrcode::before { content: "QRコードから読み取られたフォーメーションリンク"; @@ -483,7 +493,7 @@ label[for="sourceSelect"]::before { content: "ビデオ ソースの選択:"; } -#qr-code-frame .save-qr-svg::before +#qr-code-frame .save-qr-img::before { content: "\f0c7 QRコードイメージを保存"; } @@ -491,7 +501,20 @@ label[for="sourceSelect"]::before { content: "\f030 カメラでスキャンする"; } +#qr-code-frame .read-qr-camera.running::before +{ + content: "\f28d カメラの使用を停止します"; +} #qr-code-frame .read-qr-file::before { content: "\f1c5 画像ファイルを読み取る"; +} + +label[for="qr-data-type-pdf"]::before +{ + content: "このフォーメーション画像メーカー"; +} +label[for="qr-data-type-pdc"]::before +{ + content: "パズドラダメージ計算 (PDC)"; } \ No newline at end of file diff --git a/languages/ko.css b/languages/ko.css index 5be851da..ba2157ef 100644 --- a/languages/ko.css +++ b/languages/ko.css @@ -466,6 +466,16 @@ .control-box .btn-qrcode::before{ content: "\f029 QR 코드"; } + +.read-qr-box::before +{ + content: "QR 코드 읽기:"; +} +.save-qr-box::before +{ + content: "QR 코드 생성:"; +} + .formation-from-qrcode::before { content: "QR 코드에서 읽은 형성 링크"; @@ -474,7 +484,7 @@ label[for="sourceSelect"]::before { content: "비디오 소스 선택:"; } -#qr-code-frame .save-qr-svg::before +#qr-code-frame .save-qr-img::before { content: "\f0c7 QR 코드 이미지 저장"; } @@ -482,7 +492,20 @@ label[for="sourceSelect"]::before { content: "\f030 카메라로 스캔"; } +#qr-code-frame .read-qr-camera.running::before +{ + content: "\f28d 카메라 사용을 중지합니다"; +} #qr-code-frame .read-qr-file::before { content: "\f1c5 이미지 파일 읽기"; +} + +label[for="qr-data-type-pdf"]::before +{ + content: "이 형성 사진 메이커"; +} +label[for="qr-data-type-pdc"]::before +{ + content: "퍼즐앤드래곤 데미지 카큐라터 (PDC)"; } \ No newline at end of file diff --git a/languages/zh-TW.css b/languages/zh-TW.css index 99f4b371..2148ef48 100644 --- a/languages/zh-TW.css +++ b/languages/zh-TW.css @@ -468,6 +468,16 @@ .control-box .btn-qrcode::before{ content: "\f029 二維碼"; } + +.read-qr-box::before +{ + content: "讀取二維碼:"; +} +.save-qr-box::before +{ + content: "生成二維碼:"; +} + .formation-from-qrcode::before { content: "從二維碼中讀取的隊伍連結"; @@ -476,7 +486,7 @@ label[for="sourceSelect"]::before { content: "視頻源選擇:"; } -#qr-code-frame .save-qr-svg::before +#qr-code-frame .save-qr-img::before { content: "\f0c7 保存二維碼圖片"; } @@ -484,7 +494,20 @@ label[for="sourceSelect"]::before { content: "\f030 使用相機掃描"; } +#qr-code-frame .read-qr-camera.running::before +{ + content: "\f28d 停止使用相機"; +} #qr-code-frame .read-qr-file::before { content: "\f1c5 讀取二維碼圖片"; +} + +label[for="qr-data-type-pdf"]::before +{ + content: "本隊伍圖製作工具"; +} +label[for="qr-data-type-pdc"]::before +{ + content: "智龙迷城傷害計算器 (PDC)"; } \ No newline at end of file diff --git a/languages/zh.css b/languages/zh.css index e29da2c8..121f810e 100644 --- a/languages/zh.css +++ b/languages/zh.css @@ -468,6 +468,16 @@ .control-box .btn-qrcode::before{ content: "\f029 二维码"; } + +.read-qr-box::before +{ + content: "读取二维码:"; +} +.save-qr-box::before +{ + content: "生成二维码:"; +} + .formation-from-qrcode::before { content: "从二维码中读取的队伍链接"; @@ -476,7 +486,7 @@ label[for="sourceSelect"]::before { content: "视频源选择:"; } -#qr-code-frame .save-qr-svg::before +#qr-code-frame .save-qr-img::before { content: "\f0c7 保存二维码图片"; } @@ -484,7 +494,20 @@ label[for="sourceSelect"]::before { content: "\f030 使用相机扫描"; } +#qr-code-frame .read-qr-camera.running::before +{ + content: "\f28d 停止使用相机"; +} #qr-code-frame .read-qr-file::before { content: "\f1c5 读取二维码图片"; +} + +label[for="qr-data-type-pdf"]::before +{ + content: "本队伍图制作工具"; +} +label[for="qr-data-type-pdc"]::before +{ + content: "智龙迷城伤害计算器(PDC)"; } \ No newline at end of file diff --git a/multi.html b/multi.html index f7e31fd4..16ac0915 100644 --- a/multi.html +++ b/multi.html @@ -1096,19 +1096,26 @@ var formation = new Formation(teamsCount,5);