From 353045b88d4811281b1a0056e863e7a5334394ba Mon Sep 17 00:00:00 2001 From: 6eps <67090812+6eps@users.noreply.github.com> Date: Tue, 27 Sep 2022 22:16:40 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=EC=9A=94=EC=A0=95=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 게임 내 요정 특성 변화에 따라 벡터런 부분을 업데이트했습니다. --- js/vec.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- vec.html | 21 ++++++++++++++++++++ 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/js/vec.js b/js/vec.js index fe46380..26d7817 100644 --- a/js/vec.js +++ b/js/vec.js @@ -16,7 +16,13 @@ var type_minFire = [ 142,142,140,128,126,124,124 ]; // 살상1 살상2 선봉 격양 var selected_talent = [ 0, 0, 0, 0 ]; -var fairy_talent = [ 12, 15, 8, 10 ]; +//var fairy_talent = [ 12, 15, 8, 10 ]; +var fairy_talent = [[5, 7, 9, 10, 12 ], + [6, 8, 11, 13, 15 ], + [3, 4, 6, 7, 8 ], + [3, 6, 7, 9, 10 ]] ; + +var selected_rare = [ 0, 0, 0, 0, 0 ]; var buff_talent = 0; $(function (){ @@ -78,18 +84,45 @@ function disp_selTalent(){ function btn_selTalent(id){ if(selected_talent[id] == 1){ selected_talent[id] = 0; - buff_talent = 0; + //buff_talent = 0; }else{ for(var i = 0; i < selected_talent.length; i++){ selected_talent[i] = 0; } selected_talent[id] = 1; - buff_talent = fairy_talent[id]; + //buff_talent = fairy_talent[id]; } disp_selTalent(); reCalc(); } +function disp_selRare(){ + for(var i = 0; i < 5; i++){ + if(selected_rare[i] == 1){ + $('#btn-rare-' + i).removeClass('btn-default'); + $('#btn-rare-' + i).addClass('btn-success'); + }else{ + $('#btn-rare-' + i).removeClass('btn-success'); + $('#btn-rare-' + i).addClass('btn-default'); + } + } +} + +function btn_selRare(id){ + if(selected_rare[id] == 1){ + selected_rare[id] = 0; + //buff_talent = 0; + }else{ + for(var i = 0; i < 5; i++){ + selected_rare[i] = 0; + } + selected_rare[id] = 1; + //buff_talent = fairy_talent[id]; + } + disp_selRare(); + reCalc(); +} + function disp_selType(){ for(var i = 0; i < selected_enc.length; i++){ var btn = document.getElementById('btn-type-' + i); @@ -170,6 +203,20 @@ function reCalc(){ $('#buff_fire').val(250); } + var talent_id=-1; + var rare_id=-1; + + for(var i = 0; i < 5; i++){ + if(selected_rare[i]==1) + rare_id=i; + } + for(var i = 0; i < 4; i++){ + if(selected_talent[i]==1) + talent_id=i; + } + + buff_talent= (talent_id != -1 && rare_id != -1) ? (fairy_talent[talent_id][rare_id]) : 0; + var finalFire = Math.ceil(Math.ceil(dollFire * (1 + (fairyFire / 100))) * (1 + (buffFire / 100)) * (1 + (buff_talent / 100))); chkFire(finalFire); @@ -275,6 +322,10 @@ function setLanguage(){ $('#btn-talent-'+(i-1)).text(langPack.talent['t'+ i]); } + for (let i = 1; i <= 5; i++) { + $('#btn-rare-'+(i-1)).text( "★".repeat(i) ); + } + $('#text-result-title').text(langPack.result.title); $('#help_pic_stat').attr("src", 'img/vec/help_stat_' + selLang + '.png'); diff --git a/vec.html b/vec.html index 252edce..b5e3d25 100644 --- a/vec.html +++ b/vec.html @@ -131,6 +131,27 @@ +
+
+
+ +
+
+
+ + + + + +
+
+
+
From 1cd302217bcf8466e611911bd873811bbf43c597 Mon Sep 17 00:00:00 2001 From: 6eps <67090812+6eps@users.noreply.github.com> Date: Tue, 27 Sep 2022 22:21:05 +0900 Subject: [PATCH 2/7] UI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 요정 관련 텍스트 수정 --- js/vec.js | 1 + lang/lang_vec.js | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/js/vec.js b/js/vec.js index 26d7817..b2ee80d 100644 --- a/js/vec.js +++ b/js/vec.js @@ -322,6 +322,7 @@ function setLanguage(){ $('#btn-talent-'+(i-1)).text(langPack.talent['t'+ i]); } + $('#text-rare-title').html(langPack.rare.title); for (let i = 1; i <= 5; i++) { $('#btn-rare-'+(i-1)).text( "★".repeat(i) ); } diff --git a/lang/lang_vec.js b/lang/lang_vec.js index 5252657..9d21b50 100644 --- a/lang/lang_vec.js +++ b/lang/lang_vec.js @@ -20,12 +20,15 @@ var languagepack_vec = "title":"승객: " }, "talent":{ - "title":"요정 특성: (5성 필수 = 100% 발동)", + "title":"요정 특성: ", "t1":"살상계 I", "t2":"살상계 II", "t3":"선봉계", "t4":"격양계" }, + "rare":{ + "title":"요정 레어도: " + }, "result":{ "title":"계산 결과: ", "fire":{ @@ -67,12 +70,15 @@ var languagepack_vec = "title":"乗客 : " }, "talent":{ - "title":"妖精天賦: (★5推薦 = 100% 発動)", + "title":"妖精天賦: ", "t1":"殺傷型 I", "t2":"殺傷型 II", "t3":"先鋒型", "t4":"激昂型" }, + "rare":{ + "title":"妖精ランク: " + }, "result":{ "title":"計算結果: ", "fire":{ @@ -113,12 +119,15 @@ var languagepack_vec = "title":"Passengers: " }, "talent":{ - "title":"Fairy Talent: (Recommend 5-Star, active rate 100%)", + "title":"Fairy Talent: ", "t1":"Damage I", "t2":"Damage II", "t3":"Charge", "t4":"Fervor" }, + "rare":{ + "title":"Fairy Rarity: " + }, "result":{ "title":"Result: ", "fire":{ From 4e3586c8469cca6c303fc490d7ff6bec6539a1c8 Mon Sep 17 00:00:00 2001 From: 6eps <67090812+6eps@users.noreply.github.com> Date: Wed, 28 Sep 2022 00:33:25 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EC=9A=94=EC=A0=95=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20=EC=9E=90=EC=8A=A4=EB=9F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 벡터런에 반영한 내용을 자스런에도 반영 --- js/zas.js | 68 +++++++++++++++++++++++++++++++++++++++++++----- lang/lang_zas.js | 15 ++++++++--- zas.html | 21 +++++++++++++++ 3 files changed, 95 insertions(+), 9 deletions(-) diff --git a/js/zas.js b/js/zas.js index 38ec909..0f76c3a 100644 --- a/js/zas.js +++ b/js/zas.js @@ -40,11 +40,23 @@ var dangerZone = 0; // 살상1 살상2 돌격 격양 var selected_talent = [ 0, 0, 0, 0 ]; -var fairy_talent_fire = [ 12, 15, 10, 8 ]; -var fairy_talent_rate = [ 0, 0, 8, 0 ]; +//var fairy_talent_fire = [ 12, 15, 10, 8 ]; +//var fairy_talent_rate = [ 0, 0, 8, 0 ]; var buff_talent_fire = 0; var buff_talent_rate = 0; +var fairy_talent_fire = [[5, 7, 9, 10, 12 ], + [6, 8, 11, 13, 15 ], + [4, 6, 7, 9, 10 ], + [3, 6, 7, 9, 10 ]]; + +var fairy_talent_rate = [[0, 0, 0, 0, 0 ], + [0, 0, 0, 0, 0 ], + [3, 4, 6, 7, 8 ], + [0, 0, 0, 0, 0 ]]; + +var selected_rare = [ 0, 0, 0, 0, 0 ]; + var selLang = 'ko'; var langPack; var langPacks; @@ -110,20 +122,45 @@ function disp_selTalent(){ function btn_selTalent(id){ if(selected_talent[id] == 1){ selected_talent[id] = 0; - buff_talent_fire = 0; - buff_talent_rate = 0; + //buff_talent_fire = 0; + //buff_talent_rate = 0; }else{ for(var i = 0; i < selected_talent.length; i++){ selected_talent[i] = 0; } selected_talent[id] = 1; - buff_talent_fire = fairy_talent_fire[id]; - buff_talent_rate = fairy_talent_rate[id]; + //buff_talent_fire = fairy_talent_fire[id]; + //buff_talent_rate = fairy_talent_rate[id]; } disp_selTalent(); reCalc(); } +function disp_selRare(){ + for(var i = 0; i < 5; i++){ + if(selected_rare[i] == 1){ + $('#btn-rare-' + i).removeClass('btn-default'); + $('#btn-rare-' + i).addClass('btn-success'); + }else{ + $('#btn-rare-' + i).removeClass('btn-success'); + $('#btn-rare-' + i).addClass('btn-default'); + } + } +} + +function btn_selRare(id){ + if(selected_rare[id] == 1){ + selected_rare[id] = 0; + }else{ + for(var i = 0; i < 5; i++){ + selected_rare[i] = 0; + } + selected_rare[id] = 1; + } + disp_selRare(); + reCalc(); +} + function btn_selArea(idx){ switch(idx){ case 81: @@ -217,7 +254,21 @@ function reCalc(){ buffRate = 100; $('#buff_rate').val(100); } + + var talent_id=-1; + var rare_id=-1; + for(var i = 0; i < 5; i++){ + if(selected_rare[i]==1) + rare_id=i; + } + for(var i = 0; i < 4; i++){ + if(selected_talent[i]==1) + talent_id=i; + } + buff_talent_fire=(talent_id != -1 && rare_id != -1) ? (fairy_talent_fire[talent_id][rare_id]) : 0; + buff_talent_rate=(talent_id != -1 && rare_id != -1) ? (fairy_talent_rate[talent_id][rare_id]) : 0; + var finalFire = Math.floor(Math.floor(dollFire * (1 + (fairyFire / 100))) * (1 + (buffFire / 100)) * (1 + (buff_talent_fire / 100)) + 1); // * (0.85) var finalRate = Math.floor(dollRate * (1 + (buffRate / 100)) * (1 + (buff_talent_rate / 100))); @@ -366,6 +417,11 @@ function setLanguage(){ $('#btn-talent-'+(i-1)).text(langPack.talent['t'+ i]); } + $('#text-rare-title').html(langPack.rare.title); + for (let i = 1; i <= 5; i++) { + $('#btn-rare-'+(i-1)).text( "★".repeat(i) ); + } + $('#text-result-title').text(langPack.result.title); $('#help_pic_stat').attr("src", 'img/zas/help_stat_' + selLang + '.png'); diff --git a/lang/lang_zas.js b/lang/lang_zas.js index 8934417..200ed94 100644 --- a/lang/lang_zas.js +++ b/lang/lang_zas.js @@ -20,12 +20,15 @@ var languagepack_zas = "rate":"사속버프 합계(%) 입력" }, "talent":{ - "title":"요정 특성: (★5 필수 = 100% 발동)", + "title":"요정 특성: ", "t1":"살상계 I", "t2":"살상계 II", "t3":"돌격계", "t4":"격양계" }, + "rare":{ + "title":"요정 레어도: " + }, "result":{ "title":"계산 결과: ", "fire":{ @@ -80,12 +83,15 @@ var languagepack_zas = "rate":"射速バフ合計(%)" }, "talent":{ - "title":"妖精天賦: (★5推薦 = 100% 発動)", + "title":"妖精天賦: ", "t1":"殺傷型 I", "t2":"殺傷型 II", "t3":"突撃型", "t4":"激昂型" }, + "rare":{ + "title":"妖精ランク: " + }, "result":{ "title":"計算結果: ", "fire":{ @@ -140,12 +146,15 @@ var languagepack_zas = "rate":"RoF. Buff (%)" }, "talent":{ - "title":"Fairy Talent: (Recommend ★5 = active rate 100%)", + "title":"Fairy Talent: ", "t1":"Damage I", "t2":"Damage II", "t3":"Assualt", "t4":"Fervor" }, + "rare":{ + "title":"Fairy Rarity: " + }, "result":{ "title":"Result: ", "fire":{ diff --git a/zas.html b/zas.html index 68eaaba..c5ea612 100644 --- a/zas.html +++ b/zas.html @@ -106,6 +106,27 @@
+
+
+
+ +
+
+
+ + + + + +
+
+
+
From 71c29f3c4ddb984fa3430648cd044f1b55e5c09b Mon Sep 17 00:00:00 2001 From: 6eps <67090812+6eps@users.noreply.github.com> Date: Wed, 28 Sep 2022 00:43:31 +0900 Subject: [PATCH 4/7] ui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xs offset 추가 --- vec.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vec.html b/vec.html index b5e3d25..1b88f71 100644 --- a/vec.html +++ b/vec.html @@ -144,7 +144,7 @@ - From 2fc21744e8e04ba25c9e886fbc8e28fa64b37135 Mon Sep 17 00:00:00 2001 From: 6eps <67090812+6eps@users.noreply.github.com> Date: Wed, 28 Sep 2022 08:32:22 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EC=96=B8=EC=96=B4=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 영어/일본어에 5성 필수 부분을 복구 --- lang/lang_vec.js | 10 +++++----- lang/lang_zas.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lang/lang_vec.js b/lang/lang_vec.js index 9d21b50..31adf0c 100644 --- a/lang/lang_vec.js +++ b/lang/lang_vec.js @@ -27,7 +27,7 @@ var languagepack_vec = "t4":"격양계" }, "rare":{ - "title":"요정 레어도: " + "title":"요정 레어도(3.0): " }, "result":{ "title":"계산 결과: ", @@ -70,14 +70,14 @@ var languagepack_vec = "title":"乗客 : " }, "talent":{ - "title":"妖精天賦: ", + "title":"妖精天賦: (★5推薦 = 100% 発動)", "t1":"殺傷型 I", "t2":"殺傷型 II", "t3":"先鋒型", "t4":"激昂型" }, "rare":{ - "title":"妖精ランク: " + "title":"妖精ランク(3.0): (★5推薦 = 100% 発動)" }, "result":{ "title":"計算結果: ", @@ -119,14 +119,14 @@ var languagepack_vec = "title":"Passengers: " }, "talent":{ - "title":"Fairy Talent: ", + "title":"Fairy Talent: (Recommend 5-Star, active rate 100%)", "t1":"Damage I", "t2":"Damage II", "t3":"Charge", "t4":"Fervor" }, "rare":{ - "title":"Fairy Rarity: " + "title":"Fairy Rarity(3.0): (Recommend 5-Star, active rate 100%)" }, "result":{ "title":"Result: ", diff --git a/lang/lang_zas.js b/lang/lang_zas.js index 200ed94..59a14e3 100644 --- a/lang/lang_zas.js +++ b/lang/lang_zas.js @@ -27,7 +27,7 @@ var languagepack_zas = "t4":"격양계" }, "rare":{ - "title":"요정 레어도: " + "title":"요정 레어도(3.0): " }, "result":{ "title":"계산 결과: ", @@ -83,14 +83,14 @@ var languagepack_zas = "rate":"射速バフ合計(%)" }, "talent":{ - "title":"妖精天賦: ", + "title":"妖精天賦: (★5推薦 = 100% 発動)", "t1":"殺傷型 I", "t2":"殺傷型 II", "t3":"突撃型", "t4":"激昂型" }, "rare":{ - "title":"妖精ランク: " + "title":"妖精ランク(3.0): (★5推薦 = 100% 発動)" }, "result":{ "title":"計算結果: ", @@ -146,14 +146,14 @@ var languagepack_zas = "rate":"RoF. Buff (%)" }, "talent":{ - "title":"Fairy Talent: ", + "title":"Fairy Talent: (Recommend 5-Star, active rate 100%)", "t1":"Damage I", "t2":"Damage II", "t3":"Assualt", "t4":"Fervor" }, "rare":{ - "title":"Fairy Rarity: " + "title":"Fairy Rarity(3.0): (Recommend 5-Star, active rate 100%)" }, "result":{ "title":"Result: ", From 9e012288f729cf936a74e1f99adc07c6c318df8c Mon Sep 17 00:00:00 2001 From: 6eps <67090812+6eps@users.noreply.github.com> Date: Thu, 5 Jan 2023 18:41:01 +0900 Subject: [PATCH 6/7] Update vec.html --- vec.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vec.html b/vec.html index 1b88f71..c79f48f 100644 --- a/vec.html +++ b/vec.html @@ -211,8 +211,8 @@ @@ -266,4 +266,4 @@ - \ No newline at end of file + From 1fd1d340b05cc19e5686a9136cdd1e062383c40e Mon Sep 17 00:00:00 2001 From: 6eps <67090812+6eps@users.noreply.github.com> Date: Thu, 5 Jan 2023 18:41:36 +0900 Subject: [PATCH 7/7] Update vec.html --- vec.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vec.html b/vec.html index c79f48f..40d8346 100644 --- a/vec.html +++ b/vec.html @@ -211,8 +211,8 @@