diff --git a/card/hearth.js b/card/hearth.js
index 0bf3b947c..b9db3f370 100644
--- a/card/hearth.js
+++ b/card/hearth.js
@@ -37,7 +37,7 @@ card.hearth={
 		},
 		jihuocard:{
 			fullskin:true,
-			type:'basic',
+			type:'trick',
 			enable:true,
 			filterTarget:function(card,player,target){
 				return player==target;
diff --git a/card/swd.js b/card/swd.js
index b5b53d4db..b2f023ec4 100755
--- a/card/swd.js
+++ b/card/swd.js
@@ -1,5 +1,27 @@
 card.swd={
 	card:{
+		xingjunyan:{
+			fullskin:true,
+			type:'equip',
+			subtype:'equip5',
+			skills:['xingjunyan'],
+			ai:{
+				basic:{
+					equipValue:4
+				},
+			},
+		},
+		qinglonglingzhu:{
+			fullskin:true,
+			type:'equip',
+			subtype:'equip5',
+			skills:['qinglonglingzhu'],
+			ai:{
+				basic:{
+					equipValue:5
+				},
+			},
+		},
 		baihupifeng:{
 			fullskin:true,
 			type:"equip",
@@ -614,6 +636,31 @@ card.swd={
 		},
 	},
 	skill:{
+		qinglonglingzhu:{
+			trigger:{source:'damageEnd'},
+			direct:true,
+			filter:function(event,player){
+				return event.nature&&event.player&&event.player.isAlive();
+			},
+			content:function(){
+				player.gainPlayerCard('是否对'+get.translation(trigger.player)+'发动【青龙灵珠】？',trigger.player,function(button){
+					if(ai.get.attitude(player,trigger.player)<=0){
+						return ai.get.buttonValue(button);
+					}
+					return 0;
+				},'he').logSkill=['qinglonglingzhu',trigger.player];
+			},
+		},
+		xingjunyan:{
+			trigger:{source:'damageBegin',player:'damageBegin'},
+			forced:true,
+			filter:function(event,player){
+				return event.card&&event.card.name=='sha';
+			},
+			content:function(){
+				trigger.num++;
+			}
+		},
 		baihupifeng:{
 			trigger:{player:'phaseEnd'},
 			frequent:true,
@@ -1091,6 +1138,10 @@ card.swd={
 		},
 	},
 	translate:{
+		qinglonglingzhu:'青龙灵珠',
+		qinglonglingzhu_info:'每当你造成一次属性伤害，你可以获得对方的一张牌',
+		xingjunyan:'星君眼',
+		xingjunyan_info:'你的杀造成的伤害+1；杀对你造成的伤害+1',
 		guiyanfadao:'鬼眼法刀',
 		guiyanfadao_bg:'眼',
 		// guiyanfadao_info:'你可以将一张普通杀当毒杀使用',
diff --git a/character/ow.js b/character/ow.js
new file mode 100644
index 000000000..28b32a17d
--- /dev/null
+++ b/character/ow.js
@@ -0,0 +1,17 @@
+'use strict';
+character.ow={
+    character:{
+        ow_liekong:['female','shu',3,[]],
+        // ow_heibaihe:['female','shu',3,[]],
+        ow_sishen:['female','shu',3,[]],
+        ow_tianshi:['female','shu',3,[]],
+        ow_falaozhiying:['female','shu',3,[]],
+        ow_zhixuzhiguang:['female','shu',3,[]],
+        ow_luxiao:['female','shu',3,[]],
+        ow_shibing:['female','shu',3,[]],
+        ow_yuanshi:['female','shu',3,[]],
+        // ow_mei:['female','shu',3,[]],
+        // ow_baolei:['female','shu',3,[]],
+        ow_chanyata:['female','shu',3,[]],
+    }
+};
diff --git a/game/asset.js b/game/asset.js
index 77a484832..360dcab22 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-    '1.8.9',
+    '1.8.10',
     'image/background/huangtian_bg.jpg',
     'image/background/shengshi_bg.jpg',
     'image/background/xueji_bg.jpg',
@@ -86,6 +86,7 @@ window.noname_asset_list=[
     'image/card/qilin.png',
     'image/card/qinggang.png',
     'image/card/qinglong.png',
+    'image/card/qinglonglingzhu.png',
     'image/card/renwang.png',
     'image/card/sadengjinhuan.png',
     'image/card/sanjian.png',
@@ -252,6 +253,7 @@ window.noname_asset_list=[
     'image/card/wuzhong.png',
     'image/card/xiangyuye.png',
     'image/card/xingjiegoutong.png',
+    'image/card/xingjunyan.png',
     'image/card/xixueguizhihuan.png',
     'image/card/yihuajiemu.png',
     'image/card/yiyi.png',
@@ -543,6 +545,15 @@ window.noname_asset_list=[
     'image/character/nianshou.jpg',
     'image/character/niutou.jpg',
     'image/character/old_zhonghui.jpg',
+    'image/character/ow_liekong.jpg',
+    'image/character/ow_sishen.jpg',
+    'image/character/ow_chanyata.jpg',
+    'image/character/ow_yuanshi.jpg',
+    'image/character/ow_zhixuzhiguang.jpg',
+    'image/character/ow_falaozhiying.jpg',
+    'image/character/ow_luxiao.jpg',
+    'image/character/ow_shibing.jpg',
+    'image/character/ow_tianshi.jpg',
     'image/character/pal_changqing.jpg',
     'image/character/pal_hanlingsha.jpg',
     'image/character/pal_jingtian.jpg',
@@ -2388,7 +2399,6 @@ window.noname_skin_list={
     xuzhu:1,
     yangxiu:2,
     yj_jushou:2,
-    yuanshu:3,
     yuanshu:4,
     yuejin:3,
     yufan:1,
diff --git a/game/game.js b/game/game.js
index a450b669d..4287d2a7c 100755
--- a/game/game.js
+++ b/game/game.js
@@ -1425,7 +1425,7 @@
 								this.innerHTML='已隐藏';
 								game.saveConfig('hiddenModePack',['stone','chess','boss']);
 								game.saveConfig('hiddenCardPack',['zhenfa','yunchou','swd','shenqi','hearth','compensate']);
-								game.saveConfig('hiddenCharacterPack',['diy','yxs','hearth','swd','gujian','xianjian','xiake','boss']);
+								game.saveConfig('hiddenCharacterPack',['diy','yxs','hearth','swd','gujian','xianjian','xiake','boss','ow']);
 								var that=this;
 								setTimeout(function(){
 									that.innerHTML='隐藏非官方扩展包';
@@ -3397,7 +3397,16 @@
     					}
                     }
                     for(var i=0;i<extensionlist.length;i++){
-                        lib.init.js(lib.assetURL+'extension/'+extensionlist[i],'extension',extLoaded,extLoaded);
+                        lib.init.js(lib.assetURL+'extension/'+extensionlist[i],'extension',extLoaded,(function(i){
+                            return function(){
+                                game.removeExtension(i);
+                                extToLoad--;
+            					if(extToLoad==0){
+                                    delete window.game;
+            						loadPack();
+            					}
+                            }
+                        }(extensionlist[i])));
                     }
                 }
                 else{
@@ -5805,6 +5814,14 @@
                         event.finish();
                     }
 					"step 3"
+                    if(event.logSkill&&event.result.bool&&!game.online){
+						if(typeof event.logSkill=='string'){
+							player.logSkill(event.logSkill);
+						}
+						else if(Array.isArray(event.logSkill)){
+							player.logSkill.apply(player,event.logSkill);
+						}
+					}
 					var cards=[];
 					for(var i=0;i<event.result.links.length;i++){
 						cards.push(event.result.links[i]);
@@ -16090,6 +16107,9 @@
                 if(lib.node&&lib.node.fs){
                     try{
                         lib.node.fs.readdir(__dirname+'/extension/'+extname,function(err,list){
+                            if(err){
+                                return;
+                            }
                             var removeFile=function(){
                                 if(list.length){
                                     var filename=list.shift();
diff --git a/game/package.js b/game/package.js
index 344437c74..5256a10e3 100755
--- a/game/package.js
+++ b/game/package.js
@@ -9,6 +9,7 @@ character.pack={
     diy:'DIY',
     yxs:'英雄杀',
     hearth:'炉石传说',
+    ow:'守望先锋',
     swd:'轩辕剑',
     gujian:'古剑奇谭',
     xianjian:'仙剑',
diff --git a/game/source.js b/game/source.js
index 6bc9129c7..17278312d 100644
--- a/game/source.js
+++ b/game/source.js
@@ -18,6 +18,7 @@ window.noname_source_list=[
     'character/guozhan.js',
     'character/hearth.js',
     'character/jiange.js',
+    'character/ow.js',
     'character/rank.js',
     'character/refresh.js',
     'character/shenhua.js',
diff --git a/game/update.js b/game/update.js
index e97e52e98..1ed8a9a45 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,21 +1,18 @@
 window.noname_update={
-    version:'1.8.14.2',
+    version:'1.8.15',
     changeLog:[
         '修bug',
     ],
     files:{
         global:[
-            'character/sp.js',
-            'character/yijiang.js',
-            'mode/guozhan.js',
+            'character/ow.js',
+            'card/swd.js',
+            'card/hearth.js',
+            'game/package.js',
             'game/game.js',
-            'layout/default/layout.css',
-            'theme/woodden/style.css',
-            'theme/simple/style.css',
-            'theme/music/style.css',
+            'game/source.js',
+            'game/asset.js',
         ],
-        '1.8.14':[],
-        '1.8.14.1':[],
         '1.8.14.2':[]
     }
 }
diff --git a/image/card/qinglonglingzhu.png b/image/card/qinglonglingzhu.png
new file mode 100755
index 000000000..efbca385a
Binary files /dev/null and b/image/card/qinglonglingzhu.png differ
diff --git a/image/card/xingjunyan.png b/image/card/xingjunyan.png
new file mode 100755
index 000000000..3b3bad925
Binary files /dev/null and b/image/card/xingjunyan.png differ
diff --git a/image/character/ow_baolei.jpg b/image/character/ow_baolei.jpg
new file mode 100644
index 000000000..bbb768f3a
Binary files /dev/null and b/image/character/ow_baolei.jpg differ
diff --git a/image/character/ow_chanyata.jpg b/image/character/ow_chanyata.jpg
new file mode 100644
index 000000000..56dcb6320
Binary files /dev/null and b/image/character/ow_chanyata.jpg differ
diff --git a/image/character/ow_falaozhiying.jpg b/image/character/ow_falaozhiying.jpg
new file mode 100644
index 000000000..aa46a84a0
Binary files /dev/null and b/image/character/ow_falaozhiying.jpg differ
diff --git a/image/character/ow_heibaihe.jpg b/image/character/ow_heibaihe.jpg
new file mode 100644
index 000000000..3ec1cd932
Binary files /dev/null and b/image/character/ow_heibaihe.jpg differ
diff --git a/image/character/ow_liekong.jpg b/image/character/ow_liekong.jpg
new file mode 100644
index 000000000..8c869666b
Binary files /dev/null and b/image/character/ow_liekong.jpg differ
diff --git a/image/character/ow_luxiao.jpg b/image/character/ow_luxiao.jpg
new file mode 100644
index 000000000..50b930f93
Binary files /dev/null and b/image/character/ow_luxiao.jpg differ
diff --git a/image/character/ow_mei.jpg b/image/character/ow_mei.jpg
new file mode 100644
index 000000000..aadf2d465
Binary files /dev/null and b/image/character/ow_mei.jpg differ
diff --git a/image/character/ow_shibing.jpg b/image/character/ow_shibing.jpg
new file mode 100644
index 000000000..c21462966
Binary files /dev/null and b/image/character/ow_shibing.jpg differ
diff --git a/image/character/ow_sishen.jpg b/image/character/ow_sishen.jpg
new file mode 100644
index 000000000..00156cb3b
Binary files /dev/null and b/image/character/ow_sishen.jpg differ
diff --git a/image/character/ow_tianshi.jpg b/image/character/ow_tianshi.jpg
new file mode 100644
index 000000000..64d5d1899
Binary files /dev/null and b/image/character/ow_tianshi.jpg differ
diff --git a/image/character/ow_yuanshi.jpg b/image/character/ow_yuanshi.jpg
new file mode 100644
index 000000000..e165229f3
Binary files /dev/null and b/image/character/ow_yuanshi.jpg differ
diff --git a/image/character/ow_zhixuzhiguang.jpg b/image/character/ow_zhixuzhiguang.jpg
new file mode 100644
index 000000000..9afd55295
Binary files /dev/null and b/image/character/ow_zhixuzhiguang.jpg differ