diff --git a/character/hearth.js b/character/hearth.js
index 46ba71a52..cce71682e 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -115,10 +115,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
             hs_tgolem:['male','wu',4,['xinwuyan','guozaix']],
 
             hs_heifengqishi:['male','qun',4,['hstianqi']],
-            hs_yuhuozhe:['male','qun',4,['hstianqi']],
-            hs_wuyaowang:['male','qun',4,['hstianqi']],
-            hs_aerfusi:['male','qun',4,['hstianqi']],
-            hs_baiguyoulong:['male','qun',4,['hstianqi']],
+            // hs_yuhuozhe:['male','qun',4,['hstianqi']],
+            // hs_wuyaowang:['male','qun',4,['hstianqi']],
+            // hs_aerfusi:['male','qun',4,['hstianqi']],
+            // hs_baiguyoulong:['male','qun',4,['hstianqi']],
             hs_yangyanwageli:['male','qun',4,['hstianqi']],
     	},
     	characterIntro:{
@@ -307,6 +307,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                         intro:{
                             content:'锁定技，你的摸牌数始终-1'
                         },
+                        priority:5,
                         trigger:{player:'drawBegin'},
                         forced:true,
                         content:function(){
@@ -7523,7 +7524,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
             hsnitai:'拟态',
             hsnitai_info:'锁定技，出牌阶段开始时，你获得一张随机炉石角色的技能牌',
             hstianqi:'天启',
-            hstianqi_info:'出牌阶段限一次，你可以选择一项：弃置一张手牌并随机装备一件天启骑士（不能替换现有装备），或弃置一张装备区内的牌并摸两张牌',
+            hstianqi_info:'出牌阶段限一次，你可以选择一项：弃置一张手牌并随机装备一件天启骑士（不能替换现有装备），或弃置一张装备区内的牌并摸两张牌；若你此时装备区内集齐了4件天启骑士，你获得游戏胜利',
+            hspuzhao:'普照',
+            hspuzhao_info:'出牌阶段限一次，你可以弃置一张红桃牌，然后令至多3名随机友方角色各摸一张牌',
+            hsyanxin:'炎心',
+            hsyanxin_info:'锁定技，你摸到的首张牌为红色的概率比其他角色多50%',
             ysjqisha:'七煞',
             ysjqisha_ju:'惧之煞',
             ysjqisha_kuang:'狂之煞',
diff --git a/character/swd.js b/character/swd.js
index dbda914a1..7d68b688a 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -649,6 +649,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     		kbolan:{
     			trigger:{player:'drawBegin'},
     			frequent:true,
+                priority:5,
     			content:function(){
     				trigger.num++;
     				trigger.id=trigger.id||get.id();
diff --git a/character/xianjian.js b/character/xianjian.js
index e541faa1e..922100f7f 100644
--- a/character/xianjian.js
+++ b/character/xianjian.js
@@ -1963,6 +1963,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				trigger:{player:'drawBegin'},
 				forced:true,
 				popup:false,
+				priority:5,
 				content:function(){
 					if(player.storage.feng<2){
 						player.storage.feng++;
diff --git a/game/asset.js b/game/asset.js
index ddb8bef86..94c53c3ef 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-    '1.9.38',
+    '1.9.39',
     'image/background/huangtian_bg.jpg',
     'image/background/ol_bg.jpg',
     'image/background/september_bg.jpg',
diff --git a/game/game.js b/game/game.js
index 2fbd5af83..308fcd079 100644
--- a/game/game.js
+++ b/game/game.js
@@ -41673,6 +41673,8 @@
         typeCard:function(type,filter){
             var list=[];
             for(var i in lib.card){
+				if(lib.card[i].mode&&lib.card[i].mode.contains(get.mode())==false) continue;
+				if(lib.card[i].vanish||lib.card[i].destroy) continue;
                 if(typeof filter=='function'&&!filter(i)) continue;
 				if(lib.config.bannedcards.contains(i)) continue;
                 if(!lib.translate[i+'_info']) continue;
@@ -41690,6 +41692,8 @@
 		libCard:function(filter){
 			var list=[];
 			for(var i in lib.card){
+				if(lib.card[i].mode&&lib.card[i].mode.contains(get.mode())==false) continue;
+				if(lib.card[i].vanish||lib.card[i].destroy) continue;
 				if(lib.config.bannedcards.contains(i)) continue;
 				if(!lib.translate[i+'_info']) continue;
 				if(filter(lib.card[i],i)){