diff --git a/game/asset.js b/game/asset.js index 0d0ce7d8a..2ef0e611a 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - 'v1.10.6.1', + 'v1.10.6.2', /*audio start*/ 'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_online.mp3', @@ -530,6 +530,7 @@ window.noname_asset_list=[ 'audio/die/liuzhang.mp3', 'audio/die/liwan.mp3', 'audio/die/liyan.mp3', + 'audio/die/liyi.mp3', 'audio/die/liyixiejing.mp3', 'audio/die/longwang.mp3', 'audio/die/luboyan.mp3', @@ -578,6 +579,8 @@ window.noname_asset_list=[ 'audio/die/mifuren.mp3', 'audio/die/miheng.mp3', 'audio/die/mizhu.mp3', + 'audio/die/mp_liuling.mp3', + 'audio/die/muludawang.mp3', 'audio/die/mushun.mp3', 'audio/die/nanhualaoxian.mp3', 'audio/die/nashime.mp3', @@ -593,6 +596,7 @@ window.noname_asset_list=[ 'audio/die/ol_dengai.mp3', 'audio/die/ol_dengzhi.mp3', 'audio/die/ol_dianwei.mp3', + 'audio/die/ol_dingshangwan.mp3', 'audio/die/ol_dingyuan.mp3', 'audio/die/ol_dongzhao.mp3', 'audio/die/ol_dongzhuo.mp3', @@ -805,6 +809,7 @@ window.noname_asset_list=[ 'audio/die/ruanyu.mp3', 'audio/die/ruiji.mp3', 'audio/die/sb_caocao.mp3', + 'audio/die/sb_caopi.mp3', 'audio/die/sb_caoren.mp3', 'audio/die/sb_chengong.mp3', 'audio/die/sb_daqiao.mp3', @@ -989,6 +994,7 @@ window.noname_asset_list=[ 'audio/die/tw_dongzhao.mp3', 'audio/die/tw_fengxí.mp3', 'audio/die/tw_gexuan.mp3', + 'audio/die/tw_gongsunfan.mp3', 'audio/die/tw_haomeng.mp3', 'audio/die/tw_huchuquan.mp3', 'audio/die/tw_huojun.mp3', @@ -1011,6 +1017,7 @@ window.noname_asset_list=[ 'audio/die/tw_weixu.mp3', 'audio/die/tw_xiahouen.mp3', 'audio/die/tw_xiahoushang.mp3', + 'audio/die/tw_yangang.mp3', 'audio/die/tw_yanxiang.mp3', 'audio/die/tw_yufuluo.mp3', 'audio/die/tw_yujin.mp3', @@ -1074,12 +1081,16 @@ window.noname_asset_list=[ 'audio/die/wuyi.mp3', 'audio/die/xf_yiji.mp3', 'audio/die/xia_dianwei.mp3', + 'audio/die/xia_liubei.mp3', 'audio/die/xia_liyàn.mp3', 'audio/die/xia_lusu.mp3', 'audio/die/xia_tongyuan.mp3', 'audio/die/xia_wangyue.mp3', + 'audio/die/xia_xiahoudun.mp3', + 'audio/die/xia_xiahousone.mp3', 'audio/die/xia_xiahouzie.mp3', 'audio/die/xia_xushu.mp3', + 'audio/die/xia_zhangwei.mp3', 'audio/die/xia_zhaoe.mp3', 'audio/die/xiahouba.mp3', 'audio/die/xiahoudun.mp3', @@ -2074,6 +2085,7 @@ window.noname_asset_list=[ 'audio/skill/dcshizong2.mp3', 'audio/skill/dcshoutan1.mp3', 'audio/skill/dcshoutan2.mp3', + 'audio/skill/dcshouze.mp3', 'audio/skill/dcshuaijie1.mp3', 'audio/skill/dcshuaijie2.mp3', 'audio/skill/dcshuangjia1.mp3', @@ -3358,6 +3370,12 @@ window.noname_asset_list=[ 'audio/skill/mouzhu2.mp3', 'audio/skill/mozhi1.mp3', 'audio/skill/mozhi2.mp3', + 'audio/skill/mpbishi1.mp3', + 'audio/skill/mpbishi2.mp3', + 'audio/skill/mpjiusong1.mp3', + 'audio/skill/mpjiusong2.mp3', + 'audio/skill/mpmaotao1.mp3', + 'audio/skill/mpmaotao2.mp3', 'audio/skill/mubing1.mp3', 'audio/skill/mubing2.mp3', 'audio/skill/mumu1.mp3', @@ -3453,6 +3471,8 @@ window.noname_asset_list=[ 'audio/skill/olbihun2.mp3', 'audio/skill/olbixin1.mp3', 'audio/skill/olbixin2.mp3', + 'audio/skill/olchanshuang1.mp3', + 'audio/skill/olchanshuang2.mp3', 'audio/skill/olchenglie1.mp3', 'audio/skill/olchenglie2.mp3', 'audio/skill/olchenshuo1.mp3', @@ -3493,8 +3513,12 @@ window.noname_asset_list=[ 'audio/skill/olfeibai2.mp3', 'audio/skill/olfengji1.mp3', 'audio/skill/olfengji2.mp3', + 'audio/skill/olfengyan1.mp3', + 'audio/skill/olfengyan2.mp3', 'audio/skill/olfengzi1.mp3', 'audio/skill/olfengzi2.mp3', + 'audio/skill/olfudao1.mp3', + 'audio/skill/olfudao2.mp3', 'audio/skill/olfushi1.mp3', 'audio/skill/olfushi2.mp3', 'audio/skill/olfusong1.mp3', @@ -3630,6 +3654,8 @@ window.noname_asset_list=[ 'audio/skill/olzenrun2.mp3', 'audio/skill/olzeyue1.mp3', 'audio/skill/olzeyue2.mp3', + 'audio/skill/olzhanjin1.mp3', + 'audio/skill/olzhanjin2.mp3', 'audio/skill/olzhenying1.mp3', 'audio/skill/olzhenying2.mp3', 'audio/skill/olzhiba1.mp3', @@ -4250,6 +4276,8 @@ window.noname_asset_list=[ 'audio/skill/sbduojing2.mp3', 'audio/skill/sbenyuan1.mp3', 'audio/skill/sbenyuan2.mp3', + 'audio/skill/sbfangzhu1.mp3', + 'audio/skill/sbfangzhu2.mp3', 'audio/skill/sbfanjian1.mp3', 'audio/skill/sbfanjian2.mp3', 'audio/skill/sbfenwei1.mp3', @@ -4346,6 +4374,8 @@ window.noname_asset_list=[ 'audio/skill/sbrende3.mp3', 'audio/skill/sbshipo1.mp3', 'audio/skill/sbshipo2.mp3', + 'audio/skill/sbsongwei1.mp3', + 'audio/skill/sbsongwei2.mp3', 'audio/skill/sbtianxiang1.mp3', 'audio/skill/sbtianxiang2.mp3', 'audio/skill/sbtiaoxin1.mp3', @@ -4366,6 +4396,8 @@ window.noname_asset_list=[ 'audio/skill/sbxieji1.mp3', 'audio/skill/sbxieji2.mp3', 'audio/skill/sbxieji3.mp3', + 'audio/skill/sbxingshang1.mp3', + 'audio/skill/sbxingshang2.mp3', 'audio/skill/sbxuanhuo1.mp3', 'audio/skill/sbxuanhuo2.mp3', 'audio/skill/sbxueyi1.mp3', @@ -4543,6 +4575,8 @@ window.noname_asset_list=[ 'audio/skill/shizhan2.mp3', 'audio/skill/shoucheng1.mp3', 'audio/skill/shoucheng2.mp3', + 'audio/skill/shoufa1.mp3', + 'audio/skill/shoufa2.mp3', 'audio/skill/shouli1.mp3', 'audio/skill/shouli2.mp3', 'audio/skill/shoulijian.mp3', @@ -4874,6 +4908,8 @@ window.noname_asset_list=[ 'audio/skill/twchaofeng1.mp3', 'audio/skill/twchaofeng2.mp3', 'audio/skill/twchayi1.mp3', + 'audio/skill/twchengxi1.mp3', + 'audio/skill/twchengxi2.mp3', 'audio/skill/twchongqi1.mp3', 'audio/skill/twchongqi2.mp3', 'audio/skill/twchuanshu1.mp3', @@ -4882,6 +4918,8 @@ window.noname_asset_list=[ 'audio/skill/twchungang2.mp3', 'audio/skill/twdanfa1.mp3', 'audio/skill/twdanfa2.mp3', + 'audio/skill/twdanlie1.mp3', + 'audio/skill/twdanlie2.mp3', 'audio/skill/twdianyi1.mp3', 'audio/skill/twdianyi2.mp3', 'audio/skill/twdingzhen1.mp3', @@ -4892,6 +4930,8 @@ window.noname_asset_list=[ 'audio/skill/twfeifu2.mp3', 'audio/skill/twfengji1.mp3', 'audio/skill/twfengji2.mp3', + 'audio/skill/twfenwang1.mp3', + 'audio/skill/twfenwang2.mp3', 'audio/skill/twfenwu1.mp3', 'audio/skill/twfenwu2.mp3', 'audio/skill/twfucuan1.mp3', @@ -4910,6 +4950,10 @@ window.noname_asset_list=[ 'audio/skill/twgongge3.mp3', 'audio/skill/twhanyu1.mp3', 'audio/skill/twhanyu2.mp3', + 'audio/skill/twhuiyuan1.mp3', + 'audio/skill/twhuiyuan2.mp3', + 'audio/skill/twhuzhong1.mp3', + 'audio/skill/twhuzhong2.mp3', 'audio/skill/twjiange1.mp3', 'audio/skill/twjiange2.mp3', 'audio/skill/twjianming1.mp3', @@ -4932,6 +4976,8 @@ window.noname_asset_list=[ 'audio/skill/twjingce2.mp3', 'audio/skill/twjuchen1.mp3', 'audio/skill/twjuchen2.mp3', + 'audio/skill/twjuezhu1.mp3', + 'audio/skill/twjuezhu2.mp3', 'audio/skill/twjuntun1.mp3', 'audio/skill/twjuntun2.mp3', 'audio/skill/twkaiji1.mp3', @@ -4983,6 +5029,8 @@ window.noname_asset_list=[ 'audio/skill/twruilian2.mp3', 'audio/skill/twshanghe1.mp3', 'audio/skill/twshanghe2.mp3', + 'audio/skill/twshenyi1.mp3', + 'audio/skill/twshenyi2.mp3', 'audio/skill/twshepan1.mp3', 'audio/skill/twshepan2.mp3', 'audio/skill/twshexhong1.mp3', @@ -4991,6 +5039,8 @@ window.noname_asset_list=[ 'audio/skill/twshezhong2.mp3', 'audio/skill/twshigong1.mp3', 'audio/skill/twshigong2.mp3', + 'audio/skill/twshoushou1.mp3', + 'audio/skill/twshoushou2.mp3', 'audio/skill/twsidai1.mp3', 'audio/skill/twsidai2.mp3', 'audio/skill/twsidao1.mp3', @@ -5008,10 +5058,14 @@ window.noname_asset_list=[ 'audio/skill/twwuhun2.mp3', 'audio/skill/twxiafeng1.mp3', 'audio/skill/twxiafeng2.mp3', + 'audio/skill/twxianfeng1.mp3', + 'audio/skill/twxianfeng2.mp3', 'audio/skill/twxiawang1.mp3', 'audio/skill/twxiawang2.mp3', 'audio/skill/twxiawei1.mp3', 'audio/skill/twxiawei2.mp3', + 'audio/skill/twxinghan1.mp3', + 'audio/skill/twxinghan2.mp3', 'audio/skill/twxingzhui1.mp3', 'audio/skill/twxingzhui2.mp3', 'audio/skill/twxiongjun1.mp3', @@ -5055,6 +5109,8 @@ window.noname_asset_list=[ 'audio/skill/twzhian2.mp3', 'audio/skill/twzhiji1.mp3', 'audio/skill/twzhiji2.mp3', + 'audio/skill/twzhiqu1.mp3', + 'audio/skill/twzhiqu2.mp3', 'audio/skill/twzhongchi1.mp3', 'audio/skill/twzhongchi2.mp3', 'audio/skill/twzhuidu1.mp3', @@ -5817,6 +5873,7 @@ window.noname_asset_list=[ 'audio/skill/yuri_xingdong3.mp3', 'audio/skill/yusui1.mp3', 'audio/skill/yusui2.mp3', + 'audio/skill/yuxiang.mp3', 'audio/skill/yuxu1.mp3', 'audio/skill/yuxu2.mp3', 'audio/skill/yuyan1.mp3', @@ -5976,6 +6033,8 @@ window.noname_asset_list=[ 'audio/skill/zhongzuo2.mp3', 'audio/skill/zhoufu1.mp3', 'audio/skill/zhoufu2.mp3', + 'audio/skill/zhoulin1.mp3', + 'audio/skill/zhoulin2.mp3', 'audio/skill/zhouxian1.mp3', 'audio/skill/zhouxian2.mp3', 'audio/skill/zhouxuan1.mp3', @@ -7433,6 +7492,7 @@ window.noname_asset_list=[ 'image/character/liwan.jpg', 'image/character/liwei.jpg', 'image/character/liyan.jpg', + 'image/character/liyi.jpg', 'image/character/liyixiejing.jpg', 'image/character/longwang.jpg', 'image/character/longyufei.jpg', diff --git a/game/update.js b/game/update.js index 4be954e40..870accac0 100644 --- a/game/update.js +++ b/game/update.js @@ -1,41 +1,61 @@ window.noname_update={ - version:'1.10.6.1', - update:'1.10.6', + version:'1.10.6.2', + update:'1.10.6.1', changeLog:[ - '整合@mengxinzxz @PZ157 @universe-st @Ansolve @Rintim @nonameShijian @copcap @kuangshen04 的Pull Request', - '《江山如故·合》武将包', + '整合@Curpond @PZ157 @copcap @nonameShijian @Tipx-L @universe-st @kuangshen04 @mengxinzxz @Rintim @tangXins 的Pull Request', '其他AI优化与bug修复', ], files:[ + 'card/extra.js', + 'card/guozhan.js', 'card/standard.js', 'card/yongjian.js', + 'character/clan.js', + 'character/collab.js', + 'character/ddd.js', + 'character/diy.js', 'character/extra.js', + 'character/gujian.js', + 'character/gwent.js', + 'character/hearth.js', 'character/huicui.js', + 'character/jiange.js', 'character/jsrg.js', 'character/mobile.js', + 'character/mtg.js', 'character/offline.js', + 'character/old.js', + 'character/onlyOL.js', + 'character/ow.js', 'character/rank.js', 'character/refresh.js', 'character/sb.js', 'character/shenhua.js', + 'character/shiji.js', 'character/sp.js', 'character/sp2.js', 'character/standard.js', + 'character/swd.js', 'character/tw.js', + 'character/xiake.js', 'character/xianding.js', + 'character/xianjian.js', + 'character/xinghuoliaoyuan.js', + 'character/yijiang.js', + 'character/yingbian.js', + 'character/yxs.js', + 'character/zhuogui.js', + 'game/entry.js', 'game/game.js', - 'game/source.js', + 'game/keyWords.js', - 'mode/boss.js', - - 'noname.js', + 'mode/guozhan.js', 'noname/game/index.js', 'noname/get/index.js', - 'noname/get/is.js', 'noname/init/cordova.js', 'noname/init/import.js', @@ -43,14 +63,13 @@ window.noname_update={ 'noname/library/index.js', + 'noname/library/element/card.js', 'noname/library/element/content.js', - 'noname/library/element/gameEvent.js', 'noname/library/element/gameEventPromise.js', - 'noname/library/element/vcard.js', + 'noname/library/element/player.js', - 'noname/ui/index.js', + 'noname/util/index.js', 'noname/util/struct/promise-error-handler/chrome.js', - 'noname/util/struct/promise-error-handler/unknown.js', ] };