From 2b85f76f88be5bf6956ca1ebe210038ef7410d55 Mon Sep 17 00:00:00 2001 From: libccy Date: Tue, 4 Apr 2017 19:57:09 +0800 Subject: [PATCH] v1.9.20.2 --- game/config.js | 1 + game/game.js | 2 +- game/update.js | 16 ++++++++-------- layout/default/menu.css | 2 +- mode/identity.js | 1 + 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/game/config.js b/game/config.js index 8b123df8f..fd7b0eaf5 100644 --- a/game/config.js +++ b/game/config.js @@ -136,6 +136,7 @@ window.config={ extensions:[], banned:[], bannedcards:[], + forbidlist:[], bannedpile:{}, customcardpile:{}, addedpile:{}, diff --git a/game/game.js b/game/game.js index 07fb44f89..c2b4ab3d3 100644 --- a/game/game.js +++ b/game/game.js @@ -27139,7 +27139,7 @@ banskillexpanded=!banskillexpanded; }); - var banskilladd=ui.create.div('.config.indent','添加...',page,function(){ + var banskilladd=ui.create.div('.config.indent','添加...',page,function(){ this.nextSibling.classList.toggle('hidden'); }); banskilladd.style.display='none'; diff --git a/game/update.js b/game/update.js index 6ae41b732..f16d38d56 100644 --- a/game/update.js +++ b/game/update.js @@ -1,24 +1,24 @@ window.noname_update={ - version:'1.9.20.1', - // update:'1.9.19', + version:'1.9.20.2', + update:'1.9.20.1', changeLog:[ 'bug修复', ], files:[ 'game/game.js', // 'game/package.js', - // 'game/config.js', + 'game/config.js', // 'game/source.js', // 'game/asset.js', // 'card/*', - 'card/sp.js', - 'card/yunchou.js', + // 'card/sp.js', + // 'card/yunchou.js', // 'character/*', - 'character/gujian.js', + // 'character/gujian.js', // 'mode/boss.js', // 'mode/versus.js', // 'mode/guozhan.js', - // 'mode/identity.js', + 'mode/identity.js', // 'mode/chess.js', // 'mode/tafang.js', // 'mode/guozhan.js', @@ -27,7 +27,7 @@ window.noname_update={ // 'theme/woodden/style.css', // 'layout/default/layout.css', // 'layout/default/phone.css', - // 'layout/default/menu.css', + 'layout/default/menu.css', // 'theme/style/cardback/*', // 'layout/long/layout.css', // 'layout/long2/layout.css', diff --git a/layout/default/menu.css b/layout/default/menu.css index 2e6d4f7ba..a5f5ec417 100644 --- a/layout/default/menu.css +++ b/layout/default/menu.css @@ -430,7 +430,7 @@ transition: all 0s; } .menu.main>.menu-content>div>.right.pane>div>.config.banskilladd.hidden{ - margin-top: -50px; + margin-top: -50px !important; } .menu.main>.menu-content>div>.right.pane>div>.config.banskilladd:not(.hidden), .menu.main>.menu-content>div>.right.pane>div>.config.cardpileadd:not(.hidden){ diff --git a/mode/identity.js b/mode/identity.js index 3d69d35d8..6996413db 100644 --- a/mode/identity.js +++ b/mode/identity.js @@ -71,6 +71,7 @@ mode.identity={ "step 2" if(!lib.config.new_tutorial){ _status.new_tutorial=true; + lib.init.onfree(); game.saveConfig('version',lib.version); var clear=function(){ ui.dialog.close();