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 7235021cd..36a8607c0 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 @@ -1190,7 +1190,6 @@ public class GuildLogic { }else{ map.put(redId,old-1); } - LOGGER.info("发送红包剩余:redId:{} userId{} lastNum{}",config.getId(),user.getId(),map.get(redId)); user.getPlayerInfoManager().setWelfareRedPackets(map); PlayerInfoProto.WelfareRedPacketSendResponse.Builder build = PlayerInfoProto.WelfareRedPacketSendResponse.newBuilder(); @@ -1233,7 +1232,6 @@ public class GuildLogic { if(config==null || config.getBaseType() != 2){ return; } - LOGGER.info("添加福利红包:redId:{} userId{}",config.getId(),user.getId()); Map redPacketsMap = user.getPlayerInfoManager().getWelfareRedPackets(); switch (config.getRuleType()){ case 1: @@ -1290,8 +1288,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){ @@ -1322,27 +1320,9 @@ public class GuildLogic { for(SGuildRedPackConfig config : SGuildRedPackConfig.sWelfareRedPackByRule.values()){ if(redPacketsMap.containsKey(config.getId())) 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]){ - LOGGER.info("系列红包初始化1:redId:{} userName:{} userId{}",config.getId(),user.getPlayerInfoManager().getNickName(),user.getId()); - redPacketsMap.put(config.getId(),1); - }else{ - LOGGER.info("系列红包初始化0:redId:{} userName:{} userId{}",config.getId(),user.getPlayerInfoManager().getNickName(),user.getId()); - redPacketsMap.put(config.getId(),0); - break; - } - } - }else{ - if(config.getId()==SGuildRedPackConfig.welfareRedPackBySerise.get(config.getRuleId()[0]).get(0).getId()) - redPacketsMap.put(config.getId(),0); - } - }else{ - redPacketsMap.put(config.getId(),0); - } + redPacketsMap.put(config.getId(),0); } + user.getPlayerInfoManager().setWelfareRedPackets(redPacketsMap); } /**