Merge branch 'master_prb_gn' into master_test_gn_zf

back_recharge
duhui 2021-08-04 19:51:33 +08:00
commit 8ab6627d3d
3 changed files with 10 additions and 2 deletions

View File

@ -1,5 +1,7 @@
package com.ljsd.jieling.handler.pokemon; package com.ljsd.jieling.handler.pokemon;
import com.ljsd.jieling.exception.ErrorCode;
import com.ljsd.jieling.exception.ErrorCodeException;
import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.handler.BaseHandler;
import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.hero.HeroLogic;
import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.network.session.ISession;

View File

@ -214,7 +214,7 @@ public class CrossServiceLogic {
if (collect.isEmpty()){ if (collect.isEmpty()){
continue; continue;
} }
Map<Integer, Long> attribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, true, teamId); Map<Integer, Long> attribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, false, teamId);
arenaOfHero.putAttributeMapByTeam(teamId,attribute); arenaOfHero.putAttributeMapByTeam(teamId,attribute);
} }
return arenaOfHero; return arenaOfHero;

View File

@ -774,10 +774,16 @@ public class PlayerLogic {
Map<Integer, Long> heroNotBufferAttribute = hero.getAttributeMapByTeam().getOrDefault(teamId,new HashMap<>()); Map<Integer, Long> heroNotBufferAttribute = hero.getAttributeMapByTeam().getOrDefault(teamId,new HashMap<>());
for(Map.Entry<Integer,Long> item : heroNotBufferAttribute.entrySet()){ for(Map.Entry<Integer,Long> item : heroNotBufferAttribute.entrySet()){
builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(item.getKey()).setPropertyValue(item.getValue().intValue()).build()); int id = item.getKey();
int values = item.getValue().intValue();
if (id == 53 || id == 57 || id == 58){
values = item.getValue().intValue()-10000;
}
builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(id).setPropertyValue(values).build());
} }
Map<String, PropertyItem> jewels = query.getHeroManager().getJewels(); Map<String, PropertyItem> jewels = query.getHeroManager().getJewels();
for(String equipId : hero.getJewelInfo()){ for(String equipId : hero.getJewelInfo()){
heroBuilder.addJewels(equipId);
builder.addEquip(CBean2Proto.getEquipProto(jewels.get(equipId))); builder.addEquip(CBean2Proto.getEquipProto(jewels.get(equipId)));
} }
for(int equipId : hero.getEquipByPositionMap().values()){ for(int equipId : hero.getEquipByPositionMap().values()){