From 82b05b58b690a223bd58a996939e3ad96375959d Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Thu, 11 Aug 2016 21:06:43 +0800
Subject: [PATCH] 1

---
 game/game.js    |  2 +-
 game/update.js  | 31 ++-----------------------------
 mode/guozhan.js | 26 +++++++++++++++++++++++---
 3 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/game/game.js b/game/game.js
index a91bd7cb1..93294ed47 100755
--- a/game/game.js
+++ b/game/game.js
@@ -3539,7 +3539,7 @@
                     lib.node={
                         fs:require('fs'),
                         debug:function(){
-                            require('remote').getCurrentWindow().toggleDevTools();
+                            require('electron').remote.getCurrentWindow().toggleDevTools();
                         }
                     };
                     game.download=function(url,folder,onsuccess,onerror,dev){
diff --git a/game/update.js b/game/update.js
index 6f48df418..7c65a5127 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,36 +1,9 @@
 window.noname_update={
-    version:'1.8.20',
+    version:'1.8.20.1',
     changeLog:[
         '修bug',
-        '新武将',
     ],
     files:{
-        global:[
-            'game/asset.js',
-            'game/game.js',
-            'game/phantom.js',
-            'character/swd.js',
-            'character/rank.js',
-            'character/sp.js',
-            'character/yijiang.js',
-            'character/yxs.js',
-            'character/hearth.js',
-            'character/xianjian.js',
-            'character/refresh.js',
-            'character/shenhua.js',
-            'character/standard.js',
-            'character/ow.js',
-            'character/gujian.js',
-            'card/extra.js',
-            'card/swd.js',
-            'card/standard.js',
-            'card/sp.js',
-            'card/hearth.js',
-            'mode/guozhan.js',
-            'mode/identity.js',
-            'layout/mobile/layout.css',
-        ],
-        '1.8.19.7':[],
-        '1.8.20':[],
+        global:[],
     }
 }
diff --git a/mode/guozhan.js b/mode/guozhan.js
index fafd7deb0..f9412a1a3 100755
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -133,13 +133,33 @@ mode.guozhan={
 					delete map[i];
 				}
 			}
-			if(choice.length<num){
+			if(choice.length==num-1){
 				for(var i=0;i<list.length;i++){
 					if(map[lib.character[list[i]][1]]){
 						choice.push(list[i]);
 						list.splice(i--,1);
-						if(choice.length>=num){
-							break;
+						break;
+					}
+				}
+			}
+			else if(choice.length<num-1){
+				var group=null
+				for(var i=0;i<list.length;i++){
+					if(group){
+						if(lib.character[list[i]][1]==group){
+							choice.push(list[i]);
+							list.splice(i--,1);
+							if(choice.length>=num){
+								console.log(group);
+								break;
+							}
+						}
+					}
+					else{
+						if(!map[lib.character[list[i]][1]]){
+							group=lib.character[list[i]][1];
+							choice.push(list[i]);
+							list.splice(i--,1);
 						}
 					}
 				}