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

Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn

back_recharge
duhui 2022-09-02 13:46:40 +08:00
parent 8bf8d3c9e6 1599f15eae
commit fabf55e0dc
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java
View File

@ -163,7 +163,7 @@ public class Hero extends MongoBase implements Comparable<Hero>,Cloneable {
jewelInfo = new HashSet<>(2);
}
//无尽使用固定配置英雄
//无尽和玉虚使用固定配置英雄
public Hero(int heroId,int uid){
this.setRootCollection(User._COLLECTION_NAME);
this.id = KeyGenUtils.produceIdByModule(UUIDEnum.HERO,uid);
@ -184,11 +184,11 @@ public class Hero extends MongoBase implements Comparable<Hero>,Cloneable {
for(int i = 0; i < equipSign.length; i++){
soulEquipByPositionMap.put(i+1,equipSign[i]);
}
int[] equip = propConfig.getEquipList();
// int[] equip = propConfig.getEquipList();
equipByPositionMap = new HashMap<>();
for(int i = 0; i < equip.length; i++){
equipByPositionMap.put(i+1,equip[i]);
}
// for(int i = 0; i < equip.length; i++){
// equipByPositionMap.put(i+1,equip[i]);
// }
}
public void upStar(int upStar) {

8
serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
View File

@ -6543,10 +6543,10 @@ public class HeroLogic {
}
// 大于10星，觉醒技
if (yuxuHero.getStar() > HERO_MAX_STAR) {
skillList.addAll(tempHero.getAwakSkills(1, yuxuHero.getBreakIdByHongMeng(user.getHeroManager())));
skillList.addAll(tempHero.getAwakSkills(1, yuxuHero.getBreakId()));
skillList.addAll(tempHero.getAwakSkills(2, yuxuHero.getStarBreakId()));
} else {
skillList.addAll(tempHero.getPassiveSkills(1, yuxuHero.getBreakIdByHongMeng(user.getHeroManager())));
skillList.addAll(tempHero.getPassiveSkills(1, yuxuHero.getBreakId()));
skillList.addAll(tempHero.getPassiveSkills(2, yuxuHero.getStarBreakId()));
}
@ -6605,10 +6605,10 @@ public class HeroLogic {
}
// 大于10星，觉醒技
if (yuxuHero.getStar() > HERO_MAX_STAR) {
skillList.addAll(tempHero.getAwakSkills(1, hero.getBreakId()));
skillList.addAll(tempHero.getAwakSkills(1, yuxuHero.getBreakId()));
skillList.addAll(tempHero.getAwakSkills(2, yuxuHero.getStarBreakId()));
} else {
skillList.addAll(tempHero.getPassiveSkills(1, hero.getBreakId()));
skillList.addAll(tempHero.getPassiveSkills(1, yuxuHero.getBreakId()));
skillList.addAll(tempHero.getPassiveSkills(2, yuxuHero.getStarBreakId()));
}

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

@ -1901,13 +1901,15 @@ public class PlayerLogic {
throw new ErrorCodeException(ErrorCode.newDefineCode("hero no"));
}
CommonProto.Hero.Builder heroBuilder = CommonProto.Hero.newBuilder().
setLevel(rpcHero.getLevel()).
setLevel(yuxuHero.getYuXuLevel()).
setEspecialEquipLevel(rpcHero.getEspecialEquipLevel()).
setStar(yuxuHero.getStar()).
setId(rpcHero.getId()).
setHeroId(rpcHero.getTemplateId()).
setGodSoulLv(yuxuHero.getGodSoulLv()).
setBreakId(rpcHero.getBreakId()).setStarBreakId(rpcHero.getStarBreakId());
setBreakId(yuxuHero.getBreakId()).
setStarBreakId(yuxuHero.getStarBreakId())
.setPropertyId(rpcHero.getPropertyId());
PlayerInfoProto.ViewHeroInfoResponse.Builder builder = PlayerInfoProto.ViewHeroInfoResponse.newBuilder();
Map<Integer, SEndlessHeroProp> config = STableManager.getConfig(SEndlessHeroProp.class);

8
serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
View File

@ -1382,13 +1382,11 @@ public class CBean2Proto {
* @return
*/
public static CommonProto.Hero getYuxuHero(Hero yuxuHero,Hero hero,HeroManager heroManager){
// 无装备
Collection<Integer> equipList =new ArrayList<>();
CommonProto.Hero hero1 = getHero(yuxuHero);
CommonProto.Hero.Builder builder = hero1.toBuilder();
builder.addAllEquipIdList(equipList);
builder.setLevel(yuxuHero.getLevel(heroManager));
builder.setBreakId(hero.getBreakIdByHongMeng(heroManager));
builder.setLevel(yuxuHero.getYuXuLevel());
builder.setBreakId(yuxuHero.getBreakId());
builder.setStarBreakId(yuxuHero.getStarBreakId());
//显示真实的法宝等级
builder.setEspecialEquipLevel(hero.getEspecialEquipLevel());
return builder.build();