From 3a6ed3419bdb66c45f92f375b2ffb7f386b558cf Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Fri, 27 Nov 2015 00:12:42 +0800
Subject: [PATCH] x

---
 CHANGELOG.MD          |  9 ++++++---
 character/mountain.js | 20 ++++++++++++--------
 game/game.js          |  1 +
 layout/mode/chess.css | 14 ++++++++++++++
 mode/chess.js         |  3 +++
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index bbb4cb737..31b886849 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -1,7 +1,10 @@
 1.6.1
 bug修复
 本轮不无懈按钮
-选将数、牌堆选项
+编辑牌堆功能
 皮肤、珠联璧合提示
-3v3主公技
-高亮颜色选项
+选将人数、高亮颜色选项
+收藏录像
+boss武将包
+标记数量显示
+精简版
diff --git a/character/mountain.js b/character/mountain.js
index 142eede42..4c560ed4e 100755
--- a/character/mountain.js
+++ b/character/mountain.js
@@ -525,6 +525,8 @@ character.mountain={
 			filter:function(event,player){
 				return player.storage.tuntian.length>0;
 			},
+			delay:false,
+			direct:true,
 			content:function(){
 				"step 0"
 				player.chooseCardButton('急袭',player.storage.tuntian);
@@ -532,18 +534,13 @@ character.mountain={
 				if(result.bool){
 					var card=result.buttons[0].link;
 					event.card=card;
-					player.storage.tuntian.remove(card);
-					game.addVideo('storage',player,['tuntian',get.cardsInfo(player.storage.tuntian),'cards']);
-					if(!player.storage.tuntian.length){
-						player.unmarkSkill('tuntian');
-					}
 					player.chooseTarget(function(noname,player,target){
 						var temp=card.name;
 						card.name='shunshou';
 						var result=player.canUse(card,target);
 						card.name=temp;
 						return result;
-					},true).ai=function(target){
+					}).ai=function(target){
 						return -ai.get.attitude(player,target);
 					};
 				}
@@ -551,8 +548,15 @@ character.mountain={
 					event.finish();
 				}
 				"step 2"
-				if(result.bool){
-					player.useCard({name:'shunshou'},[event.card],result.targets[0])
+				if(result.bool&&result.targets&&result.targets.length){
+					var card=event.card;
+					player.storage.tuntian.remove(card);
+					game.addVideo('storage',player,['tuntian',get.cardsInfo(player.storage.tuntian),'cards']);
+					if(!player.storage.tuntian.length){
+						player.unmarkSkill('tuntian');
+					}
+					player.logSkill('jixi',result.targets);
+					player.useCard({name:'shunshou'},[event.card],result.targets[0]);
 				}
 			},
 			ai:{
diff --git a/game/game.js b/game/game.js
index aab247bf9..5cb717da1 100755
--- a/game/game.js
+++ b/game/game.js
@@ -16230,6 +16230,7 @@
 		updatehl:function(){
 			if(!game.me) return;
 			if(!lib.config.low_performance) return;
+			if(!ui.handcards1Container||!ui.handcards2Container) return;
 			var hs1=[],hs2=[];
 			for(var i=0;i<ui.handcards1Container.firstChild.childElementCount;i++){
 				if(!ui.handcards1Container.firstChild.childNodes[i].classList.contains('removing')){
diff --git a/layout/mode/chess.css b/layout/mode/chess.css
index 8fb28f985..4861f3bfb 100755
--- a/layout/mode/chess.css
+++ b/layout/mode/chess.css
@@ -206,3 +206,17 @@
     top: 66px;
     left: 5px;
 }
+.dialog .buttons>.button.character.squarebutton{
+    height:90px;
+}
+.dialog .buttons>.button.character.squarebutton>.hp.text{
+    /*left:22px;*/
+    right: 4px;
+    text-align: right;
+    bottom: 4px;
+    top: auto;
+    left: auto;
+}
+.dialog .buttons>.button.character.squarebutton>.name{
+    top:8px;
+}
diff --git a/mode/chess.js b/mode/chess.js
index 25ad97daf..48c060315 100755
--- a/mode/chess.js
+++ b/mode/chess.js
@@ -3541,6 +3541,9 @@ mode.chess={
 					dialog.add('挑战魔王');
 					dialog.add(bosses);
 				}
+				for(var i=0;i<bosses.childNodes.length;i++){
+					bosses.childNodes[i].classList.add('squarebutton');
+				}
 				ui.control.style.transition='all 0s';
 				if(lib.config.layout=='mobile'){
 					ui.control.style.top='calc(100% - 70px)';