Add files via upload

character/refresh.js

@@ -94,6 +94,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				direct:true,
 				content:function(){
 					"step 0"
+					_status.noclearcountdown=true;
 					event.videoId=lib.status.videoId++;
 					var cards=player.storage.rehuashen.character.slice(0);
 					if(player.isOnline2()){
@@ -115,6 +116,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						if(player.isOnline2()){
 							player.send('closeDialog',event.videoId);
 						}
+						delete _status.noclearcountdown;
+						if(!_status.noclearcountdown){
+							game.stopCountChoose();
+						}
 						event.dialog.close();
 						event.finish();return;
 					}
@@ -195,6 +200,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						player.send('closeDialog',event.videoId);
 					}
 					event.dialog.close();
+					delete _status.noclearcountdown;
+					if(!_status.noclearcountdown){
+						game.stopCountChoose();
+					}
 					if(event.control=='弃置化身') return;
 					if(player.storage.rehuashen.current!=event.card){
 						player.storage.rehuashen.current=event.card;

character/sp.js

@@ -2242,6 +2242,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					"step 3"
 					if(result.control=="手动分配"){
 						event.map=[cards,[],[]];
+						_status.noclearcountdown=true;
 						event.goto(8);
 					}
 					else if(!_status.connectMode){
@@ -2335,6 +2336,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 								target.send('closeDialog',event.videoId);
 							}
 							event.dialog.close();
+							delete _status.noclearcountdown;
+							if(!_status.noclearcountdown){
+								game.stopCountChoose();
+							}
 							event.togain=[event.map[1],event.map[2],event.map[0]];
 							target.showCards(event.togain[0],get.translation(target)+'分出的第一份牌');
 							event.goto(5);
@@ -2375,6 +2380,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							target.send('closeDialog',event.videoId);
 						}
 						event.dialog.close();
+						delete _status.noclearcountdown;
+						if(!_status.noclearcountdown){
+							game.stopCountChoose();
+						}
 						game.cardsDiscard(cards);
 						player.addTempSkill('yanjiao2');
 						event.finish();
@@ -3811,6 +3820,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				subSkill:{
 					mark:{
+						charlotte:true,
+						locked:true,
 						mark:true,
 						intro:{
 							content:'已获得“傀”标记'

character/xinghuoliaoyuan.js

@@ -4793,9 +4793,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					player.markSkill('yizan_use');
 				},
 			},
+			xinfu_jingxie:{audio:2},
 			"xinfu_jingxie1":{
 				group:["xinfu_jingxie2"],
 				position:"he",
+				audio:'xinfu_jingxie',
 				enable:"phaseUse",
 				filter:function(event,player){
 					var he=player.getCards('he');
@@ -4829,7 +4831,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 			"xinfu_jingxie2":{
 				prompt:"出牌阶段，你可以展示一张未强化过的【诸葛连弩】或标准包/军争包/SP包中的防具牌，然后对其进行强化。当你处于濒死状态时，你可以重铸一张防具牌，将体力回复至1点。",
-				audio:2,
+				audio:'xinfu_jingxie',
 				enable:"chooseToUse",
 				filterCard:function (card){
 					return get.subtype(card)=='equip2';

character/yijiang.js

@@ -6417,7 +6417,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						var next=event.current.chooseToRespond('是否替'+get.translation(player)+'对'+get.translation(target)+'使用一张杀',
 						function(card,player,event){
 							var evt=event||_status.event;
-							return card.name=='sha'||evt.source.canUse(card,evt.target);
+							return card.name=='sha'&&evt.source.canUse(card,evt.target);
 						});
 						next.set('ai',function(card){
 							var event=_status.event;