From 9b6a1dcfb4a14f8aee0b419574caa0c5b6dd3456 Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Fri, 3 Jan 2020 23:28:52 +0800 Subject: [PATCH] v1.9.96.8.1 --- game/asset.js | 7 ++++++- game/game.js | 7 +++++-- game/update.js | 15 +++++++-------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/game/asset.js b/game/asset.js index 1a067a040..c05fc43da 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - '1.9.96.7', + '1.9.96.8.1', 'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_online.mp3', 'audio/background/aozhan_rewrite.mp3', @@ -2058,6 +2058,11 @@ window.noname_asset_list=[ 'image/card/pss_paper.png', 'image/card/pss_scissor.png', 'image/card/pss_stone.png', + 'image/card/pyzhuren_spade.jpg', + 'image/card/pyzhuren_heart.jpg', + 'image/card/pyzhuren_club.jpg', + 'image/card/pyzhuren_diamond.jpg', + 'image/card/pyzhuren_shandian.jpg', 'image/card/bagua.png', 'image/card/baihupifeng.png', diff --git a/game/game.js b/game/game.js index 55954db63..f4cda8b3e 100644 --- a/game/game.js +++ b/game/game.js @@ -10048,7 +10048,7 @@ player.ai.tempIgnore=[]; player.stat.push({card:{},skill:{}}); game.countPlayer(function(current){ - current.actionHistory.push({useCard:[],respond:[],skipped:[]}); + current.actionHistory.push({useCard:[],respond:[],skipped:[],lose:[],gain:[]}); }); if(ui.land&&ui.land.player==player){ game.addVideo('destroyLand'); @@ -14124,6 +14124,7 @@ event.finish(); return; } + player.getHistory('gain').push(event); //if(event.source&&event.delay!==false) game.delayx(); "step 2" if(player.getStat().gain==undefined){ @@ -14314,6 +14315,8 @@ _status.cardPileNum=num; },player,cards,ui.cardPile.childNodes.length); game.addVideo('lose',player,[get.cardsInfo(hs),get.cardsInfo(es),get.cardsInfo(js)]); + event.cards2=hs.concat(es); + player.getHistory('lose').push(event); player.update(); game.addVideo('loseAfter',player); event.num=0; @@ -41672,7 +41675,7 @@ node.damagepopups=[]; node.judging=[]; node.stat=[{card:{},skill:{}}]; - node.actionHistory=[{useCard:[],respond:[],skipped:[]}]; + node.actionHistory=[{useCard:[],respond:[],skipped:[],lose:[],gain:[]}]; node.tempSkills={}; node.storage={}; node.marks={}; diff --git a/game/update.js b/game/update.js index 40253c2d9..864b6fc9e 100644 --- a/game/update.js +++ b/game/update.js @@ -1,20 +1,19 @@ window.noname_update={ - version:'1.9.96.8', - update:'1.9.96.7.2', + version:'1.9.96.8.1', + update:'1.9.96.8', changeLog:[ - 'getHistory功能', 'BUG修复', ], files:[ //'card/extra.js', //'card/huanlekapai.js', //'card/sp.js', - //'card/standard.js', + 'card/standard.js', //'card/swd.js', - 'card/guozhan.js', + //'card/guozhan.js', //'card/gwent.js', //'character/diy.js', - 'character/extra.js', + //'character/extra.js', //'character/hearth.js', //'character/gujian.js', //'character/gwent.js', @@ -25,7 +24,7 @@ window.noname_update={ 'character/shenhua.js', 'character/sp.js', //'character/tw.js', - 'character/standard.js', + //'character/standard.js', //'character/swd.js', //'character/xianjian.js', 'character/xinghuoliaoyuan.js', @@ -34,7 +33,7 @@ window.noname_update={ //'extension/boss/extension.js', //'layout/default/layout.css', //'mode/identity.js', - //'mode/doudizhu.js', + 'mode/doudizhu.js', 'mode/guozhan.js', //'mode/single.js', //'mode/stone.js',