Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
049975b931
|
@ -101,7 +101,9 @@ public class ChatLogic {
|
||||||
boolean result = true;
|
boolean result = true;
|
||||||
switch (chatType){
|
switch (chatType){
|
||||||
case 1:
|
case 1:
|
||||||
result = ShieldedWordUtils.checkName(user,message,false,ChatContentType.WORLD_CHAT);
|
//0|content需要解字符串
|
||||||
|
String s = message.split("|",3)[2];
|
||||||
|
result = ShieldedWordUtils.checkName(user,s,false,ChatContentType.WORLD_CHAT);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
result= ShieldedWordUtils.checkName(user,message,false,ChatContentType.FAMILY);
|
result= ShieldedWordUtils.checkName(user,message,false,ChatContentType.FAMILY);
|
||||||
|
|
|
@ -200,11 +200,18 @@ public class GlobalDataManaager {
|
||||||
checkSystemFunctioIsOpen();
|
checkSystemFunctioIsOpen();
|
||||||
GlobalSystemControl globalSystemControl = MongoUtil.getInstence().getMyMongoTemplate().findById(GameApplication.serverId, GlobalSystemControl.class);
|
GlobalSystemControl globalSystemControl = MongoUtil.getInstence().getMyMongoTemplate().findById(GameApplication.serverId, GlobalSystemControl.class);
|
||||||
if(globalSystemControl != null){
|
if(globalSystemControl != null){
|
||||||
|
|
||||||
TimeControllerOfFunction timeControllerOfFunction = globalSystemControl.getTimeControllerOfFunctionMap().get(8);
|
TimeControllerOfFunction timeControllerOfFunction = globalSystemControl.getTimeControllerOfFunctionMap().get(8);
|
||||||
|
if(timeControllerOfFunction != null){
|
||||||
ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes());
|
ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes());
|
||||||
|
}
|
||||||
|
if(globalSystemControl.getTimeControllerOfFunctionMap().containsKey(46)){
|
||||||
MapLogic.getInstance().updateEndlessSeason(globalSystemControl.getTimeControllerOfFunctionMap().get(46).getTimes());
|
MapLogic.getInstance().updateEndlessSeason(globalSystemControl.getTimeControllerOfFunctionMap().get(46).getTimes());
|
||||||
MapLogic.setEndlessMapId(getEndleeMapIdByLevel());
|
MapLogic.setEndlessMapId(getEndleeMapIdByLevel());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
MissionEventDistributor.init();
|
MissionEventDistributor.init();
|
||||||
DataManagerDistributor.init();
|
DataManagerDistributor.init();
|
||||||
initServerIsLanEnviornment(configurableApplicationContext);
|
initServerIsLanEnviornment(configurableApplicationContext);
|
||||||
|
|
|
@ -27,7 +27,7 @@ public class GuildMyInfo extends MongoBase {
|
||||||
|
|
||||||
public void clearOfLevelGuild(){
|
public void clearOfLevelGuild(){
|
||||||
path.clear();
|
path.clear();
|
||||||
curPos = 257;
|
curPos = initPos;
|
||||||
setCurPos(curPos);
|
setCurPos(curPos);
|
||||||
setPath(new ArrayList<>());
|
setPath(new ArrayList<>());
|
||||||
}
|
}
|
||||||
|
|
|
@ -311,6 +311,7 @@ public class GuildFightLogic {
|
||||||
.setName(enemyInfo.getName())
|
.setName(enemyInfo.getName())
|
||||||
.setPictureId(1)
|
.setPictureId(1)
|
||||||
.setTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(enemyFamily),Integer.class))
|
.setTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(enemyFamily),Integer.class))
|
||||||
|
.setMyTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(guildInfo.getId()),Integer.class))
|
||||||
.build();
|
.build();
|
||||||
GuildLogic.sendIndicationToMember(guildInfo, MessageTypeProto.MessageType.FAMILY_FIGHT_MATCHING_SUCCESS_INDICATION, familyInfo);
|
GuildLogic.sendIndicationToMember(guildInfo, MessageTypeProto.MessageType.FAMILY_FIGHT_MATCHING_SUCCESS_INDICATION, familyInfo);
|
||||||
}
|
}
|
||||||
|
@ -501,7 +502,14 @@ public class GuildFightLogic {
|
||||||
.setJoinType(1);
|
.setJoinType(1);
|
||||||
if (enemyFamily != -1) {
|
if (enemyFamily != -1) {
|
||||||
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(enemyFamily);
|
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(enemyFamily);
|
||||||
Family.EnemyFamily familyInfo = Family.EnemyFamily.newBuilder().setId(guildInfo.getId()).setLevel(guildInfo.getLevel()).setName(guildInfo.getName()).setPictureId(1).build();
|
Family.EnemyFamily familyInfo = Family.EnemyFamily.newBuilder()
|
||||||
|
.setId(guildInfo.getId())
|
||||||
|
.setLevel(guildInfo.getLevel())
|
||||||
|
.setName(guildInfo.getName())
|
||||||
|
.setPictureId(1)
|
||||||
|
.setTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(enemyFamily),Integer.class))
|
||||||
|
.setMyTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(guildInfo.getId()),Integer.class))
|
||||||
|
.build();
|
||||||
response.setEnemy(familyInfo);
|
response.setEnemy(familyInfo);
|
||||||
}else{
|
}else{
|
||||||
if(status!=0&&status!=1){
|
if(status!=0&&status!=1){
|
||||||
|
|
Loading…
Reference in New Issue