diff --git a/character/shenhua.js b/character/shenhua.js index d820ead34..444e514ea 100644 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -3156,6 +3156,7 @@ character.shenhua={ tianxiang:'天香', hongyan:'红颜', buqu:'不屈', + buqu_bg:'创', leiji:'雷击', spleiji:'新雷击', guidao:'鬼道', diff --git a/game/asset.js b/game/asset.js index 3c9f88486..17f3c965d 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,12 +1,11 @@ window.noname_asset_list=[ - '1.8.3', + '1.8.4', 'image/background/huangtian_bg.jpg', 'image/background/shengshi_bg.jpg', 'image/background/xueji_bg.jpg', 'image/background/yinxiang_bg.jpg', 'image/background/zhulian_bg.jpg', 'image/background/zhulin_bg.jpg', - 'image/skin/caocao/1.jpg', 'image/card/spell_jingshenkongzhi.jpg', 'image/card/bagua.png', 'image/card/baiyin.png', @@ -2200,4 +2199,148 @@ window.noname_asset_list=[ 'theme/style/hp/image/hp2.png', 'theme/style/hp/image/hp3.png', 'theme/style/hp/image/hp4.png', -] +]; +window.noname_skin_list={ + bulianshu:4, + caifuren:2, + caiwenji:2, + caoang:2, + caocao:1, + caochong:1, + caohong:3, + caopi:4, + caoren:1, + caozhang:2, + caozhi:3, + chengong:1, + chengpu:1, + chenlin:3, + chenqun:2, + dengai:4, + dianwei:1, + diaochan:4, + dingfeng:3, + dongzhuo:3, + fazheng:1, + fuhuanghou:3, + fuwan:1, + ganfuren:1, + guanping:2, + guanyinping:2, + guanyu:1, + guanzhang:2, + guohuai:2, + guojia:1, + guyong:2, + handang:2, + hetaihou:2, + huangyueying:2, + huatuo:2, + jiangqin:1, + jiangwei:4, + jianyong:2, + jiaxu:4, + jsp_zhaoyun:1, + kongrong:1, + liaohua:2, + lingju:1, + lingtong:2, + liru:2, + liubei:1, + liubiao:2, + liufeng:3, + liushan:2, + liuxie:3, + lusu:2, + luxun:1, + lvbu:1, + machao:1, + madai:3, + maliang:1, + manchong:3, + mifuren:1, + pangde:2, + pangtong:2, + panzhangmazhong:2, + re_caocao:2, + re_daqiao:2, + re_ganning:2, + re_gongsunzan:1, + re_guanyu:1, + re_guojia:3, + re_huanggai:1, + re_lidian:2, + re_luxun:3, + re_lvbu:1, + re_lvmeng:2, + re_machao:1, + re_simayi:3, + re_xiahoudun:1, + re_xushu:3, + re_xuzhu:2, + re_zhangfei:1, + re_zhangliao:1, + re_zhaoyun:3, + re_zhouyu:3, + shen_caocao:1, + shen_lvbu:1, + shen_lvmeng:1, + sp_caiwenji:3, + sp_caoren:1, + sp_diaochan:2, + sp_jiangwei:1, + sp_machao:2, + sp_sunshangxiang:3, + sp_zhangjiao:1, + sp_zhaoyun:3, + sp_zhugeliang:1, + sunce:4, + sunjian:3, + sunluban:1, + sunquan:3, + sunshangxiang:3, + swd_yuxiaoxue:1, + taishici:1, + tianfeng:1, + wangyi:4, + weiyan:2, + wenpin:1, + wuguotai:3, + wuyi:2, + xiahouba:1, + xiahoudun:1, + xiahouyuan:1, + xiaoqiao:3, + xin_fazheng:2, + xin_xushu:1, + xuhuang:1, + xunyou:4, + xunyu:2, + xusheng:1, + xushu:1, + xuzhu:1, + yangxiu:2, + yj_jushou:2, + yuanshu:3, + yuanshu:4, + yuejin:3, + yufan:1, + yujin:1, + zhangbao:1, + zhangchunhua:4, + zhanghe:1, + zhangliao:2, + zhangsong:1, + zhangxingcai:2, + zhangzhang:2, + zhenji:3, + zhonghui:1, + zhoutai:1, + zhugedan:1, + zhugejin:3, + zhugeke:1, + zhugeliang:4, + zhuran:1, + zhurong:3, + zuoci:3 +}; diff --git a/game/game.js b/game/game.js index 800d890a8..06d85e5ef 100755 --- a/game/game.js +++ b/game/game.js @@ -52,9 +52,9 @@ var lib={ configprefix:'noname_0.9_', versionOL:6, - updateURL:localStorage.getItem('noname_download_source')||'http://123.206.77.253/', + updateURL:localStorage.getItem('noname_update_url')||'http://123.206.55.178/', assetURL:'', - hallURL:'123.206.77.253', + hallURL:'123.206.55.178', changeLog:[], updates:[], canvasUpdates:[], @@ -20671,10 +20671,11 @@ li3.innerHTML='更新源

'; li3.querySelector('button').onclick=function(){ lib.updateURL=this.previousSibling.value; - localStorage.setItem('noname_download_source',lib.updateURL); + localStorage.setItem('noname_update_url',lib.updateURL); } var button1,button2; + var span1,includeskin; game.checkForUpdate=function(forcecheck){ if(button1.disabled){ @@ -20807,13 +20808,22 @@ script.remove(); var updates=window.noname_asset_list; delete window.noname_asset_list; + var skins=window.noname_skin_list; + delete window.noname_skin_list; var asset_version=updates.shift(); - if(asset_version==lib.config.asset_version){ + if(asset_version==lib.config.asset_version&&lib.config.exclude_skin){ alert('素材已是最新'); button2.disabled=false; button2.innerHTML='检查素材更新'; return; } + if(!lib.config.exclude_skin){ + for(var i in skins){ + for(var j=0;j