diff --git a/game/asset.js b/game/asset.js index f28592485..3ed1953a6 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - 'v1.10.7.1', + 'v1.10.8', /*audio start*/ 'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_online.mp3', @@ -181,6 +181,7 @@ window.noname_asset_list=[ /*dieaudio begin*/ 'audio/die/ahuinan.mp3', + 'audio/die/bailingyun.mp3', 'audio/die/baosanniang.mp3', 'audio/die/beimihu.mp3', 'audio/die/bianfuren.mp3', @@ -286,6 +287,7 @@ window.noname_asset_list=[ 'audio/die/dc_jiling.mp3', 'audio/die/dc_liru.mp3', 'audio/die/dc_liuba.mp3', + 'audio/die/dc_liuli.mp3', 'audio/die/dc_liuye.mp3', 'audio/die/dc_liuyu.mp3', 'audio/die/dc_luotong.mp3', @@ -475,17 +477,6 @@ window.noname_asset_list=[ 'audio/die/jsp_caoren.mp3', 'audio/die/jsp_guanyu.mp3', 'audio/die/jsp_huangyueying.mp3', - 'audio/die/jsrg_gaoxiang.mp3', - 'audio/die/jsrg_guozhao.mp3', - 'audio/die/jsrg_jiangwei.mp3', - 'audio/die/jsrg_liuyong.mp3', - 'audio/die/jsrg_luxun.mp3', - 'audio/die/jsrg_simayi.mp3', - 'audio/die/jsrg_sunlubansunluyu.mp3', - 'audio/die/jsrg_weiwenzhugezhi.mp3', - 'audio/die/jsrg_zhangxuan.mp3', - 'audio/die/jsrg_zhaoyun.mp3', - 'audio/die/jsrg_zhugeliang.mp3', 'audio/die/kanze.mp3', 'audio/die/kebineng.mp3', 'audio/die/key_abyusa.mp3', @@ -886,6 +877,7 @@ window.noname_asset_list=[ 'audio/die/shen_sunquan.mp3', 'audio/die/shen_taishici.mp3', 'audio/die/shen_xunyu.mp3', + 'audio/die/shen_xuzhu.mp3', 'audio/die/shen_zhangfei.mp3', 'audio/die/shen_zhangjiao.mp3', 'audio/die/shen_zhangliao.mp3', @@ -1309,6 +1301,7 @@ window.noname_asset_list=[ 'audio/die/zhugejin.mp3', 'audio/die/zhugeke.mp3', 'audio/die/zhugeliang.mp3', + 'audio/die/zhugemengxue.mp3', 'audio/die/zhugeruoxue.mp3', 'audio/die/zhugeshang.mp3', 'audio/die/zhugezhan.mp3', @@ -1848,6 +1841,8 @@ window.noname_asset_list=[ 'audio/skill/dcdanyi2.mp3', 'audio/skill/dcdanying1.mp3', 'audio/skill/dcdanying2.mp3', + 'audio/skill/dcdehua1.mp3', + 'audio/skill/dcdehua2.mp3', 'audio/skill/dcdeshao1.mp3', 'audio/skill/dcdeshao2.mp3', 'audio/skill/dcdeshi1.mp3', @@ -1878,6 +1873,8 @@ window.noname_asset_list=[ 'audio/skill/dcfozong2.mp3', 'audio/skill/dcfudao1.mp3', 'audio/skill/dcfudao2.mp3', + 'audio/skill/dcfuli1.mp3', + 'audio/skill/dcfuli2.mp3', 'audio/skill/dcfumou1.mp3', 'audio/skill/dcfumou2.mp3', 'audio/skill/dcfuning1.mp3', @@ -1894,6 +1891,8 @@ window.noname_asset_list=[ 'audio/skill/dcgue2.mp3', 'audio/skill/dcgusuan1.mp3', 'audio/skill/dcgusuan2.mp3', + 'audio/skill/dchanying1.mp3', + 'audio/skill/dchanying2.mp3', 'audio/skill/dchaochong1.mp3', 'audio/skill/dchaochong2.mp3', 'audio/skill/dchuace1.mp3', @@ -1924,6 +1923,8 @@ window.noname_asset_list=[ 'audio/skill/dcjiaofeng2.mp3', 'audio/skill/dcjiaoxia1.mp3', 'audio/skill/dcjiaoxia2.mp3', + 'audio/skill/dcjichun1.mp3', + 'audio/skill/dcjichun2.mp3', 'audio/skill/dcjieling1.mp3', 'audio/skill/dcjieling2.mp3', 'audio/skill/dcjieshu1.mp3', @@ -1978,6 +1979,8 @@ window.noname_asset_list=[ 'audio/skill/dcligong2.mp3', 'audio/skill/dclingfang1.mp3', 'audio/skill/dclingfang2.mp3', + 'audio/skill/dclinghui1.mp3', + 'audio/skill/dclinghui2.mp3', 'audio/skill/dclingkong1.mp3', 'audio/skill/dclingkong2.mp3', 'audio/skill/dclingxi1.mp3', @@ -2171,6 +2174,8 @@ window.noname_asset_list=[ 'audio/skill/dcwumei2.mp3', 'audio/skill/dcwuyuan1.mp3', 'audio/skill/dcwuyuan2.mp3', + 'audio/skill/dcxiace1.mp3', + 'audio/skill/dcxiace2.mp3', 'audio/skill/dcxialei1.mp3', 'audio/skill/dcxialei2.mp3', 'audio/skill/dcxiangmian1.mp3', @@ -2239,6 +2244,8 @@ window.noname_asset_list=[ 'audio/skill/dcyuanmo2.mp3', 'audio/skill/dcyuguan1.mp3', 'audio/skill/dcyuguan2.mp3', + 'audio/skill/dcyuxin1.mp3', + 'audio/skill/dcyuxin2.mp3', 'audio/skill/dczecai1.mp3', 'audio/skill/dczecai2.mp3', 'audio/skill/dczhangcai1.mp3', @@ -2759,6 +2766,10 @@ window.noname_asset_list=[ 'audio/skill/huaiyuan2.mp3', 'audio/skill/huamu1.mp3', 'audio/skill/huamu2.mp3', + 'audio/skill/huamu3.mp3', + 'audio/skill/huamu4.mp3', + 'audio/skill/huamu5.mp3', + 'audio/skill/huamu6.mp3', 'audio/skill/huangjintianbingfu1.mp3', 'audio/skill/huangjintianbingfu2.mp3', 'audio/skill/huangkong1.mp3', @@ -3024,52 +3035,6 @@ window.noname_asset_list=[ 'audio/skill/jizhi2.mp3', 'audio/skill/jspdanqi1.mp3', 'audio/skill/jspdanqi2.mp3', - 'audio/skill/jsrgchiying1.mp3', - 'audio/skill/jsrgchiying2.mp3', - 'audio/skill/jsrgchushi1.mp3', - 'audio/skill/jsrgchushi2.mp3', - 'audio/skill/jsrgdailao1.mp3', - 'audio/skill/jsrgdailao2.mp3', - 'audio/skill/jsrgdaimou1.mp3', - 'audio/skill/jsrgdaimou2.mp3', - 'audio/skill/jsrgdanxin1.mp3', - 'audio/skill/jsrgdanxin2.mp3', - 'audio/skill/jsrgfangjie1.mp3', - 'audio/skill/jsrgfangjie2.mp3', - 'audio/skill/jsrgfengxiang1.mp3', - 'audio/skill/jsrgfengxiang2.mp3', - 'audio/skill/jsrgfuhai1.mp3', - 'audio/skill/jsrgfuhai2.mp3', - 'audio/skill/jsrgfumou1.mp3', - 'audio/skill/jsrgfumou2.mp3', - 'audio/skill/jsrgjinfa1.mp3', - 'audio/skill/jsrgjinfa2.mp3', - 'audio/skill/jsrglonglin1.mp3', - 'audio/skill/jsrglonglin2.mp3', - 'audio/skill/jsrgpianchong1.mp3', - 'audio/skill/jsrgpianchong2.mp3', - 'audio/skill/jsrgshezeng1.mp3', - 'audio/skill/jsrgshezeng2.mp3', - 'audio/skill/jsrgtongli1.mp3', - 'audio/skill/jsrgtongli2.mp3', - 'audio/skill/jsrgtuigu1.mp3', - 'audio/skill/jsrgtuigu2.mp3', - 'audio/skill/jsrgwentian1.mp3', - 'audio/skill/jsrgwentian2.mp3', - 'audio/skill/jsrgxuanfeng1.mp3', - 'audio/skill/jsrgxuanfeng2.mp3', - 'audio/skill/jsrgyingshi1.mp3', - 'audio/skill/jsrgyingshi2.mp3', - 'audio/skill/jsrgyinlve1.mp3', - 'audio/skill/jsrgyinlve2.mp3', - 'audio/skill/jsrgyoujin1.mp3', - 'audio/skill/jsrgyoujin2.mp3', - 'audio/skill/jsrgzhendan1.mp3', - 'audio/skill/jsrgzhendan2.mp3', - 'audio/skill/jsrgzhubei1.mp3', - 'audio/skill/jsrgzhubei2.mp3', - 'audio/skill/jsrgzunwei1.mp3', - 'audio/skill/jsrgzunwei2.mp3', 'audio/skill/juanjia1.mp3', 'audio/skill/juanjia2.mp3', 'audio/skill/jubao1.mp3', @@ -6071,6 +6036,8 @@ window.noname_asset_list=[ 'audio/skill/zhengjing2.mp3', 'audio/skill/zhengnan1.mp3', 'audio/skill/zhengnan2.mp3', + 'audio/skill/zhengqing1.mp3', + 'audio/skill/zhengqing2.mp3', 'audio/skill/zhenlie_re_wangyi1.mp3', 'audio/skill/zhenlie_re_wangyi2.mp3', 'audio/skill/zhenlie1.mp3', @@ -6162,6 +6129,8 @@ window.noname_asset_list=[ 'audio/skill/zhuandui2.mp3', 'audio/skill/zhuangdan1.mp3', 'audio/skill/zhuangdan2.mp3', + 'audio/skill/zhuangpo1.mp3', + 'audio/skill/zhuangpo2.mp3', 'audio/skill/zhuangrong1.mp3', 'audio/skill/zhuangrong2.mp3', 'audio/skill/zhuangshu1.mp3', @@ -6821,6 +6790,7 @@ window.noname_asset_list=[ /*character image begin*/ 'image/character/ahuinan.jpg', + 'image/character/bailingyun.jpg', 'image/character/baiwuchang.jpg', 'image/character/baosanniang.jpg', 'image/character/baoxin.jpg', @@ -6934,6 +6904,7 @@ window.noname_asset_list=[ 'image/character/dc_liru.jpg', 'image/character/dc_liuba.jpg', 'image/character/dc_liubei.jpg', + 'image/character/dc_liuli.jpg', 'image/character/dc_liuye.jpg', 'image/character/dc_liuyu.jpg', 'image/character/dc_luotong.jpg', @@ -7481,6 +7452,7 @@ window.noname_asset_list=[ 'image/character/junk_simayi.jpg', 'image/character/junk_sunquan.jpg', 'image/character/junk_xuyou.jpg', + 'image/character/junk_zhangjiao.jpg', 'image/character/junk_zhangrang.jpg', 'image/character/kaisa.jpg', 'image/character/kanze.jpg', @@ -8217,6 +8189,7 @@ window.noname_asset_list=[ 'image/character/shen_sunquan.jpg', 'image/character/shen_taishici.jpg', 'image/character/shen_xunyu.jpg', + 'image/character/shen_xuzhu.jpg', 'image/character/shen_zhangfei.jpg', 'image/character/shen_zhangjiao.jpg', 'image/character/shen_zhangliao.jpg', diff --git a/game/source.js b/game/source.js index 238aa4e7f..36938a3b9 100644 --- a/game/source.js +++ b/game/source.js @@ -2,7 +2,7 @@ window.noname_source_list=[ 'LICENSE', 'noname.js', 'service-worker.js', - + 'noname/ai/basic.js', 'noname/ai/index.js', 'noname/game/index.js', @@ -25,8 +25,8 @@ window.noname_source_list=[ 'noname/library/announce/index.js', 'noname/library/cache/cacheContext.js', 'noname/library/cache/childNodesWatcher.js', - 'noname/library/crypt/md5.js', 'noname/library/channel/index.js', + 'noname/library/crypt/md5.js', 'noname/library/element/button.js', 'noname/library/element/card.js', 'noname/library/element/client.js', @@ -46,6 +46,15 @@ window.noname_source_list=[ 'noname/library/init/promises.js', 'noname/status/index.js', 'noname/ui/index.js', + 'noname/ui/click/index.js', + 'noname/ui/create/index.js', + 'noname/ui/create/menu/index.js', + 'noname/ui/create/menu/pages/cardPackMenu.js', + 'noname/ui/create/menu/pages/characterPackMenu.js', + 'noname/ui/create/menu/pages/exetensionMenu.js', + 'noname/ui/create/menu/pages/optionsMenu.js', + 'noname/ui/create/menu/pages/otherMenu.js', + 'noname/ui/create/menu/pages/startMenu.js', 'noname/util/browser.js', 'noname/util/config.js', 'noname/util/index.js', diff --git a/game/update.js b/game/update.js index ea9cf8ef0..5492fcd73 100644 --- a/game/update.js +++ b/game/update.js @@ -1,28 +1,26 @@ window.noname_update={ - version:'1.10.7.1', - update:'1.10.7', + version:'1.10.8', + update:'1.10.7.1', changeLog:[ - '整合@PZ157 @nonameShijian @copcap @mengxinzxz @lieren2023 @kuangshen04 @universe-st 的Pull Request', - 'OL族吴乔、谋关羽；手杀谋荀彧；海外服侠关羽、石韬、史阿、玉真子', + '整合@mengxinzxz @Rintim @universe-st @nonameShijian @kuangshen04 @copcap @lieren2023 @7754496 的Pull Request', + '“获得技能时/失去技能时”的新时机', '其他AI优化与bug修复', ], files:[ - 'card/guozhan.js', - 'card/standard.js', - 'card/yongjian.js', + 'card/swd.js', + 'card/yunchou.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/jsrg.js', 'character/mobile.js', 'character/offline.js', + 'character/old.js', 'character/onlyOL.js', 'character/rank.js', 'character/refresh.js', @@ -40,43 +38,44 @@ window.noname_update={ 'game/entry.js', 'game/game.js', - 'game/pinyinjs.js', - 'mode/doudizhu.js', + 'mode/boss.js', 'mode/guozhan.js', 'mode/identity.js', 'mode/versus.js', - 'noname/ai/basic.js', - 'noname/game/index.js', - 'noname/game/promises.js', 'noname/get/index.js', + 'noname/init/cordova.js', 'noname/init/import.js', 'noname/init/index.js', - 'noname/init/polyfill.js', + 'noname/init/onload.js', 'noname/library/index.js', - 'noname/library/cache/cacheContext.js', - - 'noname/library/element/button.js', 'noname/library/element/card.js', 'noname/library/element/content.js', - 'noname/library/element/contents.js', - 'noname/library/element/control.js', - 'noname/library/element/dialog.js', 'noname/library/element/gameEvent.js', - 'noname/library/element/gameEventPromise.js', 'noname/library/element/player.js', 'noname/library/init/index.js', 'noname/ui/index.js', - 'noname/util/index.js', + 'noname/ui/click/index.js', + + 'noname/ui/create/index.js', + + 'noname/ui/create/menu/index.js', + + 'noname/ui/create/menu/pages/cardPackMenu.js', + 'noname/ui/create/menu/pages/characterPackMenu.js', + 'noname/ui/create/menu/pages/extensionMenu.js', + 'noname/ui/create/menu/pages/optionsMenu.js', + 'noname/ui/create/menu/pages/otherMenu.js', + 'noname/ui/create/menu/pages/startMenu.js', 'service-worker.js', ]