From ff24810d251943208e8140f2bda7b7f27751ad54 Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Mon, 13 Jan 2020 23:37:51 +0800
Subject: [PATCH] Add files via upload

---
 game/asset.js  |  7 ++++++-
 game/game.js   | 19 +++++++++++++++++--
 game/update.js | 22 +++++++++++-----------
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/game/asset.js b/game/asset.js
index b2174c6e6..8012ea879 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-	'1.9.97',
+	'1.9.97.1',
 	'audio/background/aozhan_chaoming.mp3',
 	'audio/background/aozhan_online.mp3',
 	'audio/background/aozhan_rewrite.mp3',
@@ -2448,6 +2448,11 @@ window.noname_asset_list=[
 	'image/character/re_caiwenji.jpg',
 	'image/character/re_jiangwei.jpg',
 	'image/character/key_umi.jpg',
+	'image/character/key_rei.jpg',
+	'image/character/hhzz_kanade.jpg',
+	'image/character/hhzz_shiona.jpg',
+	'image/character/hhzz_takaramono1.jpg',
+	'image/character/hhzz_takaramono2.jpg',
 	
 	'image/character/baiwuchang.jpg',
 	'image/character/baosanniang.jpg',
diff --git a/game/game.js b/game/game.js
index 7d36bdaee..54556c13f 100644
--- a/game/game.js
+++ b/game/game.js
@@ -18023,7 +18023,7 @@
 						game.addVideo('directequip',this,get.cardsInfo(cards));
 					}
 				},
-				directgain:function(cards){
+				directgain:function(cards,broadcast){
 					var hs=this.getCards('h');
 					for(var i=0;i<cards.length;i++){
 						if(hs.contains(cards[i])){
@@ -18048,7 +18048,7 @@
 						game.addVideo('directgain',this,get.cardsInfo(cards));
 						this.update();
 					}
-					game.broadcast(function(player,cards){
+					if(broadcast!==false) game.broadcast(function(player,cards){
 						player.directgain(cards);
 					},this,cards);
 					return this;
@@ -41225,6 +41225,21 @@
 				// if(!lib.config.show_cardpile||_status.connectMode){
 				// 	ui.cardPileButton.style.display='none';
 				// }
+				
+				ui.sortCard=ui.create.system('整理手牌',function(){
+					var hs=game.me.getCards('h');
+					if(!hs.length) return;
+					game.addVideo('lose',game.me,[get.cardsInfo(hs),[],[]]);
+					for(var i=0;i<hs.length;i++){
+						hs[i].goto(ui.special);
+					}
+					hs.sort(function(b,a){
+						if(a.name!=b.name) return lib.sort.card(a.name,b.name);
+						else if(a.suit!=b.suit) return lib.suit.indexOf(a)-lib.suit.indexOf(b);
+						else return a.number-b.number;
+					});
+					game.me.directgain(hs,false);
+				});
 				ui.playerids=ui.create.system('显示身份',function(){
 					if(game.showIdentity){
 						game.showIdentity();
diff --git a/game/update.js b/game/update.js
index 55bfa55e0..72063a74e 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,9 +1,9 @@
 window.noname_update={
-	version:'1.9.97',
-	update:'1.9.96.9.1',
+	version:'1.9.97.1',
+	update:'1.9.97',
 	changeLog:[
-		'界吕蒙，SP贾诩调整',
-		'屏幕常亮全版本适配',
+		'幻化之战',
+		'手牌整理',
 		'BUG修复',
 	],
 	files:[
@@ -14,8 +14,8 @@ window.noname_update={
 		//'card/swd.js',
 		//'card/guozhan.js',
 		//'card/gwent.js',
-		//'character/diy.js',
-		'character/extra.js',
+		'character/diy.js',
+		//'character/extra.js',
 		//'character/hearth.js',
 		//'character/gujian.js',
 		//'character/gwent.js',
@@ -30,23 +30,23 @@ window.noname_update={
 		//'character/swd.js',
 		//'character/xianjian.js',
 		//'character/xinghuoliaoyuan.js',
-		'character/yijiang.js',
+		//'character/yijiang.js',
 		//'character/yxs.js',
 		//'extension/boss/extension.js',
 		//'layout/default/layout.css',
 		//'mode/identity.js',
 		//'mode/doudizhu.js',
-		'mode/guozhan.js',
+		//'mode/guozhan.js',
 		//'mode/single.js',
 		//'mode/stone.js',
 		'mode/brawl.js',
-		'mode/versus.js',
+		//'mode/versus.js',
 		//'mode/boss.js',
 		'game/game.js',
-		'game/NoSleep.js',
+		//'game/NoSleep.js',
 		//'game/config.js',
 		//'game/package.js',
 		//'game/asset.js',
-		'game/source.js',
+		//'game/source.js',
 	]
 };