YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pos

This commit is contained in:
libccy 2017-01-20 23:22:26 +08:00
parent ee3a58e80b
commit a790e4553f
4 changed files with 94 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
game/game.js
View File

@ -1180,6 +1180,24 @@
name:'技能特效', name:'技能特效',
init:true, init:true,
}, },
fewplayer:{
name:'手杀布局启用人数',
init:'3',
unfrequent:true,
item:{
'2':'两人',
'3':'三人',
'4':'四人',
'5':'五人',
'6':'六人',
'7':'七人',
'8':'八人',
},
onclick:function(item){
game.saveConfig('fewplayer',item);
if(ui.arena) ui.arena.setNumber(ui.arena.dataset.number);
}
},
target_shake:{ target_shake:{
name:'目标特效', name:'目标特效',
init:'off', init:'off',
@ -1384,6 +1402,12 @@
} }
else{ else{
map.show_handcardbutton.hide(); map.show_handcardbutton.hide();
}
if(lib.config.layout=='long'){
map.fewplayer.show();
}
else{
map.fewplayer.hide();
} }
// if(config.theme=='woodden'&&config.image_background=='default'){ // if(config.theme=='woodden'&&config.image_background=='default'){
// map.background_color_wood.show(); // map.background_color_wood.show();
@ -15524,7 +15548,7 @@
ui.arena.classList.add('observe'); ui.arena.classList.add('observe');
} }
} }
ui.arena.dataset.number=state.number; ui.arena.setNumber(state.number);
_status.mode=state.mode; _status.mode=state.mode;
var pos=state.players[observe||game.onlineID].position; var pos=state.players[observe||game.onlineID].position;
for(var i in state.players){ for(var i in state.players){
@ -16840,7 +16864,7 @@
if(lib.config.mode=='versus'){ if(lib.config.mode=='versus'){
players.bool=players.pop(); players.bool=players.pop();
} }
ui.arena.dataset.number=players.length; ui.arena.setNumber(players.length);
ui.arena.classList.add('video'); ui.arena.classList.add('video');
game.players.length=0; game.players.length=0;
game.dead.length=0; game.dead.length=0;
@ -16852,7 +16876,7 @@
ui.handcards2Container.appendChild(ui.handcards2); ui.handcards2Container.appendChild(ui.handcards2);
if(lib.config.mode=='versus'){ if(lib.config.mode=='versus'){
if(players.bool){ if(players.bool){
ui.arena.dataset.number=parseInt(ui.arena.dataset.number)+1; ui.arena.setNumber(parseInt(ui.arena.dataset.number)+1);
for(var i=0;i<game.players.length;i++){ for(var i=0;i<game.players.length;i++){
game.players[i].dataset.position=parseInt(game.players[i].dataset.position)+1; game.players[i].dataset.position=parseInt(game.players[i].dataset.position)+1;
} }
@ -16870,7 +16894,7 @@
ui.arena.classList.add('single-handcard'); ui.arena.classList.add('single-handcard');
ui.fakeme=ui.create.div('.fakeme.avatar',ui.me); ui.fakeme=ui.create.div('.fakeme.avatar',ui.me);
} }
ui.arena.dataset.number=8; ui.arena.setNumber(8);
} }
ui.updatehl(); ui.updatehl();
for(var i=0;i<players.length;i++){ for(var i=0;i<players.length;i++){
@ -20751,7 +20775,7 @@
position=Math.ceil(Math.random()*(game.players.length+game.dead.length)); position=Math.ceil(Math.random()*(game.players.length+game.dead.length));
} }
var players=game.players.concat(game.dead); var players=game.players.concat(game.dead);
ui.arena.dataset.number=players.length+1; ui.arena.setNumber(players.length+1);
for(var i=0;i<players.length;i++){ for(var i=0;i<players.length;i++){
if(parseInt(players[i].dataset.position)>=position){ if(parseInt(players[i].dataset.position)>=position){
players[i].dataset.position=parseInt(players[i].dataset.position)+1; players[i].dataset.position=parseInt(players[i].dataset.position)+1;
@ -20780,7 +20804,7 @@
position=Math.ceil(Math.random()*(game.players.length+game.dead.length)); position=Math.ceil(Math.random()*(game.players.length+game.dead.length));
} }
var players=game.players.concat(game.dead); var players=game.players.concat(game.dead);
ui.arena.dataset.number=players.length+1; ui.arena.setNumber(players.length+1);
for(var i=0;i<players.length;i++){ for(var i=0;i<players.length;i++){
if(parseInt(players[i].dataset.position)>=position){ if(parseInt(players[i].dataset.position)>=position){
players[i].dataset.position=parseInt(players[i].dataset.position)+1; players[i].dataset.position=parseInt(players[i].dataset.position)+1;
@ -20814,7 +20838,7 @@
player.delete(); player.delete();
game.players.remove(player); game.players.remove(player);
game.dead.remove(player); game.dead.remove(player);
ui.arena.dataset.number=players.length-1; ui.arena.setNumber(players.length-1);
player.removed=true; player.removed=true;
if(player==game.me){ if(player==game.me){
ui.me.hide(); ui.me.hide();
@ -27993,6 +28017,15 @@
ui.window.addEventListener(lib.config.touchscreen?'touchend':'click',ui.click.window); ui.window.addEventListener(lib.config.touchscreen?'touchend':'click',ui.click.window);
ui.system=ui.create.div("#system.",ui.window); ui.system=ui.create.div("#system.",ui.window);
ui.arena=ui.create.div('#arena.nome',ui.window); ui.arena=ui.create.div('#arena.nome',ui.window);
ui.arena.setNumber=function(num){
this.dataset.number=num;
if(parseInt(num)<parseInt(lib.config.fewplayer)){
this.classList.add('fewplayer');
}
else{
this.classList.remove('fewplayer');
}
}
if(lib.config.layout=='mobile'||lib.config.layout=='long'){ if(lib.config.layout=='mobile'||lib.config.layout=='long'){
ui.arena.classList.add('mobile'); ui.arena.classList.add('mobile');
@ -28763,7 +28796,7 @@
players[0].previousSeat=players[players.length-1]; players[0].previousSeat=players[players.length-1];
players[players.length-1].next=players[0]; players[players.length-1].next=players[0];
players[players.length-1].nextSeat=players[0]; players[players.length-1].nextSeat=players[0];
ui.arena.dataset.number=num; ui.arena.setNumber(num);
return players; return players;
}, },
me:function(hasme){ me:function(hasme){

140
layout/long/layout.css
View File

@ -1,129 +1,91 @@
@import "../mobile/layout.css"; @import "../mobile/layout.css";
#arena:not(.stone)>.player:not(.minskin):not(*[data-position='0']){ #arena:not(.fewplayer)>.player:not(.minskin):not(*[data-position='0']){
width: 120px !important; width: 120px !important;
height: 220px !important; height: 220px !important;
} }
#arena:not(.stone)>.player:not(.minskin):not(*[data-position='0'])>.avatar, #arena:not(.fewplayer)>.player:not(.minskin):not(*[data-position='0'])>.equips{
#arena:not(.stone)>.player:not(.minskin):not(*[data-position='0'])>.avatar2{ transform: scale(0.8);
transform-origin: bottom left;
}
#arena:not(.fewplayer)>.player:not(.minskin):not(*[data-position='0'])>.avatar,
#arena:not(.fewplayer)>.player:not(.minskin):not(*[data-position='0'])>.avatar2{
width: 106px !important; width: 106px !important;
height: 206px !important; height: 206px !important;
background-position: 50% !important; background-position: 50% !important;
} }
#arena:not(.stone)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar, #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar,
#arena:not(.stone)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{
height: 103px !important; height: 103px !important;
background-position: 0 0 !important; background-position: 0 0 !important;
border-radius: 8px !important; border-radius: 8px !important;
} }
#window.reduce_radius #arena:not(.stone)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar, #window.reduce_radius #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar,
#window.reduce_radius #arena:not(.stone)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ #window.reduce_radius #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{
border-radius: 4px !important; border-radius: 4px !important;
} }
#arena:not(.stone)>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{ #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{
border-radius: 8px 8px 0 0 !important; border-radius: 8px 8px 0 0 !important;
height: 125px !important; height: 124px !important;
-webkit-clip-path: polygon(-10px -10px, 116px -10px, 116px 103px, 106px 103px, 0px 125px, -10px 125px); -webkit-clip-path: polygon(-10px -10px, 116px -10px, 116px 92px, 106px 92px, 0px 114px, -10px 114px);
} }
#window.reduce_radius #arena:not(.stone)>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{ #window.reduce_radius #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{
border-radius: 4px 4px 0 0 !important; border-radius: 4px 4px 0 0 !important;
} }
#arena:not(.stone)>.player.fullskin2:not(.minskin):not(.unseen):not(*[data-position='0'])>.avatar2{ #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen):not(*[data-position='0'])>.avatar2{
border-radius: 0 0 8px 8px !important; border-radius: 0 0 8px 8px !important;
top: 100px !important; top: 89px !important;
height: 113px !important; height: 124px !important;
background-position: 0 10px !important; background-position: 0 10px !important;
-webkit-clip-path: polygon(-10px 32px, 0 32px, 106px 10px, 116px 10px, 116px 125px, -10px 125px); -webkit-clip-path: polygon(-10px 32px, 0 32px, 106px 10px, 116px 10px, 116px 125px, -10px 125px);
} }
#window.reduce_radius #arena:not(.stone)>.player.fullskin2:not(.minskin):not(.unseen):not(*[data-position='0'])>.avatar2{ #window.reduce_radius #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen):not(*[data-position='0'])>.avatar2{
border-radius: 0 0 4px 4px !important; border-radius: 0 0 4px 4px !important;
} }
#arena:not(.stone)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{
top: 110px !important; top: 110px !important;
} }
#arena:not(.stone)>.player:not(.minskin):not(*[data-position='0'])>.identity{ #arena:not(.fewplayer)>.player:not(.minskin):not(*[data-position='0'])>.identity{
left: 102px; left: 102px;
} }
#arena:not(.stone)>.player:not(.minskin):not(*[data-position='0'])>.hp{ #arena:not(.fewplayer)>.player:not(.minskin):not(*[data-position='0'])>.hp:not(.actcount){
left: 93px; left: 93px;
} }
#arena:not(.stone)>.player:not(.minskin):not(*[data-position='0'])>.hp.text{ #arena:not(.fewplayer)>.player:not(.minskin):not(*[data-position='0'])>.hp:not(.actcount).text{
left: 89px; left: 89px;
} }
/*--------位置(8人)------*/ /*--------位置(8人)------*/
[data-number='8']>.player[data-position='1']{top:calc(200% / 3 - 340px);left:calc(100% - 120px);} #arena:not(.fewplayer)[data-number='8']>.player[data-position='1']{top:calc(200% / 3 - 340px);left:calc(100% - 120px);}
[data-number='8']>.player[data-position='2']{top:calc(60% / 3 - 108px);left:calc(500% / 6 - 100px);} #arena:not(.fewplayer)[data-number='8']>.player[data-position='2']{top:calc(60% / 3 - 108px);left:calc(500% / 6 - 100px);}
[data-number='8']>.player[data-position='3']{top:0;left:calc(400% / 6 - 80px);} #arena:not(.fewplayer)[data-number='8']>.player[data-position='3']{top:0;left:calc(400% / 6 - 80px);}
[data-number='8']>.player[data-position='4']{top:0;left:calc(300% / 6 - 60px);} #arena:not(.fewplayer)[data-number='8']>.player[data-position='4']{top:0;left:calc(300% / 6 - 60px);}
[data-number='8']>.player[data-position='5']{top:0;left:calc(200% / 6 - 40px);} #arena:not(.fewplayer)[data-number='8']>.player[data-position='5']{top:0;left:calc(200% / 6 - 40px);}
[data-number='8']>.player[data-position='6']{top:calc(60% / 3 - 108px);left:calc(100% / 6 - 20px);} #arena:not(.fewplayer)[data-number='8']>.player[data-position='6']{top:calc(60% / 3 - 108px);left:calc(100% / 6 - 20px);}
[data-number='8']>.player[data-position='7']{top:calc(200% / 3 - 340px);left:0;} #arena:not(.fewplayer)[data-number='8']>.player[data-position='7']{top:calc(200% / 3 - 340px);left:0;}
/*--------位置(7人)------*/ /*--------位置(7人)------*/
[data-number='7']>.player[data-position='1']{top:calc(200% / 3 - 160px);left:calc(100% - 150px);} #arena:not(.fewplayer)[data-number='7']>.player[data-position='1']{top:calc(200% / 3 - 340px);left:calc(100% - 120px);}
[data-number='7']>.player[data-position='2']{top:calc(100% / 3 - 170px);left:calc(100% - 150px);} #arena:not(.fewplayer)[data-number='7']>.player[data-position='2']{top:calc(60% / 3 - 108px);left:calc(80% - 96px);}
[data-number='7']>.player[data-position='3']{top:0;left:calc(62.5% - 75px);} #arena:not(.fewplayer)[data-number='7']>.player[data-position='3']{top:0;left:calc(60% - 72px);}
[data-number='7']>.player[data-position='4']{top:0;left:calc(37.5% - 75px);} #arena:not(.fewplayer)[data-number='7']>.player[data-position='4']{top:0;left:calc(40% - 48px);}
[data-number='7']>.player[data-position='5']{top:calc(100% / 3 - 170px);left:0;} #arena:not(.fewplayer)[data-number='7']>.player[data-position='5']{top:calc(60% / 3 - 108px);left:calc(20% - 24px);}
[data-number='7']>.player[data-position='6']{top:calc(200% / 3 - 160px);left:0;} #arena:not(.fewplayer)[data-number='7']>.player[data-position='6']{top:calc(200% / 3 - 340px);left:0;}
[data-number='7']>.card[data-position='1']{top:calc(200% / 3 - 122px);left:calc(100% - 127px);}
[data-number='7']>.card[data-position='2']{top:calc(100% / 3 - 132px);left:calc(100% - 127px);}
[data-number='7']>.card[data-position='3']{top:38px;left:calc(62.5% - 52px);}
[data-number='7']>.card[data-position='4']{top:38px;left:calc(37.5% - 52px);}
[data-number='7']>.card[data-position='5']{top:calc(100% / 3 - 132px);left:23px;}
[data-number='7']>.card[data-position='6']{top:calc(200% / 3 - 122px);left:23px;}
[data-number='7']>.popup[data-position='1']{top:calc(200% / 3 - 150px);left:calc(100% - 186px);}
[data-number='7']>.popup[data-position='2']{top:calc(100% / 3 - 160px);left:calc(100% - 186px);}
[data-number='7']>.popup[data-position='3']{top:190px;left:calc(62.5% + 48px);}
[data-number='7']>.popup[data-position='4']{top:190px;left:calc(37.5% - 75px);}
[data-number='7']>.popup[data-position='5']{top:calc(100% / 3 - 160px);left:160px;}
[data-number='7']>.popup[data-position='6']{top:calc(200% / 3 - 150px);left:160px;}
/*--------位置(6人)------*/ /*--------位置(6人)------*/
[data-number='6']>.player[data-position='1']{top:calc(200% / 3 - 160px);left:calc(100% - 150px);} #arena:not(.fewplayer)[data-number='6']>.player[data-position='1']{top:calc(200% / 3 - 340px);left:calc(100% - 120px);}
[data-number='6']>.player[data-position='2']{top:calc(100% / 3 - 170px);left:calc(100% - 150px);} #arena:not(.fewplayer)[data-number='6']>.player[data-position='2']{top:calc(60% / 3 - 108px);left:calc(75% - 90px);}
[data-number='6']>.player[data-position='3']{top:0;left:calc(50% - 75px);} #arena:not(.fewplayer)[data-number='6']>.player[data-position='3']{top:0;left:calc(50% - 60px);}
[data-number='6']>.player[data-position='4']{top:calc(100% / 3 - 170px);left:0;} #arena:not(.fewplayer)[data-number='6']>.player[data-position='4']{top:calc(60% / 3 - 108px);left:calc(25% - 30px);}
[data-number='6']>.player[data-position='5']{top:calc(200% / 3 - 160px);left:0;} #arena:not(.fewplayer)[data-number='6']>.player[data-position='5']{top:calc(200% / 3 - 340px);left:0;}
[data-number='6']>.card[data-position='1']{top:calc(200% / 3 - 122px);left:calc(100% - 127px);}
[data-number='6']>.card[data-position='2']{top:calc(100% / 3 - 132px);left:calc(100% - 127px);}
[data-number='6']>.card[data-position='3']{top:38px;left:calc(50% - 52px);}
[data-number='6']>.card[data-position='4']{top:calc(100% / 3 - 132px);left:23px;}
[data-number='6']>.card[data-position='5']{top:calc(200% / 3 - 122px);left:23px;}
[data-number='6']>.popup[data-position='1']{top:calc(200% / 3 - 150px);left:calc(100% - 186px);}
[data-number='6']>.popup[data-position='2']{top:calc(100% / 3 - 160px);left:calc(100% - 186px);}
[data-number='6']>.popup[data-position='3']{top:190px;left:calc(50% - 61px);}
[data-number='6']>.popup[data-position='4']{top:calc(100% / 3 - 160px);left:160px;}
[data-number='6']>.popup[data-position='5']{top:calc(200% / 3 - 150px);left:160px;}
/*--------位置(5人)------*/ /*--------位置(5人)------*/
[data-number='5']>.player[data-position='1']{top:calc(200% / 3 - 220px);left:calc(100% - 150px);} #arena:not(.fewplayer)[data-number='5']>.player[data-position='1']{top:calc(200% / 3 - 340px);left:calc(100% - 120px);}
[data-number='5']>.player[data-position='2']{top:0;left:calc(200% / 3 - 50px);} #arena:not(.fewplayer)[data-number='5']>.player[data-position='2']{top:0;left:calc(200% / 3 - 80px);}
[data-number='5']>.player[data-position='3']{top:0;left:calc(100% / 3 - 100px);} #arena:not(.fewplayer)[data-number='5']>.player[data-position='3']{top:0;left:calc(100% / 3 - 40px);}
[data-number='5']>.player[data-position='4']{top:calc(200% / 3 - 220px);left:0;} #arena:not(.fewplayer)[data-number='5']>.player[data-position='4']{top:calc(200% / 3 - 340px);left:0;}
[data-number='5']>.card[data-position='1']{top:calc(150% / 3 - 65px);left:calc(100% - 127px);}
[data-number='5']>.card[data-position='2']{top:38px;left:calc(200% / 3 - 27px);}
[data-number='5']>.card[data-position='3']{top:38px;left:calc(100% / 3 - 77px);}
[data-number='5']>.card[data-position='4']{top:calc(150% / 3 - 65px);left:23px;}
[data-number='5']>.popup[data-position='1']{top:calc(200% / 3 - 210px);left:calc(100% - 186px);}
[data-number='5']>.popup[data-position='2']{top:190px;left:calc(200% / 3 + 73px);}
[data-number='5']>.popup[data-position='3']{top:190px;left:calc(100% / 3 - 100px);}
[data-number='5']>.popup[data-position='4']{top:calc(200% / 3 - 210px);left:160px;}
/*--------位置(4人)------*/ /*--------位置(4人)------*/
[data-number='4']>.player[data-position='1']{top:calc(100% / 3 - 40px);left:calc(100% - 150px);} #arena:not(.fewplayer)[data-number='4']>.player[data-position='1']{top:calc(200% / 3 - 340px);left:calc(100% - 120px);}
[data-number='4']>.player[data-position='2']{top:0;left:calc(50% - 75px);} #arena:not(.fewplayer)[data-number='4']>.player[data-position='2']{top:0;left:calc(50% - 60px);}
[data-number='4']>.player[data-position='3']{top:calc(100% / 3 - 40px);left:0;} #arena:not(.fewplayer)[data-number='4']>.player[data-position='3']{top:calc(200% / 3 - 340px);left:0;}
[data-number='4']>.card[data-position='1']{top:calc(100% / 3 - 2px);left:calc(100% - 127px);}
[data-number='4']>.card[data-position='2']{top:38px;left:calc(50% - 52px);}
[data-number='4']>.card[data-position='3']{top:calc(100% / 3 - 2px);left:23px;}
[data-number='4']>.popup[data-position='1']{top:calc(100% / 3 - 30px);left:calc(100% - 186px);}
[data-number='4']>.popup[data-position='2']{top:190px;left:calc(50% - 61px);}
[data-number='4']>.popup[data-position='3']{top:calc(100% / 3 - 30px);left:160px;}
/*--------位置(3人)------*/ /*--------位置(3人)------*/
[data-number='3']>.player[data-position='1']{top:20px;left:calc(75% + 30px);} #arena:not(.fewplayer)[data-number='3']>.player[data-position='1']{top:calc(60% / 3 - 88px);left:calc(75% + 80px);}
[data-number='3']>.player[data-position='2']{top:20px;left:calc(25% - 180px);} #arena:not(.fewplayer)[data-number='3']>.player[data-position='2']{top:calc(60% / 3 - 88px);left:calc(25% - 200px);}
[data-number='3']>.card[data-position='1']{top:58px;left:calc(75% + 53px);}
[data-number='3']>.card[data-position='2']{top:58px;left:calc(25% - 157px);}
[data-number='3']>.popup[data-position='1']{top:210px;left:calc(75% + 153px);}
[data-number='3']>.popup[data-position='2']{top:210px;left:calc(25% - 180px);}
/*--------位置(2人)------*/ /*--------位置(2人)------*/
[data-number='2']>.player[data-position='1']{top:0;left:calc(50% - 75px);} #arena:not(.fewplayer)[data-number='2']>.player[data-position='1']{top:0;left:calc(50% - 60px);}
[data-number='2']>.card[data-position='1']{top:0;left:calc(50% - 52px);}
[data-number='2']>.popup[data-position='1']{top:190px;left:calc(50% - 61px);}

2
mode/boss.js
View File

@ -130,7 +130,7 @@ mode.boss={
lib.translate.boss_pangtong='涅槃凤雏'; lib.translate.boss_pangtong='涅槃凤雏';
ui.create.cards(); ui.create.cards();
game.finishCards(); game.finishCards();
ui.arena.dataset.number=8; ui.arena.setNumber(8);
ui.control.style.transitionProperty='opacity'; ui.control.style.transitionProperty='opacity';
ui.control.classList.add('bosslist'); ui.control.classList.add('bosslist');
setTimeout(function(){ setTimeout(function(){

2
mode/versus.js
View File

@ -1381,7 +1381,7 @@ mode.versus={
game.players[i].node.action.innerHTML='行动'; game.players[i].node.action.innerHTML='行动';
} }
if(lib.storage.single_control&&lib.storage.control_all&&game.players.length>=4){ if(lib.storage.single_control&&lib.storage.control_all&&game.players.length>=4){
ui.arena.dataset.number=parseInt(ui.arena.dataset.number)+1; ui.arena.setNumber(parseInt(ui.arena.dataset.number)+1);
for(var i=0;i<game.players.length;i++){ for(var i=0;i<game.players.length;i++){
game.players[i].dataset.position=parseInt(game.players[i].dataset.position)+1; game.players[i].dataset.position=parseInt(game.players[i].dataset.position)+1;
} }