From 7075805c048de39c98e1174a702e989620a52839 Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Fri, 31 Jul 2020 11:00:16 +0800
Subject: [PATCH] fix

---
 game/game.js   |  5 +++++
 game/update.js | 24 ++++++++++++------------
 mode/brawl.js  | 14 ++++++++++++++
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/game/game.js b/game/game.js
index 79e2b89e5..320b75dca 100644
--- a/game/game.js
+++ b/game/game.js
@@ -6013,6 +6013,11 @@
 						init:true,
 						frequent:true
 					},
+					liangjunduilei:{
+						name:'两军对垒',
+						init:true,
+						frequent:true
+					},
 					scene:{
 						name:'创建场景',
 						init:true,
diff --git a/game/update.js b/game/update.js
index 3061b3721..75e334510 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,6 +1,6 @@
 window.noname_update={
-	version:'1.9.100.6',
-	update:'1.9.100.5',
+	version:'1.9.100.6.1',
+	update:'1.9.100.6',
 	changeLog:[
 		'武将技能设计征集比赛2020（三国组）',
 		'星张辽，星甘宁，星徐晃，星张郃',
@@ -9,36 +9,36 @@ window.noname_update={
 		
 	],
 	files:[
-		'card/extra.js',
+		//'card/extra.js',
 		//'card/huanlekapai.js',
 		//'card/sp.js',
-		'card/standard.js',
+		//'card/standard.js',
 		//'card/swd.js',
 		//'card/mtg.js',
 		//'card/gujian.js',
 		//'card/guozhan.js',
 		//'card/gwent.js',
-		'card/yunchou.js',
+		//'card/yunchou.js',
 		//'card/zhenfa.js',
 		//'card/zhulu.js',
-		'character/diy.js',
-		'character/extra.js',
+		//'character/diy.js',
+		//'character/extra.js',
 		//'character/hearth.js',
 		//'character/gujian.js',
 		//'character/gwent.js',
         //'character/hearth.js',
-		'character/mobile.js',
+		//'character/mobile.js',
 		//'character/mtg.js',
 		//'character/old.js',
-		'character/refresh.js',
+		//'character/refresh.js',
 		//'character/shenhua.js',
-		'character/sp.js',
+		//'character/sp.js',
 		//'character/tw.js',
 		//'character/standard.js',
 		//'character/swd.js',
 		//'character/xianjian.js',
-		'character/xinghuoliaoyuan.js',
-		'character/yijiang.js',
+		//'character/xinghuoliaoyuan.js',
+		//'character/yijiang.js',
 		//'character/yxs.js',
 		//'extension/boss/extension.js',
 		//'layout/default/layout.css',
diff --git a/mode/brawl.js b/mode/brawl.js
index d60aa330c..7d550de60 100644
--- a/mode/brawl.js
+++ b/mode/brawl.js
@@ -2431,6 +2431,13 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
    					setTimeout(function(){
    						ui.arena.classList.remove('choose-character');
    					},500);
+   					if(get.config('two_phaseswap')){
+   						game.addGlobalSkill('autoswap');
+   						if(lib.config.show_handcardbutton){
+   							ui.versushs=ui.create.system('手牌',null,true);
+   							lib.setPopped(ui.versushs,game.versusHoverHandcards,220);
+   						}
+   					}
    				});
    			};
 					}
@@ -2757,6 +2764,13 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
    					setTimeout(function(){
    						ui.arena.classList.remove('choose-character');
    					},500);
+   					if(get.config('two_phaseswap')){
+   						game.addGlobalSkill('autoswap');
+   						if(lib.config.show_handcardbutton){
+   							ui.versushs=ui.create.system('手牌',null,true);
+   							lib.setPopped(ui.versushs,game.versusHoverHandcards,220);
+   						}
+   					}
    				});
    			};
 					}