From e1e0721cd836d02e95aa6b0a02870ef579011a58 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Tue, 28 Feb 2017 16:31:05 +0800
Subject: [PATCH] 2

---
 audio/skill/{wuxin1.mp3 => boss_wuxin1.mp3} | Bin
 audio/skill/{wuxin2.mp3 => boss_wuxin2.mp3} | Bin
 extension/boss/extension.js                 |   2 ++
 game/asset.js                               |   6 +++---
 game/game.js                                |   1 -
 game/update.js                              |   2 +-
 mode/boss.js                                |  18 ++++++++++++------
 7 files changed, 18 insertions(+), 11 deletions(-)
 rename audio/skill/{wuxin1.mp3 => boss_wuxin1.mp3} (100%)
 rename audio/skill/{wuxin2.mp3 => boss_wuxin2.mp3} (100%)

diff --git a/audio/skill/wuxin1.mp3 b/audio/skill/boss_wuxin1.mp3
similarity index 100%
rename from audio/skill/wuxin1.mp3
rename to audio/skill/boss_wuxin1.mp3
diff --git a/audio/skill/wuxin2.mp3 b/audio/skill/boss_wuxin2.mp3
similarity index 100%
rename from audio/skill/wuxin2.mp3
rename to audio/skill/boss_wuxin2.mp3
diff --git a/extension/boss/extension.js b/extension/boss/extension.js
index 09319c668..2f2d83dbd 100644
--- a/extension/boss/extension.js
+++ b/extension/boss/extension.js
@@ -180,6 +180,7 @@ play.boss={
 						lib.translate[i]=lib.translate[i]||mode.versus.translate[i];
 					}
 					for(var i in mode.versus.skill){
+						if(lib.skill[i]) console.log(i);
 						if(i!='versus_ladder'){
 							lib.skill[i]=lib.init.eval(mode.versus.skill[i]);
 							game.finishSkill(i);
@@ -196,6 +197,7 @@ play.boss={
 					lib.translate[i]=lib.translate[i]||mode.boss.translate[i];
 				}
 				for(var i in mode.boss.skill){
+					if(lib.skill[i]) console.log(i);
 					lib.skill[i]=lib.init.eval(mode.boss.skill[i]);
 					game.finishSkill(i);
 				}
diff --git a/game/asset.js b/game/asset.js
index b161b78b2..37e62b975 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-    '1.9.9.8',
+    '1.9.10',
     'image/background/huangtian_bg.jpg',
     'image/background/september_bg.jpg',
     'image/background/shengshi_bg.jpg',
@@ -1574,6 +1574,8 @@ window.noname_asset_list=[
     'audio/skill/boss_skonghun.mp3',
     'audio/skill/boss_tianyu.mp3',
     'audio/skill/boss_tianyujg.mp3',
+    'audio/skill/boss_wuxin1.mp3',
+    'audio/skill/boss_wuxin2.mp3',
     'audio/skill/boss_xianyin1.mp3',
     'audio/skill/boss_xianyin2.mp3',
     'audio/skill/boss_xuanlei.mp3',
@@ -2229,8 +2231,6 @@ window.noname_asset_list=[
     'audio/skill/wushuang12.mp3',
     'audio/skill/wushuang21.mp3',
     'audio/skill/wushuang22.mp3',
-    'audio/skill/wuxin1.mp3',
-    'audio/skill/wuxin2.mp3',
     'audio/skill/wuyan1.mp3',
     'audio/skill/wuyan2.mp3',
     'audio/skill/xiangle1.mp3',
diff --git a/game/game.js b/game/game.js
index 588566966..72fc809be 100644
--- a/game/game.js
+++ b/game/game.js
@@ -25533,7 +25533,6 @@
 							list.push(i);
 							for(var j=0;j<info[i][3].length;j++){
 								if(!lib.skill[info[i][3][j]]){
-									console.log(info[i][3][j]);
 									continue;
 								}
 								if(lib.skill[info[i][3][j]].alter){
diff --git a/game/update.js b/game/update.js
index 7fc55433b..96b3e5072 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,5 +1,5 @@
 window.noname_update={
-    version:'1.9.10.1',
+    version:'1.9.10.2',
     // update:'1.9.9.6',
     changeLog:[
         'bug修复',
diff --git a/mode/boss.js b/mode/boss.js
index 17f7bbae2..c25b8ce30 100644
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -385,7 +385,7 @@ mode.boss={
 	},
 	characterPack:{
 		mode_boss:{
-			boss_zhangchunhua:['female','wei',4,['jueqing','wuxin','shangshix'],['boss','bossallowed'],'wei'],
+			boss_zhangchunhua:['female','wei',4,['jueqing','boss_wuxin','shangshix'],['boss','bossallowed'],'wei'],
 			boss_zhenji:['female','wei',4,['tashui','lingbo','jiaoxia','fanghua'],['boss','bossallowed'],'wei'],
 			boss_huangyueying:['female','shu',4,['boss_gongshen','boss_jizhi','qicai','boss_guiyin'],['boss','bossallowed'],'wei'],
 			boss_pangtong:['male','shu',4,['boss_tianyu','qiwu','niepan','boss_yuhuo'],['boss','bossallowed'],'zhu'],
@@ -3247,9 +3247,15 @@ mode.boss={
 				}
 			}
 		},
-		wuxin:{
-			inherit:'miles_xueyi',
-			group:'swd_wuxie',
+		boss_wuxin:{
+			trigger:{player:'damageBefore'},
+			forced:true,
+			priority:10,
+			content:function(){
+				trigger.untrigger();
+				trigger.finish();
+				player.loseHp();
+			},
 			audio:2,
 		},
 		shenwei:{
@@ -3778,8 +3784,8 @@ mode.boss={
 		tashui:'踏水',
 		tashui_info:'每当你使用或打出一张黑色牌，你可以令一名其他角色翻面',
 
-		wuxin:'无心',
-		wuxin_info:'锁定技，你防止即将受到的伤害，改为流失一点体力；你不能成为其他角色的延时锦囊的目标',
+		boss_wuxin:'无心',
+		boss_wuxin_info:'锁定技，你防止即将受到的伤害，改为流失一点体力；你不能成为其他角色的延时锦囊的目标',
 		shangshix:'伤逝',
 		shangshix2:'伤逝',
 		shangshix_info:'锁定技，你的手牌数至少为4，结束阶段，若你的体力值大于1，你令场上所有角色流失一点体力',