diff --git a/src/chapter6/demo64/Game.java b/src/chapter6/demo64/Game.java index 095eb95..dafd4ca 100644 --- a/src/chapter6/demo64/Game.java +++ b/src/chapter6/demo64/Game.java @@ -49,12 +49,7 @@ public class Game { } } - // 3. 整理手牌 - player1.sortHand(); - player2.sortHand(); - player3.sortHand(); - - // 4. 显示结果 + // 3. 显示结果 showResult(); } diff --git a/src/chapter6/demo64/Player.java b/src/chapter6/demo64/Player.java index 595cdab..e97b512 100644 --- a/src/chapter6/demo64/Player.java +++ b/src/chapter6/demo64/Player.java @@ -3,11 +3,13 @@ package chapter6.demo64; import java.util.ArrayList; import java.util.Collections; +import java.util.TreeSet; // Player.java - 玩家类 public class Player { private String name; - private ArrayList hand = new ArrayList<>(); + // Card类已经实现Comparable接口,可以使用TreeSet自动排序 + private TreeSet hand = new TreeSet<>(); /** * 构造函数 @@ -25,13 +27,6 @@ public class Player { hand.add(card); } - /** - * 整理手牌 - */ - public void sortHand() { - Collections.sort(hand); - } - /** * 显示手牌 * @return 手牌的字符串表示