diff --git a/game_zp_fangpaofa/src/main/java/extend/zp/uitl/WinCard.java b/game_zp_fangpaofa/src/main/java/extend/zp/uitl/WinCard.java index d8626a8..e62226f 100644 --- a/game_zp_fangpaofa/src/main/java/extend/zp/uitl/WinCard.java +++ b/game_zp_fangpaofa/src/main/java/extend/zp/uitl/WinCard.java @@ -18,6 +18,7 @@ public class WinCard { public Stack stackHuxi; public List cardList; public static final Logger logger = Logger.getLogger(WinCard.class); + public boolean activeCardIsUse = false; private void push(List cardGroup) { this.stack.push(cardGroup); @@ -32,7 +33,7 @@ public class WinCard { } boolean tryKezi(int card, EXPlayer player) { - if(player.getRoom().activeCard!=0) { + if (player.getRoom().activeCard != 0) { card = player.getRoom().activeCard; } // logger.info("当前牌数量:" + CardUtil.cardNum(card, this.cardList) + "--" + card); @@ -198,6 +199,10 @@ public class WinCard { break; } } + if (activeCardIsUse == false && player.seat!=player.getRoom().activeSeat) { + activeCard = player.getRoom().activeCard; + activeCardIsUse = true; + } if (activeCard == 0) { activeCard = this.cardList.get(0); @@ -242,7 +247,12 @@ public class WinCard { this.stackHuxi.pop(); } } else if (activeCard % 100 == 2) { +// logger.info("当前剩余牌----"+this.cardList); +// logger.info("当前行动的牌----"+activeCard); + if (tryShunzi3(activeCard, player)) { +// logger.info("吃牌后当前剩余牌----"+this.cardList); + if (tryWin(player)) { return true; }