From 9b0a35bfb1fce8dc0fba358de462a8c07d6ff7f9 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Thu, 2 Mar 2017 21:11:10 +0800
Subject: [PATCH] s

---
 card/standard.js     | 2 +-
 card/yunchou.js      | 4 ++--
 character/diy.js     | 3 +--
 character/hearth.js  | 2 +-
 character/swd.js     | 4 ++--
 character/yijiang.js | 2 +-
 character/yxs.js     | 2 +-
 game/game.js         | 4 ++--
 8 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/card/standard.js b/card/standard.js
index 7cbe6f561..747384d92 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -466,7 +466,7 @@ card.standard={
 				if(result&&result.control=='顺时针'){
 					var evt=event.getParent();
 					evt.fixedSeat=true;
-					get.sortSeat(evt.targets);
+					evt.targets.sortBySeat();
 					evt.targets.reverse();
 					if(evt.targets[evt.targets.length-1]==player){
 						evt.targets.unshift(evt.targets.pop());
diff --git a/card/yunchou.js b/card/yunchou.js
index 5a60997c2..4a5802348 100644
--- a/card/yunchou.js
+++ b/card/yunchou.js
@@ -24,7 +24,7 @@ card.yunchou={
 				if(result&&result.control=='顺时针'){
 					var evt=event.getParent();
 					evt.fixedSeat=true;
-					get.sortSeat(evt.targets);
+					evt.targets.sortBySeat();
 					evt.targets.reverse();
 					if(evt.targets[evt.targets.length-1]==player){
 						evt.targets.unshift(evt.targets.pop());
@@ -315,7 +315,7 @@ card.yunchou={
 					event.finish();
 				}
 				else{
-					get.sortSeat(list,target);
+					list.sortBySeat(target);
 					event.list=list;
 					event.torespond=[];
 				}
diff --git a/character/diy.js b/character/diy.js
index fda0e906e..ad14787cb 100644
--- a/character/diy.js
+++ b/character/diy.js
@@ -185,9 +185,8 @@ character.diy={
 				return 6-ai.get.value(card);
 			},
 			content:function(){
-				// if(player!=target) player.draw();
 				var list=game.filterPlayer();
-				get.sortSeat(list,target);
+				list.sortBySeat(target);
 				target.useCard({name:'diaobingqianjiang'},list);
 			},
 			ai:{
diff --git a/character/hearth.js b/character/hearth.js
index b039403be..bdec2577a 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -352,7 +352,7 @@ character.hearth={
 				event.targets=game.filterPlayer(function(current){
 					return current.hp>player.hp;
 				});
-				get.sortSeat(event.targets);
+				event.targets.sortBySeat();
 				'step 1'
 				if(event.targets.length){
 					event.target=event.targets.shift();
diff --git a/character/swd.js b/character/swd.js
index 2bc5b10dd..c86213903 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -7000,7 +7000,7 @@ character.swd={
 				event.targets=game.filterPlayer(function(current){
 					return current.num('j');
 				});
-				get.sortSeat(event.targets);
+				event.targets.sortBySeat();
 				'step 2'
 				if(event.targets.length){
 					var current=event.targets.shift();
@@ -8595,7 +8595,7 @@ character.swd={
 				event.targets=game.filterPlayer(function(current){
 					return get.distance(target,current)<=1;
 				});
-				get.sortSeat(event.targets,event.target);
+				event.targets.sortBySeat(event.target);
 				event.targets.unshift(player);
 				"step 1"
 				if(event.targets.length){
diff --git a/character/yijiang.js b/character/yijiang.js
index ca10b9475..d0f7a2349 100644
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -4160,7 +4160,7 @@ character.yijiang={
 				event.players=game.filterPlayer(function(current){
 					return current!=target&&get.distance(current,target,'attack')<=1;
 				});
-				get.sortSeat(event.players,target);
+				event.players.sortBySeat(target);
 				"step 1"
 				if(event.players.length){
 					event.current=event.players.shift();
diff --git a/character/yxs.js b/character/yxs.js
index 173cdb5c7..7723030bf 100644
--- a/character/yxs.js
+++ b/character/yxs.js
@@ -126,7 +126,7 @@ character.yxs={
 						var list=game.filterPlayer(function(current){
 							return current.hasSkill('lyuxue2');
 						});
-						get.sortSeat(list);
+						list.sortBySeat();
 						event.list=list;
 						player.line(list,'green');
 						'step 1'
diff --git a/game/game.js b/game/game.js
index 20e543fd3..474a8cd94 100644
--- a/game/game.js
+++ b/game/game.js
@@ -6465,7 +6465,7 @@
 					if(result&&result.control=='顺时针'){
 						var evt=event.getParent();
 						evt.fixedSeat=true;
-						get.sortSeat(evt.targets);
+						evt.targets.sortBySeat();
 						evt.targets.reverse();
 						if(evt.targets[evt.targets.length-1]==player){
 							evt.targets.unshift(evt.targets.pop());
@@ -8857,7 +8857,7 @@
 					if(num==0&&next.targets.length>1){
 						if(!info.multitarget){
 							if(!event.fixedSeat){
-								get.sortSeat(targets,player);
+								targets.sortBySeat(player);
 							}
 							for(var i=0;i<targets.length;i++){
 								targets[i].animate('target');