From a0beb0d011d13ad533370702f56c898b3ca68760 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Mon, 20 Feb 2017 20:47:48 +0800
Subject: [PATCH] des

---
 game/game.js            | 22 ++++++++++++++++++++--
 layout/default/menu.css | 10 +++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/game/game.js b/game/game.js
index a126347e8..763c9444d 100644
--- a/game/game.js
+++ b/game/game.js
@@ -26306,6 +26306,11 @@
                                             options.childNodes[i].lastChild.checked=false;
                                         }
     								}
+									for(var i=0;i<info[4].length;i++){
+										if(info[4][i].indexOf('des:')==0){
+											newCharacter.querySelector('.new_des').value=info[4][i].slice(4);
+										}
+									}
     							}
 
     							var skills=info[3];
@@ -26493,8 +26498,9 @@
 
     						ui.create.div('.select_avatar','选择头像',fakeme);
 
-    						ui.create.div('.indent','姓名：<input class="new_name" type="text">',newCharacter).style.paddingTop='10px';
-    						ui.create.div('.indent','体力：<input class="new_hp" type="text">',newCharacter).style.paddingTop='10px';
+							ui.create.div('.indent','姓名：<input class="new_name" type="text">',newCharacter).style.paddingTop='8px';
+    						ui.create.div('.indent','介绍：<input class="new_des" type="text">',newCharacter).style.paddingTop='8px';
+    						ui.create.div('.indent','体力：<input class="new_hp" type="text">',newCharacter).style.paddingTop='8px';
                             newCharacter.querySelector('input.new_name').onblur=updateButton;
     						var sexes=ui.create.selectlist([
     							['male','男'],
@@ -26664,6 +26670,10 @@
                                 if(tags.contains('boss')){
                                     tags.add('bossallowed');
                                 }
+								var des=page.querySelector('input.new_des').value;
+								if(des){
+									tags.add('des:'+des);
+								}
 
                                 page.content.pack.translate[name]=translate;
                                 page.content.pack.character[name]=[sexes.value,groups.value,hp,skills,tags];
@@ -34739,6 +34749,14 @@
         },
 		characterIntro:function(name){
 			if(lib.characterIntro[name]) return lib.characterIntro[name];
+			var tags=lib.character[name][4];
+			if(tags){
+				for(var i=0;i<tags.length;i++){
+					if(tags[i].indexOf('des:')==0){
+						return tags[i].slice(4);
+					}
+				}
+			}
 			if(name.indexOf('_')!=-1){
 				name=name.slice(name.indexOf('_')+1);
 			}
diff --git a/layout/default/menu.css b/layout/default/menu.css
index ea4a1d46f..cca59e58d 100644
--- a/layout/default/menu.css
+++ b/layout/default/menu.css
@@ -597,7 +597,7 @@
 	left:12px;
 	position: absolute;
 	width: 100px;
-	height: 120px;
+	height: 130px;
 	margin: 0;
 }
 .menu-buttons>.new_character>.card{
@@ -640,7 +640,7 @@
 	width: 100%;
 	height: 20px;
 	line-height: 20px;
-	top:50px;
+	top:55px;
 	left:0;
 	text-align: center;
 }
@@ -669,13 +669,13 @@
 .menu-buttons>.new_character>.add_skill{
 	position: absolute;
 	left: 12px;
-	top:170px;
+	top:180px;
 	text-align: left;
 	line-height: 20px;
 	white-space: nowrap;
 }
 .menu-buttons>.new_character>.add_skill.options{
-	top:145px;
+	top:155px;
 }
 .menu-buttons>.new_character>.add_skill.options>span{
 	margin-right: 10px;
@@ -1023,7 +1023,7 @@
 	transform: translateX(200px);
 }
 #create-extension>.menu-buttons>.new_character>.skill_list{
-    top: 210px;
+    top: 220px;
 }
 #create-extension>.menu-buttons>.new_character>.skill_list>div:first-child{
 	transition: all 0s;