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

city의 officer를 general로 이동

Browse Source
This commit is contained in:
Hide_D
2020-04-18 03:57:58 +09:00
parent b8c28e0a89
commit 16f2c9fb42
98 changed files with 680 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/js/battle_simulator.js
+6 -21
View File
@@ -152,7 +152,7 @@ jQuery(function($){
setVal('.form_general_name', data.name);
setVal('.form_general_level', data.level);
setVal('.form_officer_level', data.officer_level);
setVal('.form_exp_level', data.explevel);
setVal('.form_injury', data.injury);
@@ -200,7 +200,7 @@ jQuery(function($){
return {
no:getGeneralNo($general),
name:getVal('.form_general_name'),
level:getInt('.form_general_level'),
officer_level:getInt('.form_officer_level'),
explevel:getInt('.form_exp_level'),
leadership:getInt('.form_leadership'),
@@ -602,9 +602,6 @@ jQuery(function($){
dead:0,
state:0,
officer4:0,
officer3:0,
officer2:0,
conflict:'{}',
};
@@ -618,14 +615,8 @@ jQuery(function($){
attackerCity.city = 1;
var attackerGeneral = extendGeneralInfoForDB(allData.attackerGeneral);
if(attackerGeneral.level == 4){
attackerCity.officer4 = attackerGeneral.no;
}
if(attackerGeneral.level == 3){
attackerCity.officer3 = attackerGeneral.no;
}
if(attackerGeneral.level == 2){
attackerCity.officer2 = attackerGeneral.no;
if(2 <= attackerGeneral.officer_level && attackerGeneral.officer_level <= 4){
attackerCity.officer_city = 1;
}
var defenderNation = $.extend({}, defaultNation, allData.defenderNation);
@@ -641,14 +632,8 @@ jQuery(function($){
var defenderGenerals = [];
$.each(allData.defenderGenerals, function(){
var defenderGeneral = extendGeneralInfoForDB(this);
if(defenderGeneral.level == 4){
defenderCity.officer4 = defenderGeneral.no;
}
if(defenderGeneral.level == 3){
defenderCity.officer3 = defenderGeneral.no;
}
if(defenderGeneral.level == 2){
defenderCity.officer2 = defenderGeneral.no;
if(2 <= defenderGeneral.officer_level && defenderGeneral.officer_level <= 4){
defenderGeneral.officer_city = 3;
}
defenderGenerals.push(defenderGeneral);
hwe/js/bossInfo.js
+15 -15
View File
@@ -114,31 +114,31 @@ $(function(){
$('.btn_appoint').click(function(){
var $btn = $(this);
var level = $btn.data('level');
var officerLevel = $btn.data('officer_level');
var officerLevelText = $btn.data('officer_level_text');
var cityID = 0;
var cityName = '_';
var $generalSelect = $('.genlist_{0} option:selected'.format(level));
var $citySelect = $('.citylist_{0} option:selected'.format(level));
var levelText = $btn.data('level-text');
var $generalSelect = $('.genlist_{0} option:selected'.format(officerLevel));
var $citySelect = $('.citylist_{0} option:selected'.format(officerLevel));
var generalID = $generalSelect.val();
var generalName = $generalSelect.data('name');
var generalLevel = $generalSelect.data('level');
var generalOfficerLevel = $generalSelect.data('officer_level');
if(level >= 5){
if(officerLevel >= 5){
if(generalID == 0){
if(!confirm('{0}직을 비우시겠습니까?'.format(levelText))){
if(!confirm('{0}직을 비우시겠습니까?'.format(officerLevelText))){
return false;
}
}
else if(generalLevel >= 5){
if(!confirm('이미 수뇌인 {0}를 {1}직에 임명하시겠습니까?'.format(generalName, levelText))){
else if(generalOfficerLevel >= 5){
if(!confirm('이미 수뇌인 {0}를 {1}직에 임명하시겠습니까?'.format(generalName, officerLevelText))){
return false;
}
}
else{
if(!confirm('{0}를 {1}직에 임명하시겠습니까?'.format(generalName, levelText))){
if(!confirm('{0}를 {1}직에 임명하시겠습니까?'.format(generalName, officerLevelText))){
return false;
}
}
@@ -152,17 +152,17 @@ $(function(){
cityName = $citySelect.find('option:selected .name_field').text();
if(generalID == 0){
if(!confirm('{0} {1}직을 비우시겠습니까?'.format(cityName, levelText))){
if(!confirm('{0} {1}직을 비우시겠습니까?'.format(cityName, officerLevelText))){
return false;
}
}
else if(generalLevel >= 5){
if(!confirm('수뇌인 {0}를 {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, levelText))){
else if(generalOfficerLevel >= 5){
if(!confirm('수뇌인 {0}를 {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, officerLevelText))){
return false;
}
}
else{
if(!confirm('{0}를 {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, levelText))){
if(!confirm('{0}를 {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, officerLevelText))){
return false;
}
}
@@ -175,7 +175,7 @@ $(function(){
action:'임명',
destGeneralID:generalID,
destCityID:cityID,
level:level
officerLevel:officerLevel
},
}).then(function(data){
if(!data){
hwe/js/chiefCenter.js
+3 -3
View File
@@ -14,7 +14,7 @@ function genChiefTableObj(){
for(var chiefIdx = 5; chiefIdx <= 12; chiefIdx++){
var $plate = $('#chief_{0}'.format(chiefIdx));
var $levelText = $plate.find('.chiefLevelText');
var $officerLevelText = $plate.find('.chiefLevelText');
var $name = $plate.find('.chiefName');
var turn = [];
for(var turnIdx=0;turnIdx<maxChiefTurn;turnIdx++){
@@ -25,7 +25,7 @@ function genChiefTableObj(){
turn.push({turnTime:$turnTime,turnPad:$turnPad,turnText:$turnText});
}
objTable[chiefIdx] = {
levelText: $levelText,
officerLevelText: $officerLevelText,
name: $name,
turn: turn
};
@@ -70,7 +70,7 @@ function reloadTable(){
if(nameColor){
$name.css('color',nameColor);
}
plateObj.levelText.text(chiefInfo.levelText);
plateObj.officerLevelText.text(chiefInfo.officerLevelText);
plateObj.name.html($name);
var turnTimeObj = moment(chiefInfo.turnTime);
hwe/js/ext.expand_city.js
+10 -10
View File
@@ -175,11 +175,11 @@ $(function() {
var cityInfo = subCityList[cityVal].city;
$.post(basicPath+'c_myBossInfo.php',{
citylist:cityVal,
genlist:userVal,
level:type,
btn:'임명'
$.post(basicPath+'j_myBossInfo.php',{
destCityID:cityVal,
destGeneralID:userVal,
officerLevel:type,
action:'임명'
},function(rawData){
cityInfo['p'+text]=false;
@@ -451,11 +451,11 @@ $(function() {
}
}
$.post(basicPath+'c_myBossInfo.php',{
citylist:cityVal,
genlist:userInfo.val,
level:type,
btn:'임명'
$.post(basicPath+'j_myBossInfo.php',{
destCityID:cityVal,
destGeneralID:userInfo.val,
officerLevel:type,
action:'임명'
},function(rawData){
cityInfo['p'+text]=false;
hwe/js/msg.js
+1 -1
View File
@@ -449,7 +449,7 @@ function registerGlobal(basicInfo){
};
window.myGeneralID = basicInfo.generalID;
window.isChief = basicInfo.isChief;
window.myGeneralLevel = basicInfo.generalLevel;
window.myOfficerLevel = basicInfo.officerLevel;
window.permissionLevel = basicInfo.permission;
}
hwe/js/select_npc.js
+2 -2
View File
@@ -29,7 +29,7 @@ var templateGeneralRow =
<td><%nation%></td>\
<td><%experience%></td>\
<td><%dedication%></td>\
<td><%level%></td>\
<td><%officerLevel%></td>\
<td><%total%></td>\
<td><%leadership%></td>\
<td><%strength%></td>\
@@ -188,7 +188,7 @@ function printGeneralList(value){
explevel:general[16],
experience:general[17],
dedication:general[18],
level:general[19],
officerLevel:general[19],
killturn:general[20],
connect:general[21],
reserved:0