From 574719e77341a38339def742d9a90bb3ba145f7f Mon Sep 17 00:00:00 2001
From: copcap <copcap@outlook.com>
Date: Fri, 21 Jul 2023 18:32:35 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/mobile.js  |  7 +++----
 character/refresh.js |  8 ++++++++
 character/tw.js      | 11 +++++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/character/mobile.js b/character/mobile.js
index 0b8d28ce4..c0622d352 100644
--- a/character/mobile.js
+++ b/character/mobile.js
@@ -2360,8 +2360,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 			//沮授
 			xinjianying:{
-				audio:'jianying',
-				audioname:['xin_jushou'],
+				audio:2,
 				subfrequent:['draw'],
 				group:['xinjianying_draw'],
 				enable:'phaseUse',
@@ -2449,7 +2448,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					result:{player:1},
 				},
 				subSkill:{
-					draw:{inherit:'jianying',audio:'jianying',audioname:['xin_jushou']},
+					draw:{inherit:'jianying',audio:'xinjianying'},
 				},
 			},
 			//刘巴
@@ -18822,7 +18821,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			duansuo_info:'出牌阶段限一次。你可以重置任意名处于连环状态的角色，然后对这些角色各造成1点火焰伤害。',
 			sp_pengyang:'彭羕',
 			spdaming:'达命',
-			spdaming_info:'①游戏开始时，你获得2点“达命”值。②其他角色A的出牌阶段限一次。其可以交给你一张牌，然后你选择令一名其他角色B。若B有与此牌相同类型的牌，其将一张该类型的牌交给A，你获得1点“达命”值；否则你将此牌交给A。',
+			spdaming_info:'①游戏开始时，你获得2点“达命”值。②其他角色A的出牌阶段限一次。其可以交给你一张牌，然后你选择另一名其他角色B。若B有与此牌相同类型的牌，其将一张该类型的牌交给A，你获得1点“达命”值；否则你将此牌交给A。',
 			spxiaoni:'嚣逆',
 			spxiaoni_info:'①出牌阶段限一次。若你的“达命”值大于0，你可以将一张牌当任意一种【杀】或伤害类锦囊牌使用。然后你减少等同于此牌指定目标数的“达命”值。②你的手牌上限基数为X（X为“达命”值，且至多为你的体力值，至少为0）。',
 			xin_zhuhuan:'手杀朱桓',
diff --git a/character/refresh.js b/character/refresh.js
index 300e2bc19..8da8af055 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -213,6 +213,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				filter:function(event,player){
 					if(event.type!='discard') return false;
 					if(player.hasSkill('olguzheng_used')) return false;
+					var phaseName;
+					for(var name of lib.phaseName){
+						var evt=event.getParent(name);
+						if(!evt||evt.name!=name) continue;
+						phaseName=name;
+						break;
+					}
+					if(!phaseName) return false;
 					return game.hasPlayer(current=>{
 						if(current==player) return false;
 						var evt=event.getl(current);
diff --git a/character/tw.js b/character/tw.js
index b496db793..e0e4bd63f 100644
--- a/character/tw.js
+++ b/character/tw.js
@@ -527,15 +527,22 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						mark:true,
 						forced:true,
 						intro:{
+							markcount:function(storage,player){
+								var max=0;
+								for(var id in storage){
+									if(storage[id]>max) max=storage[id];
+								}
+								return max;
+							},
 							content:function(storage,player){
 								if(!storage) return '';
 								var str='';
 								var map=(_status.connectMode?lib.playerOL:game.playerMap);
-								for(var id of storage){
+								for(var id in storage){
 									str+='至'+get.translation(map[id])+'的距离-'+storage[id]+'、';
 								}
 								return str.slice(0,-1);
-							}
+							},
 						},
 						content:function(){
 							delete player.storage.twxianfeng_others[trigger.player.playerid];