From 0930a3bcb5b49210684a080bf49e3dbe3ac01c7d Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Sun, 3 Apr 2016 10:19:24 +0800
Subject: [PATCH] fix2

---
 game/game.js     |  2 +-
 game/update.js   |  3 ++-
 mode/identity.js | 28 ++++++++++++++++++++--------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/game/game.js b/game/game.js
index f3d30c086..06af92f98 100755
--- a/game/game.js
+++ b/game/game.js
@@ -8624,7 +8624,7 @@
 						}
 						else{
 							var hiddenCard=get.info(skills[i]).hiddenCard;
-							if(typeof hiddenCard=='function'&&hiddenCard(player,'wuxie')){
+							if(typeof hiddenCard=='function'&&hiddenCard(this,'wuxie')){
 								return true;
 							}
 						}
diff --git a/game/update.js b/game/update.js
index 3e076c76e..a9acbdf3b 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,6 +1,7 @@
 window.noname_update={
-    version:'1.8.2.1',
+    version:'1.8.2.2',
     changeLog:[
+        '修复一个卡死问题',
         '联机预览版（身份模式，标准包）',
         '新卡牌样式（by @_游离感_ ）',
     ]
diff --git a/mode/identity.js b/mode/identity.js
index 6fc6b4b98..b8fb6cfeb 100755
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -939,14 +939,15 @@ mode.identity={
 				game.me.setIdentity();
 
 				for(var i=0;i<game.players.length;i++){
-					game.players[i].send(function(zhu,me,identity){
+					game.players[i].send(function(zhu,zhuid,me,identity){
 						for(var i in lib.playerOL){
 							lib.playerOL[i].setIdentity('cai');
 						}
 						zhu.identityShown=true;
-						zhu.setIdentity('zhu');
+						zhu.identity=zhuid;
+						zhu.setIdentity();
 						me.setIdentity(identity);
-					},game.zhu,game.players[i],game.players[i].identity);
+					},game.zhu,game.zhu.identity,game.players[i],game.players[i].identity);
 				}
 
 				var list;
@@ -1000,10 +1001,16 @@ mode.identity={
 				event.list.remove(game.zhu.name);
 				event.list.remove(game.zhu.name2);
 
+				game.zhu.maxHp++;
+				game.zhu.hp++;
+				game.zhu.update();
 				game.broadcast(function(zhu,name,name2){
 					if(game.zhu!=game.me){
 						zhu.init(name,name2);
 					}
+					zhu.maxHp++;
+					zhu.hp++;
+					zhu.update();
 				},game.zhu,game.zhu.name,game.zhu.name2);
 
 				var list=[];
@@ -1011,10 +1018,15 @@ mode.identity={
 				for(var i=0;i<game.players.length;i++){
 					if(game.players[i]!=game.zhu){
 						var num;
-						switch(game.players[i].identity){
-							case 'zhong':num=4;break;
-							case 'nei':num=5;break;
-							default:num=3;break;
+						if(event.zhongmode){
+							num=3;
+						}
+						else{
+							switch(game.players[i].identity){
+								case 'zhong':num=4;break;
+								case 'nei':num=5;break;
+								default:num=3;break;
+							}
 						}
 						list.push([game.players[i],['选择角色',[event.list.randomRemove(num),'character']],selectButton,true]);
 					}
@@ -1180,7 +1192,7 @@ mode.identity={
 				if(this.ai.shown>0.95) this.ai.shown=0.95;
 				if(this.ai.shown<-0.5) this.ai.shown=-0.5;
 
-				var marknow=(this!=game.me&&get.config('auto_mark_identity')&&this.ai.identity_mark!='finished');
+				var marknow=(!_status.connectMode&&this!=game.me&&get.config('auto_mark_identity')&&this.ai.identity_mark!='finished');
 				if(true){
 					if(marknow&&_status.clickingidentity&&_status.clickingidentity[0]==this){
 						for(var i=0;i<_status.clickingidentity[1].length;i++){