a

character/yijiang.js

@@ -3364,142 +3364,6 @@ character.yijiang={
 				}
 			}
 		},
-		huomo_sha:{
-			enable:'chooseToUse',
-			viewAs:{name:'sha'},
-			position:'he',
-			viewAsFilter:function(player){
-				if(!player.storage.huomo) player.storage.huomo={};
-				if(player.storage.huomo.sha) return false;
-				var hs=player.get('he',{color:'black'});
-				for(var i=0;i<hs.length;i++){
-					if(get.type(hs[i])!='basic'){
-						return true;
-					}
-				}
-				return false;
-			},
-			prompt:'将一张黑色非基本牌置于牌堆顶，视为使用一张杀',
-			precontent:function(){
-				'step 0'
-				var card=event.result.cards[0];
-				event.card=card;
-				player.$throw(card,1000);
-				game.log(player,'将',card,'置于牌堆顶');
-				event.result.cards.length=0;
-				player.lose(card);
-				'step 1'
-				game.delay();
-				'step 2'
-				ui.cardPile.insertBefore(event.card,ui.cardPile.firstChild);
-			},
-			filterCard:function(card){
-				return get.type(card)!='basic'&&get.color(card)=='black';
-			},
-			ai:{
-				skillTagFilter:function(player,tag,arg){
-
-				},
-				order:3.1,
-				respondSha:true,
-			},
-		},
-		huomo_tao:{
-			enable:'chooseToUse',
-			viewAs:{name:'tao'},
-			viewAsFilter:function(player){
-				if(!player.storage.huomo) player.storage.huomo={};
-				if(player.storage.huomo.tao) return false;
-				var hs=player.get('he',{color:'black'});
-				for(var i=0;i<hs.length;i++){
-					if(get.type(hs[i])!='basic'){
-						return true;
-					}
-				}
-				return false;
-			},
-			position:'he',
-			prompt:'将一张黑色非基本牌置于牌堆顶，视为使用一张桃',
-			precontent:function(){
-				'step 0'
-				var card=event.result.cards[0];
-				event.card=card;
-				player.$throw(card,1000);
-				game.log(player,'将',card,'置于牌堆顶');
-				event.result.cards.length=0;
-				player.lose(card);
-				'step 1'
-				game.delay();
-				'step 2'
-				ui.cardPile.insertBefore(event.card,ui.cardPile.firstChild);
-			},
-			filterCard:function(card){
-				return get.type(card)!='basic'&&get.color(card)=='black';
-			},
-			ai:{
-				order:4,
-				skillTagFilter:function(player){
-					if(!player.storage.huomo) player.storage.huomo={};
-					if(player.storage.huomo.tao) return false;
-					var hs=player.get('he',{color:'black'});
-					for(var i=0;i<hs.length;i++){
-						if(get.type(hs[i])!='basic'){
-							return true;
-						}
-					}
-					return false;
-				},
-				save:true,
-			},
-		},
-		huomo_jiu:{
-			enable:'chooseToUse',
-			viewAs:{name:'jiu'},
-			viewAsFilter:function(player){
-				if(!player.storage.huomo) player.storage.huomo={};
-				if(player.storage.huomo.jiu) return false;
-				var hs=player.get('he',{color:'black'});
-				for(var i=0;i<hs.length;i++){
-					if(get.type(hs[i])!='basic'){
-						return true;
-					}
-				}
-				return false;
-			},
-			prompt:'将一张黑色非基本牌置于牌堆顶，视为使用一张酒',
-			precontent:function(){
-				'step 0'
-				var card=event.result.cards[0];
-				event.card=card;
-				player.$throw(card,1000);
-				game.log(player,'将',card,'置于牌堆顶');
-				event.result.cards.length=0;
-				player.lose(card);
-				'step 1'
-				game.delay();
-				'step 2'
-				ui.cardPile.insertBefore(event.card,ui.cardPile.firstChild);
-			},
-			position:'he',
-			filterCard:function(card){
-				return get.type(card)!='basic'&&get.color(card)=='black';
-			},
-			ai:{
-				skillTagFilter:function(player){
-					if(!player.storage.huomo) player.storage.huomo={};
-					if(player.storage.huomo.jiu) return false;
-					if(player.hp>0) return false;
-					var hs=player.get('he',{color:'black'});
-					for(var i=0;i<hs.length;i++){
-						if(get.type(hs[i])!='basic'){
-							return true;
-						}
-					}
-					return false;
-				},
-				save:true,
-			},
-		},
 		taoxi:{
 			audio:2,
 			trigger:{player:'useCardToBegin'},
@@ -7618,10 +7482,6 @@ character.yijiang={
 		qinwang2:'勤王',
 		qinwang_info:'主公技，你可以弃置一张牌，然后视为你发动“激将”。若有角色响应，则该角色打出【杀】时摸一张牌',
 		huomo:'活墨',
-		huomo_sha:'墨杀',
-		huomo_shan:'墨闪',
-		huomo_tao:'墨桃',
-		huomo_jiu:'墨酒',
 		huomo_use:'活墨',
 		huomo_use_backup:'活墨',
 		huomo_info:'每当你需要使用一张本回合内未使用过的基本牌时，你可以将一张黑色非基本牌置于牌堆顶，然后视为你使用了此基本牌',

game/asset.js

@@ -1788,12 +1788,6 @@ window.noname_asset_list=[
     'audio/skill/huoji2.mp3',
     'audio/skill/huomo1.mp3',
     'audio/skill/huomo2.mp3',
-    'audio/skill/huomo_jiu1.mp3',
-    'audio/skill/huomo_jiu2.mp3',
-    'audio/skill/huomo_sha1.mp3',
-    'audio/skill/huomo_sha2.mp3',
-    'audio/skill/huomo_tao1.mp3',
-    'audio/skill/huomo_tao2.mp3',
     'audio/skill/huoshou11.mp3',
     'audio/skill/huoshou12.mp3',
     'audio/skill/huoshui1.mp3',

game/game.js

@@ -8636,7 +8636,14 @@
 						}
 						if(!ok){
 							if(typeof event.prompt=='string'){
-								event.dialog=ui.create.dialog(event.prompt);
+								if(event.openskilldialog){
+									event.skillDialog=ui.create.dialog(event.openskilldialog);
+									delete event.openskilldialog;
+									event.dialog=event.prompt;
+								}
+								else{
+									event.dialog=ui.create.dialog(event.prompt);
+								}
 							}
 							else if(event.prompt=='function'){
 								event.dialog=ui.create.dialog(event.prompt(event));

game/update.js

@@ -1,6 +1,6 @@
 window.noname_update={
     version:'1.9.12.5',
-    update:'1.9.12.4',
+    update:'1.9.12.5',
     changeLog:[
         'bug修复',
     ],
@@ -9,7 +9,7 @@ window.noname_update={
         // 'game/package.js',
         // 'game/config.js',
         // 'game/source.js',
-        // 'game/asset.js',
+        'game/asset.js',
         // 'card/standard.js',
         // 'character/*',
         // 'character/xianjian.js',