y

card/swd.js

@@ -908,6 +908,7 @@ card.swd={
 				}
 				"step 2"
 				if(result.bool&&result.targets&&result.targets.length){
+					player.line(result.targets[0],'green');
 					player.discardPlayerCard(result.targets[0],'he',true);
 				}
 			},

character/gujian.js

@@ -13,6 +13,38 @@ character.gujian={
 		gjqt_aruan:['female','wu',3,['zhaolu','jiehuo','yuling']],
 	},
 	skill:{
+		meiying:{
+			global:'meiying2',
+			globalSilent:true,
+			trigger:{global:'phaseEnd'},
+			filter:function(event,player){
+				return event.player!=player&&!event.player.tempSkills.meiying3&&event.player.isAlive()&&player.num('he',{color:'red'})>0;
+			},
+			direct:true,
+			content:function(){
+				"step 0"
+				player.chooseToDiscard('魅影：是否弃置一张红色牌视为对'+get.translation(trigger.player)+'使用一张杀？').logSkill=['meiying',trigger.player];
+				"step 1"
+				if(result.bool){
+					player.useCard({name:'sha'},trigger.player).animate=false;
+				}
+			},
+			ai:{
+				expose:0.1
+			}
+		},
+		meiying2:{
+			trigger:{player:'useCard'},
+			filter:function(event,player){
+				return _status.currentPhase==player&&event.targets&&(event.targets.length>1||event.targets[0]!=player);
+			},
+			forced:true,
+			popup:false,
+			content:function(){
+				player.addTempSkill('meiying3','phaseAfter');
+			}
+		},
+		meiying3:{},
 		jianwu:{
 			trigger:{player:'shaBegin'},
 			forced:true,
@@ -77,7 +109,7 @@ character.gujian={
 				threaten:1.3
 			}
 		},
-		meiying:{
+		meiying_old:{
 			trigger:{global:'phaseBefore'},
 			filter:function(event,player){
 				return event.player!=player&&!player.isTurnedOver()&&!player.storage.meiying;
@@ -1032,9 +1064,9 @@ character.gujian={
 		meihu2:'魅狐',
 		meihu_info:'当你受到伤害后，可令伤害来源交给你一张手牌',
 		jianwu:'剑舞',
-		jianwu_info:'锁定技，每当你使用一张杀，若你不在目标的攻击范围内，此杀不可闪避。',
+		jianwu_info:'锁定技，攻击范围不含你的角色无法闪避你的杀',
 		meiying:'魅影',
-		meiying_info:'在一名其他角色的回合开始前，若你的武将牌正面朝上，你可以进行一个额外回合，并在回合结束后翻面（若已翻面则不翻回来）。若如此做，你对其使用卡牌无视距离直到回合结束。',
+		meiying_info:'一名其他角色的回合结束时，若其未于此回合内使用过指定另一名角色为目标的牌，你可以弃置一张红色牌视为对其使用一张杀',
 		zhongji:'重击',
 		zhongji_info:'每当你即将造成伤害，可弃置一张黑色手牌令伤害+1',
 		zuizhan:'醉斩',

character/ow.js

@@ -1,7 +1,7 @@
 'use strict';
 character.ow={
     character:{
-        ow_liekong:['female','shu',3,[]],
+        ow_liekong:['female','shu',3,['shanxian','shanhui']],
         // ow_heibaihe:['female','shu',3,[]],
         ow_sishen:['female','shu',3,[]],
         ow_tianshi:['female','shu',3,[]],
@@ -13,5 +13,113 @@ character.ow={
         // ow_mei:['female','shu',3,[]],
         // ow_baolei:['female','shu',3,[]],
         ow_chanyata:['female','shu',3,[]],
+    },
+    skill:{
+        shanxian:{
+			trigger:{global:'phaseBefore'},
+			filter:function(event,player){
+				return event.player!=player&&!player.isTurnedOver()&&!player.storage.shanxian;
+			},
+			check:function(event,player){
+				return ai.get.attitude(player,event.player)<0&&
+				((player.num('h')>player.hp&&player.num('h','lebu')==0)||get.distance(player,event.player)>1);
+			},
+			prompt:function(event,player){
+				return '是否对'+get.translation(event.player)+'发动【闪现】？'
+			},
+			content:function(){
+				"step 0"
+                player.storage.shanxian_h=player.get('h');
+                player.storage.shanxian_e=player.get('e');
+                player.syncStorage('shanxian_e');
+				player.line(trigger.player,'green');
+				player.phase();
+				player.storage.shanxian=trigger.player;
+				"step 1"
+				if(!player.isTurnedOver()){
+					player.turnOver();
+				}
+				delete player.storage.shanxian;
+			},
+			mod:{
+				targetInRange:function(card,player,target,now){
+					if(target==player.storage.shanxian) return true;
+				},
+			},
+			ai:{
+                expose:0.1,
+				effect:{
+					target:function(card){
+						if(card.name=='guiyoujie') return [0,0];
+					}
+				}
+			}
+		},
+        shanhui:{
+            unique:true,
+            trigger:{player:'damageEnd'},
+            filter:function(event,player){
+                return player.storage.shanxian_h&&player.storage.shanxian_e;
+            },
+            check:function(event,player){
+                var n1=player.num('he');
+                var n2=player.storage.shanxian_h.length+player.storage.shanxian_e.length;
+                if(n1==n2+1) return true;
+                if(n1<n2) return true;
+                return false;
+            },
+            video:function(player){
+                var cards=player.get('he');
+                for(var i=0;i<cards.length;i++){
+                    cards[i].remove();
+                }
+                for(var i=0;i<player.storage.shanxian_e.length;i++){
+                    player.$equip(player.storage.shanxian_e[i]);
+                }
+            },
+            content:function(){
+                game.addVideo('skill',player,'shanhui');
+                for(var i=0;i<player.storage.shanxian_h.length;i++){
+                    if(player.storage.shanxian_h[i].parentNode!=ui.cardPile&&
+                    player.storage.shanxian_h[i].parentNode!=ui.discardPile){
+                        player.storage.shanxian_h[i]=game.createCard(player.storage.shanxian_h[i]);
+                    }
+                }
+                for(var i=0;i<player.storage.shanxian_e.length;i++){
+                    if(player.storage.shanxian_e[i].parentNode!=ui.cardPile&&
+                    player.storage.shanxian_e[i].parentNode!=ui.discardPile){
+                        player.storage.shanxian_e[i]=game.createCard(player.storage.shanxian_e[i]);
+                    }
+                }
+                var cards=player.get('he');
+                for(var i=0;i<cards.length;i++){
+                    ui.discardPile.appendChild(cards[i]);
+                }
+                player.directgain(player.storage.shanxian_h);
+                for(var i=0;i<player.storage.shanxian_e.length;i++){
+                    player.$equip(player.storage.shanxian_e[i]);
+                }
+                if(cards.length>player.storage.shanxian_h.length+player.storage.shanxian_e.length){
+                    player.recover();
+                }
+                delete player.storage.shanxian_h;
+                delete player.storage.shanxian_e;
+            }
+        }
+    },
+    translate:{
+        shanxian:'闪现',
+        shanxian_info:'在一名其他角色的回合开始前，若你的武将牌正面朝上，你可以进行一个额外回合，并在回合结束后将武将牌翻至背面。若如此做，你对其使用卡牌无视距离直到回合结束。',
+        shanhui:'闪回',
+        shanhui_info:'每当你受到一次伤害，你可以将你的牌重置为上次发动闪现前的状态，若你的牌数因此而减少，你回复一点体力',
+        ow_liekong:'猎空',
+        ow_sishen:'死神',
+        ow_tianshi:'天使',
+        ow_falaozhiying:'法老之鹰',
+        ow_zhixuzhiguang:'秩序之光',
+        ow_luxiao:'卢西奥',
+        ow_shibing:'士兵76',
+        ow_yuanshi:'源氏',
+        ow_chanyata:'禅雅塔'
     }
 };

game/game.js

@@ -3338,7 +3338,7 @@
 				if(lib.config.extensions.length){
 					window.resetExtension=function(){
 						for(var i=0;i<lib.config.extensions.length;i++){
-							game.saveConfig('extension_'+lib.config.extensions[i],false);
+							game.saveConfig('extension_'+lib.config.extensions[i]+'_enable',false);
 						}
 					}
 				}
@@ -10418,7 +10418,7 @@
 						}
 					}
 					if(get.itemtype(card)=='cards'){
-						if(log!=false){
+						if(log!=false&&!_status.video){
 							game.log(player,'从',this,'获得了',card);
 						}
 						if(this.$givemod){
@@ -10431,7 +10431,7 @@
 						}
 					}
 					else if(typeof card=='number'&&card>=0){
-						if(log!=false){
+						if(log!=false&&!_status.video){
 							game.log(player,'从',this,'获得了'+get.cnNumber(card)+'张牌');
 						}
 						if(this.$givemod){
@@ -10442,7 +10442,7 @@
 						}
 					}
 					else{
-						if(log!=false){
+						if(log!=false&&!_status.video){
 							if(get.itemtype(card)=='card'&&log!=false){
 								game.log(player,'从',this,'获得了',card);
 							}
@@ -10548,7 +10548,7 @@
 						}
 					}
 					if(get.itemtype(card)=='cards'){
-						if(log!=false){
+						if(log!=false&&!_status.video){
 							game.log(this,'获得了',card);
 						}
 						if(this.$gainmod){
@@ -10561,7 +10561,7 @@
 						}
 					}
 					else if(typeof card=='number'&&card>1){
-						if(log!=false){
+						if(log!=false&&!_status.video){
 							game.log(this,'获得了'+get.cnNumber(card)+'张牌');
 						}
 						if(this.$gainmod){
@@ -10574,7 +10574,7 @@
 						}
 					}
 					else{
-						if(get.itemtype(card)=='card'&&log!=false){
+						if(get.itemtype(card)=='card'&&log!=false&&!_status.video){
 							game.log(this,'获得了',card);
 						}
 						if(this.$gainmod){
@@ -15034,7 +15034,7 @@
 			},
 			equip:function(player,card){
 				if(player&&card){
-					player.equip(get.infoCard(card));
+					player.$equip(get.infoCard(card));
 				}
 				else{
 					console.log(player);
@@ -26486,6 +26486,7 @@
 				str2+=str[i];
                 if(nobreak) continue;
 				if(sp&&str[i]=='S'&&str[i+1]=='P') continue;
+                if(/[0-9]/.test(str[i])&&/[0-9]/.test(str[i+1])) continue;
 				if(i<str.length-1){
 					str2+='<br>';
 				}

game/update.js

@@ -6,6 +6,7 @@ window.noname_update={
     files:{
         global:[
             'character/ow.js',
+            'character/gujian.js',
             'card/swd.js',
             'card/hearth.js',
             'card/shenqi.js',