Merge pull request #177 from copcap/dev

bug修复

character/extra.js

@@ -35,7 +35,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			db_key_hina:['female','key',3,['hina_shenshi','hina_xingzhi'],['doublegroup:key:shen']],
 			
 			shen_sunce:['male','shen','1/6',['yingba','scfuhai','pinghe'],['wu']],
-			shen_xunyu:['male','shen',3,['tianzuo','lingce','dinghan'],['wei']],
+			shen_xunyu:['male','shen',3,['tianzuo','lingce','dinghan'],['wei','clan:颍川荀氏']],
 			shen_taishici:['male','shen',4,['dulie','tspowei'],['wu']],
 			shen_guojia:['male','shen',3,['reshuishi','stianyi','resghuishi'],['wei']],
 			shen_diaochan:['female','shen',3,['meihun','huoxin'],['qun']],

character/mobile.js

@@ -1041,6 +1041,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							game.log(trigger.player,'移回了游戏');
 							delete _status.mbmowang_return[trigger.player.playerid];
 							trigger.player.recover(trigger.player.maxHp-trigger.player.hp);
+							game.broadcastAll(function(player){
+								if(player.name1=='shichangshi'){
+									player.smoothAvatar(false);
+									player.node.avatar.setBackground(player.name1,'character');
+								}
+								if(player.name2=='shichangshi'){
+									player.smoothAvatar(true);
+									player.node.avatar2.setBackground(player.name2,'character');
+								}
+							},trigger.player);
 							'step 1'
 							event.trigger('restEnd');
 						}
@@ -19803,7 +19813,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			spjianyi_info:'锁定技。其他角色的回合结束时，若弃牌堆中有于本回合内因弃置而进入弃牌堆的防具牌，则你获得其中一张。',
 			spshangyi:'尚义',
 			spshangyi_info:'出牌阶段限一次。你可以弃置一张牌并选择一名其他角色。其观看你的手牌，然后你观看其手牌并获得其中的一张。',
-			sunhanhua:'孙寒华',
+			sunhanhua:'手杀孙寒华',
 			chongxu:'冲虚',
 			chongxu_info:'出牌阶段限一次，你可以随机演奏一首音乐，并根据完成度来获得相应的分数（至多五分）。然后你可修改〖妙剑〗或〖莲华〗（消耗3分），并使用剩余的分数进行摸牌（每张2分）。',
 			chongxu_faq:'目前的曲库',

character/offline.js

@@ -283,7 +283,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				check:function(event,player){
 					return get.attitude(player,event.source)>=0||
-						get.attitude(player,event.source)>=-4&&get.distance(_status.currentPhase,player,'absolute')>get.distance(_status.currentPhase,trigger.source,'absolute')
+						get.attitude(player,event.source)>=-4&&get.distance(_status.currentPhase,player,'absolute')>get.distance(_status.currentPhase,event.source,'absolute');
 				},
 				content:function(){
 					'step 0'

character/shenhua.js

@@ -29,7 +29,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 
 			sp_zhugeliang:['male','shu',3,['huoji','bazhen','kanpo']],
 			pangtong:['male','shu',3,['lianhuan','oldniepan']],
-			xunyu:['male','wei',3,['quhu','jieming']],
+			xunyu:['male','wei',3,['quhu','jieming'],['clan:颍川荀氏']],
 			dianwei:['male','wei',4,['qiangxix']],
 			taishici:['male','wu',4,['tianyi']],
 			yanwen:['male','qun',4,['shuangxiong']],

character/standard.js

@@ -1110,7 +1110,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			guanxing_fail:{},
 			guanxing:{
 				audio:2,
-				audioname:['jiangwei','re_jiangwei','re_zhugeliang'],
+				audioname:['jiangwei','re_jiangwei','re_zhugeliang','ol_jiangwei'],
 				trigger:{player:'phaseZhunbeiBegin'},
 				frequent:true,
 				preHidden:true,

character/yijiang.js

@@ -94,7 +94,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			sunziliufang:['male','wei',3,['guizao','jiyu']],
 
 			xinxianying:['female','wei',3,['zhongjian','caishi']],
-			wuxian:['female','shu',3,['fumian','daiyan']],
+			wuxian:['female','shu',3,['fumian','daiyan'],['clan:陈留吴氏']],
 			xushi:['female','wu',3,['wengua','fuzhu']],
 			caojie:['female','qun',3,['shouxi','huimin']],
 

game/game.js

@@ -29316,14 +29316,16 @@
 						useCard:[],
 						changeHp:[],
 					});
-					game.countPlayer2(function(current){
+					var players=game.players.slice(0).concat(game.dead);
+					for(var i=0;i<players.length;i++){
+						var current=players[i];
 						current.actionHistory.push({useCard:[],respond:[],skipped:[],lose:[],gain:[],sourceDamage:[],damage:[],custom:[],useSkill:[]});
 						current.stat.push({card:{},skill:{}});
 						if(isRound){
 							current.getHistory().isRound=true;
 							current.getStat().isRound=true;
 						}
-					});
+					};
 					player.getHistory().isMe=true;
 					player.getStat().isMe=true;
 					if(isRound){