From 003ccb99b3ad79a048885bb98adea94a281c6c49 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Tue, 16 Aug 2016 01:06:18 +0800
Subject: [PATCH] h

---
 game/game.js   | 26 +++++++++++++++++++-------
 mode/boss.js   | 32 +++++++++++++++++---------------
 mode/chess.js  | 41 ++++++++++++++++++++++-------------------
 mode/tafang.js | 42 +++++++++++++++++++++---------------------
 mode/versus.js |  2 +-
 5 files changed, 80 insertions(+), 63 deletions(-)

diff --git a/game/game.js b/game/game.js
index 8e597368e..a8e40cfc6 100755
--- a/game/game.js
+++ b/game/game.js
@@ -1031,6 +1031,14 @@
 							}
 						}
 					},
+					show_handcardbutton:{
+						name:'显示手牌按钮',
+						init:true,
+						unfrequent:true,
+						onclick:function(bool){
+							game.saveConfig('show_handcardbutton',bool);
+						}
+					},
 					show_wuxie:{
 						name:'显示不询问无懈',
 						init:false,
@@ -1245,6 +1253,12 @@
                         }
                         else{
                             map.clear_log.hide();
+                        }
+                        if(lib.config.mode=='versus'||lib.config.mode=='chess'||lib.config.mode=='tafang'||lib.config.mode=='boss'){
+                            map.show_handcardbutton.show();
+                        }
+                        else{
+                            map.show_handcardbutton.hide();
                         }
 						// if(config.theme=='woodden'&&config.image_background=='default'){
 						// 	map.background_color_wood.show();
@@ -31317,6 +31331,11 @@
 				}
 				uiintro.add(capt);
 
+                if(node.isUnderControl()){
+                    uiintro.add('<div class="text center">手牌</div>');
+                    uiintro.addSmall(node.get('h'));
+                }
+
 				var skills=node.skills;
 				var skills2=game.filterSkills(node.skills,node);
 				for(i=0;i<skills.length;i++){
@@ -31342,13 +31361,6 @@
 						}
 					}
 				}
-				// var forbidden=node.forbiddenSkills;
-				// for(i=0;i<forbidden.length;i++){
-				// 	if(lib.translate[forbidden[i]+'_info']){
-				// 		translation=get.translation(forbidden[i]).slice(0,2);
-				// 		uiintro.add('<div><div class="skill">『'+translation+'』</div><div>'+'已禁用'+'</div></div>');
-				// 	}
-				// }
 
                 if(lib.config.show_favourite&&lib.character[node.name]&&get.mode()!='story'){
                     var addFavourite=ui.create.div('.text.center');
diff --git a/mode/boss.js b/mode/boss.js
index 997e95063..bc67baad0 100755
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -233,25 +233,27 @@ mode.boss={
 			game.onSwapControl();
 			// ui.fakemebg.show();
 
-			lib.setPopped(ui.create.system('手牌',null,true),function(){
-				var uiintro=ui.create.dialog('hidden');
+			if(lib.config.show_handcardbutton){
+				lib.setPopped(ui.create.system('手牌',null,true),function(){
+					var uiintro=ui.create.dialog('hidden');
 
-				var players=game.players.concat(game.dead);
-				for(var i=0;i<players.length;i++){
-					if(players[i].side==game.me.side&&players[i]!=game.me){
-						uiintro.add(get.translation(players[i]));
-						var cards=players[i].get('h');
-						if(cards.length){
-							uiintro.addSmall(cards,true);
-						}
-						else{
-							uiintro.add('（无）');
+					var players=game.players.concat(game.dead);
+					for(var i=0;i<players.length;i++){
+						if(players[i].side==game.me.side&&players[i]!=game.me){
+							uiintro.add(get.translation(players[i]));
+							var cards=players[i].get('h');
+							if(cards.length){
+								uiintro.addSmall(cards,true);
+							}
+							else{
+								uiintro.add('（无）');
+							}
 						}
 					}
-				}
 
-				return uiintro;
-			},220);
+					return uiintro;
+				},220);
+			}
 		}
 		lib.setPopped(ui.create.system('重整',null,true),function(){
 			var uiintro=ui.create.dialog('hidden');
diff --git a/mode/chess.js b/mode/chess.js
index 37d9543bd..95d461ede 100755
--- a/mode/chess.js
+++ b/mode/chess.js
@@ -296,28 +296,31 @@ mode.chess={
 			lib.posmap[enemy.dataset.position]=enemy;
 		}
 
-		lib.setPopped(ui.create.system('手牌',null,true),function(){
-			var uiintro=ui.create.dialog('hidden');
-			var added=false;
-			for(var i=0;i<game.players.length;i++){
-				if(game.players[i].side==game.me.side&&game.players[i]!=game.me){
-					added=true;
-					uiintro.add(get.translation(game.players[i]));
-					var cards=game.players[i].get('h');
-					if(cards.length){
-						uiintro.addSmall(cards,true);
-					}
-					else{
-						uiintro.add('（无）');
+		if(lib.config.show_handcardbutton){
+			lib.setPopped(ui.create.system('手牌',null,true),function(){
+				var uiintro=ui.create.dialog('hidden');
+				var added=false;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side==game.me.side&&game.players[i]!=game.me){
+						added=true;
+						uiintro.add(get.translation(game.players[i]));
+						var cards=game.players[i].get('h');
+						if(cards.length){
+							uiintro.addSmall(cards,true);
+						}
+						else{
+							uiintro.add('（无）');
+						}
 					}
 				}
-			}
-			if(!added){
-				uiintro.add('无队友');
-			}
+				if(!added){
+					uiintro.add('无队友');
+				}
+
+				return uiintro;
+			},220);
+		}
 
-			return uiintro;
-		},220);
 		if(!event.video&&_status.mode=='combat'&&!_status.vsboss&&(_status.replacelist.length||get.config('additional_player'))){
 			_status.enemyDied=0;
 			_status.friendDied=0;
diff --git a/mode/tafang.js b/mode/tafang.js
index 5e2d3af4b..4612f8d32 100644
--- a/mode/tafang.js
+++ b/mode/tafang.js
@@ -221,30 +221,30 @@ mode.tafang={
 				event.obs.push(cg.toString());
 			}
 		}
-		_status.enemyCount=0;
-		_status.friendCount=0;
 
-		lib.setPopped(ui.create.system('手牌',null,true),function(){
-			var uiintro=ui.create.dialog('hidden');
-			var added=false;
-			for(var i=0;i<game.players.length;i++){
-				if(game.players[i].side==game.me.side&&game.players[i]!=game.me){
-					added=true;
-					uiintro.add(get.translation(game.players[i]));
-					var cards=game.players[i].get('h');
-					if(cards.length){
-						uiintro.addSmall(cards,true);
-					}
-					else{
-						uiintro.add('（无）');
+		if(lib.config.show_handcardbutton){
+			lib.setPopped(ui.create.system('手牌',null,true),function(){
+				var uiintro=ui.create.dialog('hidden');
+				var added=false;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side==game.me.side&&game.players[i]!=game.me){
+						added=true;
+						uiintro.add(get.translation(game.players[i]));
+						var cards=game.players[i].get('h');
+						if(cards.length){
+							uiintro.addSmall(cards,true);
+						}
+						else{
+							uiintro.add('（无）');
+						}
 					}
 				}
-			}
-			if(!added){
-				uiintro.add('无队友');
-			}
-			return uiintro;
-		},220);
+				if(!added){
+					uiintro.add('无队友');
+				}
+				return uiintro;
+			},220);
+		}
 
 		ui.create.me();
 		ui.create.fakeme();
diff --git a/mode/versus.js b/mode/versus.js
index f2695ee22..5645c1b88 100755
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -294,7 +294,7 @@ mode.versus={
 
 					// ui.versusreplace=ui.create.system('换人',null,true);
 					// lib.setPopped(ui.versusreplace,game.versusHoverReplace);
-					if(game.players.length>2){
+					if(game.players.length>2&&lib.config.show_handcardbutton){
 						ui.versushs=ui.create.system('手牌',null,true);
 						lib.setPopped(ui.versushs,game.versusHoverHandcards,220);
 					}