Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
e8e1f7b744
|
@ -2255,18 +2255,20 @@ public class MapLogic {
|
|||
public void openNextMainLevel(User user,int fightId) throws Exception {
|
||||
int level = user.getPlayerInfoManager().getLevel();
|
||||
int state = 1;
|
||||
int updateFightId = fightId;
|
||||
SMainLevelConfig sMainLevelConfig = SMainLevelConfig.config.get(fightId);
|
||||
if(sMainLevelConfig.getNextLevel()!=-1){
|
||||
SMainLevelConfig sMainLevelConfigNext = SMainLevelConfig.config.get(sMainLevelConfig.getNextLevel());
|
||||
if(sMainLevelConfigNext.getLevelLimit()>level){
|
||||
state =-1;
|
||||
}
|
||||
updateFightId = sMainLevelConfigNext.getId();
|
||||
}else{
|
||||
state =2;
|
||||
}
|
||||
user.getUserMissionManager().onGameEvent(user, GameEvent.STORY_FIGHT, fightId,0,1);
|
||||
Poster.getPoster().dispatchEvent(new FightMainEvent(user.getId(),fightId));
|
||||
user.getMainLevelManager().updateFight(sMainLevelConfig.getNextLevel(),state);
|
||||
user.getMainLevelManager().updateFight(updateFightId,state);
|
||||
if(state == -1){
|
||||
//删除为0的
|
||||
Map<Integer, Integer> fightStateInfo = user.getMainLevelManager().getFightStateInfo();
|
||||
|
|
|
@ -309,17 +309,22 @@ public class CombatLogic {
|
|||
Map<Integer,Integer> randomRandomMap = new HashMap<>();
|
||||
CommonProto.Drop.Builder baseBuilder = CommonProto.Drop.newBuilder();
|
||||
CommonProto.Drop.Builder randomBuilder = CommonProto.Drop.newBuilder();
|
||||
|
||||
if(mainLevelManager.getState()!=-1){
|
||||
int fightId = mainLevelManager.getFightId();
|
||||
SMainLevelConfig sMainLevelConfig = SMainLevelConfig.config.get(fightId);
|
||||
int[] randomRewardMin = sMainLevelConfig.getRandomRewardMin();
|
||||
ItemUtil.combineReward(user,randomRewardMin, times,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap);
|
||||
int timesTemp =times;
|
||||
while (timesTemp-->0){
|
||||
ItemUtil.combineReward(user,sMainLevelConfig.getRandomReward(), 1f,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap);
|
||||
int fightId = mainLevelManager.getFightId();
|
||||
SMainLevelConfig targetMainLevelConfig = SMainLevelConfig.config.get(fightId);
|
||||
if(mainLevelManager.getState()==-1){
|
||||
for( SMainLevelConfig sMainLevelConfig : SMainLevelConfig.config.values() ){
|
||||
if(sMainLevelConfig.getNextLevel() == mainLevelManager.getFightId()){
|
||||
targetMainLevelConfig = sMainLevelConfig;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
int[] randomRewardMin = targetMainLevelConfig.getRandomRewardMin();
|
||||
ItemUtil.combineReward(user,randomRewardMin, times,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap);
|
||||
int timesTemp =times;
|
||||
while (timesTemp-->0){
|
||||
ItemUtil.combineReward(user,targetMainLevelConfig.getRandomReward(), 1f,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap);
|
||||
}
|
||||
ItemUtil.drop(user,baseBuilder,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,BIReason.ADVENTURE_BASE_REWARD);
|
||||
ItemUtil.drop(user,randomBuilder,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,BIReason.ADVENTURE_RANDOM_REWARDD);
|
||||
Map<Integer, CommonProto.Drop> result = new HashMap<>(2);
|
||||
|
|
|
@ -496,7 +496,7 @@ public class ItemLogic {
|
|||
}
|
||||
user.getEquipManager().upStarEspecialEquip(equipId);
|
||||
Poster.getPoster().dispatchEvent(new EspecialEquipUpEvent(user.getId(),0, user.getEquipManager().getEspecialEquipMap().get(equipId).getStar()));
|
||||
user.getUserMissionManager().onGameEvent(user, GameEvent.ESPECIAL_EQUIP,especialEquip.getStar()+1);
|
||||
user.getUserMissionManager().onGameEvent(user, GameEvent.ESPECIAL_EQUIP,especialEquip.getStar());
|
||||
MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE,null,true);
|
||||
if(especialEquip.getStar()>=SSpecialConfig.getIntegerValue(SSpecialConfig.lamp_rankup_equiptalisman_content_parm)){
|
||||
SItem sItem = SItem.getsItemMap().get(especialEquip.getEquipId());
|
||||
|
|
Loading…
Reference in New Issue