master
parent
da28610e0b
commit
f5c0a76f4a
|
|
@ -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
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<annotationProcessing>
|
||||
<profile name="Maven default annotation processors profile" enabled="true">
|
||||
<sourceOutputDir name="target/generated-sources/annotations" />
|
||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||
<outputRelativeToContentRoot value="true" />
|
||||
<module name="game_common" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding">
|
||||
<file url="file://$PROJECT_DIR$/game_common/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/game_common/src/main/resources" charset="UTF-8" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RemoteRepositoriesConfiguration">
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Central Repository" />
|
||||
<option name="url" value="https://repo.maven.apache.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Maven Central repository" />
|
||||
<option name="url" value="https://repo1.maven.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="jboss.community" />
|
||||
<option name="name" value="JBoss Community repository" />
|
||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="MavenProjectsManager">
|
||||
<option name="originalFiles">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/game_common/pom.xml" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/server.iml" filepath="$PROJECT_DIR$/.idea/server.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue