diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java index e371e06f5..df4832364 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java @@ -234,10 +234,10 @@ public class EndExpeditionBattleRequest extends BaseHandler hpList= fightResult.getRemainHp(); @@ -646,7 +646,7 @@ public class TowerMap extends AbstractMap { mapManager.updateTrialKillCount(mapManager.getTrialInfo().getKillCount()+monsterAmount); int[] bombReward = rewardResult.stream().mapToInt(Integer::valueOf).toArray(); - CommonProto.Drop.Builder drop = ItemUtil.drop(user, bombReward, 1,0,BIReason.BOMB_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, bombReward, 1,0,BIReason.BOMB_REWARD); mapManager.updateBombUseCount(mapManager.getTrialInfo().getBombUseTimes()+1); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/phone/GetPhoneRewardRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/phone/GetPhoneRewardRequestHandler.java index 899c6c8a0..88228b1c0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/phone/GetPhoneRewardRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/phone/GetPhoneRewardRequestHandler.java @@ -34,7 +34,7 @@ public class GetPhoneRewardRequestHandler extends BaseHandler0){ - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sRaceTowerConfig.getFirstReward(), 1, 0, BIReason.SITUATION_CHALLENGE_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sRaceTowerConfig.getFirstReward(), 1, 0, BIReason.SITUATION_CHALLENGE_REWARD); builder.setDrop(drop); // 埋点用的 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index 84f847bc6..ecbbf78fd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -575,7 +575,7 @@ public class ArenaLogic { int reason = fightResult == 1 ? BIReason.ARENA_WIN_REWARD : BIReason.ARENA_LOSE_REWARD; int[] dropList = new int[1]; dropList[0] = rewardGroupId; - return ItemUtil.drop(user, dropList, 1, 0, reason); + return ItemUtil.dropByGroup(user, dropList, 1, 0, reason); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java index a61afa7ce..8d7ff659e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java @@ -310,9 +310,9 @@ public class GuildChallengeLogic { ProtocolsManager.getInstance().updateAyncWorker(worker); } } - drop = ItemUtil.drop(user, new int[]{config.getReward(),config.getKillReward()}, 1, 0, BIReason.GUILD_BOSS_KILLED_REWARD); + drop = ItemUtil.dropByGroup(user, new int[]{config.getReward(),config.getKillReward()}, 1, 0, BIReason.GUILD_BOSS_KILLED_REWARD); }else{ - drop = ItemUtil.drop(user, new int[]{config.getReward()}, 1, 0, BIReason.GUILD_BOSS_CHALLENGE_REWARD); + drop = ItemUtil.dropByGroup(user, new int[]{config.getReward()}, 1, 0, BIReason.GUILD_BOSS_CHALLENGE_REWARD); } int remainHp; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index eb90e5632..aa076d655 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -1097,8 +1097,8 @@ public class GuildFightLogic { SGuildBossRewardConfig sGuildBossRewardConfig = SGuildBossRewardConfig.getIndexByHurt(myHurt); int[] randomGroupIds = MathUtils.randomFromWeight(sGuildBossRewardConfig.getRandomRewardAllGroup()); - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sGuildBossRewardConfig.getReward(), 1, 0, BIReason.GUILD_BOSS_FIGHT_BASE_REWARD); - CommonProto.Drop.Builder raadomDrop = ItemUtil.drop(user, randomGroupIds, 1, 0, BIReason.GUILD_BOSS_FIGHT_RANDOM_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sGuildBossRewardConfig.getReward(), 1, 0, BIReason.GUILD_BOSS_FIGHT_BASE_REWARD); + CommonProto.Drop.Builder raadomDrop = ItemUtil.dropByGroup(user, randomGroupIds, 1, 0, BIReason.GUILD_BOSS_FIGHT_RANDOM_REWARD); FightInfoProto.FightEndResponse.Builder fightEndResponse = FightInfoProto.FightEndResponse.newBuilder(); fightEndResponse.setEnventDrop(drop); @@ -1125,8 +1125,8 @@ public class GuildFightLogic { CommonProto.FightData fightDataProto = CommonProto.FightData.parseFrom(fightData); SGuildBossRewardConfig sGuildBossRewardConfig = SGuildBossRewardConfig.getIndexByHurt(lastHurt); int[] randomGroupIds = MathUtils.randomFromWeight(sGuildBossRewardConfig.getRandomRewardAllGroup()); - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sGuildBossRewardConfig.getReward(), 1, 0, BIReason.GUILD_BOSS_FIGHT_BASE_REWARD); - CommonProto.Drop.Builder raadomDrop = ItemUtil.drop(user, randomGroupIds, 1, 0, BIReason.GUILD_BOSS_FIGHT_RANDOM_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sGuildBossRewardConfig.getReward(), 1, 0, BIReason.GUILD_BOSS_FIGHT_BASE_REWARD); + CommonProto.Drop.Builder raadomDrop = ItemUtil.dropByGroup(user, randomGroupIds, 1, 0, BIReason.GUILD_BOSS_FIGHT_RANDOM_REWARD); FightInfoProto.SweepRightResponse build = FightInfoProto.SweepRightResponse.newBuilder().setDrop(drop).setRandomDrop(raadomDrop).setFightData(fightDataProto).setHurt(lastHurt).build(); MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.SWEEP_RIGHT_RESPONSE_VALUE,build, true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java index f68668f65..78cdf0faf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java @@ -302,7 +302,7 @@ public class HardStageLogic { * 获取奖励 */ public static CommonProto.Drop.Builder getReward(User user, int rewardId) throws Exception { - return ItemUtil.drop(user, new int[]{rewardId}, 1, 0, BIReason.HARD_STAGE_GET); + return ItemUtil.dropByGroup(user, new int[]{rewardId}, 1, 0, BIReason.HARD_STAGE_GET); } private static boolean addDropAndStar(HardStageNode node, List dropList, int rewardGroupId) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 5afe9346b..dfcc6600f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -87,7 +87,7 @@ public class ItemLogic { if (!result) { throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } - CommonProto.Drop.Builder drop = ItemUtil.drop(user, StringUtil.parseFiledInt(reward.toString()), 1, 0, BIReason.DECOMPOS_ITEM_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, StringUtil.parseFiledInt(reward.toString()), 1, 0, BIReason.DECOMPOS_ITEM_REWARD); sendUseAndPriceItemMessage(iSession, msgId, drop); } @@ -186,7 +186,7 @@ public class ItemLogic { if (!result) { throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } - CommonProto.Drop.Builder drop = ItemUtil.drop(user, StringUtil.parseFiledInt(reward.toString()), 1, 0, BIReason.USER_ITEM); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, StringUtil.parseFiledInt(reward.toString()), 1, 0, BIReason.USER_ITEM); sendUseAndPriceItemMessage(iSession, msgId, drop); } @@ -370,7 +370,7 @@ public class ItemLogic { reward.append("#").append(sItem.getResolveReward()); } } - CommonProto.Drop.Builder drop = ItemUtil.drop(user, StringUtil.parseFiledInt(reward.toString()), 1, 0, BIReason.DECOMPOS_EQUIP_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, StringUtil.parseFiledInt(reward.toString()), 1, 0, BIReason.DECOMPOS_EQUIP_REWARD); sendUseAndPriceItemMessage(iSession, msgId, drop); } @@ -418,7 +418,7 @@ public class ItemLogic { user.getEquipManager().removeEquip(jewelId); } // 奖励组 - CommonProto.Drop.Builder drop = ItemUtil.drop(user, StringUtil.parseFiledInt(reward.toString()), 1, 0, BIReason.JEWEL_DECOMPOSE); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, StringUtil.parseFiledInt(reward.toString()), 1, 0, BIReason.JEWEL_DECOMPOSE); // 直接的奖励 ItemUtil.drop(user, items, drop, BIReason.JEWEL_DECOMPOSE); // 协议返回