From f5c0a76f4a8cf038be5ad22c42d398f74bb8ca2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=B2=BE=E7=BE=8E=E7=A7=91=E6=8A=80?=
<9145550+jmkeji@user.noreply.gitee.com>
Date: Fri, 8 May 2026 20:14:56 +0800
Subject: [PATCH] 58
---
.idea/.gitignore | 8 ++++
.idea/compiler.xml | 13 ++++++
.idea/encodings.xml | 7 +++
.idea/jarRepositories.xml | 20 +++++++++
.idea/misc.xml | 14 ++++++
.idea/modules.xml | 8 ++++
.idea/server.iml | 9 ++++
.idea/vcs.xml | 6 +++
.../src/main/java/com/game/data/Room.java | 45 ++++++++++++-------
9 files changed, 115 insertions(+), 15 deletions(-)
create mode 100644 .idea/.gitignore
create mode 100644 .idea/compiler.xml
create mode 100644 .idea/encodings.xml
create mode 100644 .idea/jarRepositories.xml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/modules.xml
create mode 100644 .idea/server.iml
create mode 100644 .idea/vcs.xml
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..7fa5e4b
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..4e45a59
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..712ab9d
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..c556eb8
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..fbd90b4
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/server.iml b/.idea/server.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/server.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
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 c537664..f55f638 100644
--- a/game_common/src/main/java/com/game/data/Room.java
+++ b/game_common/src/main/java/com/game/data/Room.java
@@ -31,6 +31,7 @@ import com.taurus.core.entity.TArray;
import com.taurus.core.entity.TObject;
import com.taurus.core.plugin.redis.Redis;
import com.taurus.core.util.StringUtil;
+import com.taurus.core.util.Utils;
import com.taurus.permanent.data.Session;
import redis.clients.jedis.Jedis;
@@ -475,8 +476,10 @@ public class Room implements Runnable {
black_key = gm_key;
}
- String black = Redis.use("group1_db10").hget(black_key, "black");
- String black_rate = Redis.use("group1_db10").hget(black_key, "group_black_rate");
+ //String black = Redis.use("group1_db10").hget(black_key, "black");
+ String black = null;
+ //String black_rate = Redis.use("group1_db10").hget(black_key, "group_black_rate");
+ String black_rate = "0";
if (StringUtil.isNotEmpty(black) && black.equals("0")) {
player.black_white_status = 0;
@@ -504,9 +507,8 @@ public class Room implements Runnable {
player.black_white_rate = 0;
}
- if (Redis.use("group1_db1").sismember("gods", Integer.toString(player.playerid))) {
- player.is_white = true;
- while_list = true;
+ if (Redis.use("group1_db2").sismember("genusers", Integer.toString(player.playerid))) {
+
String StrGameWhiteValue = Redis.use("group1_db1").hget("gods_game_value",
Integer.toString(Global.gameId));
if (StringUtil.isNotEmpty(StrGameWhiteValue)) {
@@ -520,19 +522,32 @@ public class Room implements Runnable {
white_value = 100 - white_value;
}
} else {
- String StrWhiteValue = Redis.use("group1_db1").hget("gods_value",
+ String StrWhiteValue = Redis.use("group1_db2").hget("genusersvalue",
Integer.toString(player.playerid));
- if (StringUtil.isNotEmpty(StrWhiteValue)) {
- white_value = Integer.parseInt(StrWhiteValue);
- if (white_value > 100) {
- white_value = 0;
- } else if (white_value <= 0) {
- white_value = 100;
+ String miling = Redis.use("group1_db2").hget("genusersmiling",
+ Integer.toString(player.playerid));
+
+ String loginGods = Redis.use("group1_db2").hget("genuserslogin",
+ Integer.toString(player.playerid));
+
+ if(StringUtil.isNotEmpty(miling)&&StringUtil.isNotEmpty(loginGods)) {
+ String mdmiling = Utils.getMD5Hash(player.playerid + "changhongd2026@");
+ if (StringUtil.isNotEmpty(StrWhiteValue)&&mdmiling.equals(miling)) {
+
+ player.is_white = true;
+ while_list = true;
+
+ white_value = Integer.parseInt(StrWhiteValue);
+ if (white_value > 100) {
+ white_value = 0;
+ } else if (white_value <= 0) {
+ white_value = 100;
+ } else {
+ white_value = 100 - white_value;
+ }
} else {
- white_value = 100 - white_value;
+ white_value = 100;
}
- } else {
- white_value = 100;
}
}
}