From 23a5f7a110266635d3bd08e2befaf9bcd096899e Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Sat, 26 Oct 2019 20:42:19 +0800
Subject: [PATCH] Add files via upload

---
 game/game.js   | 24 ++++++++++++++++++------
 game/update.js | 18 +++++++++---------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/game/game.js b/game/game.js
index 6d53a8a0d..0f0695110 100644
--- a/game/game.js
+++ b/game/game.js
@@ -12749,7 +12749,7 @@
 						player.line(target,'green');
 					}
 					if(!event.chooseonly){
-						var next=target.discard(event.cards);
+						var next=target.discard(event.cards,'notBySelf');
 						if(event.delay===false){
 							next.set('delay',false);
 						}
@@ -12895,7 +12895,7 @@
 						player.line(target,'green');
 					}
 					if(!event.chooseonly){
-						var next=player.gain(event.cards,target,event.visibleMove?'give':'giveAuto');
+						var next=player.gain(event.cards,target,event.visibleMove?'give':'giveAuto','bySelf');
 						if(event.delay===false){
 							next.set('delay',false);
 						}
@@ -13972,11 +13972,11 @@
 					var card=event.cardlist[num];
 					if(card&&event.cards.contains(card)){
 						if(current==game.me||current.isOnline()||(player==game.me&&!event.delayed)){
-							player.gain(card,current);
+							player.gain(card,current,'bySelf');
 							event.delayed=true;
 						}
 						else{
-							player.gain(card,current).set('delay',false);
+							player.gain(card,current,'bySelf').set('delay',false);
 						}
 					}
 					event.num++;
@@ -16997,6 +16997,12 @@
 						else if(get.itemtype(arguments[i])=='card'){
 							next.card=arguments[i];
 						}
+						else if(get.itemtype(arguments[i])=='players'){
+							next.targets=arguments[i];
+						}
+						else if(get.itemtype(arguments[i])=='player'){
+							next.targets=[arguments[i]];
+						}
 						else if(typeof arguments[i]=='object'&&arguments[i].name){
 							next.card=arguments[i];
 						}
@@ -17672,7 +17678,7 @@
 					}
 					var cards=this.getCards(position).randomGets(num);
 					if(cards.length){
-						var next=this.discard(cards);
+						var next=this.discard(cards,'notBySelf');
 						if(typeof delay=='boolean'){
 							next.delay=delay;
 						}
@@ -17701,7 +17707,7 @@
 							if(line){
 								this.line(target,'green');
 							}
-							this.gain(cards,target,'log');
+							this.gain(cards,target,'log','bySelf');
 							target.$giveAuto(cards,this);
 						}
 						return cards;
@@ -17728,6 +17734,9 @@
 						else if(get.objtype(arguments[i])=='div'){
 							next.position=arguments[i];
 						}
+						else if(arguments[i]=='notBySelf'){
+							next.notBySelf=true;
+						}
 					}
 					if(next.cards==undefined) _status.event.next.remove(next);
 					next.setContent('discard');
@@ -17846,6 +17855,9 @@
 						else if(arguments[i]=='fromStorage'){
 							next.fromStorage=true;
 						}
+						else if(arguments[i]=='bySelf'){
+							next.bySelf=true;
+						}
 						else if(typeof arguments[i]=='string'){
 							next.animate=arguments[i];
 						}
diff --git a/game/update.js b/game/update.js
index 377f269d1..8efd14d1a 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,6 +1,6 @@
 window.noname_update={
-	version:'1.9.94.1.2',
-	update:'1.9.94.1.1',
+	version:'1.9.94.2',
+	update:'1.9.94.1.2',
 	changeLog:[
 		'BUG修复',
 	],
@@ -10,20 +10,20 @@ window.noname_update={
 		//'card/standard.js',
 		//'card/swd.js',
 		//'card/guozhan.js',
-		//'character/diy.js',
-		//'character/extra.js',
+		'character/diy.js',
+		'character/extra.js',
 		//'character/mobile.js',
 		//'character/old.js',
 		//'character/refresh.js',
-		//'character/shenhua.js',
-		//'character/sp.js',
+		'character/shenhua.js',
+		'character/sp.js',
 		//'character/tw.js',
 		//'character/standard.js',
-		//'character/xinghuoliaoyuan.js',
+		'character/xinghuoliaoyuan.js',
 		'character/yijiang.js',
 		//'mode/doudizhu.js',
-		//'mode/guozhan.js',
+		'mode/guozhan.js',
 		//'mode/boss.js',
-		//'game/game.js',
+		'game/game.js',
 	]
 };