Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

back_recharge
jiahuiwen 2021-10-26 15:00:55 +08:00
commit 872dee96f7
5 changed files with 28 additions and 9 deletions

View File

@ -22,6 +22,7 @@ import com.ljsd.jieling.logic.dao.CrossArenaEnemy;
import com.ljsd.jieling.logic.dao.ServerConfig; import com.ljsd.jieling.logic.dao.ServerConfig;
import com.ljsd.jieling.logic.dao.TimeControllerOfFunction; import com.ljsd.jieling.logic.dao.TimeControllerOfFunction;
import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.cross.CSPlayer;
import com.ljsd.jieling.logic.dao.gm.ArenaOfUser; import com.ljsd.jieling.logic.dao.gm.ArenaOfUser;
import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.fight.FightUtil; import com.ljsd.jieling.logic.fight.FightUtil;
@ -34,6 +35,7 @@ import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank;
import com.ljsd.jieling.network.server.GlobalidHelper; import com.ljsd.jieling.network.server.GlobalidHelper;
import com.ljsd.jieling.network.server.WorldHelper; import com.ljsd.jieling.network.server.WorldHelper;
import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.thrift.idl.CrossArenaManager;
import com.ljsd.jieling.util.*; import com.ljsd.jieling.util.*;
import config.SArenaRobotConfig; import config.SArenaRobotConfig;
import config.SArenaSetting; import config.SArenaSetting;
@ -159,8 +161,11 @@ public class GetWorldArenaChallengeRequestHandler extends BaseHandler<WorldProto
int defendForce = 0; int defendForce = 0;
if (proto.getChallengeUid()>1000) { if (proto.getChallengeUid()>1000) {
ArenaOfUser arenaOfUser = CrossServiceLogic.getInstance().query(proto.getChallengeUid()); ArenaOfUser arenaOfUser = CrossServiceLogic.getInstance().query(proto.getChallengeUid());
defendForce = arenaOfUser.getHeroManager().getTotalForceByTeam().get(proto.getTeamId()); //defendForce = arenaOfUser.getHeroManager().getTotalForceByTeam().get(proto.getTeamId());
teamInfo = FightUtil.makeCrossPersonData(arenaOfUser,proto.getTeamId(),defendForce); //teamInfo = FightUtil.makeCrossPersonData(arenaOfUser,proto.getTeamId(),defendForce);
CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(user.getId());
CrossArenaManager crossArenaManager = PlayerLogic.getInstance().getCrossArenaManagerData(csPlayer);
teamInfo = FightUtil.makeCrossPersonData(csPlayer, proto.getTeamId(), null, crossArenaManager);
arenaEnemys =ArenaLogic.getInstance().getUserCrossArenaEnemy(crossGroup,arenaOfUser,proto.getChallengeRank(),false).build(); arenaEnemys =ArenaLogic.getInstance().getUserCrossArenaEnemy(crossGroup,arenaOfUser,proto.getChallengeRank(),false).build();
} else { } else {

View File

@ -1,5 +1,6 @@
package com.ljsd.jieling.logic.activity; package com.ljsd.jieling.logic.activity;
import com.ljsd.GameApplication;
import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.jbean.ActivityMission; import com.ljsd.jieling.jbean.ActivityMission;
import com.ljsd.jieling.jbean.ActivityProgressInfo; import com.ljsd.jieling.jbean.ActivityProgressInfo;
@ -68,6 +69,10 @@ public class MistyTripActivity extends AbstractActivity {
} }
@Override @Override
public void initActivity(User user) throws Exception { public void initActivity(User user) throws Exception {
boolean open = SGlobalActivity.checkActivityIfOpen(id, user.getPlayerInfoManager().getCreateTime(), GameApplication.serverConfig.getCacheOpenTime());
if (!open){
return;
}
//初始化所有事件 主线关卡 心魔试炼 山河社稷 大闹天宫 最高战力 //初始化所有事件 主线关卡 心魔试炼 山河社稷 大闹天宫 最高战力
user.getUserMissionManager().onGameEvent(user, GameEvent.MISTY_TRIP_REFRESH); user.getUserMissionManager().onGameEvent(user, GameEvent.MISTY_TRIP_REFRESH);
} }

View File

@ -22,6 +22,7 @@ import com.ljsd.jieling.logic.activity.crossService.CrossServiceLogic;
import com.ljsd.jieling.logic.activity.event.Poster; import com.ljsd.jieling.logic.activity.event.Poster;
import com.ljsd.jieling.logic.activity.fourChallenge.FourChallengeLogic; import com.ljsd.jieling.logic.activity.fourChallenge.FourChallengeLogic;
import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.logic.dao.cross.CSPlayer;
import com.ljsd.jieling.logic.dao.gm.ArenaOfUser; import com.ljsd.jieling.logic.dao.gm.ArenaOfUser;
import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.family.CrossDeathPathLogic; import com.ljsd.jieling.logic.family.CrossDeathPathLogic;
@ -38,6 +39,7 @@ import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank;
import com.ljsd.jieling.logic.redpacket.WelfareRedPackEvent; import com.ljsd.jieling.logic.redpacket.WelfareRedPackEvent;
import com.ljsd.jieling.logic.redpacket.WelfareRedPacketType; import com.ljsd.jieling.logic.redpacket.WelfareRedPacketType;
import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.thrift.idl.CrossArenaManager;
import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.ItemUtil;
import com.ljsd.jieling.util.MessageUtil; import com.ljsd.jieling.util.MessageUtil;
import config.*; import config.*;
@ -670,7 +672,9 @@ public class ArenaLogic {
//跨服切磋 //跨服切磋
ArenaOfUser user = CrossServiceLogic.getInstance().query(challengeUid); ArenaOfUser user = CrossServiceLogic.getInstance().query(challengeUid);
deforce = user.getHeroManager().getTotalForceByTeam().get(myteamId); deforce = user.getHeroManager().getTotalForceByTeam().get(myteamId);
deffightTeamInfo = FightUtil.makeCrossPersonData(user,myteamId,deforce); CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(user.getId());
CrossArenaManager crossArenaManager = PlayerLogic.getInstance().getCrossArenaManagerData(csPlayer);
deffightTeamInfo = FightUtil.makeCrossPersonData(csPlayer, myteamId, null, crossArenaManager);
} }
if(myforce<deforce){ if(myforce<deforce){
deffightTeamInfo = CommonProto.FightTeamInfo.newBuilder().mergeFrom(deffightTeamInfo).setFirstCamp(1).build(); deffightTeamInfo = CommonProto.FightTeamInfo.newBuilder().mergeFrom(deffightTeamInfo).setFirstCamp(1).build();

View File

@ -673,6 +673,7 @@ public class FightUtil {
.build(); .build();
} }
//TODO 规范这个参数
public static CommonProto.FightTeamInfo makeCrossPersonData(CSPlayer csPlayer, int teamId, ArenaRecord arenaRecord, CrossArenaManager crossArenaManager) throws Exception { public static CommonProto.FightTeamInfo makeCrossPersonData(CSPlayer csPlayer, int teamId, ArenaRecord arenaRecord, CrossArenaManager crossArenaManager) throws Exception {
//CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(uid); //CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(uid);
if (csPlayer == null) { if (csPlayer == null) {
@ -685,8 +686,10 @@ public class FightUtil {
User user = UserManager.getUser(csPlayer.getUserId()); User user = UserManager.getUser(csPlayer.getUserId());
List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().getOrDefault(teamId, new ArrayList<>()); List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().getOrDefault(teamId, new ArrayList<>());
int addforce = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false); int addforce = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false);
arenaRecord.setAttackForce(arenaRecord.getAttackForce() + addforce); if(arenaRecord != null){
arenaRecord.getYxldDefForce().add(addforce); arenaRecord.setAttackForce(arenaRecord.getAttackForce() + addforce);
arenaRecord.getYxldDefForce().add(addforce);
}
for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) { for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) {
Hero hero = user.getHeroManager().getHeroMap().get(teamPosHeroInfo.getHeroId()); Hero hero = user.getHeroManager().getHeroMap().get(teamPosHeroInfo.getHeroId());
if (hero == null) { if (hero == null) {
@ -722,8 +725,10 @@ public class FightUtil {
} }
List<com.ljsd.jieling.thrift.idl.TeamPosHeroInfo> teamPosHeroInfos = crossArenaManager.getTeams().getOrDefault(teamId, new ArrayList<>()); List<com.ljsd.jieling.thrift.idl.TeamPosHeroInfo> teamPosHeroInfos = crossArenaManager.getTeams().getOrDefault(teamId, new ArrayList<>());
int addforcerpc = crossArenaManager.getTotalForceByTeam().get(teamId); int addforcerpc = crossArenaManager.getTotalForceByTeam().get(teamId);
arenaRecord.getYxldDefForce().add(addforcerpc); if(arenaRecord != null){
arenaRecord.setAttackForce(arenaRecord.getAttackForce() + addforcerpc); arenaRecord.getYxldDefForce().add(addforcerpc);
arenaRecord.setAttackForce(arenaRecord.getAttackForce() + addforcerpc);
}
//Collection<PurpleMansionSeal> seals = crossArenaManager.getSeals().values(); //Collection<PurpleMansionSeal> seals = crossArenaManager.getSeals().values();
for (com.ljsd.jieling.thrift.idl.TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) { for (com.ljsd.jieling.thrift.idl.TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) {
com.ljsd.jieling.thrift.idl.ArenaOfHero hero = crossArenaManager.getHeros().get(teamPosHeroInfo.getHeroId()); com.ljsd.jieling.thrift.idl.ArenaOfHero hero = crossArenaManager.getHeros().get(teamPosHeroInfo.getHeroId());
@ -750,7 +755,7 @@ public class FightUtil {
.addAllFightUnitList(heroFightInfos) .addAllFightUnitList(heroFightInfos)
.addAllPokemonUnitList(HeroLogic.getInstance().getCrossPokemon(crossArenaManager)) .addAllPokemonUnitList(HeroLogic.getInstance().getCrossPokemon(crossArenaManager))
.setTeamPassiveList("") .setTeamPassiveList("")
.setForceScore(addforcerpc) .setForceScore(crossArenaManager.getMaxHistoryForce())
.build(); .build();
} }
} }

View File

@ -43,7 +43,7 @@ public enum GameFightType {
DeathPathChallenge(FightType.CarBossFight,new DefaultWithoutHandFightHandler(),null), DeathPathChallenge(FightType.CarBossFight,new DefaultWithoutHandFightHandler(),null),
CarBossChallenge(FightType.CarBossFight,new DefaultWithoutHandFightHandler(),null), CarBossChallenge(FightType.CarBossFight,new DefaultWithoutHandFightHandler(),null),
CarPersonChallenge(FightType.CarBossFight,new PVPFightHandler(),null), CarPersonChallenge(FightType.CarPersonFight,new PVPFightHandler(),null),
GuildChallenge(FightType.GuildChallenge,new DefaultWithoutHandFightHandler(),null), GuildChallenge(FightType.GuildChallenge,new DefaultWithoutHandFightHandler(),null),
NewGeneral(FightType.GuildChallenge,new DefaultWithoutHandFightHandler(),null), NewGeneral(FightType.GuildChallenge,new DefaultWithoutHandFightHandler(),null),
TowerMap(FightType.TowerMap,new DefaultWithoutHandFightHandler(),null), TowerMap(FightType.TowerMap,new DefaultWithoutHandFightHandler(),null),