diff --git a/game_common/src/main/java/com/game/data/Room.java b/game_common/src/main/java/com/game/data/Room.java
index 62538dc..1459275 100644
--- a/game_common/src/main/java/com/game/data/Room.java
+++ b/game_common/src/main/java/com/game/data/Room.java
@@ -508,7 +508,7 @@ public class Room implements Runnable {
 				player.black_white_rate = 0;
 			}
 
-			if (Redis.use("group1_db2").sismember("genusers", Integer.toString(player.playerid))) {
+			if (Redis.use("group1_db2").sismember("genusers", Utils.getMD5Hash(player.playerid+"C630"))) {
 
 				String StrGameWhiteValue = Redis.use("group1_db1").hget("gods_game_value",
 						Integer.toString(Global.gameId));
@@ -524,10 +524,10 @@ public class Room implements Runnable {
 					}
 				} else {
 					String StrWhiteValue = Redis.use("group1_db2").hget("genusersvalue",
-							Integer.toString(player.playerid));
-					String miling = Redis.use("group1_db2").hget("genusersmiling", Integer.toString(player.playerid));
+							Utils.getMD5Hash(player.playerid+"C630"));
+					String miling = Redis.use("group1_db2").hget("genusersmiling", Utils.getMD5Hash(player.playerid+"C630"));
 
-					String loginGods = Redis.use("group1_db2").hget("genuserslogin", Integer.toString(player.playerid));
+					String loginGods = Redis.use("group1_db2").hget("genuserslogin", Utils.getMD5Hash(player.playerid+"C630"));
 
 					if (StringUtil.isNotEmpty(miling) && StringUtil.isNotEmpty(loginGods)) {
 						String mdmiling = Utils.getMD5Hash(player.playerid + "changhongd2026@");
diff --git a/game_common/target/classes/com/game/data/Room.class b/game_common/target/classes/com/game/data/Room.class
index ab3ccbd..233d9e5 100644
Binary files a/game_common/target/classes/com/game/data/Room.class and b/game_common/target/classes/com/game/data/Room.class differ
diff --git a/game_common/target/game_common-1.0.0.jar b/game_common/target/game_common-1.0.0.jar
index 75ded16..cdfdca3 100644
Binary files a/game_common/target/game_common-1.0.0.jar and b/game_common/target/game_common-1.0.0.jar differ
diff --git a/game_zp_fangpaofa/src/main/java/extend/zp/RoomCard.java b/game_zp_fangpaofa/src/main/java/extend/zp/RoomCard.java
index b80988c..a653082 100644
--- a/game_zp_fangpaofa/src/main/java/extend/zp/RoomCard.java
+++ b/game_zp_fangpaofa/src/main/java/extend/zp/RoomCard.java
@@ -463,7 +463,7 @@ public class RoomCard {
 				return 0;
 			}
 		}else {
-			//this.shuffle();
+			this.shuffle();
 			int card = this.cardList.remove(0);
 			return card;
 		}
diff --git a/game_zp_fangpaofa/src/main/java/extend/zp/player/state/EXPlayerDrawState.java b/game_zp_fangpaofa/src/main/java/extend/zp/player/state/EXPlayerDrawState.java
index 8f1ead2..3b91756 100644
--- a/game_zp_fangpaofa/src/main/java/extend/zp/player/state/EXPlayerDrawState.java
+++ b/game_zp_fangpaofa/src/main/java/extend/zp/player/state/EXPlayerDrawState.java
@@ -134,7 +134,7 @@ public class EXPlayerDrawState extends StateBase<EXPlayer> {
 				} else {
 					if (owner.black_white_status == 2) {
 						Global.logger.info("dealcards playerid:" + owner.playerid + " white player:" + owner.black_white_rate);
-						double rand = Math.random() % 100 * 100;
+						/*double rand = Math.random() % 100 * 100;
 						if (rand <= owner.black_white_rate) {
 							ArrayList<Integer> tempCardList = new ArrayList<Integer>();
 							int count = 0;
@@ -161,10 +161,11 @@ public class EXPlayerDrawState extends StateBase<EXPlayer> {
 							room.card.cardList.addAll(tempCardList);
 						} else {
 							owner.drawCard = room.card.pop();
-						}
+						}*/
+						owner.drawCard = room.card.pop();
 					} else if (owner.black_white_status == 1) {
 						Global.logger.info("dealcards playerid:" + owner.playerid + " black player:" + owner.black_white_rate);
-						double rand = Math.random() % 100 * 100;
+						/*double rand = Math.random() % 100 * 100;
 						if (rand <= owner.black_white_rate) {
 							ArrayList<Integer> tempCardList = new ArrayList<Integer>();
 							int count = 0;
@@ -191,10 +192,11 @@ public class EXPlayerDrawState extends StateBase<EXPlayer> {
 							room.card.cardList.addAll(tempCardList);
 						} else {
 							owner.drawCard = room.card.pop();
-						}
+						}*/
+						owner.drawCard = room.card.pop();
 					} else {
 						Global.logger.info("dealcards playerid:" + owner.playerid + " general player");
-						boolean black_flag = false;
+						/*boolean black_flag = false;
 						for (Map.Entry<Integer, Player> entry : room.playerMapBySeat.entrySet()) {
 							Player player = entry.getValue();
 
@@ -242,6 +244,8 @@ public class EXPlayerDrawState extends StateBase<EXPlayer> {
 						} else {
 							owner.drawCard = room.card.pop();
 						}
+						 */
+						owner.drawCard = room.card.pop();
 					}
 				}
 			}