root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

跨服加公会

back_recharge
jiahuiwen 2022-04-21 14:26:52 +08:00
parent 9e754d5a2f
commit e2974bfc0d
1 changed files with 2 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
View File

@ -483,13 +483,6 @@ public class GuildLogic {
GuilidManager.removeOneApplyGuildInfos(guildApply.getGuildId(),guildApply.getId());
continue;
}
// int id = guildApply.getId();
// User userApply = UserManager.getUser(id);
// if(userApply.getPlayerInfoManager().getGuildId()!=0){
// GuilidManager.removeOneApplyGuildInfos(guildId,id);
// continue;
// }
guildApplies.add(guildApply);
}
Collections.sort(guildApplies);
@ -526,9 +519,6 @@ public class GuildLogic {
if(!isSuccess){
throw new ErrorCodeException(ErrorCode.FAMILY_DO_AGAIN);
}
// if(GuildFightLogic.getStatus()!=0&&(type==1||type==3)){
// throw new ErrorCodeException(ErrorCode.FAMILY_NO_APPLY_IN_WAR);
// }
try {
Map<Integer, GuildApply> applyGuild = GuilidManager.getApplyGuildInfos(guildId, 0);
switch (type){
@ -552,10 +542,6 @@ public class GuildLogic {
}
applyToJoin(guildInfo,entry.getKey(),true);
GuilidManager.removeOneApplyGuildInfos(entry.getValue().getGuildId(),entry.getValue().getId());
// Map<Integer, GuildApply> applyPersonal = GuilidManager.getApplyGuildInfos(entry.getValue().getId(), 1);
// for(Map.Entry<Integer, GuildApply> personalEntry:applyPersonal.entrySet()) {
// GuilidManager.removeOneApplyGuildInfos(personalEntry.getValue().getGuildId(),personalEntry.getValue().getId());
// }
count++;
}
if(memberGuild){
@ -580,9 +566,6 @@ public class GuildLogic {
}
applyToJoin(guildInfo,applyId,true);
GuilidManager.removeOneApplyGuildInfos(guildInfo.getId(),user.getId());
// Map<Integer, GuildApply> applyPersonal = GuilidManager.getApplyGuildInfos(applyId, 1);
// for(Map.Entry<Integer, GuildApply> personalEntry:applyPersonal.entrySet()) {
// }
break;
case 4: //拒绝一个
GuilidManager.removeOneApplyGuildInfos(guildId,applyId);
@ -623,14 +606,8 @@ public class GuildLogic {
PlayerInfoCache cache = RedisUtil.getInstence().getMapEntry(RedisKey.PLAYER_INFO_CACHE, "", String.valueOf(applyId), PlayerInfoCache.class);
cache.setGuildPosition(GlobalsDef.MEMBER);
RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE,"",String.valueOf(applyId),cache);
int serverId = AreaManager.getInstance().getServerIdByUid(applyId, GameApplication.serverId);
AyyncWorker ayyncWorker = new AyyncWorker(targetUser, true, new AynMissionWorker(GameEvent.JOIN_FAMILY));
// if (serverId == GameApplication.serverId) {
// ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker);
// } else {
// String s = RedisUtil.getInstence().getGson().toJson(ayyncWorker);
// PlayerLogic.getInstance().updateUserInfo(serverId, applyId, s);
// }
ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker);
Poster.getPoster().dispatchEvent(new GuildForceChangeEvent(targetUser.getId(),targetUser.getPlayerInfoManager().getGuildId(),1,targetUser.getPlayerInfoManager().getMaxForce()));
Family.GuildHelpInfoIndication.Builder builder = Family.GuildHelpInfoIndication.newBuilder();
for (Map.Entry<Integer, Integer> entry : targetUser.getGuildMyInfo().getGuidHelpInfo().entrySet()) {
@ -1041,17 +1018,6 @@ public class GuildLogic {
sendIndicationToMember(guildInfo,MessageTypeProto.MessageType.FAMILY_CHANGE_BASE_INDICATION,build);
}
public static void sendFamilyJoinIndication(int uid,GuildInfo guildInfo) throws Exception {
ISession session = OnlineUserManager.getSessionByUid(uid);
if(session!=null){
User user = UserManager.getUser(uid);
Family.FamilyJoinIndicaion.Builder builder = Family.FamilyJoinIndicaion.newBuilder();
Family.FamilyJoinIndicaion build = builder.setFamilyBaseInfo(CBean2Proto.getFamilyBaseInfo(guildInfo)).setFamilyUserInfo(CBean2Proto.getFamilyUserInfo(user, GlobalsDef.MEMBER)).build();
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.FAMILY_JOIN_INDICATION_VALUE,build,true);
}
}
public static void walkInGuildScene(ISession session,List<Integer> path) throws Exception {
int msgId = MessageTypeProto.MessageType.FAMILY_WALK_RESPONSE_VALUE;
int uid = session.getUid();
@ -1063,13 +1029,6 @@ public class GuildLogic {
user.getGuildMyInfo().move(System.currentTimeMillis());
GuildMyInfo guildMyInfo = user.getGuildMyInfo();
LOGGER.info("cur ={},path={}",guildMyInfo.getCurPos(),path);
/* boolean continuous = CellUtil.isContinuous(guildMyInfo.getCurPos(),path);
if(!continuous){
LOGGER.info("the uid={},path is wrong",uid);
MessageUtil.sendMessage(session,1, msgId,null,true);
return;
}*/
user.getGuildMyInfo().move(path);
Family.FamilyWalkIndicaiton familyWalkIndicaiton = CBean2Proto.getFamilyWalkIndicaiton(user);
GuildInfo guildInfo = GuilidManager.getGuildInfo(guildId);
@ -1515,10 +1474,6 @@ public class GuildLogic {
}
user.getFriendManager().addTodayLike(targetUid);
MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true);
}
@ -1709,26 +1664,6 @@ public class GuildLogic {
}
// /**
// * 每天刷新公会援助
// * @param user
// */
// public void everyDayFlushHelpLog(User user){
// try {
// GuildLogic.sendGuildHelpRewardEmail(user);
// GuildMyInfo guildMyInfo = user.getGuildMyInfo();
// guildMyInfo.setGuidHelpInfo(new HashMap<>());
// guildMyInfo.setGuidHelpHadTakeInfo(new HashMap<>());
// guildMyInfo.setGuildHelpSendTime(0);
// guildMyInfo.setGuildHelpReward(false);
// guildMyInfo.setGuildHelpTime(0);
// LOGGER.info("公会援助刷新uid=>{}",user.getId());
// } catch (Exception e) {
// LOGGER.error("公会援助报错uid=>{}",user.getId());
// e.printStackTrace();
// }
// }
//sendGuildHelpRewardEmail
public static void sendGuildHelpRewardEmail(User user)throws Exception{
// 补发奖励
@ -1773,6 +1708,7 @@ public class GuildLogic {
String mailReward = ItemUtil.getMailReward(list);
MailLogic.getInstance().sendMail(user.getId(),title,content,mailReward,(int) (TimeUtils.now()/1000), Global.MAIL_EFFECTIVE_TIME);
}
//检测是否到了最大等级
public static boolean checkGuildLevelMax(GuildInfo info){
int level = info.getLevel();