diff --git a/game/asset.js b/game/asset.js index ee46b181c..22bb9c7fb 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,8 +1,7 @@ window.noname_asset_list=[ - '1.9.94', + '1.9.93.4.1', 'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_online.mp3', - 'audio/background/aozhan_rewrite.mp3', 'audio/background/music_danji.mp3', 'audio/background/music_default.mp3', 'audio/background/music_diaochan.mp3', @@ -11,20 +10,6 @@ window.noname_asset_list=[ 'audio/background/music_jilve.mp3', 'audio/card/default.mp3', - 'audio/card/female/caomu.mp3', - 'audio/card/female/chiling.mp3', - 'audio/card/female/diaohulishan.mp3', - 'audio/card/female/fulei.mp3', - 'audio/card/female/huoshaolianying.mp3', - 'audio/card/female/jinchan.mp3', - 'audio/card/female/lianjunshengyan.mp3', - 'audio/card/female/lulitongxin.mp3', - 'audio/card/female/qijia.mp3', - 'audio/card/female/shengdong.mp3', - 'audio/card/female/shuiyanqijun.mp3', - 'audio/card/female/xietianzi.mp3', - 'audio/card/female/zengbin.mp3', - 'audio/card/female/bagua.mp3', 'audio/card/female/baiyin.mp3', 'audio/card/female/chitu.mp3', @@ -75,20 +60,6 @@ window.noname_asset_list=[ 'audio/card/female/yuanjiao.mp3', 'audio/card/female/zhibi.mp3', - 'audio/card/male/caomu.mp3', - 'audio/card/male/chiling.mp3', - 'audio/card/male/diaohulishan.mp3', - 'audio/card/male/fulei.mp3', - 'audio/card/male/huoshaolianying.mp3', - 'audio/card/male/jinchan.mp3', - 'audio/card/male/lianjunshengyan.mp3', - 'audio/card/male/lulitongxin.mp3', - 'audio/card/male/qijia.mp3', - 'audio/card/male/shengdong.mp3', - 'audio/card/male/shuiyanqijun.mp3', - 'audio/card/male/xietianzi.mp3', - 'audio/card/male/zengbin.mp3', - 'audio/card/male/bagua.mp3', 'audio/card/male/baiyin.mp3', 'audio/card/male/chitu.mp3', @@ -1901,6 +1872,7 @@ window.noname_asset_list=[ 'font/yuanli.ttf', 'image/background/huangtian_bg.jpg', 'image/background/key_bg.jpg', + 'image/background/planetarian_bg.jpg', 'image/background/kyoani_bg.jpg', 'image/background/ol_bg.jpg', 'image/background/september_bg.jpg', @@ -2268,30 +2240,7 @@ window.noname_asset_list=[ 'image/character/key_kyousuke.jpg', 'image/character/key_lucia.jpg', 'image/character/re_yujin.jpg', - 'image/character/re_caopi.jpg', - 'image/character/re_dongzhuo.jpg', - 'image/character/re_sunjian.jpg', - 'image/character/ol_guansuo.jpg', - 'image/character/ol_guohuai.jpg', - 'image/character/ol_liaohua.jpg', - 'image/character/ol_manchong.jpg', - 'image/character/ol_xinxianying.jpg', - 'image/character/ol_yujin.jpg', - 'image/character/ol_zhangrang.jpg', - 'image/character/ol_zhuran.jpg', - 'image/character/ol_liuyu.jpg', - 'image/character/ol_wuyi.jpg', - 'image/character/guanlu.jpg', - 'image/character/gexuan.jpg', - 'image/character/re_huangzhong.jpg', - 'image/character/re_pangde.jpg', - 'image/character/re_weiyan.jpg', - 'image/character/re_xiahouyuan.jpg', - 'image/character/re_xiaoqiao.jpg', - 'image/character/re_xuhuang.jpg', - 'image/character/key_haruko.jpg', - 'image/character/baiwuchang.jpg', 'image/character/baosanniang.jpg', 'image/character/beimihu.jpg', diff --git a/game/config.js b/game/config.js index 14552f296..40fbe41d8 100644 --- a/game/config.js +++ b/game/config.js @@ -127,7 +127,7 @@ window.config={ sort:'type_sort', cards:['standard','ex','extra','sp','classic','basic'], - characters:['standard','shenhua','sp','yijiang'], + characters:['standard','shenhua','sp','yijiang','refresh','xinghuoliaoyuan','mobile','extra'], connect_characters:[], connect_cards:[], plays:[], @@ -183,6 +183,7 @@ window.config={ forbid:[ ['huashen'], ['xinmanjuan'], + ['reluanji','jueqing'], ['lianying','rende'], ['lianying','anxian'], ['lianying','yinguo'], diff --git a/game/game.js b/game/game.js index 273af3e1e..63d76433f 100644 --- a/game/game.js +++ b/game/game.js @@ -13341,7 +13341,7 @@ event.getTriggerTarget=function(list1,list2){ var listx=list1.slice(0).sortBySeat(); for(var i=0;i