玉虚论道10.8
parent
7204d7187c
commit
a03ee2095c
|
@ -140,6 +140,11 @@ public class CoreService implements RPCRequestIFace.Iface {
|
|||
rpcArenaManager.setJewels(jewels);
|
||||
rpcArenaManager.setTotalForceByTeam(map);
|
||||
rpcArenaManager.setTotalForce(force1+force2+force3);
|
||||
|
||||
//TODO new HashMap<>(user.getHeroManager().getPurpleMansionSeal()) 需要做类型转换
|
||||
rpcArenaManager.setSeals(new HashMap<>());
|
||||
rpcArenaManager.setPokemons(new HashMap<>());
|
||||
rpcArenaManager.setGuildSkill(new HashMap<>());
|
||||
return rpcArenaManager;
|
||||
}catch (Exception e){
|
||||
|
||||
|
|
|
@ -13,7 +13,6 @@ import com.ljsd.jieling.exception.ErrorCode;
|
|||
import com.ljsd.jieling.exception.ErrorCodeException;
|
||||
import com.ljsd.jieling.handler.map.TrailHero;
|
||||
import com.ljsd.jieling.handler.map.behavior.BehaviorUtil;
|
||||
import com.ljsd.jieling.logic.activity.crossService.CrossServiceLogic;
|
||||
import com.ljsd.jieling.logic.blood.BloodLogic;
|
||||
import com.ljsd.jieling.logic.dao.Hero;
|
||||
import com.ljsd.jieling.logic.dao.TeamPosHeroInfo;
|
||||
|
@ -36,12 +35,15 @@ import com.ljsd.jieling.util.MonsterUtil;
|
|||
import config.*;
|
||||
import manager.STableManager;
|
||||
import org.luaj.vm2.LuaValue;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import rpc.protocols.CommonProto;
|
||||
import util.TimeUtils;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public class FightUtil {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(FightUtil.class);
|
||||
|
||||
public static CommonProto.FightTeamInfo makePersonFightData(User player, int teamId, Map<String, Integer> attackBloodMap, List<Integer> buffIds) {
|
||||
if (buffIds != null) {
|
||||
|
@ -544,11 +546,11 @@ public class FightUtil {
|
|||
List<CommonProto.FightUnitInfo> heroFightInfos = new ArrayList<>();
|
||||
Map<Integer, CommonProto.Hero> heroMapList;
|
||||
if (type == 3) {
|
||||
heroMapList = sArenaRobotConfig.getHeroMapList();
|
||||
heroMapList = sArenaRobotConfig.getHeroMapList3();
|
||||
} else if (type == 2) {
|
||||
heroMapList = sArenaRobotConfig.getHeroMapList2();
|
||||
} else {
|
||||
heroMapList = sArenaRobotConfig.getHeroMapList3();
|
||||
heroMapList = sArenaRobotConfig.getHeroMapList();
|
||||
}
|
||||
int i = 0;
|
||||
for (Map.Entry<Integer, CommonProto.Hero> item : heroMapList.entrySet()) {
|
||||
|
@ -704,7 +706,7 @@ public class FightUtil {
|
|||
} else {
|
||||
//其他服玩家
|
||||
if (crossArenaManager == null) {
|
||||
//LOGGER.info("hehhhhhhhhhhh");
|
||||
LOGGER.error("Exception::=>{}", "rpc data is empty");
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||
}
|
||||
List<com.ljsd.jieling.thrift.idl.TeamPosHeroInfo> teamPosHeroInfos = crossArenaManager.getTeams().getOrDefault(teamId, new ArrayList<>());
|
||||
|
|
|
@ -81,7 +81,7 @@ public class SArenaRobotConfig implements BaseConfig {
|
|||
heroListTmp2.add(heroId);
|
||||
}
|
||||
//第三个队伍
|
||||
int[] roleId3 = sArenaRobotConfig.getRoleId2();
|
||||
int[] roleId3 = sArenaRobotConfig.getRoleId3();
|
||||
List<Integer> heroListTmp3 = new ArrayList<>(roleId.length);
|
||||
for(int heroId : roleId3){
|
||||
heroListTmp3.add(heroId);
|
||||
|
|
Loading…
Reference in New Issue