devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

국가 성향이 제대로 등록되지 않는 버그 수정. 시뮬레이터 구현

Browse Source
This commit is contained in:
Hide_D
2018-08-26 18:19:27 +09:00
parent 724804efc6
commit 8ac85881a9
4 changed files with 70 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/battle_simulator.php
+20 -8
View File
@@ -40,22 +40,34 @@ $startYear = $gameStor->getValue('startyear');
<div class="row">
<div class="col-sm-6">
<div class="input-group">
<input type="number" class="form-control" id="year" aria-describedby="text_year" value="<?=$startYear?>" min="<?=$startYear?>" disabled>
<input type="number" class="form-control" aria-describedby="text_year" value="<?=$startYear?>" disabled>
<div class="input-group-append">
<span class="input-group-text" id="text_year">년 시작</span>
<span class="input-group-text">년 시작</span>
</div>
<input type="number" class="form-control" id="year" aria-describedby="text_year" value="<?=$startYear+3?>" min="<?=$startYear?>">
<input type="number" class="form-control" id="year" value="<?=$startYear+3?>" min="<?=$startYear?>">
<div class="input-group-append">
<span class="input-group-text" id="text_year">년</span>
<span class="input-group-text">년</span>
</div>
<input type="number" class="form-control" id="month" aria-describedby="text_month" value="1" min="1" max="12">
<input type="number" class="form-control" id="month" value="1" min="1" max="12">
<div class="input-group-append">
<span class="input-group-text" id="text_month">월</span>
<span class="input-group-text">월</span>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="btn-toolbar" role="toolbar">
<div class="input-group mr-2" role="group">
<div class="input-group-prepend">
<span class="input-group-text">반복 횟수</span>
</div>
<select class="custom-select" id="repeat_cnt">
<option value="1">1회 (로그 표기)</option>
<option value="1000">1000회 (요약 표기)</option>
</select>
</div>
<div class="btn-group mr-2" role="group">
<button type="button" class="btn btn-danger btn-begin_battle">전투</button>
</div>
<div class="btn-group mr-2" role="group">
<button type="button" class="btn btn-info">모두 저장</button>
<input type="file" class="form_load_battle_file" style="display: none;" />
@@ -194,11 +206,11 @@ $startYear = $gameStor->getValue('startyear');
<div class="input-group-prepend">
<span class="input-group-text">수비</span>
</div>
<input type="number" class="form-control form_def" id="month" value="1000" min="10" step="10">
<input type="number" class="form-control form_def" id="city_def" value="1000" min="10" step="10">
<div class="input-group-prepend">
<span class="input-group-text">성벽</span>
</div>
<input type="number" class="form-control form_wall" id="month" value="1000" min="0" step="10">
<input type="number" class="form-control form_wall" id="city_wall" value="1000" min="0" step="10">
</div>
</div>
</div>
hwe/css/battle_simulator.css
+4
View File
@@ -10,4 +10,8 @@
.form_sample{
display:none;
}
input[type=number]{
text-align:right;
}
hwe/func_converter.php
+1 -1
View File
@@ -15,7 +15,7 @@ function NationCharCall($call) {
$invTable[$name] = $typeID;
}
}
return $invTable[$name]??0;
return $invTable[$call]??0;
}
function getCharacterList(){
hwe/js/battle_simulator.js
+45 -11
View File
@@ -257,10 +257,12 @@ jQuery(function($){
return true;
}
var exportGeneralInfoForDB = function($general, idx){
var exportGeneralInfoForDB = function($general){
var retVal = exportGeneralInfo($general);
var dbVal = {
nation: (retVal.no)<=1 ? 1 : 2,
city: (retVal.no)<=1 ? 1 : 2,
turntime:'2018-08-26 12:00',
leader2:0,
power2:0,
@@ -279,16 +281,7 @@ jQuery(function($){
experience:Math.pow(retVal.explevel, 2),
};
if(idx <= 0){
dbVal['name'] = '출병자';
dbVal['nation'] = 1;
}
else{
dbVal['name'] = '수비자{0}'.format(idx);
dbVal['nation'] = 2;
}
return $.merge(retVal, defaultVal);
return $.merge(retVal, dbVal);
}
var getGeneralFrame = function($btn){
@@ -369,8 +362,49 @@ jQuery(function($){
importGeneralInfo(getGeneralDetail($newObj), generalData);
}
var exportAll = function(forDB){
if(forDB === undefined){
forDB = false;
}
var attackerGeneral = (forDB?exportGeneralInfoForDB:exportGeneralInfo)($('.attacker_form'));
var defenderGenerals = $('.defender_form').map(function(){
return (forDB?exportGeneralInfoForDB:exportGeneralInfo)($(this));
}).toArray();
var defaultCity = {
nation:0,
def:1000,
wall:1000,
};
var defenderCity = {
def: parseInt($('#city_def').val()),
wall: parseInt($('#city_wall').val()),
};
var year = parseInt($('#year').val());
var month = parseInt($('#month').val());
var repeatCnt = parseInt($('#repeat_cnt').val());
}
var beginBattle = function(){
var attackerGeneral = exportGeneralInfoForDB($('.attacker_form'));
var defenderGenerals = $('.defender_form').map(function(){
return exportGeneralInfoForDB($(this));
}).toArray();
console.log(attackerGeneral);
console.log(defenderGenerals);
}
initBasicEvent();
$attackerCard.append($generalForm.clone(true,true));
addDefender();
$('.btn-begin_battle').click(function(){
beginBattle();
});
});