From 0495584910b54ed41fa810257c225817e350b1c6 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Mon, 27 Mar 2017 12:27:01 +0800
Subject: [PATCH] b

---
 game/game.js    |  3 ++-
 mode/boss.js    | 40 +++++++++++++++++++++++++++++++---------
 mode/connect.js |  2 ++
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/game/game.js b/game/game.js
index ad6ef6718..0578c5e98 100644
--- a/game/game.js
+++ b/game/game.js
@@ -18982,7 +18982,7 @@
                         ui.rooms=[];
                         game.ip=get.trimip(_status.ip);
                         for(var i=0;i<list.length;i++){
-                            var player=ui.create.player(ui.window);
+                            var player=ui.create.player(ui.window).animate('start');
                             player.dataset.position='c'+i;
                             player.classList.add('connect');
                             player.roomindex=i;
@@ -19024,6 +19024,7 @@
                         else if(typeof game.roomId=='number'){
                             game.send('server','enter',game.roomId,lib.config.connect_nickname,lib.config.connect_avatar);
                         }
+						lib.init.onfree();
                     }
                     if(_status.event.parent){
                         game.forceOver('noover',proceed);
diff --git a/mode/boss.js b/mode/boss.js
index db756e0bf..157a8bceb 100644
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -129,8 +129,16 @@ mode.boss={
 		}
 		ui.create.div(bosslist);
 		lib.translate.boss_pangtong='涅槃凤雏';
-		ui.create.cards();
-		game.finishCards();
+		if(lib.onfree){
+			lib.onfree.push(function(){
+				ui.create.cards();
+				game.finishCards();
+			});
+		}
+		else{
+			ui.create.cards();
+			game.finishCards();
+		}
 		game.addGlobalSkill('autoswap');
 		ui.arena.setNumber(8);
 		ui.control.style.transitionProperty='opacity';
@@ -611,7 +619,7 @@ mode.boss={
 				// dialog.add('0/3');
 				dialog.add([list.slice(0,20),'character']);
 				dialog.noopen=true;
-				var next=game.me.chooseButton(dialog,true);
+				var next=game.me.chooseButton(dialog,true).set('onfree',true);
 				next._triggered=null;
 				next.custom.replace.target=event.customreplacetarget;
 				next.selectButton=[3,3];
@@ -644,10 +652,21 @@ mode.boss={
 					ui.cheat=ui.create.control('更换',event.changeDialog);
 					delete _status.createControl;
 				};
-				event.dialogxx=ui.create.characterDialog();
-				event.dialogxx.classList.add('bosscharacter');
-				event.dialogxx.classList.add('withbg');
-				event.dialogxx.classList.add('fixed');
+				var createCharacterDialog=function(){
+					event.dialogxx=ui.create.characterDialog();
+					event.dialogxx.classList.add('bosscharacter');
+					event.dialogxx.classList.add('withbg');
+					event.dialogxx.classList.add('fixed');
+					if(ui.cheat2){
+						ui.cheat2.classList.remove('disabled');
+					}
+				};
+				if(lib.onfree){
+					lib.onfree.push(createCharacterDialog);
+				}
+				else{
+					createCharacterDialog();
+				}
 				ui.create.cheat2=function(){
 					_status.createControl=event.asboss;
 					ui.cheat2=ui.create.control('自由选将',function(){
@@ -662,7 +681,7 @@ mode.boss={
 							game.uncheck();
 							game.check();
 							if(ui.cheat){
-								ui.cheat.style.opacity=1;
+								ui.cheat.classList.remove('disabled');
 							}
 						}
 						else{
@@ -677,10 +696,13 @@ mode.boss={
 							game.uncheck();
 							game.check();
 							if(ui.cheat){
-								ui.cheat.style.opacity=0.6;
+								ui.cheat.classList.add('disabled');
 							}
 						}
 					});
+					if(lib.onfree){
+						ui.cheat2.classList.add('disabled');
+					}
 					delete _status.createControl;
 				}
 				if(!ui.cheat&&get.config('change_choice'))
diff --git a/mode/connect.js b/mode/connect.js
index 65aad92bb..b368a1e21 100644
--- a/mode/connect.js
+++ b/mode/connect.js
@@ -104,6 +104,7 @@ mode.connect={
                 });
                 return uiintro;
             },220);
+            lib.init.onfree();
         }
         if(window.isNonameServer){
             game.connect(window.isNonameServerIp||'localhost');
@@ -135,5 +136,6 @@ mode.connect={
             add:{},
             replace:{}
         };
+        setTimeout(lib.init.onfree,1000);
     }
 };