Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
96bf0a392e
|
|
@ -1169,7 +1169,7 @@ public class MapLogic {
|
||||||
int[] checkResult = CheckFight.getInstance().checkFight(seed, mostTime, getFightData, getOptionData);
|
int[] checkResult = CheckFight.getInstance().checkFight(seed, mostTime, getFightData, getOptionData);
|
||||||
|
|
||||||
List<Integer> remainHp = new ArrayList<>(5);
|
List<Integer> remainHp = new ArrayList<>(5);
|
||||||
for (int i = 1; i < checkResult.length; i++) {
|
for (int i = 2; i < checkResult.length; i++) {
|
||||||
if (checkResult[i] <= 0) {
|
if (checkResult[i] <= 0) {
|
||||||
remainHp.add(0);
|
remainHp.add(0);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -1223,7 +1223,7 @@ public class MapLogic {
|
||||||
int teamId = mapManager.getTeamId();
|
int teamId = mapManager.getTeamId();
|
||||||
List<TeamPosHeroInfo> team = user.getTeamPosManager().getTeamPosForHero().get(teamId);
|
List<TeamPosHeroInfo> team = user.getTeamPosManager().getTeamPosForHero().get(teamId);
|
||||||
for (TeamPosHeroInfo teamPosHeroInfo : team) {
|
for (TeamPosHeroInfo teamPosHeroInfo : team) {
|
||||||
mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition()]);
|
mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition()+1]);
|
||||||
}
|
}
|
||||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1, BIReason.MAP_GENERAL_FIGHT_REWARD);
|
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1, BIReason.MAP_GENERAL_FIGHT_REWARD);
|
||||||
FightInfoProto.FightEndResponse.Builder fightEndResponse = FightInfoProto.FightEndResponse.newBuilder();
|
FightInfoProto.FightEndResponse.Builder fightEndResponse = FightInfoProto.FightEndResponse.newBuilder();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue