diff --git a/card/gwent.js b/card/gwent.js
index 09974f3ae..2df9b0d6b 100644
--- a/card/gwent.js
+++ b/card/gwent.js
@@ -1100,15 +1100,15 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				// },
 				content:function(){
     				var list=[];
-					list.push(get.cardPile('juedou','cardPile'));
-					list.push(get.cardPile('huogong','cardPile'));
-					list.push(get.cardPile('nanman','cardPile'));
-					list.push(get.cardPile('huoshaolianying','cardPile'));
+					list.push(get.cardPile2('juedou'));
+					list.push(get.cardPile2('huogong'));
+					list.push(get.cardPile2('nanman'));
+					list.push(get.cardPile2('huoshaolianying'));
 					for(var i=0;i<list.length;i++){
 						if(!list[i]) list.splice(i--,1);
 					}
 					list=[list.randomGet()];
-					var sha=get.cardPile('sha','cardPile');
+					var sha=get.cardPile2('sha');
 					if(sha){
 						if(list.length){
 							list.push(sha);
@@ -1116,7 +1116,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						else{
 							sha.remove();
 							list.push(sha);
-							var sha2=get.cardPile('sha','cardPile');
+							var sha2=get.cardPile2('sha');
 							if(sha2){
 								list.push(sha2);
 							}
@@ -2208,7 +2208,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			gw_youer_bg:'饵',
 			gw_youer_info:'将一名其他角色的所有手牌移出游戏，然后摸一张牌，当前回合结束后该角色将以此法失去的牌收回手牌',
 			gw_tongdi:'通敌',
-			gw_tongdi_info:'观看一名其他角色的手牌并获得其中一张，然后令目标装备一件进攻马',
+			gw_tongdi_info:'观看一名其他角色的手牌并获得其中一张，然后令目标从牌堆或弃牌堆中装备一件进攻马',
 			gw_baoxueyaoshui:'暴雪药水',
 			gw_baoxueyaoshui_info:'令一名角色弃置两张手牌并摸一张牌',
 			gw_birinongwu:'蔽日浓雾',
diff --git a/card/hearth.js b/card/hearth.js
index 5555631d6..f985d1d3f 100644
--- a/card/hearth.js
+++ b/card/hearth.js
@@ -696,7 +696,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			shandianjian:'闪电箭',
 			shandianjian_info:'目标角色展示一张手牌，然后若你能弃掉一张与所展示牌相同花色的手牌，则对该角色造成1点雷电伤害。',
 			shijieshu:'视界术',
-			shijieshu_info:'目标随机装备两张装备牌，然后弃置一张牌',
+			shijieshu_info:'目标从牌堆或弃牌堆中随机装备两张装备牌，然后弃置一张牌',
 			zhaomingdan:'照明弹',
 			zhaomingdan_info:'观看一名其他角色的手牌，并弃置其区域内的一张牌，然后其与你各摸一张牌',
 			jihuocard:'激活',
diff --git a/character/hearth.js b/character/hearth.js
index e810aaca9..877d891dc 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -5097,7 +5097,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			},
     			content:function(){
     				var type=get.type(trigger.card);
-    				var card=get.cardPile(function(card){
+    				var card=get.cardPile2(function(card){
     					return get.type(card)==type;
     				});
     				if(card){
diff --git a/character/sp.js b/character/sp.js
index 4a6140719..20fbb599f 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -614,9 +614,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                     'step 0'
                     player.showCards(get.translation(player)+'对'+get.translation(target)+'发动了【连计】',cards);
                     'step 1'
-                    var equip1=get.cardPile(function(card){
+                    var equip1=get.cardPile2(function(card){
                         return get.subtype(card)=='equip1';
-                    },'cardPile');
+                    });
                     target.$draw(equip1);
                     target.equip(equip1);
                     game.delay();
diff --git a/character/yijiang.js b/character/yijiang.js
index 8ce0fdf90..7f6f576c5 100644
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -550,7 +550,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                     if(result.bool){
                         var target=result.targets[0];
                         player.logSkill('daiyan',target);
-                        var tao=get.cardPile('tao','cardPile');
+                        var tao=get.cardPile2('tao');
                         if(tao){
                             target.gain(tao,'gain2');
                         }
diff --git a/game/game.js b/game/game.js
index a603e5d9f..920829c07 100644
--- a/game/game.js
+++ b/game/game.js
@@ -42432,6 +42432,9 @@
 			}
 			return null;
 		},
+		cardPile2:function(name){
+			return get.cardPile(name,'cardPile');
+		},
 		aiStrategy:function(){
 			switch(get.config('ai_strategy')){
 				case 'ai_strategy_1':return 1;