Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bugfixes
  • Loading branch information
tempkaridc committed May 27, 2020
1 parent 5b114bf commit 88407a7
Show file tree
Hide file tree
Showing 7 changed files with 203 additions and 962 deletions.
2 changes: 1 addition & 1 deletion .gitignore
@@ -1,3 +1,3 @@

.idea/workspace.xml
.idea/*
*.xml
6 changes: 0 additions & 6 deletions .idea/encodings.xml

This file was deleted.

1,079 changes: 180 additions & 899 deletions .idea/workspace.xml

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions index.html
Expand Up @@ -861,9 +861,6 @@
<td width="80%">
<div id="auto_calc" class="btn btn-sm btn-primary" style="width:100%;"></div>
</td>
<td width="40%" style="display:none;">
<div id="auto_calc_high" class="btn btn-sm btn-danger" style="width:100%;">고효율</div>
</td>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -1109,6 +1106,7 @@
<script src="js/extlib/jquery-2.2.4.min.js"></script>
<script src="js/extlib/bootstrap.js"></script>
<script src="js/extlib/html2canvas.js"></script>

<script src="lang/lang_logistics.js"></script>
<script src="js/params.js"></script>
<script src="js/logistics.js"></script>
Expand Down
70 changes: 18 additions & 52 deletions 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. (<font style="color:blue;"><a href="https://tempkaridc.github.io/gf/vec.html" target="_blank">Link</a></font>)<br>' +
'- Modified 8-1n ZAS Calculator. (<font style="color:blue;"><a href="https://tempkaridc.github.io/gf/zas.html" target="_blank">Link</a></font>)';
var updateString = '- Added <i>13-4 Vector Calculator</i>. (<font style="color:blue;"><a href="https://tempkaridc.github.io/gf/vec.html" target="_blank">Link</a></font>)'
+ '<br>- Modified <i>8-1n ZAS Calculator</i>. (<font style="color:blue;"><a href="https://tempkaridc.github.io/gf/zas.html" target="_blank">Link</a></font>)'
+ '<br>- Bugfix #1: Contract error on 13-1 (repair to quick production)'
+ '<br>- Bugfix #2: Recover area time when out of <i>Check Cycle</i> function'
;

var updateImage = false;

Expand All @@ -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
Expand All @@ -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분
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -1556,42 +1542,18 @@ 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();
tmp.Area = arr[i][0];
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);
Expand Down Expand Up @@ -1645,7 +1607,6 @@ function callData(){
objectList.push(tmp);
}
}
console.log(objectList);
}

function reload(){
Expand Down Expand Up @@ -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 = '<div class="btn-group">';
Expand Down
2 changes: 2 additions & 0 deletions js/params.js
Expand Up @@ -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 ],
Expand Down
2 changes: 1 addition & 1 deletion js/vec.js
Expand Up @@ -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;
Expand Down

0 comments on commit 88407a7

Please sign in to comment.