From 15fa286544f26c866da8001d36dd2ff0294fb9fb Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Sat, 26 Aug 2023 21:04:21 +0800 Subject: [PATCH] update source.js and asset.js --- character/jsrg.js | 6 +++--- game/asset.js | 12 ++++++------ game/game.js | 2 +- game/source.js | 2 +- mode/guozhan.js | 14 +++++++------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/character/jsrg.js b/character/jsrg.js index 7120b1672..18e031fc4 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -29,13 +29,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){ //承 jsrg_sunce:['male','wu',4,['jsrgduxing','jsrgzhiheng','jsrgzhasi','jsrgbashi'],['zhu']], jsrg_xuyou:['male','wei',3,['jsrglipan','jsrgqingxi','jsrgjinmie'],['doublegroup:wei:qun']], - jsrg_lvbu:['male','qun',5,['jsrgwuchang','jsrgqingjiao','jsrgchengxu'],['doublegroup:qun:shu']], - jsrg_zhanghe:['male','wei',4,['jsrgqiongtu','jsrgxianzhu'],['doublegroup:qun:wei']], + jsrg_lvbu:['male','qun',5,['jsrgwuchang','jsrgqingjiao','jsrgchengxu'],['doublegroup:shu:qun']], + jsrg_zhanghe:['male','wei',4,['jsrgqiongtu','jsrgxianzhu'],['doublegroup:wei:qun']], jsrg_zoushi:['female','qun',3,['jsrgguyin','jsrgzhangdeng']], jsrg_guanyu:['male','shu',5,['jsrgguanjue','jsrgnianen'],['border:wei']], jsrg_chendeng:['male','qun',3,['jsrglunshi','jsrgguitu']], jsrg_zhenji:['female','qun',3,['jsrgjixiang','jsrgchengxian']], - jsrg_zhangliao:['male','qun',4,['jsrgzhengbing','jsrgtuwei'],['doublegroup:qun:wei']], + jsrg_zhangliao:['male','qun',4,['jsrgzhengbing','jsrgtuwei'],['doublegroup:wei:qun']], jsrg_xugong:['male','wu',3,['jsrgbiaozhao','jsrgyechou']], jsrg_chunyuqiong:['male','qun',4,['jsrgcangchu','jsrgshishou']], }, diff --git a/game/asset.js b/game/asset.js index e221a310e..4ab2b68ac 100644 --- a/game/asset.js +++ b/game/asset.js @@ -5835,12 +5835,12 @@ window.noname_asset_list=[ 'audio/voice/female/21.mp3', 'audio/voice/female/22.mp3', - 'font/huangcao.ttf', - 'font/shousha.ttf', - 'font/xiaozhuan.ttf', - 'font/xingkai.ttf', - 'font/xinwei.ttf', - 'font/yuanli.ttf', + 'font/huangcao.woff2', + 'font/shousha.woff2', + 'font/xiaozhuan.woff2', + 'font/xingkai.woff2', + 'font/xinwei.woff2', + 'font/yuanli.woff2', 'image/background/beipan_bg.jpg', 'image/background/heaven_bg.jpg', diff --git a/game/game.js b/game/game.js index ce5157b33..62fce0880 100644 --- a/game/game.js +++ b/game/game.js @@ -52576,9 +52576,9 @@ //优先度判断 priority:function(skill){ const info=get.info(skill); + if(!info) return 0; if(info.hasOwnProperty('_priority')) return info._priority; let priority=0; - if(!info) return 0; if(info.priority){ priority=info.priority*100; } diff --git a/game/source.js b/game/source.js index 1d4724e86..4a2bef2d8 100644 --- a/game/source.js +++ b/game/source.js @@ -49,7 +49,7 @@ window.noname_source_list=[ 'character/yingbian.js', 'character/yxs.js', 'character/zhuogui.js', - 'font/suits.ttf', + 'font/suits.woff2', 'game/asset.js', 'game/codemirror.js', 'game/config.js', diff --git a/mode/guozhan.js b/mode/guozhan.js index 37af5b388..07d1caa48 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -398,19 +398,19 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ gz_simazhao:['male','ye',3,['gzzhaoxin','gzsuzhi'],['gzskin']], gz_gongsunyuan:['male','ye',4,['gzhuaiyi','gzzisui'],['gzskin']], gz_sunchen:['male','ye',4,['gzshilu','gzxiongnve']], - gz_tangzi:['male','wu',4,['gzxingzhao'],['doublegroup:wu:wei','gzskin']], + gz_tangzi:['male','wu',4,['gzxingzhao'],['doublegroup:wei:wu','gzskin']], gz_mengda:['male','wei',4,['qiuan','liangfan'],['doublegroup:wei:shu']], - gz_liuqi:['male','qun',3,['gzwenji','gztunjiang'],['doublegroup:qun:shu','gzskin']], + gz_liuqi:['male','qun',3,['gzwenji','gztunjiang'],['doublegroup:shu:qun','gzskin']], gz_mifangfushiren:['male','shu',4,['mffengshi'],['doublegroup:shu:wu']], - gz_shixie:['male','qun',3,['gzbiluan','gzrelixia'],['doublegroup:qun:wu','gzskin']], - gz_zhanglu:['male','qun',3,['gzrebushi','gzremidao'],['doublegroup:qun:wei','gzskin']], + gz_shixie:['male','qun',3,['gzbiluan','gzrelixia'],['doublegroup:wu:qun','gzskin']], + gz_zhanglu:['male','qun',3,['gzrebushi','gzremidao'],['doublegroup:wei:qun','gzskin']], gz_dongzhao:['male','wei',3,['quanjin','zaoyun']], gz_re_xushu:['male','shu',4,['gzzhuhai','gzpozhen','gzjiancai'],['gzskin']], gz_wujing:['male','wu',4,['donggui','fengyang'],['gzskin']], gz_yanbaihu:['male','qun',4,['gzzhidao','gzyjili'],['gzskin']], gz_xuyou:['male','wei',3,['gzchenglve','gzshicai'],['doublegroup:wei:qun','gzskin']], - gz_xiahouba:['male','shu',4,['gzbaolie'],['doublegroup:shu:wei','gzskin']], - gz_panjun:['male','wu',3,['gzcongcha','xinfu_gongqing'],['doublegroup:wu:shu','gzskin']], + gz_xiahouba:['male','shu',4,['gzbaolie'],['doublegroup:wei:shu','gzskin']], + gz_panjun:['male','wu',3,['gzcongcha','xinfu_gongqing'],['doublegroup:shu:wu','gzskin']], gz_huangzu:['male','qun',4,['gzxishe'],['gzskin']], gz_zhugeke:['male','wu',3,['aocai','gzduwu'],['gzskin']], gz_wenqin:['male','wei',4,['gzjinfa'],['doublegroup:wei:wu','gzskin']], @@ -575,7 +575,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ gz_guohuai:['male','wei',4,['gzduanshi','gzjingce'],['gzskin']], gz_guanqiujian:['male','wei',4,['gzzhengrong','gzhongju'],[]], gz_zhujun:['male','qun',4,['gzgongjian','gzkuimang'],[]], - gz_chengong:['male','qun',3,['gzyinpan','gzxingmou'],['doublegroup:qun:wei','gzskin']], + gz_chengong:['male','qun',3,['gzyinpan','gzxingmou'],['doublegroup:wei:qun','gzskin']], gz_re_xugong:['male','wu',3,['gzbiaozhao','gzyechou'],['doublegroup:wu:qun']], gz_yangwan:['female','shu',3,['gzyouyan','gzzhuihuan'],['gzskin']],