yijiang

character/sp.js

@@ -4872,7 +4872,7 @@ character.sp={
 			audio:false,
 			content:function(){
 				"step 0"
-				if(player.storage.bifa[1].isAlive()){
+				if(player.storage.bifa[1].isAlive()&&player.num('h')){
 					player.chooseCard(get.translation(player.storage.bifa[1])+
 						'的笔伐牌为'+get.translation(player.storage.bifa[0]),function(card){
 						return get.type(card,'trick')==_status.event.type;
@@ -4892,7 +4892,7 @@ character.sp={
 				else{
 					ui.discardPile.appendChild(player.storage.bifa[0]);
 					game.log(player.storage.bifa[0],'进入弃牌堆');
-					player.$throw(player.storage.bifa[0]);
+					player.$throw(player.storage.bifa[0],1000);
 					player.loseHp();
 				}
 				player.removeSkill('bifa2');

character/standard.js

@@ -605,11 +605,10 @@ character.standard={
 			audio:2,
 			audioname:['liushan'],
 			enable:'chooseToUse',
-			usable:20,
 			filter:function(event,player){
 				if(event.filterCard&&!event.filterCard({name:'sha'},player)) return false;
 				if(!player.isZhu) return false;
-				if(player!=game.me&&player.skills.contains('jijiang3')) return false;
+				if(player.skills.contains('jijiang3')) return false;
 				for(var i=0;i<game.players.length;i++){
 					if(game.players[i].group=='shu'&&game.players[i]!=player){
 						return lib.filter.cardUsable({name:'sha'},player);
@@ -629,7 +628,7 @@ character.standard={
 				"step 0"
 				if(event.current==undefined) event.current=player.next;
 				if(event.current==player){
-					player.addTempSkill('jijiang3','phaseAfter');
+					player.addSkill('jijiang3');
 					event.getParent(2).step=0;
 					event.finish();
 				}
@@ -682,7 +681,18 @@ character.standard={
 				},
 			}
 		},
-		jijiang3:{},
+		jijiang3:{
+			trigger:{global:['useCardAfter','useSkillAfter','phaseAfter']},
+			forced:true,
+			popup:false,
+			silent:true,
+			filter:function(event){
+				return event.skill!='jijiang2'&&event.skill!='qinwang2';
+			},
+			content:function(){
+				player.removeSkill('jijiang3');
+			}
+		},
 		wusheng:{
 			audio:3,
 			enable:['chooseToRespond','chooseToUse'],

game/asset.js

@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-    '1.8.4',
+    '1.8.5',
     'image/background/huangtian_bg.jpg',
     'image/background/shengshi_bg.jpg',
     'image/background/xueji_bg.jpg',
@@ -1231,7 +1231,7 @@ window.noname_asset_list=[
     'audio/die/zhoutai.mp3',
     'audio/die/zhouyu.mp3',
     'audio/die/zhugedan.mp3',
-    'audio/die/zhugeguo.ogg',
+    'audio/die/zhugeguo.mp3',
     'audio/die/zhugejin.mp3',
     'audio/die/zhugeke.mp3',
     'audio/die/zhugeliang.mp3',

game/game.js

@@ -8143,7 +8143,7 @@
 						else if(get.itemtype(arguments[i])=='select'||typeof arguments[i]=='number') select=arguments[i];
 					}
 					if(prompt==undefined) prompt='请选择卡牌';
-					return this.chooseButton([prompt,cards,'hidden'],forced,select,'hidden');
+					return this.chooseButton(forced,select,'hidden',[prompt,cards,'hidden']);
 				},
 				chooseButton:function(){
 					var next=game.createEvent('chooseButton');
@@ -9645,9 +9645,10 @@
 				isIn:function(){
 					return this.classList.contains('dead')==false&&this.classList.contains('out')==false&&!this.removed;
 				},
-				isUnderControl:function(self){
+				isUnderControl:function(self,me){
+                    me=me||game.me;
 					if(this.isMad()) return false;
-					if(this===game.me){
+					if(this===me){
 						if(self) return true;
 						return false;
 					}
@@ -9655,17 +9656,17 @@
 					if(lib.config.mode=='versus'){
 						if(_status.mode=='four'||_status.mode=='jiange') return false;
 						return ui.autoreplace&&ui.autoreplace.classList.contains('on')&&
-							this.side==game.me.side;
+							this.side==me.side;
 					}
 					else if(lib.config.mode=='boss'){
-						return this.side==game.me.side&&get.config('single_control');
+						return this.side==me.side&&get.config('single_control');
 					}
 					else if(lib.config.mode=='chess'){
 						if(_status.mode=='combat'&&!get.config('single_control')) return false;
-						return this.side==game.me.side;
+						return this.side==me.side;
 					}
                     else if(lib.config.mode=='story'){
-                        return this.side==game.me.side;
+                        return this.side==me.side;
                     }
 					return false;
 				},
@@ -11189,7 +11190,7 @@
                     return parent;
                 },
                 getTrigger:function(){
-                    return this.getTrigger();
+                    return this.getParent()._trigger;
                 },
 				backup:function(skill){
 					this._backup={
@@ -11985,11 +11986,11 @@
                         },player);
 					}
 					_status.currentPhase=player;
+					game.phaseNumber++;
                     game.syncState();
 					game.addVideo('phaseChange',player);
 					game.log();
 					game.log(player,'的回合开始');
-					game.phaseNumber++;
 					player._noVibrate=true;
 					if(get.config('identity_mode')!='zhong'&&!_status.connectMode){
 						var num;