From a53951b4db8cac70e8e333a23edd978e029f2a64 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Mon, 18 Apr 2016 21:19:22 +0800
Subject: [PATCH] fix

---
 game/game.js    | 14 +++++++++++---
 game/update.js  |  4 ++--
 mode/guozhan.js |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/game/game.js b/game/game.js
index a4b994d61..ccbb23249 100755
--- a/game/game.js
+++ b/game/game.js
@@ -12422,7 +12422,7 @@
                         game.onlineID=null;
                         game.roomId=null;
                     }
-                    if(game.servermode){
+                    if(game.servermode&&!observe){
                         game.saveConfig('reconnect_info',[_status.ip,game.onlineID,game.roomId]);
                     }
                     else{
@@ -15358,6 +15358,12 @@
                 }
                 if(game.servermode){
                     ui.exit.firstChild.innerHTML='返回房间';
+                    setTimeout(function(){
+                        ui.exit.firstChild.innerHTML='退出房间';
+                        _status.roomtimeout=true;
+                        lib.config.reconnect_info[2]=null;
+                        game.saveConfig('reconnect_info',lib.config.reconnect_info);
+                    },10000);
                 }
                 if(ui.tempnowuxie){
     				ui.tempnowuxie.close();
@@ -22434,8 +22440,10 @@
 		click:{
             exit:function(){
                 if(game.servermode&&lib.config.reconnect_info&&_status.over){
-                    lib.config.reconnect_info[2]=game.roomId;
-                    game.saveConfig('reconnect_info',lib.config.reconnect_info);
+                    if(!_status.roomtimeout){
+                        lib.config.reconnect_info[2]=game.roomId;
+                        game.saveConfig('reconnect_info',lib.config.reconnect_info);
+                    }
                 }
                 else{
                     game.saveConfig('reconnect_info');
diff --git a/game/update.js b/game/update.js
index 5316613de..76771ef2e 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,9 +1,9 @@
 window.noname_update={
-    version:'1.8.8.1',
+    version:'1.8.8.2',
     changeLog:[
         '联机大厅改进',
         '默认更新地址修改',
         '可下载皮肤素材',
-        '修复观战bug'
+        '修复观战和国战bug'
     ]
 }
diff --git a/mode/guozhan.js b/mode/guozhan.js
index 24a11de73..408d6a9b0 100755
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -718,6 +718,7 @@ mode.guozhan={
 						game.players[i].identity='unknown';
 						game.players[i].node.name.show();
 						game.players[i].node.name2.show();
+						game.players[i]._group=lib.character[game.players[i].name1][1];
 					}
 				},result);
 			}