From 89a41eff6d79f01751f179bb620c7c4494ccadab Mon Sep 17 00:00:00 2001 From: libccy Date: Sat, 11 Jun 2016 12:03:15 +0800 Subject: [PATCH] groupcontrol --- game/game.js | 20 -------------------- mode/boss.js | 9 --------- mode/chess.js | 9 --------- mode/guozhan.js | 9 --------- mode/identity.js | 9 --------- mode/stone.js | 9 --------- mode/versus.js | 17 ----------------- 7 files changed, 82 deletions(-) diff --git a/game/game.js b/game/game.js index 8214aff38..75f104a66 100755 --- a/game/game.js +++ b/game/game.js @@ -1827,10 +1827,6 @@ else if(ui.cheat2&&!get.config('free_choose')){ ui.cheat2.close(); delete ui.cheat2; - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2; - } } } }, @@ -2110,10 +2106,6 @@ else if(ui.cheat2&&!get.config('free_choose')){ ui.cheat2.close(); delete ui.cheat2; - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2; - } } } }, @@ -2494,10 +2486,6 @@ else if(ui.cheat2&&!get.config('free_choose')){ ui.cheat2.close(); delete ui.cheat2; - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2; - } } } }, @@ -2729,10 +2717,6 @@ else if(ui.cheat2&&!get.config('free_choose')){ ui.cheat2.close(); delete ui.cheat2; - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2; - } } }, }, @@ -2942,10 +2926,6 @@ else if(ui.cheat2&&!get.config('free_choose')){ ui.cheat2.close(); delete ui.cheat2; - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2; - } } }, }, diff --git a/mode/boss.js b/mode/boss.js index f666e8c6e..a00a2680e 100755 --- a/mode/boss.js +++ b/mode/boss.js @@ -586,16 +586,11 @@ mode.boss={ if(ui.cheat){ ui.cheat.style.opacity=1; } - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2x; - } } else{ if(game.changeCoin){ game.changeCoin(-10); } - ui.cheat2x=ui.create.groupControl(_status.event.parent.dialogxx); this.backup=_status.event.dialog; _status.event.dialog.close(); _status.event.dialog=_status.event.parent.dialogxx; @@ -640,10 +635,6 @@ mode.boss={ ui.cheat2.close(); delete ui.cheat2; } - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2x; - } event.asboss.close(); if(event.boss){ event.result={ diff --git a/mode/chess.js b/mode/chess.js index 99143d04c..f3565c856 100755 --- a/mode/chess.js +++ b/mode/chess.js @@ -4077,16 +4077,11 @@ mode.chess={ if(ui.cheat){ ui.cheat.style.opacity=1; } - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2x; - } } else{ if(game.changeCoin){ game.changeCoin(-10); } - ui.cheat2x=ui.create.groupControl(_status.event.parent.dialogxx); this.backup=_status.event.dialog; _status.event.dialog.close(); _status.event.dialog=_status.event.parent.dialogxx; @@ -4114,10 +4109,6 @@ mode.chess={ ui.cheat2.close(); delete ui.cheat2; } - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2x; - } if(event.asboss){ event.asboss.close(); delete ui.asboss; diff --git a/mode/guozhan.js b/mode/guozhan.js index df6aba808..6abb5f1d1 100755 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -460,16 +460,11 @@ mode.guozhan={ if(ui.cheat){ ui.cheat.style.opacity=1; } - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2x; - } } else{ if(game.changeCoin){ game.changeCoin(-10); } - ui.cheat2x=ui.create.groupControl(_status.event.parent.dialogxx); this.backup=_status.event.dialog; _status.event.dialog.close(); _status.event.dialog=_status.event.parent.dialogxx; @@ -519,10 +514,6 @@ mode.guozhan={ ui.cheat2.close(); delete ui.cheat2; } - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2x; - } if(result.buttons){ game.me.init(result.buttons[0].link,result.buttons[1].link,false); } diff --git a/mode/identity.js b/mode/identity.js index 391ff0d63..c26731700 100755 --- a/mode/identity.js +++ b/mode/identity.js @@ -794,16 +794,11 @@ mode.identity={ if(ui.cheat){ ui.cheat.style.opacity=1; } - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2x; - } } else{ if(game.changeCoin){ game.changeCoin(-10); } - ui.cheat2x=ui.create.groupControl(_status.event.parent.dialogxx); this.backup=_status.event.dialog; _status.event.dialog.close(); _status.event.dialog=_status.event.parent.dialogxx; @@ -830,10 +825,6 @@ mode.identity={ ui.cheat2.close(); delete ui.cheat2; } - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2x; - } if(event.chosen.length){ game.me.init(event.chosen[0],event.chosen[1]); } diff --git a/mode/stone.js b/mode/stone.js index c09af03e5..e2d29acd5 100755 --- a/mode/stone.js +++ b/mode/stone.js @@ -1499,16 +1499,11 @@ mode.stone={ if(ui.cheat){ ui.cheat.style.opacity=1; } - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2x; - } } else{ if(game.changeCoin){ game.changeCoin(-10); } - ui.cheat2x=ui.create.groupControl(_status.event.parent.dialogxx); this.backup=_status.event.dialog; _status.event.dialog.close(); _status.event.dialog=_status.event.parent.dialogxx; @@ -1535,10 +1530,6 @@ mode.stone={ ui.cheat2.close(); delete ui.cheat2; } - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2x; - } if(ui.deckcontrol){ ui.deckcontrol.remove(); delete ui.deckcontrol; diff --git a/mode/versus.js b/mode/versus.js index e249e19d4..2e4d7bb3d 100755 --- a/mode/versus.js +++ b/mode/versus.js @@ -708,16 +708,11 @@ mode.versus={ if(ui.cheat){ ui.cheat.style.opacity=1; } - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2x; - } } else{ if(game.changeCoin){ game.changeCoin(-10); } - ui.cheat2x=ui.create.groupControl(_status.event.parent.dialogxx); this.backup=_status.event.dialog; _status.event.dialog.close(); _status.event.dialog=_status.event.parent.dialogxx; @@ -744,10 +739,6 @@ mode.versus={ ui.cheat2.close(); delete ui.cheat2; } - if(ui.cheat2x){ - ui.cheat2x.close(); - delete ui.cheat2x; - } game.me.init(result.links[0]); game.addRecentCharacter(game.me.name); event.list.remove(game.me.name); @@ -841,9 +832,6 @@ mode.versus={ dialog.buttons[i].classList.add('noclick'); } } - if(!event.groupControl){ - event.groupControl=ui.create.groupControl(dialog); - } game.me.chooseButton(dialog,true).closeDialog=false; event.xdialog=dialog; dialog.static=true; @@ -903,9 +891,6 @@ mode.versus={ } } "step 3" - if(event.groupControl){ - event.groupControl.close(); - } if(event.xdialog){ event.xdialog.close(); } @@ -1483,7 +1468,6 @@ mode.versus={ var func=function(filter,id,selected,map){ var dialog=ui.create.characterDialog(filter,'expandall').open(); dialog.videoId=id; - dialog.groupControl=ui.create.groupControl(dialog); for(var i in map){ var player=lib.playerOL[i]; if(player){ @@ -1580,7 +1564,6 @@ mode.versus={ var dialog=get.idDialog(id); if(dialog){ dialog.close(); - dialog.groupControl.close(); } },event.videoId); }