From dd05e4cdd259a6bcda289c1e497fa109475bddf5 Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Tue, 13 Aug 2019 12:52:38 +0800 Subject: [PATCH] v1.9.91.5(Final Part) --- game/asset.js | 3 ++- game/game.js | 21 ++++++++++----------- game/package.js | 1 + game/update.js | 12 +++++++++--- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/game/asset.js b/game/asset.js index 909edc210..39e09d340 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - '1.9.91.2', + '1.9.91.5', 'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_online.mp3', 'audio/background/music_danji.mp3', @@ -1788,6 +1788,7 @@ window.noname_asset_list=[ 'font/yuanli.ttf', 'font/shousha.ttf', 'image/background/huangtian_bg.jpg', + 'image/background/key_bg.jpg', 'image/background/kyoani_bg.jpg', 'image/background/ol_bg.jpg', 'image/background/september_bg.jpg', diff --git a/game/game.js b/game/game.js index b6dcd78d4..6ad5a8035 100644 --- a/game/game.js +++ b/game/game.js @@ -9559,26 +9559,25 @@ } }, disableEquip:function(){ - event.trigger('disableEquip'); + //event.trigger('disableEquip'); if(!player.isDisabled(event.pos)){ player.storage.disableEquip.add(event.pos); //player.markSkill('_disableEquip'); player.syncStorage('_disableEquip'); - var str=event.pos.slice(event.pos.length-1,event.pos.length); - if(player.get('e',str)!=undefined) player.discard(player.get('e',str)); + if(player.getEquip(event.pos)) player.discard(player.getEquip(event.pos)).delay=false; game.log(player,'废除了',get.translation(event.pos),'栏'); player.$disableEquip(event.pos); } }, enableEquip:function(){ - event.trigger('enableEquip'); - if(player.storage.disableEquip.contains(event.pos)){ + //event.trigger('enableEquip'); + if(player.isDisabled(event.pos)){ player.storage.disableEquip.remove(event.pos); player.syncStorage('_disableEquip'); //if(player.storage.disableEquip.length==0) player.unmarkSkill('_disableEquip'); + game.log(player,'恢复了',get.translation(event.pos),'栏'); + player.$enableEquip(event.pos); }; - game.log(player,'恢复了',get.translation(event.pos),'栏'); - player.$enableEquip(event.pos); }, disableJudge:function(){ var js=player.getCards('j'); @@ -9850,7 +9849,7 @@ } while(player!=end); event.changeCard=get.config('change_card'); - if(lib.config.mode!='identity'&&lib.config.mode!='guozhan'){ + if(_status.connectMode||lib.config.mode!='identity'&&lib.config.mode!='guozhan'&&lib.config.mode!='doudizhu'){ event.changeCard='disabled'; } "step 1" @@ -12773,7 +12772,7 @@ else if(lib.config.show_card_prompt){ if(get.type(event.card)=='equip'&&lib.config.hide_card_prompt_equip); else if(get.type(event.card)=='basic'&&lib.config.hide_card_prompt_basic); - else{ + else if(!event.nopopup){ if(lib.translate[event.card.name+'_pop']){ player.popup(lib.translate[event.card.name+'_pop'],'metal'); } @@ -43202,7 +43201,7 @@ if(game.online){ if(game.onlinezhu){ if(!this.playerid&&game.connectPlayers){ - if(lib.configOL.mode=='versus') return; + if(lib.configOL.mode=='versus'||lib.configOL.mode=='doudizhu') return; if(lib.configOL.mode=='identity'&&lib.configOL.identity_mode=='zhong') return; if(!this.classList.contains('unselectable2')&&lib.configOL.number<=2) return; this.classList.toggle('unselectable2') @@ -43268,7 +43267,7 @@ } } else{ - if(lib.configOL.mode=='versus') return; + if(lib.configOL.mode=='versus'||lib.configOL.mode=='doudizhu') return; if(lib.configOL.mode=='identity'&&lib.configOL.identity_mode=='zhong') return; if(!this.classList.contains('unselectable2')&&lib.configOL.number<=2) return; this.classList.toggle('unselectable2') diff --git a/game/package.js b/game/package.js index b4f06fa4f..de2fe0d18 100644 --- a/game/package.js +++ b/game/package.js @@ -83,6 +83,7 @@ window.noname_package={ september_bg:'九月', yinxiang_bg:'印象', kyoani_bg:'京都', + key_bg:'键社', }, music:{ music_diaochan:'貂蝉', diff --git a/game/update.js b/game/update.js index 755d6c8b5..b1398f330 100644 --- a/game/update.js +++ b/game/update.js @@ -1,19 +1,25 @@ window.noname_update={ - version:'1.9.91.4', - update:'1.9.91.2', + version:'1.9.91.5', + update:'1.9.91.4', changeLog:[ + '旧于吉回归', 'BUG修复', ], files:[ + 'card/extra.js', 'card/guozhan.js', + 'card/standard.js', + 'character/extra.js', + 'character/old.js', 'character/shenhua.js', 'character/sp.js', - 'character/diy.js', + 'character/xinghuoliaoyuan.js', 'character/yijiang.js', 'mode/boss.js', 'mode/doudizhu.js', 'mode/guozhan.js', 'mode/versus.js', + 'game/package.js', 'game/game.js', ] };