diff --git a/character/rank.js b/character/rank.js index 787645bcd..86bb4964d 100644 --- a/character/rank.js +++ b/character/rank.js @@ -84,7 +84,6 @@ window.characterRank={ 'swd_wangsiyue', 'swd_lanyin', 'swd_hengai', - 'jg_liubei', 're_huangyueying', 'hs_bchillmaw', 'shen_zhugeliang', @@ -185,8 +184,6 @@ window.characterRank={ 're_luxun', 'pal_hanlingsha', 'hs_jaina', - 'jg_xiahouyuan', - 'jg_pangtong', 'diy_liuyan', 'diy_zhouyu', 'shen_zhouyu', @@ -207,7 +204,6 @@ window.characterRank={ 'caifuren', 'yj_jushou', 'hs_siwangzhiyi', - 'jg_huangyueying', 'hs_bilanyoulong', 'yxs_direnjie', 'yxs_sunwu', @@ -291,10 +287,8 @@ window.characterRank={ 'gjqt_hongyu', 'gjqt_wenrenyu', 'shen_zhaoyun', - 'jg_caozhen', 'swd_shangzhang', 'swd_situqiang', - 'jg_zhanghe', 'hs_mijiaojisi', 'hs_malfurion', 'swd_haidapang', @@ -404,8 +398,6 @@ window.characterRank={ 're_guojia', 'ganfuren', 'hs_huzhixiannv', - 'jg_simayi', - 'jg_zhugeliang', 'sp_sunshangxiang', 're_lidian', 'jiangqing', diff --git a/game/asset.js b/game/asset.js index faef8aa85..495965d1e 100644 --- a/game/asset.js +++ b/game/asset.js @@ -30,8 +30,6 @@ window.noname_asset_list=[ 'image/card/donghuangzhong.png', 'image/card/du.png', 'image/card/dujian.png', - 'image/card/dujian1.png', - 'image/card/dujian2.png', 'image/card/dunpaigedang.png', 'image/card/fangtian.png', 'image/card/fengxueren.png', @@ -39,7 +37,6 @@ window.noname_asset_list=[ 'image/card/fudichouxin.png', 'image/card/fulingbing.png', 'image/card/fuxiqin.png', - 'image/card/fuxiqin2.png', 'image/card/gouhunluo.png', 'image/card/guanshi.png', 'image/card/guangshatianyi.png', @@ -380,14 +377,6 @@ window.noname_asset_list=[ 'image/character/huangzhong.jpg', 'image/character/huatuo.jpg', 'image/character/huaxiong.jpg', - 'image/character/jg_caozhen.jpg', - 'image/character/jg_huangyueying.jpg', - 'image/character/jg_liubei.jpg', - 'image/character/jg_pangtong.jpg', - 'image/character/jg_simayi.jpg', - 'image/character/jg_xiahouyuan.jpg', - 'image/character/jg_zhanghe.jpg', - 'image/character/jg_zhugeliang.jpg', 'image/character/jiangfei.jpg', 'image/character/jiangqing.jpg', 'image/character/jiangwei.jpg', @@ -670,11 +659,6 @@ window.noname_asset_list=[ 'image/character/xin_xushu.jpg', 'image/character/xin_yuji.jpg', 'image/character/xin_yujin.jpg', - 'image/character/xk_dongfangweiming.jpg', - 'image/character/xk_fujianhan.jpg', - 'image/character/xk_guyuexuan.jpg', - 'image/character/xk_jinji.jpg', - 'image/character/xk_shenxiangyun.jpg', 'image/character/xuhuang.jpg', 'image/character/xunyou.jpg', 'image/character/xunyu.jpg', diff --git a/game/config.js b/game/config.js index cfa1d1c33..eda400638 100644 --- a/game/config.js +++ b/game/config.js @@ -25,7 +25,7 @@ window.config={ }, forbidchess:['hetaihou','swd_kangnalishi'], forbidboss:['caiwenji','gjqt_aruan','pal_xuanxiao','swd_hupo'], - forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','jg_simayi','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'], + forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'], all:{ diymode:['stone','chess','boss','tafang'], diycharacter:['diy','yxs','hearth','swd','gujian','xianjian','boss','ow'], diff --git a/game/game.js b/game/game.js index 7a5a9bb01..0a9fcb51d 100644 --- a/game/game.js +++ b/game/game.js @@ -16888,7 +16888,9 @@ else{ current2=current; } - game.print(current); + if(!lib.config.dev){ + game.print(current.slice(current.lastIndexOf('/')+1)); + } game.download(current,current2,function(){ if(onsuccess) onsuccess(list.length); download(); @@ -25556,6 +25558,7 @@ var button=document.createElement('button'); button.innerHTML='重新启动'; button.onclick=game.reload; + button.style.marginTop='8px'; p.appendChild(button); } game.multiDownload(updates,function(){ @@ -25718,6 +25721,9 @@ skipcard=skipcard.concat(pack); } } + if(lib.cardPack.mode_derivation){ + skipcard=skipcard.concat(lib.cardPack.mode_derivation); + } } for(var i=0;i