From dd762f66e6c1ad1a331e999005c16c5bf0d88a80 Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Wed, 6 Apr 2016 18:34:18 +0800
Subject: [PATCH] 1

---
 character/hearth.js  |  3 ++-
 character/shenhua.js |  3 +++
 game/game.js         | 11 +++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/character/hearth.js b/character/hearth.js
index c99cbe961..8b6c0d91a 100755
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -163,6 +163,7 @@ character.hearth={
 					player.skills.remove(link);
 					player.additionalSkills.maoxian=link;
 					player.popup(link);
+					game.log(player,'获得了技能','【'+get.translation(link)+'】')
 					var name=event.map[link];
 					var target;
 					for(var i=0;i<game.players.length;i++){
@@ -173,7 +174,7 @@ character.hearth={
 							target=game.players[i];break;
 						}
 					}
-					if(target){
+					if(target&&(target.name==name||(target.name2==name&&!target.classList.contains('unseen2')))){
 						player.line(target,'green');
 						player.markSkillCharacter('maoxian',target,get.translation(link),lib.translate[link+'_info']);
 					}
diff --git a/character/shenhua.js b/character/shenhua.js
index 1aebcbde0..e7d61f5ef 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -2622,6 +2622,9 @@ character.shenhua={
 		liegong:{
 			audio:2,
 			trigger:{player:'shaBegin'},
+			check:function(event,player){
+				return ai.get.attitude(player,event.target)<=0;
+			},
 			filter:function(event,player){
 				var length=event.target.num('h');
 				return (length>=player.hp||length<=get.attackRange(player));
diff --git a/game/game.js b/game/game.js
index 9db084b6e..d2cbfc46d 100755
--- a/game/game.js
+++ b/game/game.js
@@ -14176,8 +14176,9 @@
                     lib.config.recentCharacter.unshift(arguments[i]);
                 }
             }
-            if(lib.config.recentCharacter.length>parseInt(lib.config.recent_character_number)){
-                lib.config.recentCharacter.splice(0,12);
+            var num=parseInt(lib.config.recent_character_number);
+            if(lib.config.recentCharacter.length>num){
+                lib.config.recentCharacter.splice(num);
             }
             game.saveConfig('recentCharacter',lib.config.recentCharacter);
         },
@@ -25377,9 +25378,15 @@
 			a:function(name){
 				if(lib.storage.test&&!name){
 					game.save('test',false);
+                    if(lib.config.mode=='identity'){
+                        game.saveConfig('double_character',false,true);
+                    }
 				}
 				else{
 					game.save('test',name||true);
+                    if(lib.config.mode=='identity'){
+                        game.saveConfig('double_character',true,true);
+                    }
 				}
 				game.reload();
 			},