From 8a749d9c258600390bd583dd555779bbba6c37fd Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Tue, 14 Feb 2017 13:54:28 +0800
Subject: [PATCH] f

---
 character/swd.js | 32 ++++++++++++--------------------
 game/game.js     | 20 ++++++++++++++++++--
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/character/swd.js b/character/swd.js
index 40c6b9b88..e52557722 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -4184,27 +4184,19 @@ character.swd={
 				game.addVideo('skill',event.player,'kunlunjing');
 				"step 2"
 				var storage=event.player.storage.kunlunjing;
+				for(var i=0;i<storage.length;i++){
+					var player=storage[i].player;
+					if(player.isIn()){
+						player.lose(player.get('hej'))._triggered=null;
+					}
+				}
+				"step 3"
+				var storage=event.player.storage.kunlunjing;
 				var player,frag;
 				var i,j;
 				for(i=0;i<storage.length;i++){
-					if(game.players.contains(storage[i].player)){
-						player=storage[i].player;
-						while(player.node.handcards1.childNodes.length)
-						ui.discardPile.appendChild(player.node.handcards1.firstChild);
-
-						while(player.node.handcards2.childNodes.length)
-						ui.discardPile.appendChild(player.node.handcards2.firstChild);
-
-						while(player.node.judges.childNodes.length)
-						ui.discardPile.appendChild(player.node.judges.firstChild);
-
-						while(player.node.equips.childNodes.length)
-						ui.discardPile.appendChild(player.node.equips.firstChild);
-					}
-				}
-				for(i=0;i<storage.length;i++){
-					if(game.players.contains(storage[i].player)){
-						player=storage[i].player;
+					player=storage[i].player;
+					if(player.isIn()){
 						for(j=0;j<storage[i].handcards1.length;j++){
 							if(storage[i].handcards1[j].parentNode==ui.discardPile||
 							storage[i].handcards1[j].parentNode==ui.cardPile){
@@ -4261,7 +4253,7 @@ character.swd={
 					}
 				}
 				game.addVideo('skill',event.player,['kunlunjing',data]);
-				"step 3"
+				"step 4"
 				ui.window.show();
 				ui.window.classList.remove('zoomin3');
 				setTimeout(function(){
@@ -4269,7 +4261,7 @@ character.swd={
 					game.resume();
 				},500);
 				game.pause();
-				'step 4'
+				'step 5'
 				ui.updatehl();
 			}
 		},
diff --git a/game/game.js b/game/game.js
index ba5e096ce..3b9bafdac 100644
--- a/game/game.js
+++ b/game/game.js
@@ -24589,11 +24589,19 @@
 							var page=ui.create.div('.hidden.menu-buttons');
 							page.reset=function(){
 								page.innerHTML='';
-								ui.create.div('.config.more.margin-bottom','<div style="transform:none;margin-right:3px">←</div>返回',page,function(){
+								var backbutton=ui.create.div('.menubutton.round','返',page,function(){
 	                                ui.create.templayer();
 	                                page.hide();
 	                                pageboard.show();
 	                            });
+								backbutton.style.zIndex=1;
+								backbutton.style.right='10px';
+								backbutton.style.bottom='15px';
+								var placeholder=ui.create.div('.placeholder',page);
+								placeholder.style.position='relative';
+								placeholder.style.display='block';
+								placeholder.style.width='100%';
+								placeholder.style.height='14px';
 								createDash2('将','武将图片','image/character',page);
 								createDash2('肤','皮肤图片','image/skin',page);
 								createDash2('卡','卡牌图片','image/card',page);
@@ -24608,11 +24616,19 @@
 							var page=ui.create.div('.hidden.menu-buttons');
 							page.reset=function(){
 								page.innerHTML='';
-								ui.create.div('.config.more.margin-bottom','<div style="transform:none;margin-right:3px">←</div>返回',page,function(){
+								var backbutton=ui.create.div('.menubutton.round','返',page,function(){
 	                                ui.create.templayer();
 	                                page.hide();
 	                                pageboard.show();
 	                            });
+								backbutton.style.zIndex=1;
+								backbutton.style.right='10px';
+								backbutton.style.bottom='15px';
+								var placeholder=ui.create.div('.placeholder',page);
+								placeholder.style.position='relative';
+								placeholder.style.display='block';
+								placeholder.style.width='100%';
+								placeholder.style.height='14px';
 								createDash2('技','技能配音','audio/skill',page);
 								createDash2('卡','男性卡牌','audio/card/male',page);
 								createDash2('牌','女性卡牌','audio/card/female',page);