diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 4e5af4f43..b67044a01 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -1227,6 +1227,7 @@ public class GuildLogic { * @throws Exception */ public static void addWelfareRedPacket(int uid,int redId) throws Exception { + LOGGER.info("添加福利礼包,uid:{},redId:{}",uid,redId); User user = UserManager.getUser(uid); SGuildRedPackConfig config = SGuildRedPackConfig.sGuildRedPackConfigMap.get(redId); if(config==null || config.getBaseType() != 2){ @@ -1292,8 +1293,8 @@ public class GuildLogic { } public static void sendWelfareRedPacketInfo(User user){ - Map redPacketsMap = user.getPlayerInfoManager().getWelfareRedPackets(); initWelfareRedPacketInfo(user); + Map redPacketsMap = user.getPlayerInfoManager().getWelfareRedPackets(); PlayerInfoProto.WelfareRedPacketPush.Builder build = PlayerInfoProto.WelfareRedPacketPush.newBuilder(); for(Map.Entry entry : redPacketsMap.entrySet()){ if(entry.getValue() >= 0){ @@ -1326,14 +1327,9 @@ public class GuildLogic { continue; if(config.getRuleType() == 3){ if(config.getGroupId() == 2){ - int num = user.getMapManager().getLastMonsterAttack(); for(SGuildRedPackConfig config1 : SGuildRedPackConfig.welfareRedPackBySerise.get(config.getRuleId()[0])){ - if(num >= config1.getRuleId()[1]){ - redPacketsMap.put(config.getId(),1); - }else{ - redPacketsMap.put(config.getId(),0); - break; - } + redPacketsMap.put(config.getId(),0); + break; } }else{ if(config.getId()==SGuildRedPackConfig.welfareRedPackBySerise.get(config.getRuleId()[0]).get(0).getId()) @@ -1343,6 +1339,7 @@ public class GuildLogic { redPacketsMap.put(config.getId(),0); } } + user.getPlayerInfoManager().setWelfareRedPackets(redPacketsMap); } /**