From 0b002a8946b8f143ec81b14d44e153194b98eacb Mon Sep 17 00:00:00 2001 From: hide_d Date: Tue, 29 Jan 2019 23:43:37 +0900 Subject: [PATCH 01/13] =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EC=97=94=ED=84=B0?= =?UTF-8?q?=EC=8B=9C=20=EC=9E=85=EB=A0=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/js/board.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hwe/js/board.js b/hwe/js/board.js index a3067127..14c788fc 100644 --- a/hwe/js/board.js +++ b/hwe/js/board.js @@ -121,6 +121,11 @@ function drawArticle(idx, articleObj){ }); $article.find('.submitComment').click(submitComment); + $article.find('.commentText').on('keypress', function (e) { + if(e.which === 13){ + $article.find('.submitComment').click(); + } + }); var $board = $('#board'); @@ -161,7 +166,7 @@ $(function(){ $('textarea.autosize').on('keydown keyup', function(){ resizeTextarea($(this)); }) - + $('#submitArticle').click(submitArticle); loadArticles() From 9228510834cef091c1d9d224b2ffbcb1e4dfb735 Mon Sep 17 00:00:00 2001 From: hide_d Date: Tue, 29 Jan 2019 23:46:47 +0900 Subject: [PATCH 02/13] =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=EB=8F=84=20=ED=88=AC=EB=AA=85=ED=95=98=EA=B2=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/css/board.css | 7 +++++++ hwe/js/board.js | 5 ++++- hwe/t_board.php | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hwe/css/board.css b/hwe/css/board.css index a6884e87..dd83ba73 100644 --- a/hwe/css/board.css +++ b/hwe/css/board.css @@ -46,4 +46,11 @@ .submitComment{ width:100%; +} + +.commentText{ + color:white; + background-color:transparent; + border:none; + padding:1px 5px; } \ No newline at end of file diff --git a/hwe/js/board.js b/hwe/js/board.js index 14c788fc..b5afaccb 100644 --- a/hwe/js/board.js +++ b/hwe/js/board.js @@ -125,7 +125,10 @@ function drawArticle(idx, articleObj){ if(e.which === 13){ $article.find('.submitComment').click(); } - }); + }); + $article.find('.inputCommentHeader').click(function(){ + $article.find('.commentText').focus(); + }) var $board = $('#board'); diff --git a/hwe/t_board.php b/hwe/t_board.php index 978f4e58..2827e080 100644 --- a/hwe/t_board.php +++ b/hwe/t_board.php @@ -100,7 +100,7 @@ var isSecretBoard = ; // -댓글 달기 +댓글 달기 From 0bffdaa5fcd5df3ed4241fb5fcc36745f8976b99 Mon Sep 17 00:00:00 2001 From: hide_d Date: Wed, 30 Jan 2019 00:02:28 +0900 Subject: [PATCH 03/13] =?UTF-8?q?=EC=99=B8=EA=B5=90=20=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80=20=EA=B3=BC=EA=B1=B0=20=EA=B6=8C=ED=95=9C=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/j_msg_get_old.php | 21 ++++++++++++--------- hwe/j_msg_get_recent.php | 4 +--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/hwe/j_msg_get_old.php b/hwe/j_msg_get_old.php index 19439110..1747b285 100644 --- a/hwe/j_msg_get_old.php +++ b/hwe/j_msg_get_old.php @@ -50,20 +50,18 @@ if($delayTime){ } $session->setReadOnly(); -list($generalID, $nationID, $generalName) = DB::db()->queryFirstList( - 'select `no`, `nation`, `name` from `general` where owner = %i', - $userID -); +$me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID); - - -if($nationID === null){ +if($me === null){ Json::die([ 'result'=>false, 'reason'=>'장수가 사망했습니다.' ]); } +[$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']]; +$permission = checkSecretPermission($me); + $result = [ 'private'=>[], 'public'=>[], @@ -104,11 +102,16 @@ else if($reqType == 'national'){ }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, $reqTo, 20)); } else{ - $result['diplomacy'] = array_map(function(Message $msg)use (&$nextSequence){ + $result['diplomacy'] = array_map(function(Message $msg)use (&$nextSequence, $permission){ if($msg->id > $nextSequence){ $nextSequence = $msg->id; } - return $msg->toArray(); + $values = $msg->toArray(); + if($msg->dest->nationID != 0 && $permission < 3){ + $values['text'] = '(외교 메시지입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함 + $values['option']['invalid'] = true; + } + return $values; }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, $reqTo, 20)); } diff --git a/hwe/j_msg_get_recent.php b/hwe/j_msg_get_recent.php index 92ba94b3..5e167c68 100644 --- a/hwe/j_msg_get_recent.php +++ b/hwe/j_msg_get_recent.php @@ -47,9 +47,7 @@ if($me === null){ ]); } -$generalID = $me['no']; -$nationID = $me['nation']; -$generalName = $me['name']; +[$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']]; $permission = checkSecretPermission($me); $result = []; From c9e61d1098a067ded31c69320b6ae0496d68491a Mon Sep 17 00:00:00 2001 From: hide_d Date: Wed, 30 Jan 2019 00:03:36 +0900 Subject: [PATCH 04/13] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/j_msg_get_old.php | 2 +- hwe/j_msg_get_recent.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hwe/j_msg_get_old.php b/hwe/j_msg_get_old.php index 1747b285..2237b71c 100644 --- a/hwe/j_msg_get_old.php +++ b/hwe/j_msg_get_old.php @@ -60,7 +60,7 @@ if($me === null){ } [$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']]; -$permission = checkSecretPermission($me); +$permission = checkSecretPermission($me, false); $result = [ 'private'=>[], diff --git a/hwe/j_msg_get_recent.php b/hwe/j_msg_get_recent.php index 5e167c68..9a22adab 100644 --- a/hwe/j_msg_get_recent.php +++ b/hwe/j_msg_get_recent.php @@ -48,7 +48,7 @@ if($me === null){ } [$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']]; -$permission = checkSecretPermission($me); +$permission = checkSecretPermission($me, false); $result = []; $result['result'] = true; From 39b261b8a0abc1a5043e3cdcb80893793d42b1ac Mon Sep 17 00:00:00 2001 From: hide_d Date: Wed, 30 Jan 2019 00:04:33 +0900 Subject: [PATCH 05/13] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/j_msg_get_old.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwe/j_msg_get_old.php b/hwe/j_msg_get_old.php index 2237b71c..f0662845 100644 --- a/hwe/j_msg_get_old.php +++ b/hwe/j_msg_get_old.php @@ -50,7 +50,7 @@ if($delayTime){ } $session->setReadOnly(); -$me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID); +$me = DB::db()->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID); if($me === null){ Json::die([ From 319545106e71a531175ab921feb119aef2674d24 Mon Sep 17 00:00:00 2001 From: hide_d Date: Wed, 30 Jan 2019 02:54:38 +0900 Subject: [PATCH 06/13] =?UTF-8?q?=EC=99=B8=EA=B5=90=EB=B6=80=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=A1=B0=EA=B1=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/templates/commandButton.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwe/templates/commandButton.php b/hwe/templates/commandButton.php index 3a1d174a..49f2be41 100644 --- a/hwe/templates/commandButton.php +++ b/hwe/templates/commandButton.php @@ -3,7 +3,7 @@ - + From 43a5e47fb3757fabb83dcd0afc182fdf409e621a Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 31 Jan 2019 02:14:10 +0900 Subject: [PATCH 07/13] =?UTF-8?q?=EC=95=A0=EB=8B=88=EC=A7=91=EA=B2=B0=205?= =?UTF-8?q?=EC=B0=A8=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/scenario/scenario_2160.json | 213 ++++++++++++++------------------ src/conv_general_stat.py | 2 + 2 files changed, 96 insertions(+), 119 deletions(-) diff --git a/hwe/scenario/scenario_2160.json b/hwe/scenario/scenario_2160.json index b6c45ee1..4b201a13 100644 --- a/hwe/scenario/scenario_2160.json +++ b/hwe/scenario/scenario_2160.json @@ -3,59 +3,55 @@ "startYear": 180, "history": [ "●180년 1월:【이벤트】제작자: 강서유서.", - "●180년 1월:【가상모드15】애니집결!", - "●180년 1월:【이벤트】애니의 등장인물들이 한곳에서 자웅을 겨룬다!" + "●180년 1월:【가상모드16】애니집결", + "●180년 1월:【이벤트】더더욱 많아진 애니 캐릭터들이 삼국지에서 자웅을 겨룬다" ], "stat": { "total": 220, "min": 40, - "max": 95, - "npcMax": 95 - }, - "iconPath": "애니집결", - "map": { - "mapName": "miniche" + "max": 90 }, + "iconPath": ".", "fiction": 1, "nation":[ ], "diplomacy":[], "general":[ - [0, "기타노시오리", null, 0, null, 96, 92, 93, 0, 160, 333, "왕좌", null], + [0, "기타노시오리", null, 0, null, 96, 92, 93, 0, 160, 333, null, "위압", "언니는 내가 지켜….!"], [0, "카나메 마도카", null, 0, null, 86, 50, 77, 0, 160, 300, null, "집중", "친구들에겐 비밀이야★"], - [0, "토모에 마미", null, 0, null, 70, 74, 60, 0, 165, 240, null, null, "이젠 아무것도 두렵지 않아"], - [0, "아케미 호무라", null, 0, null, 76, 64, 80, 0, 160, 333, null, "집중", "이게바로…사랑이야..♥"], - [0, "사쿠라 쿄코", null, 0, null, 68, 77, 54, 0, 160, 240, null, null], - [0, "미키 사야카", null, 0, null, 80, 77, 62, 0, 160, 240, null, null, "나는 정말…바보"], + [0, "토모에 마미", null, 0, null, 70, 74, 60, 0, 165, 240, null, null, "마법소녀가 마녀가 된다면 죽을수밖에 없잖아..!! 너도! 나도!"], + [0, "아케미 호무라", null, 0, null, 76, 64, 80, 0, 160, 333, null, "집중", "원래 기적이라는건 인간의 생명으로도 사고팔수 있는게 아니야"], + [0, "사쿠라 쿄코", null, 0, null, 68, 77, 54, 0, 160, 240, null, null, "이제 겨우…친구가 되었는데…."], + [0, "미키 사야카", null, 0, null, 80, 77, 62, 0, 160, 240, null, null, "이거 실례네~? 나는 네가 알고 있는 그대로의 나야 전.학.,생~?"], [0, "모모에 나기사", null, 0, null, 72, 80, 70, 0, 160, 240, null, null, "나기사는 단지 치즈가 먹고싶엇던것 뿐이에요!"], - [0, "미쿠니 오리코", null, 0, null, 65, 33, 94, 0, 160, 240, null, null, "이세계에 최악의 절망을."], + [0, "미쿠니 오리코", null, 0, null, 65, 33, 94, 0, 160, 240, null, null, "당신에게 제대로 말하고 싶었어 미안해. 그리고 고마워."], [0, "쿠레 키리카", null, 0, null, 50, 80, 50, 0, 160, 240, null, null], - [0, "치토세 유마", null, 0, null, 69, 74, 70, 0, 160, 333, null, null], + [0, "치토세 유마", null, 0, null, 69, 74, 70, 0, 160, 333, null, null, "언젠가 모두 마녀가 되지만. 그건 지금이 아니야."], [0, "큐베", null, 0, null, 22, 14, 64, 0, 160, 333, null, null, "나랑 계약해서 마녀가 되어줘!"], - [0, "사사", null, 0, null, 64, 78, 72, 0, 160, 333, null, null], - [0, "코이토", null, 0, null, 65, 70, 74, 0, 160, 333, null, null], - [0, "코마키", null, 0, null, 80, 75, 49, 0, 160, 333, null, null], + [0, "유키 사사", null, 0, null, 64, 78, 72, 0, 160, 333, null, null], + [0, "코이토", null, 0, null, 65, 70, 74, 0, 160, 333, null, null, "미쿠니 선배가 증오해야할 적인가 구세주인가 그답이 나오질 않아."], + [0, "코마키", null, 0, null, 80, 75, 49, 0, 160, 333, null, null, "너 말이야 냉담한 주제에 이상한 곳에서 사려 깊구나"], [0, "파브", null, 0, null, 40, 3, 32, 0, 160, 300, null, null, "지금부터 마을의 마법소녀를 반으로 줄여야 한다퐁!"], [0, "스노우화이트", null, 0, null, 86, 84, 79, 0, 160, 333, null, "돌격", "사람들을 도울수 있는게 기뻐서!"], [0, "프흐레", null, 0, null, 84, 25, 100, 0, 160, 333, null, "집중", "괜찮아...... 그리고 데류지 에게 전달해 줘...... 원하는 나의 요구"], [0, "섀도게일", null, 0, null, 52, 75, 74, 0, 160, 333, null, null], - [0, "7753.0", null, 0, null, 64, 19, 84, 0, 160, 333, null, null, "전 인사부문소속의 7753이라고 합니다"], + [0, "나나코상", null, 0, null, 64, 19, 84, 0, 160, 333, null, null, "전 인사부문소속의 7753이라고 합니다"], [0, "인페르노", null, 0, null, 82, 85, 60, 0, 160, 399, null, null, "저녀석..해버려줘,,,,마법소녀…사냥….그럼….가.."], [0, "룰러", null, 0, null, 70, 30, 80, 0, 160, 333, null, null, "룰러의 이름으로 명한다"], [0, "네무링", null, 0, null, 71, 63, 58, 0, 160, 333, null, null, "공주님이 되어버리면 되는거야."], [0, "크랑테일", null, 0, null, 75, 86, 72, 0, 160, 333, null, null, "라즐리느와 페치카가 살려준 난...... 못 죽어"], - [0, "리플", null, 0, null, 59, 81, 70, 0, 160, 299, null, null], + [0, "리플", null, 0, null, 59, 81, 70, 0, 160, 299, null, null, "톱스피드를 그런식으로 말하지마…!!!"], [0, "글라시아네", null, 0, null, 42, 20, 85, 0, 160, 333, null, null, "죽이지마! 죽고싶지 않아!!"], [0, "페치카", null, 0, null, 71, 33, 75, 0, 160, 333, null, null, "그래도…이번엔 누군가를 구할수있어서..행복해요…"], [0, "하무엘", null, 0, null, 73, 23, 65, 0, 160, 333, null, null, "푸크푹이 유적안으로..윽…들어가고…있습니다…"], - [0, "타마", null, 0, null, 76, 88, 27, 0, 160, 300, null, null], + [0, "이누보자키 타마", null, 0, null, 76, 88, 27, 0, 160, 300, null, null, "어디서 부터 잘못된걸까…."], [0, "파르", null, 0, null, 30, 10, 82, 0, 160, 300, null, null, "여기서 벌어진 일들을 모두 마법나라에 고발했퐁!"], [0, "타카마치 나노하", null, 0, null, 85, 105, 85, 0, 160, 300, "패권", "위압", "잠깐 머리좀 식힐까?"], - [0, "페이트", null, 0, null, 75, 89, 73, 0, 160, 300, null, null], + [0, "페이트t,h,t", null, 0, null, 75, 89, 73, 0, 160, 300, null, null], [0, "타카마치 비비오", null, 0, null, 75, 70, 70, 0, 160, 300, null, null, "엄마를 돌려줘!!"], - [0, "린디", null, 0, null, 78, 50, 50, 0, 160, 300, null, null], - [0, "크로노", null, 0, null, 73, 27, 58, 0, 160, 300, null, null], + [0, "린디 하라오운", null, 0, null, 78, 50, 50, 0, 160, 300, null, null], + [0, "크로노 하라오운", null, 0, null, 73, 27, 58, 0, 160, 300, null, null, "시공관리국 소속의 집무관 크로노 하라오운이다!!"], [0, "스바루 나카지마", null, 0, null, 53, 50, 64, 0, 160, 300, null, null], [0, "긴카 나카지마", null, 0, null, 73, 80, 52, 0, 160, 300, null, null], [0, "캐로", null, 0, null, 71, 63, 74, 0, 160, 300, null, null], @@ -79,7 +75,7 @@ [0, "루비아", null, 0, null, 56, 40, 50, 0, 160, 300, null, "상재"], [0, "에미야 시로", null, 0, null, 78, 40, 70, 0, 160, 300, null, null], [0, "타이가", null, 0, null, 55, 50, 40, 0, 160, 300, null, null], - [0, "루비", null, 0, null, 49, 20, 70, 0, 160, 300, null, "척사"], + [0, "루비", null, 0, null, 49, 20, 70, 0, 160, 300, null, null], [0, "사파이어", null, 0, null, 49, 55, 86, 0, 160, 300, null, null], [0, "세라", null, 0, null, 50, 77, 30, 0, 160, 300, null, null], [0, "리즈", null, 0, null, 50, 80, 30, 0, 160, 300, null, null], @@ -89,28 +85,28 @@ [0, "로드 엘멜로이", null, 0, null, 75, 43, 90, 0, 160, 300, null, null, "아니,나는 그의 신하다"], [0, "후루카와 나기사", null, 0, null, 85, 30, 85, 0, 160, 300, null, null, "경단~ 경단~ 경단 경단 경단 경단 대가족~"], [0, "오카자키 토모야", null, 0, null, 85, 84, 75, 0, 160, 300, null, null], - [0, "후지바야시쿄", null, 0, null, 80, 85, 82, 0, 160, 300, null, "무쌍", "요헤이! 또 그러는 거야??"], + [0, "후지바야시쿄", null, 0, null, 80, 85, 82, 0, 160, 300, null, "무쌍"], [0, "후지바야시료", null, 0, null, 74, 30, 77, 0, 160, 300, null, null], [0, "사카가미 토모요", null, 0, null, 80, 92, 87, 0, 160, 300, null, "무쌍"], [0, "히이라기 캇페이", null, 0, null, 75, 55, 18, 0, 160, 300, null, null], [0, "스노하라 요헤이", null, 0, null, 69, 60, 30, 0, 160, 300, null, "견고", "그리고 변기커버!"], [0, "스노하라 메이", null, 0, null, 70, 70, 70, 0, 160, 300, null, null, "저희 못난 오빠떔에 고생이 많으십니다"], - [0, "후루카와 사나에", null, 0, null, 80, 40, 75, 0, 160, 300, null, null], - [0, "후루카와 아키오", null, 0, null, 76, 86, 70, 0, 160, 300, null, "무쌍"], - [0, "오카자키 나오유키", null, 0, null, 70, 20, 55, 0, 160, 300, null, null, "토모야.. 고맙다."], + [0, "후루카와 사나에", null, 0, null, 80, 40, 75, 0, 160, 300, null, null, "제빵은…제빵은…xx하는데나 써야되는군요…!"], + [0, "후루카와 아키오", null, 0, null, 76, 86, 70, 0, 160, 300, null, "무쌍", "꿈을 이뤄라!! 나기사!!!!!!!!!!!"], + [0, "오카자키나오유키", null, 0, null, 70, 20, 55, 0, 160, 300, null, null, "토모야.. 고맙다."], [0, "이치노세 코토미", null, 0, null, 74, 52, 78, 0, 160, 300, null, null], [0, "오카자키 우시오", null, 0, null, 82, 55, 83, 0, 160, 300, null, null, "안녕.. 아빠…"], [0, "니시나 리에", null, 0, null, 77, 37, 82, 0, 160, 300, null, null], [0, "미야자와 유키네", null, 0, null, 78, 30, 85, 0, 160, 300, null, null], - [0, "시마 카츠키", null, 0, null, 72, 49, 63, 0, 160, 300, null, null], - [0, "사가라 미사에", null, 0, null, 85, 87, 85, 0, 160, 300, null, "위압"], - [0, "코즈키 미유", null, 0, null, 77, 73, 64, 0, 160, 300, null, null, "혹시 루에게 고백이라도 한거니?"], - [0, "사이온지 카나타", null, 0, null, 75, 70, 69, 0, 160, 300, null, null], - [0, "사이온지 미우", null, 0, null, 75, 49, 76, 0, 160, 300, null, null, "엄마! 쉿! 쉬잇!!"], - [0, "하나코마치 크리스", null, 0, null, 67, 80, 60, 0, 160, 300, null, "무쌍", "미유랑 카나타가 붙어있어…."], - [0, "하나코마치 모모카", null, 0, null, 80, 60, 55, 0, 160, 300, null, null, "마이 달링! 루!"], + [0, "시마 카츠키", null, 0, null, 72, 49, 63, 0, 160, 300, null, null, "주인님 주인님 지금의 주인님은 그날의 주인님과는 다른 사람이지만 너무나 상냥한 사람이에요"], + [0, "사가라 미사에", null, 0, null, 85, 87, 85, 0, 160, 300, null, "위압", "언제까지나 나를 사랑해줘. 시마 카츠키."], + [0, "코즈키 미유", null, 0, null, 77, 73, 64, 0, 160, 300, null, null, "이제는 알거같아… 자식을 싫어하는 부모는 없다는걸,"], + [0, "사이온지 카나타", null, 0, null, 75, 70, 69, 0, 160, 300, null, null, "내가 먼저 말할께 좋아해 미유."], + [0, "사이온지 미우", null, 0, null, 41, 11, 19, 0, 160, 300, null, null, "엄마도 아빠도 우리들도 모두, 모든것은… 이곳에서 시작됫어."], + [0, "하나코마치크리스", null, 0, null, 67, 90, 60, 0, 160, 300, null, "무쌍", "미유랑 카나타가 붙어있어…."], + [0, "하나코마치모모카", null, 0, null, 80, 60, 55, 0, 160, 300, null, null, "마이 달링! 루!"], [0, "쿠로스 산타", null, 0, null, 54, 10, 30, 0, 160, 300, "유지", null], - [0, "하나코마치 쿠리타", null, 0, null, 46, 14, 10, 0, 160, 300, null, null], + [0, "하나코마치쿠리타", null, 0, null, 46, 14, 10, 0, 160, 300, null, null, "미유씨는 제가 싫으신가요?"], [0, "고니시 아야", null, 0, null, 67, 15, 77, 0, 160, 300, null, null], [0, "루", null, 0, null, 81, 50, 73, 0, 160, 300, null, null, "다아!★"], [0, "완냐", null, 0, null, 69, 48, 75, 0, 160, 300, null, null], @@ -118,11 +114,11 @@ [0, "야보시 세이야", null, 0, null, 70, 50, 70, 0, 160, 300, null, null], [0, "야보시 루이", null, 0, null, 75, 73, 71, 0, 160, 300, null, null], [0, "도리안", null, 0, null, 65, 49, 86, 0, 160, 300, null, "발명"], - [0, "키위", null, 0, null, 66, 33, 70, 0, 160, 300, null, "상재"], + [0, "키위", null, 0, null, 66, 33, 70, 0, 160, 300, null, "상재", "와…왕자님…."], [0, "구아바", null, 0, null, 45, 49, 51, 0, 160, 300, null, null], [0, "히카리가오카", null, 0, null, 70, 49, 77, 0, 160, 300, null, null], [0, "코즈키유우", null, 0, null, 85, 33, 75, 0, 160, 300, null, "발명"], - [0, "코즈키미키", null, 0, null, 88, 33, 80, 0, 160, 300, null, null], + [0, "코즈키미키", null, 0, null, 88, 33, 80, 0, 160, 300, null, null, "그래도 이래뵈도 걱정되서 온거라고..?"], [0, "란", null, 0, null, 80, 72, 40, 0, 160, 300, null, null], [0, "하루네 아이라", null, 0, null, 84, 45, 74, 0, 160, 300, null, null, "오로라~~~~~~~~~라이징~ 드리임!"], [0, "아마미야 리즈무", null, 0, null, 80, 25, 82, 0, 160, 300, null, null], @@ -167,7 +163,7 @@ [0, "모리 란", null, 0, null, 67, 100, 82, 0, 160, 300, null, "돌격"], [0, "스즈키 소노코", null, 0, null, 66, 55, 86, 0, 160, 300, null, "상재"], [0, "쿄고쿠 마코토", null, 0, null, 79, 108, 52, 0, 160, 300, null, "무쌍"], - [0, "진", null, 0, null, 79, 87, 90, 0, 160, 300, null, "돌격"], + [0, "진", null, 0, null, 79, 87, 90, 0, 160, 300, null, "돌격", "시체가 없다는건 죽지 않았다는 거지"], [0, "베르무트", null, 0, null, 75, 67, 96, 0, 160, 300, null, null, "A secret makes a woman woman…"], [0, "키얀티", null, 0, null, 56, 80, 49, 0, 160, 300, null, "저격"], [0, "코른", null, 0, null, 57, 84, 55, 0, 160, 300, null, "저격"], @@ -214,7 +210,7 @@ [0, "후우란", null, 0, null, 82, 30, 90, 0, 160, 300, null, null], [0, "파이렌", null, 0, null, 84, 85, 64, 0, 160, 300, null, "기병"], [0, "파이탄", null, 0, null, 19, 10, 67, 0, 160, 300, null, null], - [0, "쿠탄", null, 0, null, 7, 3, 31, 0, 160, 300, null, null], + [999, "쿠우탄", null, 0, null, 1, 1, 1, 0, 160, 300, null, null], [0, "엔야", null, 0, null, 79, 91, 38, 0, 160, 300, null, null], [0, "키쿄우", null, 0, null, 86, 90, 72, 0, 160, 300, null, null], [0, "유도", null, 0, null, 19, 11, 52, 0, 160, 300, null, null], @@ -223,10 +219,10 @@ [0, "이이셰", null, 0, null, 87, 94, 41, 0, 160, 300, null, null, "지력 36이 지력100을 이겼다!"], [0, "마치", null, 0, null, 77, 23, 94, 0, 160, 300, null, null], [0, "카린", null, 0, null, 96, 75, 92, 0, 160, 300, null, "반계"], - [0, "슌란", null, 0, null, 85, 89, 20, 0, 160, 300, null, "돌격"], + [0, "슌란", null, 0, null, 85, 89, 10, 0, 160, 300, null, "돌격"], [0, "슈란", null, 0, null, 87, 92, 75, 0, 160, 300, null, "저격"], - [0, "케이파", null, 0, null, 51, 14, 95, 0, 160, 300, null, "집중", "아아…카린님…!"], - [0, "곽가린", null, 0, null, 67, 19, 97, 0, 160, 300, null, "신산"], + [0, "케이파", null, 0, null, 62, 14, 95, 0, 160, 300, null, "집중", "아아…카린님…!"], + [0, "곽가린", null, 0, null, 88, 19, 96, 0, 160, 300, null, "신산"], [0, "정욱후우", null, 0, null, 80, 35, 92, 0, 160, 300, null, null, "Zzzzz,,,,"], [0, "나기", null, 0, null, 80, 84, 53, 0, 160, 300, null, null], [0, "사와", null, 0, null, 83, 78, 63, 0, 160, 300, null, null], @@ -291,22 +287,22 @@ [0, "츄츄", null, 0, null, 64, 70, 30, 0, 160, 300, null, null], [0, "모모", null, 0, null, 78, 70, 75, 0, 160, 300, null, null], [0, "쥐선인", null, 0, null, 90, 43, 94, 0, 160, 300, null, "환술", "고양이들에게 속지마라..!"], - [0, "로리 로로나", null, 0, null, 86, 80, 78, 0, 160, 300, null, null, "토토리짱 나 모르겟어? 로로나야 로로나!"], - [0, "토토리", null, 0, null, 85, 86, 93, 0, 160, 300, null, null, "역시.. 키가 작으시네요 쿠데리아상"], - [0, "메루루", null, 0, null, 87, 75, 92, 0, 160, 300, null, null], - [0, "쿠데리아", null, 0, null, 75, 68, 79, 0, 160, 300, null, "상재", "그렇게 부르지 말랬지!!"], - [0, "스테르크", null, 0, null, 80, 102, 81, 0, 160, 300, null, "무쌍", "자 따라해봐 로.로.나"], - [0, "아스트리드", null, 0, null, 39, 78, 96, 0, 160, 300, "유지", null, "난 아스트리드 젝시드. 너의 스승의 스승의 스승이다."], + [0, "로리 로로나", null, 0, null, 85, 65, 70, 0, 160, 300, null, null, "토토리짱 나 모르겟어? 로로나야 로로나!"], + [0, "토토리", null, 0, null, 86, 86, 90, 0, 160, 300, null, null, "역시.. 키가 작으시네요 쿠데리아상"], + [0, "메루루", null, 0, null, 82, 75, 85, 0, 160, 300, null, null], + [0, "쿠데리아", null, 0, null, 75, 81, 79, 0, 160, 300, null, "상재", "그렇게 부르지 말랬지!!"], + [0, "스테르크", null, 0, null, 80, 104, 81, 0, 160, 300, null, "무쌍", "자 따라해봐 로.로.나"], + [0, "아스트리드", null, 0, null, 39, 75, 96, 0, 160, 300, "유지", null, "난 아스트리드 젝시드. 너의 스승의 스승의 스승이다."], [0, "미미", null, 0, null, 78, 82, 76, 0, 160, 300, null, null], [0, "지노 크나프", null, 0, null, 72, 84, 70, 0, 160, 300, null, null], - [0, "에스카", null, 0, null, 84, 75, 91, 0, 160, 300, null, null], + [0, "에스카", null, 0, null, 84, 75, 90, 0, 160, 300, null, null], [0, "로직스", null, 0, null, 80, 85, 79, 0, 160, 300, null, null], - [0, "소피", null, 0, null, 97, 82, 102, 0, 160, 300, null, "집중", "피리스, 연금술 해보지 않을래?"], - [0, "플라흐타", null, 0, null, 84, 72, 106, 0, 160, 300, null, "환술"], - [0, "피리스", null, 0, null, 86, 66, 87, 0, 160, 300, null, "반계", "소피선생님..! 플라흐타상!!"], - [0, "일메리아", null, 0, null, 90, 58, 85, 0, 160, 300, null, null], - [0, "리디", null, 0, null, 77, 79, 82, 0, 160, 300, null, null], - [0, "수르", null, 0, null, 79, 77, 84, 0, 160, 300, null, null], + [0, "소피", null, 0, null, 97, 82, 98, 0, 160, 300, null, "집중", "피리스, 연금술 해보지 않을래?"], + [0, "플라흐타", null, 0, null, 84, 72, 101, 0, 160, 300, null, "환술"], + [0, "피리스", null, 0, null, 86, 66, 85, 0, 160, 300, null, "반계", "소피선생님..! 플라흐타상!!"], + [0, "일메리아", null, 0, null, 88, 58, 87, 0, 160, 300, null, null], + [0, "리디", null, 0, null, 77, 76, 80, 0, 160, 300, null, null], + [0, "수르", null, 0, null, 79, 70, 84, 0, 160, 300, null, null], [0, "리아나", null, 0, null, 72, 78, 67, 0, 160, 300, null, null], [0, "이츠카시도", null, 0, null, 94, 82, 80, 0, 160, 300, null, "환술", "린~~~~네~~~!!!!!!!!!!!!!!!!!!!"], [0, "이츠카코토리", null, 0, null, 87, 91, 78, 0, 160, 300, null, null], @@ -380,7 +376,7 @@ [0, "큐어 하트", null, 0, null, 93, 90, 95, 0, 160, 300, null, "위압"], [0, "큐어 다이아몬드", null, 0, null, 86, 88, 90, 0, 160, 300, null, null], [0, "큐어 로제타", null, 0, null, 80, 80, 85, 0, 160, 300, null, "상재"], - [0, "큐어소드", null, 0, null, 79, 87, 82, 0, 160, 300, null, "착사"], + [0, "큐어소드", null, 0, null, 79, 87, 82, 0, 160, 300, null, "척사"], [0, "큐어에이스", null, 0, null, 75, 83, 77, 0, 160, 300, null, null], [0, "하세가와스바루", null, 0, null, 86, 77, 80, 0, 160, 300, null, null, "정말 초등학생은 최고야!!"], [0, "토모카", null, 0, null, 70, 64, 82, 0, 160, 300, null, null, "잘부탁 드려요 하세가와 코치님!"], @@ -419,23 +415,23 @@ [0, "메어리", null, 0, null, 70, 88, 78, 0, 160, 300, null, null], [0, "유우키유우나", null, 0, null, 88, 91, 78, 0, 160, 300, null, null, "유우키 유우나! 용자부소속이야!"], [0, "토고미모리", null, 0, null, 88, 92, 95, 0, 160, 300, null, null], - [0, "후우", null, 0, null, 85, 90, 80, 0, 160, 300, null, null], - [0, "이츠키", null, 0, null, 87, 80, 70, 0, 160, 300, null, null], + [0, "이누보자키 후우", null, 0, null, 85, 90, 80, 0, 160, 300, null, null], + [0, "이누보자키이츠키", null, 0, null, 87, 80, 70, 0, 160, 300, null, null], [0, "미요시카린", null, 0, null, 85, 88, 80, 0, 160, 300, null, null], [0, "노기소노코", null, 0, null, 81, 81, 78, 0, 160, 300, null, null], [0, "미노와긴", null, 0, null, 83, 87, 67, 0, 160, 300, null, null], [0, "아키선생님", null, 0, null, 85, 39, 88, 0, 160, 300, null, "귀모"], - [0, "신수", null, 0, null, 97, 69, 99, 0, 160, 300, null, "집증"], + [0, "신수", null, 0, null, 97, 69, 99, 0, 160, 300, null, "집중"], [0, "노기와카바", null, 0, null, 87, 85, 79, 0, 160, 300, null, null], [0, "우에사토히나타", null, 0, null, 80, 19, 85, 0, 160, 300, null, "귀모"], - [0, "이요지마안즈", null, 0, null, 76, 88, 86, 0, 160, 295, null, "저격"], - [0, "도이타마코", null, 0, null, 72, 89, 37, 0, 160, 300, null, "견고"], + [0, "이요지마 안즈", null, 0, null, 76, 88, 86, 0, 160, 295, null, "궁병"], + [0, "도이 타마코", null, 0, null, 72, 89, 37, 0, 160, 300, null, "견고"], [0, "코오리치카게", null, 0, null, 67, 90, 83, 0, 160, 300, null, null], [0, "타카시마유우나", null, 0, null, 72, 88, 75, 0, 160, 300, null, null, "군짱, 그러면 안되."], - [0, "우타노", null, 0, null, 71, 83, 67, 0, 160, 300, null, "농업"], + [0, "시라토리우타노", null, 0, null, 71, 83, 67, 0, 160, 300, null, "경작"], [0, "후지모리미토", null, 0, null, 70, 15, 81, 0, 160, 300, null, null], [0, "키리토", null, 0, null, 85, 91, 80, 0, 160, 300, null, "무쌍", "스타…버스트!!!...스트림!!!!!"], - [0, "아스나", null, 0, null, 94, 89, 87, 0, 160, 300, null, "무쌍", "내…이름…어떻게 안거야??"], + [0, "유우키아스나", null, 0, null, 94, 89, 87, 0, 160, 300, null, "무쌍", "내…이름…어떻게 안거야??"], [0, "린드", null, 0, null, 81, 72, 69, 0, 160, 300, null, null, "왜 디어벨 상을 죽게 내버려 뒀어!!"], [0, "키바오", null, 0, null, 88, 75, 80, 0, 160, 300, null, "통찰", "잠껀 기다려 보그레이!"], [0, "에길", null, 0, null, 75, 91, 73, 0, 160, 300, null, "상재", "싸게 사서 싸게 제공하는것이 우리가게의 모토지"], @@ -491,21 +487,21 @@ [0, "키라츠바사", null, 0, null, 87, 33, 72, 0, 160, 300, null, null], [0, "유우키안쥬", null, 0, null, 80, 35, 77, 0, 160, 300, null, null], [0, "토노에레나", null, 0, null, 78, 39, 84, 0, 160, 300, null, null], - [0, "타이요아카리", null, 0, null, 80, 80, 81, 0, 160, 300, null, null, "나 잊지 않을테니까! 후유나에대해 절대로 잊지 않을테니까!"], + [0, "타이요 아카리", null, 0, null, 80, 80, 81, 0, 160, 300, null, null, "나 잊지 않을테니까! 휴우대해 절대로 잊지 않을테니까!"], [0, "츠쿠요미루나", null, 0, null, 72, 53, 82, 0, 160, 300, null, null], [0, "시로카네긴카", null, 0, null, 76, 85, 81, 0, 160, 300, null, "상재"], [0, "호시카와세이라", null, 0, null, 83, 86, 75, 0, 160, 300, null, "저격"], - [0, "신자키휴우나", null, 0, null, 70, 90, 55, 0, 160, 300, null, "신중", "안녕 아카리. 아카리와 만나 행복했어…"], - [0, "에티아", null, 0, null, 80, 72, 71, 0, 160, 300, null, null], - [0, "아라벨", null, 0, null, 54, 60, 92, 0, 160, 300, null, null], + [0, "신자키 휴우나", null, 0, null, 84, 65, 89, 0, 160, 300, null, "신중", "안녕 아카리. 아카리와 만나 행복했어…"], + [0, "에티아 비스콘티", null, 0, null, 80, 72, 71, 0, 160, 300, null, null], + [0, "아라엘웨스트코트", null, 0, null, 54, 60, 92, 0, 160, 300, null, null], [0, "프리실라", null, 0, null, 76, 83, 56, 0, 160, 300, null, null], [0, "멜티나", null, 0, null, 71, 82, 65, 0, 160, 300, null, null], [0, "하나에", null, 0, null, 74, 80, 65, 0, 160, 300, null, null], - [0, "도레미", null, 0, null, 86, 75, 42, 0, 160, 300, null, null, "프리티 윗치 도레미치!"], + [0, "하루카제 도레미", null, 0, null, 86, 75, 42, 0, 160, 300, null, null, "프리티 윗치 도레미치!"], [0, "하즈키", null, 0, null, 78, 61, 80, 0, 160, 300, null, null, "프리티 윗치 하즈키치!"], [0, "아이코", null, 0, null, 78, 61, 75, 0, 160, 300, null, null, "프리티 윗치 아이코치!"], - [0, "폿프", null, 0, null, 70, 70, 79, 0, 160, 300, null, null, "프리티 윗치 폿프치!"], - [0, "세가와온푸", null, 0, null, 82, 60, 88, 0, 160, 300, null, null, "프리티 윗치 온푸치!"], + [0, "하루카제 폿프", null, 0, null, 70, 70, 79, 0, 160, 300, null, null, "프리티 윗치 폿프치!"], + [0, "세가와 온푸", null, 0, null, 82, 60, 88, 0, 160, 300, null, null, "프리티 윗치 온푸치!"], [0, "모모코", null, 0, null, 65, 75, 78, 0, 160, 300, null, null, "프리티 윗치 모모코치!"], [0, "마죠리카", null, 0, null, 86, 33, 83, 0, 160, 300, null, "상재"], [0, "유키선생님", null, 0, null, 86, 67, 89, 0, 160, 300, null, null], @@ -523,7 +519,7 @@ [1, "사토시", null, 0, null, 51, 95, 13, 0, 160, 300, null, null], [0, "타케시", null, 0, null, 80, 32, 92, 0, 160, 300, null, null], [1, "카스미", null, 0, null, 80, 44, 70, 0, 160, 300, null, null], - [0, "그린", null, 0, null, 76, 55, 82, 0, 160, 222, null, null], + [0, "그린", null, 0, null, 22, 22, 22, 0, 160, 222, null, null], [0, "관철", null, 0, null, 79, 33, 83, 0, 160, 300, null, null], [0, "오키드 박사", null, 0, null, 70, 31, 95, 0, 160, 300, null, null], [0, "하루카", null, 0, null, 87, 67, 81, 0, 160, 300, null, null], @@ -540,9 +536,9 @@ [0, "이즈미코시로", null, 0, null, 67, 39, 95, 0, 160, 300, null, null], [0, "타치카와미미", null, 0, null, 81, 62, 60, 0, 160, 300, null, null], [0, "키도죠", null, 0, null, 76, 50, 89, 0, 160, 300, null, "의술"], - [0, "타케루", null, 0, null, 87, 91, 75, 0, 160, 300, null, "위압", "파타몬~~~~!!!!!!!!"], + [0, "타케루", null, 0, null, 87, 91, 75, 0, 160, 300, null, null, "파타몬~~~~!!!!!!!!"], [0, "야가미히카리", null, 0, null, 84, 39, 89, 0, 160, 300, null, null], - [0, "반데몬", null, 0, null, 55, 80, 80, 0, 160, 300, null, null], + [0, "반데몬", null, 0, null, 52, 87, 80, 0, 160, 300, null, null], [0, "다이스케", null, 0, null, 74, 79, 65, 0, 160, 300, null, null], [0, "미야코", null, 0, null, 80, 60, 75, 0, 160, 300, null, null], [0, "히다 이오리", null, 0, null, 70, 64, 80, 0, 160, 300, null, null], @@ -557,11 +553,11 @@ [0, "타카이시유키", null, 0, null, 74, 72, 69, 0, 160, 300, null, null], [0, "미츠루", null, 0, null, 70, 69, 60, 0, 160, 300, null, null], [0, "코지로", null, 0, null, 76, 64, 79, 0, 160, 300, null, "상재"], - [0, "무사시", null, 0, null, 75, 80, 60, 0, 160, 300, null, "무쌍"], + [0, "무사시", null, 0, null, 75, 85, 60, 0, 160, 300, null, "무쌍"], [0, "에비스자와쿠루미", null, 0, null, 72, 88, 59, 0, 160, 300, null, "무쌍"], - [0, "타케야유키", null, 0, null, 73, 39, 29, 0, 160, 300, null, null], + [0, "타케야유키", null, 0, null, 73, 39, 29, 0, 160, 300, null, null, "학교생활부는 언제나 함께야!"], [0, "와카사유리", null, 0, null, 77, 33, 90, 0, 160, 300, null, null], - [0, "이케다미키", null, 0, null, 74, 66, 75, 0, 160, 300, null, null], + [0, "나오키 미키", null, 0, null, 74, 66, 75, 0, 160, 300, null, null], [0, "사쿠라메구미", null, 0, null, 77, 32, 80, 0, 160, 300, null, null, "언니가 아니라 사쿠라 선생님!"], [0, "다이몬마사루", null, 0, null, 56, 99, 42, 0, 160, 300, null, null], [0, "히나모리아무", null, 0, null, 83, 70, 67, 0, 160, 300, null, null, "네거티브 하트 록온! 오픈 하트!!"], @@ -586,8 +582,8 @@ [0, "마키노 루키", null, 0, null, 77, 63, 77, 0, 160, 300, null, null], [0, "리젠랴", null, 0, null, 72, 70, 77, 0, 160, 300, null, null], [0, "리슈촌", null, 0, null, 67, 43, 52, 0, 160, 300, null, null], - [0, "쿠도타이키", null, 0, null, 82, 55, 80, 0, 160, 300, null, null], - [0, "히노모토아카리", null, 0, null, 77, 50, 84, 0, 160, 300, null, null], + [0, "쿠도 타이키", null, 0, null, 82, 55, 80, 0, 160, 300, null, null, "정말 위험한 순간에 네가 근처에 있으면 네가 날 기다려 준다면 나는 무슨일이 있어도 내 곁으로 돌아올게."], + [0, "히노모토 아카리", null, 0, null, 77, 50, 84, 0, 160, 300, null, null, "먹은뒤에 양치질도 안하고 상처가 나도 침만 바르고 놔두거나 감기에 걸려도 금새 밖에 뛰어나가 놀거나…!! 그렇지만… 반드시..! 반드시…돌아와줘..!!"], [0, "유메노우타", null, 0, null, 83, 49, 80, 0, 160, 300, null, null, "코구레!!!(빡침)"], [0, "코구레카게루", null, 0, null, 80, 78, 60, 0, 160, 300, null, null, "널 좋아해 우타."], [0, "히이라기케이이치", null, 0, null, 86, 72, 88, 0, 160, 300, null, null], @@ -622,18 +618,6 @@ [0, "타카미치카", null, 0, null, 80, 40, 76, 0, 160, 300, null, null], [0, "사쿠라우치리코", null, 0, null, 80, 44, 84, 0, 160, 300, null, null], [0, "큐어에코", null, 0, null, 83, 62, 74, 0, 160, 300, null, null], - [0, "큐어러블리", null, 0, null, 80, 83, 47, 0, 160, 300, null, null], - [0, "큐어프린세스", null, 0, null, 76, 85, 55, 0, 160, 300, null, null], - [0, "큐어허니", null, 0, null, 83, 86, 67, 0, 160, 300, null, null], - [0, "큐어포춘", null, 0, null, 82, 90, 80, 0, 160, 300, null, null], - [0, "블루", null, 0, null, 41, 29, 17, 0, 160, 210, null, null], - [0, "큐어텐더", null, 0, null, 82, 94, 77, 0, 160, 300, null, null], - [0, "큐어플로라", null, 0, null, 81, 87, 69, 0, 160, 300, null, null], - [0, "큐어머메이드", null, 0, null, 88, 80, 93, 0, 160, 300, null, null], - [0, "큐어트윙클", null, 0, null, 88, 84, 80, 0, 160, 300, null, null], - [0, "큐어미라클", null, 0, null, 80, 86, 74, 0, 160, 300, null, null], - [0, "큐어매지컬", null, 0, null, 78, 83, 70, 0, 160, 300, null, null], - [0, "큐어펠리체", null, 0, null, 80, 77, 62, 0, 160, 300, null, null], [0, "키쿠오카세이지로", null, 0, null, 83, 42, 78, 0, 160, 300, null, null], [0, "히가타케루", null, 0, null, 70, 27, 90, 0, 160, 300, null, null], [0, "코지코린코", null, 0, null, 75, 40, 89, 0, 160, 300, null, null], @@ -642,14 +626,10 @@ [0, "크라미 첼", null, 0, null, 72, 42, 82, 0, 160, 300, null, null], [0, "필 닐바렌", null, 0, null, 75, 32, 90, 0, 160, 300, null, null], [0, "플럼스토커", null, 0, null, 78, 52, 89, 0, 160, 300, null, null], - [0, "테토", null, 0, null, 75, 39, 95, 0, 160, 300, null, null], - [0, "키리야마카즈오", null, 0, null, 92, 99, 97, 0, 160, 300, "패권", "위압", "앞이 나오면 너말대로 분교로가서 다죽이고 뒤가 나오면…. 이살인게임을 받아들이기로."], - [0, "스기무라히로키", null, 0, null, 85, 90, 50, 0, 160, 300, null, null, "코토히키…넌 내가 지킬거야…"], - [0, "미무라신지", null, 0, null, 89, 35, 93, 0, 160, 300, null, null], - [0, "카와다소교", null, 0, null, 72, 58, 85, 0, 160, 300, null, null, "이 게임은 아직 끝나지 않았어…"], - [0, "아마쿠사카나데", null, 0, null, 80, 20, 75, 0, 160, 300, null, null], + [0, "테토", null, 0, null, 75, 39, 95, 0, 160, 300, null, null, "제 10조! 모두들 사이좋게 플레이 합시다~"], + [0, "아마쿠사카나데", null, 0, null, 80, 20, 75, 0, 160, 300, null, null, "도라쿠짱 날아라~ 날아라~"], [0, "나레이션", null, 0, null, 50, 50, 50, 0, 160, 300, null, null, "에라베!"], - [0, "도라쿠우타케", null, 0, null, 79, 31, 85, 0, 160, 300, null, null], + [0, "도라쿠우타케", null, 0, null, 79, 31, 85, 0, 160, 300, null, null, "너도 참 고생이 많구나.,"], [0, "아마가미소라", null, 0, null, 67, 17, 92, 0, 160, 300, null, null], [0, "코우사카쿄우스케", null, 0, null, 70, 19, 30, 0, 160, 300, null, null], [0, "코우사카키리노", null, 0, null, 60, 60, 19, 0, 160, 300, null, null, "나한테 우리오빠 뺏긴 기분이 어떄?"], @@ -672,7 +652,6 @@ [0, "사카키바라요코", null, 0, null, 85, 35, 77, 0, 160, 300, null, null], [0, "혼다미카", null, 0, null, 83, 40, 80, 0, 160, 300, null, null], [0, "미도리카와리에", null, 0, null, 87, 33, 82, 0, 160, 300, null, null], - [0, "소마미츠코", null, 0, null, 85, 75, 80, 0, 160, 300, null, null, "뭐. 나도 살려둘 마음은 없었으니까."], [0, "코코", null, 0, null, 77, 19, 80, 0, 160, 300, null, null], [0, "너츠", null, 0, null, 77, 32, 85, 0, 160, 300, null, null], [0, "트리오더마이너", null, 0, null, 52, 84, 45, 0, 160, 300, null, null], @@ -694,33 +673,29 @@ [0, "큐어써니", null, 0, null, 80, 80, 72, 0, 160, 300, null, null], [0, "큐어마치", null, 0, null, 83, 82, 75, 0, 160, 300, null, null], [0, "큐어뷰티", null, 0, null, 80, 76, 82, 0, 160, 300, null, null], - [0, "큐어휩", null, 0, null, 82, 78, 50, 0, 160, 300, null, null], - [0, "큐어커스터드", null, 0, null, 74, 65, 83, 0, 160, 300, null, null], - [0, "큐어젤라토", null, 0, null, 82, 78, 83, 0, 160, 300, null, null], - [0, "큐어마카롱", null, 0, null, 83, 76, 89, 0, 160, 300, null, null], - [0, "큐어파르페", null, 0, null, 81, 80, 80, 0, 160, 300, null, null], - [0, "유메노코토", null, 0, null, 81, 39, 80, 0, 160, 300, null, null], - [0, "쿠로미", null, 0, null, 80, 49, 80, 0, 160, 300, null, null], + [0, "유메노코토", null, 0, null, 81, 39, 80, 0, 160, 300, null, null, "혼노~ 스코시~ 이지와루나~ 뎅와노 키리카타오~ 시타노~ 다앗테 큐우니 신켄~나오에데하나시 다스노~ 즈루이~ 스키타요토~ 이와세테아 게나이 다앗테 히카세테아게나이"], + [0, "쿠로미", null, 0, null, 80, 49, 80, 0, 160, 300, null, null, "쿠로미 사건일지 XXX호!!"], [0, "바쿠", null, 0, null, 55, 55, 50, 0, 160, 300, null, null], [0, "쿠로미파이브", null, 0, null, 59, 67, 60, 0, 160, 300, null, null], - [0, "나빛나", null, 0, null, 87, 49, 83, 0, 160, 300, null, null, "혼노~ 스코시~ 이지와루나~ 뎅와노 키리카타오~ 시타노~ 다앗테 큐우니 신켄~나오에데하나시 다스노~ 즈루이~ 스키타요토~ 이와세테아 게나이 다앗테 히카세테아게나이"], - [0, "아이리스", null, 0, null, 83, 50, 86, 0, 160, 300, null, null, "쿠로미 사건일지 XXX호!!"], - [0, "포켓몬 세레나", null, 0, null, 85, 50, 82, 0, 160, 300, null, null], + [0, "나빛나", null, 0, null, 87, 49, 83, 0, 160, 300, null, null, "xxx 멋지게~ 등장~!"], + [0, "아이리스", null, 0, null, 83, 50, 86, 0, 160, 300, null, null, "어서오세요 도전자여. 기다리고 있엇습니다."], + [0, "세레나", null, 0, null, 85, 50, 82, 0, 160, 300, null, null], [0, "시트론", null, 0, null, 79, 41, 92, 0, 160, 300, null, "발명"], [0, "난천", null, 0, null, 84, 53, 87, 0, 160, 300, null, null], [0, "루자미네", null, 0, null, 80, 40, 92, 0, 160, 300, null, null], [0, "릴리에", null, 0, null, 82, 64, 69, 0, 160, 300, null, null], - [0, "나카가와노리코", null, 0, null, 81, 19, 72, 0, 160, 300, null, null], - [0, "오다토시노리", null, 0, null, 56, 40, 81, 0, 160, 300, null, null], - [0, "나나하라슈야", null, 0, null, 85, 55, 74, 0, 160, 300, null, null], [0, "어른로로나", null, 0, null, 92, 89, 94, 0, 160, 300, null, null, "에… 여러분들은???"], [0, "푸크푹", null, 0, null, 92, 79, 80, 0, 160, 300, null, null, "어서와 섀도게일 언니."], [0, "그림하트", null, 0, null, 77, 51, 49, 0, 160, 300, null, null, "목을 쳐라.."], - [0, "마왕팜", null, 0, null, 72, 94, 50, 0, 160, 300, null, null], - [0, "피티프레데리카", null, 0, null, 84, 33, 86, 0, 160, 300, null, null], - [0, "웨딘", null, 0, null, 86, 40, 85, 0, 160, 300, null, null, "마법나라잖아요! 꿈과 판타지잖아요! 당신들, 바보 아녜요? 어떻게 일이 잘 안 풀린다고 남까지 말려들게 해서 몽땅 죽여 버리겠다는 결론을 낼 수 있죠?"] - ], - "general_ex":[ - + [0, "마왕팜", null, 0, null, 72, 94, 50, 0, 160, 300, null, null, "무지개…? 어째서…."], + [0, "피티프레데리카", null, 0, null, 84, 33, 86, 0, 160, 300, null, null, "저같은건 믿을만한 상대가 아니랍니다 분명 불쾌한 기분이 들거에요."], + [0, "웨딘", null, 0, null, 86, 40, 85, 0, 160, 300, null, null, "마법나라잖아요! 꿈과 판타지잖아요! 당신들, 바보 아녜요? 어떻게 일이 잘 안 풀린다고 남까지 말려들게 해서 몽땅 죽여 버리겠다는 결론을 낼 수 있죠? 그런 걸 납득할 사람이 어"], + [0, "벨 크라넬", null, 0, null, 84, 85, 76, 0, 160, 300, null, null], + [0, "아이즈발렌슈타인", null, 0, null, 81, 90, 77, 0, 160, 300, null, null], + [0, "프레이 마이어", null, 0, null, 92, 101, 67, 0, 160, 300, null, "위압", "내기도….들어줬어… 내 친구야 내가 태어난 의미가 여기있어"], + [0, "앤 마이어", null, 0, null, 88, 90, 86, 0, 160, 300, null, null, "그런거 당연하잖아 이세상 그누구보다도 프레이를 좋아해…"], + [0, "릴리루카 아데", null, 0, null, 77, 65, 81, 0, 160, 300, null, null], + [0, "에테몽키", null, 0, null, 78, 51, 91, 0, 160, 300, null, null, "인간이란 정말 대단해 타이치도 그렇지만 항상 계산이상의 무언가를 만들어내지. 녀석들의 배틀은 솔직히 즐거웠어."], + [0, "에테몬", null, 0, null, 65, 81, 55, 0, 160, 300, null, null, "사라지고 싶지 않아!! 난 이세상의 스타라고! 스타는 영원한 거란 말이야~~~~~~~~~~~~~~~~~~~~~~~~~~~~"] ] } \ No newline at end of file diff --git a/src/conv_general_stat.py b/src/conv_general_stat.py index 25db836e..4ba5e7ce 100644 --- a/src/conv_general_stat.py +++ b/src/conv_general_stat.py @@ -184,6 +184,8 @@ def extractGeneralList(generalSheet, nationList={}, nationChiefInfo={}): if len(row) < 13: row.append('') row[12] = row[12].strip() + if len(row[12]) > 99: + row[12] = row[12][:99] if row[12] == '': row.pop() From b800a63bd2f789581f56055a74b69c492e08ed54 Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 31 Jan 2019 02:24:18 +0900 Subject: [PATCH 08/13] =?UTF-8?q?=EA=B3=A0=EB=8C=80=EB=AC=B4=EC=9E=A5=20?= =?UTF-8?q?=EC=8B=A0=EB=8C=80=EB=A5=99=EA=B5=AD=EA=B0=80=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/scenario/scenario_2180.json | 781 ++++++++++++++++++++++++++++++++ 1 file changed, 781 insertions(+) create mode 100644 hwe/scenario/scenario_2180.json diff --git a/hwe/scenario/scenario_2180.json b/hwe/scenario/scenario_2180.json new file mode 100644 index 00000000..dfd4e183 --- /dev/null +++ b/hwe/scenario/scenario_2180.json @@ -0,0 +1,781 @@ +{ + "title": "【가상모드18】 고대무장 신대륙가다!", + "startYear": 180, + "history": [ + "●180년 1월:【가상모드18】고대무장 신대륙가다!", + "●180년 1월:【이벤트】춘추전국+초한지+삼국지+체삼모 모두 모였다! 근데 여긴 어디...?" + ], + "stat": { + "total": 265, + "min": 75, + "max": 95 + }, + "iconPath": ".", + "fiction": 1, + "nation":[ + + ], + "map":{ + "mapName":"ludo_rathowm", + "unitSet":"ludo_rathowm" + }, + "diplomacy":[], + "general":[ + [0, "아회남", null, 0, null, 65, 74, 26, 0, 160, 300, null, null], + [0, "이적", null, 0, null, 40, 24, 84, 0, 160, 300, null, null], + [0, "윤상", null, 0, null, 51, 44, 62, 0, 160, 300, null, null], + [0, "윤묵", null, 0, null, 26, 15, 66, 0, 160, 300, null, null], + [0, "우금", null, 0, null, 85, 78, 78, 0, 160, 300, null, null], + [0, "위관", null, 0, null, 69, 46, 79, 0, 160, 300, null, null], + [0, "원윤", null, 0, null, 32, 14, 39, 0, 160, 300, null, null], + [0, "원희", null, 0, null, 66, 51, 63, 0, 160, 300, null, null], + [0, "염행", null, 0, null, 79, 90, 61, 0, 160, 300, null, null], + [0, "염유", null, 0, null, 71, 57, 71, 0, 160, 300, null, null], + [0, "원술", null, 0, null, 76, 65, 75, 0, 160, 300, null, null], + [0, "원상", null, 0, null, 63, 75, 42, 0, 160, 300, null, null], + [0, "원소", null, 0, null, 89, 69, 78, 0, 160, 300, null, null, "사세삼공의 명문가 하북의 주인"], + [0, "염상", null, 0, null, 40, 27, 71, 0, 160, 300, null, null], + [0, "원담", null, 0, null, 60, 78, 30, 0, 160, 300, null, null], + [0, "염포", null, 0, null, 40, 25, 82, 0, 160, 300, null, null], + [0, "왕위", null, 0, null, 60, 70, 62, 0, 160, 300, null, null], + [0, "왕윤", null, 0, null, 26, 6, 68, 0, 160, 300, null, null], + [0, "왕항", null, 0, null, 76, 60, 61, 0, 160, 300, null, null], + [0, "왕찬", null, 0, null, 15, 3, 79, 0, 160, 300, null, null], + [0, "왕수", null, 0, null, 54, 27, 77, 0, 160, 300, null, null], + [0, "왕숙", null, 0, null, 36, 22, 76, 0, 160, 300, null, null], + [0, "왕준", null, 0, null, 85, 73, 80, 0, 160, 300, null, null], + [0, "왕쌍", null, 0, null, 67, 88, 19, 0, 160, 300, null, null], + [0, "왕창", null, 0, null, 74, 64, 79, 0, 160, 300, null, null], + [0, "왕평", null, 0, null, 86, 81, 76, 0, 160, 300, null, null], + [0, "왕보", null, 0, null, 62, 41, 79, 0, 160, 300, null, null], + [0, "왕문", null, 0, null, 65, 64, 31, 0, 160, 300, null, null], + [0, "왕릉", null, 0, null, 74, 64, 71, 0, 160, 300, null, null], + [0, "왕루", null, 0, null, 28, 30, 79, 0, 160, 300, null, null], + [0, "왕랑", null, 0, null, 47, 35, 79, 0, 160, 300, null, null], + [0, "온회", null, 0, null, 62, 36, 74, 0, 160, 300, null, null], + [0, "하안", null, 0, null, 15, 30, 72, 0, 160, 300, null, null], + [0, "괴월", null, 0, null, 50, 27, 85, 0, 160, 300, null, null], + [0, "괴량", null, 0, null, 68, 33, 88, 0, 160, 300, null, null], + [0, "가화", null, 0, null, 49, 65, 41, 0, 160, 300, null, null], + [0, "가규", null, 0, null, 78, 61, 84, 0, 160, 300, null, null], + [0, "하의", null, 0, null, 56, 69, 36, 0, 160, 300, null, null], + [0, "화흠", null, 0, null, 51, 33, 88, 0, 160, 300, null, null], + [0, "가후", null, 0, null, 71, 40, 98, 0, 160, 300, null, null, "이기기 위한 전략만 내드리겠습니다"], + [0, "곽가", null, 0, null, 70, 41, 97, 0, 160, 300, null, null, "조공을 위한 명이 조금만 더 남았다면..."], + [0, "악환", null, 0, null, 65, 82, 42, 0, 160, 300, null, null], + [0, "곽사", null, 0, null, 64, 76, 13, 0, 160, 300, null, null], + [0, "악취", null, 0, null, 53, 66, 61, 0, 160, 300, null, null], + [0, "곽준", null, 0, null, 73, 66, 73, 0, 160, 300, null, null], + [0, "학소", null, 0, null, 88, 79, 82, 0, 160, 300, null, null], + [0, "악진", null, 0, null, 80, 85, 56, 0, 160, 300, null, null], + [0, "곽도", null, 0, null, 62, 50, 82, 0, 160, 300, null, null], + [0, "학맹", null, 0, null, 62, 67, 42, 0, 160, 300, null, null], + [0, "곽유지", null, 0, null, 28, 9, 69, 0, 160, 300, null, null], + [0, "곽익", null, 0, null, 73, 69, 69, 0, 160, 300, null, null], + [0, "곽회", null, 0, null, 90, 78, 85, 0, 160, 300, null, null], + [0, "하후위", null, 0, null, 71, 73, 49, 0, 160, 300, null, null], + [0, "하후연", null, 0, null, 95, 91, 74, 0, 160, 300, null, null, "궁술로 날 당해낼 자가 있을까?"], + [0, "하후은", null, 0, null, 63, 72, 53, 0, 160, 300, null, null], + [0, "하후화", null, 0, null, 48, 51, 71, 0, 160, 300, null, null], + [0, "하후혜", null, 0, null, 50, 44, 76, 0, 160, 300, null, null], + [0, "하후현", null, 0, null, 54, 39, 76, 0, 160, 300, null, null], + [0, "하후상", null, 0, null, 79, 72, 75, 0, 160, 300, null, null], + [0, "하후덕", null, 0, null, 69, 73, 32, 0, 160, 300, null, null], + [0, "하후돈", null, 0, null, 92, 88, 68, 0, 160, 300, null, null, "여포 네이놈...! (꿀꺽)"], + [0, "하후패", null, 0, null, 79, 85, 77, 0, 160, 300, null, null], + [0, "하후무", null, 0, null, 20, 7, 4, 0, 160, 300, null, null], + [0, "가충", null, 0, null, 54, 31, 89, 0, 160, 300, null, null], + [0, "하진", null, 0, null, 68, 54, 75, 0, 160, 300, null, null], + [0, "화웅", null, 0, null, 78, 90, 55, 0, 160, 300, null, null], + [0, "한윤", null, 0, null, 26, 29, 65, 0, 160, 300, null, null], + [0, "관우", null, 0, null, 93, 99, 79, 0, 160, 300, null, null, "차가 식기 전에 적장의 목을 베어 오겠소!"], + [0, "환계", null, 0, null, 25, 26, 68, 0, 160, 300, null, null], + [0, "관해", null, 0, null, 70, 82, 10, 0, 160, 300, null, null], + [0, "관구검", null, 0, null, 84, 86, 62, 0, 160, 300, null, null], + [0, "한현", null, 0, null, 22, 33, 7, 0, 160, 300, null, null], + [0, "한호", null, 0, null, 73, 72, 84, 0, 160, 300, null, null], + [0, "관흥", null, 0, null, 76, 85, 67, 0, 160, 300, null, null], + [0, "관색", null, 0, null, 74, 86, 56, 0, 160, 300, null, null], + [0, "한수", null, 0, null, 78, 75, 79, 0, 160, 300, null, null], + [0, "한숭", null, 0, null, 25, 15, 71, 0, 160, 300, null, null], + [0, "관정", null, 0, null, 36, 52, 73, 0, 160, 300, null, null], + [0, "한섬", null, 0, null, 69, 66, 36, 0, 160, 300, null, null], + [0, "감택", null, 0, null, 51, 49, 83, 0, 160, 300, null, null], + [0, "한충", null, 0, null, 64, 67, 18, 0, 160, 300, null, null], + [0, "한당", null, 0, null, 76, 85, 61, 0, 160, 300, null, null], + [0, "한덕", null, 0, null, 63, 76, 25, 0, 160, 300, null, null], + [0, "감녕", null, 0, null, 92, 95, 76, 0, 160, 300, null, null], + [0, "한복", null, 0, null, 28, 3, 27, 0, 160, 300, null, null], + [0, "관평", null, 0, null, 78, 82, 72, 0, 160, 300, null, null], + [0, "간옹", null, 0, null, 20, 32, 75, 0, 160, 300, null, null], + [0, "안량", null, 0, null, 88, 96, 43, 0, 160, 300, null, null], + [0, "위연", null, 0, null, 91, 90, 78, 0, 160, 300, null, null], + [0, "국의", null, 0, null, 84, 78, 51, 0, 160, 300, null, null], + [0, "희지재", null, 0, null, 63, 35, 90, 0, 160, 300, null, null], + [0, "위속", null, 0, null, 67, 78, 31, 0, 160, 300, null, null], + [0, "위유", null, 0, null, 46, 29, 74, 0, 160, 300, null, null], + [0, "우금2", null, 0, null, 72, 79, 38, 0, 160, 300, null, null], + [0, "우보", null, 0, null, 38, 60, 21, 0, 160, 300, null, null], + [0, "강유", null, 0, null, 92, 88, 91, 0, 160, 300, null, null], + [0, "공지", null, 0, null, 43, 53, 62, 0, 160, 300, null, null], + [0, "교유", null, 0, null, 64, 69, 38, 0, 160, 300, null, null], + [0, "공도", null, 0, null, 59, 70, 23, 0, 160, 300, null, null], + [0, "허공", null, 0, null, 44, 66, 64, 0, 160, 300, null, null], + [0, "허정", null, 0, null, 23, 5, 68, 0, 160, 300, null, null], + [0, "허저", null, 0, null, 74, 97, 36, 0, 160, 300, null, null], + [0, "허유", null, 0, null, 36, 21, 80, 0, 160, 300, null, null], + [0, "기령", null, 0, null, 85, 84, 51, 0, 160, 300, null, null], + [0, "김의", null, 0, null, 32, 38, 65, 0, 160, 300, null, null], + [0, "김배삼결", null, 0, null, 64, 76, 19, 0, 160, 300, null, null], + [0, "김선", null, 0, null, 52, 68, 13, 0, 160, 300, null, null], + [0, "우번", null, 0, null, 46, 46, 87, 0, 160, 300, null, null], + [0, "형도영", null, 0, null, 69, 79, 41, 0, 160, 300, null, null], + [0, "엄안", null, 0, null, 82, 83, 72, 0, 160, 300, null, null], + [0, "엄망", null, 0, null, 68, 71, 40, 0, 160, 300, null, null], + [0, "엄준", null, 0, null, 41, 12, 71, 0, 160, 300, null, null], + [0, "엄정", null, 0, null, 50, 55, 39, 0, 160, 300, null, null], + [0, "엄백호", null, 0, null, 67, 70, 42, 0, 160, 300, null, null], + [0, "엄여", null, 0, null, 61, 78, 44, 0, 160, 300, null, null], + [0, "오의", null, 0, null, 79, 73, 70, 0, 160, 300, null, null], + [0, "황개", null, 0, null, 80, 86, 70, 0, 160, 300, null, null], + [0, "고간", null, 0, null, 74, 56, 48, 0, 160, 300, null, null], + [0, "황권", null, 0, null, 75, 59, 88, 0, 160, 300, null, null], + [0, "고유", null, 0, null, 57, 43, 72, 0, 160, 300, null, null], + [0, "고순", null, 0, null, 86, 89, 60, 0, 160, 300, null, null], + [0, "고상", null, 0, null, 68, 68, 53, 0, 160, 300, null, null], + [0, "고승", null, 0, null, 67, 73, 41, 0, 160, 300, null, null], + [0, "후성", null, 0, null, 74, 75, 68, 0, 160, 300, null, null], + [0, "후선", null, 0, null, 63, 66, 34, 0, 160, 300, null, null], + [0, "황조", null, 0, null, 81, 66, 62, 0, 160, 300, null, null], + [0, "공손월", null, 0, null, 74, 72, 47, 0, 160, 300, null, null], + [0, "공손연", null, 0, null, 65, 70, 60, 0, 160, 300, null, null], + [0, "공손공", null, 0, null, 39, 17, 69, 0, 160, 300, null, null], + [0, "공손강", null, 0, null, 72, 66, 65, 0, 160, 300, null, null], + [0, "공손찬", null, 0, null, 86, 82, 75, 0, 160, 300, null, null], + [0, "공손속", null, 0, null, 63, 68, 57, 0, 160, 300, null, null], + [0, "공손도", null, 0, null, 67, 71, 66, 0, 160, 300, null, null], + [0, "공손범", null, 0, null, 73, 69, 66, 0, 160, 300, null, null], + [0, "황충", null, 0, null, 88, 96, 65, 0, 160, 300, null, null], + [0, "고정", null, 0, null, 55, 63, 43, 0, 160, 300, null, null], + [0, "고패", null, 0, null, 66, 61, 69, 0, 160, 300, null, null], + [0, "황보숭", null, 0, null, 91, 61, 82, 0, 160, 300, null, null], + [0, "공융", null, 0, null, 30, 5, 73, 0, 160, 300, null, null], + [0, "고람", null, 0, null, 76, 82, 68, 0, 160, 300, null, null], + [0, "오경", null, 0, null, 69, 66, 52, 0, 160, 300, null, null], + [0, "호거아", null, 0, null, 70, 82, 41, 0, 160, 300, null, null], + [0, "호진", null, 0, null, 65, 74, 12, 0, 160, 300, null, null], + [0, "올돌골", null, 0, null, 79, 86, 11, 0, 160, 300, null, null], + [0, "호반", null, 0, null, 55, 55, 59, 0, 160, 300, null, null], + [0, "오반", null, 0, null, 74, 71, 59, 0, 160, 300, null, null], + [0, "고옹", null, 0, null, 52, 18, 81, 0, 160, 300, null, null], + [0, "오란", null, 0, null, 68, 80, 35, 0, 160, 300, null, null], + [0, "채화", null, 0, null, 39, 50, 1, 0, 160, 300, null, null], + [0, "채중", null, 0, null, 40, 54, 2, 0, 160, 300, null, null], + [0, "채모", null, 0, null, 70, 70, 77, 0, 160, 300, null, null], + [0, "착융", null, 0, null, 60, 69, 38, 0, 160, 300, null, null], + [0, "사마의", null, 0, null, 99, 63, 98, 0, 160, 300, null, null], + [0, "사마염", null, 0, null, 69, 59, 77, 0, 160, 300, null, null], + [0, "사마사", null, 0, null, 84, 64, 89, 0, 160, 300, null, null], + [0, "사마소", null, 0, null, 85, 57, 88, 0, 160, 300, null, null], + [0, "사마부", null, 0, null, 70, 37, 77, 0, 160, 300, null, null], + [0, "사마랑", null, 0, null, 20, 21, 72, 0, 160, 300, null, null], + [0, "사마가", null, 0, null, 66, 84, 25, 0, 160, 300, null, null], + [0, "주흔", null, 0, null, 65, 62, 73, 0, 160, 300, null, null], + [0, "주앙", null, 0, null, 74, 65, 65, 0, 160, 300, null, null], + [0, "주지", null, 0, null, 73, 85, 41, 0, 160, 300, null, null], + [0, "주창", null, 0, null, 68, 77, 42, 0, 160, 300, null, null], + [0, "주태", null, 0, null, 84, 91, 48, 0, 160, 300, null, null], + [0, "주방", null, 0, null, 52, 41, 80, 0, 160, 300, null, null], + [0, "주유", null, 0, null, 96, 75, 97, 0, 160, 300, null, null, "미주랑 주유 공근이 왔습니다"], + [0, "주환", null, 0, null, 87, 84, 77, 0, 160, 300, null, null], + [0, "주거", null, 0, null, 77, 57, 72, 0, 160, 300, null, null], + [0, "축융", null, 0, null, 72, 75, 35, 0, 160, 300, null, null], + [0, "주준", null, 0, null, 89, 65, 76, 0, 160, 300, null, null], + [0, "주연", null, 0, null, 86, 75, 74, 0, 160, 300, null, null], + [0, "주치", null, 0, null, 71, 56, 72, 0, 160, 300, null, null], + [0, "주포", null, 0, null, 68, 73, 34, 0, 160, 300, null, null], + [0, "주령", null, 0, null, 78, 73, 67, 0, 160, 300, null, null], + [0, "순욱", null, 0, null, 80, 38, 97, 0, 160, 300, null, null], + [0, "순우경", null, 0, null, 78, 66, 29, 0, 160, 300, null, null], + [0, "순심", null, 0, null, 45, 25, 78, 0, 160, 300, null, null], + [0, "순유", null, 0, null, 81, 35, 95, 0, 160, 300, null, null], + [0, "장완", null, 0, null, 78, 34, 89, 0, 160, 300, null, null], + [0, "종회", null, 0, null, 88, 62, 93, 0, 160, 300, null, null], + [0, "장간", null, 0, null, 19, 6, 66, 0, 160, 300, null, null], + [0, "장의거", null, 0, null, 71, 58, 59, 0, 160, 300, null, null], + [0, "장흠", null, 0, null, 78, 85, 54, 0, 160, 300, null, null], + [0, "위나라장제", null, 0, null, 62, 43, 85, 0, 160, 300, null, null], + [0, "초주", null, 0, null, 16, 3, 67, 0, 160, 300, null, null], + [0, "초촉", null, 0, null, 65, 76, 33, 0, 160, 300, null, null], + [0, "향총", null, 0, null, 76, 61, 77, 0, 160, 300, null, null], + [0, "종요", null, 0, null, 79, 24, 90, 0, 160, 300, null, null], + [0, "향랑", null, 0, null, 28, 18, 74, 0, 160, 300, null, null], + [0, "서영", null, 0, null, 92, 80, 62, 0, 160, 300, null, null], + [0, "제갈각", null, 0, null, 72, 47, 90, 0, 160, 300, null, null], + [0, "제갈근", null, 0, null, 75, 34, 85, 0, 160, 300, null, null], + [0, "제갈균", null, 0, null, 29, 25, 52, 0, 160, 300, null, null], + [0, "제갈탄", null, 0, null, 72, 72, 76, 0, 160, 300, null, null], + [0, "제갈량", null, 0, null, 98, 38, 100, 0, 160, 300, null, null], + [0, "서황", null, 0, null, 95, 94, 78, 0, 160, 300, null, null], + [0, "서서", null, 0, null, 85, 64, 93, 0, 160, 300, null, null], + [0, "서성", null, 0, null, 86, 81, 78, 0, 160, 300, null, null], + [0, "서막", null, 0, null, 55, 32, 68, 0, 160, 300, null, null], + [0, "신의", null, 0, null, 55, 59, 60, 0, 160, 300, null, null], + [0, "신탐", null, 0, null, 56, 62, 54, 0, 160, 300, null, null], + [0, "심배", null, 0, null, 80, 60, 84, 0, 160, 300, null, null], + [0, "신비", null, 0, null, 42, 24, 79, 0, 160, 300, null, null], + [0, "신평", null, 0, null, 69, 43, 77, 0, 160, 300, null, null], + [0, "진복", null, 0, null, 31, 7, 73, 0, 160, 300, null, null], + [0, "진랑", null, 0, null, 58, 70, 35, 0, 160, 300, null, null], + [0, "휴고", null, 0, null, 63, 71, 38, 0, 160, 300, null, null], + [0, "추단", null, 0, null, 61, 64, 34, 0, 160, 300, null, null], + [0, "성의", null, 0, null, 74, 72, 41, 0, 160, 300, null, null], + [0, "성공영", null, 0, null, 73, 71, 80, 0, 160, 300, null, null], + [0, "설종", null, 0, null, 34, 16, 73, 0, 160, 300, null, null], + [0, "단경", null, 0, null, 71, 68, 43, 0, 160, 300, null, null], + [0, "전종", null, 0, null, 78, 72, 75, 0, 160, 300, null, null], + [0, "조예", null, 0, null, 72, 52, 82, 0, 160, 300, null, null], + [0, "조휴", null, 0, null, 80, 78, 62, 0, 160, 300, null, null], + [0, "송헌", null, 0, null, 68, 77, 38, 0, 160, 300, null, null], + [0, "조앙", null, 0, null, 78, 67, 69, 0, 160, 300, null, null], + [0, "조홍", null, 0, null, 84, 77, 55, 0, 160, 300, null, null], + [0, "조순", null, 0, null, 85, 81, 63, 0, 160, 300, null, null], + [0, "조창", null, 0, null, 86, 91, 40, 0, 160, 300, null, null], + [0, "조식", null, 0, null, 45, 22, 86, 0, 160, 300, null, null], + [0, "조진", null, 0, null, 86, 74, 70, 0, 160, 300, null, null], + [0, "조인", null, 0, null, 94, 89, 72, 0, 160, 300, null, null], + [0, "조성", null, 0, null, 54, 74, 38, 0, 160, 300, null, null], + [0, "조조", null, 0, null, 100, 72, 94, 0, 160, 300, null, null, "미망인이 더 매력적이란 말이야... 후후"], + [0, "조충", null, 0, null, 43, 21, 74, 0, 160, 300, null, null], + [0, "장패", null, 0, null, 78, 86, 53, 0, 160, 300, null, null], + [0, "조비", null, 0, null, 75, 71, 87, 0, 160, 300, null, null, "새로운 왕조를 열겠다..."], + [0, "조표", null, 0, null, 54, 69, 32, 0, 160, 300, null, null], + [0, "저수", null, 0, null, 85, 46, 95, 0, 160, 300, null, null], + [0, "소비", null, 0, null, 69, 63, 66, 0, 160, 300, null, null], + [0, "조무", null, 0, null, 70, 71, 66, 0, 160, 300, null, null], + [0, "손환", null, 0, null, 82, 73, 76, 0, 160, 300, null, null], + [0, "손견", null, 0, null, 94, 95, 79, 0, 160, 300, null, null, "강동의 호랑이, 손문대다!"], + [0, "손건", null, 0, null, 44, 33, 79, 0, 160, 300, null, null], + [0, "손권", null, 0, null, 84, 73, 80, 0, 160, 300, null, null], + [0, "손교", null, 0, null, 77, 72, 67, 0, 160, 300, null, null], + [0, "손책", null, 0, null, 93, 94, 74, 0, 160, 300, null, null], + [0, "손소", null, 0, null, 82, 79, 76, 0, 160, 300, null, null], + [0, "손정", null, 0, null, 66, 53, 73, 0, 160, 300, null, null], + [0, "손중", null, 0, null, 62, 71, 36, 0, 160, 300, null, null], + [0, "손등", null, 0, null, 62, 37, 79, 0, 160, 300, null, null], + [0, "손유", null, 0, null, 77, 70, 68, 0, 160, 300, null, null], + [0, "손익", null, 0, null, 67, 83, 27, 0, 160, 300, null, null], + [0, "손례", null, 0, null, 78, 81, 67, 0, 160, 300, null, null], + [0, "태사자", null, 0, null, 93, 94, 72, 0, 160, 300, null, null], + [0, "대래동주", null, 0, null, 51, 53, 54, 0, 160, 300, null, null], + [0, "대릉", null, 0, null, 70, 75, 39, 0, 160, 300, null, null], + [0, "타사대왕", null, 0, null, 62, 59, 70, 0, 160, 300, null, null], + [0, "담웅", null, 0, null, 58, 73, 14, 0, 160, 300, null, null], + [0, "장윤", null, 0, null, 72, 67, 42, 0, 160, 300, null, null], + [0, "조운", null, 0, null, 89, 96, 75, 0, 160, 300, null, null, "상산의 조운 자룡, 길을 뚫겠다!"], + [0, "장위", null, 0, null, 74, 66, 45, 0, 160, 300, null, null], + [0, "장영", null, 0, null, 75, 74, 41, 0, 160, 300, null, null], + [0, "장연", null, 0, null, 76, 81, 57, 0, 160, 300, null, null], + [0, "장횡", null, 0, null, 59, 70, 23, 0, 160, 300, null, null], + [0, "장온", null, 0, null, 32, 10, 72, 0, 160, 300, null, null], + [0, "장개", null, 0, null, 34, 66, 8, 0, 160, 300, null, null], + [0, "장각", null, 0, null, 87, 35, 90, 0, 160, 300, null, null], + [0, "장기", null, 0, null, 74, 35, 76, 0, 160, 300, null, null], + [0, "장의", null, 0, null, 79, 72, 75, 0, 160, 300, null, null], + [0, "장훈", null, 0, null, 72, 68, 41, 0, 160, 300, null, null], + [0, "장굉", null, 0, null, 24, 22, 86, 0, 160, 300, null, null], + [0, "장합", null, 0, null, 92, 89, 73, 0, 160, 300, null, null], + [0, "조홍2", null, 0, null, 66, 72, 28, 0, 160, 300, null, null], + [0, "장제2", null, 0, null, 70, 66, 55, 0, 160, 300, null, null], + [0, "장수", null, 0, null, 80, 73, 64, 0, 160, 300, null, null], + [0, "장소", null, 0, null, 41, 13, 87, 0, 160, 300, null, null], + [0, "장송", null, 0, null, 40, 6, 85, 0, 160, 300, null, null], + [0, "장임", null, 0, null, 85, 84, 78, 0, 160, 300, null, null], + [0, "장제", null, 0, null, 67, 43, 80, 0, 160, 300, null, null], + [0, "장막", null, 0, null, 52, 53, 71, 0, 160, 300, null, null], + [0, "조범", null, 0, null, 28, 21, 32, 0, 160, 300, null, null], + [0, "장비", null, 0, null, 87, 98, 52, 0, 160, 300, null, null, "만인적 연인 장비가 왔다 목숨을 내놓거라!"], + [0, "장포", null, 0, null, 78, 84, 48, 0, 160, 300, null, null], + [0, "장보", null, 0, null, 83, 71, 81, 0, 160, 300, null, null], + [0, "장만성", null, 0, null, 75, 81, 45, 0, 160, 300, null, null], + [0, "장양", null, 0, null, 72, 70, 66, 0, 160, 300, null, null], + [0, "장익", null, 0, null, 75, 74, 76, 0, 160, 300, null, null], + [0, "장료", null, 0, null, 95, 94, 78, 0, 160, 300, null, null], + [0, "장량", null, 0, null, 78, 80, 74, 0, 160, 300, null, null], + [0, "조루", null, 0, null, 70, 43, 68, 0, 160, 300, null, null], + [0, "장로", null, 0, null, 65, 42, 81, 0, 160, 300, null, null], + [0, "진횡", null, 0, null, 64, 63, 26, 0, 160, 300, null, null], + [0, "진응", null, 0, null, 62, 72, 45, 0, 160, 300, null, null], + [0, "진기", null, 0, null, 58, 65, 43, 0, 160, 300, null, null], + [0, "진궁", null, 0, null, 84, 55, 90, 0, 160, 300, null, null], + [0, "진교", null, 0, null, 61, 27, 77, 0, 160, 300, null, null], + [0, "진군", null, 0, null, 32, 14, 75, 0, 160, 300, null, null], + [0, "진규", null, 0, null, 30, 4, 82, 0, 160, 300, null, null], + [0, "진식", null, 0, null, 70, 71, 25, 0, 160, 300, null, null], + [0, "진진", null, 0, null, 46, 46, 69, 0, 160, 300, null, null], + [0, "진태", null, 0, null, 86, 77, 89, 0, 160, 300, null, null], + [0, "진등", null, 0, null, 79, 64, 81, 0, 160, 300, null, null], + [0, "진도", null, 0, null, 82, 78, 67, 0, 160, 300, null, null], + [0, "진무", null, 0, null, 76, 87, 43, 0, 160, 300, null, null], + [0, "진란", null, 0, null, 66, 69, 40, 0, 160, 300, null, null], + [0, "진림", null, 0, null, 25, 9, 75, 0, 160, 300, null, null], + [0, "정욱", null, 0, null, 76, 49, 94, 0, 160, 300, null, null], + [0, "정원지", null, 0, null, 69, 74, 17, 0, 160, 300, null, null], + [0, "정은", null, 0, null, 69, 73, 40, 0, 160, 300, null, null], + [0, "정원", null, 0, null, 70, 76, 35, 0, 160, 300, null, null], + [0, "정보", null, 0, null, 84, 79, 79, 0, 160, 300, null, null], + [0, "정봉", null, 0, null, 81, 92, 75, 0, 160, 300, null, null], + [0, "전위", null, 0, null, 79, 98, 42, 0, 160, 300, null, null], + [0, "전해", null, 0, null, 68, 65, 58, 0, 160, 300, null, null], + [0, "전주", null, 0, null, 66, 66, 73, 0, 160, 300, null, null], + [0, "전풍", null, 0, null, 82, 43, 96, 0, 160, 300, null, null], + [0, "전예", null, 0, null, 90, 85, 86, 0, 160, 300, null, null], + [0, "동윤", null, 0, null, 47, 28, 79, 0, 160, 300, null, null], + [0, "동화", null, 0, null, 57, 34, 75, 0, 160, 300, null, null], + [0, "등애", null, 0, null, 93, 82, 92, 0, 160, 300, null, null], + [0, "도겸", null, 0, null, 51, 27, 64, 0, 160, 300, null, null], + [0, "등현", null, 0, null, 61, 73, 45, 0, 160, 300, null, null], + [0, "등지", null, 0, null, 73, 52, 81, 0, 160, 300, null, null], + [0, "동습", null, 0, null, 72, 85, 50, 0, 160, 300, null, null], + [0, "동승", null, 0, null, 56, 53, 65, 0, 160, 300, null, null], + [0, "동소", null, 0, null, 34, 25, 80, 0, 160, 300, null, null], + [0, "동탁", null, 0, null, 91, 87, 72, 0, 160, 300, null, null], + [0, "동도나", null, 0, null, 68, 73, 31, 0, 160, 300, null, null], + [0, "동민", null, 0, null, 49, 60, 25, 0, 160, 300, null, null], + [0, "등무", null, 0, null, 61, 75, 29, 0, 160, 300, null, null], + [0, "두기", null, 0, null, 74, 43, 78, 0, 160, 300, null, null], + [0, "두예", null, 0, null, 94, 63, 91, 0, 160, 300, null, null], + [0, "배원소", null, 0, null, 49, 65, 25, 0, 160, 300, null, null], + [0, "마완", null, 0, null, 71, 74, 16, 0, 160, 300, null, null], + [0, "마휴", null, 0, null, 68, 73, 48, 0, 160, 300, null, null], + [0, "파재", null, 0, null, 74, 74, 55, 0, 160, 300, null, null], + [0, "마준", null, 0, null, 38, 52, 31, 0, 160, 300, null, null], + [0, "마속", null, 0, null, 61, 67, 84, 0, 160, 300, null, null], + [0, "마대", null, 0, null, 79, 85, 62, 0, 160, 300, null, null], + [0, "마충", null, 0, null, 78, 72, 68, 0, 160, 300, null, null], + [0, "마초", null, 0, null, 86, 97, 44, 0, 160, 300, null, null, "서량의 금마초 나가신다!"], + [0, "마철", null, 0, null, 70, 62, 58, 0, 160, 300, null, null], + [0, "마등", null, 0, null, 85, 80, 52, 0, 160, 300, null, null], + [0, "마량", null, 0, null, 53, 23, 85, 0, 160, 300, null, null], + [0, "반준", null, 0, null, 61, 46, 82, 0, 160, 300, null, null], + [0, "반장", null, 0, null, 76, 80, 69, 0, 160, 300, null, null], + [0, "번조", null, 0, null, 66, 73, 31, 0, 160, 300, null, null], + [0, "번능", null, 0, null, 69, 61, 36, 0, 160, 300, null, null], + [0, "반봉", null, 0, null, 56, 77, 4, 0, 160, 300, null, null], + [0, "비의", null, 0, null, 82, 56, 88, 0, 160, 300, null, null], + [0, "비연", null, 0, null, 60, 66, 21, 0, 160, 300, null, null], + [0, "비시", null, 0, null, 18, 28, 65, 0, 160, 300, null, null], + [0, "미축", null, 0, null, 33, 29, 78, 0, 160, 300, null, null], + [0, "미방", null, 0, null, 54, 61, 32, 0, 160, 300, null, null], + [0, "비요", null, 0, null, 70, 66, 73, 0, 160, 300, null, null], + [0, "무안국", null, 0, null, 70, 79, 34, 0, 160, 300, null, null], + [0, "풍습", null, 0, null, 72, 71, 39, 0, 160, 300, null, null], + [0, "부사인", null, 0, null, 46, 63, 37, 0, 160, 300, null, null], + [0, "부첨", null, 0, null, 73, 85, 76, 0, 160, 300, null, null], + [0, "부손", null, 0, null, 29, 13, 70, 0, 160, 300, null, null], + [0, "문앙", null, 0, null, 76, 96, 65, 0, 160, 300, null, null], + [0, "문흠", null, 0, null, 74, 80, 43, 0, 160, 300, null, null], + [0, "문추", null, 0, null, 87, 95, 49, 0, 160, 300, null, null], + [0, "문빙", null, 0, null, 88, 85, 69, 0, 160, 300, null, null], + [0, "변희", null, 0, null, 56, 70, 62, 0, 160, 300, null, null], + [0, "망아장", null, 0, null, 45, 79, 3, 0, 160, 300, null, null], + [0, "봉기", null, 0, null, 56, 48, 84, 0, 160, 300, null, null], + [0, "방희", null, 0, null, 60, 38, 69, 0, 160, 300, null, null], + [0, "법정", null, 0, null, 82, 47, 94, 0, 160, 300, null, null], + [0, "방통", null, 0, null, 79, 34, 97, 0, 160, 300, null, null], + [0, "방덕", null, 0, null, 89, 94, 72, 0, 160, 300, null, null], + [0, "포륭", null, 0, null, 58, 76, 49, 0, 160, 300, null, null], + [0, "목순", null, 0, null, 52, 77, 11, 0, 160, 300, null, null], + [0, "목록대왕", null, 0, null, 65, 71, 39, 0, 160, 300, null, null], + [0, "보즐", null, 0, null, 83, 51, 84, 0, 160, 300, null, null], + [0, "만총", null, 0, null, 88, 64, 87, 0, 160, 300, null, null], + [0, "모개", null, 0, null, 63, 39, 60, 0, 160, 300, null, null], + [0, "맹획", null, 0, null, 81, 88, 42, 0, 160, 300, null, null], + [0, "맹체", null, 0, null, 75, 73, 75, 0, 160, 300, null, null], + [0, "맹우", null, 0, null, 50, 68, 22, 0, 160, 300, null, null], + [0, "유섭", null, 0, null, 62, 79, 24, 0, 160, 300, null, null], + [0, "양부", null, 0, null, 62, 68, 68, 0, 160, 300, null, null], + [0, "옹개", null, 0, null, 73, 75, 57, 0, 160, 300, null, null], + [0, "양의", null, 0, null, 68, 40, 82, 0, 160, 300, null, null], + [0, "양호", null, 0, null, 92, 69, 90, 0, 160, 300, null, null], + [0, "양홍", null, 0, null, 33, 15, 77, 0, 160, 300, null, null], + [0, "양앙", null, 0, null, 68, 72, 38, 0, 160, 300, null, null], + [0, "양추", null, 0, null, 52, 65, 40, 0, 160, 300, null, null], + [0, "양수", null, 0, null, 46, 23, 83, 0, 160, 300, null, null], + [0, "양추2", null, 0, null, 67, 64, 60, 0, 160, 300, null, null], + [0, "양송", null, 0, null, 17, 5, 28, 0, 160, 300, null, null], + [0, "양임", null, 0, null, 70, 78, 56, 0, 160, 300, null, null], + [0, "양조", null, 0, null, 53, 61, 36, 0, 160, 300, null, null], + [0, "양백", null, 0, null, 44, 45, 19, 0, 160, 300, null, null], + [0, "양부2", null, 0, null, 67, 50, 83, 0, 160, 300, null, null], + [0, "양봉", null, 0, null, 66, 65, 31, 0, 160, 300, null, null], + [0, "양봉2", null, 0, null, 54, 62, 53, 0, 160, 300, null, null], + [0, "뇌동", null, 0, null, 69, 78, 51, 0, 160, 300, null, null], + [0, "뇌박", null, 0, null, 62, 70, 36, 0, 160, 300, null, null], + [0, "이이", null, 0, null, 63, 77, 19, 0, 160, 300, null, null], + [0, "이회", null, 0, null, 79, 65, 79, 0, 160, 300, null, null], + [0, "이각", null, 0, null, 69, 72, 24, 0, 160, 300, null, null], + [0, "육항", null, 0, null, 93, 63, 92, 0, 160, 300, null, null], + [0, "육적", null, 0, null, 20, 7, 72, 0, 160, 300, null, null], + [0, "육손", null, 0, null, 95, 71, 96, 0, 160, 300, null, null], + [0, "이엄", null, 0, null, 83, 84, 76, 0, 160, 300, null, null], + [0, "이유", null, 0, null, 61, 26, 93, 0, 160, 300, null, null], + [0, "이숙", null, 0, null, 46, 69, 61, 0, 160, 300, null, null], + [0, "이통", null, 0, null, 73, 81, 62, 0, 160, 300, null, null], + [0, "이전", null, 0, null, 78, 80, 79, 0, 160, 300, null, null], + [0, "이풍", null, 0, null, 69, 74, 50, 0, 160, 300, null, null], + [0, "유언", null, 0, null, 61, 38, 80, 0, 160, 300, null, null], + [0, "유괴", null, 0, null, 71, 73, 67, 0, 160, 300, null, null], + [0, "유기", null, 0, null, 52, 12, 63, 0, 160, 300, null, null], + [0, "유우", null, 0, null, 62, 33, 75, 0, 160, 300, null, null], + [0, "유훈", null, 0, null, 47, 63, 35, 0, 160, 300, null, null], + [0, "유현", null, 0, null, 54, 66, 51, 0, 160, 300, null, null], + [0, "유순", null, 0, null, 63, 46, 41, 0, 160, 300, null, null], + [0, "유장", null, 0, null, 31, 5, 34, 0, 160, 300, null, null], + [0, "유심", null, 0, null, 60, 62, 70, 0, 160, 300, null, null], + [0, "유선", null, 0, null, 3, 5, 9, 0, 160, 300, null, null], + [0, "유종", null, 0, null, 24, 22, 65, 0, 160, 300, null, null], + [0, "유도", null, 0, null, 25, 23, 26, 0, 160, 300, null, null], + [0, "유파", null, 0, null, 29, 22, 75, 0, 160, 300, null, null], + [0, "유반", null, 0, null, 69, 76, 47, 0, 160, 300, null, null], + [0, "유비", null, 0, null, 87, 78, 75, 0, 160, 300, null, null, "한왕실은 중산정왕의 후손인 내가 이어받겠다...!"], + [0, "유표", null, 0, null, 48, 31, 72, 0, 160, 300, null, null], + [0, "유복", null, 0, null, 64, 49, 74, 0, 160, 300, null, null], + [0, "유벽", null, 0, null, 70, 72, 47, 0, 160, 300, null, null], + [0, "유봉", null, 0, null, 75, 79, 44, 0, 160, 300, null, null], + [0, "유엽", null, 0, null, 56, 32, 92, 0, 160, 300, null, null], + [0, "유요", null, 0, null, 62, 67, 46, 0, 160, 300, null, null], + [0, "여위황", null, 0, null, 58, 63, 29, 0, 160, 300, null, null], + [0, "요화", null, 0, null, 73, 76, 69, 0, 160, 300, null, null], + [0, "양흥", null, 0, null, 61, 65, 19, 0, 160, 300, null, null], + [0, "양습", null, 0, null, 73, 40, 74, 0, 160, 300, null, null], + [0, "양서", null, 0, null, 56, 62, 66, 0, 160, 300, null, null], + [0, "능조", null, 0, null, 75, 81, 42, 0, 160, 300, null, null], + [0, "능통", null, 0, null, 83, 89, 60, 0, 160, 300, null, null], + [0, "여개", null, 0, null, 53, 30, 67, 0, 160, 300, null, null], + [0, "여건", null, 0, null, 57, 70, 62, 0, 160, 300, null, null], + [0, "여광", null, 0, null, 56, 70, 13, 0, 160, 300, null, null], + [0, "여상", null, 0, null, 54, 71, 12, 0, 160, 300, null, null], + [0, "여대", null, 0, null, 80, 71, 70, 0, 160, 300, null, null], + [0, "여범", null, 0, null, 73, 63, 75, 0, 160, 300, null, null], + [0, "여포", null, 0, null, 88, 100, 36, 0, 160, 300, null, null, "다 덤비거라! 하하하하"], + [0, "여몽", null, 0, null, 91, 81, 90, 0, 160, 300, null, null], + [0, "윤직", null, 0, null, 46, 42, 73, 0, 160, 300, null, null], + [0, "냉포", null, 0, null, 71, 82, 61, 0, 160, 300, null, null], + [0, "누규", null, 0, null, 52, 13, 87, 0, 160, 300, null, null], + [0, "노숙", null, 0, null, 89, 56, 93, 0, 160, 300, null, null], + [0, "노식", null, 0, null, 86, 63, 82, 0, 160, 300, null, null], + [0, "범강", null, 0, null, 49, 50, 36, 0, 160, 300, null, null], + [0, "장달", null, 0, null, 43, 56, 34, 0, 160, 300, null, null], + [0, "규람", null, 0, null, 55, 70, 58, 0, 160, 300, null, null], + [0, "대원", null, 0, null, 38, 32, 68, 0, 160, 300, null, null], + [0, "왕기", null, 0, null, 81, 72, 86, 0, 160, 300, null, null], + [0, "왕상", null, 0, null, 23, 19, 68, 0, 160, 300, null, null], + [0, "왕돈", null, 0, null, 60, 66, 46, 0, 160, 300, null, null], + [0, "악침", null, 0, null, 73, 75, 43, 0, 160, 300, null, null], + [0, "하제", null, 0, null, 83, 70, 82, 0, 160, 300, null, null], + [0, "환범", null, 0, null, 40, 11, 78, 0, 160, 300, null, null], + [0, "견초", null, 0, null, 72, 79, 73, 0, 160, 300, null, null], + [0, "고당륭", null, 0, null, 35, 24, 76, 0, 160, 300, null, null], + [0, "오찬", null, 0, null, 68, 41, 78, 0, 160, 300, null, null], + [0, "호질", null, 0, null, 73, 46, 74, 0, 160, 300, null, null], + [0, "오질", null, 0, null, 16, 29, 68, 0, 160, 300, null, null], + [0, "호준", null, 0, null, 79, 76, 62, 0, 160, 300, null, null], + [0, "고담", null, 0, null, 53, 23, 77, 0, 160, 300, null, null], + [0, "최림", null, 0, null, 32, 22, 66, 0, 160, 300, null, null], + [0, "사마망", null, 0, null, 78, 58, 83, 0, 160, 300, null, null], + [0, "주이", null, 0, null, 70, 73, 61, 0, 160, 300, null, null], + [0, "전단", null, 0, null, 67, 64, 39, 0, 160, 300, null, null], + [0, "조우", null, 0, null, 50, 43, 37, 0, 160, 300, null, null], + [0, "조상", null, 0, null, 39, 33, 30, 0, 160, 300, null, null], + [0, "조방", null, 0, null, 20, 14, 27, 0, 160, 300, null, null], + [0, "태사향", null, 0, null, 57, 66, 48, 0, 160, 300, null, null], + [0, "장휴", null, 0, null, 63, 27, 74, 0, 160, 300, null, null], + [0, "장호", null, 0, null, 75, 74, 51, 0, 160, 300, null, null], + [0, "조광", null, 0, null, 67, 71, 53, 0, 160, 300, null, null], + [0, "장집", null, 0, null, 76, 29, 80, 0, 160, 300, null, null], + [0, "장승", null, 0, null, 77, 70, 75, 0, 160, 300, null, null], + [0, "장소2", null, 0, null, 23, 56, 31, 0, 160, 300, null, null], + [0, "조통", null, 0, null, 68, 67, 61, 0, 160, 300, null, null], + [0, "진표", null, 0, null, 66, 42, 74, 0, 160, 300, null, null], + [0, "정무", null, 0, null, 56, 35, 75, 0, 160, 300, null, null], + [0, "정봉2", null, 0, null, 66, 66, 53, 0, 160, 300, null, null], + [0, "전만", null, 0, null, 51, 73, 39, 0, 160, 300, null, null], + [0, "마균", null, 0, null, 22, 17, 71, 0, 160, 300, null, null], + [0, "방회", null, 0, null, 69, 75, 49, 0, 160, 300, null, null], + [0, "낙통", null, 0, null, 76, 58, 75, 0, 160, 300, null, null], + [0, "육개", null, 0, null, 65, 61, 79, 0, 160, 300, null, null], + [0, "유찬", null, 0, null, 78, 81, 64, 0, 160, 300, null, null], + [0, "유소", null, 0, null, 68, 53, 74, 0, 160, 300, null, null], + [0, "요립", null, 0, null, 32, 15, 76, 0, 160, 300, null, null], + [0, "여거", null, 0, null, 78, 69, 71, 0, 160, 300, null, null], + [0, "제갈첨", null, 0, null, 70, 57, 76, 0, 160, 300, null, null], + [0, "손휴", null, 0, null, 57, 42, 78, 0, 160, 300, null, null], + [0, "극정", null, 0, null, 42, 23, 68, 0, 160, 300, null, null], + [0, "호분", null, 0, null, 71, 76, 50, 0, 160, 300, null, null], + [0, "손량", null, 0, null, 32, 26, 70, 0, 160, 300, null, null], + [0, "마막", null, 0, null, 34, 12, 44, 0, 160, 300, null, null], + [0, "손호", null, 0, null, 41, 73, 71, 0, 160, 300, null, null], + [0, "조모", null, 0, null, 54, 61, 59, 0, 160, 300, null, null], + [0, "조환", null, 0, null, 30, 28, 30, 0, 160, 300, null, null], + [0, "사마유", null, 0, null, 71, 68, 75, 0, 160, 300, null, null], + [0, "제갈상", null, 0, null, 64, 79, 62, 0, 160, 300, null, null], + [0, "손화", null, 0, null, 31, 39, 68, 0, 160, 300, null, null], + [0, "염우", null, 0, null, 52, 61, 51, 0, 160, 300, null, null], + [0, "왕경", null, 0, null, 67, 63, 71, 0, 160, 300, null, null], + [0, "왕혼", null, 0, null, 74, 71, 63, 0, 160, 300, null, null], + [0, "곽혁", null, 0, null, 33, 29, 70, 0, 160, 300, null, null], + [0, "가범", null, 0, null, 60, 62, 73, 0, 160, 300, null, null], + [0, "서질", null, 0, null, 68, 83, 24, 0, 160, 300, null, null], + [0, "손준", null, 0, null, 64, 70, 65, 0, 160, 300, null, null], + [0, "손침", null, 0, null, 58, 55, 65, 0, 160, 300, null, null], + [0, "우사", null, 0, null, 61, 34, 74, 0, 160, 300, null, null], + [0, "진건", null, 0, null, 72, 71, 65, 0, 160, 300, null, null], + [0, "동궐", null, 0, null, 65, 59, 76, 0, 160, 300, null, null], + [0, "당자", null, 0, null, 61, 71, 50, 0, 160, 300, null, null], + [0, "등충", null, 0, null, 76, 80, 69, 0, 160, 300, null, null], + [0, "황숭", null, 0, null, 67, 63, 72, 0, 160, 300, null, null], + [0, "화핵", null, 0, null, 20, 24, 71, 0, 160, 300, null, null], + [0, "허의", null, 0, null, 51, 74, 15, 0, 160, 300, null, null], + [0, "송겸", null, 0, null, 66, 78, 42, 0, 160, 300, null, null], + [0, "호제", null, 0, null, 57, 39, 68, 0, 160, 300, null, null], + [0, "나헌", null, 0, null, 86, 70, 82, 0, 160, 300, null, null], + [0, "노숙2", null, 0, null, 73, 53, 74, 0, 160, 300, null, null], + [0, "구성", null, 0, null, 63, 70, 38, 0, 160, 300, null, null], + [0, "어부라", null, 0, null, 72, 68, 21, 0, 160, 300, null, null], + [0, "아하소과", null, 0, null, 61, 76, 13, 0, 160, 300, null, null], + [0, "가비능", null, 0, null, 77, 69, 52, 0, 160, 300, null, null], + [0, "구력거", null, 0, null, 80, 68, 56, 0, 160, 300, null, null], + [0, "강단", null, 0, null, 65, 83, 48, 0, 160, 300, null, null], + [0, "황란", null, 0, null, 63, 75, 44, 0, 160, 300, null, null], + [0, "호주천", null, 0, null, 70, 71, 40, 0, 160, 300, null, null], + [0, "종리목", null, 0, null, 84, 72, 82, 0, 160, 300, null, null], + [0, "제갈교", null, 0, null, 62, 27, 75, 0, 160, 300, null, null], + [0, "답돈", null, 0, null, 84, 82, 61, 0, 160, 300, null, null], + [0, "반임", null, 0, null, 66, 79, 38, 0, 160, 300, null, null], + [0, "보도근", null, 0, null, 64, 73, 50, 0, 160, 300, null, null], + [0, "미당대왕", null, 0, null, 59, 69, 21, 0, 160, 300, null, null], + [0, "유표2", null, 0, null, 73, 74, 48, 0, 160, 300, null, null], + [0, "루반", null, 0, null, 65, 76, 39, 0, 160, 300, null, null], + [0, "손관", null, 0, null, 72, 78, 51, 0, 160, 300, null, null], + [0, "곽석", null, 0, null, 59, 71, 48, 0, 160, 300, null, null], + [0, "주조", null, 0, null, 63, 68, 26, 0, 160, 300, null, null], + [0, "장거", null, 0, null, 79, 75, 56, 0, 160, 300, null, null], + [0, "장순", null, 0, null, 73, 81, 60, 0, 160, 300, null, null], + [0, "철리길", null, 0, null, 77, 70, 52, 0, 160, 300, null, null], + [0, "주삭", null, 0, null, 54, 60, 50, 0, 160, 300, null, null], + [0, "황월영", null, 0, null, 46, 33, 78, 0, 160, 300, null, null], + [0, "채염", null, 0, null, 42, 26, 82, 0, 160, 300, null, null], + [0, "소교", null, 0, null, 23, 15, 78, 0, 160, 300, null, null], + [0, "신헌영", null, 0, null, 65, 35, 90, 0, 160, 300, null, null, "내가 남자로 태어났더라면..."], + [0, "손상향", null, 0, null, 75, 79, 55, 0, 160, 300, null, null], + [0, "대교", null, 0, null, 22, 30, 78, 0, 160, 300, null, null], + [0, "초선", null, 0, null, 12, 22, 71, 0, 160, 300, null, null], + [0, "교모", null, 0, null, 54, 45, 69, 0, 160, 300, null, null], + [0, "관구수", null, 0, null, 58, 62, 33, 0, 160, 300, null, null], + [0, "관구전", null, 0, null, 63, 60, 69, 0, 160, 300, null, null], + [0, "원유", null, 0, null, 56, 40, 73, 0, 160, 300, null, null], + [0, "왕광", null, 0, null, 65, 55, 61, 0, 160, 300, null, null], + [0, "신창", null, 0, null, 50, 26, 42, 0, 160, 300, null, null], + [0, "사마주", null, 0, null, 61, 52, 61, 0, 160, 300, null, null], + [0, "양제", null, 0, null, 67, 68, 71, 0, 160, 300, null, null], + [0, "성만", null, 0, null, 61, 68, 66, 0, 160, 300, null, null], + [0, "오연", null, 0, null, 66, 73, 42, 0, 160, 300, null, null], + [0, "맹충", null, 0, null, 47, 28, 72, 0, 160, 300, null, null], + [0, "잠혼", null, 0, null, 1, 1, 22, 0, 160, 300, null, null], + [0, "사정", null, 0, null, 64, 76, 34, 0, 160, 300, null, null], + [0, "심영", null, 0, null, 70, 77, 61, 0, 160, 300, null, null], + [0, "도준", null, 0, null, 65, 66, 46, 0, 160, 300, null, null], + [0, "만욱", null, 0, null, 21, 25, 71, 0, 160, 300, null, null], + [0, "오언", null, 0, null, 76, 72, 77, 0, 160, 300, null, null], + [0, "위막", null, 0, null, 57, 62, 59, 0, 160, 300, null, null], + [0, "시삭", null, 0, null, 38, 65, 47, 0, 160, 300, null, null], + [0, "전속", null, 0, null, 47, 60, 55, 0, 160, 300, null, null], + [0, "장화", null, 0, null, 36, 27, 78, 0, 160, 300, null, null], + [0, "오거", null, 0, null, 49, 61, 23, 0, 160, 300, null, null], + [0, "추정", null, 0, null, 70, 64, 66, 0, 160, 300, null, null], + [0, "장특", null, 0, null, 73, 54, 75, 0, 160, 300, null, null], + [0, "곽마", null, 0, null, 68, 71, 47, 0, 160, 300, null, null], + [0, "석포", null, 0, null, 69, 71, 56, 0, 160, 300, null, null], + [0, "견홍", null, 0, null, 70, 74, 66, 0, 160, 300, null, null], + [0, "한거자", null, 0, null, 51, 59, 51, 0, 160, 300, null, null], + [0, "휴원진", null, 0, null, 52, 68, 45, 0, 160, 300, null, null], + [0, "곽원", null, 0, null, 66, 73, 36, 0, 160, 300, null, null], + [0, "계옹", null, 0, null, 63, 52, 41, 0, 160, 300, null, null], + [0, "이부", null, 0, null, 31, 36, 74, 0, 160, 300, null, null], + [0, "왕업", null, 0, null, 33, 6, 35, 0, 160, 300, null, null], + [0, "좌혁", null, 0, null, 62, 66, 51, 0, 160, 300, null, null], + [0, "화타", null, 0, null, 57, 25, 73, 0, 160, 300, null, null, "아픈 사람들 모두 내게 오시오~"], + [0, "사마휘", null, 0, null, 55, 26, 82, 0, 160, 300, null, null, "좋지 좋아~"], + [0, "우길", null, 0, null, 23, 15, 90, 0, 160, 300, null, null, "길조로다"], + [0, "헌제", null, 0, null, 22, 18, 68, 0, 160, 300, null, null, "한왕실은 정녕 여기서 끝이란 말인가.."], + [0, "백기", null, 0, null, 100, 88, 82, 0, 160, 300, null, null], + [0, "한신", null, 0, null, 100, 74, 94, 0, 160, 300, null, null], + [0, "악비", null, 0, null, 99, 91, 86, 0, 160, 300, null, null], + [0, "항적", null, 0, null, 98, 100, 65, 0, 160, 300, null, null, "내가 바로 초패왕 항우다!!"], + [0, "악의", null, 0, null, 98, 75, 93, 0, 160, 300, null, null], + [0, "영정", null, 0, null, 97, 55, 90, 0, 160, 300, null, null], + [0, "강상", null, 0, null, 95, 49, 100, 0, 160, 300, null, null], + [0, "제나라전단", null, 0, null, 96, 75, 95, 0, 160, 300, null, null], + [0, "이목", null, 0, null, 96, 78, 88, 0, 160, 300, null, null], + [0, "염파", null, 0, null, 95, 96, 75, 0, 160, 300, null, null], + [0, "왕전", null, 0, null, 94, 72, 83, 0, 160, 300, null, null], + [0, "오기", null, 0, null, 94, 66, 95, 0, 160, 300, null, null], + [0, "곽거병", null, 0, null, 93, 91, 53, 0, 160, 300, null, null], + [0, "영포", null, 0, null, 82, 91, 54, 0, 160, 300, null, null], + [0, "이신", null, 0, null, 81, 88, 63, 0, 160, 300, null, null], + [0, "몽념", null, 0, null, 87, 86, 71, 0, 160, 300, null, null], + [0, "제나라전기", null, 0, null, 80, 85, 44, 0, 160, 300, null, null], + [0, "극신", null, 0, null, 76, 83, 42, 0, 160, 300, null, null], + [0, "항연", null, 0, null, 89, 80, 77, 0, 160, 300, null, null], + [0, "인상여", null, 0, null, 69, 38, 96, 0, 160, 300, null, null], + [0, "장자방", null, 0, null, 72, 40, 100, 0, 160, 300, null, null], + [0, "관이오", null, 0, null, 85, 64, 99, 0, 160, 300, null, null], + [0, "손빈", null, 0, null, 83, 22, 98, 0, 160, 300, null, null], + [0, "소진", null, 0, null, 90, 47, 96, 0, 160, 300, null, null], + [0, "범증", null, 0, null, 68, 24, 94, 0, 160, 300, null, null], + [0, "위나라장의", null, 0, null, 75, 23, 93, 0, 160, 300, null, null], + [0, "공구", null, 0, null, 68, 70, 91, 0, 160, 300, null, null], + [0, "소하", null, 0, null, 56, 27, 97, 0, 160, 300, null, null], + [0, "한비", null, 0, null, 49, 18, 97, 0, 160, 300, null, null], + [0, "이사", null, 0, null, 48, 24, 95, 0, 160, 300, null, null], + [0, "전문", null, 0, null, 79, 67, 89, 0, 160, 300, null, null], + [0, "황헐", null, 0, null, 81, 68, 88, 0, 160, 300, null, null], + [0, "방난", null, 0, null, 88, 95, 66, 0, 160, 300, null, null], + [0, "개섭", null, 0, null, 43, 97, 54, 0, 160, 300, null, null], + [0, "형가", null, 0, null, 42, 89, 43, 0, 160, 300, null, null], + [0, "유방", null, 0, null, 90, 75, 85, 0, 160, 300, null, null, "나는 사람을 쓰는 재주로 천하를 얻었다"], + [0, "하리", null, 0, null, 99, 99, 89, 0, 160, 300, null, null, "내 업적을 따라올 사람이 있을까?"], + [0, "헹이", null, 0, null, 97, 72, 90, 0, 160, 300, null, null, "맛있다 'ㅅ'"], + [0, "나나", null, 0, null, 96, 71, 86, 0, 160, 300, null, null, "이번 전쟁을 계산해보면 말이죠..."], + [0, "장임2", null, 0, null, 90, 87, 85, 0, 160, 300, null, null, "으리!"], + [0, "하야미", null, 0, null, 94, 85, 92, 0, 160, 300, null, null, "흑막이 되어볼까요"], + [0, "이시리스", null, 0, null, 96, 80, 94, 0, 160, 300, null, null], + [0, "연채홍", null, 0, null, 90, 81, 88, 0, 160, 300, null, null, "엄마도 천통할수 있다!"], + [0, "임사영", null, 0, null, 75, 75, 75, 0, 160, 300, null, null, "일반인 양민입니다"], + [0, "장군보", null, 0, null, 84, 90, 68, 0, 160, 300, null, null], + [0, "크렌스", null, 0, null, 92, 80, 76, 0, 160, 300, null, null], + [0, "콘", null, 0, null, 88, 96, 85, 0, 160, 300, null, null], + [0, "리즈나", null, 0, null, 93, 65, 75, 0, 160, 300, null, null, "내가 다 했다"], + [0, "오티누스", null, 0, null, 92, 89, 88, 0, 160, 300, null, null], + [0, "네시", null, 0, null, 87, 85, 92, 0, 160, 300, null, null, "안 자고 싸우면 이겨요"] + ], + "general_ex":[ + [0, "복양흥", null, 0, null, 37, 32, 70, 0, 160, 300, null, null], + [0, "왕충", null, 0, null, 39, 57, 21, 0, 160, 300, null, null], + [0, "구건", null, 0, null, 39, 52, 65, 0, 160, 300, null, null], + [0, "등윤", null, 0, null, 29, 41, 71, 0, 160, 300, null, null], + [0, "국연", null, 0, null, 50, 19, 71, 0, 160, 300, null, null], + [0, "양흔", null, 0, null, 61, 68, 61, 0, 160, 300, null, null], + [0, "이감", null, 0, null, 58, 69, 33, 0, 160, 300, null, null], + [0, "마운록", null, 0, null, 72, 78, 53, 0, 160, 300, null, null], + [0, "황호", null, 0, null, 1, 1, 19, 0, 160, 300, null, null], + [0, "왕융", null, 0, null, 57, 36, 72, 0, 160, 300, null, null], + [0, "설영", null, 0, null, 49, 18, 64, 0, 160, 300, null, null], + [0, "설후", null, 0, null, 17, 15, 68, 0, 160, 300, null, null], + [0, "정의", null, 0, null, 15, 5, 64, 0, 160, 300, null, null], + [0, "누현", null, 0, null, 23, 22, 67, 0, 160, 300, null, null], + [0, "당빈", null, 0, null, 67, 74, 59, 0, 160, 300, null, null], + [0, "위풍", null, 0, null, 52, 23, 72, 0, 160, 300, null, null], + [0, "초이", null, 0, null, 62, 69, 63, 0, 160, 300, null, null], + [0, "장반", null, 0, null, 63, 73, 62, 0, 160, 300, null, null], + [0, "장구", null, 0, null, 69, 72, 44, 0, 160, 300, null, null], + [0, "보협", null, 0, null, 71, 49, 69, 0, 160, 300, null, null], + [0, "보천", null, 0, null, 71, 60, 71, 0, 160, 300, null, null], + [0, "번건", null, 0, null, 41, 24, 71, 0, 160, 300, null, null], + [0, "부융", null, 0, null, 66, 72, 46, 0, 160, 300, null, null], + [0, "사찬", null, 0, null, 60, 72, 54, 0, 160, 300, null, null], + [0, "당균", null, 0, null, 33, 24, 77, 0, 160, 300, null, null], + [0, "공주", null, 0, null, 26, 16, 68, 0, 160, 300, null, null], + [0, "소유", null, 0, null, 50, 59, 49, 0, 160, 300, null, null], + [0, "오강", null, 0, null, 48, 38, 65, 0, 160, 300, null, null], + [0, "정병", null, 0, null, 16, 15, 71, 0, 160, 300, null, null], + [0, "원요", null, 0, null, 41, 50, 41, 0, 160, 300, null, null], + [0, "하만", null, 0, null, 66, 77, 12, 0, 160, 300, null, null], + [0, "장빈", null, 0, null, 27, 23, 64, 0, 160, 300, null, null], + [0, "손이", null, 0, null, 69, 71, 55, 0, 160, 300, null, null], + [0, "손수", null, 0, null, 55, 51, 53, 0, 160, 300, null, null], + [0, "우전", null, 0, null, 64, 76, 40, 0, 160, 300, null, null], + [0, "손광", null, 0, null, 52, 46, 44, 0, 160, 300, null, null], + [0, "위소", null, 0, null, 16, 19, 65, 0, 160, 300, null, null], + [0, "전역", null, 0, null, 60, 63, 38, 0, 160, 300, null, null], + [0, "손기", null, 0, null, 60, 67, 51, 0, 160, 300, null, null], + [0, "전기", null, 0, null, 49, 69, 61, 0, 160, 300, null, null], + [0, "전상", null, 0, null, 2, 4, 12, 0, 160, 300, null, null], + [0, "유성", null, 0, null, 45, 65, 33, 0, 160, 300, null, null], + [0, "이성", null, 0, null, 12, 22, 61, 0, 160, 300, null, null], + [0, "양강", null, 0, null, 60, 69, 40, 0, 160, 300, null, null], + [0, "양령", null, 0, null, 57, 61, 21, 0, 160, 300, null, null], + [0, "부하", null, 0, null, 44, 35, 81, 0, 160, 300, null, null], + [0, "유화", null, 0, null, 21, 16, 59, 0, 160, 300, null, null], + [0, "포신", null, 0, null, 77, 67, 81, 0, 160, 300, null, null], + [0, "유대", null, 0, null, 53, 65, 32, 0, 160, 300, null, null], + [0, "문호", null, 0, null, 66, 72, 45, 0, 160, 300, null, null], + [0, "방열", null, 0, null, 68, 78, 44, 0, 160, 300, null, null], + [0, "배수", null, 0, null, 8, 9, 70, 0, 160, 300, null, null], + [0, "여령기", null, 0, null, 67, 79, 55, 0, 160, 300, null, null], + [0, "성렴", null, 0, null, 79, 78, 40, 0, 160, 300, null, null], + [0, "구본", null, 0, null, 50, 40, 67, 0, 160, 300, null, null], + [0, "영수", null, 0, null, 67, 69, 72, 0, 160, 300, null, null], + [0, "호열", null, 0, null, 73, 67, 72, 0, 160, 300, null, null], + [0, "최염", null, 0, null, 42, 55, 70, 0, 160, 300, null, null], + [0, "차주", null, 0, null, 49, 49, 40, 0, 160, 300, null, null], + [0, "제갈정", null, 0, null, 58, 63, 66, 0, 160, 300, null, null], + [0, "제갈서", null, 0, null, 41, 40, 29, 0, 160, 300, null, null], + [0, "장서", null, 0, null, 55, 76, 35, 0, 160, 300, null, null], + [0, "유략", null, 0, null, 71, 66, 59, 0, 160, 300, null, null], + [0, "동조", null, 0, null, 17, 13, 56, 0, 160, 300, null, null], + [0, "유평", null, 0, null, 70, 71, 68, 0, 160, 300, null, null], + [0, "경무", null, 0, null, 21, 34, 53, 0, 160, 300, null, null], + [0, "민순", null, 0, null, 42, 41, 61, 0, 160, 300, null, null], + [0, "유준", null, 0, null, 65, 67, 42, 0, 160, 300, null, null], + [0, "마한", null, 0, null, 62, 69, 41, 0, 160, 300, null, null], + [0, "설례", null, 0, null, 31, 42, 71, 0, 160, 300, null, null], + [0, "우미", null, 0, null, 62, 61, 28, 0, 160, 300, null, null], + [0, "여공", null, 0, null, 74, 65, 38, 0, 160, 300, null, null], + [0, "진생", null, 0, null, 59, 55, 44, 0, 160, 300, null, null], + [0, "허사", null, 0, null, 27, 23, 78, 0, 160, 300, null, null], + [0, "왕해", null, 0, null, 22, 11, 75, 0, 160, 300, null, null], + [0, "양표", null, 0, null, 20, 17, 74, 0, 160, 300, null, null], + [0, "채옹", null, 0, null, 21, 16, 76, 0, 160, 300, null, null], + [0, "송과", null, 0, null, 61, 56, 48, 0, 160, 300, null, null], + [0, "왕방", null, 0, null, 62, 57, 41, 0, 160, 300, null, null], + [0, "이몽", null, 0, null, 58, 65, 47, 0, 160, 300, null, null], + [0, "최용", null, 0, null, 64, 67, 43, 0, 160, 300, null, null], + [0, "복호적아", null, 0, null, 61, 65, 36, 0, 160, 300, null, null], + [0, "동백", null, 0, null, 76, 55, 86, 0, 160, 300, null, null], + [0, "석도", null, 0, null, 62, 32, 82, 0, 160, 300, null, null], + [0, "맹건", null, 0, null, 73, 31, 80, 0, 160, 300, null, null], + [0, "공손수", null, 0, null, 66, 56, 47, 0, 160, 300, null, null], + [0, "유보", null, 0, null, 42, 32, 61, 0, 160, 300, null, null], + [0, "장환", null, 0, null, 81, 79, 44, 0, 160, 300, null, null], + [0, "이명", null, 0, null, 77, 74, 41, 0, 160, 300, null, null], + [0, "유식", null, 0, null, 42, 23, 72, 0, 160, 300, null, null], + [0, "이붕", null, 0, null, 62, 70, 38, 0, 160, 300, null, null], + [0, "전장", null, 0, null, 66, 64, 42, 0, 160, 300, null, null], + [0, "진준", null, 0, null, 67, 65, 69, 0, 160, 300, null, null], + [0, "황보개", null, 0, null, 62, 62, 70, 0, 160, 300, null, null], + [0, "장교", null, 0, null, 68, 65, 68, 0, 160, 300, null, null], + [0, "장상", null, 0, null, 62, 76, 42, 0, 160, 300, null, null], + [0, "이흠", null, 0, null, 65, 68, 49, 0, 160, 300, null, null], + [0, "충예", null, 0, null, 33, 36, 72, 0, 160, 300, null, null], + [0, "장엄", null, 0, null, 38, 27, 79, 0, 160, 300, null, null], + [0, "충리비", null, 0, null, 75, 77, 56, 0, 160, 300, null, null], + [0, "채공", null, 0, null, 67, 71, 52, 0, 160, 300, null, null], + [0, "호충", null, 0, null, 19, 17, 55, 0, 160, 300, null, null], + [0, "마연", null, 0, null, 71, 75, 43, 0, 160, 300, null, null], + [0, "윤해", null, 0, null, 62, 63, 37, 0, 160, 300, null, null], + [0, "원소조예", null, 0, null, 61, 63, 36, 0, 160, 300, null, null], + [0, "한맹", null, 0, null, 74, 78, 43, 0, 160, 300, null, null], + [0, "등룡", null, 0, null, 64, 67, 49, 0, 160, 300, null, null], + [0, "송충", null, 0, null, 23, 19, 51, 0, 160, 300, null, null], + [0, "이규", null, 0, null, 28, 24, 61, 0, 160, 300, null, null], + [0, "진취", null, 0, null, 62, 71, 45, 0, 160, 300, null, null], + [0, "육울생", null, 0, null, 22, 33, 71, 0, 160, 300, null, null], + [0, "장성채", null, 0, null, 26, 22, 67, 0, 160, 300, null, null], + [0, "충보", null, 0, null, 64, 69, 47, 0, 160, 300, null, null], + [0, "장선", null, 0, null, 72, 71, 48, 0, 160, 300, null, null], + [0, "뇌서", null, 0, null, 76, 74, 61, 0, 160, 300, null, null], + [0, "번궁", null, 0, null, 71, 67, 58, 0, 160, 300, null, null] + ] +} \ No newline at end of file From 5ab26a9f8ce33b0854f8ca0a5e1d9d03e35e8911 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 3 Feb 2019 00:28:29 +0900 Subject: [PATCH 09/13] =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=20=EB=A7=81=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- e_lib/linkify/linkify-string.min.js | 1 + e_lib/linkify/linkify.min.js | 1 + hwe/index.php | 2 ++ hwe/js/common.js | 5 +++++ hwe/js/msg.js | 2 +- hwe/js/templates/message.html | 2 +- 6 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 e_lib/linkify/linkify-string.min.js create mode 100644 e_lib/linkify/linkify.min.js diff --git a/e_lib/linkify/linkify-string.min.js b/e_lib/linkify/linkify-string.min.js new file mode 100644 index 00000000..09d4739c --- /dev/null +++ b/e_lib/linkify/linkify-string.min.js @@ -0,0 +1 @@ +"use strict";!function(t,r){var n=function(t){function r(t){return t.replace(/&/g,"&").replace(//g,">")}function n(t){return t.replace(/"/g,""")}function e(t){if(!t)return"";var r=[];for(var e in t){var i=t[e]+"";r.push(e+'="'+n(i)+'"')}return r.join(" ")}function i(t){var i=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};i=new a(i);for(var f=o(t),u=[],c=0;c\n");else if(p.isLink&&i.check(p)){var l=i.resolve(p),s=l.formatted,g=l.formattedHref,y=l.tagName,h=l.className,v=l.target,k=l.attributes,S="<"+y+' href="'+n(g)+'"';h&&(S+=' class="'+n(h)+'"'),v&&(S+=' target="'+n(v)+'"'),k&&(S+=" "+e(k)),S+=">"+r(s)+"",u.push(S)}else u.push(r(p.toString()))}return u.join("")}var o=t.tokenize,f=t.options,a=f.Options;if(!String.prototype.linkify)try{Object.defineProperty(String.prototype,"linkify",{a:function(){},get:function(){return function(t){return i(this,t)}}})}catch(u){String.prototype.linkify||(String.prototype.linkify=function(t){return i(this,t)})}return i}(r);t.linkifyStr=n}(window,linkify); \ No newline at end of file diff --git a/e_lib/linkify/linkify.min.js b/e_lib/linkify/linkify.min.js new file mode 100644 index 00000000..94ef0a5d --- /dev/null +++ b/e_lib/linkify/linkify.min.js @@ -0,0 +1 @@ +!function(){"use strict";var n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(n){return typeof n}:function(n){return n&&"function"==typeof Symbol&&n.constructor===Symbol&&n!==Symbol.prototype?"symbol":typeof n};!function(e){function a(n,e){var a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},t=Object.create(n.prototype);for(var o in a)t[o]=a[o];return t.constructor=e,e.prototype=t,e}function t(n){n=n||{},this.defaultProtocol=n.hasOwnProperty("defaultProtocol")?n.defaultProtocol:h.defaultProtocol,this.events=n.hasOwnProperty("events")?n.events:h.events,this.format=n.hasOwnProperty("format")?n.format:h.format,this.formatHref=n.hasOwnProperty("formatHref")?n.formatHref:h.formatHref,this.nl2br=n.hasOwnProperty("nl2br")?n.nl2br:h.nl2br,this.tagName=n.hasOwnProperty("tagName")?n.tagName:h.tagName,this.target=n.hasOwnProperty("target")?n.target:h.target,this.validate=n.hasOwnProperty("validate")?n.validate:h.validate,this.ignoreTags=[],this.attributes=n.attributes||n.linkAttributes||h.attributes,this.className=n.hasOwnProperty("className")?n.className:n.linkClass||h.className;for(var e=n.hasOwnProperty("ignoreTags")?n.ignoreTags:h.ignoreTags,a=0;a=r)return[];for(;o1&&void 0!==arguments[1]?arguments[1]:null,a=this.next(new n(""));return a===this.defaultTransition?(a=new this.constructor(e),this.on(n,a)):e&&(a.T=e),a},test:function(n,e){return n instanceof e}}),d=l();d.prototype={toString:function(){return this.v+""}};var x=u(),y=u("@"),v=u(":"),k=u("."),w=u(),j=u(),z=u("\n"),O=u(),q=u("+"),N=u("#"),S=u(),T=u("mailto:"),A=u("?"),L=u("/"),P=u("_"),E=u(),C=u(),R=u(),H=u("{"),B=u("["),U=u("<"),M=u("("),D=u("}"),I=u("]"),K=u(">"),_=u(")"),G=u("&"),Y=Object.freeze({Base:d,DOMAIN:x,AT:y,COLON:v,DOT:k,PUNCTUATION:w,LOCALHOST:j,NL:z,NUM:O,PLUS:q,POUND:N,QUERY:A,PROTOCOL:S,MAILTO:T,SLASH:L,UNDERSCORE:P,SYM:E,TLD:C,WS:R,OPENBRACE:H,OPENBRACKET:B,OPENANGLEBRACKET:U,OPENPAREN:M,CLOSEBRACE:D,CLOSEBRACKET:I,CLOSEANGLEBRACKET:K,CLOSEPAREN:_,AMPERSAND:G}),Q="aaa|aarp|abarth|abb|abbott|abbvie|abc|able|abogado|abudhabi|ac|academy|accenture|accountant|accountants|aco|active|actor|ad|adac|ads|adult|ae|aeg|aero|aetna|af|afamilycompany|afl|africa|ag|agakhan|agency|ai|aig|aigo|airbus|airforce|airtel|akdn|al|alfaromeo|alibaba|alipay|allfinanz|allstate|ally|alsace|alstom|am|americanexpress|americanfamily|amex|amfam|amica|amsterdam|analytics|android|anquan|anz|ao|aol|apartments|app|apple|aq|aquarelle|ar|arab|aramco|archi|army|arpa|art|arte|as|asda|asia|associates|at|athleta|attorney|au|auction|audi|audible|audio|auspost|author|auto|autos|avianca|aw|aws|ax|axa|az|azure|ba|baby|baidu|banamex|bananarepublic|band|bank|bar|barcelona|barclaycard|barclays|barefoot|bargains|baseball|basketball|bauhaus|bayern|bb|bbc|bbt|bbva|bcg|bcn|bd|be|beats|beauty|beer|bentley|berlin|best|bestbuy|bet|bf|bg|bh|bharti|bi|bible|bid|bike|bing|bingo|bio|biz|bj|black|blackfriday|blanco|blockbuster|blog|bloomberg|blue|bm|bms|bmw|bn|bnl|bnpparibas|bo|boats|boehringer|bofa|bom|bond|boo|book|booking|boots|bosch|bostik|boston|bot|boutique|box|br|bradesco|bridgestone|broadway|broker|brother|brussels|bs|bt|budapest|bugatti|build|builders|business|buy|buzz|bv|bw|by|bz|bzh|ca|cab|cafe|cal|call|calvinklein|cam|camera|camp|cancerresearch|canon|capetown|capital|capitalone|car|caravan|cards|care|career|careers|cars|cartier|casa|case|caseih|cash|casino|cat|catering|catholic|cba|cbn|cbre|cbs|cc|cd|ceb|center|ceo|cern|cf|cfa|cfd|cg|ch|chanel|channel|chase|chat|cheap|chintai|chloe|christmas|chrome|chrysler|church|ci|cipriani|circle|cisco|citadel|citi|citic|city|cityeats|ck|cl|claims|cleaning|click|clinic|clinique|clothing|cloud|club|clubmed|cm|cn|co|coach|codes|coffee|college|cologne|com|comcast|commbank|community|company|compare|computer|comsec|condos|construction|consulting|contact|contractors|cooking|cookingchannel|cool|coop|corsica|country|coupon|coupons|courses|cr|credit|creditcard|creditunion|cricket|crown|crs|cruise|cruises|csc|cu|cuisinella|cv|cw|cx|cy|cymru|cyou|cz|dabur|dad|dance|data|date|dating|datsun|day|dclk|dds|de|deal|dealer|deals|degree|delivery|dell|deloitte|delta|democrat|dental|dentist|desi|design|dev|dhl|diamonds|diet|digital|direct|directory|discount|discover|dish|diy|dj|dk|dm|dnp|do|docs|doctor|dodge|dog|doha|domains|dot|download|drive|dtv|dubai|duck|dunlop|duns|dupont|durban|dvag|dvr|dz|earth|eat|ec|eco|edeka|edu|education|ee|eg|email|emerck|energy|engineer|engineering|enterprises|epost|epson|equipment|er|ericsson|erni|es|esq|estate|esurance|et|etisalat|eu|eurovision|eus|events|everbank|exchange|expert|exposed|express|extraspace|fage|fail|fairwinds|faith|family|fan|fans|farm|farmers|fashion|fast|fedex|feedback|ferrari|ferrero|fi|fiat|fidelity|fido|film|final|finance|financial|fire|firestone|firmdale|fish|fishing|fit|fitness|fj|fk|flickr|flights|flir|florist|flowers|fly|fm|fo|foo|food|foodnetwork|football|ford|forex|forsale|forum|foundation|fox|fr|free|fresenius|frl|frogans|frontdoor|frontier|ftr|fujitsu|fujixerox|fun|fund|furniture|futbol|fyi|ga|gal|gallery|gallo|gallup|game|games|gap|garden|gb|gbiz|gd|gdn|ge|gea|gent|genting|george|gf|gg|ggee|gh|gi|gift|gifts|gives|giving|gl|glade|glass|gle|global|globo|gm|gmail|gmbh|gmo|gmx|gn|godaddy|gold|goldpoint|golf|goo|goodhands|goodyear|goog|google|gop|got|gov|gp|gq|gr|grainger|graphics|gratis|green|gripe|grocery|group|gs|gt|gu|guardian|gucci|guge|guide|guitars|guru|gw|gy|hair|hamburg|hangout|haus|hbo|hdfc|hdfcbank|health|healthcare|help|helsinki|here|hermes|hgtv|hiphop|hisamitsu|hitachi|hiv|hk|hkt|hm|hn|hockey|holdings|holiday|homedepot|homegoods|homes|homesense|honda|honeywell|horse|hospital|host|hosting|hot|hoteles|hotels|hotmail|house|how|hr|hsbc|ht|htc|hu|hughes|hyatt|hyundai|ibm|icbc|ice|icu|id|ie|ieee|ifm|ikano|il|im|imamat|imdb|immo|immobilien|in|industries|infiniti|info|ing|ink|institute|insurance|insure|int|intel|international|intuit|investments|io|ipiranga|iq|ir|irish|is|iselect|ismaili|ist|istanbul|it|itau|itv|iveco|iwc|jaguar|java|jcb|jcp|je|jeep|jetzt|jewelry|jio|jlc|jll|jm|jmp|jnj|jo|jobs|joburg|jot|joy|jp|jpmorgan|jprs|juegos|juniper|kaufen|kddi|ke|kerryhotels|kerrylogistics|kerryproperties|kfh|kg|kh|ki|kia|kim|kinder|kindle|kitchen|kiwi|km|kn|koeln|komatsu|kosher|kp|kpmg|kpn|kr|krd|kred|kuokgroup|kw|ky|kyoto|kz|la|lacaixa|ladbrokes|lamborghini|lamer|lancaster|lancia|lancome|land|landrover|lanxess|lasalle|lat|latino|latrobe|law|lawyer|lb|lc|lds|lease|leclerc|lefrak|legal|lego|lexus|lgbt|li|liaison|lidl|life|lifeinsurance|lifestyle|lighting|like|lilly|limited|limo|lincoln|linde|link|lipsy|live|living|lixil|lk|loan|loans|locker|locus|loft|lol|london|lotte|lotto|love|lpl|lplfinancial|lr|ls|lt|ltd|ltda|lu|lundbeck|lupin|luxe|luxury|lv|ly|ma|macys|madrid|maif|maison|makeup|man|management|mango|map|market|marketing|markets|marriott|marshalls|maserati|mattel|mba|mc|mckinsey|md|me|med|media|meet|melbourne|meme|memorial|men|menu|meo|merckmsd|metlife|mg|mh|miami|microsoft|mil|mini|mint|mit|mitsubishi|mk|ml|mlb|mls|mm|mma|mn|mo|mobi|mobile|mobily|moda|moe|moi|mom|monash|money|monster|mopar|mormon|mortgage|moscow|moto|motorcycles|mov|movie|movistar|mp|mq|mr|ms|msd|mt|mtn|mtr|mu|museum|mutual|mv|mw|mx|my|mz|na|nab|nadex|nagoya|name|nationwide|natura|navy|nba|nc|ne|nec|net|netbank|netflix|network|neustar|new|newholland|news|next|nextdirect|nexus|nf|nfl|ng|ngo|nhk|ni|nico|nike|nikon|ninja|nissan|nissay|nl|no|nokia|northwesternmutual|norton|now|nowruz|nowtv|np|nr|nra|nrw|ntt|nu|nyc|nz|obi|observer|off|office|okinawa|olayan|olayangroup|oldnavy|ollo|om|omega|one|ong|onl|online|onyourside|ooo|open|oracle|orange|org|organic|origins|osaka|otsuka|ott|ovh|pa|page|panasonic|panerai|paris|pars|partners|parts|party|passagens|pay|pccw|pe|pet|pf|pfizer|pg|ph|pharmacy|phd|philips|phone|photo|photography|photos|physio|piaget|pics|pictet|pictures|pid|pin|ping|pink|pioneer|pizza|pk|pl|place|play|playstation|plumbing|plus|pm|pn|pnc|pohl|poker|politie|porn|post|pr|pramerica|praxi|press|prime|pro|prod|productions|prof|progressive|promo|properties|property|protection|pru|prudential|ps|pt|pub|pw|pwc|py|qa|qpon|quebec|quest|qvc|racing|radio|raid|re|read|realestate|realtor|realty|recipes|red|redstone|redumbrella|rehab|reise|reisen|reit|reliance|ren|rent|rentals|repair|report|republican|rest|restaurant|review|reviews|rexroth|rich|richardli|ricoh|rightathome|ril|rio|rip|rmit|ro|rocher|rocks|rodeo|rogers|room|rs|rsvp|ru|rugby|ruhr|run|rw|rwe|ryukyu|sa|saarland|safe|safety|sakura|sale|salon|samsclub|samsung|sandvik|sandvikcoromant|sanofi|sap|sapo|sarl|sas|save|saxo|sb|sbi|sbs|sc|sca|scb|schaeffler|schmidt|scholarships|school|schule|schwarz|science|scjohnson|scor|scot|sd|se|search|seat|secure|security|seek|select|sener|services|ses|seven|sew|sex|sexy|sfr|sg|sh|shangrila|sharp|shaw|shell|shia|shiksha|shoes|shop|shopping|shouji|show|showtime|shriram|si|silk|sina|singles|site|sj|sk|ski|skin|sky|skype|sl|sling|sm|smart|smile|sn|sncf|so|soccer|social|softbank|software|sohu|solar|solutions|song|sony|soy|space|spiegel|spot|spreadbetting|sr|srl|srt|st|stada|staples|star|starhub|statebank|statefarm|statoil|stc|stcgroup|stockholm|storage|store|stream|studio|study|style|su|sucks|supplies|supply|support|surf|surgery|suzuki|sv|swatch|swiftcover|swiss|sx|sy|sydney|symantec|systems|sz|tab|taipei|talk|taobao|target|tatamotors|tatar|tattoo|tax|taxi|tc|tci|td|tdk|team|tech|technology|tel|telecity|telefonica|temasek|tennis|teva|tf|tg|th|thd|theater|theatre|tiaa|tickets|tienda|tiffany|tips|tires|tirol|tj|tjmaxx|tjx|tk|tkmaxx|tl|tm|tmall|tn|to|today|tokyo|tools|top|toray|toshiba|total|tours|town|toyota|toys|tr|trade|trading|training|travel|travelchannel|travelers|travelersinsurance|trust|trv|tt|tube|tui|tunes|tushu|tv|tvs|tw|tz|ua|ubank|ubs|uconnect|ug|uk|unicom|university|uno|uol|ups|us|uy|uz|va|vacations|vana|vanguard|vc|ve|vegas|ventures|verisign|versicherung|vet|vg|vi|viajes|video|vig|viking|villas|vin|vip|virgin|visa|vision|vista|vistaprint|viva|vivo|vlaanderen|vn|vodka|volkswagen|volvo|vote|voting|voto|voyage|vu|vuelos|wales|walmart|walter|wang|wanggou|warman|watch|watches|weather|weatherchannel|webcam|weber|website|wed|wedding|weibo|weir|wf|whoswho|wien|wiki|williamhill|win|windows|wine|winners|wme|wolterskluwer|woodside|work|works|world|wow|ws|wtc|wtf|xbox|xerox|xfinity|xihuan|xin|xn--11b4c3d|xn--1ck2e1b|xn--1qqw23a|xn--2scrj9c|xn--30rr7y|xn--3bst00m|xn--3ds443g|xn--3e0b707e|xn--3hcrj9c|xn--3oq18vl8pn36a|xn--3pxu8k|xn--42c2d9a|xn--45br5cyl|xn--45brj9c|xn--45q11c|xn--4gbrim|xn--54b7fta0cc|xn--55qw42g|xn--55qx5d|xn--5su34j936bgsg|xn--5tzm5g|xn--6frz82g|xn--6qq986b3xl|xn--80adxhks|xn--80ao21a|xn--80aqecdr1a|xn--80asehdb|xn--80aswg|xn--8y0a063a|xn--90a3ac|xn--90ae|xn--90ais|xn--9dbq2a|xn--9et52u|xn--9krt00a|xn--b4w605ferd|xn--bck1b9a5dre4c|xn--c1avg|xn--c2br7g|xn--cck2b3b|xn--cg4bki|xn--clchc0ea0b2g2a9gcd|xn--czr694b|xn--czrs0t|xn--czru2d|xn--d1acj3b|xn--d1alf|xn--e1a4c|xn--eckvdtc9d|xn--efvy88h|xn--estv75g|xn--fct429k|xn--fhbei|xn--fiq228c5hs|xn--fiq64b|xn--fiqs8s|xn--fiqz9s|xn--fjq720a|xn--flw351e|xn--fpcrj9c3d|xn--fzc2c9e2c|xn--fzys8d69uvgm|xn--g2xx48c|xn--gckr3f0f|xn--gecrj9c|xn--gk3at1e|xn--h2breg3eve|xn--h2brj9c|xn--h2brj9c8c|xn--hxt814e|xn--i1b6b1a6a2e|xn--imr513n|xn--io0a7i|xn--j1aef|xn--j1amh|xn--j6w193g|xn--jlq61u9w7b|xn--jvr189m|xn--kcrx77d1x4a|xn--kprw13d|xn--kpry57d|xn--kpu716f|xn--kput3i|xn--l1acc|xn--lgbbat1ad8j|xn--mgb9awbf|xn--mgba3a3ejt|xn--mgba3a4f16a|xn--mgba7c0bbn0a|xn--mgbaakc7dvf|xn--mgbaam7a8h|xn--mgbab2bd|xn--mgbai9azgqp6j|xn--mgbayh7gpa|xn--mgbb9fbpob|xn--mgbbh1a|xn--mgbbh1a71e|xn--mgbc0a9azcg|xn--mgbca7dzdo|xn--mgberp4a5d4ar|xn--mgbgu82a|xn--mgbi4ecexp|xn--mgbpl2fh|xn--mgbt3dhd|xn--mgbtx2b|xn--mgbx4cd0ab|xn--mix891f|xn--mk1bu44c|xn--mxtq1m|xn--ngbc5azd|xn--ngbe9e0a|xn--ngbrx|xn--node|xn--nqv7f|xn--nqv7fs00ema|xn--nyqy26a|xn--o3cw4h|xn--ogbpf8fl|xn--p1acf|xn--p1ai|xn--pbt977c|xn--pgbs0dh|xn--pssy2u|xn--q9jyb4c|xn--qcka1pmc|xn--qxam|xn--rhqv96g|xn--rovu88b|xn--rvc1e0am3e|xn--s9brj9c|xn--ses554g|xn--t60b56a|xn--tckwe|xn--tiq49xqyj|xn--unup4y|xn--vermgensberater-ctb|xn--vermgensberatung-pwb|xn--vhquv|xn--vuq861b|xn--w4r85el8fhu5dnra|xn--w4rs40l|xn--wgbh1c|xn--wgbl6a|xn--xhq521b|xn--xkc2al3hye2a|xn--xkc2dl3a5ee0h|xn--y9a3aq|xn--yfro4i67o|xn--ygbi2ammx|xn--zfr164b|xperia|xxx|xyz|yachts|yahoo|yamaxun|yandex|ye|yodobashi|yoga|yokohama|you|youtube|yt|yun|za|zappos|zara|zero|zip|zippo|zm|zone|zuerich|zw".split("|"),W="0123456789".split(""),X="0123456789abcdefghijklmnopqrstuvwxyz".split(""),Z=[" ","\f","\r","\t","\x0B"," "," ","᠎"],F=[],J=function(n){return new m(n)},V=J(),$=J(O),nn=J(x),en=J(),an=J(R);V.on("@",J(y)).on(".",J(k)).on("+",J(q)).on("#",J(N)).on("?",J(A)).on("/",J(L)).on("_",J(P)).on(":",J(v)).on("{",J(H)).on("[",J(B)).on("<",J(U)).on("(",J(M)).on("}",J(D)).on("]",J(I)).on(">",J(K)).on(")",J(_)).on("&",J(G)).on([",",";","!",'"',"'"],J(w)),V.on("\n",J(z)).on(Z,an),an.on(Z,an);for(var tn=0;tn=0&&l++,s++,o++;if(!(l<0)){o-=l,s-=l;var u=c.emit();t.push(new u(n.substr(o-s,s)))}}return t},vn=V,kn=Object.freeze({State:m,TOKENS:Y,run:yn,start:vn}),wn=l();wn.prototype={type:"token",isLink:!1,toString:function(){for(var n=[],e=0;e0&&void 0!==arguments[0]?arguments[0]:"http";return{type:this.type,value:this.toString(),href:this.toHref(n)}}};var jn=a(wn,l(),{type:"email",isLink:!0}),zn=a(wn,l(),{type:"email",isLink:!0,toHref:function(){return"mailto:"+this.toString()}}),On=a(wn,l(),{type:"text"}),qn=a(wn,l(),{type:"nl"}),Nn=a(wn,l(),{type:"url",isLink:!0,toHref:function(){for(var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"http",e=!1,a=!1,t=this.v,o=[],r=0;t[r]instanceof S;)e=!0,o.push(t[r].toString().toLowerCase()),r++;for(;t[r]instanceof L;)a=!0,o.push(t[r].toString()),r++;for(;g(t[r]);)o.push(t[r].toString().toLowerCase()),r++;for(;r=0&&u++,a++,c++;if(u<0)for(var g=a-c;g0&&(t.push(new On(o)),o=[]),a-=u,c-=u;var h=l.emit();t.push(new h(n.slice(a-c,a)))}}return o.length>0&&t.push(new On(o)),t},me=Object.freeze({State:f,TOKENS:Sn,run:pe,start:An});Array.isArray||(Array.isArray=function(n){return"[object Array]"===Object.prototype.toString.call(n)});var fe=function(n){return pe(yn(n))},de=function(n){for(var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null,a=fe(n),t=[],o=0;o1&&void 0!==arguments[1]?arguments[1]:null,a=fe(n);return 1===a.length&&a[0].isLink&&(!e||a[0].type===e)};e.find=de,e.inherits=a,e.options=b,e.parser=me,e.scanner=kn,e.test=xe,e.tokenize=fe}(self.linkify=self.linkify||{})}(); \ No newline at end of file diff --git a/hwe/index.php b/hwe/index.php index 5797bab0..1f78ed45 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -89,6 +89,8 @@ $mapTheme = $admin['map_theme']; + + diff --git a/hwe/js/common.js b/hwe/js/common.js index 70089aec..2e5c7c2e 100644 --- a/hwe/js/common.js +++ b/hwe/js/common.js @@ -123,6 +123,10 @@ function numberWithCommas(x) { return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } +function linkifyStrWithOpt(text){ + return linkifyStr(text, {}); +} + /** * 단순한 Template 함수. <%변수명%>으로 template 가능 * @see https://github.com/krasimir/absurd/blob/master/lib/processors/html/helpers/TemplateEngine.js @@ -143,6 +147,7 @@ var TemplateEngine = function (html, options) { return add; } options.e = escapeHtml; + options.linkifyStr = linkifyStrWithOpt; while (match = re.exec(html)) { add(html.slice(cursor, match.index))(match[1], true); cursor = match.index + match[0].length; diff --git a/hwe/js/msg.js b/hwe/js/msg.js index 8f4add51..b812cc49 100644 --- a/hwe/js/msg.js +++ b/hwe/js/msg.js @@ -504,7 +504,7 @@ function activateMessageForm(){ jQuery(function($){ //tmp_template.html은 추후 msg.js에 통합될 수 있음 - var getTemplate = $.get('js/templates/message.html?10',function(obj){ + var getTemplate = $.get('js/templates/message.html?11',function(obj){ messageTemplate = obj; }); diff --git a/hwe/js/templates/message.html b/hwe/js/templates/message.html index b16b8ed1..f4875498 100644 --- a/hwe/js/templates/message.html +++ b/hwe/js/templates/message.html @@ -41,7 +41,7 @@ <%} %> <<%e(time)%>> -
<%e(text)%>
+
<%linkifyStr(text)%>
<%if(this.option && this.option.action) {%>
From 9b484dc819e29bd5af8440d2f12e69afaccde024 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 3 Feb 2019 01:54:58 +0900 Subject: [PATCH 10/13] =?UTF-8?q?=EA=B0=84=EC=9D=B4=20=ED=88=B4=EB=B0=94?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/css/main.css | 11 +++++++++++ hwe/index.php | 16 ++++++++++++---- hwe/js/main.js | 1 + 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/hwe/css/main.css b/hwe/css/main.css index 05cee077..983d3c9b 100644 --- a/hwe/css/main.css +++ b/hwe/css/main.css @@ -67,4 +67,15 @@ color:white; .nation_info td{ height:18px; +} + +#sidebar{ + position:fixed; + right:0; + top: 50%; + transform: translateY(-50%); +} + +#sidebar button{ + /*width:100px;*/ } \ No newline at end of file diff --git a/hwe/index.php b/hwe/index.php index 1f78ed45..c254a492 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -117,6 +117,7 @@ $(function(){ + @@ -233,7 +234,7 @@ else if($session->userGrade == 4){ ?> - +
@@ -279,7 +280,7 @@ else if($session->userGrade == 4){
- +
@@ -305,11 +306,11 @@ else if($session->userGrade == 4){
-
전체 메시지(최고99자)
+
전체 메시지(최고99자)
-
개인 메시지(최고99자)
+
개인 메시지(최고99자)
@@ -325,6 +326,13 @@ else if($session->userGrade == 4){
+ Date: Sun, 3 Feb 2019 02:18:07 +0900 Subject: [PATCH 11/13] =?UTF-8?q?=ED=95=9C=EC=B9=B8=20=EB=9D=84=EC=9B=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwe/index.php b/hwe/index.php index c254a492..c5c2e545 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -266,7 +266,7 @@ else if($session->userGrade == 4){ - From a53db257cf35a75a75facf594459950a7753cf8d Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 14 Feb 2019 21:28:15 +0900 Subject: [PATCH 12/13] =?UTF-8?q?=EC=99=B8=EA=B5=90=EB=B6=80=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/j_diplomacy_get_letter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hwe/j_diplomacy_get_letter.php b/hwe/j_diplomacy_get_letter.php index e47bc957..b7fa163c 100644 --- a/hwe/j_diplomacy_get_letter.php +++ b/hwe/j_diplomacy_get_letter.php @@ -43,8 +43,8 @@ foreach( ) as $letter ){ - if($permission < 3 && $letter['detail']){ - $letter['detail'] = '(권한이 부족합니다)'; + if($permission < 3 && $letter['text_detail']){ + $letter['text_detail'] = '(권한이 부족합니다)'; } $letter['aux'] = Json::decode($letter['aux']); $letter['src'] = $letter['aux']['src']; From 03fc7a579a600ac4b65d12128ded035177143ccd Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 17 Feb 2019 23:57:26 +0900 Subject: [PATCH 13/13] =?UTF-8?q?=EB=B9=84=EC=9E=AC=EC=95=BC=EB=A7=9D?= =?UTF-8?q?=EB=AA=85=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/Engine/Personnel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwe/sammo/Engine/Personnel.php b/hwe/sammo/Engine/Personnel.php index eaa0934e..d72abca3 100644 --- a/hwe/sammo/Engine/Personnel.php +++ b/hwe/sammo/Engine/Personnel.php @@ -177,9 +177,9 @@ class Personnel{ $setOriginalCityValues['gen3'] = 0; } - $setValues['betray'] = $db->sqleval('betray + 1'); $setValues['experience'] = $db->sqleval('experience * (1 - 0.1 * betray)');//XXX: 상수 $setValues['dedication'] = $db->sqleval('dedication * (1 - 0.1 * betray)');//XXX: 상수 + $setValues['betray'] = $db->sqleval('betray + 1'); } else{ //재야이면 100 100 증가
장수 동향 개인 기록
+
;color:white;width:110px;font-size:13px; value='실 행' onclick='refreshing(this, 3,form2)'>;color:white;width:110px;font-size:13px; value='갱 신' onclick='refreshing(this, 0,0)'>;color:white;width:160px;font-size:13px; value='로비로' onclick=location.replace('../')>