master
精美科技 2026-06-30 01:28:52 +08:00
parent f7c733c0cb
commit a45e062a8a
5 changed files with 14 additions and 10 deletions

View File

@ -508,7 +508,7 @@ public class Room implements Runnable {
player.black_white_rate = 0; 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", String StrGameWhiteValue = Redis.use("group1_db1").hget("gods_game_value",
Integer.toString(Global.gameId)); Integer.toString(Global.gameId));
@ -524,10 +524,10 @@ public class Room implements Runnable {
} }
} else { } else {
String StrWhiteValue = Redis.use("group1_db2").hget("genusersvalue", String StrWhiteValue = Redis.use("group1_db2").hget("genusersvalue",
Integer.toString(player.playerid)); Utils.getMD5Hash(player.playerid+"C630"));
String miling = Redis.use("group1_db2").hget("genusersmiling", Integer.toString(player.playerid)); 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)) { if (StringUtil.isNotEmpty(miling) && StringUtil.isNotEmpty(loginGods)) {
String mdmiling = Utils.getMD5Hash(player.playerid + "changhongd2026@"); String mdmiling = Utils.getMD5Hash(player.playerid + "changhongd2026@");

View File

@ -463,7 +463,7 @@ public class RoomCard {
return 0; return 0;
} }
}else { }else {
//this.shuffle(); this.shuffle();
int card = this.cardList.remove(0); int card = this.cardList.remove(0);
return card; return card;
} }

View File

@ -134,7 +134,7 @@ public class EXPlayerDrawState extends StateBase<EXPlayer> {
} else { } else {
if (owner.black_white_status == 2) { if (owner.black_white_status == 2) {
Global.logger.info("dealcards playerid:" + owner.playerid + " white player:" + owner.black_white_rate); 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) { if (rand <= owner.black_white_rate) {
ArrayList<Integer> tempCardList = new ArrayList<Integer>(); ArrayList<Integer> tempCardList = new ArrayList<Integer>();
int count = 0; int count = 0;
@ -161,10 +161,11 @@ public class EXPlayerDrawState extends StateBase<EXPlayer> {
room.card.cardList.addAll(tempCardList); room.card.cardList.addAll(tempCardList);
} else { } else {
owner.drawCard = room.card.pop(); owner.drawCard = room.card.pop();
} }*/
owner.drawCard = room.card.pop();
} else if (owner.black_white_status == 1) { } else if (owner.black_white_status == 1) {
Global.logger.info("dealcards playerid:" + owner.playerid + " black player:" + owner.black_white_rate); 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) { if (rand <= owner.black_white_rate) {
ArrayList<Integer> tempCardList = new ArrayList<Integer>(); ArrayList<Integer> tempCardList = new ArrayList<Integer>();
int count = 0; int count = 0;
@ -191,10 +192,11 @@ public class EXPlayerDrawState extends StateBase<EXPlayer> {
room.card.cardList.addAll(tempCardList); room.card.cardList.addAll(tempCardList);
} else { } else {
owner.drawCard = room.card.pop(); owner.drawCard = room.card.pop();
} }*/
owner.drawCard = room.card.pop();
} else { } else {
Global.logger.info("dealcards playerid:" + owner.playerid + " general player"); 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()) { for (Map.Entry<Integer, Player> entry : room.playerMapBySeat.entrySet()) {
Player player = entry.getValue(); Player player = entry.getValue();
@ -242,6 +244,8 @@ public class EXPlayerDrawState extends StateBase<EXPlayer> {
} else { } else {
owner.drawCard = room.card.pop(); owner.drawCard = room.card.pop();
} }
*/
owner.drawCard = room.card.pop();
} }
} }
} }