diff --git a/character/gwent.js b/character/gwent.js
index 9fcafd7e8..b021b5481 100644
--- a/character/gwent.js
+++ b/character/gwent.js
@@ -73,6 +73,174 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gw_yioufeisi:'国王还是乞丐，两者有何区别，人类少一个算一个',
 		},
 		skill:{
+			gwjingtian:{
+				clickable:function(player){
+					player.addTempSkill('gwjingtian2');
+					player.directgain(get.cards());
+					player.$draw();
+					player.storage.gwjingtian--;
+					player.updateMark('gwjingtian',true);
+					player.logSkill('gwjingtian');
+					if(_status.imchoosing){
+						delete _status.event._cardChoice;
+						delete _status.event._targetChoice;
+						game.check();
+					}
+				},
+				clickableFilter:function(player){
+					return player.storage.gwjingtian>0&&!player.hasSkill('gwjingtian2');
+				},
+				init:function(player){
+					player.storage.gwjingtian=0;
+				},
+				trigger:{player:'phaseDrawBefore'},
+				forced:true,
+				content:function(){
+					trigger.cancel();
+					player.storage.gwjingtian+=3;
+					player.updateMark('gwjingtian',true);
+				},
+				group:'gwjingtian_ai',
+				mark:true,
+				intro:{
+					mark:function(dialog,content,player){
+						if(player.isUnderControl(true)){
+							if(_status.gameStarted&&player.storage.gwjingtian>0&&!player.hasSkill('gwjingtian2')){
+								dialog.add(ui.create.div('.menubutton.pointerdiv','点击发动',function(){
+									lib.skill.gwjingtian.clickable(player);
+								}));
+							}
+							var list=[];
+							var num=Math.min(9,ui.cardPile.childElementCount);
+							for(var i=0;i<num;i++){
+								list.push(ui.cardPile.childNodes[i]);
+							}
+							dialog.addSmall(list);
+						}
+						else{
+							dialog.addText('剩余'+content+'次');
+						}
+					},
+					content:function(content,player){
+						if(player.isUnderControl(true)){
+							var list=[];
+							var num=Math.min(9,ui.cardPile.childElementCount);
+							for(var i=0;i<num;i++){
+								list.push(ui.cardPile.childNodes[i]);
+							}
+							return get.translation(list);
+						}
+						else{
+							return '剩余'+content+'次';
+						}
+					}
+				},
+				subSkill:{
+					ai:{
+						trigger:{global:'drawAfter'},
+						filter:function(event,player){
+							return (_status.auto||!player.isUnderControl(true))&&player.storage.gwjingtian>0&&!player.hasSkill('gwjingtian2');
+						},
+						popup:false,
+						check:function(event,player){
+							var value=0,card=ui.cardPile.firstChild;
+							if(card){
+								value=get.value(card);
+							}
+							if(value>=6) return true;
+							if(value>=5&&get.type(card)!='equip'&&player.storage.gwjingtian>=3) return true;
+							if(player.storage.gwjingtian>3&&value>3) return true;
+							return false;
+						},
+						content:function(){
+							lib.skill.gwjingtian.clickable(player);
+						}
+					}
+				}
+			},
+			gwjingtian2:{},
+			gwjingshi:{
+				enable:'phaseUse',
+				usable:1,
+				direct:true,
+				delay:0,
+				filter:function(event,player){
+					return game.hasPlayer(function(current){
+						return current.countCards('h');
+					})
+				},
+				content:function(){
+					'step 0'
+					var targets=game.filterPlayer(function(current){
+						return current.countCards('h');
+					});
+					var num=targets.length;
+					for(var i=0;i<targets.length;i++){
+						targets[i]=[targets[i],targets[i].countCards('h',{color:'black'})];
+					}
+					targets.sort(function(a,b){
+						return b[1]-a[1];
+					});
+					for(var i=1;i<targets.length;i++){
+						if(targets[i][1]<targets[0][1]){
+							targets.splice(i);break;
+						}
+					}
+					for(var i=0;i<targets.length;i++){
+						targets[i]=targets[i][0];
+					}
+					event.targets=targets;
+					var rand=Math.random();
+					var choice=targets.randomGet();
+					player.chooseTarget('猜测手牌中黑色牌最多的角色',true,function(card,player,target){
+						return target.countCards('h');
+					}).set('ai',function(target){
+						if(rand<0.6||player==game.me){
+							return target.isMaxHandcard()?1:0;
+						}
+						else if(rand<0.8){
+							return target==choice?1:0;
+						}
+						else{
+							return Math.random();
+						}
+					});
+					'step 1'
+					if(event.targets.contains(result.targets[0])){
+						player.popup('成功');
+						game.log(player,'发动','【镜师】','成功');
+						var dialog=ui.create.dialog('hidden');
+						dialog.add('获得任意一名角色的一张手牌');
+						var list=game.filterPlayer(function(current){
+							return current!=player&&current.countCards('h');
+						}).sortBySeat();
+						for(var i=0;i<list.length;i++){
+							dialog.addText(get.translation(list[i]));
+							dialog.add(list[i].getCards('h'));
+						}
+						player.chooseButton(dialog,true).set('ai',function(button){
+							if(get.attitude(player,get.owner(button))>0) return -1;
+							return get.value(button.link);
+						});
+					}
+					else{
+						player.popup('失败');
+						game.log(player,'发动','【镜师】','失败');
+						event.finish();
+					}
+					'step 2'
+					if(result.bool&&result.links&&result.links.length){
+						var owner=get.owner(result.links[0]);
+						if(owner){
+							owner.give(result.links,player);
+							player.line(owner);
+						}
+						else{
+							player.gain(result.links,'gain2');
+						}
+					}
+				}
+			},
 			gwweitu:{
 				trigger:{player:'discardAfter'},
 				forced:true,
@@ -2663,9 +2831,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gw_shasixiwusi:'沙斯西乌斯',
 
 			gwjingshi:'镜师',
-			gwjingshi_info:'出牌阶段限一次，你可以猜测手牌中黑色牌最多的角色是谁，若猜对，你可以执行任意一项操作',
+			gwjingshi_info:'出牌阶段限一次，你可以猜测手牌中黑色牌最多的角色是谁，若猜对，你可以观看所有其他角色的手牌并获得任意一张',
 			gwjingtian:'经天',
-			gwjingtian_info:'锁定技，牌堆顶的9张牌对你始终可见；你可以跳过摸牌阶段，改为选择至多3名其他角色，在他们的下个准备阶段获得牌堆顶前9张中的任意一张牌',
+			gwjingtian_info:'锁定技，牌堆顶的9张牌对你始终可见；你始终跳过摸牌阶段，改为获得3枚“经天”标记；每名角色的回合限一次，你可以在任意时间点移去一枚“经天”标记，然后获得牌堆顶的一张牌',
 			gwweitu:'卫土',
 			gwweitu_info:'锁定技，每当你弃置一张牌，若你的护甲数小于3，你获得一点护甲；每当你的护甲为你累计抵消3次伤害，你获得一张随机银卡法术',
 			gwzhongmo:'终末',
diff --git a/character/hearth.js b/character/hearth.js
index 63b66b637..a82283b16 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -1896,25 +1896,20 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			}
     		},
     		yushou_misha:{
-    			trigger:{player:'damageBegin'},
+    			trigger:{player:'damageEnd'},
     			forced:true,
     			filter:function(event,player){
     				return event.num>=1;
     			},
-    			usable:1,
     			content:function(){
-    				if(trigger.num>=1){
-    					trigger.num--;
-    					// player.removeSkill('yushou_misha');
-    					// player.draw();
-    				}
+    				player.changeHujia();
     			},
     			ai:{
     				effect:{
     					target:function(card,player,target){
     						if(get.tag(card,'damage')){
     							if(player.hasSkillTag('jueqing',false,target)) return;
-    							return 0.5;
+    							return 0.6;
     						}
     					}
     				}
@@ -7623,7 +7618,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     		yushou:'御兽',
     		yushou_info:'出牌阶段，你可以弃置一张牌并召唤一个随机的野兽宠物，回合开始阶段，你随机失去一个宠物',
     		yushou_misha:'米莎',
-    		yushou_misha_info:'你每回合受到的首次伤害-1',
+    		yushou_misha_info:'每当你受到一次伤害，你获得一点护甲',
     		yushou_huofu:'霍弗',
     		yushou_huofu_info:'你可以将一张黑色牌当作决斗使用',
     		yushou_leiouke:'雷欧克',
diff --git a/character/rank.js b/character/rank.js
index fff3a4535..7e87c6858 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -57,6 +57,7 @@ window.noname_character_rank={
         'pal_yueqi',
     ],
     a:[
+        'gw_shasixiwusi',
         'gw_kairuisi',
         'gw_kanbi',
         'gw_nvyemo',
@@ -190,6 +191,7 @@ window.noname_character_rank={
         'xizhicai',
     ],
     am:[
+        'gw_oudimu',
         'dongyun',
         'gw_xigedelifa',
         'gw_laomaotou',
diff --git a/extension/boss/extension.js b/extension/boss/extension.js
index 4f7d21df0..75f408505 100644
--- a/extension/boss/extension.js
+++ b/extension/boss/extension.js
@@ -4,190 +4,83 @@ game.import('play',function(lib,game,ui,get,ai,_status){
 		name:'boss',
 		init:function(){
 			if(get.mode()=='tafang') return;
+			var storage=localStorage.getItem('boss_storage_playpackconfig');
+			try{
+				storage=JSON.parse(storage)||{};
+			}
+			catch(e){
+				storage={};
+			}
 			if(get.mode()!='boss'){
-				lib.characterPack.mode_extension_boss={
-					boss_zhuque:['female','shen',4,['boss_shenyi','boss_fentian'],['shu','hiddenboss','bossallowed']],
-					boss_huoshenzhurong:['male','shen',5,['boss_shenyi','boss_xingxia'],['shu','hiddenboss','bossallowed']],
-					boss_yanling:['male','shen',4,['boss_huihuo','boss_furan'],['shu','hiddenboss','bossallowed']],
-					boss_yandi:['male','shen',6,['boss_shenyi','boss_shenen','boss_chiyi'],['shu','hiddenboss','bossallowed']],
-
-					boss_qinglong:['male','shen',4,['boss_shenyi','releiji'],['wu','hiddenboss','bossallowed']],
-					boss_mushengoumang:['male','shen',5,['boss_shenyi','boss_buchun'],['wu','hiddenboss','bossallowed']],
-					boss_shujing:['female','shen',2,['boss_cuidu','boss_zhongdu'],['wu','hiddenboss','bossallowed']],
-					boss_taihao:['male','shen',6,['boss_shenyi','boss_shenen','boss_qingyi'],['wu','hiddenboss','bossallowed']],
-
-					boss_nianshou_heti:['male','shen',12,['boss_nianrui','boss_mengtai','boss_nbianshen','boss_nbianshenx'],['shu','boss','bossallowed'],'shu'],
-					boss_nianshou_jingjue:['male','shen',12,['boss_nianrui','boss_mengtai','boss_jingjue','boss_nbianshen'],['shu','hiddenboss','bossallowed'],'shu'],
-					boss_nianshou_renxing:['male','shen',12,['boss_nianrui','boss_mengtai','boss_renxing','boss_nbianshen'],['shu','hiddenboss','bossallowed'],'shu'],
-					boss_nianshou_ruizhi:['male','shen',12,['boss_nianrui','boss_mengtai','boss_ruizhi','boss_nbianshen'],['shu','hiddenboss','bossallowed'],'shu'],
-					boss_nianshou_baonu:['male','shen',12,['boss_nianrui','boss_mengtai','boss_nbaonu','boss_shouyi','boss_nbianshen'],['shu','hiddenboss','bossallowed'],'shu'],
-					boss_baiwuchang:['male','shen',9,['boss_baolian','boss_qiangzheng','boss_zuijiu','juece','boss_bianshen4'],['shu','hiddenboss','bossallowed']],
-					boss_heiwuchang:['male','shen',9,['boss_guiji','boss_taiping','boss_suoming','boss_xixing','boss_bianshen4'],['shu','hiddenboss','bossallowed']],
-					boss_luocha:['male','shen',12,['boss_modao','boss_yushou','yizhong','boss_moyany'],['shu','hiddenboss','bossallowed']],
-					boss_yecha:['male','shen',11,['boss_modao','boss_mojian','bazhen','boss_danshu'],['shu','hiddenboss','bossallowed']],
-					boss_niutou:['male','shen',7,['boss_baolian','niepan','boss_manjia','boss_xiaoshou','boss_bianshen3'],['shu','hiddenboss','bossallowed']],
-					boss_mamian:['male','shen',6,['boss_guiji','fankui','boss_lianyu','juece','boss_bianshen3'],['shu','hiddenboss','bossallowed']],
-					boss_chi:['male','shen',5,['boss_guimei','boss_didong','boss_shanbeng','boss_bianshen2'],['shu','hiddenboss','bossallowed']],
-					boss_mo:['female','shen',5,['boss_guimei','enyuan','boss_beiming','boss_bianshen2'],['shu','hiddenboss','bossallowed']],
-					boss_wang:['male','shen',5,['boss_guimei','boss_luolei','huilei','boss_bianshen2'],['shu','hiddenboss','bossallowed']],
-					boss_liang:['female','shen',5,['boss_guimei','boss_guihuo','boss_minbao','boss_bianshen2'],['shu','hiddenboss','bossallowed']],
-
-					boss_lvbu1:['male','shen',8,['mashu','wushuang','boss_baonu'],['qun','boss','bossallowed'],'wei'],
-					boss_lvbu2:['male','shen',4,['mashu','wushuang','xiuluo','shenwei','shenji'],['qun','hiddenboss','bossallowed'],'qun'],
-					boss_lvbu3:['male','shen',4,['wushuang','shenqu','jiwu'],['qun','hiddenboss','bossallowed'],'qun'],
-
-					boss_caocao:['male','shen',12,['boss_guixin','xiongcai'],['wei','boss','bossallowed'],'wei'],
-					boss_guojia:['male','shen',4,['tiandu','boss_guimou','boss_yuance','boss_qizuo'],['wei','boss','bossallowed'],'zhu'],
-					boss_zhangchunhua:['female','shen',4,['jueqing','boss_wuxin','shangshix'],['wei','boss','bossallowed'],'wei'],
-					boss_zhenji:['female','shen',4,['tashui','lingbo','jiaoxia','fanghua'],['wei','boss','bossallowed'],'wei'],
-
-					boss_liubei:['male','shen',12,['xiaoxiong','boss_zhangwu'],['shu','boss','bossallowed'],'qun'],
-					boss_zhugeliang:['male','shen',Infinity,['xiangxing','yueyin','fengqi','gaiming'],['shu','boss','bossallowed'],'qun'],
-					boss_huangyueying:['female','shen',4,['boss_gongshen','boss_jizhi','qicai','boss_guiyin'],['shu','boss','bossallowed'],'wei'],
-					boss_pangtong:['male','shen',4,['boss_tianyu','qiwu','niepan','boss_yuhuo'],['shu','boss','bossallowed'],'zhu'],
-					boss_zhaoyun:['male','shen',1,['boss_juejing','longhun','zhanjiang'],['shu','boss','bossallowed'],'qun'],
-
-					boss_zhouyu:['male','shen',6,['huoshen','boss_honglian','boss_xianyin'],['wu','boss','bossallowed'],'zhu'],
-
-					boss_caiwenji:['female','shen',4,['beige','boss_hujia','boss_guihan'],['qun','boss','bossallowed'],'wei'],
-					boss_zhangjiao:['male','shen',8,['boss_leiji','tiandao','jidian'],['qun','boss','bossallowed'],'shu'],
-					boss_zuoci:['male','shen',0,['huanhua'],['qun','boss','bossallowed'],'shu'],
-
-					boss_diaochan:['female','shen',4,['fengwu','yunshen','lianji','boss_wange','yuehun'],['qun','boss','bossallowed'],'qun'],
-					boss_huatuo:['male','shen',6,['chulao','mazui','boss_shengshou','guizhen','wuqin'],['qun','boss','bossallowed'],'wu'],
-					boss_dongzhuo:['male','shen',20,['jiuchi','boss_qiangzheng','boss_baolin'],['qun','boss','bossallowed'],'shu'],
-				};
+				lib.characterPack.mode_extension_boss=storage.boss||{};
 				for(var i in lib.characterPack.mode_extension_boss){
 					lib.characterPack.mode_extension_boss[i][4].push('mode:boss');
 					lib.character[i]=lib.characterPack.mode_extension_boss[i];
+					if(typeof lib.character[i][2]!='number'){
+						lib.character[i][2]=Infinity;
+					}
 					if(!lib.config.boss_enableai_playpackconfig){
 						lib.config.forbidai.push(i);
 					}
 				}
-				var list2={
-					boss_liedixuande:['male','shu',5,['boss_lingfeng','boss_jizhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
-					boss_gongshenyueying:['male','shu',4,['boss_gongshenjg','boss_jingmiao','boss_zhinang'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
-					boss_tianhoukongming:['male','shu',4,['boss_biantian','bazhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
-					boss_yuhuoshiyuan:['male','shu',4,['boss_yuhuojg','boss_qiwu','boss_tianyujg'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
-					boss_qiaokuijunyi:['male','wei',4,['boss_huodi','boss_jueji'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
-					boss_jiarenzidan:['male','wei',5,['boss_chiying','boss_jingfan'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
-					boss_duanyuzhongda:['male','wei',5,['boss_fanshi','boss_xuanlei','boss_skonghun'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
-					boss_juechenmiaocai:['male','wei',4,['boss_chuanyun','boss_leili','boss_fengxing'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
-
-					boss_jileibaihu:['male','shu',4,['boss_jiguan','boss_zhenwei','boss_benlei'],['jiangemech','hiddenboss','bossallowed'],'shu'],
-					boss_yunpingqinglong:['male','shu',4,['boss_jiguan','boss_mojianjg'],['jiangemech','hiddenboss','bossallowed'],'shu'],
-					boss_lingjiaxuanwu:['male','shu',5,['boss_jiguan','yizhong','boss_lingyu'],['jiangemech','hiddenboss','bossallowed'],'shu'],
-					boss_chiyuzhuque:['male','shu',5,['boss_jiguan','boss_yuhuojg','boss_tianyun'],['jiangemech','hiddenboss','bossallowed'],'shu'],
-					boss_fudibian:['male','wei',4,['boss_jiguan','boss_didongjg'],['jiangemech','hiddenboss','bossallowed'],'wei'],
-					boss_tuntianchiwen:['male','wei',5,['boss_jiguan','boss_tanshi','boss_tunshi'],['jiangemech','hiddenboss','bossallowed'],'wei'],
-					boss_shihuosuanni:['male','wei',3,['boss_jiguan','boss_lianyujg'],['jiangemech','hiddenboss','bossallowed'],'wei'],
-					boss_lieshiyazi:['male','wei',4,['boss_jiguan','boss_nailuo'],['jiangemech','hiddenboss','bossallowed'],'wei'],
-				}
-				if(get.mode()!='versus'||get.config('versus_mode')!='jiange'){
-					lib.characterPack.mode_extension_jiange=list2;
-					for(var i in list2){
-						lib.characterPack.mode_extension_jiange[i]=list2[i];
-						lib.characterPack.mode_extension_jiange[i][4].push('mode:versus');
-						lib.character[i]=list2[i];
-						if(!lib.config.boss_enableai_playpackconfig){
-							lib.config.forbidai.push(i);
-						}
+			}
+			var list2=storage.versus||{};
+			if(get.mode()!='versus'||get.config('versus_mode')!='jiange'){
+				lib.characterPack.mode_extension_jiange=list2;
+				for(var i in list2){
+					lib.characterPack.mode_extension_jiange[i]=list2[i];
+					lib.characterPack.mode_extension_jiange[i][4].push('mode:versus');
+					lib.character[i]=list2[i];
+					if(typeof lib.character[i][2]!='number'){
+						lib.character[i][2]=Infinity;
 					}
-					lib.characterIntro.boss_liedixuande=lib.characterIntro.liubei;
-					lib.characterIntro.boss_gongshenyueying=lib.characterIntro.huangyueying;
-					lib.characterIntro.boss_tianhoukongming=lib.characterIntro.shen_zhugeliang;
-					lib.characterIntro.boss_yuhuoshiyuan=lib.characterIntro.pangtong;
-					lib.characterIntro.boss_qiaokuijunyi=lib.characterIntro.zhanghe;
-					lib.characterIntro.boss_jiarenzidan=lib.characterIntro.caozhen;
-					lib.characterIntro.boss_duanyuzhongda=lib.characterIntro.simayi;
-					lib.characterIntro.boss_juechenmiaocai=lib.characterIntro.xiahouyuan;
-				}
-				else if(_status.mode!='jiange'){
-					for(var i in list2){
-						lib.character[i]=list2[i];
-						if(!lib.config.boss_enableai_playpackconfig){
-							lib.config.forbidai.push(i);
-						}
+					if(!lib.config.boss_enableai_playpackconfig){
+						lib.config.forbidai.push(i);
 					}
 				}
-				var list={
-					boss_chi:'魑',
-					boss_mo:'魅',
-					boss_wang:'魍',
-					boss_liang:'魉',
-					boss_niutou:'牛头',
-					boss_mamian:'马面',
-					boss_baiwuchang:'白无常',
-					boss_heiwuchang:'黑无常',
-					boss_luocha:'罗刹',
-					boss_yecha:'夜叉',
-
-					boss_nianshou:'年兽',
-					boss_nianshou_heti:'合体',
-					boss_nianshou_jingjue:'警觉年兽',
-					boss_nianshou_renxing:'任性年兽',
-					boss_nianshou_baonu:'暴怒年兽',
-					boss_nianshou_ruizhi:'睿智年兽',
-
-					boss_shuijing:'水镜先生',
-					boss_huangyueying:'奇智女杰',
-					boss_zhangchunhua:'冷血皇后',
-					boss_satan:'堕落天使',
-					boss_dongzhuo:'乱世魔王',
-					boss_lvbu1:'最强神话',
-					boss_lvbu2:'暴怒战神',
-					boss_lvbu3:'神鬼无前',
-					boss_zhouyu:'赤壁火神',
-					boss_pangtong:'涅盘凤雏',
-					boss_zhugeliang:'祭风卧龙',
-					boss_zhangjiao:'天公将军',
-					boss_zuoci:'迷之仙人',
-					boss_yuji:'琅琊道士',
-					boss_liubei:'蜀汉烈帝',
-					boss_caiwenji:'异乡孤女',
-					boss_huatuo:'药坛圣手',
-					boss_luxun:'蹁跹君子',
-					boss_zhenji:'洛水仙子',
-					boss_diaochan:'绝代妖姬',
-					boss_zhaoyun:'高达一号',
-					boss_zhuoguiquxie:'捉鬼驱邪',
-					boss_caocao:'魏武大帝',
-					boss_guojia:'世之奇士',
-
-					boss_liedixuande:'烈帝玄德',
-					boss_gongshenyueying:'工神月英',
-					boss_tianhoukongming:'天侯孔明',
-					boss_yuhuoshiyuan:'浴火士元',
-					boss_qiaokuijunyi:'巧魁儁乂',
-					boss_jiarenzidan:'佳人子丹',
-					boss_duanyuzhongda:'断狱仲达',
-					boss_juechenmiaocai:'绝尘妙才',
-
-					boss_jileibaihu:'机雷白虎',
-					boss_yunpingqinglong:'云屏青龙',
-					boss_lingjiaxuanwu:'灵甲玄武',
-					boss_chiyuzhuque:'炽羽朱雀',
-					boss_fudibian:'缚地狴犴',
-					boss_tuntianchiwen:'吞天螭吻',
-					boss_shihuosuanni:'食火狻猊',
-					boss_lieshiyazi:'裂石睚眦',
-
-					mode_extension_boss_character_config:'挑战武将',
-					mode_extension_jiange_character_config:'剑阁武将',
-				};
-
-				for(var i in list){
-					lib.translate[i]=lib.translate[i]||list[i];
+				lib.characterIntro.boss_liedixuande=lib.characterIntro.liubei;
+				lib.characterIntro.boss_gongshenyueying=lib.characterIntro.huangyueying;
+				lib.characterIntro.boss_tianhoukongming=lib.characterIntro.shen_zhugeliang;
+				lib.characterIntro.boss_yuhuoshiyuan=lib.characterIntro.pangtong;
+				lib.characterIntro.boss_qiaokuijunyi=lib.characterIntro.zhanghe;
+				lib.characterIntro.boss_jiarenzidan=lib.characterIntro.caozhen;
+				lib.characterIntro.boss_duanyuzhongda=lib.characterIntro.simayi;
+				lib.characterIntro.boss_juechenmiaocai=lib.characterIntro.xiahouyuan;
+			}
+			else if(_status.mode!='jiange'){
+				for(var i in list2){
+					lib.character[i]=list2[i];
+					if(!lib.config.boss_enableai_playpackconfig){
+						lib.config.forbidai.push(i);
+					}
 				}
 			}
+			var list=storage.translate||{};
+			list.mode_extension_boss_character_config='挑战武将';
+			list.mode_extension_jiange_character_config='剑阁武将';
+
+			for(var i in list){
+				lib.translate[i]=lib.translate[i]||list[i];
+			}
 		},
 		arenaReady:function(){
 			if(get.mode()=='tafang') return;
+			var storage=localStorage.getItem('boss_storage_playpackconfig');
+			try{
+				storage=JSON.parse(storage)||{};
+			}
+			catch(e){
+				storage={};
+			}
+			if(!storage.translate){
+				storage.translate={};
+			}
 			var loadversus=function(){
 				if(get.mode()!='versus'){
 					game.loadModeAsync('versus',function(mode){
 						for(var i in mode.translate){
 							lib.translate[i]=lib.translate[i]||mode.translate[i];
+							storage.translate[i]=mode.translate[i];
 						}
 						for(var i in mode.skill){
 							if(lib.skill[i]) console.log(i);
@@ -196,19 +89,36 @@ game.import('play',function(lib,game,ui,get,ai,_status){
 								game.finishSkill(i);
 							}
 						}
+						storage.versus={};
+						for(var i in mode.jiangeboss){
+							if(mode.jiangeboss[i][4].contains('bossallowed')){
+								storage.versus[i]=mode.jiangeboss[i];
+							}
+						}
+						localStorage.setItem('boss_storage_playpackconfig',JSON.stringify(storage));
 					});
 				}
+				else{
+					localStorage.setItem('boss_storage_playpackconfig',JSON.stringify(storage));
+				}
 			};
 			if(get.mode()!='boss'){
 				game.loadModeAsync('boss',function(mode){
 					for(var i in mode.translate){
 						lib.translate[i]=lib.translate[i]||mode.translate[i];
+						storage.translate[i]=mode.translate[i];
 					}
 					for(var i in mode.skill){
 						if(lib.skill[i]) console.log(i);
 						lib.skill[i]=mode.skill[i];
 						game.finishSkill(i);
 					}
+					storage.boss={};
+					for(var i in mode.characterPack.mode_boss){
+						if(mode.characterPack.mode_boss[i][4].contains('bossallowed')){
+							storage.boss[i]=mode.characterPack.mode_boss[i];
+						}
+					}
 					loadversus();
 				});
 			}
diff --git a/game/asset.js b/game/asset.js
index 682ddea43..6a38a97e8 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-    '1.9.37.3',
+    '1.9.38',
     'image/background/huangtian_bg.jpg',
     'image/background/ol_bg.jpg',
     'image/background/september_bg.jpg',
diff --git a/game/config.js b/game/config.js
index c6ead9f31..1779f52d2 100644
--- a/game/config.js
+++ b/game/config.js
@@ -30,7 +30,7 @@ window.config={
 		sgscards:['standard','extra','sp','guozhan'],
 		sgsmodes:['identity','guozhan','versus','brawl','connect'],
 		stockmode:['identity','guozhan','versus','boss','chess','stone','connect','brawl','tafang'],
-		stockextension:['boss','cardpile','coin','wuxing','hs_mod'],
+		stockextension:['boss','cardpile','coin','wuxing'],
 		layout:['default','newlayout'],
 		theme:['woodden','music','simple'],
 		card_font:['xiaozhuan','huangcao','caoshu','xingshu'],
diff --git a/game/game.js b/game/game.js
index 492390fdd..460124ab9 100644
--- a/game/game.js
+++ b/game/game.js
@@ -3689,6 +3689,38 @@
     			    name:'开启',
     			    init:false,
     			    restart:true,
+					onswitch:function(bool){
+						if(bool){
+							var storage={boss:{},versus:{},translate:{}};
+							var loadversus=function(){
+								game.loadModeAsync('versus',function(mode){
+									for(var i in mode.translate){
+										storage.translate[i]=mode.translate[i];
+									}
+									for(var i in mode.jiangeboss){
+										if(mode.jiangeboss[i][4].contains('bossallowed')){
+											storage.versus[i]=mode.jiangeboss[i];
+										}
+									}
+									localStorage.setItem('boss_storage_playpackconfig',JSON.stringify(storage));
+								});
+							};
+							game.loadModeAsync('boss',function(mode){
+								for(var i in mode.translate){
+									storage.translate[i]=mode.translate[i];
+								}
+								for(var i in mode.characterPack.mode_boss){
+									if(mode.characterPack.mode_boss[i][4].contains('bossallowed')){
+										storage.boss[i]=mode.characterPack.mode_boss[i];
+									}
+								}
+								loadversus();
+							});
+						}
+						else{
+							localStorage.removeItem('boss_storage_playpackconfig');
+						}
+					}
     			},
     			intro:{
     			    name:'将剑阁和挑战模式的武将添加到其它模式',
@@ -7652,6 +7684,7 @@
 					delete lib.imported.character;
 					delete lib.imported.card;
 					delete lib.imported.mode;
+					delete lib.imported.play;
 					for(var i in lib.init){
 						if(i.indexOf('setMode_')==0){
 							delete lib.init[i];
@@ -15463,28 +15496,28 @@
                     next.setContent('gain');
 					return next;
 				},
-				give:function(cards,target){
+				give:function(cards,target,visible){
 					var shown=[],hidden=[];
-					var hs=this.getCards('h');
 					if(get.itemtype(cards)=='card'){
 						cards=[cards];
 					}
-					for(var i=0;i<cards.length;i++){
-						if(hs.contains(cards[i])){
-							hidden.push(cards[i]);
-						}
-						else{
-							shown.push(cards[i]);
+					if(visible){
+						shown.addArray(cards);
+					}
+					else{
+						var hs=this.getCards('h');
+						for(var i=0;i<cards.length;i++){
+							if(hs.contains(cards[i])){
+								hidden.push(cards[i]);
+							}
+							else{
+								shown.push(cards[i]);
+							}
 						}
 					}
 					if(shown.length) this.$give(shown,target);
 					if(hidden.length) this.$giveAuto(hidden,target);
-					if(hidden===true){
-						target.gain(cards,this);
-					}
-					else{
-						target.gain(cards,this);
-					}
+					target.gain(cards,this);
 				},
 				lose:function(){
 					var next=game.createEvent('lose');
@@ -19363,6 +19396,10 @@
 				finish:function(){
 					this.finished=true;
 				},
+				cancel:function(){
+					this.untrigger();
+					this.finish();
+				},
 				goto:function(step){
 					this.step=step-1;
 				},
@@ -26371,6 +26408,9 @@
                 script.remove();
 				var content=lib.imported.mode[name];
 				delete lib.imported.mode[name];
+				if(get.is.empty(lib.imported.mode)){
+					delete lib.imported.mode;
+				}
                 callback(content);
             });
         },
@@ -31275,6 +31315,9 @@
     						}
     						game.saveConfig('plays',lib.config.plays);
                         }
+						if(this.onswitch){
+							this.onswitch(bool);
+						}
 						updateNodes();
 					};
 
@@ -31321,6 +31364,9 @@
                                 };
                             }
                             var cfgnode=createConfig(cfg);
+							if(cfg.onswitch){
+								cfgnode.onswitch=cfg.onswitch;
+							}
                             page.appendChild(cfgnode);
                         }
                         return node;
@@ -40512,6 +40558,9 @@
                 }
                 game.saveConfig('autoskilllist',list);
             },
+			skillbutton:function(){
+				this.func(this.link);
+			},
 			autoskill2:function(e){
 				this.classList.toggle('on');
 				if(this.classList.contains('on')){
@@ -42454,7 +42503,9 @@
                         str2+='（'+get.translation(str)+'）';
                     }
                     else{
-                        str2+='【'+get.translation(str.suit)+str.number+'】'
+						str2+='【'+get.translation(str.suit)+str.number+'】';
+						// var len=str2.length-1;
+                        // str2=str2.slice(0,len)+'<span style="letter-spacing: -2px">'+str2[len]+'·</span>'+get.translation(str.suit)+str.number;
                     }
 				}
 				return str2;
@@ -43056,6 +43107,19 @@
 							underlinenode.link=skills[i];
 							underlinenode.listen(ui.click.autoskill2);
 						}
+						else if(lib.skill[skills[i]].clickable&&node.isIn()&&node.isUnderControl(true)){
+							var intronode=uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i])+'<br><div class="menubutton skillbutton" style="position:relative;margin-top:5px">点击发动</div></div></div>').querySelector('.skillbutton');
+							intronode.link=node;
+							intronode.func=lib.skill[skills[i]].clickable;
+							intronode.listen(ui.click.skillbutton);
+							if(!_status.gameStarted||(lib.skill[skills[i]].clickableFilter&&!lib.skill[skills[i]].clickableFilter(node))){
+								intronode.classList.add('disabled');
+								intronode.style.opacity=0.5;
+							}
+							else{
+								intronode.classList.add('pointerdiv');
+							}
+						}
 						else if(lib.skill[skills[i]].nobracket){
 							uiintro.add('<div><div class="skill">'+get.translation(skills[i])+'</div><div>'+lib.translate[skills[i]+'_info']+'</div></div>');
 						}
diff --git a/game/update.js b/game/update.js
index be5974a7d..58a5d8cf8 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,5 +1,5 @@
 window.noname_update={
-    version:'1.9.37.3',
+    version:'1.9.38',
     update:'1.9.37.2',
     changeLog:[
         'bug修复'
@@ -17,17 +17,18 @@ window.noname_update={
         // 'card/gujian.js',
         // 'character/*',
         // 'character/hearth.js',
+        'character/gwent.js',
         // 'character/old.js',
         // 'character/standard.js',
         // 'character/sp.js',
         // 'character/swd.js',
-        // 'character/rank.js',
+        'character/rank.js',
         // 'character/yijiang.js',
         // 'character/xianjian.js',
         // 'mode/identity.js',
         'mode/boss.js',
         // 'mode/guozhan.js',
-        // 'mode/versus.js',
+        'mode/versus.js',
         // 'mode/connect.js',
         // 'mode/chess.js',
         // 'mode/tafang.js',
@@ -45,6 +46,6 @@ window.noname_update={
         // 'layout/mobile/layout.css',
         // 'layout/newlayout/global.css',
         // 'layout/mode/chess.css',
-        // 'extension/boss/extension.js',
+        'extension/boss/extension.js',
     ]
 }
diff --git a/image/character/gw_shasixiwusi.jpg b/image/character/gw_shasixiwusi.jpg
index c421b306c..7ad3c06ed 100644
Binary files a/image/character/gw_shasixiwusi.jpg and b/image/character/gw_shasixiwusi.jpg differ
diff --git a/mode/versus.js b/mode/versus.js
index 3599e8396..9cc9ad49b 100644
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -4,25 +4,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     	name:'versus',
     	init:function(){
     		if(get.config('versus_mode')=='jiange'){
-    			lib.characterPack.mode_versus={
-    				boss_liedixuande:['male','shu',5,['boss_lingfeng','boss_jizhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
-    				boss_gongshenyueying:['female','shu',4,['boss_gongshenjg','boss_jingmiao','boss_zhinang'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
-    				boss_tianhoukongming:['male','shu',4,['boss_biantian','bazhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
-    				boss_yuhuoshiyuan:['male','shu',4,['boss_yuhuojg','boss_qiwu','boss_tianyujg'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
-    				boss_qiaokuijunyi:['male','wei',4,['boss_huodi','boss_jueji'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
-    				boss_jiarenzidan:['male','wei',5,['boss_chiying','boss_jingfan'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
-    				boss_duanyuzhongda:['male','wei',5,['boss_fanshi','boss_xuanlei','boss_skonghun'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
-    				boss_juechenmiaocai:['male','wei',4,['boss_chuanyun','boss_leili','boss_fengxing'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
-
-    				boss_jileibaihu:['male','shu',4,['boss_jiguan','boss_zhenwei','boss_benlei'],['jiangemech','hiddenboss','bossallowed'],'shu'],
-    				boss_yunpingqinglong:['male','shu',4,['boss_jiguan','boss_mojianjg'],['jiangemech','hiddenboss','bossallowed'],'shu'],
-    				boss_lingjiaxuanwu:['male','shu',5,['boss_jiguan','yizhong','boss_lingyu'],['jiangemech','hiddenboss','bossallowed'],'shu'],
-    				boss_chiyuzhuque:['male','shu',5,['boss_jiguan','boss_yuhuojg','boss_tianyun'],['jiangemech','hiddenboss','bossallowed'],'shu'],
-    				boss_fudibian:['male','wei',4,['boss_jiguan','boss_didongjg'],['jiangemech','hiddenboss','bossallowed'],'wei'],
-    				boss_tuntianchiwen:['male','wei',5,['boss_jiguan','boss_tanshi','boss_tunshi'],['jiangemech','hiddenboss','bossallowed'],'wei'],
-    				boss_shihuosuanni:['male','wei',3,['boss_jiguan','boss_lianyujg'],['jiangemech','hiddenboss','bossallowed'],'wei'],
-    				boss_lieshiyazi:['male','wei',4,['boss_jiguan','boss_nailuo'],['jiangemech','hiddenboss','bossallowed'],'wei'],
-    			};
+    			lib.characterPack.mode_versus=lib.jiangeboss;
     			lib.characterIntro.boss_liedixuande=lib.characterIntro.liubei;
     			lib.characterIntro.boss_gongshenyueying=lib.characterIntro.huangyueying;
     			lib.characterIntro.boss_tianhoukongming=lib.characterIntro.shen_zhugeliang;
@@ -3267,6 +3249,25 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     			ctx.stroke();
     		},
     	},
+        jiangeboss:{
+            boss_liedixuande:['male','shu',5,['boss_lingfeng','boss_jizhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
+            boss_gongshenyueying:['female','shu',4,['boss_gongshenjg','boss_jingmiao','boss_zhinang'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
+            boss_tianhoukongming:['male','shu',4,['boss_biantian','bazhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
+            boss_yuhuoshiyuan:['male','shu',4,['boss_yuhuojg','boss_qiwu','boss_tianyujg'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
+            boss_qiaokuijunyi:['male','wei',4,['boss_huodi','boss_jueji'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
+            boss_jiarenzidan:['male','wei',5,['boss_chiying','boss_jingfan'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
+            boss_duanyuzhongda:['male','wei',5,['boss_fanshi','boss_xuanlei','boss_skonghun'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
+            boss_juechenmiaocai:['male','wei',4,['boss_chuanyun','boss_leili','boss_fengxing'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
+
+            boss_jileibaihu:['male','shu',4,['boss_jiguan','boss_zhenwei','boss_benlei'],['jiangemech','hiddenboss','bossallowed'],'shu'],
+            boss_yunpingqinglong:['male','shu',4,['boss_jiguan','boss_mojianjg'],['jiangemech','hiddenboss','bossallowed'],'shu'],
+            boss_lingjiaxuanwu:['male','shu',5,['boss_jiguan','yizhong','boss_lingyu'],['jiangemech','hiddenboss','bossallowed'],'shu'],
+            boss_chiyuzhuque:['male','shu',5,['boss_jiguan','boss_yuhuojg','boss_tianyun'],['jiangemech','hiddenboss','bossallowed'],'shu'],
+            boss_fudibian:['male','wei',4,['boss_jiguan','boss_didongjg'],['jiangemech','hiddenboss','bossallowed'],'wei'],
+            boss_tuntianchiwen:['male','wei',5,['boss_jiguan','boss_tanshi','boss_tunshi'],['jiangemech','hiddenboss','bossallowed'],'wei'],
+            boss_shihuosuanni:['male','wei',3,['boss_jiguan','boss_lianyujg'],['jiangemech','hiddenboss','bossallowed'],'wei'],
+            boss_lieshiyazi:['male','wei',4,['boss_jiguan','boss_nailuo'],['jiangemech','hiddenboss','bossallowed'],'wei'],
+        },
     	cardsFour:[
     		["spade",7,"sha"],
     		["spade",8,"sha"],