diff --git a/character/extra.js b/character/extra.js index f166a50fd..1751fcbb6 100755 --- a/character/extra.js +++ b/character/extra.js @@ -1224,6 +1224,6 @@ character.extra={ shenfen:'神愤', shenfen_info:'限定技,出牌阶段,你可以弃置6枚暴怒标记,对场上所有其他角色造成一点伤害,然后令其弃置4张牌', wuqian:'无前', - wuqian_info:'出牌阶段,你可以弃置两枚暴怒标记并获得技能【无双】', + wuqian_info:'出牌阶段,你可以弃置两枚暴怒标记并获得技能【无双】直到回合结束', }, } diff --git a/character/hearth.js b/character/hearth.js index 971518468..149fe48df 100755 --- a/character/hearth.js +++ b/character/hearth.js @@ -2,18 +2,18 @@ character.hearth={ character:{ hs_jaina:['female','wei',3,['huopu','bianxing','bingjia']], - hs_lrexxar:['male','qun',4,['shoulie','gongji']], + hs_lrexxar:['male','shu',4,['shoulie','gongji']], hs_wuther:['male','qun',4,['fengxian','jieming']], - hs_jgarrosh:['male','qun',4,['zhanhou','qiangxi']], + hs_jgarrosh:['male','shu',4,['zhanhou','qiangxi']], hs_malfurion:['male','wu',4,['jihuo']], - hs_guldan:['male','qun',3,['fenliu','hongxi']], + hs_guldan:['male','wei',3,['fenliu','hongxi']], hs_anduin:['male','qun',3,['shengguang','shijie','anying']], hs_sthrall:['male','wu',4,['tuteng','guozai','zuling']], - hs_waleera:['female','qun',3,['jianren','mengun','wlianji']], + hs_waleera:['female','shu',3,['jianren','mengun','wlianji']], hs_medivh:['male','wei',3,['jingxiang','moying','mdzhoufu']], hs_alleria:['male','wu',3,['fengxing','qiaodong','liegong']], - hs_magni:['male','qun',4,['zhongjia','dunji']], + hs_magni:['male','shu',4,['zhongjia','dunji']], hs_neptulon:['male','wu',4,['liechao','qingliu']], hs_wvelen:['male','qun',3,['shengyan','xianzhi']], @@ -38,13 +38,13 @@ character.hearth={ hs_zhishigushu:['male','shu',4,['jiaohui']], hs_zhanzhenggushu:['male','wei',6,['biri']], hs_ronghejuren:['male','shu',8,['ronghuo']], - hs_shanlingjuren:['male','qun',8,['luoshi']], - hs_edwin:['male','qun',3,['lianzhan']], - hs_mijiaojisi:['female','qun',3,['kuixin']], + hs_shanlingjuren:['male','wu',8,['luoshi']], + hs_edwin:['male','wu',3,['lianzhan']], + hs_mijiaojisi:['female','wu',3,['kuixin']], hs_huzhixiannv:['female','wu',3,['jingmeng','qingliu']], - hs_tgolem:['male','qun',4,['xinwuyan','guozai']], + hs_tgolem:['male','wu',4,['xinwuyan','guozai']], hs_totemic:['male','wu',3,['s_tuteng']], - hs_xsylvanas:['female','qun',3,['busi','xshixin','xmojian']], + hs_xsylvanas:['female','wei',3,['busi','xshixin','xmojian']], hs_siwangzhiyi:['male','qun',12,['mieshi']], hs_bilanyoulong:['male','wei',4,['lingzhou']], hs_jinglinglong:['male','wu',3,['mianyi']], diff --git a/character/mountain.js b/character/mountain.js index 951e6c08d..9ddd865d0 100755 --- a/character/mountain.js +++ b/character/mountain.js @@ -46,7 +46,7 @@ character.mountain={ } }, zhiji:{ - skillAnimation:'true', + skillAnimation:true, audio:2, unique:true, trigger:{player:'phaseBegin'}, diff --git a/character/yxs.js b/character/yxs.js index 1711e18c2..5039ddde1 100755 --- a/character/yxs.js +++ b/character/yxs.js @@ -22,19 +22,19 @@ character.yxs={ yxs_luobinhan:['male','wu',4,['xiadao','lzhangyi']], yxs_chengjisihan:['male','qun',4,['mashu','qianglue']], yxs_mingchenghuanghou:['female','shu',3,['tiewan','chajue']], - yxs_wangzhaojun:['female','qun',3,['heqin','luoyan']], + yxs_wangzhaojun:['female','wei',3,['heqin','luoyan']], yxs_luocheng:['male','wu',4,['hanqiang','biaoqi']], yxs_direnjie:['male','wei',3,['shentan','kanpo']], yxs_sunwu:['male','wu',3,['bingsheng','taolue']], - yxs_chengyaojin:['male','qun',4,['sanbanfu']], - yxs_yuji:['female','qun',3,['sheshen','changnian']], - yxs_xiangyu:['male','qun',4,['wushuang','ciqiu']], + yxs_chengyaojin:['male','shu',4,['sanbanfu']], + yxs_yuji:['female','shu',3,['sheshen','changnian']], + yxs_xiangyu:['male','shu',4,['wushuang','ciqiu']], yxs_yingzheng:['male','qun',4,['jianxiong','batu']], yxs_yuefei:['male','qun',4,['longdan','wumu']], - yxs_fuermosi:['male','qun',3,['yanyi','jiean']], + yxs_fuermosi:['male','wei',3,['yanyi','jiean']], yxs_guiguzi:['male','qun',3,['baihe','yinyang','xiushen']], yxs_xiaoqiao:['female','wu',3,['chujia','zhijie']], - yxs_luzhishen:['male','qun',4,['dili','kuangchan']], + yxs_luzhishen:['male','wei',4,['dili','kuangchan']], }, skill:{ zhijie:{ diff --git a/game/game.js b/game/game.js index 45d0658e6..430016662 100755 --- a/game/game.js +++ b/game/game.js @@ -18,10 +18,12 @@ var lib={ version:1.76, changeLog:[ - '捉鬼bug修复', + 'bug修复(捉鬼、导出武将)', '配音支持引用文件名', '挑战模式可关闭单人控制', '不同模式可单独设置禁将、禁卡', + '自定义技能禁配', + '战棋对战选项', '炉石模式平衡调整' ], configprefix:'noname_0.9_', @@ -2019,16 +2021,16 @@ map.chess_character.show(); } if(config.chess_mode=='combat'){ - map.battle_number.show(); - map.chess_ordered.show(); - map.free_choose.show(); - map.change_choice.show(); + // map.battle_number.show(); + // map.chess_ordered.show(); + map.free_choose.show(); + map.change_choice.show(); } else{ - map.battle_number.hide(); - map.chess_ordered.hide(); - map.free_choose.hide(); - map.change_choice.hide(); + // map.battle_number.hide(); + // map.chess_ordered.hide(); + map.free_choose.hide(); + map.change_choice.hide(); } if(config.chess_mode=='tafang'){ map.chess_treasure.hide(); @@ -2120,25 +2122,25 @@ clear:true, frequent:true, }, - battle_number:{ - name:'对战人数', - init:'3', - frequent:true, - item:{ - '2':'2v2', - '3':'3v3', - '4':'4v4', - '6':'6v6', - '8':'8v8', - }, - onclick:function(num){ - game.saveConfig('battle_number',num,this._link.config.mode); - if(!_status.event.parent.showConfig&&!_status.event.showConfig) return; - if(_status.event.parent.changeDialog){ - _status.event.parent.changeDialog(); - } - }, - }, + // battle_number:{ + // name:'对战人数', + // init:'3', + // frequent:true, + // item:{ + // '2':'2v2', + // '3':'3v3', + // '4':'4v4', + // '6':'6v6', + // '8':'8v8', + // }, + // onclick:function(num){ + // game.saveConfig('battle_number',num,this._link.config.mode); + // if(!_status.event.parent.showConfig&&!_status.event.showConfig) return; + // if(_status.event.parent.changeDialog){ + // _status.event.parent.changeDialog(); + // } + // }, + // }, chess_treasure:{ name:'战场机关', init:'0.2', @@ -2172,11 +2174,11 @@ init:true, // frequent:true, }, - chess_ordered:{ - name:'交替行动', - init:true, - // frequent:true, - }, + // chess_ordered:{ + // name:'交替行动', + // init:true, + // // frequent:true, + // }, chess_character:{ name:'战棋武将', init:true, @@ -2403,6 +2405,8 @@ '每人在出牌阶段有一次移动的机会,可移动的最大距离为2