修改道具掉落组方法
parent
cfcf56093d
commit
2457575a11
|
|
@ -234,10 +234,10 @@ public class EndExpeditionBattleRequest extends BaseHandler<Expedition.EndExpedi
|
|||
}
|
||||
CommonProto.Drop.Builder drop;
|
||||
if(nodeInfo.getType()==ExpeditionLogic.NODETYPE_GREED){
|
||||
drop = ItemUtil.drop(user,new int[]{STableManager.getConfig(SExpeditionSetting.class).get(1).getSpecialReward()},1,0,BIReason.EXPEDITION_DROP_REWARD);
|
||||
drop = ItemUtil.dropByGroup(user,new int[]{STableManager.getConfig(SExpeditionSetting.class).get(1).getSpecialReward()},1,0,BIReason.EXPEDITION_DROP_REWARD);
|
||||
}else{
|
||||
if(sExpeditionFloorConfig.getReward()!=null&&sExpeditionNodeConfig.getReward()!=0){
|
||||
drop = ItemUtil.drop(user, sExpeditionFloorConfig.getReward(),sExpeditionNodeConfig.getReward(),0,BIReason.EXPEDITION_DROP_REWARD);
|
||||
drop = ItemUtil.dropByGroup(user, sExpeditionFloorConfig.getReward(),sExpeditionNodeConfig.getReward(),0,BIReason.EXPEDITION_DROP_REWARD);
|
||||
}else {
|
||||
drop = CommonProto.Drop.newBuilder();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ public class GetShejiAwardRequestHandler extends BaseHandler<ActivityProto.GetSh
|
|||
activityType.sendActivityProgress(sessionByUid, null);
|
||||
int[] dropList = new int[1];
|
||||
dropList[0]=sGodSacrificeSetting.getTimeRewardGroup();
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropList,1,0, BIReason.SHEJI_ACTIVITY);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, dropList,1,0, BIReason.SHEJI_ACTIVITY);
|
||||
Poster.getPoster().dispatchEvent(new GetSheJiAwardEvent(uid));
|
||||
return ActivityProto.GetShejiAwardResponse.newBuilder().setDrop(drop).build();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ public class CompareNumBonusHandler extends BaseHandler {
|
|||
}
|
||||
int[] dropList = new int[1];
|
||||
dropList[0] = reward[1];
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropList,1,0, BIReason.COMPARENUM_TOTAL_REWARD);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, dropList,1,0, BIReason.COMPARENUM_TOTAL_REWARD);
|
||||
response.setDrop(drop);
|
||||
break;
|
||||
}
|
||||
|
|
@ -78,7 +78,7 @@ public class CompareNumBonusHandler extends BaseHandler {
|
|||
if (reward[0] == levelNum) {
|
||||
int[] dropList = new int[1];
|
||||
dropList[0] = reward[1];
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropList,1,0, BIReason.COMPARENUM_TOTAL_REWARD);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, dropList,1,0, BIReason.COMPARENUM_TOTAL_REWARD);
|
||||
response.setDrop(drop);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ public class ExplorerMapEventHandler extends BaseHandler<PlayerInfoProto.Explore
|
|||
.build();
|
||||
builder.setFightData(fightData);
|
||||
builder.setFightResult(fightResult.getResult());
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, new int[]{exploreEventConfig.get(id).getRewardGroup()}, 1, 0, BIReason.EXPLORE_EVENT_MONSTER);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, new int[]{exploreEventConfig.get(id).getRewardGroup()}, 1, 0, BIReason.EXPLORE_EVENT_MONSTER);
|
||||
builder.setDrop(drop);
|
||||
if ((int) fightResult.getCheckResult()[0] == 1) {
|
||||
//user.getUserMissionManager().onGameEvent(user, GameEvent.EXPLORE, MissionType.EXPLORE_REPELMONSTER_NUM,1);
|
||||
|
|
@ -120,14 +120,14 @@ public class ExplorerMapEventHandler extends BaseHandler<PlayerInfoProto.Explore
|
|||
.build();
|
||||
builder.setFightData(fightData);
|
||||
builder.setFightResult((int) fightResult.getCheckResult()[0]);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, new int[]{exploreEventConfig.get(id).getRewardGroup()}, 1, 0, BIReason.EXPLORE_EVENT_MONSTER);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, new int[]{exploreEventConfig.get(id).getRewardGroup()}, 1, 0, BIReason.EXPLORE_EVENT_MONSTER);
|
||||
builder.setDrop(drop);
|
||||
if ((int) fightResult.getCheckResult()[0] == 1) {
|
||||
//user.getUserMissionManager().onGameEvent(user, GameEvent.EXPLORE, MissionType.EXPLORE_REPELXINMO_NUM, 1);
|
||||
eventList.remove(index);
|
||||
}
|
||||
} else if (exploreEventConfig.get(id).getType() == 3) {
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, new int[]{exploreEventConfig.get(id).getRewardGroup()}, 1, 0, BIReason.EXPLORE_EVENT_BOX);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, new int[]{exploreEventConfig.get(id).getRewardGroup()}, 1, 0, BIReason.EXPLORE_EVENT_BOX);
|
||||
builder.setDrop(drop);
|
||||
//user.getUserMissionManager().onGameEvent(user, GameEvent.EXPLORE, MissionType.EXPLORE_PICKYM_NUM, 1);
|
||||
eventList.remove(index);
|
||||
|
|
|
|||
|
|
@ -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,0,BIReason.JOURNEY_COMMON_REWARD);
|
||||
drop = ItemUtil.dropByGroup(user,ints,1,0,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, 0, BIReason.JOURNEY_FIGHT_REWARD);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, new int[]{monster.getReward()}, 1, 0, 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, 0, BIReason.JOURNEY_RANDOM_REWARD);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, new int[]{reward}, 1, 0, BIReason.JOURNEY_RANDOM_REWARD);
|
||||
response.setDrop(drop);
|
||||
response.setLocation(position);
|
||||
|
||||
|
|
|
|||
|
|
@ -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, 0, BIReason.MAP_FAST_FIGHT_REWARD);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sMonsterGroup.getRewardgroup(), 1, 0, 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, 0, BIReason.MAP_GENERAL_FIGHT_REWARD);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sMonsterGroup.getRewardgroup(), 1, 0, BIReason.MAP_GENERAL_FIGHT_REWARD);
|
||||
checkMoraleLevel(user);
|
||||
builder.setEnventDrop(drop.build());
|
||||
builder.setResult(resultCode);
|
||||
|
|
|
|||
|
|
@ -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, 0, BIReason.MAP_FAST_FIGHT_REWARD);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sMonsterGroup.getRewardgroup(), 1, 0, BIReason.MAP_FAST_FIGHT_REWARD);
|
||||
fastFightResponseBuilder.setEnventDrop(drop.build());
|
||||
}else{
|
||||
List<Long> 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);
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public class GetPhoneRewardRequestHandler extends BaseHandler<PlayerInfoProto.Ge
|
|||
rewardIds[0] = reward;
|
||||
int uid = iSession.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user,rewardIds, 1, 0, BIReason.BIND_PHONE);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user,rewardIds, 1, 0, BIReason.BIND_PHONE);
|
||||
if(user.getPlayerInfoManager().getPhoneBindInfo().getState()!=1){
|
||||
throw new ErrorCodeException(ErrorCode.PHONE_GET);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ public class SituationLogic {
|
|||
if(!situationPass.containsKey(sRaceTowerConfig.getType())||situationPass.get(sRaceTowerConfig.getType())<id){
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||
}
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sRaceTowerConfig.getReward(), 1, 0, BIReason.SITUATION_CHALLENGE_REWARD);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropByGroup(user, sRaceTowerConfig.getReward(), 1, 0, BIReason.SITUATION_CHALLENGE_REWARD);
|
||||
builder.setDrop(drop);
|
||||
|
||||
ReportUtil.dropToString(drop,dropResult);
|
||||
|
|
@ -266,7 +266,7 @@ public class SituationLogic {
|
|||
|
||||
//挑战成功
|
||||
if(fightResult.getResult()>0){
|
||||
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);
|
||||
|
||||
// 埋点用的
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<Integer> dropList, int rewardGroupId) {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
// 协议返回
|
||||
|
|
|
|||
Loading…
Reference in New Issue