root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yx属性

back_recharge
xuexinpeng 2021-10-15 12:01:17 +08:00
parent fff846bc3f
commit 83a80abd6e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serverlogic/src/main/java/com/ljsd/CoreService.java
View File

@ -214,7 +214,7 @@ public class CoreService implements RPCRequestIFace.Iface {
if (collect.isEmpty()){
continue;
}
Map<Integer, Long> attribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, false, teamId);
Map<Integer, Long> attribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, true, teamId);
if(arenaOfHero.getAttributeMapByTeam() == null){
arenaOfHero.setAttributeMapByTeam(new HashMap<>());
}

13
serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
View File

@ -1164,6 +1164,7 @@ public class PlayerLogic {
}
CommonProto.Hero.Builder heroBuilder = CommonProto.Hero.newBuilder().setLevel(rpcHero.getLevel()).setEspecialEquipLevel(rpcHero.getEspecialEquipLevel()).setStar(rpcHero.getStar()).setId(rpcHero.getId()).setHeroId(rpcHero.getTemplateId()).setBreakId(rpcHero.getBreakId()).setStarBreakId(rpcHero.getStarBreakId());
PlayerInfoProto.ViewHeroInfoResponse.Builder builder = PlayerInfoProto.ViewHeroInfoResponse.newBuilder();
Map<Integer, Long> heroNotBufferAttribute = rpcHero.getAttributeMapByTeam().getOrDefault(teamId,new HashMap<>());
for(Map.Entry<Integer,Long> item : heroNotBufferAttribute.entrySet()){
int id = item.getKey();
@ -1204,16 +1205,14 @@ public class PlayerLogic {
public PlayerInfoProto.ViewHeroInfoResponse viewCrossHeroInfoMyserver(int uid,String heroId,int teamId) throws Exception{
User user = UserManager.getUser(uid);
Hero hero= user.getHeroManager().getHero(heroId);
//ArenaOfUser query = CrossServiceLogic.getInstance().query(uid);
//Map<String, ArenaOfHero> heroes = query.getHeroManager().getHeros();
//ArenaOfHero hero = heroes.get(heroId);
if(hero == null){
throw new ErrorCodeException(ErrorCode.newDefineCode("hero no"));
}
CommonProto.Hero.Builder heroBuilder = CommonProto.Hero.newBuilder().setLevel(hero.getLevel(user.getHeroManager())).setEspecialEquipLevel(hero.getEspecialEquipLevel()).setStar(hero.getStar()).setId(hero.getId()).setHeroId(hero.getTemplateId()).setBreakId(hero.getBreakId()).setStarBreakId(hero.getStarBreakId());
PlayerInfoProto.ViewHeroInfoResponse.Builder builder = PlayerInfoProto.ViewHeroInfoResponse.newBuilder();
//Map<Integer, Long> heroNotBufferAttribute = hero.getAttributeMapByTeam().getOrDefault(teamId,new HashMap<>());
Map<Integer, Long> heroNotBufferAttribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, false, teamId);
Map<Integer, Long> heroNotBufferAttribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, true, teamId);
for(Map.Entry<Integer,Long> item : heroNotBufferAttribute.entrySet()){
int id = item.getKey();
int values = item.getValue().intValue();
@ -1222,13 +1221,13 @@ public class PlayerLogic {
}
builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(id).setPropertyValue(values).build());
}
Map<String, PropertyItem> jewels = new HashMap<>();
Map<String, com.ljsd.jieling.logic.dao.PropertyItem> equipMap = user.getEquipManager().getEquipMap();
// 魂宝灵宝
Map<String, Hero> heroMap = user.getHeroManager().getHeroMap();
//Map<String, PropertyItem> jewels = new HashMap<>();
//Map<String, PropertyItem> equipMap = user.getEquipManager().getEquipMap();
heroMap.values().forEach(v-> v.getJewelInfo().forEach(v2->{
PropertyItem item = equipMap.get(v2);
jewels.put(v2,item);