diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java index 9642fa066..95af35a9b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java @@ -134,6 +134,7 @@ public class LoginRequestHandler extends BaseHandler=0){ - guildInfo.setBossHpRemain(remain); - }else{ - Map levelConfigMap = STableManager.getConfig(SGuildLevelConfig.class); - if (guildInfo.getExp() + config.getLegionExp() >= levelConfigMap.get(guildInfo.getLevel()).getExp()) { - guildInfo.updateExp(guildInfo.getExp() + config.getLegionExp() - levelConfigMap.get(guildInfo.getLevel()).getExp()); - guildInfo.updateLevel(guildInfo.getLevel() + 1); - RedisUtil.getInstence().putMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(guildInfo.getId()), new GuildCache(GameApplication.serverId, guildInfo.getIcon(), guildInfo.getLevel(), guildInfo.getName())); - } else { - guildInfo.updateExp(guildInfo.getExp() + config.getLegionExp()); - } - if(guildInfo.getCurrBossId()!=configMap.size()){ - guildInfo.setCurrBossId(guildInfo.getCurrBossId() + 1); - guildInfo.setBossHpRemain(0); + if(guildMyInfo.getGuildChallengeDamage()==0){ + error = "今天没有挑战过,无法扫荡"; + }else{ + //扫荡 + if(guildInfo.getBossHpRemain()!=-1){ + int remain = guildInfo.getBossHpRemain() - guildMyInfo.getGuildChallengeDamage(); + if(remain>=0){ + guildInfo.setBossHpRemain(remain); }else{ - guildInfo.setBossHpRemain(-1); + Map levelConfigMap = STableManager.getConfig(SGuildLevelConfig.class); + if (guildInfo.getExp() + config.getLegionExp() >= levelConfigMap.get(guildInfo.getLevel()).getExp()) { + guildInfo.updateExp(guildInfo.getExp() + config.getLegionExp() - levelConfigMap.get(guildInfo.getLevel()).getExp()); + guildInfo.updateLevel(guildInfo.getLevel() + 1); + RedisUtil.getInstence().putMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(guildInfo.getId()), new GuildCache(GameApplication.serverId, guildInfo.getIcon(), guildInfo.getLevel(), guildInfo.getName())); + } else { + guildInfo.updateExp(guildInfo.getExp() + config.getLegionExp()); + } + if(guildInfo.getCurrBossId()!=configMap.size()){ + guildInfo.setCurrBossId(guildInfo.getCurrBossId() + 1); + guildInfo.setBossHpRemain(0); + }else{ + guildInfo.setBossHpRemain(-1); + } + kill=1; } - kill=1; } + damage = guildMyInfo.getGuildChallengeDamage(); } - damage = guildMyInfo.getGuildChallengeDamage(); } } } 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 e126abae3..cb2e791e3 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 @@ -58,6 +58,7 @@ public class GuildLogic { user.getGuildMyInfo().setFetetype(0); user.getGuildMyInfo().clearHadTakeReward(); + user.getGuildMyInfo().setGuildChallengeDamage(0); if(null!=fBuilder){ fBuilder.setLastFeteType(user.getGuildMyInfo().getFetetype()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index 6ad1ef08c..a5491c45c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -449,7 +449,7 @@ public class BuyGoodsLogic { onChargeSuccess(uid,price,0,orderId,cfgType);//充值成功上报 Map mapReward = ItemUtil.arrayToMap(baseReward); if(price>0){ - ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(),orderId,price,user.getPlayerInfoManager().getBundle_id(),user.getPlayerInfoManager().getChannel_id(),String.valueOf(GameApplication.serverId),String.valueOf(goodsId),sRechargeCommodityConfig.getName(),new ArrayList<>(mapReward.keySet()),new ArrayList<>(mapReward.values()),new Date()); + ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(),orderId,price,user.getPlayerInfoManager().getBundle_id(),user.getPlayerInfoManager().getChannel_id(),String.valueOf(GameApplication.serverId),String.valueOf(goodsId),sRechargeCommodityConfig.getName(),new ArrayList<>(mapReward.keySet()),new ArrayList<>(mapReward.values()),new Date(),user.getPlayerInfoManager().getLastDeviceId()==null?"DEFAULT_DEVICE":user.getPlayerInfoManager().getLastDeviceId()); } return resultRes;