hero lock & fix msg

back_recharge
wangyuan 2019-10-08 16:30:00 +08:00
parent d302e893b4
commit 65d1405b13
3 changed files with 14 additions and 16 deletions

View File

@ -37,20 +37,18 @@ public class SHeroReturn implements BaseConfig {
}
Map<Integer, SHeroReturn> sHeroReturnMapByStar = sheroReturnMapTmp.get(heroId);
int star = sHeroReturn.getStar();
if(sHeroReturnMapByStar.containsKey(star)){
int[] rankupReturn = sHeroReturn.getRankupReturn();
int[][] returnHero = sHeroReturn.getReturnHero();
int length = 1 + returnHero.length ;
int[][] returnMaterialsTmp = new int[length][];
for(int i=0;i<returnHero.length;i++){
returnMaterialsTmp[i]=returnHero[i];
}
returnMaterialsTmp[length-1] = new int[2];
returnMaterialsTmp[length-1][0] = rankupReturn[0];
returnMaterialsTmp[length-1][1] = rankupReturn[1];
sHeroReturn.setReturnMaterials(returnMaterialsTmp);
sHeroReturnMapByStar.put(star,sHeroReturn);
int[] rankupReturn = sHeroReturn.getRankupReturn();
int[][] returnHero = sHeroReturn.getReturnHero();
int length = 1 + returnHero.length ;
int[][] returnMaterialsTmp = new int[length][];
for(int i=0;i<returnHero.length;i++){
returnMaterialsTmp[i]=returnHero[i];
}
returnMaterialsTmp[length-1] = new int[2];
returnMaterialsTmp[length-1][0] = rankupReturn[0];
returnMaterialsTmp[length-1][1] = rankupReturn[1];
sHeroReturn.setReturnMaterials(returnMaterialsTmp);
sHeroReturnMapByStar.put(star,sHeroReturn);
}
sheroReturnMap = sheroReturnMapTmp;
}

View File

@ -2075,7 +2075,7 @@ public class HeroLogic {
List<String> heroList = new ArrayList<>(1);
heroList.add(heroId);
String err = ItemLogic.getInstance().checkHeroResolve(heroList, user);
if("".equals(err)){
if(!"".equals(err)){
MessageUtil.sendErrorResponse(session,0,responseMsgId,err);
return;
}
@ -2084,7 +2084,7 @@ public class HeroLogic {
int star = hero.getStar();
int templateId = hero.getTemplateId();
Map<Integer, SHeroReturn> sHeroReturnMap = SHeroReturn.sheroReturnMap.get(templateId);
if(sHeroReturnMap == null || sHeroReturnMap.containsKey(star)){
if(sHeroReturnMap == null || !sHeroReturnMap.containsKey(star)){
MessageUtil.sendErrorResponse(session,0,responseMsgId,"not satisfy");
return;
}

View File

@ -1059,7 +1059,7 @@ public class ItemUtil {
heroList.add(CBean2Proto.getHero(hero));
SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId());
if (scHero.getNatural() >= 13) {
String message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_recruit_content", new Object[]{playerInfoManager.getNickName(), scHero.getNatural(), scHero.getReadingName()});
String message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_content", new Object[]{playerInfoManager.getNickName(), scHero.getNatural(), scHero.getReadingName()});
if (!message.isEmpty()){
ChatLogic.getInstance().sendSysChatMessage(message,Global.LUCKY_LUCK,hero.getTemplateId(),0,0,0,0,0);
}