i

card/guozhan.js

@@ -391,7 +391,6 @@ card.guozhan={
 				if(player.identity=='ye') return true;
 				return player.identity!=target.identity;
 			},
-			multitarget:true,
 			content:function(){
 				game.asyncDraw([target,player],[1,get.mode()=='guozhan'?3:1]);
 			},

card/swd.js

@@ -1,5 +1,8 @@
 card.swd={
 	card:{
+		shenmiguo:{
+			fullskin:true,
+		},
 		// yuchanqian:{
 		// 	fullskin:true,
 		// },
@@ -3927,6 +3930,7 @@ card.swd={
 		yuchanli:'离玉蝉',
 		yuchangen:'艮玉蝉',
 		yuchandui:'兑玉蝉',
+		shenmiguo:'神秘果',
 		shuchui:'鼠槌',
 		shuchui_info:'出牌阶段限一次，你可以指定一名攻击范围内的角色，依次将手牌中的所有杀对该角色使用，杀每造成一次伤害你摸一张牌（最多使用3张杀）',
 		zhiluxiaohu:'指路小狐',

character/hearth.js

@@ -808,25 +808,58 @@ character.hearth={
 			direct:true,
 			delay:false,
 			unique:true,
-			onremove:function(player){
-				player.removeAdditionalSkill('maoxian');
-			},
 			content:function(){
 				'step 0'
 				var list=get.gainableSkills();
 				list.remove('maoxian');
-				player.chooseControl(list.randomGets(3)).prompt='选择一项作为你的技能';
-				'step 1'
-				if(result.control){
-					game.stopCountChoose();
-					var link=result.control;
-					player.addAdditionalSkill('maoxian',link);
-					player.popup(link);
-					game.log(player,'获得了技能','【'+get.translation(link)+'】');
-					player.checkMarks();
-					player.markSkill('maoxian');
-					game.delay();
+				list=list.randomGets(3);
+				event.skillai=function(){
+					return list.randomGet();
+				};
+				if(event.isMine()){
+					var dialog=ui.create.dialog();
+					dialog.add('选择获得一项技能');
+					var clickItem=function(){
+						_status.event._result=this.link;
+						dialog.close();
+						game.resume();
+					};
+					for(var i=0;i<list.length;i++){
+						if(lib.translate[list[i]+'_info']){
+							var translation=get.translation(list[i]);
+							if(translation[0]=='新'&&translation.length==3){
+								translation=translation.slice(1,3);
+							}
+							else{
+								translation=translation.slice(0,2);
+							}
+							var item=dialog.add('<div class="popup" style="width:50%;display:inline-block"><div class="skill">【'+
+							translation+'】</div><div>'+lib.translate[list[i]+'_info']+'</div></div>');
+							item.firstChild.addEventListener('click',clickItem);
+							item.firstChild.link=list[i];
+						}
+					}
+					dialog.add(ui.create.div('.placeholder'));
+					event.switchToAuto=function(){
+						event._result=event.skillai();
+						dialog.close();
+						game.resume();
+					};
+					_status.imchoosing=true;
+					game.pause();
 				}
+				else{
+					event._result=event.skillai();
+				}
+				'step 1'
+				_status.imchoosing=false;
+				var link=result;
+				player.addAdditionalSkill('maoxian',link);
+				player.popup(link);
+				game.log(player,'获得了技能','【'+get.translation(link)+'】');
+				player.checkMarks();
+				player.markSkill('maoxian');
+				game.delay();
 			},
 			intro:{
 				content:function(storage,player){
@@ -3754,6 +3787,7 @@ character.hearth={
 			animationColor:'thunder',
 			trigger:{player:'phaseBegin'},
 			forced:true,
+			unique:true,
 			filter:function(event,player){
 				if(!player.storage.tuteng_awake){
 					var rand=['tuteng1','tuteng2','tuteng3','tuteng4',

character/ow.js

@@ -546,6 +546,7 @@ character.ow={
                 content:'limited'
             },
             mark:true,
+            unique:true,
             skillAnimation:true,
             animationColor:'water',
             line:'thunder',

character/shenhua.js

@@ -217,6 +217,7 @@ character.shenhua={
 			audio:2,
 			unique:true,
 			zhuSkill:true,
+			keepSkill:true,
 			trigger:{player:'phaseBegin'},
 			forced:true,
 			filter:function(event,player){

character/yijiang.js

@@ -1106,6 +1106,7 @@ character.yijiang={
 			trigger:{player:'phaseDrawBegin'},
 			forced:true,
 			mark:true,
+			audio:false,
 			intro:{
 				content:'下个摸牌阶段额外摸一张牌'
 			},

game/asset.js

@@ -123,6 +123,7 @@ window.noname_asset_list=[
     'image/card/chiling.png',
     'image/card/shenenshu.png',
     'image/card/shengdong.png',
+    'image/card/shenmiguo.png',
     'image/card/shennongding.png',
     'image/card/shentoumianju.png',
     'image/card/shihuawuqi.png',

game/game.js

@@ -11342,6 +11342,9 @@
         						info.onremove(this);
         					}
                             this.removeSkillTrigger(skill);
+                            if(!info.keepSkill){                                
+                                this.removeAdditionalSkill(skill);
+                            }
                         }
                     }
 					return skill;

game/update.js

@@ -20,6 +20,7 @@ window.noname_update={
 }
 
 // 'card/swd.js',
+// 'card/guozhan.js',
 // 'game/package.js',
 // 'game/asset.js',
 // 'game/game.js',
@@ -27,6 +28,9 @@ window.noname_update={
 // 'character/swd.js',
 // 'character/hearth.js',
 // 'character/xianjian.js',
+// 'character/shenhua.js',
+// 'character/ow.js',
+// 'character/yijiang.js',
 // 'mode/boss.js',
 // 'mode/versus.js',
 // 'mode/brawl.js',