From d8f053335e5b7bf94f704641dfeb139e0b7f3514 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Tue, 26 Oct 2021 15:00:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E6=88=98=E5=8A=9B=E5=85=BC=E5=AE=B9=E6=9C=BA=E5=99=A8=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 3fc72b9a6..c403d6142 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -3178,6 +3178,9 @@ public class HeroLogic { ///获取最高战斗力 public long calTeamForce(User user, int teamId) { + if (user == null) { + return 100; + } return user.getPlayerInfoManager().getMaxForce(); //之前是当前编队战斗力 /*long teamForce = 0; From c366955468834bf5d08283b9890e9705aa692c66 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 26 Oct 2021 17:06:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=BB=E8=A7=92=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=80=A7=E5=88=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index c403d6142..2d69b6b48 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -2371,7 +2371,7 @@ public class HeroLogic { } ///获取修行技能数据 - public void getPracticeSkill(List infoList, Map practiceSkillMap,long maxForce) { + public void getPracticeSkill(List infoList, Map practiceSkillMap,long maxForce,int sex) { if (practiceSkillMap.isEmpty()) { return; } @@ -2392,6 +2392,7 @@ public class HeroLogic { .setPosition(100) .setSkinId(0) .setForceScore(maxForce) + .setPlayerSex(sex) .build(); infoList.add(skillInfo); } @@ -2431,7 +2432,7 @@ public class HeroLogic { .build(); pokemonInfos.add(info); } - getPracticeSkill(pokemonInfos, user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce()); + getPracticeSkill(pokemonInfos, user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce(),user.getPlayerInfoManager().getSex()); return pokemonInfos; } @@ -2487,7 +2488,7 @@ public class HeroLogic { .setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build(); pokemonInfos.add(info); } - getPracticeSkill(pokemonInfos,crossArenaManager.getPracticeSkillMap(),crossArenaManager.getMaxHistoryForce()); + getPracticeSkill(pokemonInfos,crossArenaManager.getPracticeSkillMap(),crossArenaManager.getMaxHistoryForce(),0); return pokemonInfos; } @@ -2520,7 +2521,7 @@ public class HeroLogic { .setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build(); pokemonInfos.add(info); } - getPracticeSkill(pokemonInfos,user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce()); + getPracticeSkill(pokemonInfos,user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce(),user.getPlayerInfoManager().getSex()); return pokemonInfos; } From 379e85704d4c6e0e4302fde3e25df4a89655a351 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 26 Oct 2021 17:18:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=B8=BB=E8=A7=92=E6=8A=80=E8=83=BD=E6=80=A7=E5=88=AB=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/fight/FightUtil.java | 2 +- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java index a8821c194..048f06157 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java @@ -753,7 +753,7 @@ public class FightUtil { return CommonProto.FightTeamInfo. newBuilder() .addAllFightUnitList(heroFightInfos) - .addAllPokemonUnitList(HeroLogic.getInstance().getCrossPokemon(crossArenaManager)) + .addAllPokemonUnitList(HeroLogic.getInstance().getCrossPokemon(crossArenaManager,csPlayer.getSex())) .setTeamPassiveList("") .setForceScore(crossArenaManager.getMaxHistoryForce()) .build(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 2d69b6b48..9469b1aa5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -2460,11 +2460,10 @@ public class HeroLogic { return pokemonInfos; } - public List getCrossPokemon(CrossArenaManager crossArenaManager) { + public List getCrossPokemon(CrossArenaManager crossArenaManager,int sex) { //todo 灵兽 Map pokemonMap = crossArenaManager.getPokemons(); Map teamMap = crossArenaManager.getPokemonTeamMap(); - Map pokemons = new HashMap<>(); List pokemonInfos = new ArrayList<>(); @@ -2488,7 +2487,7 @@ public class HeroLogic { .setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build(); pokemonInfos.add(info); } - getPracticeSkill(pokemonInfos,crossArenaManager.getPracticeSkillMap(),crossArenaManager.getMaxHistoryForce(),0); + getPracticeSkill(pokemonInfos,crossArenaManager.getPracticeSkillMap(),crossArenaManager.getMaxHistoryForce(),sex); return pokemonInfos; } From 004ce5a02727f41bff4c6c98f3b0d3d8f9150c47 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 26 Oct 2021 17:57:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=BB=E8=A7=92=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/fight/FightUtil.java | 2 +- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java index 048f06157..e2964d59b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java @@ -753,7 +753,7 @@ public class FightUtil { return CommonProto.FightTeamInfo. newBuilder() .addAllFightUnitList(heroFightInfos) - .addAllPokemonUnitList(HeroLogic.getInstance().getCrossPokemon(crossArenaManager,csPlayer.getSex())) + .addAllPokemonUnitList(HeroLogic.getInstance().getCrossPokemon(crossArenaManager,csPlayer)) .setTeamPassiveList("") .setForceScore(crossArenaManager.getMaxHistoryForce()) .build(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 9469b1aa5..6f7bc70b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -27,6 +27,7 @@ import com.ljsd.jieling.logic.activity.eventhandler.HeroFiveStarGetEventHandler; import com.ljsd.jieling.logic.activity.eventhandler.PokemonFiveStarGetEventHandler; import com.ljsd.jieling.logic.activity.fourChallenge.FourChallengeLogic; import com.ljsd.jieling.logic.dao.*; +import com.ljsd.jieling.logic.dao.cross.CSPlayer; import com.ljsd.jieling.logic.dao.gm.ArenaOfHero; import com.ljsd.jieling.logic.dao.gm.ArenaOfUser; import com.ljsd.jieling.logic.dao.root.User; @@ -2371,7 +2372,7 @@ public class HeroLogic { } ///获取修行技能数据 - public void getPracticeSkill(List infoList, Map practiceSkillMap,long maxForce,int sex) { + public void getPracticeSkill(List infoList, Map practiceSkillMap,long maxForce,int sex,int userLv) { if (practiceSkillMap.isEmpty()) { return; } @@ -2390,6 +2391,7 @@ public class HeroLogic { .setUnitSkillIds(skillStr.toString()) .setProperty("0") .setPosition(100) + .setStar(userLv) .setSkinId(0) .setForceScore(maxForce) .setPlayerSex(sex) @@ -2432,7 +2434,7 @@ public class HeroLogic { .build(); pokemonInfos.add(info); } - getPracticeSkill(pokemonInfos, user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce(),user.getPlayerInfoManager().getSex()); + getPracticeSkill(pokemonInfos, user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce(),user.getPlayerInfoManager().getSex(),user.getPlayerInfoManager().getLevel()); return pokemonInfos; } @@ -2460,7 +2462,7 @@ public class HeroLogic { return pokemonInfos; } - public List getCrossPokemon(CrossArenaManager crossArenaManager,int sex) { + public List getCrossPokemon(CrossArenaManager crossArenaManager, CSPlayer csPlayer) { //todo 灵兽 Map pokemonMap = crossArenaManager.getPokemons(); Map teamMap = crossArenaManager.getPokemonTeamMap(); @@ -2487,7 +2489,7 @@ public class HeroLogic { .setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build(); pokemonInfos.add(info); } - getPracticeSkill(pokemonInfos,crossArenaManager.getPracticeSkillMap(),crossArenaManager.getMaxHistoryForce(),sex); + getPracticeSkill(pokemonInfos,crossArenaManager.getPracticeSkillMap(),crossArenaManager.getMaxHistoryForce(),csPlayer.getSex(),csPlayer.getLevel()); return pokemonInfos; } @@ -2520,7 +2522,7 @@ public class HeroLogic { .setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build(); pokemonInfos.add(info); } - getPracticeSkill(pokemonInfos,user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce(),user.getPlayerInfoManager().getSex()); + getPracticeSkill(pokemonInfos,user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce(),user.getPlayerInfoManager().getSex(),user.getPlayerInfoManager().getLevel()); return pokemonInfos; }