diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXRoom.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXRoom.java index 68ed7d0..adfd211 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXRoom.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXRoom.java @@ -84,10 +84,13 @@ public class EXRoom extends Room { + public EXPlayer win; public EXRoom(String roomid, Map redis_room_map) { super(roomid, redis_room_map); + + card = new RoomCard(this, 2, maxPlayers); if (!this.config.containsKey(Config.ROOM_CONFIG_PRW_FORE)) { this.config.putInt(Config.ROOM_CONFIG_PRW_FORE, 2); @@ -119,6 +122,8 @@ public class EXRoom extends Room { this.config.putInt(Config.ROOM_CONFIG_BASE_SCORE, 0); } + + // System.out.println("底注"+this.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)); // int num = this.config.getInt(Config.ROOM_CONFIG_BASE_SCORE); // System.out.println(num); diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/room/state/EXRoomDealState.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/room/state/EXRoomDealState.java index cce2bd9..784de58 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/room/state/EXRoomDealState.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/room/state/EXRoomDealState.java @@ -100,8 +100,34 @@ public class EXRoomDealState extends StateBase { // 扣除底分 for (Entry entry : room.playerMapByPlaying.entrySet()) { EXPlayer player = (EXPlayer) entry.getValue(); - player.lostScore -= room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE); - room.sidePot += room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE); +// player.lostScore -= room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE); +// room.sidePot += room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE); + if (room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==0){ + if (room.nextRound==1 && room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==0){ + player.totalLostScore=1; + player.lostScore=-1; + } + room.sidePot = 2; + + } + if (room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==1){ + if (room.nextRound==1 && room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==1){ + player.totalLostScore=2; + player.lostScore=-2; + + } + room.sidePot = 4; + + } + if (room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==2) { + if (room.nextRound==1 && room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==2){ + player.totalLostScore=5; + player.lostScore=-5; + + } + room.sidePot = 10; + + } } // 广播协议 TObject param = new TObject(); diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/room/state/EXRoomStartGameState.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/room/state/EXRoomStartGameState.java index c24688f..2d3ecf7 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/room/state/EXRoomStartGameState.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/room/state/EXRoomStartGameState.java @@ -29,40 +29,15 @@ public void enter(EXRoom owner) { for (Entry entry : owner.playerMapBySeat.entrySet()) { EXPlayer player = (EXPlayer) entry.getValue(); - if (owner.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==0){ - if (owner.nextRound==1 && owner.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==0){ - player.totalLostScore=1; - player.lostScore=-1; - - } - owner.sidePot = 2; - - }else if (owner.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==1){ - if (owner.nextRound==1 && owner.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==1){ - player.totalLostScore=2; - player.lostScore=-2; - - } - owner.sidePot = 4; - - }else if (owner.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==2) { - if (owner.nextRound==1 && owner.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==2){ - player.totalLostScore=5; - player.lostScore=-5; - - } - owner.sidePot = 10; - - } - - - player.clearEx(); } // 清除房间的额外状态 owner.clearEx(); System.out.println("底池分数:"+owner.sidePot); + //根据用户id拿用户信息 +// EXPlayer player = (EXPlayer) owner.playerMapById.get(owner.owner_id); + // 开始游戏 owner.startGame(); diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXRoom.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXRoom.class index ed4d9b2..575e88a 100644 Binary files a/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXRoom.class and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXRoom.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomDealState.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomDealState.class index 520c608..f27cd5f 100644 Binary files a/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomDealState.class and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomDealState.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomStartGameState.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomStartGameState.class index fdcb243..1037bee 100644 Binary files a/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomStartGameState.class and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomStartGameState.class differ