Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
commit
cccb53e1ae
|
|
@ -2564,18 +2564,18 @@ public class MapLogic {
|
|||
if(trialInfo.getAddHpCount()>=healing[1]){
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||
}
|
||||
boolean itemCost = ItemUtil.itemCost(user, new int[][]{{healing[0],1}}, BIReason.TRIAL_ADD_HP_CONSUME, 1);
|
||||
if(!itemCost){
|
||||
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
|
||||
}
|
||||
Map<Integer, Integer> propertyMap = heroInfo.get(heroId).getProperty();
|
||||
int curHp = propertyMap.get(HeroAttributeEnum.CurHP.getPropertyId());
|
||||
if(curHp==0){
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||
}else{
|
||||
boolean itemCost = ItemUtil.itemCost(user, new int[][]{{healing[0],1}}, BIReason.TRIAL_ADD_HP_CONSUME, 1);
|
||||
if(!itemCost){
|
||||
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
|
||||
}
|
||||
//todo 加血逻辑
|
||||
int maxHp = propertyMap.get(HeroAttributeEnum.Hp.getPropertyId());
|
||||
int resultHp = Math.min(curHp+maxHp*5000/10000,maxHp);
|
||||
int resultHp = Math.min(curHp+maxHp/2,maxHp);
|
||||
propertyMap.put(HeroAttributeEnum.CurHP.getPropertyId(),resultHp);
|
||||
trialInfo.getHeroInfo().get(heroId).setProperty(propertyMap);
|
||||
mapManager.updateTrialAddHpCount(1);
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ public class PlayerLogic {
|
|||
Set<Integer> fixVipId = new HashSet<>();
|
||||
for(Map.Entry<Integer,VipInfo> vipInfoItem : vipInfo.entrySet()){
|
||||
//如果这个权限是活动 且永久了 那么需要修复
|
||||
if(vipInfoItem.getValue().getEffectTime()==0&&SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(vipInfoItem.getKey()).getPrivilegeType()==5){
|
||||
if(vipInfoItem.getValue().getEffectTime()==0&&SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(vipInfoItem.getKey()).getUnlockType()==5){
|
||||
fixVipId.add(vipInfoItem.getKey());
|
||||
}
|
||||
if(vipInfoItem.getValue().getEffectTime()!=0 && vipInfoItem.getValue().getEffectTime()<=(TimeUtils.now()/1000)){
|
||||
|
|
@ -317,11 +317,10 @@ public class PlayerLogic {
|
|||
CombatLogic.getInstance().getNewAdventureReward(user,true,vipInfoItem.getValue().getEffectTime());
|
||||
}
|
||||
removePrivileges.add(vipInfoItem.getKey());
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if(!fixVipId.isEmpty()){
|
||||
fixVipId.forEach(n->playerInfoManager.addVipByTime(n,(int)((TimeUtils.now()+TimeUtils.WEEK)/1000)));
|
||||
fixVipId.forEach(n->playerInfoManager.addVipByTime(n,(int)(TimeUtils.now()/1000)));
|
||||
}
|
||||
playerInfoManager.vipFlush(removePrivileges);
|
||||
//vip刷新后才能发给前端
|
||||
|
|
|
|||
Loading…
Reference in New Issue