From 8728635136f90cd8e0e811fc4c64790154cebfe6 Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Fri, 19 May 2017 06:15:32 +0800
Subject: [PATCH] n

---
 card/extra.js         |  2 +-
 card/gujian.js        | 10 ++++----
 card/guozhan.js       |  2 +-
 card/gwent.js         |  6 ++---
 card/hearth.js        | 10 ++++----
 card/sp.js            |  2 +-
 card/standard.js      |  2 +-
 card/swd.js           | 14 +++++------
 card/yunchou.js       |  2 +-
 character/diy.js      |  2 +-
 character/extra.js    |  4 ++--
 character/gujian.js   |  4 ++--
 character/gwent.js    | 54 +++++++++++++++++++++++++++++++++++++++----
 character/hearth.js   | 12 +++++-----
 character/jiange.js   |  2 +-
 character/old.js      |  4 ++--
 character/ow.js       | 35 ++++++++++++++++++++--------
 character/refresh.js  |  6 ++---
 character/shenhua.js  | 11 +++++----
 character/sp.js       | 42 ++++++++++++++++-----------------
 character/swd.js      | 24 +++++++++----------
 character/xiake.js    |  2 +-
 character/xianjian.js | 14 +++++------
 character/yijiang.js  | 40 ++++++++++++++++----------------
 character/yxs.js      |  8 +++----
 game/game.js          |  5 +++-
 mode/boss.js          |  4 ++--
 mode/chess.js         |  2 +-
 mode/guozhan.js       |  2 +-
 mode/identity.js      |  2 +-
 mode/stone.js         |  8 +++----
 31 files changed, 200 insertions(+), 137 deletions(-)

diff --git a/card/extra.js b/card/extra.js
index d540cde1f..7f9f7b4c4 100644
--- a/card/extra.js
+++ b/card/extra.js
@@ -155,7 +155,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						target.damage('fire');
 					}
 					else{
-						target.addTempSkill('huogong2','phaseBegin');
+						target.addTempSkill('huogong2');
 					}
 					event.dialog.close();
 					game.addVideo('cardDialog',null,event.videoId);
diff --git a/card/gujian.js b/card/gujian.js
index a8e2a1d5b..23c988076 100644
--- a/card/gujian.js
+++ b/card/gujian.js
@@ -183,7 +183,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 	                target.storage.xiajiao=card;
 	                target.storage.xiajiao_markcount=3;
 	                target.addSkill('xiajiao');
-	                target.addTempSkill('xiajiao3','phaseAfter');
+	                target.addTempSkill('xiajiao3');
 	            },
 	            ai:{
 	                order:2,
@@ -589,7 +589,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 	                "step 4"
 	                if(cards&&cards.length){
 	                    player.gain(cards,'gain2');
-	                    target.addTempSkill('bingpotong','phaseAfter');
+	                    target.addTempSkill('bingpotong');
 	                }
 				},
 				ai:{
@@ -964,7 +964,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 	                else{
 	                    player.updateMarks();
 	                }
-	                player.addTempSkill('xiajiao3','phaseAfter');
+	                player.addTempSkill('xiajiao3');
 	            },
 	            group:'xiajiao_draw',
 	            subSkill:{
@@ -973,7 +973,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 	                    forced:true,
 	                    content:function(){
 	                        trigger.num++;
-	                        player.addTempSkill('xiajiao2','phaseAfter');
+	                        player.addTempSkill('xiajiao2');
 	                    }
 	                }
 	            }
@@ -1397,7 +1397,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 	                    }
 	                    if(card.storage.yuheng>=3){
 	                        card.init([card.suit,card.number,'yuheng_plus',card.nature]);
-	                        player.addTempSkill('yuheng_plus_temp','phaseAfter');
+	                        player.addTempSkill('yuheng_plus_temp');
 	                    }
 	                }
 	            },
diff --git a/card/guozhan.js b/card/guozhan.js
index 101a85595..20e14b03e 100644
--- a/card/guozhan.js
+++ b/card/guozhan.js
@@ -305,7 +305,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return target!=player;
 				},
 				content:function(){
-					target.addTempSkill('diaohulishan','phaseAfter');
+					target.addTempSkill('diaohulishan');
 				},
 				ai:{
 					order:10,
diff --git a/card/gwent.js b/card/gwent.js
index c63e7fdf9..776bc2742 100644
--- a/card/gwent.js
+++ b/card/gwent.js
@@ -783,7 +783,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
     				var dialog=ui.create.dialog('卜天术',[list,'vcard']);
 					var bing=target.countCards('h')<=1;
     				player.chooseButton(dialog,true,function(button){
-                        if(ai.get.effect(target,{name:button.link[2]},player,player)>0){
+                        if(get.effect(target,{name:button.link[2]},player,player)>0){
 							if(button.link[2]=='bingliang'){
                                 if(bing) return 2;
                                 return 0.7;
@@ -819,7 +819,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 							var eff=0;
 							for(var i in lib.card){
 								if(lib.card[i].type=='delay'){
-									var current=ai.get.effect(target,{name:i},player,player);
+									var current=get.effect(target,{name:i},player,player);
 									if(current>eff){
 										eff=current;
 									}
@@ -1100,7 +1100,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					useful:[4,1],
 					result:{
 						target:function(player,target){
-							var threaten=ai.get.threaten(target,player,true);
+							var threaten=get.threaten(target,player,true);
 							if(target.hujia){
 								threaten*=(target.hujia+1);
 							}
diff --git a/card/hearth.js b/card/hearth.js
index 292d91257..b1b60fcca 100644
--- a/card/hearth.js
+++ b/card/hearth.js
@@ -50,7 +50,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				modTarget:true,
 				content:function(){
 					if(_status.currentPhase==target){
-						target.addTempSkill('jihuocard2','phaseAfter');
+						target.addTempSkill('jihuocard2');
 					}
 					target.draw();
 				},
@@ -221,7 +221,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						target.damage('thunder');
 					}
 					else{
-						target.addTempSkill('huogong2','phaseBegin');
+						target.addTempSkill('huogong2');
 					}
 					game.addVideo('cardDialog',null,event.videoId);
 					event.dialog.close();
@@ -287,7 +287,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				},
 				selectTarget:-1,
 				content:function(){
-					player.addTempSkill('shihuawuqi','phaseAfter');
+					player.addTempSkill('shihuawuqi');
 					if(!player.countCards('h','sha')){
 						var card=get.cardPile('sha');
 						if(card){
@@ -397,10 +397,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					'step 1'
 					if(result.bool&&!target.hasSkill('chuansongmen3')){
 						if(target.hasSkill('chuansongmen2')){
-							target.addTempSkill('chuansongmen3','phaseAfter');
+							target.addTempSkill('chuansongmen3');
 						}
 						else{
-							target.addTempSkill('chuansongmen2','phaseAfter');
+							target.addTempSkill('chuansongmen2');
 						}
 						target.gain(cards,'gain2');
 					}
diff --git a/card/sp.js b/card/sp.js
index 0be0349eb..ca29b5536 100644
--- a/card/sp.js
+++ b/card/sp.js
@@ -416,7 +416,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				},
 				effect:function(){
 					if(result.bool==false){
-						player.addTempSkill('caomu_skill','phaseAfter');
+						player.addTempSkill('caomu_skill');
 					}
 				},
 				ai:{
diff --git a/card/standard.js b/card/standard.js
index 2e57e6280..a250a05a1 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -1016,7 +1016,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 									}
 								}
 								if(target.getEquip('baiyin')&&target.isDamaged()&&
-									ai.get.recoverEffect(target,player,player)>0){
+									get.recoverEffect(target,player,player)>0){
 									if(target.hp==1&&!target.hujia) return 1.6;
 									if(target.hp==2) return 0.01;
 									return 0;
diff --git a/card/swd.js b/card/swd.js
index c95b39ed9..009111495 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -48,7 +48,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					else{
 						player.$gain2(event.card1);
 						target.$gain2(event.card2);
-						target.addTempSkill('dujian2','phaseBegin');
+						target.addTempSkill('dujian2');
 					}
 					ui.arena.classList.remove('thrownhighlight');
 					game.addVideo('thrownhighlight2');
@@ -1790,7 +1790,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				},
 				content:function(){
 					player.storage.zhufangshenshi=target;
-					player.addTempSkill('zhufangshenshi','phaseAfter');
+					player.addTempSkill('zhufangshenshi');
 				},
 				ai:{
 					value:4,
@@ -2255,7 +2255,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					},trigger.player,-1).set('cardname',trigger.card.name).targetRequired=true;
 					'step 1'
 					if(result.bool){
-						player.addTempSkill('shenmiguo2','phaseAfter');
+						player.addTempSkill('shenmiguo2');
 					}
 					delete player.storage.shenmiguo;
 				}
@@ -2900,7 +2900,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						if(!hu.storage.shouna){
 							hu.storage.shouna=[];
 						}
-						player.addTempSkill('shouna2','phaseAfter');
+						player.addTempSkill('shouna2');
 						player.$gain2(cards);
 						for(var i=0;i<cards.length;i++){
 							hu.storage.shouna.push(cards[i]);
@@ -3414,7 +3414,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return _status.currentPhase!=player&&!player.hasSkill('hslingjian_xuanfengzhiren_equip3_dist');
 				},
 				content:function(){
-					player.addTempSkill('hslingjian_xuanfengzhiren_equip3_dist','phaseAfter');
+					player.addTempSkill('hslingjian_xuanfengzhiren_equip3_dist');
 				}
 			},
 			hslingjian_xuanfengzhiren_equip3_dist:{
@@ -3431,7 +3431,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return _status.currentPhase==player&&!player.hasSkill('hslingjian_xuanfengzhiren_equip4_dist');
 				},
 				content:function(){
-					player.addTempSkill('hslingjian_xuanfengzhiren_equip4_dist','phaseAfter');
+					player.addTempSkill('hslingjian_xuanfengzhiren_equip4_dist');
 				}
 			},
 			hslingjian_xuanfengzhiren_equip4_dist:{
@@ -3647,7 +3647,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return !player.hasSkill('qianxing');
 				},
 				content:function(){
-					player.addTempSkill('qianxing','phaseAfter');
+					player.addTempSkill('qianxing');
 				}
 			},
 			hslingjian_yinmilichang_equip3:{
diff --git a/card/yunchou.js b/card/yunchou.js
index 860ff1320..a9dbe13ce 100644
--- a/card/yunchou.js
+++ b/card/yunchou.js
@@ -654,7 +654,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				targetprompt:['被拿牌','得牌'],
 				content:function(){
 					"step 0"
-					target.addTempSkill('toulianghuanzhu2','phaseAfter');
+					target.addTempSkill('toulianghuanzhu2');
 					var hs=target.getCards('h');
 					event.num=Math.min(2,hs.length);
 					if(event.num){
diff --git a/character/diy.js b/character/diy.js
index be72a75ea..0395dc960 100644
--- a/character/diy.js
+++ b/character/diy.js
@@ -440,7 +440,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						}
 						else{
 							player.storage.kangyin2=player.maxHp-player.hp;
-							player.addTempSkill('kangyin2','phaseAfter');
+							player.addTempSkill('kangyin2');
 							event.finish();
 						}
 					}
diff --git a/character/extra.js b/character/extra.js
index 0cf4f842d..a2dffe3b4 100644
--- a/character/extra.js
+++ b/character/extra.js
@@ -193,7 +193,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				content:function(){
 					player.storage.baonu-=2;
-					player.addTempSkill('wushuang','phaseAfter');
+					player.addTempSkill('wushuang');
 				},
 				ai:{
 					order:5,
@@ -388,7 +388,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					player.storage.renjie--;
 					player.updateMarks();
-					player.addTempSkill('wansha','phaseAfter');
+					player.addTempSkill('wansha');
 				}
 			},
 			jilue_zhiheng:{
diff --git a/character/gujian.js b/character/gujian.js
index 1e6ef887f..2f7728324 100644
--- a/character/gujian.js
+++ b/character/gujian.js
@@ -613,7 +613,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				forced:true,
 				popup:false,
 				content:function(){
-					player.addTempSkill('meiying3','phaseAfter');
+					player.addTempSkill('meiying3');
 				}
 			},
 			meiying3:{},
@@ -844,7 +844,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					}
 					if(trigger.source){
 						trigger.source.storage.mingkong=true;
-						trigger.source.addTempSkill('mingkong2','phaseAfter');
+						trigger.source.addTempSkill('mingkong2');
 					}
 				},
 				ai:{
diff --git a/character/gwent.js b/character/gwent.js
index d4668f11f..083ea549f 100644
--- a/character/gwent.js
+++ b/character/gwent.js
@@ -34,7 +34,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gw_aokeweisite:['male','qun',4,['yunhuo']],
 			// gw_kaxier:['male','wu',4,[]],
 			gw_luobo:['male','qun',3,['junchi']],
-			// gw_mieren:['male','shu',3,[]],
+			gw_mieren:['male','shu',3,['lingji']],
 			gw_sanhanya:['male','shu',3,['gwjinyan']],
 			gw_shanhu:['female','qun',3,['shuijian']],
 			// gw_zhangyujushou:['male','wu',4,[]],
@@ -54,6 +54,48 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gw_yioufeisi:'国王还是乞丐，两者有何区别，人类少一个算一个',
 		},
 		skill:{
+			lingji:{
+				enable:'phaseUse',
+				usable:1,
+				content:function(){
+					'step 0'
+					player.draw(2);
+					'step 1'
+					player.chooseToDiscard('he',2,true).ai=function(card){
+						var val=get.value(card);
+						if(ui.selected.cards.length){
+							if(get.suit(card)==get.suit(ui.selected.cards[0])) val++;
+							if(get.number(card)==get.number(ui.selected.cards[0])) val+=3;
+						}
+						return val;
+					}
+					'step 2'
+					if(result.cards.length==2){
+						var list=[];
+						if(get.suit(result.cards[0])==get.suit(result.cards[1])){
+							var list1=get.typeCard('spell_bronze');
+							if(list1.length){
+								list.push(game.createCard(list1.randomGet()));
+							}
+						}
+						if(get.number(result.cards[0])==get.number(result.cards[1])){
+							var list2=get.typeCard('spell_silver');
+							if(list2.length){
+								list.push(game.createCard(list2.randomGet()));
+							}
+						}
+						if(list.length){
+							player.gain(list,'gain2');
+						}
+					}
+				},
+				ai:{
+					order:8,
+					result:{
+						player:1
+					}
+				}
+			},
 			gwjinyan:{
 				trigger:{player:['damageBegin','loseHpBegin']},
     			forced:true,
@@ -290,7 +332,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				filterCard:true,
 				check:function(card){
-					return 7-ai.get.value(card);
+					return 7-get.value(card);
 				},
 				filterTarget:true,
 				content:function(){
@@ -426,7 +468,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						target.chooseToDiscard('h',true);
 					}
 					if(target!=player){
-						target.addTempSkill('hunmo2','phaseAfter');
+						target.addTempSkill('hunmo2');
 						player.storage.hunmo2++;
 					}
 					else{
@@ -763,7 +805,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					player.draw(3);
 					if(cards.length>=2){
-						player.addTempSkill('shewu_dist','phaseAfter');
+						player.addTempSkill('shewu_dist');
 					}
 					if(cards.length==3){
 						player.recover();
@@ -998,7 +1040,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						game.asyncDrawAuto(result.targets,function(current){
 							return current==player?1:2;
 						});
-						player.addTempSkill('huandie_discard','phaseAfter');
+						player.addTempSkill('huandie_discard');
 					}
 				},
 				ai:{
@@ -1436,6 +1478,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gw_zhangyujushou:'章鱼巨兽',
 			gw_zhuoertan:'卓尔坦',
 
+			lingji:'灵计',
+			lingji_info:'出牌阶段限一次，你可以摸两张牌并弃置两张牌，若弃置的牌花色相同，你获得一张随机铜卡；若弃置的牌点数相同，你获得一张随机银卡',
 			gwjinyan:'金焰',
 			gwjinyan_info:'锁定技，准备阶段，若游戏轮数为3的倍数，你获得一张随机金卡；你的体力值不能小于X，X为游戏轮数除3的余数',
 			gwshenyu:'神愈',
diff --git a/character/hearth.js b/character/hearth.js
index e66bfba10..ed74b31be 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -867,7 +867,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                     var list=get.inpile('trick','trick');
                     player.gain(game.createCard(list.randomGet()),'draw');
                     if(player.storage.counttrigger&&player.storage.counttrigger.lieyang>=3){
-                        player.addTempSkill('lieyang2','phaseAfter');
+                        player.addTempSkill('lieyang2');
                     }
                 },
                 ai:{
@@ -3415,7 +3415,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			forced:true,
     			content:function(){
     				player.gain(game.createCard(trigger.card),'gain2');
-    				trigger.player.addTempSkill('yiwen2','phaseAfter');
+    				trigger.player.addTempSkill('yiwen2');
     			},
     			ai:{
     				threaten:0.7
@@ -5272,7 +5272,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			},
     			content:function(){
     				trigger.player.recover();
-    				player.addTempSkill('shengyan2','phaseAfter');
+    				player.addTempSkill('shengyan2');
     			},
     			ai:{
     				expose:0.2
@@ -5383,7 +5383,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				'step 0'
     				if(!event.isMine()) game.delay(0.5);
     				'step 1'
-    				player.addTempSkill('fengxing2','phaseAfter');
+    				player.addTempSkill('fengxing2');
     				player.chooseToDiscard('he',get.prompt('fengxing')).set('ai',function(card){
     					return 7-get.value(card);
     				}).logSkill='fengxing';
@@ -5757,7 +5757,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				ui.discardPile.appendChild(player.storage.bingjia);
     				delete player.storage.bingjia;
     				player.changeHujia();
-    				player.addTempSkill('mianyi','phaseAfter');
+    				player.addTempSkill('mianyi');
     			},
     			intro:{
     				mark:function(dialog,content,player){
@@ -6163,7 +6163,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     						target.discard(cs.randomGet());
     					}
     					target.damage('thunder');
-    					player.addTempSkill('tzhenji2','phaseAfter');
+    					player.addTempSkill('tzhenji2');
     				}
     			},
     			ai:{
diff --git a/character/jiange.js b/character/jiange.js
index fbfad043a..ffd9959e9 100644
--- a/character/jiange.js
+++ b/character/jiange.js
@@ -144,7 +144,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				forced:true,
 				popup:false,
 				content:function(){
-					player.addTempSkill('huodi3','phaseAfter');
+					player.addTempSkill('huodi3');
 				}
 	        },
 	        huodi3:{},
diff --git a/character/old.js b/character/old.js
index 65b434aac..8d38e7f6e 100644
--- a/character/old.js
+++ b/character/old.js
@@ -54,7 +54,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	                        trigger.result={bool:true,card:{name:'sha'}}
 	                    }
 						player.logSkill('zhenshan',result.targets);
-						player.addTempSkill('zhenshan2','phaseAfter');
+						player.addTempSkill('zhenshan2');
 	                    player.swapHandcards(result.targets[0]);
 					}
 				},
@@ -123,7 +123,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	                            },true).ai=function(target){
 	                                return get.attitude(player,target);
 	                            }
-	            				player.addTempSkill('zhenshan2','phaseAfter');
+	            				player.addTempSkill('zhenshan2');
 	                            'step 1'
 	            				if(result.bool){
 	                                player.logSkill('zhenshan',result.targets);
diff --git a/character/ow.js b/character/ow.js
index efa4ff998..bd0cd1509 100644
--- a/character/ow.js
+++ b/character/ow.js
@@ -311,7 +311,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	                    var target=result.targets[0];
 	                    player.logSkill('feitiao',target);
 	                    player.storage.feitiao2=target;
-	                    player.addTempSkill('feitiao2','phaseAfter');
+	                    player.addTempSkill('feitiao2');
 	                    target.randomDiscard();
 	                }
 
@@ -358,7 +358,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	                if(player.marks.zhencha){
 	                    player.marks.zhencha.firstChild.innerHTML='侦';
 	                }
-	                player.addTempSkill('zhencha2','phaseAfter');
+	                player.addTempSkill('zhencha2');
 	            },
 	            subSkill:{
 	                sha:{
@@ -394,7 +394,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	                if(player.marks.zhencha){
 	                    player.marks.zhencha.firstChild.innerHTML='哨';
 	                }
-	                player.addTempSkill('zhencha2','phaseAfter');
+	                player.addTempSkill('zhencha2');
 	            },
 	            subSkill:{
 	                sha:{
@@ -553,7 +553,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	                });
 	                'step 1'
 	                if(result.bool){
-	                    target.addTempSkill('liangou2','phaseAfter');
+	                    target.addTempSkill('liangou2');
 	                    target.storage.liangou2=player;
 	                }
 	            },
@@ -919,6 +919,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return get.attitude(player,event.target)<=0;
 				},
 				filter:function(event,player){
+					if(player.hasSkill('bfengshi4')) return false;
 	                var num=0.2;
 	                if(get.is.altered('bfengshi')) num=0.15;
 					return Math.random()<num*get.cardCount(true,player);
@@ -931,7 +932,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	                    return distance-get.cardCount(true,from);
 	                }
 	            },
-	            group:'bfengshi2'
+	            group:['bfengshi2','bfengshi3']
 	        },
 	        bfengshi2:{
 	            trigger:{source:'damageBegin'},
@@ -940,6 +941,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return get.attitude(player,event.target)<=0;
 				},
 	            filter:function(event,player){
+					if(player.hasSkill('bfengshi4')) return false;
 	                var num=0.2;
 	                if(get.is.altered('bfengshi')) num=0.15;
 	                return event.card&&event.card.name=='sha'&&Math.random()<num*get.cardCount(true,player);
@@ -948,6 +950,19 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	                trigger.num++;
 	            }
 	        },
+	        bfengshi3:{
+	            trigger:{player:'useCard'},
+	            forced:true,
+				popup:false,
+				silent:true,
+	            filter:function(event,player){
+					if(player.hasSkill('bfengshi4')) return false;
+	                return event.card.name=='sha';
+	            },
+	            content:function(){
+	                player.addTempSkill('bfengshi4');
+	            }
+	        },
 	        yinbo:{
 	            enable:'phaseUse',
 	            usable:1,
@@ -1214,7 +1229,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	                return 6-get.value(card);
 	            },
 	            content:function(){
-	                target.addTempSkill('shanguang2','phaseAfter');
+	                target.addTempSkill('shanguang2');
 	            },
 	            ai:{
 	                order:7.9,
@@ -2021,7 +2036,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	            },
 	            content:function(){
 	                player.storage.tuijin2=target;
-	                player.addTempSkill('tuijin2','phaseAfter');
+	                player.addTempSkill('tuijin2');
 	            },
 	            ai:{
 	                order:11,
@@ -2334,7 +2349,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	                'step 0'
 	                player.discard(player.getCards('he'));
 	                'step 1'
-	                player.addTempSkill('zhanlong2','phaseAfter');
+	                player.addTempSkill('zhanlong2');
 	                player.awakenSkill('zhanlong');
 					player.storage.zhanlong=true;
 	                var cards=[];
@@ -3391,8 +3406,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	        maoding_info_alter:'每当你造成一次伤害，你可以获得一个零件；出牌阶段，你可以弃置两张零件牌令一名没有护甲的角色获得一点护甲',
 	        bfengshi:'风矢',
 	        bfengshi2:'风矢',
-	        bfengshi_info:'锁定技，在一合内每当你使用一张牌，你的攻击范围+1；你的杀增加20%的概率强制命中；你的杀造成伤害后增加20%的概率令伤害+1',
-	        bfengshi_info_alter:'锁定技，在一合内每当你使用一张牌，你的攻击范围+1；你的杀增加15%的概率强制命中；你的杀造成伤害后增加15%的概率令伤害+1',
+	        bfengshi_info:'锁定技，在一合内每当你使用一张牌，你的攻击范围+1；你的首张杀增加20%的概率强制命中；你的首张杀造成伤害后增加20%的概率令伤害+1',
+	        bfengshi_info_alter:'锁定技，在一合内每当你使用一张牌，你的攻击范围+1；你的首张杀增加15%的概率强制命中；你的首张杀造成伤害后增加15%的概率令伤害+1',
 	        yinbo:'音波',
 	        yinbo_info:'出牌阶段限一次，你可以弃置一张黑桃牌，然后随机弃置三名敌人各一张牌',
 	        liudan:'榴弹',
diff --git a/character/refresh.js b/character/refresh.js
index 9ef99413e..9dd859a06 100644
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -1017,9 +1017,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					"step 1"
 					if(result.bool){
 						if(!target.hasSkill('fengyin')){
-							target.addTempSkill('fengyin','phaseAfter');
+							target.addTempSkill('fengyin');
 						}
-						target.addTempSkill('yijue2','phaseAfter');
+						target.addTempSkill('yijue2');
 						event.finish();
 					}
 					else if(target.hp<target.maxHp){
@@ -1091,7 +1091,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					"step 0"
 					player.judge(function(){return 0});
 					if(!trigger.target.hasSkill('fengyin')){
-						trigger.target.addTempSkill('fengyin','phaseAfter');
+						trigger.target.addTempSkill('fengyin');
 					}
 					"step 1"
 					var suit=get.suit(result.card);
diff --git a/character/shenhua.js b/character/shenhua.js
index f59d90720..da5308272 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -447,7 +447,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				}
     				player.storage.qimou2=num;
     				player.loseHp(num);
-    				player.addTempSkill('qimou2','phaseAfter');
+    				player.addTempSkill('qimou2');
     			},
     			ai:{
     				order:2,
@@ -3024,10 +3024,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				"step 0"
     				if(cards.length==0){
     					player.loseHp();
-    					player.addTempSkill('xinqiangxi3','phaseAfter');
+    					player.addTempSkill('xinqiangxi3');
     				}
     				else{
-    					player.addTempSkill('xinqiangxi2','phaseAfter');
+    					player.addTempSkill('xinqiangxi2');
     				}
     				"step 1"
     				target.damage();
@@ -3067,10 +3067,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				player.chooseToCompare(target);
     				"step 1"
     				if(result.bool){
-    					player.addTempSkill('tianyi2','phaseAfter');
+    					player.addTempSkill('tianyi2');
     				}
     				else{
     					player.addTempSkill('tianyi3','phaseAfter');
+    					player.addTempSkill('tianyi3');
     				}
     			},
     			ai:{
@@ -3137,7 +3138,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				"step 1"
     				player.gain(result.card);
     				player.$gain2(result.card);
-    				player.addTempSkill('shuangxiong2','phaseAfter');
+    				player.addTempSkill('shuangxiong2');
     				player.storage.shuangxiong=get.color(result.card);
     				trigger.untrigger();
     				trigger.finish();
diff --git a/character/sp.js b/character/sp.js
index 5caee34fe..5fd779f9c 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -437,7 +437,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				}
     				'step 2'
     				if(result.control=='选项一'){
-    					target.addTempSkill('fenyue2','phaseAfter');
+    					target.addTempSkill('fenyue2');
     				}
     				else{
     					player.useCard({name:'sha'},target,false);
@@ -472,7 +472,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				game.countPlayer(function(current){
     					if(current!=player&&!current.hasSkill('fengyin')){
     						player.line(current,'green');
-    						current.addTempSkill('fengyin','phaseAfter');
+    						current.addTempSkill('fengyin');
     					}
     				});
     			}
@@ -614,7 +614,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				else{
     					source.storage.hengjiang3=player;
     					source.storage.hengjiang2=trigger.num;
-    					source.addTempSkill('hengjiang2','phaseAfter');
+    					source.addTempSkill('hengjiang2');
     				}
     			}
     		},
@@ -1162,7 +1162,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			},
     			content:function(){
     				player.storage.fenxun2=target;
-    				player.addTempSkill('fenxun2','phaseAfter');
+    				player.addTempSkill('fenxun2');
     			},
     			check:function(card){
     				if(card.name=='sha'&&_status.event.player.countCards('h','sha')<=1) return 0;
@@ -1780,9 +1780,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			content:function(){
     				player.loseHp();
     				switch(get.type(cards[0],'trick')){
-    					case 'basic':player.addTempSkill('zhanyi_basic','phaseAfter');break;
-    					case 'equip':player.addTempSkill('zhanyi_equip','phaseAfter');break;
-    					case 'trick':player.addTempSkill('zhanyi_trick','phaseAfter');player.draw(2);break;
+    					case 'basic':player.addTempSkill('zhanyi_basic');break;
+    					case 'equip':player.addTempSkill('zhanyi_equip');break;
+    					case 'trick':player.addTempSkill('zhanyi_trick');player.draw(2);break;
     				}
     			},
     			ai:{
@@ -2332,7 +2332,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			},
     			content:function(){
     				player.draw(2*player.storage.tuifeng.length);
-    				player.addTempSkill('tuifeng3','phaseAfter');
+    				player.addTempSkill('tuifeng3');
     				player.$throw(player.storage.tuifeng.slice(0),1000);
     				player.storage.tuifeng3=player.storage.tuifeng.length;
     				while(player.storage.tuifeng.length){
@@ -2924,7 +2924,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     						return true;
     					});
     				}
-    				player.addTempSkill('zhidao2','phaseAfter');
+    				player.addTempSkill('zhidao2');
     			}
     		},
     		zhidao2:{
@@ -3190,7 +3190,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				player.chooseToCompare(target);
     				'step 1'
     				if(result.bool){
-    					target.addTempSkill('tanhu2','phaseAfter');
+    					target.addTempSkill('tanhu2');
     				}
     			},
     			ai:{
@@ -3306,7 +3306,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     		fenyong:{
     			trigger:{player:'damageEnd'},
     			content:function(){
-    				player.addTempSkill('fenyong2','phaseAfter');
+    				player.addTempSkill('fenyong2');
     			}
     		},
     		fenyong2:{
@@ -3523,7 +3523,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     						if(_status.event.du) return -att;
     						return att;
     					}).set('du',event.card.name=='du');
-    					target.addTempSkill('dahe2','phaseAfter');
+    					target.addTempSkill('dahe2');
     				}
     				else{
     					event.type=false;
@@ -3631,7 +3631,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					player.draw(num);
     				}
     				player.storage.yawang=num;
-    				player.addTempSkill('yawang2','phaseAfter');
+    				player.addTempSkill('yawang2');
     			}
     		},
     		yawang2:{
@@ -4237,8 +4237,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			},
     			content:function(){
     				var target=trigger.player;
-    				target.addTempSkill('meibu_viewas','phaseAfter');
-    				target.addTempSkill('meibu_range','phaseAfter');
+    				target.addTempSkill('meibu_viewas');
+    				target.addTempSkill('meibu_range');
     				target.storage.meibu=player;
     				target.markSkillCharacter('meibu',player,'魅步','锦囊牌均视为杀且'+get.translation(player)+'视为在攻击范围内');
     			},
@@ -5248,7 +5248,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			direct:true,
     			content:function(){
     				'step 0'
-    				player.addTempSkill('fengpo3','phaseAfter');
+    				player.addTempSkill('fengpo3');
     				player.chooseControl('draw_card','加伤害','cancel2').set('prompt',get.prompt('fengpo'));
     				'step 1'
     				if(result.control&&result.control!='cancel2'){
@@ -5441,7 +5441,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				if(num>0){
     					player.draw(num);
     				}
-    				player.addTempSkill('canshi2','phaseAfter');
+    				player.addTempSkill('canshi2');
     			}
     		},
     		canshi2:{
@@ -5593,7 +5593,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					player.logSkill('jilei',trigger.source);
     					player.popup(get.translation(result.control)+'牌');
     					trigger.source.storage.jilei2=result.control;
-    					trigger.source.addTempSkill('jilei2','phaseAfter');
+    					trigger.source.addTempSkill('jilei2');
     				}
     			},
     			ai:{
@@ -6154,7 +6154,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				player.draw();
     				player.markSkill('wangzun');
     				player.storage.wangzun=trigger.player;
-    				trigger.player.addTempSkill('wangzun3','phaseAfter');
+    				trigger.player.addTempSkill('wangzun3');
     			},
     			ai:{
     				expose:0.2
@@ -6499,7 +6499,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				if(trigger.delay==false) game.delay();
     				"step 1"
     				player.draw();
-    				player.addTempSkill('shenxian2','phaseAfter');
+    				player.addTempSkill('shenxian2');
     			},
     			ai:{
     				threaten:1.5
@@ -7448,7 +7448,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     							player.storage.huxiao3=[];
     						}
     						player.storage.huxiao3.addArray(player.storage.huxiao);
-    						player.addTempSkill('huxiao3','phaseAfter');
+    						player.addTempSkill('huxiao3');
     					}
     				},
     				clear:{
diff --git a/character/swd.js b/character/swd.js
index 8ef2f6eef..36237a381 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -653,7 +653,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				trigger.num++;
     				trigger.id=trigger.id||get.id();
     				player.storage.kbolan2=trigger.id;
-    				player.addTempSkill('kbolan2','phaseAfter');
+    				player.addTempSkill('kbolan2');
     			}
     		},
     		kbolan2:{
@@ -1920,7 +1920,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				"step 1"
     				if(player.countCards('h')>=8){
     					player.damage(3,'fire');
-    					player.addTempSkill('heihuo2','phaseAfter');
+    					player.addTempSkill('heihuo2');
     				}
     			},
     			ai:{
@@ -2205,7 +2205,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				next.logSkill='lianda';
     				"step 1"
     				if(result.bool){
-    					player.addTempSkill('lianda2','phaseAfter');
+    					player.addTempSkill('lianda2');
     					player.useCard({name:'sha'},trigger.target);
     				}
     			}
@@ -2927,7 +2927,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					player.lose(result.cards,ui.special);
     					player.storage.hutian=target;
     					player.logSkill('hutian',result.targets);
-    					player.addTempSkill('hutian4','phaseAfter');
+    					player.addTempSkill('hutian4');
     					target.addSkill('hutian2');
     					target.storage.hutian2=result.cards;
     					game.addVideo('storage',target,['hutian2',get.cardsInfo(result.cards),'cards']);
@@ -3915,7 +3915,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				if(result.bool){
     					player.discard(result.cards);
     					player.logSkill('dangping',result.targets);
-    					player.addTempSkill('dangping2','phaseAfter');
+    					player.addTempSkill('dangping2');
     				}
     				"step 2"
     				if(result.bool){
@@ -3945,11 +3945,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 
     				"step 1"
     				if(result.bool){
-    					target.addTempSkill('duishi3','phaseAfter');
+    					target.addTempSkill('duishi3');
     				}
     				else{
     					player.gainPlayerCard(target,'he',true);
-    					player.addTempSkill('duishi2','phaseAfter');
+    					player.addTempSkill('duishi2');
     				}
     			},
     			ai:{
@@ -4859,7 +4859,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					trigger.player.hp=1;
     					if(trigger.player.maxHp<1) trigger.player.maxHp=1;
     					trigger.player.update();
-    					player.addTempSkill('susheng2','phaseAfter');
+    					player.addTempSkill('susheng2');
     				}
 
     			},
@@ -7514,7 +7514,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			},
     			content:function(){
     				"step 0"
-    				player.addTempSkill('xiaomoyu2','phaseAfter');
+    				player.addTempSkill('xiaomoyu2');
     				if(player.hp<player.maxHp){
     					player.recover();
     					event.finish();
@@ -7702,7 +7702,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				var dialog=ui.create.dialog('玄咒',[list,'vcard']);
                     var bing=target.countCards('h')<=1;
     				player.chooseButton(dialog,true,function(button){
-                        if(ai.get.effect(target,{name:button.link[2]},player,player)>0){
+                        if(get.effect(target,{name:button.link[2]},player,player)>0){
                             if(button.link[2]=='bingliang'){
                                 if(bing) return 2;
                                 return 0.7;
@@ -7731,7 +7731,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							var eff=0;
 							for(var i in lib.card){
 								if(lib.card[i].type=='delay'){
-									var current=ai.get.effect(target,{name:i},player,player);
+									var current=get.effect(target,{name:i},player,player);
 									if(current>eff){
 										eff=current;
 									}
@@ -8333,7 +8333,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				player.judge(function(){
     					return 0;
     				});
-    				player.addTempSkill('yueren2','phaseAfter');
+    				player.addTempSkill('yueren2');
     				"step 1"
     				if(get.color(result.card)=='black'){
     					if(trigger.target.countCards('he')){
diff --git a/character/xiake.js b/character/xiake.js
index 836e59edf..743a3685d 100644
--- a/character/xiake.js
+++ b/character/xiake.js
@@ -77,7 +77,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	            },
 	            content:function(){
 	                player.draw();
-	                player.addTempSkill('gzhenji3','phaseAfter');
+	                player.addTempSkill('gzhenji3');
 	            }
 	        },
 	        gzhenji3:{
diff --git a/character/xianjian.js b/character/xianjian.js
index b864225f8..e2eb0d836 100644
--- a/character/xianjian.js
+++ b/character/xianjian.js
@@ -744,7 +744,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 								player.markSkill('yanshi');
 								player.updateMarks();
 							}
-							player.addTempSkill('yanshi2','phaseAfter');
+							player.addTempSkill('yanshi2');
 						}
 					}
 				}
@@ -1332,7 +1332,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					}
 					'step 1'
 					if(result.bool){
-						player.addTempSkill('qixia2','phaseAfter');
+						player.addTempSkill('qixia2');
 						trigger.player.draw(2);
 						if(trigger.player.hp==1&&!trigger.player.hujia){
 							trigger.player.changeHujia();
@@ -1560,7 +1560,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				onuse:function(result){
 					if(result.targets){
 						for(var i=0;i<result.targets.length;i++){
-							result.targets[i].addTempSkill('yanzhan3','phaseAfter');
+							result.targets[i].addTempSkill('yanzhan3');
 						}
 					}
 				},
@@ -2439,7 +2439,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					target.gain(cards,player);
 					if(!player.hasSkill('diewu2')){
 						player.draw();
-						player.addTempSkill('diewu2','phaseAfter');
+						player.addTempSkill('diewu2');
 					}
 				},
 				ai:{
@@ -2956,7 +2956,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return event.player.isAlive();
 				},
 				content:function(){
-					trigger.player.addTempSkill('wangyou3','phaseAfter');
+					trigger.player.addTempSkill('wangyou3');
 				}
 			},
 			wangyou3:{},
@@ -3075,7 +3075,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						var card=cards.randomGet();
 						player.gain(card,'log');
 						player.$gain2(card);
-						player.addTempSkill('jubao2','phaseAfter');
+						player.addTempSkill('jubao2');
 					}
 				},
 				ai:{
@@ -3302,7 +3302,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						player.storage.xuanning=0;
 						player.unmarkSkill('xuanning');
 						if(!get.is.altered('qianfang')){
-							player.addTempSkill('qianfang2','phaseAfter');
+							player.addTempSkill('qianfang2');
 						}
 						if(!event.logged) player.logSkill('qianfang');
 						player.useCard({name:'wanjian'},event.targets);
diff --git a/character/yijiang.js b/character/yijiang.js
index 08c910af2..91594224a 100644
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -466,7 +466,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					target.$give(result.cards,player);
     				}
     				else{
-    					player.addTempSkill('taoluan3','phaseAfter');
+    					player.addTempSkill('taoluan3');
     					player.loseHp();
     				}
     			}
@@ -1729,10 +1729,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				"step 1"
     				if(result.bool){
     					player.storage.xianzhen=target;
-    					player.addTempSkill('xianzhen2','phaseAfter');
+    					player.addTempSkill('xianzhen2');
     				}
     				else{
-    					player.addTempSkill('xianzhen3','phaseAfter');
+    					player.addTempSkill('xianzhen3');
     				}
     			},
     			ai:{
@@ -1812,7 +1812,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				return event.parent.skill=='lihuo';
     			},
     			content:function(){
-    				player.addTempSkill('lihuo3','phaseAfter');
+    				player.addTempSkill('lihuo3');
     			}
     		},
     		lihuo3:{
@@ -2138,7 +2138,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					player.line(trigger.player,'green');
     					game.log(player,'将',button,'置于弃牌堆');
     					ui.discardPile.appendChild(button);
-    					trigger.player.addTempSkill('sidi3','phaseAfter');
+    					trigger.player.addTempSkill('sidi3');
     					player.storage.sidi.remove(button);
     					player.syncStorage('sidi');
     					if(player.storage.sidi.length==0){
@@ -2359,7 +2359,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			},
     			content:function(){
     				player.draw(2);
-    				player.addTempSkill('jigong2','phaseAfter');
+    				player.addTempSkill('jigong2');
     			}
     		},
     		jigong2:{
@@ -2543,7 +2543,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				'step 1'
     				if(result.bool){
     					player.logSkill('yaoming',result.targets);
-    					player.addTempSkill('yaoming2','phaseAfter');
+    					player.addTempSkill('yaoming2');
     					var target=result.targets[0];
     					if(target.countCards('h')<player.countCards('h')){
     						target.draw();
@@ -3199,7 +3199,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			popup:false,
     			silent:true,
     			content:function(){
-    				player.addTempSkill('zuoding2','phaseAfter');
+    				player.addTempSkill('zuoding2');
     			}
     		},
     		huomo:{
@@ -3239,7 +3239,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					player.$throw(result.cards);
     					event.card=result.cards[0];
     					player.logSkill('huomo');
-    					player.addTempSkill('huomo2','phaseAfter');
+    					player.addTempSkill('huomo2');
     				}
     				else{
     					event.finish();
@@ -3405,7 +3405,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				player.storage.taoxi2=trigger.target;
     				player.syncStorage('taoxi');
     				player.markSkill('taoxi');
-    				player.addTempSkill('taoxi4','phaseAfter');
+    				player.addTempSkill('taoxi4');
     			},
     			group:['taoxi2','taoxi3']
     		},
@@ -3930,8 +3930,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				return event.getParent().skill=='fuhun';
     			},
     			content:function(){
-    				player.addTempSkill('wusheng','phaseAfter');
-    				player.addTempSkill('paoxiao','phaseAfter');
+    				player.addTempSkill('wusheng');
+    				player.addTempSkill('paoxiao');
     			}
     		},
     		fencheng:{
@@ -4338,10 +4338,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				}
     				"step 2"
     				if(result.bool){
-    					player.addTempSkill('qiaoshui3','phaseAfter');
+    					player.addTempSkill('qiaoshui3');
     				}
     				else{
-    					player.addTempSkill('qiaoshui2','phaseAfter');
+    					player.addTempSkill('qiaoshui2');
     				}
     			},
     			ai:{
@@ -4654,7 +4654,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				"step 1"
     				if(result.bool){
     					target.draw(target.maxHp-target.hp);
-    					target.addTempSkill('dingpin2','phaseAfter');
+    					target.addTempSkill('dingpin2');
     				}
     				else{
     					player.turnOver();
@@ -5046,7 +5046,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			forced:true,
     			popup:false,
     			content:function(){
-    				player.addTempSkill('qieting3','phaseAfter');
+    				player.addTempSkill('qieting3');
     			}
     		},
     		qieting3:{},
@@ -5075,7 +5075,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				player.chooseToCompare(trigger.player);
     				"step 1"
     				if(result.bool){
-    					trigger.player.addTempSkill('zishou2','phaseAfter');
+    					trigger.player.addTempSkill('zishou2');
     				}
     			},
     		},
@@ -5152,7 +5152,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			},
     			content:function(){
     				"step 0"
-    				player.addTempSkill('gongji2','phaseAfter');
+    				player.addTempSkill('gongji2');
     				"step 1"
     				if(get.type(cards[0])=='equip'){
     					player.chooseTarget('是否弃置一名角色的一张牌？',function(card,player,target){
@@ -6070,7 +6070,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					}
     				});
     				trigger.num+=num;
-    				player.addTempSkill('zishou2','phaseAfter');
+    				player.addTempSkill('zishou2');
 
     			},
     			ai:{
@@ -7100,7 +7100,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					player.loseHp();
     				}
     				if(!player.hasSkill('shibei2')){
-    					player.addTempSkill('shibei2','phaseAfter');
+    					player.addTempSkill('shibei2');
     				}
     			}
     		},
diff --git a/character/yxs.js b/character/yxs.js
index 21405dc04..6de612fb0 100644
--- a/character/yxs.js
+++ b/character/yxs.js
@@ -634,7 +634,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					player.addSkill('jimin');
 					player.addSkill('lzhangyi');
 					player.addSkill('tongyu');
-					player.addTempSkill('tongyu_guiyin','phaseAfter');
+					player.addTempSkill('tongyu_guiyin');
 				},
 				ai:{
 					order:function(){
@@ -669,7 +669,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					player.removeSkill('jimin');
 					player.removeSkill('lzhangyi');
 					player.removeSkill('tongyu');
-					player.addTempSkill('tongyu_guiyin','phaseAfter');
+					player.addTempSkill('tongyu_guiyin');
 				},
 				ai:{
 					order:9,
@@ -2066,7 +2066,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						event.dialog.close();
 					}
 					if(result.control!='cancel'){
-						player.addTempSkill('bolehuiyan4','phaseAfter');
+						player.addTempSkill('bolehuiyan4');
 						player.logSkill(['bolehuiyan',result.control],trigger.target);
 						game.log(player,'预言'+result.control);
 						player.storage.bolehuiyan=result.control;
@@ -2465,7 +2465,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					"step 1"
 					if(result.bool){
 						player.gain(trigger.card,'gain2');
-						player.addTempSkill('zhulu2','phaseAfter');
+						player.addTempSkill('zhulu2');
 					}
 				},
 				ai:{
diff --git a/game/game.js b/game/game.js
index bee6aa482..ba78d02f7 100644
--- a/game/game.js
+++ b/game/game.js
@@ -16030,7 +16030,10 @@
                     this.skills.remove(skill);
 					this.tempSkills[skill]=expire;
 
-                    if(typeof expire=='string'){
+					if(!expire){
+						expire='phaseAfter';
+					}
+                    else if(typeof expire=='string'){
                         lib.hookmap[expire]=true;
                     }
                     else if(Array.isArray(expire)){
diff --git a/mode/boss.js b/mode/boss.js
index b555c213a..778ff108e 100644
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -4593,7 +4593,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					if(!player.hasSkill('xuanfeng')) list.push('xuanfeng');
 					if(!player.hasSkill('wansha')) list.push('wansha');
 					if(list.length==1){
-						player.addTempSkill(list[0],'phaseAfter');
+						player.addTempSkill(list[0]);
 						event.finish();
 					}
 					else{
@@ -4617,7 +4617,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						}).set('prompt','选择获得一项技能直到回合结束');
 					}
 					'step 1'
-					player.addTempSkill(result.control,'phaseAfter');
+					player.addTempSkill(result.control);
 					player.popup(get.translation(result.control));
 				},
 				ai:{
diff --git a/mode/chess.js b/mode/chess.js
index ce605df9a..4d7894ede 100644
--- a/mode/chess.js
+++ b/mode/chess.js
@@ -4951,7 +4951,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     			forced:true,
     			popup:false,
     			content:function(){
-    				player.addTempSkill('noactpunish','phaseAfter');
+    				player.addTempSkill('noactpunish');
     			}
     		},
     		noactpunish:{},
diff --git a/mode/guozhan.js b/mode/guozhan.js
index af9100a3a..36352340c 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -1596,7 +1596,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					else{
 						target.hideCharacter(1);
 					}
-					target.addTempSkill('qingcheng_ai','phaseAfter');
+					target.addTempSkill('qingcheng_ai');
 				},
 				ai:{
 					order:8,
diff --git a/mode/identity.js b/mode/identity.js
index d2cede95d..66cd64b66 100644
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -1888,7 +1888,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 								}
 							}
 							if(target.getEquip('baiyin')&&target.isDamaged()&&
-								ai.get.recoverEffect(target,player,player)>0){
+								get.recoverEffect(target,player,player)>0){
 								if(target.hp==1&&!target.hujia) return 1.6*att;
 								if(target.hp==2) return 0.01*att;
 								return 0;
diff --git a/mode/stone.js b/mode/stone.js
index 636b81929..368d55b86 100644
--- a/mode/stone.js
+++ b/mode/stone.js
@@ -2400,7 +2400,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     				else{
     					target.recover(num);
     				}
-    				// player.addTempSkill('priest_kuaisuzhiliao','phaseAfter');
+    				// player.addTempSkill('priest_kuaisuzhiliao');
     			},
     			ai:{
     				order:7,
@@ -3441,7 +3441,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     			selectTarget:-1,
     			content:function(){
     				player.drawDeck(2);
-    				player.addTempSkill('shaman_xianzuzhishi','phaseAfter');
+    				player.addTempSkill('shaman_xianzuzhishi');
     			},
     			ai:{
     				order:10,
@@ -3982,7 +3982,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     			content:function(){
     				var list=['spell_lierenyinji','spell_guanmenfanggou','spell_duochongsheji','spell_kuaisusheji','spell_zhaohuanchongwu'];
     				player.gain(game.createCard(list.randomGet()),'draw');
-    				player.addTempSkill('hunter_zidanshangtang','phaseAfter');
+    				player.addTempSkill('hunter_zidanshangtang');
     			},
     			ai:{
     				order:7.5,
@@ -8873,7 +8873,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     			forced:true,
     			unique:true,
     			content:function(){
-    				player.getLeader().addTempSkill('stone_yaosaishouwei2','phaseAfter');
+    				player.getLeader().addTempSkill('stone_yaosaishouwei2');
     			}
     		},
     		stone_yaosaishouwei2:{