From e70e9c1830b1c08e3e1dc35fa7189a2973e9d477 Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Thu, 9 Jul 2015 13:21:22 +0800
Subject: [PATCH] =?UTF-8?q?canvas=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/hearth.js       |  2 +-
 game/game.js              | 26 +++++++++++++++++---------
 layout/default/layout.css |  5 +++++
 mode/identity.js          |  2 +-
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/character/hearth.js b/character/hearth.js
index c045912be..461434119 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -1080,7 +1080,7 @@ character.hearth={
 		dunji:'盾击',
 		dunji_info:'出牌阶段限，你可以失去你的所有护甲，并对等量的其他角色各造成一点伤害',
 		qiaodong:'巧动',
-		qiaodong_info:'你可以将一张装备牌当作当使用或打出',
+		qiaodong_info:'你可以将一张装备牌当作闪使用或打出',
 		fengxian:'奉献',
 		fengxian_info:'出牌阶段限一次，你可以令场上所有角色各弃置一张手牌',
 		zhanhou:'战吼',
diff --git a/game/game.js b/game/game.js
index 538846302..44ad945cd 100644
--- a/game/game.js
+++ b/game/game.js
@@ -89,8 +89,8 @@
 			var ctx=ui.ctx;
 			ctx.shadowBlur=5;
 			ctx.shadowColor='rgba(0,0,0,0.3)';
-			ctx.fillStyle='white';
 			ctx.strokeStyle='white';
+			ctx.lineCap='round';
 			ctx.lineWidth=3;
 			ctx.save();
 			for(var i=0;i<lib.canvasUpdates.length;i++){
@@ -5331,6 +5331,7 @@
 				}
 				ctx.beginPath();
 				if(dashed){
+					ctx.lineCap='butt';
 					ctx.setLineDash([8,2]);
 				}
 				ctx.moveTo(from[0],from[1]);
@@ -5994,11 +5995,13 @@
 					}
 				}
 			}
-			ui.arena.classList.remove('selecting');
-			_status.imchoosing=false;
-			_status.lastdragchange.length=0;
-			_status.mousedragging=null;
-			_status.mousedragorigin=null;
+			if(arguments[0]!='target'&&arguments[0]!='card'&&arguments[0]!='button'){
+				ui.arena.classList.remove('selecting');
+				_status.imchoosing=false;
+				_status.lastdragchange.length=0;
+				_status.mousedragging=null;
+				_status.mousedragorigin=null;
+			}
 			ui.canvas.width=ui.arena.offsetWidth;
 			ui.canvas.height=ui.arena.offsetHeight;
 			for(var i=0;i<game.players.length;i++){
@@ -8445,7 +8448,6 @@
 					dialogs[i].delete();
 				}
 				var node=_status.currentmouseenter;
-
 				if(_status.mousedragging){
 					e.preventDefault();
 					ui.canvas.width=ui.arena.offsetWidth;
@@ -8453,7 +8455,6 @@
 					var ctx=ui.ctx;
 					ctx.shadowBlur=5;
 					ctx.shadowColor='rgba(0,0,0,0.3)';
-					ctx.fillStyle='white';
 					ctx.strokeStyle='white';
 					ctx.lineWidth=3;
 					ctx.setLineDash([8,2]);
@@ -8508,7 +8509,13 @@
 							}
 							if(itemtype!='player'||(ex>item.offsetLeft&&ex<item.offsetLeft+item.offsetWidth&&
 								ey>item.offsetTop&&ey<item.offsetTop+item.offsetHeight)){
-								if(item.classList.contains('selectable')&&_status.dragstatuschanged!=item){
+								var targetfixed=false;
+								if(itemtype=='player'){
+									if(get.select(_status.event.selectTarget)[1]==-1){
+										targetfixed=true;
+									}
+								}
+								if(!targetfixed&&item.classList.contains('selectable')&&_status.dragstatuschanged!=item){
 									_status.mouseleft=true;
 									_status.dragstatuschanged=item;
 									_status.clicked=false;
@@ -10635,6 +10642,7 @@
 						}
 						return false;
 					}
+					break;
 				}
 				default:{
 					if(typeof type=='string'){
diff --git a/layout/default/layout.css b/layout/default/layout.css
index a0c8eea27..35a2d225b 100644
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -19,6 +19,11 @@ table{table-layout: fixed;}
 	top:0;
 	z-index:20
 }
+#arena>canvas{
+	z-index: 10;
+	pointer-events: none;
+	position: absolute;
+}
 #me,#mebg{width: 100%;height: 140px;top:calc(100% - 140px);left:0;}
 #mebg{z-index:-1}
 #handcards1,#handcards2{width: calc(50% - 140px);height: 127px;padding: 10px;}
diff --git a/mode/identity.js b/mode/identity.js
index 77a2bd308..863b87960 100644
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -580,7 +580,7 @@ mode.identity={
 					case 'zhong':
 						switch(identity2){
 							case 'zhu': return 10;
-							case 'zhong': return get.population('fan')>0?4:-1;
+							case 'zhong': return get.population('fan')>0?4:0;
 							case 'nei':
 								if(get.population('fan')==0) return -2;
 								return Math.min(3,-situation);