From 88407a74423ba78bc08f8c44216e589161961df5 Mon Sep 17 00:00:00 2001 From: tempkari Date: Wed, 27 May 2020 11:25:14 +0900 Subject: [PATCH] bugfixes --- .gitignore | 2 +- .idea/encodings.xml | 6 - .idea/workspace.xml | 1079 ++++++++----------------------------------- index.html | 4 +- js/logistics.js | 70 +-- js/params.js | 2 + js/vec.js | 2 +- 7 files changed, 203 insertions(+), 962 deletions(-) delete mode 100644 .idea/encodings.xml diff --git a/.gitignore b/.gitignore index 70b596c..9203d2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -.idea/workspace.xml +.idea/* *.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index f9f70d0..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ba9058c..04b58ad 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,900 +1,181 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - date - var date - function - onclick - title - cl - click - change - onChange - onClick - svae - save - down - thisEvent - selectLanguage - dispRate - sumrate - display:none - none - display - modal - csv - CSV - read - levelsum - areaTo - Toggle - btn-area - summ_ - updateImage - - - table-sm - \' - menu_0 - menu_1 - menu_2 - menu_3 - menu_4 - btn_toggleMenu - saveConfig(); - "100" - val_sumItem.d - val_sumItem.k - - ,^t - ( - ]); - [" - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + 1590546027864 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/index.html b/index.html index 54f8046..2af1e68 100644 --- a/index.html +++ b/index.html @@ -861,9 +861,6 @@
- -
고효율
- @@ -1109,6 +1106,7 @@ + diff --git a/js/logistics.js b/js/logistics.js index c076044..9f1170d 100644 --- a/js/logistics.js +++ b/js/logistics.js @@ -1,10 +1,13 @@ -var lastUpdate = '2020-05-21 01:00' +var lastUpdate = '2020-05-27 12:05' var version = parseInt(lastUpdate.replace(/[^0-9]/g,'')); var updateDate = 'Changelog (' + lastUpdate + ')'; -var updateString = '- Added 13-4 Vector Calculator. (Link)
' + - '- Modified 8-1n ZAS Calculator. (Link)'; +var updateString = '- Added 13-4 Vector Calculator. (Link)' + + '
- Modified 8-1n ZAS Calculator. (Link)' + + '
- Bugfix #1: Contract error on 13-1 (repair to quick production)' + + '
- Bugfix #2: Recover area time when out of Check Cycle function' + ; var updateImage = false; @@ -16,7 +19,6 @@ var objectList = new Array(); var selectedList = new Array(); var sync_calcList = new Array(); -var highReturnPt = 0.5; // 상위 50% 군수는 고효율 군수로 분류 var rankTable = new Array(); //var sortToggle = [0,0,0,0,0,0,0,0,0,0,0,0]; // 0:none 1:asc 2:desc //지역, 인탄식부, 합계, 시간, 계약서5종 = 12 @@ -37,7 +39,6 @@ var sw_drawChart = true; // 차트 드로잉 갱신여부 var sw_drawReserved = false; // 차트 드로잉 예약여부 var sw_interval = false; // 확인 주기 적용여부 var sw_successEvent = false; // 군수확업 이벤트 트리거 -var sw_calcHigh = false; // 고효율군수 클릭했는가? var val_success = 0.6; // 대성공 초기성공률 60% var val_interval = 30; // 확인 주기 초기값 30분 @@ -473,11 +474,7 @@ $('[id^=btn-fdb]').off().on('click', function (e) { break; } - if(sw_calcHigh == false){ - $('#auto_calc').trigger('click'); - }else{ - $('#auto_calc_high').trigger('click'); - } + $('#auto_calc').trigger('click'); }); $('[id^=btn-rangeSelector]').off().on('click', function (e) { @@ -518,14 +515,10 @@ $('[id^=btn-rangeSelector]').off().on('click', function (e) { }); $('#auto_calc').off().on('click', function (e) { - auto_calculation(0); + auto_calculation(); }); -$('#auto_calc_high').off().on('click', function (e) { - auto_calculation(1); -}); - -function auto_calculation(type){ +function auto_calculation(){ var originalList; var usedRes = new Object(); var usedResA = new Array(); @@ -563,16 +556,9 @@ function auto_calculation(type){ var numAry = new Array(); for(var i in objectList){ - if(type == 1){ - console.log(objectList[i].highReturn); - if(objectList[i].highReturn == 0){ - console.log('aaak!'); - continue; //여기서 저효율 군수 걸러내면됨 - } - } - numAry.push(i); } + var comb = k_combinations(numAry, 4); //console.log(comb); @@ -1556,33 +1542,11 @@ function callData(){ arr[i][2] = val_interval * (parseInt(arr[i][2] / val_interval) + 1); } } - } - - // ======= Rank - rankTable = new Array(); - for(var i = 0; i < arr.length; i++){ - var tot = arr[i][3] / (arr[i][2] / 60) * val_sumRate.h + - arr[i][4] / (arr[i][2] / 60) * val_sumRate.a + - arr[i][5] / (arr[i][2] / 60) * val_sumRate.f + - arr[i][6] / (arr[i][2] / 60) * val_sumRate.p; - var obj = {"id":i, "val":parseInt(tot)}; - rankTable.push(obj); - } - for(var i = 0; i < rankTable.length; i++){ - var rank = 0; - if(i == j){ - continue; - }else{ - for(var j = 0; j < rankTable.length; j++){ - if(rankTable[i].val > rankTable[j].val){ - rank++; - } - } + }else{ + for(var i = 0; i < arr.length; i++){ + arr[i][2] = timeOriginal[i]; } - rankTable[i].rank = rank; - if(rank >= parseInt(arr.length * (1 - highReturnPt))){rankTable[i].highReturn = 1;}else{rankTable[i].highReturn = 0;} } - // ======= Rank End for(var i = 0; i < arr.length; i++){ var tmp = new Object(); @@ -1590,8 +1554,6 @@ function callData(){ tmp.Stage = arr[i][1]; tmp.Time = arr[i][2]; - tmp.highReturn = rankTable[i].highReturn; - if(sw_sucs){ tmp.Human = arr[i][3] * (0.5 * val_success + 1); tmp.Ammo = arr[i][4] * (0.5 * val_success + 1); @@ -1645,7 +1607,6 @@ function callData(){ objectList.push(tmp); } } - console.log(objectList); } function reload(){ @@ -2055,6 +2016,11 @@ function chkScroll(){ function init(){ + timeOriginal = new Array(); + for(var i = 0; i < arr.length; i++){ + timeOriginal[i] = arr[i][2]; + } + $('#area_btn_list').empty(); for(var i = 0; i < areaToggle.length; i++){ var btn = '
'; diff --git a/js/params.js b/js/params.js index 27a9d9c..954364b 100644 --- a/js/params.js +++ b/js/params.js @@ -22,6 +22,8 @@ * *****************************************************************************************************/ +var timeOriginal; // Original time array for area. Used for recover interval function. arr[i][2] + var arr = [ // Area, Stage, Time, Huma, Ammo, MRE, Part, Doll, Tool, Fast, Repr, Tokn [0, 1, 50, 0, 145, 145, 0, 0, 0, 0.2, 0.5, 0 ], diff --git a/js/vec.js b/js/vec.js index 6d8e622..5184f30 100644 --- a/js/vec.js +++ b/js/vec.js @@ -16,7 +16,7 @@ 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 buff_talent = 0; +var buff_talent = 0; $(function (){ langPacks = languagepack_vec;