From 10bd119486647791ecbeabd2850c400a8755b555 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Mon, 23 Jan 2017 17:33:09 +0800
Subject: [PATCH] 2

---
 character/swd.js     | 10 +++++-----
 character/yijiang.js | 12 ++++++------
 character/yxs.js     |  8 +++++---
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/character/swd.js b/character/swd.js
index 9cb993116..6e1e4db05 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -425,7 +425,7 @@ character.swd={
 			animationColor:'fire',
 			content:function(){
 				'step 0'
-				player.unmarkSkill('hxunzhi');
+				player.awakenSkill('hxunzhi');
 				player.storage.hxunzhi=true;
 				var targets=[];
 				for(var i=0;i<game.players.length;i++){
@@ -708,7 +708,7 @@ character.swd={
             selectTarget:[1,Infinity],
 			content:function(){
                 if(target==targets[0]){
-                    player.unmarkSkill('jinlin');
+                    player.awakenSkill('jinlin');
     				player.storage.jinlin=true;
                 }
 				target.changeHujia(3);
@@ -938,7 +938,7 @@ character.swd={
 			selectTarget:[1,3],
 			content:function(){
 				"step 0"
-				player.unmarkSkill('bingfeng');
+				player.awakenSkill('bingfeng');
 				player.removeSkill('xuanzhou');
 				player.loseMaxHp();
 				player.storage.bingfeng=true;
@@ -2005,7 +2005,7 @@ character.swd={
 			},
 			content:function(){
 				"step 0"
-				player.unmarkSkill('shouyin');
+				player.awakenSkill('shouyin');
 				player.storage.shouyin=true;
 				player.turnOver();
 				"step 1"
@@ -7406,7 +7406,7 @@ character.swd={
 			},
 			content:function(){
 				player.storage.duijue=true;
-				player.unmarkSkill('duijue');
+				player.awakenSkill('duijue');
 				var evt=_status.event;
 				for(var i=0;i<10;i++){
 					if(evt&&evt.getParent){
diff --git a/character/yijiang.js b/character/yijiang.js
index cfa4911b8..4b9ee9167 100644
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -1230,7 +1230,7 @@ character.yijiang={
 			content:function(){
 				"step 0"
 				player.storage.xinfencheng=true;
-				player.unmarkSkill('xinfencheng');
+				player.awakenSkill('xinfencheng');
 				event.num=1;
 				event.targets=targets.slice(0);
 				event.targets.sort(lib.sort.seat);
@@ -3623,7 +3623,7 @@ character.yijiang={
 			content:function(){
 				'step 0'
 				player.storage.xingshuai=true;
-				player.unmarkSkill('xingshuai');
+				player.awakenSkill('xingshuai');
 				var targets=get.players();
 				targets.remove(player);
 				event.targets=targets;
@@ -4064,7 +4064,7 @@ character.yijiang={
 			content:function(){
 				"step 0"
 				player.storage.fencheng=true;
-				player.unmarkSkill('fencheng');
+				player.awakenSkill('fencheng');
 				var res=ai.get.damageEffect(target,player,target,'fire');
 				var num=Math.max(1,target.num('e'));
 				target.chooseToDiscard(num,'he','弃置'+get.cnNumber(num)+'张牌或受到1点火焰伤害').set('ai',function(card){
@@ -4230,7 +4230,7 @@ character.yijiang={
 			filterTarget:true,
 			content:function(){
 				"step 0"
-				player.unmarkSkill('jiefan');
+				player.awakenSkill('jiefan');
 				player.storage.jiefan=true;
 				event.players=[];
 				for(var i=0;i<game.players.length;i++){
@@ -4301,7 +4301,7 @@ character.yijiang={
 			},
 			content:function(){
 				"step 0"
-				player.unmarkSkill('fuli');
+				player.awakenSkill('fuli');
 				player.recover(player.maxHp);
 				"step 1"
 				player.turnOver();
@@ -5013,7 +5013,7 @@ character.yijiang={
 			mark:true,
 			content:function(){
 				"step 0"
-				player.unmarkSkill('xianzhou');
+				player.awakenSkill('xianzhou');
 				var cards=player.get('e');
 				target.gain(cards,player);
 				event.num=cards.length;
diff --git a/character/yxs.js b/character/yxs.js
index 6cb77d0b8..f74f1bf47 100644
--- a/character/yxs.js
+++ b/character/yxs.js
@@ -96,7 +96,7 @@ character.yxs={
 				return 7-ai.get.value(card);
 			},
 			content:function(){
-				player.unmarkSkill('yixin');
+				player.awakenSkill('yixin');
 				player.storage.yixin=true;
 				var num=Math.min(4,target.maxHp-target.hp);
 				target.recover(num);
@@ -938,6 +938,8 @@ character.yxs={
 				return target.sex=='male'&&target!=player;
 			},
 			content:function(){
+				player.awakenSkill('heqin');
+
 				player.addSkill('heqin2');
 				target.addSkill('heqin2');
 
@@ -1664,7 +1666,7 @@ character.yxs={
 			filterTarget:true,
 			content:function(){
 				"step 0"
-				player.unmarkSkill('seyou');
+				player.awakenSkill('seyou');
 				player.storage.seyou=true;
 				event.targets=game.players.slice(0);
 				event.targets.remove(player);
@@ -2487,7 +2489,7 @@ character.yxs={
 				player.hp=Math.min(3,player.maxHp);
 				player.discard(player.get('hej'));
 				player.draw(3);
-				player.unmarkSkill('zhexian');
+				player.awakenSkill('zhexian');
 				player.storage.zhexian=true;
 				'step 1'
 				if(player.isLinked()) player.link();