fix 22
parent
40d69786a4
commit
88904dd030
|
|
@ -14,6 +14,7 @@ public class FinsionMissionAndDestoryBehavior extends BaseBehavior{
|
|||
|
||||
@Override
|
||||
public boolean process(int optionId, User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
||||
BehaviorUtil.updateMission(user, eventUpdateResponse);
|
||||
BehaviorUtil.destoryPoint(user, user.getMapManager().getCurMapId(), behaviorTypeValues[0][1]);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ package com.ljsd.jieling.logic.dao;
|
|||
|
||||
import com.ljsd.common.mogodb.MongoBase;
|
||||
import com.ljsd.jieling.config.SCHero;
|
||||
import com.ljsd.jieling.config.SGameSetting;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||
import com.ljsd.jieling.logic.mission.GameEvent;
|
||||
import com.ljsd.jieling.util.KeyGenUtils;
|
||||
import com.ljsd.jieling.util.UUIDEnum;
|
||||
|
|
@ -35,6 +32,8 @@ public class Hero extends MongoBase {
|
|||
|
||||
private int breakId;
|
||||
|
||||
private int starBreakId;
|
||||
|
||||
private int createTime ;
|
||||
|
||||
private int lastUpdateEnergyTime;
|
||||
|
|
@ -182,4 +181,12 @@ public class Hero extends MongoBase {
|
|||
return createTime;
|
||||
}
|
||||
|
||||
public int getStarBreakId() {
|
||||
return starBreakId;
|
||||
}
|
||||
|
||||
public void setStarBreakId(int starBreakId) {
|
||||
updateString("starBreakId",starBreakId);
|
||||
this.starBreakId = starBreakId;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -414,41 +414,18 @@ public class HeroLogic {
|
|||
SHeroLevlConfig sHeroLevlConfig = SHeroLevlConfig.getsCHero().get(oldLevel);
|
||||
consume = sHeroLevlConfig.getConsume();
|
||||
}
|
||||
if(!isBreak){
|
||||
Map<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByTypeStar = SCHeroRankUpConfig.getScHeroRankUpConfigByShow(GlobalsDef.UP_STAR_TYPE, scHero.getStar());
|
||||
if(scHeroRankUpConfig == null && scHeroRankUpConfigByTypeStar == null && scHeroRankUpConfigByType!=null){
|
||||
boolean isAll = true;
|
||||
for( SCHeroRankUpConfig scHeroRankUpConfigTmp :scHeroRankUpConfigByType.values()){
|
||||
int openLevel = scHeroRankUpConfigTmp.getOpenLevel();
|
||||
if(hero.getLevel()<openLevel){
|
||||
isAll = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(isAll){
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,"max level");
|
||||
return;
|
||||
}
|
||||
if(!isBreak&&breakId!=0){
|
||||
|
||||
int starBreakId = hero.getStarBreakId();
|
||||
if(starBreakId==0){
|
||||
scHeroRankUpConfig = SCHeroRankUpConfig.scHeroRankUpConfigMap.get(breakId);
|
||||
}else{
|
||||
scHeroRankUpConfig = SCHeroRankUpConfig.scHeroRankUpConfigMap.get(starBreakId);
|
||||
}
|
||||
if(scHeroRankUpConfigByTypeStar!=null){
|
||||
boolean isOk =false;
|
||||
// boolean isCheck = false;
|
||||
for(SCHeroRankUpConfig scHeroRankUpConfigStar:scHeroRankUpConfigByTypeStar.values()){
|
||||
int limitStar = scHeroRankUpConfigStar.getLimitStar();
|
||||
if(hero.getStar()>=limitStar){
|
||||
// isCheck=true;
|
||||
if(hero.getLevel()+1<=scHeroRankUpConfigStar.getOpenLevel()){
|
||||
isOk = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!isOk){
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,"max level");
|
||||
return;
|
||||
}
|
||||
|
||||
if(hero.getLevel() + 1 > scHeroRankUpConfig.getOpenLevel()){
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,"max level");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -578,7 +555,7 @@ public class HeroLogic {
|
|||
//删除hero
|
||||
recyleHeroBySystem(user,removeHeroIds);
|
||||
targetHero.upStar( 1 );
|
||||
targetHero.setBreakId(scHeroRankUpConfig.getId());
|
||||
targetHero.setStarBreakId(scHeroRankUpConfig.getId());
|
||||
|
||||
MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE,null,true);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@ public class CBean2Proto {
|
|||
.setLevel(hero.getLevel())
|
||||
.setStar(hero.getStar())
|
||||
.setBreakId(hero.getBreakId())
|
||||
.setStarBreakId(hero.getStarBreakId())
|
||||
.setCreateTime(hero.getCreateTime())
|
||||
.addAllSkillIdList(hero.getSkillList())
|
||||
.addAllEquipIdList(equipList)
|
||||
|
|
|
|||
Loading…
Reference in New Issue