From 146bae518f364e944d0f52fde0f4a95865742d6c Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Sat, 11 Feb 2017 09:12:32 +0800
Subject: [PATCH] lt

---
 character/hearth.js       |  4 ++--
 game/game.js              | 16 ++++++++++++++++
 layout/default/layout.css |  3 ++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/character/hearth.js b/character/hearth.js
index c51d93ad3..4300d27a9 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -468,8 +468,8 @@ character.hearth={
 						if(get.tag(card,'damage')){
 							if(player.hasSkill('jueqing')) return [1,-2];
 							if(!target.hasFriend()) return;
-							if(target.hp>=4) return [1,get.tag(card,'damage')*1.5];
-							if(target.hp==3) return [1,get.tag(card,'damage')*1];
+							if(target.hp>=4) return [1,get.tag(card,'damage')*2];
+							if(target.hp==3) return [1,get.tag(card,'damage')*1.5];
 							if(target.hp==2) return [1,get.tag(card,'damage')*0.5];
 						}
 					}
diff --git a/game/game.js b/game/game.js
index 06ab96a48..32f757d2a 100644
--- a/game/game.js
+++ b/game/game.js
@@ -3947,6 +3947,22 @@
         			})
         			return this;
         		};
+				HTMLDivElement.prototype.listenTransition=function(func){
+					if(!Array.isArray(this._transitionlist)){
+						this._transitionList=[];
+					}
+					var id=get.id();
+					var that=this;
+					var callback=function(){
+						if(that._transitionList.contains(id)){
+							that._transitionList.remove(id);
+							func.call(that);
+						}
+					};
+					this._transitionList.push(id);
+					this.addEventListener('webkitTransitionEnd',callback);
+					setTimeout(callback,1000);
+				};
         		HTMLDivElement.prototype.setPosition=function(){
         			var position;
         			if(arguments.length==4){
diff --git a/layout/default/layout.css b/layout/default/layout.css
index 966949ae8..4841cc2a9 100644
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -747,7 +747,7 @@ table {
 	opacity: 0;
 	pointer-events: none
 }
-#arena.auto #handcards1,#arena.auto #handcards2 {
+#arena.auto #me .card{
 	opacity: 0.5
 }
 #autonode>div {
@@ -2784,6 +2784,7 @@ div:hover>.intro {
 }
 #window>.choosedouble.character {
 	transform-origin: top left;
+	transition-property: opacity, transform;
 }
 #window>.choosedouble.character.moved {
 	z-index: 1;