公会跨服
parent
0ec32ba9e6
commit
f5d18d2575
|
|
@ -256,7 +256,7 @@ public class MongoUtil {
|
||||||
}
|
}
|
||||||
return mongoTemplate;
|
return mongoTemplate;
|
||||||
}
|
}
|
||||||
// 如果不参与跨服,不可以获取其他服数据
|
// 如果不参与跨服,不可以获取其他服mongoTemplate
|
||||||
if (GlobleSystemLogic.crossGroup == 0) {
|
if (GlobleSystemLogic.crossGroup == 0) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
@ -264,10 +264,11 @@ public class MongoUtil {
|
||||||
if (group == null || group <= 0){
|
if (group == null || group <= 0){
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
// 不是同一组也不可以获取数据
|
// 不是同一组也不可以获取mongoTemplate
|
||||||
if (GlobleSystemLogic.crossGroup != group) {
|
if (GlobleSystemLogic.crossGroup != group) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
// 不合服不可以获取mongoTemplate
|
||||||
if(!AreaManager.getInstance().checkServerIdAllowPermit(serverId)){
|
if(!AreaManager.getInstance().checkServerIdAllowPermit(serverId)){
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -344,7 +344,7 @@ public class GuildChallengeLogic {
|
||||||
Family.GuildChallengeIndication.Builder otherIndication = Family.GuildChallengeIndication.newBuilder()
|
Family.GuildChallengeIndication.Builder otherIndication = Family.GuildChallengeIndication.newBuilder()
|
||||||
.setBlood(remainHp)
|
.setBlood(remainHp)
|
||||||
.setCurBoss(guildInfo.getCurrBossId());
|
.setCurBoss(guildInfo.getCurrBossId());
|
||||||
if(kill==1&&!UserManager.getUser(sendUid).getGuildMyInfo().getRefreshedBoss().contains(bossId)&&guildInfo.getBossHpRemain()!=-1){
|
if(kill==1&&!PlayerLogic.getInstance().getUserByRpc(sendUid).getGuildMyInfo().getRefreshedBoss().contains(bossId)&&guildInfo.getBossHpRemain()!=-1){
|
||||||
otherIndication.setIsRefresh(1);//需要前端刷新次数
|
otherIndication.setIsRefresh(1);//需要前端刷新次数
|
||||||
}
|
}
|
||||||
if(isession!=null){
|
if(isession!=null){
|
||||||
|
|
|
||||||
|
|
@ -773,9 +773,6 @@ public class GuildLogic {
|
||||||
}
|
}
|
||||||
guildInfo.removeMember(targetType,targetUid);
|
guildInfo.removeMember(targetType,targetUid);
|
||||||
guildInfo.addMembers(position,targetUid);
|
guildInfo.addMembers(position,targetUid);
|
||||||
// PlayerInfoCache cache = RedisUtil.getInstence().getMapEntry(RedisKey.PLAYER_INFO_CACHE, "", String.valueOf(uid), PlayerInfoCache.class);
|
|
||||||
// cache.setGuildPosition(position);
|
|
||||||
// RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE,"",String.valueOf(uid),cache);
|
|
||||||
PlayerLogic.getInstance().playerInfoUpdate(PlayerLogic.getInstance().getUserByRpc(targetUid));
|
PlayerLogic.getInstance().playerInfoUpdate(PlayerLogic.getInstance().getUserByRpc(targetUid));
|
||||||
sendPositionChange(targetUid,position);
|
sendPositionChange(targetUid,position);
|
||||||
|
|
||||||
|
|
@ -1468,6 +1465,9 @@ public class GuildLogic {
|
||||||
if(!alreadyList.isEmpty()) {
|
if(!alreadyList.isEmpty()) {
|
||||||
for(Map.Entry<Integer, AcceptRedInfo> already:alreadyList.entrySet()){
|
for(Map.Entry<Integer, AcceptRedInfo> already:alreadyList.entrySet()){
|
||||||
User guildUser = PlayerLogic.getInstance().getUserByRpc(already.getValue().getUid());
|
User guildUser = PlayerLogic.getInstance().getUserByRpc(already.getValue().getUid());
|
||||||
|
if (guildUser == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
PlayerManager playerInfoManager = guildUser.getPlayerInfoManager();
|
PlayerManager playerInfoManager = guildUser.getPlayerInfoManager();
|
||||||
CommonProto.RedOneDetail.Builder detail= CommonProto.RedOneDetail.newBuilder()
|
CommonProto.RedOneDetail.Builder detail= CommonProto.RedOneDetail.newBuilder()
|
||||||
.setUid(already.getValue().getUid())
|
.setUid(already.getValue().getUid())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue