From 5059a554d112547bf9c48b75ee1d0312caf44d53 Mon Sep 17 00:00:00 2001
From: copcap <copcap@outlook.com>
Date: Fri, 28 Jul 2023 17:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=87=BA=E6=B8=B8?=
 =?UTF-8?q?=E6=88=8F=E7=9A=84=E8=A7=92=E8=89=B2=E6=B2=A1=E6=9C=89actionHis?=
 =?UTF-8?q?tory=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/mobile.js | 12 +++++++++++-
 game/game.js        |  6 ++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/character/mobile.js b/character/mobile.js
index 421648885..4f7588520 100644
--- a/character/mobile.js
+++ b/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:'目前的曲库',
diff --git a/game/game.js b/game/game.js
index c3bad7aa0..ff30ea3c3 100644
--- a/game/game.js
+++ b/game/game.js
@@ -29208,14 +29208,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){