diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index fbf89722e..1381180d3 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -6,15 +6,16 @@ import com.ljsd.jieling.ktbeans.KtEventUtils; import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean; import com.ljsd.jieling.logic.OnlineUserManager; -import com.ljsd.jieling.logic.dao.Hero; -import com.ljsd.jieling.logic.dao.HeroManager; -import com.ljsd.jieling.logic.dao.Jewel; -import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.thrift.idl.*; +import com.ljsd.jieling.thrift.idl.Pokemon; +import com.ljsd.jieling.thrift.idl.PropertyItem; +import com.ljsd.jieling.thrift.idl.PurpleMansionSeal; +import com.ljsd.jieling.thrift.idl.TeamPosHeroInfo; import rpc.protocols.MessageTypeProto; import rpc.protocols.RoomProto; import com.ljsd.jieling.util.MessageUtil; @@ -105,6 +106,14 @@ public class CoreService implements RPCRequestIFace.Iface { teams.put(GlobalsDef.WORLD_TEAM_ARENA_DEFENSE,luofurpc); set.addAll(luofurpc); + //七界试炼 + List qijie = user.getTeamPosManager().getTeamPosForHero().getOrDefault(TeamEnum.SEVEN_WORLD_TEAM.getTeamId(),new ArrayList<>()); + List qijierpc = new ArrayList(); + qijie.forEach(n->qijierpc.add(new TeamPosHeroInfo().setHeroId(n.getHeroId()).setPosition(n.getPosition()))); + teams.put(TeamEnum.SEVEN_WORLD_TEAM.getTeamId(),qijierpc); + set.addAll(qijierpc); + + //玉虚论道编队 List yxldOne = user.getTeamPosManager().getTeamPosForHero().getOrDefault(GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE,new ArrayList<>()); List rpcYxldOne = new ArrayList();