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 4df9b1602..37b8add95 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 chapt = user.getHardStageManager().getChapterMap(user); if (chapt != null) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/JourneyMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/JourneyMap.java index 3e78dcba7..06c4a5e91 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/JourneyMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/JourneyMap.java @@ -433,7 +433,7 @@ public class JourneyMap { Integer[] array = reward.toArray(new Integer[0]); int[] ints = Arrays.stream(array).mapToInt(Integer::intValue).toArray(); - drop = ItemUtil.drop(user,ints,1, BIReason.JOURNEY_COMMON_REWARD); + drop = ItemUtil.dropByGroup(user,ints,1, BIReason.JOURNEY_COMMON_REWARD); builder.setDrop(drop); arrivePath.setMapPointId(0); user.getMapManager().updateJourneyInfoByMapId(mapId,pathInfo); @@ -543,7 +543,7 @@ public class JourneyMap { MapInfoProto.JourneyFightResponse.Builder response =MapInfoProto.JourneyFightResponse.newBuilder(); String combat_results = "失败"; if(fightResult.getResult()==1){ - CommonProto.Drop.Builder drop = ItemUtil.drop(user, new int[]{monster.getReward()}, 1, BIReason.JOURNEY_FIGHT_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, new int[]{monster.getReward()}, 1, BIReason.JOURNEY_FIGHT_REWARD); response.setDrop(drop); pathInfo.removeMonster(bossIndex); @@ -630,7 +630,7 @@ public class JourneyMap { }else { pathInfo.setRandomReward(null); } - CommonProto.Drop.Builder drop = ItemUtil.drop(user, new int[]{reward}, 1, BIReason.JOURNEY_RANDOM_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, new int[]{reward}, 1, BIReason.JOURNEY_RANDOM_REWARD); response.setDrop(drop); response.setLocation(position); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 6012ed345..69d2ca09c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -823,7 +823,7 @@ public class MapLogic { MapMissionManager.updateMapMission(user, EventType.updatePonintEvent, pointId, pointId); CommonProto.Drop.Builder dropBuilder = null; if (sOptionConfig.getReward().length > 0) { - dropBuilder = ItemUtil.drop(user, sOptionConfig.getReward(), 1, BIReason.MAP_EVENET_REWARD); + dropBuilder = ItemUtil.dropByGroup(user, sOptionConfig.getReward(), 1, BIReason.MAP_EVENET_REWARD); } List eventBehaviorValuesList = new ArrayList<>(); for (int i = 0; i < sOptionConfig.getBehaviorTypeValues().length; i++) { @@ -1303,7 +1303,7 @@ public class MapLogic { if (mission.getMissionInfo() != null) { checkMissionReturn.newEventId = mission.getMissionInfo(); } - checkMissionReturn.drop = ItemUtil.drop(user, sMissionEventsConfig.getReward(), 1, BIReason.MAP_MISSION_REWARD); + checkMissionReturn.drop = ItemUtil.dropByGroup(user, sMissionEventsConfig.getReward(), 1, BIReason.MAP_MISSION_REWARD); int useTime = getUseTime(user); mission.setTime(useTime); CrossInfo crossInfo = user.getMapManager().getCrossInfoMap().get(mapManager.getCurMapId()); @@ -1526,7 +1526,7 @@ public class MapLogic { SChallengeMapConfig sChallengeMapConfig = STableManager.getConfig(SChallengeMapConfig.class).get(mapId); for (int i = 0; i < count; i++) { - CommonProto.Drop.Builder dropBuilder = ItemUtil.drop(user, sChallengeMapConfig.getSweepingAward(), 1, BIReason.MAP_SWEEP_REWARD); + CommonProto.Drop.Builder dropBuilder = ItemUtil.dropByGroup(user, sChallengeMapConfig.getSweepingAward(), 1, BIReason.MAP_SWEEP_REWARD); mapSweepResponse.addDrop(dropBuilder); } Poster.getPoster().dispatchEvent(new StoryEvent(user.getId(), count)); @@ -1580,7 +1580,7 @@ public class MapLogic { .setResult(fightResult.getResult()); if (fightResult.getResult() == 1) { SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(mapManager.getSuddenlyBoss()); - CommonProto.Drop.Builder dropBuilder = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1.0f, BIReason.SUDDENLY_REWARD); + CommonProto.Drop.Builder dropBuilder = ItemUtil.dropByGroup(user, sMonsterGroup.getRewardgroup(), 1.0f, BIReason.SUDDENLY_REWARD); builderResponse.setEnventDrop(dropBuilder); mapManager.findSuddenlyBoss(0, 0); } @@ -1755,7 +1755,7 @@ public class MapLogic { MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.MAIN_LEVEL_FIGHT_UPDATE_INDICATION_VALUE, build, true); // 打点,现在不用 SMainLevelConfig sMainLevelConfig = SMainLevelConfig.config.get(fightId); - ReportUtil.onReportEvent(user, ReportEventEnum.PASS_STAGE.getType(), String.valueOf(fightId), "", sMainLevelConfig.getReward(), new Date()); +// ReportUtil.onReportEvent(user, ReportEventEnum.PASS_STAGE.getType(), String.valueOf(fightId), "", sMainLevelConfig.getReward(), new Date()); // 奖励道具 return ItemUtil.dropToPrivilege(user, sMainLevelConfig.getReward(), BIReason.LEVELDIFFICULTY_FIGHT_REWARD); } @@ -2633,7 +2633,7 @@ public class MapLogic { if (!dailyPass.contains(id)) { throw new ErrorCodeException(ErrorCode.DAILY_ALREADY_PASS); } - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sDailyChallengeConfig.getReward(), 1, 1); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sDailyChallengeConfig.getReward(), 1, 1); builder.setDrop(drop); consumeCount = true; } else if (type == 1) { @@ -2686,7 +2686,7 @@ public class MapLogic { FightRecordLogic.getInstance().addRecordMap(user, fightData); if (fightResult.getResult() > 0) { - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sDailyChallengeConfig.getReward(), 1, 1); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sDailyChallengeConfig.getReward(), 1, 1); builder.setDrop(drop); playerInfoManager.addDailyPass(id); } else { @@ -3127,7 +3127,7 @@ public class MapLogic { killNum++; SEventPointConfig point = eventPointConfig.get(cell.getEventId()); SMonsterGroup monsterGroup = SMonsterGroup.getsMonsterGroupMap().get(point.getOption()[0]); - ItemUtil.drop(user, monsterGroup.getRewardgroup(), drop, 1, BIReason.MAP_FAST_FIGHT_REWARD); + ItemUtil.dropByGroup(user, monsterGroup.getRewardgroup(), drop, 1, BIReason.MAP_FAST_FIGHT_REWARD); BehaviorUtil.destoryApointXY(user, cell.getCellId()); } // 扫荡,boss,增加杀敌数量 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java index 666f83228..8e507a8f2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java @@ -284,7 +284,7 @@ public class EndlessMap extends AbstractMap{ // user.getUserMissionManager().onGameEvent(user,GameEvent.ONE_MISSION_TYPE_CONSUME, MissionType.ENDLESS_MONSTER_KILL); mapManager.removeEndlessOneMonsterHp(mapManager.getTriggerXY()); SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(groupId); - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, BIReason.MAP_FAST_FIGHT_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sMonsterGroup.getRewardgroup(), 1, BIReason.MAP_FAST_FIGHT_REWARD); fastFightResponseBuilder.setEnventDrop(drop.build()); } mapManager.setLastFightResult(resultCode); @@ -686,7 +686,7 @@ public class EndlessMap extends AbstractMap{ mapManager.removeEndlessOneMonsterHp(mapManager.getCurXY()); //血量更新 // refreshHp(user, mapManager.getTeamId(),checkResult); - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, BIReason.MAP_GENERAL_FIGHT_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sMonsterGroup.getRewardgroup(), 1, BIReason.MAP_GENERAL_FIGHT_REWARD); checkMoraleLevel(user); builder.setEnventDrop(drop.build()); builder.setResult(resultCode); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java index 3bfcda005..07a445fff 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java @@ -475,7 +475,7 @@ public class TowerMap extends AbstractMap { mapManager.updateTrialKillCount(trialInfo.getKillCount()+1); SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(groupId); - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, BIReason.MAP_FAST_FIGHT_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sMonsterGroup.getRewardgroup(), 1, BIReason.MAP_FAST_FIGHT_REWARD); fastFightResponseBuilder.setEnventDrop(drop.build()); }else{ List 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, BIReason.BOMB_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, bombReward, 1, 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 c880b1c00..4a77b4e38 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, BIReason.SITUATION_CHALLENGE_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sRaceTowerConfig.getFirstReward(), 1, 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 8d82ad145..169b3ca24 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, reason); + return ItemUtil.dropByGroup(user, dropList, 1, 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 043cbe8d8..e951fce01 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 @@ -304,10 +304,10 @@ public class GuildChallengeLogic { } } - drop = ItemUtil.drop(user, new int[]{config.getReward(),config.getKillReward()}, 1, 1); + drop = ItemUtil.dropByGroup(user, new int[]{config.getReward(),config.getKillReward()}, 1, 1); }else{ - drop = ItemUtil.drop(user, new int[]{config.getReward()}, 1, 1); + drop = ItemUtil.dropByGroup(user, new int[]{config.getReward()}, 1, 1); } int remainHp; if(guildInfo.getBossHpRemain()==0){ 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 a4af18bee..740f4a40d 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, BIReason.GUILD_BOSS_FIGHT_BASE_REWARD); - CommonProto.Drop.Builder raadomDrop = ItemUtil.drop(user, randomGroupIds, 1, BIReason.GUILD_BOSS_FIGHT_RANDOM_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sGuildBossRewardConfig.getReward(), 1, BIReason.GUILD_BOSS_FIGHT_BASE_REWARD); + CommonProto.Drop.Builder raadomDrop = ItemUtil.dropByGroup(user, randomGroupIds, 1, 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, BIReason.GUILD_BOSS_FIGHT_BASE_REWARD); - CommonProto.Drop.Builder raadomDrop = ItemUtil.drop(user, randomGroupIds, 1, BIReason.GUILD_BOSS_FIGHT_RANDOM_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sGuildBossRewardConfig.getReward(), 1, BIReason.GUILD_BOSS_FIGHT_BASE_REWARD); + CommonProto.Drop.Builder raadomDrop = ItemUtil.dropByGroup(user, randomGroupIds, 1, 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/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 302fe1350..5b3ff3c9d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -277,11 +277,11 @@ public class CombatLogic { } } } - ItemUtil.combineRewardByMainLine(user,false, mainLevelConfig.getRandomRewardMin(), times,itemObj,BIReason.ADVENTURE_BASE_REWARD); - ItemUtil.combineRewardByMainLine(user,true, mainLevelConfig.getRandomReward(), times,itemRandomObj,BIReason.ADVENTURE_RANDOM_REWARDD); + ItemUtil.combineRewardGroupByMainLine(user,false, mainLevelConfig.getRandomRewardMin(), times,itemObj,BIReason.ADVENTURE_BASE_REWARD); + ItemUtil.combineRewardGroupByMainLine(user,true, mainLevelConfig.getRandomReward(), times,itemRandomObj,BIReason.ADVENTURE_RANDOM_REWARDD); // 小兵关卡 SSoldierStageConfig stageConfig = SSoldierStageConfig.idMap.get(mainLevelManager.getSoldierLayerId()); - ItemUtil.combineRewardByMainLine(user,false, stageConfig.getRandomRewardMin(), times,itemObj,BIReason.ADVENTURE_BASE_REWARD); + ItemUtil.combineRewardGroupByMainLine(user,false, stageConfig.getRandomRewardMin(), times,itemObj,BIReason.ADVENTURE_BASE_REWARD); itemRandomObj.setEquipMap(equipAutoCombine(itemRandomObj.getEquipMap())); //清除无用活动道具 @@ -639,11 +639,11 @@ public class CombatLogic { String title = SErrorCodeEerverConfig.getI18NMessage("adventuren_boss_find_reward_title"); String content = SErrorCodeEerverConfig.getI18NMessage("adventuren_boss_find_reward__txt"); if (findRewardgroup != null) { - String findRewardMail = ItemUtil.getMailReward(findUser,findRewardgroup, 1.0f); + String findRewardMail = ItemUtil.getMailRewardByGroup(findUser,findRewardgroup, 1.0f); MailLogic.getInstance().sendMail(findUserId,title,content,findRewardMail,nowTime, Global.MAIL_EFFECTIVE_TIME); } User killUser = UserManager.getUser(killUid); - String killRewardMail = ItemUtil.getMailReward(killUser,killReward, 1.0f); + String killRewardMail = ItemUtil.getMailRewardByGroup(killUser,killReward, 1.0f); title = SErrorCodeEerverConfig.getI18NMessage("adventuren_boss_kill_reward_title"); content = SErrorCodeEerverConfig.getI18NMessage("adventuren_boss_kill_reward__txt"); MailLogic.getInstance().sendMail(killUid,title,content,killRewardMail,nowTime, Global.MAIL_EFFECTIVE_TIME); @@ -966,13 +966,13 @@ public class CombatLogic { getSoldierBaseReward(baseList); ItemMap itemObj = new ItemMap(); ItemMap itemRandom = new ItemMap(); - ItemUtil.combineRewardByMainLineNotCycle(user,true,baseList,itemObj,BIReason.ADVENTURE_BASE_REWARD); + ItemUtil.combineRewardGroupByMainLineNotCycle(user,true,baseList,itemObj,BIReason.ADVENTURE_BASE_REWARD); if (viewBaseReward){ myResult = true; rewardStr = ItemUtil.getReward(itemObj); return this; } - ItemUtil.combineRewardByMainLineNotCycle(user, false, randomList,itemRandom,BIReason.ADVENTURE_RANDOM_REWARDD); + ItemUtil.combineRewardGroupByMainLineNotCycle(user, false, randomList,itemRandom,BIReason.ADVENTURE_RANDOM_REWARDD); //装备合成 itemRandom.setEquipMap(equipAutoCombine(itemRandom.getEquipMap())); removeNoUseItem(user,itemRandom.getItemMap()); 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 2b0daa42d..375e34fe1 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, BIReason.HARD_STAGE_GET); + return ItemUtil.dropByGroup(user, new int[]{rewardId}, 1, 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 ec2081e11..5b15119c7 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 @@ -85,7 +85,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, BIReason.DECOMPOS_ITEM_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, StringUtil.parseFiledInt(reward.toString()), 1, BIReason.DECOMPOS_ITEM_REWARD); sendUseAndPriceItemMessage(iSession, msgId, drop); } @@ -184,7 +184,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, BIReason.USER_ITEM); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, StringUtil.parseFiledInt(reward.toString()), 1, BIReason.USER_ITEM); sendUseAndPriceItemMessage(iSession, msgId, drop); } @@ -277,11 +277,11 @@ public class ItemLogic { SMainLevelConfig targetMainLevelConfig = mainLevelConfigMap.get(mainLevelManager.getFightId()); int[] randomRewardMin = targetMainLevelConfig.getRandomRewardMin(); int[] randomReward = targetMainLevelConfig.getRandomReward(); - ItemUtil.combineRewardByMainLine(user, false, randomRewardMin, dropRatio, itemObj, BIReason.ADVENTURE_BASE_REWARD); - ItemUtil.combineRewardByMainLine(user, true, randomReward, dropRatio, itemObj, BIReason.ADVENTURE_RANDOM_REWARDD); + ItemUtil.combineRewardGroupByMainLine(user, false, randomRewardMin, dropRatio, itemObj, BIReason.ADVENTURE_BASE_REWARD); + ItemUtil.combineRewardGroupByMainLine(user, true, randomReward, dropRatio, itemObj, BIReason.ADVENTURE_RANDOM_REWARDD); // 小兵关卡 SSoldierStageConfig stageConfig = idMap.get(mainLevelManager.getSoldierLayerId()); - ItemUtil.combineRewardByMainLine(user, false, stageConfig.getRandomRewardMin(), dropRatio, itemObj, BIReason.ADVENTURE_BASE_REWARD); + ItemUtil.combineRewardGroupByMainLine(user, false, stageConfig.getRandomRewardMin(), dropRatio, itemObj, BIReason.ADVENTURE_BASE_REWARD); if (itemObj.getItemMap().containsKey(itemId)) { dropArr[index][0] = itemId; @@ -326,7 +326,7 @@ public class ItemLogic { } SItem sItem = SItem.getsItemMap().get(item.getItemId()); num += (int) item.getItemNum(); - ItemUtil.combineReward(user, true, sItem.getRewardGroup(), 1f, itemObj, 0); + ItemUtil.combineRewardByGroup(user, true, sItem.getRewardGroup(), 1f, itemObj, 0); } int[][] costItemArr = StringUtil.parseFiledInt2(cost.toString()); long mapNum = ItemUtil.getMapById(itemId, itemObj); @@ -371,7 +371,7 @@ public class ItemLogic { reward.append("#").append(sItem.getResolveReward()); } } - CommonProto.Drop.Builder drop = ItemUtil.drop(user, StringUtil.parseFiledInt(reward.toString()), 1, BIReason.DECOMPOS_EQUIP_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, StringUtil.parseFiledInt(reward.toString()), 1, BIReason.DECOMPOS_EQUIP_REWARD); sendUseAndPriceItemMessage(iSession, msgId, drop); } @@ -419,7 +419,7 @@ public class ItemLogic { user.getEquipManager().removeEquip(jewelId); } // 奖励组 - CommonProto.Drop.Builder drop = ItemUtil.drop(user, StringUtil.parseFiledInt(reward.toString()), 1, BIReason.JEWEL_DECOMPOSE); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, StringUtil.parseFiledInt(reward.toString()), 1, BIReason.JEWEL_DECOMPOSE); // 直接的奖励 ItemUtil.drop(user, items, drop, BIReason.JEWEL_DECOMPOSE); // 协议返回 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index 8c5eeaad2..6784868aa 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -746,7 +746,7 @@ public class MissionLoigc { throw new ErrorCodeException(ErrorCode.newDefineCode("had taked reward")); } int rewardGroup = STableManager.getConfig(SBloodyBattleTask.class).get(missionId).getRewardGroup(); - CommonProto.Drop.Builder drop = ItemUtil.drop(user, new int[]{rewardGroup}, 1.0f, BIReason.TAKE_MISSION_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, new int[]{rewardGroup}, 1.0f, BIReason.TAKE_MISSION_REWARD); PlayerInfoProto.TakeMissionRewardResponse build = PlayerInfoProto.TakeMissionRewardResponse.newBuilder().setDrop(drop).build(); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.TAKE_MISSION_REWARD_RESPONSE_VALUE,build,true); ReportUtil.onReportEvent(user, ReportEventEnum.MISSION_COMPLETE.getType(),missionId,GameMisionType.BLOODYMISSION.toString()); @@ -769,7 +769,7 @@ public class MissionLoigc { } takeCopyMisionRewards.add(missionId); user.getMapManager().setTakeCopyMisionRewards(takeCopyMisionRewards); - CommonProto.Drop.Builder drop = ItemUtil.drop(user, STableManager.getConfig(SAccomplishmentConfig.class).get(missionId).getReward(), 1, BIReason.TAKE_COPY_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, STableManager.getConfig(SAccomplishmentConfig.class).get(missionId).getReward(), 1, BIReason.TAKE_COPY_REWARD); PlayerInfoProto.TakeMissionRewardResponse build = PlayerInfoProto.TakeMissionRewardResponse.newBuilder().setDrop(drop).build(); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.TAKE_MISSION_REWARD_RESPONSE_VALUE,build,true); KtEventUtils.onKtEvent(user, ParamEventBean.UserTaskEvent,type,missionId); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 051dbd518..4a2ab23ca 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1110,7 +1110,7 @@ public class PlayerLogic { } String title = sTestWelfare.gettitle(); String content = sTestWelfare.getvalue(); - String mailReward = ItemUtil.getMailReward(user, sTestWelfare.getReward(), 1.0f); + String mailReward = ItemUtil.getMailRewardByGroup(user, sTestWelfare.getReward(), 1.0f); MailLogic.getInstance().sendMail(user.getId(), title, content, mailReward, (int) (System.currentTimeMillis() / 1000), Global.MAIL_EFFECTIVE_TIME); timingMailIds.add(sTestWelfare.getId()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 29030efdb..b500d135e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -178,14 +178,13 @@ public class ItemUtil { } return dropBuilder; } + //活动额外掉落 - public static void activityDrop(User user,CommonProto.Drop.Builder dropBuilder ,int[] dropGroupIds, float dropRatio,int reason) throws Exception { - ItemMap itemObj = new ItemMap(); - combineRewardDropGroup(user, dropGroupIds, dropRatio,itemObj); - mapToAdd(user,itemObj,dropBuilder,reason); - } - - +// public static void activityDrop(User user,CommonProto.Drop.Builder dropBuilder ,int[] dropGroupIds, float dropRatio,int reason) throws Exception { +// ItemMap itemObj = new ItemMap(); +// combineRewardDropGroup(user, dropGroupIds, dropRatio,itemObj); +// mapToAdd(user,itemObj,dropBuilder,reason); +// } private static void combineRewardDropGroup(User user, int[] dropGroupIds, float dropRatio,ItemMap itemObj) throws ErrorCodeException{ for (int dropGroupId : dropGroupIds) { @@ -206,20 +205,20 @@ public class ItemUtil { } //掉落组概率 - public static CommonProto.Drop.Builder drop(User user, Map dropGroupAndRatioMap,int reason) throws Exception { - CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder(); - for (Map.Entry entry :dropGroupAndRatioMap.entrySet()){ - int[] dropGroupIds = entry.getKey(); - float dropRatio = entry.getValue(); - activityDrop(user,dropBuilder,dropGroupIds,dropRatio,reason); - } - return dropBuilder; - } +// public static CommonProto.Drop.Builder drop(User user, Map dropGroupAndRatioMap,int reason) throws Exception { +// CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder(); +// for (Map.Entry entry :dropGroupAndRatioMap.entrySet()){ +// int[] dropGroupIds = entry.getKey(); +// float dropRatio = entry.getValue(); +// activityDrop(user,dropBuilder,dropGroupIds,dropRatio,reason); +// } +// return dropBuilder; +// } /** * 掉落 */ - public static CommonProto.Drop.Builder drop(User user, int[] dropGroupIds, float dropRatio, int reason) throws Exception { + public static CommonProto.Drop.Builder dropByGroup(User user, int[] dropGroupIds, float dropRatio, int reason) throws Exception { CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder(); ItemMap itemObj = new ItemMap(); combineRewardDropGroup(user, dropGroupIds, dropRatio,itemObj); @@ -230,16 +229,17 @@ public class ItemUtil { /** * 掉落 走特权 */ - public static CommonProto.Drop.Builder dropToPrivilege(User user, int[] dropGroupIds, int reason) throws Exception { + public static CommonProto.Drop.Builder dropToPrivilege(User user, int[] dropIds, int reason) throws Exception { CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder(); ItemMap itemObj = new ItemMap(); - combineRewardDropGroup(user, dropGroupIds, 1,itemObj); + selectItemArr(new int[][]{dropIds},itemObj); +// combineRewardDropGroup(user, dropIds, 1,itemObj); privilegeAddToMainLevelChallenge(user, itemObj); mapToAdd(user,itemObj,dropBuilder,reason); return dropBuilder; } - public static CommonProto.Drop.Builder drop(User user, int[] dropGroupIds, CommonProto.Drop.Builder dropBuilder, float dropRatio, int reason) throws Exception { + public static CommonProto.Drop.Builder dropByGroup(User user, int[] dropGroupIds, CommonProto.Drop.Builder dropBuilder, float dropRatio, int reason) throws Exception { ItemMap itemObj = new ItemMap(); combineRewardDropGroup(user, dropGroupIds, dropRatio,itemObj); mapToAdd(user,itemObj,dropBuilder,reason); @@ -261,7 +261,7 @@ public class ItemUtil { /** * 获取奖励 根据邮件 */ - public static String getMailReward (User user,int[] dropGroupIds,float dropRatio) throws Exception { + public static String getMailRewardByGroup(User user, int[] dropGroupIds, float dropRatio) throws Exception { ItemMap itemObj = new ItemMap(); combineRewardDropGroup(user, dropGroupIds, dropRatio,itemObj); return getReward(itemObj); @@ -292,7 +292,7 @@ public class ItemUtil { } - public static void combineReward(User user,boolean isLoop,int[] dropGroupIds,float dropRatio,ItemMap itemObj,int reason)throws ErrorCodeException{ + public static void combineRewardByGroup(User user, boolean isLoop, int[] dropGroupIds, float dropRatio, ItemMap itemObj, int reason)throws ErrorCodeException{ combineRewardDropGroup(user, dropGroupIds, dropRatio,itemObj); if(!isLoop){ extraAddItem(user,itemObj.getItemMap(),reason); @@ -302,7 +302,7 @@ public class ItemUtil { /** * 主线挂机奖励 */ - public static void combineRewardByMainLine(User user, boolean fiexdOrRandom, int[] dropGroupIds, int time, ItemMap itemObj, int reason) throws ErrorCodeException{ + public static void combineRewardGroupByMainLine(User user, boolean fiexdOrRandom, int[] dropGroupIds, int time, ItemMap itemObj, int reason) throws ErrorCodeException{ combineReward(user, fiexdOrRandom, dropGroupIds, time, itemObj); // 特权加成奖励 extraAddItem(user,itemObj.getItemMap(),reason); @@ -311,7 +311,7 @@ public class ItemUtil { /** * 主线挂机奖励,避免循环 挂机走redis */ - public static void combineRewardByMainLineNotCycle(User user, boolean fiexdOrRandom, List groupList, ItemMap itemObj, int reason) throws ErrorCodeException{ + public static void combineRewardGroupByMainLineNotCycle(User user, boolean fiexdOrRandom, List groupList, ItemMap itemObj, int reason) throws ErrorCodeException{ for (int[][] list : groupList) { int[] groups = list[0]; if (groups == null){ @@ -1593,7 +1593,7 @@ public class ItemUtil { CommonProto.Drop.Builder drop = CommonProto.Drop.newBuilder(); if (!dropIds.toString().isEmpty()){ int[] ints = StringUtil.parseFiledInt(dropIds.toString()); - drop = ItemUtil.drop(user, ints, 1, reason); + drop = ItemUtil.dropByGroup(user, ints, 1, reason); } return drop; }