diff --git a/hwe/j_get_general_list.php b/hwe/j_get_general_list.php
index 3ec55b1b..218692e2 100644
--- a/hwe/j_get_general_list.php
+++ b/hwe/j_get_general_list.php
@@ -69,15 +69,17 @@ foreach($rawGeneralList as $rawGeneral){
$npc,
$age,
$nationArr['name'],
- SpecCall($special),
- SpecCall($special2),
+ getGenSpecial($special),
+ getGenSpecial($special2),
getGenChar($personal),
$name,
$name2,
+ $injury,
$leader,
$lbonus,
$power,
$intel,
+ getExpLevel($experience),
getHonor($experience),
getDed($dedication),
getLevel($level, $nationArr['level']),
diff --git a/hwe/js/select_npc.js b/hwe/js/select_npc.js
index 773e9bf8..eb9bb5c6 100644
--- a/hwe/js/select_npc.js
+++ b/hwe/js/select_npc.js
@@ -16,6 +16,25 @@ var templateSpecial =
\
';
+var templateGeneralRow =
+'
\
+  | \
+ <%name%><%nameAux%> | \
+ <%age%>세 | \
+ <%personalWithTooltip%> | \
+ <%specialDomesticWithTooltip%> / <%speicalWarWithTooltip%> | \
+ Lv <%explevel%> | \
+ <%nation%> | \
+ <%experience%> | \
+ <%dedication%> | \
+ <%level%> | \
+ <%total%> | \
+ <%leader%> | \
+ <%power%> | \
+ <%intel%> | \
+ <%killturn%> | \
+
';
+
function pickGeneral(){
$btn = $(this);
@@ -115,7 +134,6 @@ function printGenerals(value){
var $card = $(TemplateEngine(templateGeneralCard, cardData));
- console.log($card);
$('.card_holder').append($card);
$card.find('.select_btn').click(pickGeneral);
@@ -131,7 +149,132 @@ function printGenerals(value){
updateOutdateTimer();
}
+function printGeneralList(value){
+ var tokenList = value.token;
+ var generalList = $.map(value.list, function(general){
+ general = {
+ no:general[0],
+ picture:general[1],
+ imgsvr:general[2],
+ npc:general[3],
+ age:general[4],
+ nation:general[5],
+ special:general[6],
+ special2:general[7],
+ personal:general[8],
+ name:general[9],
+ name2:general[10],
+ injury:general[11],
+ leader:general[12],
+ lbonus:general[13],
+ power:general[14],
+ intel:general[15],
+ explevel:general[16],
+ experience:general[17],
+ dedication:general[18],
+ level:general[19],
+ killturn:general[20],
+ connect:general[21],
+ reserved:0
+ };
+ if(general.npc < 2){
+ general.reserved = 2;
+ }
+ if(general.no in tokenList){
+ general.reserved = 1;
+ }
+
+ general.userCSS = "";
+ general.nameAux = "";
+
+ if(general.reserved == 1){
+ general.userCSS = 'color:violet';
+ }
+ else if(general.npc >= 2){
+ general.userCSS = 'color:cyan';
+ }
+ else if(general.npc == 1){
+ general.userCSS = 'color:skyblue';
+ }
+
+ if(general.name2){
+ general.nameAux += '
({0})'.format(general.name2);
+ }
+
+ if(general.reserved == 1){
+ general.nameAux += '
({0}회)'.format(tokenList[general.no]);
+ }
+
+
+ general.total = general.leader + general.power + general.intel;
+ general.iconPath = getIconPath(general.imgsvr, general.picture);
+
+ general.specialDomesticWithTooltip = TemplateEngine(templateSpecial, {
+ text:general.special,
+ info:specialInfo[general.special]
+ });
+
+ general.speicalWarWithTooltip = TemplateEngine(templateSpecial, {
+ text:general.special2,
+ info:specialInfo[general.special2]
+ });
+
+ general.personalWithTooltip = TemplateEngine(templateSpecial, {
+ text:general.personal,
+ info:characterInfo[general.personal]
+ });
+
+ return general;
+ });
+
+ generalList.sort(function(lhs, rhs){
+ if(lhs.reserved > rhs.reserved){
+ return -1;
+ }
+ if(lhs.reserved < rhs.reserved){
+ return 1;
+ }
+ if(lhs.total != rhs.total){
+ return rhs.total - lhs.total;
+ }
+ if(lhs.leader != rhs.leader){
+ return rhs.leader - lhs.total;
+ }
+
+ if(lhs.name < rhs.name){
+ return -1;
+ }
+ if(lhs.name > rhs.name){
+ return 1;
+ }
+ return 0;
+ });
+
+ window.generalList = generalList;
+ _printGeneralList(generalList);
+
+
+}
+
+function _printGeneralList(generalList){
+ var $generalTable = $('#general_list');
+ $generalTable.empty();
+
+ $.each(generalList, function(idx, general){
+ $generalTable.append(TemplateEngine(templateGeneralRow, general));
+ });
+
+ $generalTable.find('.obj_tooltip').tooltip({
+ title:function(){
+ return $.trim($(this).find('.tooltiptext').html());
+ },
+ html:true
+ });
+ $('#tb_general_list').show();
+}
+
$(function($){
+window.generalList = [];
$.post('j_get_select_npc_token.php').then(function(value){
if(!value.result){
@@ -165,4 +308,20 @@ $('#btn_pick_more').click(function(){
});
});
+$('#btn_load_general_list').click(function(){
+ $.post({
+ url:'j_get_general_list.php',
+ dataType:'json',
+ data:{
+ with_token:true
+ }
+ }).then(function(result){
+ if(!result.result){
+ alert(result.reason);
+ return false;
+ }
+ printGeneralList(result);
+ });
+});
+
});
\ No newline at end of file
diff --git a/hwe/select_npc.php b/hwe/select_npc.php
index fef164d7..70ce5697 100644
--- a/hwe/select_npc.php
+++ b/hwe/select_npc.php
@@ -26,7 +26,7 @@ $nationList = $db->query('SELECT nation,`name`,color,scout,scoutmsg FROM nation
=UniqueConst::$serverName?>: NPC빙의
-
+
=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
=WebUtil::printCSS('../d_shared/common.css')?>
=WebUtil::printCSS('../css/config.css')?>
@@ -72,7 +72,7 @@ echo Json::encode($characterAll);
= $maxgeneral) {
+if ($gencount>= $maxgeneral) {
?>
@@ -103,8 +103,32 @@ history.go(-1);
-
+
+
+
+
+
+ | 얼 굴
+ | 이 름
+ | 연령
+ | 성격
+ | 특기
+ | 레 벨
+ | 국 가
+ | 명 성
+ | 계 급
+ | 관 직
+ | 종능
+ | 통솔
+ | 무력
+ | 지력
+ | 삭턴
+ |
+
+
+
+
=backButton()?>
=banner()?>