From abf2cde699eb55ad5c1d84148429b535e281c6e1 Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Thu, 26 Nov 2015 08:50:57 +0800
Subject: [PATCH] c

---
 character/diy.js      |  32 ++++++------
 character/extra.js    |  16 +++---
 character/fire.js     |  16 +++---
 character/gujian.js   |  20 ++++----
 character/guozhan.js  |  24 ++++-----
 character/hearth.js   |  76 ++++++++++++++--------------
 character/jiange.js   |  16 +++---
 character/mountain.js |  14 +++---
 character/rank.js     |   4 ++
 character/refresh.js  |  42 ++++++++--------
 character/sp.js       |  68 ++++++++++++-------------
 character/standard.js |  50 +++++++++----------
 character/swd.js      |  90 ++++++++++++++++-----------------
 character/wind.js     |  16 +++---
 character/woods.js    |  16 +++---
 character/xiake.js    |  10 ++--
 character/xianjian.js |  24 ++++-----
 character/xswd.js     |  46 ++++++++---------
 character/yijiang.js  | 112 +++++++++++++++++++++---------------------
 character/yxs.js      |  14 +++---
 character/zhuogui.js  |  10 ++--
 game/game.js          |  66 ++++++++++++++-----------
 22 files changed, 398 insertions(+), 384 deletions(-)

diff --git a/character/diy.js b/character/diy.js
index 2705a013a..fe4172377 100755
--- a/character/diy.js
+++ b/character/diy.js
@@ -1,23 +1,23 @@
 character.diy={
 	character:{
 		// diy_caocao:['male','wei',4,['xicai','diyjianxiong','hujia']],
-		// diy_hanlong:['male','wei',4,['siji','ciqiu'],['fullskin']],
-		diy_feishi:['male','shu',3,['shuaiyan','moshou'],['fullskin']],
-		diy_liuyan:['male','shu',3,['juedao','geju'],['fullskin']],
-		// diy_luxun:['male','wu',3,['shaoying','zonghuo'],['fullskin']],
-		diy_yuji:['male','qun',3,['diyguhuo','diychanyuan'],['fullskin']],
+		// diy_hanlong:['male','wei',4,['siji','ciqiu']],
+		diy_feishi:['male','shu',3,['shuaiyan','moshou']],
+		diy_liuyan:['male','shu',3,['juedao','geju']],
+		// diy_luxun:['male','wu',3,['shaoying','zonghuo']],
+		diy_yuji:['male','qun',3,['diyguhuo','diychanyuan']],
 		// diy_zhouyu:['male','wu',3,['jieyan','honglian']],
-		diy_zhouyu:['male','wu',3,['xiongzi','yaliang'],['fullskin']],
-		diy_caiwenji:['female','qun',3,['beige','guihan'],['fullskin']],
-		diy_lukang:['male','wu',4,['luweiyan','qianxun'],['fullskin']],
-		diy_xuhuang:['male','wei',4,['diyduanliang'],['fullskin']],
-		diy_dianwei:['male','wei',4,['diyqiangxi'],['fullskin']],
-		diy_huangzhong:['male','shu',4,['liegong','fuli'],['fullskin']],
-		diy_weiyan:['male','shu',4,['diykuanggu'],['fullskin']],
-		diy_zhenji:['female','wei',3,['jiaoxia','yiesheng'],['fullskin']],
-		// diy_menghuo:['male','shu',4,['huoshou','zaiqix'],['fullskin']],
-		re_huangyueying:['female','shu',3,['rejizhi','qicai'],['fullskin']],
-		old_zhonghui:['male','wei',3,['zzhenggong','zquanji','zbaijiang'],['fullskin']],
+		diy_zhouyu:['male','wu',3,['xiongzi','yaliang']],
+		diy_caiwenji:['female','qun',3,['beige','guihan']],
+		diy_lukang:['male','wu',4,['luweiyan','qianxun']],
+		diy_xuhuang:['male','wei',4,['diyduanliang']],
+		diy_dianwei:['male','wei',4,['diyqiangxi']],
+		diy_huangzhong:['male','shu',4,['liegong','fuli']],
+		diy_weiyan:['male','shu',4,['diykuanggu']],
+		diy_zhenji:['female','wei',3,['jiaoxia','yiesheng']],
+		// diy_menghuo:['male','shu',4,['huoshou','zaiqix']],
+		re_huangyueying:['female','shu',3,['rejizhi','qicai']],
+		old_zhonghui:['male','wei',3,['zzhenggong','zquanji','zbaijiang']],
 	},
 	skill:{
 		zaiqix:{
diff --git a/character/extra.js b/character/extra.js
index bc8f13917..4cc6a8349 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -1,13 +1,13 @@
 character.extra={
 	character:{
-		shen_guanyu:['male','shu',6,['wuhun','wushen'],['fullskin']],
-		shen_zhaoyun:['male','shu',2,['juejing','longhun'],['fullskin'],['fullskin']],
-		shen_zhugeliang:['male','shu',3,['qixing','kuangfeng','dawu'],['fullskin']],
-		shen_lvmeng:['male','wu',3,['shelie','gongxin'],['fullskin']],
-		shen_zhouyu:['male','wu',4,['yeyan','qinyin'],['fullskin']],
-		shen_simayi:['male','wei',4,['renjie','sbaiyin','lianpo'],['fullskin']],
-		shen_caocao:['male','wei',3,['guixin','feiying'],['fullskin']],
-		shen_lvbu:['male','qun',5,['baonu','wuqian','shenfen'],['fullskin']],
+		shen_guanyu:['male','shu',6,['wuhun','wushen']],
+		shen_zhaoyun:['male','shu',2,['juejing','longhun']],
+		shen_zhugeliang:['male','shu',3,['qixing','kuangfeng','dawu']],
+		shen_lvmeng:['male','wu',3,['shelie','gongxin']],
+		shen_zhouyu:['male','wu',4,['yeyan','qinyin']],
+		shen_simayi:['male','wei',4,['renjie','sbaiyin','lianpo']],
+		shen_caocao:['male','wei',3,['guixin','feiying']],
+		shen_lvbu:['male','qun',5,['baonu','wuqian','shenfen']],
 	},
 	skill:{
 		lianpo:{
diff --git a/character/fire.js b/character/fire.js
index cea7b51e1..027ce4a86 100755
--- a/character/fire.js
+++ b/character/fire.js
@@ -1,14 +1,14 @@
 'use strict';
 character.fire={
 	character:{
-		zhugeliangwolong:['male','shu',3,['huoji','bazhen','kanpo'],['fullskin']],
-		pangtong:['male','shu',3,['lianhuan','niepan'],['fullskin']],
-		xunyu:['male','wei',3,['quhu','jieming'],['fullskin']],
-		dianwei:['male','wei',4,['qiangxi'],['fullskin']],
-		taishici:['male','wu',4,['tianyi'],['fullskin']],
-		yanwen:['male','qun',4,['shuangxiong'],['fullskin']],
-		yuanshao:['male','qun',4,['luanji','xueyi'],['zhu','fullskin']],
-		pangde:['male','qun',4,['mashu','mengjin'],['fullskin']],
+		zhugeliangwolong:['male','shu',3,['huoji','bazhen','kanpo']],
+		pangtong:['male','shu',3,['lianhuan','niepan']],
+		xunyu:['male','wei',3,['quhu','jieming']],
+		dianwei:['male','wei',4,['qiangxi']],
+		taishici:['male','wu',4,['tianyi']],
+		yanwen:['male','qun',4,['shuangxiong']],
+		yuanshao:['male','qun',4,['luanji','xueyi'],['zhu']],
+		pangde:['male','qun',4,['mashu','mengjin']],
 	},
 	perfectPair:{
 		zhugeliangwolong:['pangtong','huangyueying'],
diff --git a/character/gujian.js b/character/gujian.js
index 348248202..4ec67141b 100755
--- a/character/gujian.js
+++ b/character/gujian.js
@@ -1,16 +1,16 @@
 character.gujian={
 	character:{
-		gjqt_bailitusu:['male','shu',4,['xuelu','fanshi','shahun'],['fullskin']],
-		gjqt_fengqingxue:['female','wu',3,['qinglan','yuehua','swd_wuxie'],['fullskin']],
-		gjqt_xiangling:['female','wu',3,['qianhuan','meihu','xidie'],['fullskin']],
-		gjqt_fanglansheng:['male','wu',3,['fanyin','mingkong','fumo'],['fullskin']],
-		gjqt_yinqianshang:['male','qun',4,['zhongji','zuizhan'],['fullskin']],
-		gjqt_hongyu:['female','shu',4,['jianwu','meiying'],['fullskin']],
+		gjqt_bailitusu:['male','shu',4,['xuelu','fanshi','shahun']],
+		gjqt_fengqingxue:['female','wu',3,['qinglan','yuehua','swd_wuxie']],
+		gjqt_xiangling:['female','wu',3,['qianhuan','meihu','xidie']],
+		gjqt_fanglansheng:['male','wu',3,['fanyin','mingkong','fumo']],
+		gjqt_yinqianshang:['male','qun',4,['zhongji','zuizhan']],
+		gjqt_hongyu:['female','shu',4,['jianwu','meiying']],
 
-		gjqt_yuewuyi:['male','wei',4,['yanjia','xiuhua'],['fullskin']],
-		gjqt_wenrenyu:['female','shu',4,['jizhan','qianjun'],['fullskin']],
-		gjqt_xiayize:['male','qun',3,['xuanning','liuguang','yangming'],['fullskin']],
-		gjqt_aruan:['female','wu',3,['zhaolu','jiehuo','yuling'],['fullskin']],
+		gjqt_yuewuyi:['male','wei',4,['yanjia','xiuhua']],
+		gjqt_wenrenyu:['female','shu',4,['jizhan','qianjun']],
+		gjqt_xiayize:['male','qun',3,['xuanning','liuguang','yangming']],
+		gjqt_aruan:['female','wu',3,['zhaolu','jiehuo','yuling']],
 	},
 	skill:{
 		jianwu:{
diff --git a/character/guozhan.js b/character/guozhan.js
index ed3eca138..78f9d14b5 100755
--- a/character/guozhan.js
+++ b/character/guozhan.js
@@ -1,16 +1,16 @@
 character.guozhan={
 	character:{
-		ganfuren:['female','shu',3,['shushen','shenzhi'],['fullskin']],
-		mifuren:['female','shu',3,['guixiu','cunsi'],['fullskin']],
-		mateng:['male','qun',4,['xiongyi','mashu'],['fullskin']],
-		tianfeng:['male','qun',3,['sijian','suishi'],['fullskin']],
-		yuejin:['male','wei',4,['xiaoguo'],['fullskin']],
-		chendong:['male','wu',4,['duanxie','fenming'],['fullskin']],
-		sp_dongzhuo:['male','qun',5,['hengzheng'],['fullskin']],
-		jiangfei:['male','shu',3,['shengxi','shoucheng'],['fullskin']],
-		jiangqing:['male','wu',4,['shangyi'],['fullskin']],
-		hetaihou:['female','qun',3,['zhendu','qiluan'],['fullskin']],
-		kongrong:['male','qun',3,['lirang','mingshi'],['fullskin']],
-		dingfeng:['male','wu',4,['fenxun'],['fullskin']],
+		ganfuren:['female','shu',3,['shushen','shenzhi']],
+		mifuren:['female','shu',3,['guixiu','cunsi']],
+		mateng:['male','qun',4,['xiongyi','mashu']],
+		tianfeng:['male','qun',3,['sijian','suishi']],
+		yuejin:['male','wei',4,['xiaoguo']],
+		chendong:['male','wu',4,['duanxie','fenming']],
+		sp_dongzhuo:['male','qun',5,['hengzheng']],
+		jiangfei:['male','shu',3,['shengxi','shoucheng']],
+		jiangqing:['male','wu',4,['shangyi']],
+		hetaihou:['female','qun',3,['zhendu','qiluan']],
+		kongrong:['male','qun',3,['lirang','mingshi']],
+		dingfeng:['male','wu',4,['fenxun']],
 	},
 };
diff --git a/character/hearth.js b/character/hearth.js
index b0cd75278..3dc89fde9 100755
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -1,47 +1,47 @@
 'use strict';
 character.hearth={
 	character:{
-		hs_jaina:['female','wei',3,['huopu','bianxing','bingjia'],['fullskin']],
-		hs_lrexxar:['male','qun',4,['shoulie','gongji'],['fullskin']],
-		hs_wuther:['male','qun',4,['fengxian','jieming'],['fullskin']],
-		hs_jgarrosh:['male','qun',4,['zhanhou','qiangxi'],['fullskin']],
-		hs_malfurion:['male','wu',4,['jihuo'],['fullskin']],
-		hs_guldan:['male','qun',3,['fenliu','hongxi'],['fullskin']],
-		hs_anduin:['male','qun',3,['shengguang','shijie','anying'],['fullskin']],
-		hs_sthrall:['male','wu',4,['tuteng','guozai'],['fullskin']],
-		hs_waleera:['female','qun',3,['jianren','mengun','wlianji'],['fullskin']],
+		hs_jaina:['female','wei',3,['huopu','bianxing','bingjia']],
+		hs_lrexxar:['male','qun',4,['shoulie','gongji']],
+		hs_wuther:['male','qun',4,['fengxian','jieming']],
+		hs_jgarrosh:['male','qun',4,['zhanhou','qiangxi']],
+		hs_malfurion:['male','wu',4,['jihuo']],
+		hs_guldan:['male','qun',3,['fenliu','hongxi']],
+		hs_anduin:['male','qun',3,['shengguang','shijie','anying']],
+		hs_sthrall:['male','wu',4,['tuteng','guozai']],
+		hs_waleera:['female','qun',3,['jianren','mengun','wlianji']],
 
-		hs_medivh:['male','wei',3,['jingxiang','moying','mdzhoufu'],['fullskin']],
-		hs_alleria:['male','wu',3,['fengxing','qiaodong','liegong'],['fullskin']],
-		hs_magni:['male','qun',4,['zhongjia','dunji'],['fullskin']],
+		hs_medivh:['male','wei',3,['jingxiang','moying','mdzhoufu']],
+		hs_alleria:['male','wu',3,['fengxing','qiaodong','liegong']],
+		hs_magni:['male','qun',4,['zhongjia','dunji']],
 
-		hs_neptulon:['male','wu',4,['liechao','qingliu'],['fullskin']],
-		hs_wvelen:['male','qun',3,['shengyan','xianzhi'],['fullskin']],
-		hs_antonidas:['male','wei',3,['yanshu','bingshuang'],['fullskin']],
-		hs_alakir:['male','wei',3,['fengnu','shengdun'],['fullskin']],
-		hs_zhouzhuo:['male','qun',3,['jubao','qice'],['fullskin']],
-		hs_yngvar:['male','qun',3,['huanwu'],['fullskin']],
-		hs_bchillmaw:['male','wei',6,['hanshuang','bingshi'],['fullskin']],
-		hs_malorne:['male','wu',3,['enze','chongsheng'],['fullskin']],
-		hs_malygos:['male','wei',4,['malymowang'],['fullskin']],
-		hs_xuefashi:['male','wei',3,['liehun','xjumo'],['fullskin']],
-		// hs_loatheb:['male','wei',2,[],['fullskin']],
-		// hs_trueheart:['male','wei',2,[],['fullskin']],
-		// hs_sainaliusi:['male','wei',2,[],['fullskin']],
-		// hs_lrhonin:['male','wei',2,[],['fullskin']],
-		// hs_bolvar:['male','wei',2,[],['fullskin']],
-		// hs_fuding:['male','wei',2,[],['fullskin']],
-		hs_ysera:['female','wu',4,['chenshui'],['fullskin']],
+		hs_neptulon:['male','wu',4,['liechao','qingliu']],
+		hs_wvelen:['male','qun',3,['shengyan','xianzhi']],
+		hs_antonidas:['male','wei',3,['yanshu','bingshuang']],
+		hs_alakir:['male','wei',3,['fengnu','shengdun']],
+		hs_zhouzhuo:['male','qun',3,['jubao','qice']],
+		hs_yngvar:['male','qun',3,['huanwu']],
+		hs_bchillmaw:['male','wei',6,['hanshuang','bingshi']],
+		hs_malorne:['male','wu',3,['enze','chongsheng']],
+		hs_malygos:['male','wei',4,['malymowang']],
+		hs_xuefashi:['male','wei',3,['liehun','xjumo']],
+		// hs_loatheb:['male','wei',2,[]],
+		// hs_trueheart:['male','wei',2,[]],
+		// hs_sainaliusi:['male','wei',2,[]],
+		// hs_lrhonin:['male','wei',2,[]],
+		// hs_bolvar:['male','wei',2,[]],
+		// hs_fuding:['male','wei',2,[]],
+		hs_ysera:['female','wu',4,['chenshui']],
 
-		hs_ronghejuren:['male','shu',8,[],['fullskin']],
-		hs_edwin:['male','qun',3,['lianzhan'],['fullskin']],
-		hs_mijiaojisi:['female','qun',3,['kuixin'],['fullskin']],
-		hs_huzhixiannv:['female','wu',3,['jingmeng','qingliu'],['fullskin']],
-		// hs_tgolem:['male','qun',4,['guozai'],['fullskin']],
-		hs_totemic:['male','wu',3,['s_tuteng'],['fullskin']],
-		hs_xsylvanas:['female','qun',3,['busi','shixin','xmojian'],['fullskin']],
-		hs_siwangzhiyi:['male','qun',12,['mieshi'],['fullskin']],
-		hs_bilanyoulong:['male','wei',4,['lingzhou'],['fullskin']],
+		hs_ronghejuren:['male','shu',8,[]],
+		hs_edwin:['male','qun',3,['lianzhan']],
+		hs_mijiaojisi:['female','qun',3,['kuixin']],
+		hs_huzhixiannv:['female','wu',3,['jingmeng','qingliu']],
+		// hs_tgolem:['male','qun',4,['guozai']],
+		hs_totemic:['male','wu',3,['s_tuteng']],
+		hs_xsylvanas:['female','qun',3,['busi','shixin','xmojian']],
+		hs_siwangzhiyi:['male','qun',12,['mieshi']],
+		hs_bilanyoulong:['male','wei',4,['lingzhou']],
 	},
 	perfectPair:{
 		hs_sthrall:['hs_totemic','hs_alakir','hs_neptulon','hs_yngvar','hs_tgolem'],
diff --git a/character/jiange.js b/character/jiange.js
index 32a82ecb0..afed3a4b9 100755
--- a/character/jiange.js
+++ b/character/jiange.js
@@ -1,14 +1,14 @@
 'use strict';
 character.jiange={
     character:{
-        jg_pangtong:['male','shu',3,['qiwu','tianyu'],['fullskin']],
-        jg_huangyueying:['female','shu',3,['zhinang','jingmiao'],['fullskin']],
-        jg_zhugeliang:['male','shu',3,['biantian','bazhen'],['fullskin']],
-        jg_liubei:['male','shu',4,['jizhen','lingfeng'],['fullskin']],
-        jg_xiahouyuan:['male','wei',4,['shensu','juechen'],['fullskin']],
-        jg_caozhen:['male','wei',4,['chiying','jingfan'],['fullskin']],
-        jg_zhanghe:['male','wei',4,['huodi','jueji'],['fullskin']],
-        jg_simayi:['male','wei',5,['xuanlei','sfanshi','konghun'],['fullskin']],
+        jg_pangtong:['male','shu',3,['qiwu','tianyu']],
+        jg_huangyueying:['female','shu',3,['zhinang','jingmiao']],
+        jg_zhugeliang:['male','shu',3,['biantian','bazhen']],
+        jg_liubei:['male','shu',4,['jizhen','lingfeng']],
+        jg_xiahouyuan:['male','wei',4,['shensu','juechen']],
+        jg_caozhen:['male','wei',4,['chiying','jingfan']],
+        jg_zhanghe:['male','wei',4,['huodi','jueji']],
+        jg_simayi:['male','wei',5,['xuanlei','sfanshi','konghun']],
     },
     skill:{
         sfanshi:{
diff --git a/character/mountain.js b/character/mountain.js
index d32fe9df1..142eede42 100755
--- a/character/mountain.js
+++ b/character/mountain.js
@@ -1,14 +1,14 @@
 'use strict';
 character.mountain={
 	character:{
-		jiangwei:['male','shu',4,['tiaoxin','zhiji'],['fullskin']],
-		liushan:['male','shu',3,['xiangle','fangquan','ruoyu'],['zhu','fullskin']],
-		zhanghe:['male','wei',4,['qiaobian'],['fullskin']],
-		dengai:['male','wei',4,['tuntian','zaoxian'],['fullskin']],
+		jiangwei:['male','shu',4,['tiaoxin','zhiji']],
+		liushan:['male','shu',3,['xiangle','fangquan','ruoyu'],['zhu']],
+		zhanghe:['male','wei',4,['qiaobian']],
+		dengai:['male','wei',4,['tuntian','zaoxian']],
 		sunce:['male','wu',4,['jiang','hunzi','zhiba'],['zhu','fullskin']],
-		zhangzhang:['male','wu',3,['zhijian','guzheng'],['fullskin']],
-		caiwenji:['female','qun',3,['beige','duanchang'],['fullskin']],
-		zuoci:['male','qun',3,['huashen','xinsheng'],['fullskin']],
+		zhangzhang:['male','wu',3,['zhijian','guzheng']],
+		caiwenji:['female','qun',3,['beige','duanchang']],
+		zuoci:['male','qun',3,['huashen','xinsheng']],
 	},
 	skill:{
 		tiaoxin:{
diff --git a/character/rank.js b/character/rank.js
index 0f21d68de..b7ac971fc 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -88,6 +88,7 @@ window.characterRank={
         'zhoutai',
         'zhongyao',
         'liuchen',
+        'baiwuchang',
     ],
     am:[
         'zhugeguo',
@@ -102,6 +103,7 @@ window.characterRank={
         'xunyou',
         're_daqiao',
         'swd_fengyu',
+        'nianshou',
         'swd_xuanyuanjiantong',
         'diy_caiwenji',
         'zhugeke',
@@ -151,10 +153,12 @@ window.characterRank={
     bp:[
         'gongsunyuan',
         'guotufengji',
+        'mamian',
         'shixie',
         'yxs_mozi',
         'hs_xuefashi',
         'xiahoushi',
+        'heiwuchang',
         'zhangsong',
         'zhuhuan',
         'yxs_aijiyanhou',
diff --git a/character/refresh.js b/character/refresh.js
index a9098318d..4d64a46fd 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -1,27 +1,27 @@
 'use strict';
 character.refresh={
 	character:{
-		re_caocao:['male','wei',4,['hujia','rejianxiong'],['zhu','fullskin']],
-		re_simayi:['male','wei',3,['refankui','reguicai'],['fullskin']],
-		re_guojia:['male','wei',3,['tiandu','reyiji'],['fullskin']],
-		re_lidian:['male','wei',3,['xunxun','wangxi'],['fullskin']],
-		re_zhangliao:['male','wei',4,['retuxi'],['fullskin']],
-		re_xuzhu:['male','wei',4,['reluoyi'],['fullskin']],
-		re_xiahoudun:['male','wei',4,['reganglie','qingjian'],['fullskin']],
-		re_zhangfei:['male','shu',4,['paoxiao','retishen'],['fullskin']],
-		re_zhaoyun:['male','shu',4,['longdan','reyajiao'],['fullskin'],['fullskin']],
-		re_guanyu:['male','shu',4,['wusheng','yijue'],['fullskin']],
-		re_machao:['male','shu',4,['mashu','retieji'],['fullskin']],
-		re_xushu:['male','shu',4,['zhuhai','qianxin'],['fullskin']],
-		re_zhouyu:['male','wu',3,['reyingzi','refanjian'],['fullskin']],
-		re_lvmeng:['male','wu',4,['keji','qinxue'],['fullskin']],
-		re_ganning:['male','wu',4,['qixi','fenwei'],['fullskin']],
-		re_luxun:['male','wu',3,['reqianxun','relianying'],['fullskin']],
-		re_daqiao:['female','wu',3,['reguose','liuli'],['fullskin']],
-		re_huanggai:['male','wu',4,['rekurou','zhaxiang'],['fullskin']],
-		re_lvbu:['male','qun',5,['wushuang'],['fullskin']],
-		re_gongsunzan:['male','qun',4,['qiaomeng','reyicong'],['fullskin']],
-		re_huatuo:['male','qun',3,['chulao','jijiu'],['fullskin']],
+		re_caocao:['male','wei',4,['hujia','rejianxiong'],['zhu']],
+		re_simayi:['male','wei',3,['refankui','reguicai']],
+		re_guojia:['male','wei',3,['tiandu','reyiji']],
+		re_lidian:['male','wei',3,['xunxun','wangxi']],
+		re_zhangliao:['male','wei',4,['retuxi']],
+		re_xuzhu:['male','wei',4,['reluoyi']],
+		re_xiahoudun:['male','wei',4,['reganglie','qingjian']],
+		re_zhangfei:['male','shu',4,['paoxiao','retishen']],
+		re_zhaoyun:['male','shu',4,['longdan','reyajiao']],
+		re_guanyu:['male','shu',4,['wusheng','yijue']],
+		re_machao:['male','shu',4,['mashu','retieji']],
+		re_xushu:['male','shu',4,['zhuhai','qianxin']],
+		re_zhouyu:['male','wu',3,['reyingzi','refanjian']],
+		re_lvmeng:['male','wu',4,['keji','qinxue']],
+		re_ganning:['male','wu',4,['qixi','fenwei']],
+		re_luxun:['male','wu',3,['reqianxun','relianying']],
+		re_daqiao:['female','wu',3,['reguose','liuli']],
+		re_huanggai:['male','wu',4,['rekurou','zhaxiang']],
+		re_lvbu:['male','qun',5,['wushuang']],
+		re_gongsunzan:['male','qun',4,['qiaomeng','reyicong']],
+		re_huatuo:['male','qun',3,['chulao','jijiu']],
 	},
 	skill:{
 		reqicai:{
diff --git a/character/sp.js b/character/sp.js
index a341110fb..15e2bec0a 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -1,40 +1,40 @@
 'use strict';
 character.sp={
 	character:{
-		yangxiu:['male','wei',3,['jilei','danlao'],['fullskin']],
-		chenlin:['male','wei',3,['bifa','songci'],['fullskin']],
-		caohong:['male','wei',4,['yuanhu'],['fullskin']],
-		xiahouba:['male','shu',4,['baobian'],['fullskin']],
-		gongsunzan:['male','qun',4,['yicong'],['fullskin']],
-		yuanshu:['male','qun',4,['yongsi'],['fullskin']],
-		sp_diaochan:['female','qun',3,['lihun','biyue'],['fullskin']],
-		sp_zhaoyun:['male','qun',3,['longdan','chongzhen'],['fullskin']],
-		jsp_zhaoyun:['male','qun',3,['chixin','yicong','suiren'],['fullskin']],
-		liuxie:['male','qun',3,['tianming','mizhao'],['fullskin']],
-		zhugejin:['male','wu',3,['hongyuan','huanshi','mingzhe'],['fullskin']],
-		zhugeke:['male','wu',3,['aocai','duwu'],['fullskin']],
-		guanyinping:['female','shu',3,['huxiao','xueji','wuji'],['fullskin']],
-		simalang:['male','wei',3,['junbing','quji'],['fullskin']],
-		zhangxingcai:['female','shu',3,['shenxian','qiangwu'],['fullskin']],
-		fuwan:['male','qun',4,['moukui'],['fullskin']],
-		sp_sunshangxiang:['female','shu',3,['liangzhu','xiaoji'],['fullskin']],
-		caoang:['male','wei',4,['kaikang'],['fullskin']],
-		re_yuanshu:['male','qun',4,['wangzun','tongji'],['fullskin']],
-		sp_caoren:['male','wei',4,['kuiwei','yanzheng'],['fullskin']],
-		zhangbao:['male','qun',3,['zhoufu','yingbin'],['fullskin']],
-		zhangliang:['male','qun',3,['fulu','fuji'],['fullskin']],
-		maliang:['male','shu',3,['xiemu','naman'],['fullskin']],
-		sp_pangtong:['male','qun',3,['manjuan','zuixiang'],['fullskin']],
-		zhugedan:['male','wei',4,['gongao','juyi'],['fullskin']],
-		sp_jiangwei:['male','shu',4,['kunfen','fengliang'],['fullskin']],
-		sp_machao:['male','qun',4,['zhuiji','cihuai'],['fullskin']],
-		sunhao:['male','wu',5,['canshi','chouhai'],['fullskin']],
-		shixie:['male','qun',3,['biluan','lixia'],['fullskin']],
-		mayunlu:['female','shu',3,['fengpo','mashu'],['fullskin']],
-		zhanglu:['male','qun',3,['yishe','bushi','midao'],['fullskin']],
-		wutugu:['male','qun',15,['ranshang','hanyong'],['fullskin']],
-		sp_caiwenji:['female','wei',3,['chenqing','mozhi'],['fullskin']],
-		zhugeguo:['female','shu',3,['yuhua','qirang'],['fullskin']],
+		yangxiu:['male','wei',3,['jilei','danlao']],
+		chenlin:['male','wei',3,['bifa','songci']],
+		caohong:['male','wei',4,['yuanhu']],
+		xiahouba:['male','shu',4,['baobian']],
+		gongsunzan:['male','qun',4,['yicong']],
+		yuanshu:['male','qun',4,['yongsi']],
+		sp_diaochan:['female','qun',3,['lihun','biyue']],
+		sp_zhaoyun:['male','qun',3,['longdan','chongzhen']],
+		jsp_zhaoyun:['male','qun',3,['chixin','yicong','suiren']],
+		liuxie:['male','qun',3,['tianming','mizhao']],
+		zhugejin:['male','wu',3,['hongyuan','huanshi','mingzhe']],
+		zhugeke:['male','wu',3,['aocai','duwu']],
+		guanyinping:['female','shu',3,['huxiao','xueji','wuji']],
+		simalang:['male','wei',3,['junbing','quji']],
+		zhangxingcai:['female','shu',3,['shenxian','qiangwu']],
+		fuwan:['male','qun',4,['moukui']],
+		sp_sunshangxiang:['female','shu',3,['liangzhu','xiaoji']],
+		caoang:['male','wei',4,['kaikang']],
+		re_yuanshu:['male','qun',4,['wangzun','tongji']],
+		sp_caoren:['male','wei',4,['kuiwei','yanzheng']],
+		zhangbao:['male','qun',3,['zhoufu','yingbin']],
+		zhangliang:['male','qun',3,['fulu','fuji']],
+		maliang:['male','shu',3,['xiemu','naman']],
+		sp_pangtong:['male','qun',3,['manjuan','zuixiang']],
+		zhugedan:['male','wei',4,['gongao','juyi']],
+		sp_jiangwei:['male','shu',4,['kunfen','fengliang']],
+		sp_machao:['male','qun',4,['zhuiji','cihuai']],
+		sunhao:['male','wu',5,['canshi','chouhai']],
+		shixie:['male','qun',3,['biluan','lixia']],
+		mayunlu:['female','shu',3,['fengpo','mashu']],
+		zhanglu:['male','qun',3,['yishe','bushi','midao']],
+		wutugu:['male','qun',15,['ranshang','hanyong']],
+		sp_caiwenji:['female','wei',3,['chenqing','mozhi']],
+		zhugeguo:['female','shu',3,['yuhua','qirang']],
 	},
 	skill:{
 		qirang:{
diff --git a/character/standard.js b/character/standard.js
index 29d52b6fd..de372a045 100755
--- a/character/standard.js
+++ b/character/standard.js
@@ -1,31 +1,31 @@
 'use strict';
 character.standard={
 	character:{
-		caocao:['male','wei',4,['hujia','jianxiong'],['zhu','fullskin']],
-		simayi:['male','wei',3,['fankui','guicai'],['fullskin']],
-		xiahoudun:['male','wei',4,['ganglie'],['fullskin']],
-		zhangliao:['male','wei',4,['tuxi'],['fullskin']],
-		xuzhu:['male','wei',4,['luoyi'],['fullskin']],
-		guojia:['male','wei',3,['tiandu','yiji'],['fullskin']],
-		zhenji:['female','wei',3,['luoshen','qingguo'],['fullskin']],
-		liubei:['male','shu',4,['rende','jijiang'],['zhu','fullskin']],
-		guanyu:['male','shu',4,['wusheng'],['fullskin']],
-		zhangfei:['male','shu',4,['paoxiao'],['fullskin']],
-		zhugeliang:['male','shu',3,['guanxing','kongcheng'],['fullskin']],
-		zhaoyun:['male','shu',4,['longdan'],['fullskin']],
-		machao:['male','shu',4,['mashu','tieji'],['fullskin']],
-		huangyueying:['female','shu',3,['jizhi','qicai'],['fullskin']],
-		sunquan:['male','wu',4,['zhiheng','jiuyuan'],['zhu','fullskin']],
-		ganning:['male','wu',4,['qixi'],['fullskin']],
-		lvmeng:['male','wu',4,['keji'],['fullskin']],
-		huanggai:['male','wu',4,['kurou'],['fullskin']],
-		zhouyu:['male','wu',3,['yingzi','fanjian'],['fullskin']],
-		daqiao:['female','wu',3,['guose','liuli'],['fullskin']],
-		luxun:['male','wu',3,['qianxun','lianying'],['fullskin']],
-		sunshangxiang:['female','wu',3,['xiaoji','jieyin'],['fullskin']],
-		huatuo:['male','qun',3,['qingnang','jijiu'],['fullskin']],
-		lvbu:['male','qun',4,['wushuang'],['fullskin']],
-		diaochan:['female','qun',3,['lijian','biyue'],['fullskin']],
+		caocao:['male','wei',4,['hujia','jianxiong'],['zhu']],
+		simayi:['male','wei',3,['fankui','guicai']],
+		xiahoudun:['male','wei',4,['ganglie']],
+		zhangliao:['male','wei',4,['tuxi']],
+		xuzhu:['male','wei',4,['luoyi']],
+		guojia:['male','wei',3,['tiandu','yiji']],
+		zhenji:['female','wei',3,['luoshen','qingguo']],
+		liubei:['male','shu',4,['rende','jijiang'],['zhu']],
+		guanyu:['male','shu',4,['wusheng']],
+		zhangfei:['male','shu',4,['paoxiao']],
+		zhugeliang:['male','shu',3,['guanxing','kongcheng']],
+		zhaoyun:['male','shu',4,['longdan']],
+		machao:['male','shu',4,['mashu','tieji']],
+		huangyueying:['female','shu',3,['jizhi','qicai']],
+		sunquan:['male','wu',4,['zhiheng','jiuyuan'],['zhu']],
+		ganning:['male','wu',4,['qixi']],
+		lvmeng:['male','wu',4,['keji']],
+		huanggai:['male','wu',4,['kurou']],
+		zhouyu:['male','wu',3,['yingzi','fanjian']],
+		daqiao:['female','wu',3,['guose','liuli']],
+		luxun:['male','wu',3,['qianxun','lianying']],
+		sunshangxiang:['female','wu',3,['xiaoji','jieyin']],
+		huatuo:['male','qun',3,['qingnang','jijiu']],
+		lvbu:['male','qun',4,['wushuang']],
+		diaochan:['female','qun',3,['lijian','biyue']],
 	},
 	perfectPair:{
 		xiahoudun:['xiahouyuan'],
diff --git a/character/swd.js b/character/swd.js
index 368e07c10..9dd9cd724 100755
--- a/character/swd.js
+++ b/character/swd.js
@@ -1,61 +1,61 @@
 'use strict';
 character.swd={
 	character:{
-			swd_huzhongxian:['male','wu',3,['daofa','xielv','xiangu'],['fullskin']],
+			swd_huzhongxian:['male','wu',3,['daofa','xielv','xiangu']],
 
-			swd_anka:['male','qun',3,['songci','anlianying'],['fullskin']],
-			swd_septem:['male','qun',4,['jiying','liaoyuan','yishan'],['fullskin']],
-			swd_kama:['female','qun',3,['yueren','shangshi'],['fullskin']],
+			swd_anka:['male','qun',3,['songci','anlianying']],
+			swd_septem:['male','qun',4,['jiying','liaoyuan','yishan']],
+			swd_kama:['female','qun',3,['yueren','shangshi']],
 		// swd_miles:['male','qun',4,['aojian','miles_xueyi','mohua2']],
-			swd_nicole:['female','wu',3,['minjing','lingwu','huanjian'],['fullskin']],
-			swd_wangsiyue:['female','wei',3,['duishi','biyue'],['fullskin']],
+			swd_nicole:['female','wu',3,['minjing','lingwu','huanjian']],
+			swd_wangsiyue:['female','wei',3,['duishi','biyue']],
 		// swd_weida:['female','qun',3,['yueren','zhenlie']],
-			swd_xuanyuanjianxian:['male','qun',4,['pozhou','huajian'],['fullskin']],
+			swd_xuanyuanjianxian:['male','qun',4,['pozhou','huajian']],
 
-			swd_chenjingchou:['male','wu',3,['youyin','yihua'],['fullskin']],
-			swd_duguningke:['female','qun',3,['lianji','touxi'],['fullskin']],
-			swd_guyue:['male','wei',3,['tiandao','qinyin','wangchen'],['fullskin']],
-			swd_tuobayuer:['female','shu',4,['liuhong','poyue','niepan'],['fullskin']],
-			swd_yuwentuo:['male','qun',4,['wushuang','xielei','kunlunjing'],['fullskin']],
-			swd_yuxiaoxue:['female','wei',3,['huanhun','daixing','yinyue'],['fullskin']],
+			swd_chenjingchou:['male','wu',3,['youyin','yihua']],
+			swd_duguningke:['female','qun',3,['lianji','touxi']],
+			swd_guyue:['male','wei',3,['tiandao','qinyin','wangchen']],
+			swd_tuobayuer:['female','shu',4,['liuhong','poyue','niepan']],
+			swd_yuwentuo:['male','qun',4,['wushuang','xielei','kunlunjing']],
+			swd_yuxiaoxue:['female','wei',3,['huanhun','daixing','yinyue']],
 
-			swd_jiliang:['male','wu',3,['yunchou','gongxin','qimou'],['fullskin']],
-			swd_shuijing:['female','qun',4,['mojian','duanyue'],['fullskin']],
-			swd_cheyun:['female','wu',3,['shengong','xianjiang3','qiaoxie'],['fullskin']],
-			swd_huanyuanzhi:['male','qun',3,['lanzhi','mufeng','tianshu'],['fullskin']],
-			swd_murongshi:['female','shu',4,['duanyi','guxing'],['fullskin']],
-			swd_jipeng:['male','wu',3,['reyingzi','guozao'],['fullskin']],
-			swd_qi:['male','qun',3,['yaotong','heihuo','pojian'],['fullskin']],
+			swd_jiliang:['male','wu',3,['yunchou','gongxin','qimou']],
+			swd_shuijing:['female','qun',4,['mojian','duanyue']],
+			swd_cheyun:['female','wu',3,['shengong','xianjiang3','qiaoxie']],
+			swd_huanyuanzhi:['male','qun',3,['lanzhi','mufeng','tianshu']],
+			swd_murongshi:['female','shu',4,['duanyi','guxing']],
+			swd_jipeng:['male','wu',3,['reyingzi','guozao']],
+			swd_qi:['male','qun',3,['yaotong','heihuo','pojian']],
 
-			swd_luchengxuan:['male','wu',4,['ljifeng','lxianglong'],['fullskin']],
-			swd_xiarou:['female','shu',3,['xianghui','huiqi'],['fullskin']],
-			swd_moye:['female','wu',3,['rexue','liuli'],['fullskin']],
+			swd_luchengxuan:['male','wu',4,['ljifeng','lxianglong']],
+			swd_xiarou:['female','shu',3,['xianghui','huiqi']],
+			swd_moye:['female','wu',3,['rexue','liuli']],
 
-			swd_zhaoyun:['male','shu',4,['longdan','pozhen','tanlin'],['fullskin']],
-			swd_hengai:['female','shu',3,['funiao','ningxian','lingbo'],['fullskin']],
-			swd_duanmeng:['female','shu',4,['jizhan','lieren'],['fullskin']],
-			swd_jiangwu:['male','shu',4,['yijue','dangping'],['fullskin']],
-			swd_tuwei:['male','shu',3,['zhanlu','susheng'],['fullskin']],
-			swd_yeyaxi:['female','shu',3,['rexue','huopu'],['fullskin']],
+			swd_zhaoyun:['male','shu',4,['longdan','pozhen','tanlin']],
+			swd_hengai:['female','shu',3,['funiao','ningxian','lingbo']],
+			swd_duanmeng:['female','shu',4,['jizhan','lieren']],
+			swd_jiangwu:['male','shu',4,['yijue','dangping']],
+			swd_tuwei:['male','shu',3,['zhanlu','susheng']],
+			swd_yeyaxi:['female','shu',3,['rexue','huopu']],
 
-			swd_muyun:['male','wei',4,['zhuhai','polang','jikong'],['fullskin']],
-			swd_lanyin:['female','wei',3,['xingdian','yulin','luomei'],['fullskin']],
-			swd_zhiyin:['female','wei',3,['xuehuang','ningshuang','zhuyu'],['fullskin']],
-			swd_qiner:['female','wei',3,['huanyin','tianhuo','xuanzhou'],['fullskin']],
-			swd_jiuyou:['male','wei',3,['lexue'],['fullskin']],
-			swd_duopeng:['male','wu',3,['luanji','reyingzi'],['fullskin']],
+			swd_muyun:['male','wei',4,['zhuhai','polang','jikong']],
+			swd_lanyin:['female','wei',3,['xingdian','yulin','luomei']],
+			swd_zhiyin:['female','wei',3,['xuehuang','ningshuang','zhuyu']],
+			swd_qiner:['female','wei',3,['huanyin','tianhuo','xuanzhou']],
+			swd_jiuyou:['male','wei',3,['lexue']],
+			swd_duopeng:['male','wu',3,['luanji','reyingzi']],
 
-			swd_fengtianling:['male','shu',4,['guiyan','jiang'],['fullskin']],
-			swd_huyue:['female','wu',3,['yunshen','fengming'],['fullskin']],
-			swd_jialanduo:['male','qun',4,['xianyin','mailun'],['fullskin']],
-			swd_rongshuang:['female','wu',3,['suiyan','duanxing'],['fullskin']],
-			swd_zhuoshanzhu:['male','wu',4,['suiyan','wanjun'],['fullskin']],
-			swd_jiting:['female','wei',4,['guanhu','chuanyang'],['fullskin']],
+			swd_fengtianling:['male','shu',4,['guiyan','jiang']],
+			swd_huyue:['female','wu',3,['yunshen','fengming']],
+			swd_jialanduo:['male','qun',4,['xianyin','mailun']],
+			swd_rongshuang:['female','wu',3,['suiyan','duanxing']],
+			swd_zhuoshanzhu:['male','wu',4,['suiyan','wanjun']],
+			swd_jiting:['female','wei',4,['guanhu','chuanyang']],
 
-			swd_sikongyu:['male','wu',4,['sliufeng','linyun','hutian'],['fullskin']],
-			swd_muyue:['female','wei',3,['xingzhui','lingxian','shouyin'],['fullskin']],
-			swd_ziqiao:['female','shu',3,['guaili','fuyan'],['fullskin']],
-			swd_fengyu:['male','shu',4,['zhenwei','shangxi'],['fullskin']],
+			swd_sikongyu:['male','wu',4,['sliufeng','linyun','hutian']],
+			swd_muyue:['female','wei',3,['xingzhui','lingxian','shouyin']],
+			swd_ziqiao:['female','shu',3,['guaili','fuyan']],
+			swd_fengyu:['male','shu',4,['zhenwei','shangxi']],
 	},
 	perfectPair:{
 		swd_fengtianling:['swd_huyue','swd_jiting'],
diff --git a/character/wind.js b/character/wind.js
index 4d99af6b2..23ba471c6 100755
--- a/character/wind.js
+++ b/character/wind.js
@@ -1,14 +1,14 @@
 'use strict';
 character.wind={
 	character:{
-		xiahouyuan:['male','wei',4,['shensu'],['fullskin']],
-		caoren:['male','wei',4,['jushou'],['fullskin']],
-		huangzhong:['male','shu',4,['liegong'],['fullskin']],
-		weiyan:['male','shu',4,['kuanggu'],['fullskin']],
-		xiaoqiao:['female','wu',3,['tianxiang','hongyan'],['fullskin']],
-		zhoutai:['male','wu',4,['buqu','fenji'],['fullskin']],
-		zhangjiao:['male','qun',3,['leiji','guidao','huangtian'],['zhu','fullskin']],
-		diy_zhangjiao:['male','qun',3,['diyleiji','guidao','huangtian'],['zhu','fullskin']],
+		xiahouyuan:['male','wei',4,['shensu']],
+		caoren:['male','wei',4,['jushou']],
+		huangzhong:['male','shu',4,['liegong']],
+		weiyan:['male','shu',4,['kuanggu']],
+		xiaoqiao:['female','wu',3,['tianxiang','hongyan']],
+		zhoutai:['male','wu',4,['buqu','fenji']],
+		zhangjiao:['male','qun',3,['leiji','guidao','huangtian'],['zhu']],
+		diy_zhangjiao:['male','qun',3,['diyleiji','guidao','huangtian'],['zhu']],
 		// spzhangjiao:['male','qun',3,['spleiji','guidao','huangtian'],['zhu']],
 		// yuji:['male','qun',3,['guhuo']],
 	},
diff --git a/character/woods.js b/character/woods.js
index 797a8d4c2..99fe7343b 100755
--- a/character/woods.js
+++ b/character/woods.js
@@ -1,14 +1,14 @@
 'use strict';
 character.woods={
 	character:{
-		menghuo:['male','shu',4,['huoshou','zaiqi'],['fullskin']],
-		zhurong:['female','shu',4,['juxiang','lieren'],['fullskin']],
-		caopi:['male','wei',3,['xingshang','fangzhu','songwei'],['zhu','fullskin']],
-		xuhuang:['male','wei',4,['duanliang'],['fullskin']],
-		lusu:['male','wu',3,['haoshi','dimeng'],['fullskin']],
-		sunjian:['male','wu',4,['yinghun'],['fullskin']],
-		dongzhuo:['male','qun',8,['jiuchi','roulin','benghuai','baonue'],['zhu','fullskin']],
-		jiaxu:['male','qun',3,['luanwu','wansha','weimu'],['fullskin']],
+		menghuo:['male','shu',4,['huoshou','zaiqi']],
+		zhurong:['female','shu',4,['juxiang','lieren']],
+		caopi:['male','wei',3,['xingshang','fangzhu','songwei'],['zhu']],
+		xuhuang:['male','wei',4,['duanliang']],
+		lusu:['male','wu',3,['haoshi','dimeng']],
+		sunjian:['male','wu',4,['yinghun']],
+		dongzhuo:['male','qun',8,['jiuchi','roulin','benghuai','baonue'],['zhu']],
+		jiaxu:['male','qun',3,['luanwu','wansha','weimu']],
 	},
 	perfectPair:{
 		menghuo:['zhurong']
diff --git a/character/xiake.js b/character/xiake.js
index b6cc32959..0413210bb 100755
--- a/character/xiake.js
+++ b/character/xiake.js
@@ -1,11 +1,11 @@
 'use strict';
 character.xiake={
     character:{
-		// xk_dongfangweiming:['male','shu',4,[],['fullskin']],
-		xk_guyuexuan:['male','qun',4,['rouquan','gzhenji'],['fullskin']],
-		xk_jinji:['male','shu',4,['xueren','lianpo'],['fullskin']],
-        // xk_shenxiangyun:['female','wei',3,['zhenjiu'],['fullskin']],
-		xk_fujianhan:['male','qun',4,['zuijian','zitong'],['fullskin']],
+		// xk_dongfangweiming:['male','shu',4,[]],
+		xk_guyuexuan:['male','qun',4,['rouquan','gzhenji']],
+		xk_jinji:['male','shu',4,['xueren','lianpo']],
+        // xk_shenxiangyun:['female','wei',3,['zhenjiu']],
+		xk_fujianhan:['male','qun',4,['zuijian','zitong']],
     },
     skill:{
         xueren:{
diff --git a/character/xianjian.js b/character/xianjian.js
index 64925ed43..ea77eecfc 100755
--- a/character/xianjian.js
+++ b/character/xianjian.js
@@ -1,21 +1,21 @@
 'use strict';
 character.xianjian={
 	character:{
-		pal_lixiaoyao:['male','qun',4,['xiaoyao','yujian'],['fullskin']],
-		pal_zhaoliner:['female','wei',3,['huimeng','tianshe'],['fullskin']],
-		pal_linyueru:['female','wei',3,['guiyuan','qijian'],['fullskin']],
+		pal_lixiaoyao:['male','qun',4,['xiaoyao','yujian']],
+		pal_zhaoliner:['female','wei',3,['huimeng','tianshe']],
+		pal_linyueru:['female','wei',3,['guiyuan','qijian']],
 
 		// pal_wangxiaohu:['male','qun',4,['guiyuan','qijian']],
 		// pal_sumei:['female','shu',3,['guiyuan','qijian']],
 		// pal_shenqishuang:['female','wei',3,['guiyuan','qijian']],
 
 
-		pal_jingtian:['male','wu',3,['sajin','jubao'],['fullskin']],
-		pal_xuejian:['female','shu',3,['shuangren','shenmu','duci'],['fullskin']],
+		pal_jingtian:['male','wu',3,['sajin','jubao']],
+		pal_xuejian:['female','shu',3,['shuangren','shenmu','duci']],
 		// pal_longkui:['female','shu',3,['shuangren','shenmu','duci']],
 		// pal_longkuigui:['female','shu',3,['shuangren','shenmu','duci']],
-		pal_zixuan:['female','wei',3,['shuiyun','wangyou','changnian'],['fullskin']],
-		pal_changqing:['male','wei',4,['luanjian','tianfu'],['fullskin']],
+		pal_zixuan:['female','wei',3,['shuiyun','wangyou','changnian']],
+		pal_changqing:['male','wei',4,['luanjian','tianfu']],
 
 		// pal_nangonghuang:['male','wei',3,[]],
 		// pal_wenhui:['female','shu',4,[]],
@@ -23,11 +23,11 @@ character.xianjian={
 		// pal_xingxuan:['male','wei',3,[]],
 		// pal_xingxuan:['male','wei',3,[]],
 
-		pal_yuntianhe:['male','wu',4,['longxi','zhuyue','guanri'],['fullskin']],
-		pal_hanlingsha:['female','shu',3,['tannang','tuoqiao'],['fullskin']],
-		pal_liumengli:['female','wei',3,['tianxian','runxin','zhimeng'],['fullskin']],
-		pal_murongziying:['male','wei',4,['xuanning','poyun','qianfang'],['fullskin']],
-		pal_xuanxiao:['male','wei',4,['xuanyan','ningbin','fenxin'],['fullskin']],
+		pal_yuntianhe:['male','wu',4,['longxi','zhuyue','guanri']],
+		pal_hanlingsha:['female','shu',3,['tannang','tuoqiao']],
+		pal_liumengli:['female','wei',3,['tianxian','runxin','zhimeng']],
+		pal_murongziying:['male','wei',4,['xuanning','poyun','qianfang']],
+		pal_xuanxiao:['male','wei',4,['xuanyan','ningbin','fenxin']],
 
 	},
 	skill:{
diff --git a/character/xswd.js b/character/xswd.js
index 967ec7056..dd48623ce 100755
--- a/character/xswd.js
+++ b/character/xswd.js
@@ -1,8 +1,8 @@
 character.xswd={
 	character:{
 		// swd_wushi:['male','wei',3,['zhoufu','yingbin','xuying']],
-			// swd_lanmoshen:['female','wei',3,['bingjian','lieren'],['fullskin']],
-			swd_huanglei:['male','qun',3,['jilve','gongshen'],['fullskin']],
+			// swd_lanmoshen:['female','wei',3,['bingjian','lieren']],
+			swd_huanglei:['male','qun',3,['jilve','gongshen']],
 		// swd_libai:['female','qun',3,['miaobi','zhexian']],
 		// swd_kendi:['male','qun',3,['guanxing','jianyan']],
 		// swd_lijing:['male','qun',4,['tianyi','zhuhai']],
@@ -10,14 +10,14 @@ character.xswd={
 		// swd_linming:['male','qun',3,['shelie','bifa']],
 		// swd_philis:['male','qun',4,['yicong','wangxi']],
 		// swd_pepin:['male','qun',4,['rejianxiong','quhu']],
-			swd_kangnalishi:['male','qun',1,['busi','xuying','yinguo'],['fullskin']],
-			swd_xuanyuanjiantong:['male','qun',3,['chengjian','huanling'],['fullskin']],
+			swd_kangnalishi:['male','qun',1,['busi','xuying','yinguo']],
+			swd_xuanyuanjiantong:['male','qun',3,['chengjian','huanling']],
 		// swd_huiyan:['male','qun',3,['wendao','xiaozhan','xunzhi']],
 
 		// swd_chenfu:['male','qun',4,['xuanzhou','bingfeng']],
 		// swd_chengyaojin:['male','qun',4,['jiuchi','jufu']],
-			swd_shanxiaoxiao:['female','wu',3,['shehun','xiaomoyu'],['fullskin']],
-			swd_yuchiyanhong:['female','shu',3,['huanxing','meihuo'],['fullskin']],
+			swd_shanxiaoxiao:['female','wu',3,['shehun','xiaomoyu']],
+			swd_yuchiyanhong:['female','shu',3,['huanxing','meihuo']],
 		// swd_hanteng:['male','qun',4,['kuangfu']],
 		// swd_heran:['male','qun',3,['yujian','guiyin','shejie']],
 		// swd_xingtian:['male','qun',8,[]],
@@ -27,26 +27,26 @@ character.xswd={
 		// swd_zhanglie:['male','qun',4,['huajin','poxiao']],
 
 
-			swd_hanluo:['male','qun',5,['hzhenwei'],['fullskin']],
-			swd_fu:['male','qun',5,['yudun','paoxiao'],['fullskin']],
-			swd_linyue:['male','wei',3,['zhenjiu','mazui'],['fullskin']],
-			swd_zidashu:['male','wu',3,['shoulie','hudun'],['fullskin']],
-			swd_maixing:['male','wu',3,['toudan','shending'],['fullskin']],
-			swd_fuyan:['male','qun',4,['lianda'],['fullskin']],
-			swd_haidapang:['female','wu',3,['bingjian','rumeng'],['fullskin']],
-			swd_shaowei:['female','shu',3,['jianji','huangyu'],['fullskin']],
+			swd_hanluo:['male','qun',5,['hzhenwei']],
+			swd_fu:['male','qun',5,['yudun','paoxiao']],
+			swd_linyue:['male','wei',3,['zhenjiu','mazui']],
+			swd_zidashu:['male','wu',3,['shoulie','hudun']],
+			swd_maixing:['male','wu',3,['toudan','shending']],
+			swd_fuyan:['male','qun',4,['lianda']],
+			swd_haidapang:['female','wu',3,['bingjian','rumeng']],
+			swd_shaowei:['female','shu',3,['jianji','huangyu']],
 
-			swd_youzhao:['male','shu',4,['longdan','yuchen'],['fullskin']],
+			swd_youzhao:['male','shu',4,['longdan','yuchen']],
 		// swd_qingming:['male','shu',3,['mingfu','tianlun']],
-			swd_shangzhang:['male','shu',4,['lianwu'],['fullskin']],
-			swd_situqiang:['female','shu',3,['qingnang','chulao'],['fullskin']],
+			swd_shangzhang:['male','shu',4,['lianwu']],
+			swd_situqiang:['female','shu',3,['qingnang','chulao']],
 
-			swd_chunyuheng:['male','wei',2,['jueqing','shengshou','xuying'],['fullskin']],
-			swd_hanlong:['male','wei',4,['ciqiu','siji'],['fullskin']],
-			swd_yuli:['female','wu',3,['lingxin','tianxiang'],['fullskin']],
-			swd_zhanggao:['male','wei',4,['yicong','poxing'],['fullskin']],
+			swd_chunyuheng:['male','wei',2,['jueqing','shengshou','xuying']],
+			swd_hanlong:['male','wei',4,['ciqiu','siji']],
+			swd_yuli:['female','wu',3,['lingxin','tianxiang']],
+			swd_zhanggao:['male','wei',4,['yicong','poxing']],
 
-			swd_hupo:['male','wu',3,['dunxing','guiying'],['fullskin']],
-			swd_jiangziya:['male','wu',3,['mingfu','tianlun'],['fullskin']],
+			swd_hupo:['male','wu',3,['dunxing','guiying']],
+			swd_jiangziya:['male','wu',3,['mingfu','tianlun']],
 	},
 }
diff --git a/character/yijiang.js b/character/yijiang.js
index 6006674e3..a0da6937c 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -1,67 +1,67 @@
 'use strict';
 character.yijiang={
 	character:{
-		yujin:['male','wei',4,['yizhong'],['fullskin']],
-		caozhang:['male','wei',4,['jiangchi'],['fullskin']],
-		guohuai:['male','wei',4,['jingce'],['fullskin']],
-		zhangchunhua:['female','wei',3,['jueqing','shangshi'],['fullskin']],
-		caozhi:['male','wei',3,['luoying','jiushi'],['fullskin']],
-		caochong:['male','wei',3,['renxin','chengxiang'],['fullskin']],
-		xunyou:['male','wei',3,['zhiyu','qice'],['fullskin']],
-		xushu:['male','shu',3,['wuyan','jujian'],['fullskin']],
-		xin_xushu:['male','shu',3,['xinwuyan','xinjujian'],['fullskin']],
-		xin_masu:['male','shu',3,['sanyao','zhiman'],['fullskin']],
-		masu:['male','shu',3,['xinzhan','huilei'],['fullskin']],
-		fazheng:['male','shu',3,['enyuan','xuanhuo'],['fullskin']],
-		xin_fazheng:['male','shu',3,['xinenyuan','xinxuanhuo'],['fullskin']],
-		zhuran:['male','wu',4,['danshou'],['fullskin']],
-		xusheng:['male','wu',4,['xinpojun'],['fullskin']],
-		wuguotai:['female','wu',3,['ganlu','buyi'],['fullskin']],
-		lingtong:['male','wu',4,['xuanfeng'],['fullskin']],
-		liubiao:['male','qun',3,['zongshi','zishou'],['fullskin']],
-		huaxiong:['male','qun',6,['yaowu'],['fullskin']],
-		wangyi:['female','wei',3,['zhenlie','miji'],['fullskin']],
-		yufan:['male','wu',3,['zhiyan','zongxuan'],['fullskin']],
-		chengong:['male','qun',3,['mingce','zhichi'],['fullskin']],
-		bulianshi:['female','wu',3,['anxu','zhuiyi'],['fullskin']],
-		handang:['male','wu',4,['gongji','jiefan'],['fullskin']],
-		fuhuanghou:['female','qun',3,['zhuikong','qiuyuan'],['fullskin']],
-		zhonghui:['male','wei',4,['quanji','zili'],['fullskin']],
-		jianyong:['male','shu',3,['qiaoshui','jyzongshi'],['fullskin']],
-		madai:['male','shu',4,['mashu','qianxi'],['fullskin']],
-		liufeng:['male','shu',4,['xiansi'],['fullskin']],
-		manchong:['male','wei',3,['junxing','yuce'],['fullskin']],
-		liru:['male','qun',3,['juece','mieji','fencheng'],['fullskin']],
-		guanzhang:['male','shu',4,['fuhun'],['fullskin']],
-		chenqun:['male','wei',3,['dingpin','faen'],['fullskin']],
-		sunluban:['female','wu',3,['chanhui','jiaojin'],['fullskin']],
-		guyong:['male','wu',3,['shenxing','bingyi'],['fullskin']],
-		caifuren:['female','qun',3,['qieting','xianzhou'],['fullskin']],
-		yj_jushou:['male','qun',3,['jianying','shibei'],['fullskin']],
-		zhangsong:['male','shu',3,['qiangzhi','xiantu'],['fullskin']],
-		zhuhuan:['male','wu',4,['youdi'],['fullskin']],
-		xiahoushi:['female','shu',3,['qiaoshi','yanyu'],['fullskin']],
+		yujin:['male','wei',4,['yizhong']],
+		caozhang:['male','wei',4,['jiangchi']],
+		guohuai:['male','wei',4,['jingce']],
+		zhangchunhua:['female','wei',3,['jueqing','shangshi']],
+		caozhi:['male','wei',3,['luoying','jiushi']],
+		caochong:['male','wei',3,['renxin','chengxiang']],
+		xunyou:['male','wei',3,['zhiyu','qice']],
+		xushu:['male','shu',3,['wuyan','jujian']],
+		xin_xushu:['male','shu',3,['xinwuyan','xinjujian']],
+		xin_masu:['male','shu',3,['sanyao','zhiman']],
+		masu:['male','shu',3,['xinzhan','huilei']],
+		fazheng:['male','shu',3,['enyuan','xuanhuo']],
+		xin_fazheng:['male','shu',3,['xinenyuan','xinxuanhuo']],
+		zhuran:['male','wu',4,['danshou']],
+		xusheng:['male','wu',4,['xinpojun']],
+		wuguotai:['female','wu',3,['ganlu','buyi']],
+		lingtong:['male','wu',4,['xuanfeng']],
+		liubiao:['male','qun',3,['zongshi','zishou']],
+		huaxiong:['male','qun',6,['yaowu']],
+		wangyi:['female','wei',3,['zhenlie','miji']],
+		yufan:['male','wu',3,['zhiyan','zongxuan']],
+		chengong:['male','qun',3,['mingce','zhichi']],
+		bulianshi:['female','wu',3,['anxu','zhuiyi']],
+		handang:['male','wu',4,['gongji','jiefan']],
+		fuhuanghou:['female','qun',3,['zhuikong','qiuyuan']],
+		zhonghui:['male','wei',4,['quanji','zili']],
+		jianyong:['male','shu',3,['qiaoshui','jyzongshi']],
+		madai:['male','shu',4,['mashu','qianxi']],
+		liufeng:['male','shu',4,['xiansi']],
+		manchong:['male','wei',3,['junxing','yuce']],
+		liru:['male','qun',3,['juece','mieji','fencheng']],
+		guanzhang:['male','shu',4,['fuhun']],
+		chenqun:['male','wei',3,['dingpin','faen']],
+		sunluban:['female','wu',3,['chanhui','jiaojin']],
+		guyong:['male','wu',3,['shenxing','bingyi']],
+		caifuren:['female','qun',3,['qieting','xianzhou']],
+		yj_jushou:['male','qun',3,['jianying','shibei']],
+		zhangsong:['male','shu',3,['qiangzhi','xiantu']],
+		zhuhuan:['male','wu',4,['youdi']],
+		xiahoushi:['female','shu',3,['qiaoshi','yanyu']],
 
-		panzhangmazhong:['male','wu',4,['anjian','duodao'],['fullskin']],
-		zhoucang:['male','shu',4,['zhongyong'],['fullskin']],
-		guanping:['male','shu',4,['longyin'],['fullskin']],
-		liaohua:['male','shu',4,['dangxian','fuli'],['fullskin']],
-		chengpu:['male','wu',4,['lihuo','chunlao'],['fullskin']],
-		gaoshun:['male','qun',4,['xianzhen','jinjiu'],['fullskin']],
-		caozhen:['male','wei',4,['sidi'],['fullskin']],
-		wuyi:['male','shu',4,['benxi'],['fullskin']],
-		hanhaoshihuan:['male','wei',4,['shenduan','yonglve'],['fullskin']],
+		panzhangmazhong:['male','wu',4,['anjian','duodao']],
+		zhoucang:['male','shu',4,['zhongyong']],
+		guanping:['male','shu',4,['longyin']],
+		liaohua:['male','shu',4,['dangxian','fuli']],
+		chengpu:['male','wu',4,['lihuo','chunlao']],
+		gaoshun:['male','qun',4,['xianzhen','jinjiu']],
+		caozhen:['male','wei',4,['sidi']],
+		wuyi:['male','shu',4,['benxi']],
+		hanhaoshihuan:['male','wei',4,['shenduan','yonglve']],
 
 		caorui:['male','wei',3,['huituo','mingjian','xingshuai'],['fullskin','zhu']],
-		caoxiu:['male','wei',4,['taoxi'],['fullskin']],
-		zhongyao:['male','wei',3,['huomo','zuoding'],['fullskin']],
+		caoxiu:['male','wei',4,['taoxi']],
+		zhongyao:['male','wei',3,['huomo','zuoding']],
 		liuchen:['male','shu',4,['zhanjue','qinwang'],['fullskin','zhu']],
-		zhangyi:['male','shu',4,['wurong','shizhi'],['fullskin']],
+		zhangyi:['male','shu',4,['wurong','shizhi']],
 		sunxiu:['male','wu',3,['yanzhu','xingxue','zhaofu'],['fullskin','zhu']],
-		zhuzhi:['male','wu',4,['anguo'],['fullskin']],
-		quancong:['male','wu',4,['yaoming'],['fullskin']],
-		gongsunyuan:['male','qun',4,['huaiyi'],['fullskin']],
-		guotufengji:['male','qun',3,['jigong','shifei'],['fullskin']],
+		zhuzhi:['male','wu',4,['anguo']],
+		quancong:['male','wu',4,['yaoming']],
+		gongsunyuan:['male','qun',4,['huaiyi']],
+		guotufengji:['male','qun',3,['jigong','shifei']],
 	},
 	skill:{
 		jinjiu:{
diff --git a/character/yxs.js b/character/yxs.js
index 96d167fd8..39d09b80a 100755
--- a/character/yxs.js
+++ b/character/yxs.js
@@ -1,13 +1,13 @@
 'use strict';
 character.yxs={
 	character:{
-		yxs_wuzetian:['female','wu',4,['nvquan','qiandu','weiyi'],['fullskin']],
-		yxs_caocao:['male','wei',4,['zhulu','xieling'],['fullskin']],
-		yxs_mozi:['male','qun',3,['jieyong','feigong','jianai'],['fullskin']],
-		yxs_bole:['male','wu',3,['bolehuiyan','xiangma'],['fullskin']],
-		yxs_aijiyanhou:['female','qun',3,['seyou','sheshi'],['fullskin']],
-		yxs_diaochan:['female','qun',3,['fengyi','wange'],['fullskin']],
-		yxs_yangyuhuan:['female','wu',3,['fengyan','nichang'],['fullskin']],
+		yxs_wuzetian:['female','wu',4,['nvquan','qiandu','weiyi']],
+		yxs_caocao:['male','wei',4,['zhulu','xieling']],
+		yxs_mozi:['male','qun',3,['jieyong','feigong','jianai']],
+		yxs_bole:['male','wu',3,['bolehuiyan','xiangma']],
+		yxs_aijiyanhou:['female','qun',3,['seyou','sheshi']],
+		yxs_diaochan:['female','qun',3,['fengyi','wange']],
+		yxs_yangyuhuan:['female','wu',3,['fengyan','nichang']],
 	},
 	skill:{
 		nichang:{
diff --git a/character/zhuogui.js b/character/zhuogui.js
index 7418fc397..eef292ecf 100755
--- a/character/zhuogui.js
+++ b/character/zhuogui.js
@@ -1,10 +1,10 @@
 character.zhuogui={
     character:{
-		nianshou:['male','shu',4,['nianrui','qixiang'],['fullskin']],
-		mamian:['male','qun',4,['lianyu','guiji'],['fullskin']],
-		niutou:['male','shu',4,['manjia','xiaoshou'],['fullskin']],
-		baiwuchang:['male','qun',3,['qiangzheng','moukui'],['fullskin']],
-		heiwuchang:['male','qun',3,['suoling','xixing'],['fullskin']],
+		nianshou:['male','shu',4,['nianrui','qixiang']],
+		mamian:['male','qun',4,['lianyu','guiji']],
+		niutou:['male','shu',4,['manjia','xiaoshou']],
+		baiwuchang:['male','qun',3,['qiangzheng','moukui']],
+		heiwuchang:['male','qun',3,['suoling','xixing']],
     },
     skill:{
         qixiang:{
diff --git a/game/game.js b/game/game.js
index fac9b321b..70b838932 100755
--- a/game/game.js
+++ b/game/game.js
@@ -6237,7 +6237,8 @@
 					);
 					node1.classList.add('infohidden');
 					node1.style.transform='perspective(600px) rotateY(180deg) translateX(0)';
-					setTimeout(function(){
+					var onEnd01=function(){
+						node1.removeEventListener('webkitTransitionEnd',onEnd01);
 						setTimeout(function(){
 							node1.style.transition='all ease-in 0.3s';
 							node1.style.transform='perspective(600px) rotateY(270deg) translateX(52px)';
@@ -6252,32 +6253,36 @@
 								node1.style.transform='';
 								node1.removeEventListener('webkitTransitionEnd',onEnd);
 							}
-							// node1.addEventListener('transitionEnd',onEnd);
 							node1.addEventListener('webkitTransitionEnd',onEnd);
-						},600);
-
+						},300);
+					};
+					node1.addEventListener('webkitTransitionEnd',onEnd01);
+					setTimeout(function(){
 						var node2=target.$throwxy2(card2,
 							'calc(50% + 10px)','calc(50% - 52px)','perspective(600px) rotateY(180deg)',true
 						);
 						node2.classList.add('infohidden');
 						node2.style.transform='perspective(600px) rotateY(180deg) translateX(0)';
-						setTimeout(function(){
-							node2.style.transition='all ease-in 0.3s';
-							node2.style.transform='perspective(600px) rotateY(270deg) translateX(52px)';
-							var onEnd=function(){
-								node2.classList.remove('infohidden');
-								node2.style.transition='all 0s';
-								ui.refresh(node2);
-								node2.style.transform='perspective(600px) rotateY(-90deg) translateX(52px)';
-								ui.refresh(node2);
-								node2.style.transition='';
-								ui.refresh(node2);
-								node2.style.transform='';
-								node2.removeEventListener('webkitTransitionEnd',onEnd);
-							}
-							// node2.addEventListener('transitionEnd',onEnd);
-							node2.addEventListener('webkitTransitionEnd',onEnd);
-						},700);
+						var onEnd02=function(){
+							node2.removeEventListener('webkitTransitionEnd',onEnd02);
+							setTimeout(function(){
+								node2.style.transition='all ease-in 0.3s';
+								node2.style.transform='perspective(600px) rotateY(270deg) translateX(52px)';
+								var onEnd=function(){
+									node2.classList.remove('infohidden');
+									node2.style.transition='all 0s';
+									ui.refresh(node2);
+									node2.style.transform='perspective(600px) rotateY(-90deg) translateX(52px)';
+									ui.refresh(node2);
+									node2.style.transition='';
+									ui.refresh(node2);
+									node2.style.transform='';
+									node2.removeEventListener('webkitTransitionEnd',onEnd);
+								}
+								node2.addEventListener('webkitTransitionEnd',onEnd);
+							},200);
+						};
+						node2.addEventListener('webkitTransitionEnd',onEnd02);
 					},200);
 				},
 				$throw:function(card,time,init){
@@ -18370,14 +18375,19 @@
 			document.onmouseup=ui.click.windowmouseup;
 			document.oncontextmenu=ui.click.right;
 		}
-		document.ontouchend=function(e){
-			if(e.touches.length==1&&!_status.dragged){
-				ui.click.pause();
-			}
+		else{
+			document.ontouchstart=ui.click.windowmousedown;
+			document.ontouchend=ui.click.windowmousemove;
+			document.ontouchmove=ui.click.windowmousemove;
 		}
-		document.ontouchmove = function(e) {
-			e.preventDefault();
-		};
+		// document.ontouchend=function(e){
+		// 	if(e.touches.length==1&&!_status.dragged){
+		// 		ui.click.pause();
+		// 	}
+		// }
+		// document.ontouchmove = function(e) {
+		// 	e.preventDefault();
+		// };
 		window.onbeforeunload=function(){
 			if(lib.config.confirm_exit&&!_status.reloading){
 				return '是否离开游戏？'