diff --git a/game/game.js b/game/game.js index 1b7557fa3..c5c2ee128 100644 --- a/game/game.js +++ b/game/game.js @@ -494,8 +494,8 @@ default:'旧版', newlayout:'对称', mobile:'默认', - long:'手杀', - long2:'新版', + long:'新版', + long2:'手杀', }, onclick:function(layout){ if(lib.config.layoutfixed.contains(lib.config.mode)&&layout=='default'){ diff --git a/game/update.js b/game/update.js index a8856ef77..927f03976 100644 --- a/game/update.js +++ b/game/update.js @@ -16,11 +16,15 @@ window.noname_update={ 'character/yijiang.js', 'mode/chess.js', 'mode/versus.js', + 'mode/guozhan.js', + 'mode/identity.js', + 'mode/stone.js', 'theme/simple/style.css', 'layout/default/layout.css', 'layout/long/layout.css', 'layout/long2/layout.css', 'layout/mobile/layout.css', 'layout/newlayout/global.css', + 'layout/mode/stone.css', ] } diff --git a/layout/long/layout.css b/layout/long/layout.css index e1170068a..19cdf3a93 100644 --- a/layout/long/layout.css +++ b/layout/long/layout.css @@ -123,10 +123,16 @@ } #arena:not(.fewplayer) .timerbar>div{ - top: calc(100% - 15px); + top: 205px; width: 96px; left: 12px; } +#arena:not(.fewplayer)[data-player_height='default'] .timerbar>div{ + top: 185px; +} +#arena:not(.fewplayer)[data-player_height='short'] .timerbar>div{ + top: 165px; +} /*--------位置(8人)------*/ #arena:not(.fewplayer)[data-number='8']>.player[data-position='1']{top:calc(30% - 120px);left:calc(-300% / 94 + 4375% / 47 - 735px + 720px);} diff --git a/layout/long2/layout.css b/layout/long2/layout.css index 62cacc8a5..37167f46b 100644 --- a/layout/long2/layout.css +++ b/layout/long2/layout.css @@ -89,6 +89,14 @@ height:calc(100% - 370px); bottom:170px; } +#arena.choose-character>.dialog{ + height:calc(100% - 280px); + bottom:80px; +} +#arena.choose-character>#control{ + bottom: 30px; + transition: all 0s; +} .dialog.fullheight { height: calc(100% - 123px) !important; top: 40px !important; @@ -242,10 +250,16 @@ } #arena .timerbar>div{ - top: calc(100% - 15px); + top: 205px; width: 96px; left: 12px; } +#arena[data-player_height='default'] .timerbar>div{ + top: 185px; +} +#arena[data-player_height='short'] .timerbar>div{ + top: 165px; +} /*--------位置(8人)------*/ #arena[data-number='8']>.player[data-position='1']{top:calc(30% - 128px);left:calc(-300% / 94 + 4375% / 47 - 735px + 720px);} diff --git a/layout/mode/stone.css b/layout/mode/stone.css index f8d19e415..5fc531d63 100644 --- a/layout/mode/stone.css +++ b/layout/mode/stone.css @@ -148,6 +148,10 @@ white-space: nowrap; transition: all 0s; } +.dialog .deckitem{ + margin-left: 8px; + margin-right: 9px; +} .deckitem.random{ border-radius: 4px; text-align: center; diff --git a/layout/newlayout/global.css b/layout/newlayout/global.css index d4459bfcc..31ed6d40a 100644 --- a/layout/newlayout/global.css +++ b/layout/newlayout/global.css @@ -477,7 +477,7 @@ bottom:auto !important; top:200px !important; } -#arena.stone .dialog{ +#arena.stone:not(.choose-character) .dialog{ width: calc(90% - 440px); left: calc(5% + 220px); } @@ -527,7 +527,7 @@ width: 735px; left: calc(50% - 367.5px); } - #arena.stone .dialog{ + #arena.stone:not(.choose-character) .dialog{ width: calc(90% - 440px); left: calc(5% + 220px); } diff --git a/mode/guozhan.js b/mode/guozhan.js index 77d5ff5f9..6110b1d14 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -401,6 +401,7 @@ mode.guozhan={ } next.setContent(function(){ "step 0" + ui.arena.classList.add('choose-character'); var addSetting=function(dialog){ dialog.add('选择座位'); var seats=document.createElement('table'); @@ -626,12 +627,18 @@ mode.guozhan={ game.players[i].addSkillTrigger(game.players[i].hiddenSkills[j],true); } } + setTimeout(function(){ + ui.arena.classList.remove('choose-character'); + },500); }); }, chooseCharacterOL:function(){ var next=game.createEvent('chooseCharacter',false); next.setContent(function(){ 'step 0' + game.broadcastAll(function(){ + ui.arena.classList.add('choose-character'); + }); var list=get.charactersOL(); event.list=list.slice(0); var list2=[]; @@ -755,6 +762,9 @@ mode.guozhan={ game.players[i].node.name2.show(); game.players[i]._group=lib.character[game.players[i].name1][1]; } + setTimeout(function(){ + ui.arena.classList.remove('choose-character'); + },500); },result); }); } diff --git a/mode/identity.js b/mode/identity.js index dfb0ff137..dfa461e56 100644 --- a/mode/identity.js +++ b/mode/identity.js @@ -552,6 +552,7 @@ mode.identity={ } next.setContent(function(){ "step 0" + ui.arena.classList.add('choose-character'); var i; var list; var list2=[]; @@ -1015,12 +1016,16 @@ mode.identity={ event.ai(game.players[i],event.list.splice(0,get.config('choice_'+game.players[i].identity)),null,event.list) } } + setTimeout(function(){ + ui.arena.classList.remove('choose-character'); + },500); }); }, chooseCharacterOL:function(){ var next=game.createEvent('chooseCharacter',false); next.setContent(function(){ "step 0" + ui.arena.classList.add('choose-character'); var i; var identityList; if(_status.mode=='zhong'){ @@ -1091,6 +1096,7 @@ mode.identity={ zhu.identity=zhuid; zhu.setIdentity(); me.setIdentity(identity); + ui.arena.classList.add('choose-character'); },game.zhu,game.zhu.identity,game.players[i],game.players[i].identity); } @@ -1219,7 +1225,13 @@ mode.identity={ lib.playerOL[i].init(result[i][0],result[i][1]); } } + setTimeout(function(){ + ui.arena.classList.remove('choose-character'); + },500); },result); + setTimeout(function(){ + ui.arena.classList.remove('choose-character'); + },500); }); }, }, diff --git a/mode/stone.js b/mode/stone.js index 56b9a7bb0..a5d4b85cf 100644 --- a/mode/stone.js +++ b/mode/stone.js @@ -1446,6 +1446,7 @@ mode.stone={ next.showConfig=true; next.setContent(function(){ "step 0" + ui.arena.classList.add('choose-character'); var i; var list=[]; event.list=list; @@ -1650,6 +1651,12 @@ mode.stone={ get.deck(game.me,_status.deck.shift()); get.deck(game.enemy,'random'); } + ui.control.style.transitionDuration='0s'; + ui.refresh(ui.control); + ui.arena.classList.remove('choose-character'); + setTimeout(function(){ + ui.control.style.transitionDuration=''; + },500); }); }, }, diff --git a/mode/versus.js b/mode/versus.js index 0097fcfaf..cdd5679bc 100644 --- a/mode/versus.js +++ b/mode/versus.js @@ -440,6 +440,7 @@ mode.versus={ next.showConfig=true; next.setContent(function(){ 'step 0' + ui.arena.classList.add('choose-character'); for(var i in lib.characterPack.mode_versus){ lib.character[i]=lib.characterPack.mode_versus[i]; if(!lib.character[i][4]){ @@ -604,6 +605,9 @@ mode.versus={ } } game.addRecentCharacter(game.me.name,game.me.name2); + setTimeout(function(){ + ui.arena.classList.remove('choose-character'); + },500); }); }, chooseCharacterTwo:function(){ @@ -611,6 +615,7 @@ mode.versus={ next.showConfig=true; next.setContent(function(){ 'step 0' + ui.arena.classList.add('choose-character'); for(var i in lib.skill){ if(lib.skill[i].changeSeat){ lib.skill[i]={}; @@ -846,6 +851,9 @@ mode.versus={ } } } + setTimeout(function(){ + ui.arena.classList.remove('choose-character'); + },500) }); }, chooseCharacterFour:function(){ @@ -882,6 +890,7 @@ mode.versus={ } next.setContent(function(){ "step 0" + ui.arena.classList.add('choose-character'); var i; var list; var list2=[]; @@ -1019,6 +1028,9 @@ mode.versus={ event.xdialog.close(); } game.addRecentCharacter(game.me.name,game.me.name2); + setTimeout(function(){ + ui.arena.classList.remove('choose-character'); + },500) }); }, chooseCharacter:function(){ @@ -1605,7 +1617,8 @@ mode.versus={ _status.firstAct=event.current; event.flipassign=true; event.videoId=lib.status.videoId++; - var func=function(filter,id,selected,map){ + var func=function(filter,id,selected,map,choiceFour){ + lib.choiceFour=choiceFour; var dialog=ui.create.characterDialog(filter,'expandall').open(); dialog.videoId=id; for(var i in map){ @@ -1621,11 +1634,12 @@ mode.versus={ } } } + ui.arena.classList.add('choose-character'); }; event.map=map; event.selected=[]; - game.broadcastAll(func,filterChoice,event.videoId,event.selected,map); - _status.onreconnect=[func,filterChoice,event.videoId,event.selected,map]; + game.broadcastAll(func,filterChoice,event.videoId,event.selected,map,lib.choiceFour); + _status.onreconnect=[func,filterChoice,event.videoId,event.selected,map,lib.choiceFour]; "step 1" game.broadcastAll(function(player){ player.classList.add('selectedx'); @@ -1705,6 +1719,9 @@ mode.versus={ if(dialog){ dialog.close(); } + setTimeout(function(){ + ui.arena.classList.remove('choose-character'); + },500); },event.videoId); }); }, @@ -1714,6 +1731,7 @@ mode.versus={ 'step 0' game.additionaldead=[]; game.broadcastAll(function(ref,bool){ + ui.arena.classList.add('choose-character'); for(var i=0;i<6;i++){ ref.side=bool; ref=ref.next; @@ -1762,6 +1780,9 @@ mode.versus={ } } game.broadcastAll(function(result,func1,func2){ + setTimeout(function(){ + ui.arena.classList.remove('choose-character'); + },500) _status.friendDied=[]; _status.enemyDied=[]; @@ -1839,6 +1860,7 @@ mode.versus={ } game.players[i].node.identity.dataset.color=game.players[i].side+'zhu'; } + ui.arena.classList.add('choose-character'); },game.players[0],Math.random()<0.5,Math.random()<0.5); _status.onreconnect=[function(){ var players=game.players.concat(game.dead); @@ -1878,7 +1900,13 @@ mode.versus={ lib.playerOL[i].init(result[i]); } } + setTimeout(function(){ + ui.arena.classList.remove('choose-character'); + },500) },result); + setTimeout(function(){ + ui.arena.classList.remove('choose-character'); + },500) }); }, chooseCharacterOL1:function(){