diff --git a/card/extra.js b/card/extra.js
index 98187bd2d..f1dc21b7a 100644
--- a/card/extra.js
+++ b/card/extra.js
@@ -68,7 +68,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					if(typeof event.baseDamage!='number') event.baseDamage=1;
 					if(target.isDying()||event.getParent(2).type=='dying'){
-						target.recover(event.baseDamage);
+						target.recover();
 						if(_status.currentPhase==target){
 							target.getStat().card.jiu--;
 						}
@@ -210,7 +210,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					game.delay(2);
 					"step 2"
 					if(result.bool){
-						target.damage('fire',event.baseDamage||1);
+						target.damage('fire');
 					}
 					else{
 						target.addTempSkill('huogong2');
diff --git a/card/guozhan.js b/card/guozhan.js
index 488a927fb..cde521ddd 100644
--- a/card/guozhan.js
+++ b/card/guozhan.js
@@ -462,13 +462,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						target.discard(target.getCards('e',function(card){
 							return lib.filter.cardDiscardable(card,target,'shuiyanqijunx');
 						}));
-						target.damage('thunder',event.baseDamage||1);
+						target.damage('thunder');
 						event.finish();
 					}
 					else if(!target.countCards('e',function(card){
 						return lib.filter.cardDiscardable(card,target,'shuiyanqijunx');
 					})){
-						var next=target.damage(event.baseDamage||1);
+						var next=target.damage();
 						if(!get.is.single()) next.nature='thunder';
 						event.finish();
 						return;
@@ -489,7 +489,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						}));
 					}
 					else{
-						var next=target.damage(event.baseDamage||1);
+						var next=target.damage();
 						if(!get.is.single()) next.nature='thunder'
 					}
 					event.finish();
@@ -861,7 +861,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				selectTarget:-1,
 				modTarget:true,
 				content:function(){
-					target.damage('fire',event.baseDamage||1);
+					target.damage('fire');
 				},
 				ai:{
 					order:5,
diff --git a/card/standard.js b/card/standard.js
index f5bf259d3..8261b1e42 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -171,7 +171,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					}
 					"step 3"
 					if((!result||!result.bool||!result.result||result.result!='shaned')&&!event.unhurt){
-						target.damage(get.nature(event.card),event.baseDamage+event.extraDamage);
+						target.damage(get.nature(event.card));
 						event.result={bool:true}
 						event.trigger('shaDamage');
 					}
@@ -193,7 +193,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					});
 					"step 5"
 					if((!result||!result.bool)&&!event.unhurt){
-						target.damage(get.nature(event.card),event.baseDamage+event.extraDamage);
+						target.damage(get.nature(event.card));
 						event.result={bool:true}
 						event.trigger('shaDamage');
 						event.finish();
@@ -203,7 +203,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					}
 					"step 6"
 					if((!result||!result.bool)&&!event.unhurt){
-						target.damage(get.nature(event.card),event.baseDamage+event.extraDamage);
+						target.damage(get.nature(event.card));
 						event.result={bool:true}
 						event.trigger('shaDamage');
 						event.finish();
@@ -388,7 +388,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return target.hp<target.maxHp;
 				},
 				content:function(){
-					target.recover(event.baseDamage||1);
+					target.recover();
 				},
 				ai:{
 					basic:{
@@ -846,7 +846,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return target.isHealthy();
 				},
 				content:function(){
-					target.recover(event.baseDamage||1);
+					target.recover();
 				},
 				ai:{
 					basic:{
@@ -895,7 +895,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					}
 					"step 1"
 					if(result.bool==false){
-						target.damage(event.baseDamage);
+						target.damage();
 					}
 				},
 				ai:{
@@ -970,7 +970,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					}
 					"step 1"
 					if(result.bool==false){
-						target.damage(event.baseDamage);
+						target.damage();
 					}
 				},
 				ai:{
@@ -1147,10 +1147,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						}
 						else{
 							if(event.turn==target){
-								target.damage(event.baseDamage+event.extraDamage);
+								target.damage();
 							}
 							else{
-								player.damage(target,event.baseDamage+event.extraDamage);
+								player.damage(target);
 							}
 						}
 					}
diff --git a/card/yingbian.js b/card/yingbian.js
index 11a200ca3..6d294db28 100644
--- a/card/yingbian.js
+++ b/card/yingbian.js
@@ -154,7 +154,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					'step 1'
 					if(result.bool){
 						target.showCards(result.cards);
-						if(get.suit(card)!=get.suit(result.cards[0])) target.damage(event.baseDamage||1);
+						if(get.suit(card)!=get.suit(result.cards[0])) target.damage();
 					}
 				},
 				ai:{
diff --git a/card/yongjian.js b/card/yongjian.js
index 0dd8bac01..73b94e365 100644
--- a/card/yongjian.js
+++ b/card/yongjian.js
@@ -30,7 +30,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				},
 				content:function(){
 					'step 0'
-					target.recover(event.baseDamage||1);
+					target.recover();
 					'step 1'
 					if(target.hasCard(function(card){
 						return _status.connectMode||get.name(card,target)=='du';
@@ -56,6 +56,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					'step 0'
 					if(typeof event.baseDamage!='number') event.baseDamage=1;
+					if(typeof event.extraDamage!='number') event.extraDamage=0;
 					if(!target.countCards('h')||!player.isIn()) event.finish();
 					else player.choosePlayerCard(target,'h',true);
 					'step 1'
@@ -64,8 +65,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						var str=get.translation(player);
 						player.showCards(event.show_card);
 						target.chooseControl().set('choiceList',[
-							'令'+str+'获得'+get.translation(event.show_card),
-							'受到'+str+'造成的'+event.baseDamage+'点伤害',
+							`令${str}获得${get.translation(event.show_card)}`,
+							`受到${str}造成的${event.baseDamage+event.extraDamage}点伤害`,
 						]).set('ai',function(){
 							var evt=_status.event.getParent(),player=evt.target,source=evt.player,card=evt.show_card;
 							if(get.damageEffect(player,source,player)>0) return 1;
diff --git a/character/refresh.js b/character/refresh.js
index c2fbdf18d..ab6f5a6f6 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -1080,7 +1080,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					game.delay(2);
 					"step 2"
 					if(result.bool){
-						target.damage('fire',event.baseDamage||1);
+						target.damage('fire');
 					}
 					else{
 						target.addTempSkill('huogong2');
diff --git a/game/game.js b/game/game.js
index 234373256..37f976c59 100644
--- a/game/game.js
+++ b/game/game.js
@@ -23783,7 +23783,7 @@
 					if(next.source==undefined&&!nosource) next.source=event.customSource||event.player;
 					if(next.source&&next.source.isDead()) delete next.source;
 					if(next.unreal==undefined) next.unreal=false;
-					if(next.num==undefined) next.num=1;
+					if(next.num==undefined) next.num=(event.baseDamage||1)+(event.extraDamage||0);
 					next.original_num=next.num;
 					next.change_history=[];
 					if(next.nature=='poison') delete next._triggered;
@@ -23833,8 +23833,8 @@
 					}
 					if(next.card==undefined&&!nocard) next.card=event.card;
 					if(next.cards==undefined&&!nocard) next.cards=event.cards;
-					if(next.source==undefined&&!nosource) next.source=event.player;
-					if(next.num==undefined) next.num=1;
+					if(next.source==undefined&&!nosource) next.source=event.customSource||event.player;
+					if(next.num==undefined) next.num=(event.baseDamage||1)+(event.extraDamage||0);
 					if(next.num<=0) _status.event.next.remove(next);
 					next.setContent('recover');
 					return next;