From c87bf820c312782072dd52b2b9bf30a7af9a11c6 Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Sun, 20 Mar 2016 19:10:58 +0800
Subject: [PATCH] f

---
 card/extra.js     |  1 +
 character/rank.js |  1 +
 game/game.js      | 13 ++++++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/card/extra.js b/card/extra.js
index 66974dea7..9ee445dbd 100755
--- a/card/extra.js
+++ b/card/extra.js
@@ -495,6 +495,7 @@ card.extra={
 	},
 	translate:{
 		jiu:'酒',
+		jiu_info:'出牌阶段，对自己使用，令自己的下一张使用的【杀】造成的伤害+1（每回合限使用1次）； 任何时候，当自己进入濒死阶段时，对自己使用，立即回复1点体力值',
 		huogong:'火攻',
 		tiesuo:'铁锁连环',
 		huogong_bg:'攻',
diff --git a/character/rank.js b/character/rank.js
index 598841619..b4b5e4268 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -174,6 +174,7 @@ window.characterRank={
         'swd_xiyan',
     ],
     bp:[
+        'hs_yelise',
         'hs_loatheb',
         'hs_alextrasza',
         'hs_xuanzhuanjijia',
diff --git a/game/game.js b/game/game.js
index 3132b6ecf..dc2a58ef5 100755
--- a/game/game.js
+++ b/game/game.js
@@ -2959,6 +2959,13 @@
 						}
 					}
 				}
+				if(lib.config.all.mode.length==0){
+					lib.config.all.mode.push('identity');
+					lib.translate.identity='身份';
+					if(!lib.config.gameRecord.identity){
+						lib.config.gameRecord.identity={data:{}};
+					}
+				}
 				if(background&&background.pack){
 					for(i in background.pack){
 						lib.configMenu.appearence.config.image_background.item[i]=background.pack[i];
@@ -16454,7 +16461,6 @@
 						(function(){
 							var page=ui.create.div('.menu-buttons');
 	                        var node=ui.create.div('.menubutton.large','牌堆',clickMode);
-							ui.customCharacter=node;
 							start.firstChild.insertBefore(node,start.firstChild.querySelector('.lefttext'));
 							node.link=page;
 							node.mode='cardpile';
@@ -16538,6 +16544,7 @@
 							var input=exportCardPile.firstChild.lastChild.previousSibling;
 							input.value='自定义牌堆';
 							input.style.marginRight='3px';
+							input.style.width='120px';
 							exportCardPile.firstChild.lastChild.onclick=function(){
 								var name=input.value;
 								var ok=true;
@@ -22717,8 +22724,8 @@
 
 				var pilecfg=lib.config.customcardpile[get.config('cardpilename')];
 				if(pilecfg){
-					lib.config.bannedpile=pilecfg[0];
-					lib.config.addedpile=pilecfg[1];
+					lib.config.bannedpile=pilecfg[0]||{};
+					lib.config.addedpile=pilecfg[1]||{};
 				}
 				for(i in card){
 					lib.cardPack[i]=[];