From c6d45cbecf58603bcf1572cef29768ed8478c83d Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 13 Oct 2021 19:52:46 +0800 Subject: [PATCH] =?UTF-8?q?yx10.13=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/global/thrift/idl/InnerResult.java | 2 +- .../global/thrift/idl/RPCgTGRequestIFace.java | 2 +- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/global/thrift/idl/InnerResult.java | 2 +- .../global/thrift/idl/RPCgTGRequestIFace.java | 2 +- .../src/main/java/com/ljsd/CoreService.java | 17 +- .../CrossYuxulundaoChallengeHandler.java | 7 +- .../CrossYuxulundaoGetInfoHandler.java | 60 +-- .../logic/arena/CrossYuxulundaoLogic.java | 2 +- .../ljsd/jieling/logic/hero/HeroLogic.java | 8 +- .../jieling/logic/player/PlayerLogic.java | 69 ++- .../ljsd/jieling/thrift/idl/ArenaOfHero.java | 2 +- .../jieling/thrift/idl/CrossArenaManager.java | 423 ++++++++++++------ .../thrift/idl/InvalidOperException.java | 2 +- .../com/ljsd/jieling/thrift/idl/Pokemon.java | 2 +- .../ljsd/jieling/thrift/idl/PropertyItem.java | 2 +- .../jieling/thrift/idl/PurpleMansionSeal.java | 2 +- .../thrift/idl/RPCMatchRequestIFace.java | 2 +- .../jieling/thrift/idl/RPCRequestIFace.java | 2 +- .../jieling/thrift/idl/RechargeResult.java | 2 +- .../com/ljsd/jieling/thrift/idl/Result.java | 2 +- .../jieling/thrift/idl/TeamPosHeroInfo.java | 2 +- .../com/ljsd/jieling/util/CBean2Proto.java | 27 +- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/world/thrift/idl/InnerResult.java | 2 +- .../world/thrift/idl/RPCgTwRequestIFace.java | 2 +- .../world/thrift/idl/RPCwTgRequestIFace.java | 2 +- serverlogic/src/main/thrift/idl/core.thrift | 3 +- .../jieling/thrift/idl/CrossArenaManager.java | 423 ++++++++++++------ .../com/ljsd/jieling/thrift/idl/Pokemon.java | 2 +- .../ljsd/jieling/thrift/idl/PropertyItem.java | 2 +- .../jieling/thrift/idl/PurpleMansionSeal.java | 2 +- .../thrift/idl/RPCMatchRequestIFace.java | 2 +- .../jieling/thrift/idl/RPCRequestIFace.java | 2 +- .../jieling/thrift/idl/RechargeResult.java | 2 +- .../com/ljsd/jieling/thrift/idl/Result.java | 2 +- .../jieling/thrift/idl/TeamPosHeroInfo.java | 2 +- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/world/thrift/idl/InnerResult.java | 2 +- .../world/thrift/idl/RPCgTwRequestIFace.java | 2 +- .../world/thrift/idl/RPCwTgRequestIFace.java | 2 +- .../main/java/config/SArenaRobotConfig.java | 6 +- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/world/thrift/idl/InnerResult.java | 2 +- .../world/thrift/idl/RPCgTwRequestIFace.java | 2 +- .../world/thrift/idl/RPCwTgRequestIFace.java | 2 +- 46 files changed, 769 insertions(+), 346 deletions(-) diff --git a/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java b/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java index 0a34bc8a9..edd83a4ca 100644 --- a/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java +++ b/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java b/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java index 746d25113..774cec444 100644 --- a/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java +++ b/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RPCgTGRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java index 11cdd042a..092153298 100644 --- a/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java b/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java index 0a34bc8a9..edd83a4ca 100644 --- a/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java b/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java index 746d25113..774cec444 100644 --- a/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java +++ b/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RPCgTGRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index 56fc89bfb..fdb1036e5 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -143,8 +143,21 @@ public class CoreService implements RPCRequestIFace.Iface { //TODO new HashMap<>(user.getHeroManager().getPurpleMansionSeal()) 需要做类型转换 rpcArenaManager.setSeals(new HashMap<>()); - rpcArenaManager.setPokemons(new HashMap<>()); - rpcArenaManager.setGuildSkill(new HashMap<>()); + + Map pokemonMap = user.getPokemonManager().getPokemonMap(); + Map pokemonMapRpc = new HashMap(); + pokemonMap.forEach((n,m)->{ + Pokemon rpcPokemon = new Pokemon(); + rpcPokemon.setTmpId(m.getTmpId()); + rpcPokemon.setId(m.getId()); + rpcPokemon.setLevel(m.getLevel()); + rpcPokemon.setStar(m.getStar()); + pokemonMapRpc.put(n,rpcPokemon); + }); + rpcArenaManager.setPokemons(pokemonMapRpc); + Map teamMap = user.getPokemonManager().getPokemonTeamMap(); + rpcArenaManager.setPokemonTeamMap(teamMap); + rpcArenaManager.setGuildSkill(new HashMap<>(user.getGuildMyInfo().getGuildSkill())); return rpcArenaManager; }catch (Exception e){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java index 4cdcaffce..3b06040fc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java @@ -22,6 +22,7 @@ import com.ljsd.jieling.logic.dao.TeamPosHeroInfo; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.cross.CSPlayer; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.family.CrossDeathPathLogic; import com.ljsd.jieling.logic.fight.FightUtil; import com.ljsd.jieling.logic.fight.result.FightResult; import com.ljsd.jieling.logic.hero.HeroLogic; @@ -228,6 +229,9 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler> teamPosForHero = teamPosManager.getTeamPosForHero(); - if(teamPosForHero.containsKey(GlobalsDef.FORMATION_NORMAL)&&!teamPosForHero.containsKey(GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE)){ - teamPosManager.updateTeamPosByTeamId(GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE, teamPosManager.getTeamPosForHero().get(GlobalsDef.FORMATION_NORMAL)); - } - builder.setIsFirst(true); - arenaManager.setCrossYuxulundaoFirst(System.currentTimeMillis()); - //重置段位发奖 - int id = SMServerRankConfig.getIdByScore(csPlayer.getCrossYuxulundaoNewScore()); - if (SMServerRankConfig.serverRankConfig.containsKey(id)) { - SMServerRankConfig serverRankConfig = SMServerRankConfig.serverRankConfig.get(id); - int resetId = serverRankConfig.getResetRankID(); - for (int i = resetId; i <= id; i++) { - serverRankConfig = SMServerRankConfig.serverRankConfig.get(i); - CommonProto.Drop.Builder drop = ItemUtil.dropPer(user, serverRankConfig.getFirstReward(), BIReason.CROSS_YUXULUNDAO_DAILYREWARD); - builder.addDrop(drop); - } - csPlayer.setCrossYuxulundaoNewScore(SMServerRankConfig.serverRankConfig.get(resetId).getScoreLow()); - csPlayer.setCrossYuxulundaoOldScore(SMServerRankConfig.serverRankConfig.get(resetId).getScoreLow()); + arenaManager.setCrossMatchTimes(0); + CrossYuxulundaoLogic.getInstance().matchRivals(user); isNeedUpdate = true; + }else { + //赛季内第一次登陆请求,删除上赛季的挑战记录 + String key = RedisKey.getKey(RedisKey.CROSS_YUXULUNDAO_RECORD, String.valueOf(uid), false); + RedisUtil.getInstence().del(key); + //主线编队复制到第一队伍 + TeamPosManager teamPosManager = user.getTeamPosManager(); + Map> teamPosForHero = teamPosManager.getTeamPosForHero(); + if(teamPosForHero.containsKey(GlobalsDef.FORMATION_NORMAL)&&!teamPosForHero.containsKey(GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE)){ + teamPosManager.updateTeamPosByTeamId(GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE, teamPosManager.getTeamPosForHero().get(GlobalsDef.FORMATION_NORMAL)); + } + builder.setIsFirst(true); + arenaManager.setCrossYuxulundaoFirst(System.currentTimeMillis()); + //重置段位发奖 + int id = SMServerRankConfig.getIdByScore(csPlayer.getCrossYuxulundaoNewScore()); + if (SMServerRankConfig.serverRankConfig.containsKey(id)) { + SMServerRankConfig serverRankConfig = SMServerRankConfig.serverRankConfig.get(id); + int resetId = serverRankConfig.getResetRankID(); + for (int i = resetId; i <= id; i++) { + serverRankConfig = SMServerRankConfig.serverRankConfig.get(i); + CommonProto.Drop.Builder drop = ItemUtil.dropPer(user, serverRankConfig.getFirstReward(), BIReason.CROSS_YUXULUNDAO_DAILYREWARD); + builder.addDrop(drop); + } + csPlayer.setCrossYuxulundaoNewScore(SMServerRankConfig.serverRankConfig.get(resetId).getScoreLow()); + csPlayer.setCrossYuxulundaoOldScore(SMServerRankConfig.serverRankConfig.get(resetId).getScoreLow()); + isNeedUpdate = true; + } + arenaManager.setCrossMatchTimes(0); + CrossYuxulundaoLogic.getInstance().matchRivals(user); } - arenaManager.setCrossMatchTimes(0); - CrossYuxulundaoLogic.getInstance().matchRivals(user); + } List enemyList = arenaManager.getCrossYuxulundaoEnemies(); if (enemyList != null && enemyList.size() > 0) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java index ddf13f270..30cdceee2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java @@ -397,7 +397,7 @@ public class CrossYuxulundaoLogic { .setHeadFrame(arenaRecord.getHeadFrame()) .setPower(arenaRecord.getAttackForce()).setType(arenaRecord.getYxldBattleType()) .addAllYxldMyForce(arenaRecord.getYxldMyForce()) - .addAllYxldDefForce(arenaRecord.getYxldDefForce()).setPracticeLevel(UserManager.getUser(uid).getHeroManager().getPracticeLevel()).build() + .addAllYxldDefForce(arenaRecord.getYxldDefForce()).setPracticeLevel(arenaRecord.getPracticeLevel()).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 a97b35e06..33b32eaf0 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 @@ -1207,7 +1207,7 @@ public class HeroLogic{ } //跨服 玉虚论道 if (teamId == GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE||teamId == GlobalsDef.CROSS_YU_XU_LUN_DAO_TWO||teamId == GlobalsDef.CROSS_YU_XU_LUN_DAO_THREE) { - CrossServiceLogic.getInstance().dispose(user); + CrossServiceLogic.getInstance().saveBasicPlayerToRedis(user); } user.getUserMissionManager().onGameEvent(user,GameEvent.HERO_IN_TEAM,heroIds.size()); MessageUtil.sendMessage(iSession,1,MessageTypeProto.MessageType.TEAM_POS_SAVE_RESPONSE_VALUE,null,true); @@ -2344,9 +2344,9 @@ public class HeroLogic{ public List getCrossPokemonSkills(CrossArenaManager crossArenaManager){ //todo 灵兽 - Map pokemons = crossArenaManager.getPokemons(); + Map pokemons = crossArenaManager.getPokemons(); List pokemonInfos = new ArrayList<>(); - for(Map.Entry entry:pokemons.entrySet()){ + for(Map.Entry entry:pokemons.entrySet()){ com.ljsd.jieling.thrift.idl.Pokemon pokemon = entry.getValue(); if(pokemon==null){ continue; @@ -2355,7 +2355,7 @@ public class HeroLogic{ Map map = calOnePokemonAttribute(pokemon.getTmpId(),pokemon.getStar(),pokemon.getLevel()); StringBuilder propertyBuilder = getOnePokemonProperty(map,pokemon.getLevel()); CommonProto.FightUnitInfo info = CommonProto.FightUnitInfo.newBuilder() - .setPosition(entry.getKey()) + .setPosition(1) .setStar(pokemon.getStar()) .setProperty(propertyBuilder.toString()) .setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index a896ab396..b667bf859 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -902,7 +902,6 @@ public class PlayerLogic { } } // 灵兽 - Map pokemons = new HashMap<>(); Map pokemonMap = user.getPokemonManager().getPokemonMap(); Map teamMap = user.getPokemonManager().getPokemonTeamMap(); for (Map.Entry entry : teamMap.entrySet()) { @@ -1009,12 +1008,15 @@ public class PlayerLogic { } } if(crossArenaManager.getPokemons()!=null){ - for(Map.Entry entry:crossArenaManager.getPokemons().entrySet()){ - Pokemon pokemon = new Pokemon(); - pokemon.setTmpId(entry.getValue().getTmpId()); - pokemon.setId(entry.getValue().getId()); - pokemon.setLevel(entry.getValue().getLevel()); - pokemon.setStar(entry.getValue().getStar()); + Map pokemonMap = crossArenaManager.getPokemons(); + Map teamMap = crossArenaManager.getPokemonTeamMap(); + for(Map.Entry entry :teamMap.entrySet()){ + // clone 深度复制 + com.ljsd.jieling.thrift.idl.Pokemon pokemon = pokemonMap.get(entry.getValue()); + pokemon.setTmpId(pokemon.getTmpId()); + pokemon.setId(pokemon.getId()); + pokemon.setLevel(pokemon.getLevel()); + pokemon.setStar(pokemon.getStar()); teamOneTeamInfo.addPokemonInfos(CBean2Proto.getSimpleTeamInfoByPokeMon(pokemon, entry.getKey())); } } @@ -1148,6 +1150,57 @@ public class PlayerLogic { */ public PlayerInfoProto.ViewHeroInfoResponse viewCrossHeroInfo(int uid,String heroId,int teamId) throws Exception { + CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(uid); + //其他服玩家rpc 数据调用 + CrossArenaManager crossArenaManager = null; + if(GameApplication.serverId != csPlayer.getServerId()){ + crossArenaManager = PlayerLogic.getInstance().getCrossArenaManagerData(csPlayer); + } + Map rpcHeroes =crossArenaManager.getHeros(); + com.ljsd.jieling.thrift.idl.ArenaOfHero rpcHero = rpcHeroes.get(heroId); + if(rpcHero == null){ + throw new ErrorCodeException(ErrorCode.newDefineCode("hero no")); + } + CommonProto.Hero.Builder heroBuilder = CommonProto.Hero.newBuilder().setLevel(rpcHero.getLevel()).setEspecialEquipLevel(rpcHero.getEspecialEquipLevel()).setStar(rpcHero.getStar()).setId(rpcHero.getId()).setHeroId(rpcHero.getTemplateId()).setBreakId(rpcHero.getBreakId()).setStarBreakId(rpcHero.getStarBreakId()); + PlayerInfoProto.ViewHeroInfoResponse.Builder builder = PlayerInfoProto.ViewHeroInfoResponse.newBuilder(); + Map heroNotBufferAttribute = rpcHero.getAttributeMapByTeam().getOrDefault(teamId,new HashMap<>()); + for(Map.Entry item : heroNotBufferAttribute.entrySet()){ + int id = item.getKey(); + int values = item.getValue().intValue(); + if (id == 53 || id == 57 || id == 58){ + values = item.getValue().intValue()-10000; + } + builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(id).setPropertyValue(values).build()); + } + Map jewels = crossArenaManager.getJewels(); + for(String equipId : rpcHero.getJewelInfo()){ + heroBuilder.addJewels(equipId); + builder.addEquip(CBean2Proto.getEquipProto(jewels.get(equipId))); + } + // 装备 + for(int equipId : rpcHero.getEquipByPositionMap().values()){ + heroBuilder.addEquipIdList(equipId); + builder.addEquip(CBean2Proto.getEquipProto(equipId)); + } + // 法宝 + Map soulEquipByPositionMap = rpcHero.getSoulEquipByPositionMap(); + for(Map.Entry entry: soulEquipByPositionMap.entrySet()){ + heroBuilder.addSoulPos(CommonProto.SoulPos.newBuilder().setEquipId(entry.getValue()).setPosition(entry.getKey())); + } + // 皮肤 + heroBuilder.setSkinId(rpcHero.getSkin()); + // 英雄技能 + int profession = SCHero.getsCHero().get(rpcHero.getTemplateId()).getProfession(); + int skill = crossArenaManager.getGuildSkill().getOrDefault(profession, 0); + builder.setGuildSkill(skill); + // 战力 + builder.setForce(HeroLogic.getInstance().calForce(heroNotBufferAttribute)); + builder.setHero(heroBuilder); + return builder.build(); + } + + + public PlayerInfoProto.ViewHeroInfoResponse viewCrossHeroInfo1(int uid,String heroId,int teamId) throws Exception{ ArenaOfUser query = CrossServiceLogic.getInstance().query(uid); Map heroes = query.getHeroManager().getHeros(); @@ -1193,9 +1246,7 @@ public class PlayerLogic { builder.setForce(HeroLogic.getInstance().calForce(heroNotBufferAttribute)); builder.setHero(heroBuilder); return builder.build(); - } - /** * 跨服英雄属性展示特殊处理 * @param id diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java index 4069d31ac..2ab39f296 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class ArenaOfHero implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArenaOfHero"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java index 17f9ceff8..eb0d4a6a3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class CrossArenaManager implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CrossArenaManager"); @@ -47,6 +47,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -60,9 +61,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase totalForceByTeam; // optional public int totalForce; // optional public int yxldForce; // optional - public Map pokemons; // optional + public Map pokemons; // optional public Map seals; // optional public Map guildSkill; // optional + public Map pokemonTeamMap; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -74,7 +76,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase byName = new HashMap(); @@ -107,6 +110,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -177,7 +182,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase __this__pokemons = new HashMap(other.pokemons.size()); - for (Map.Entry other_element : other.pokemons.entrySet()) { + Map __this__pokemons = new HashMap(other.pokemons.size()); + for (Map.Entry other_element : other.pokemons.entrySet()) { - Integer other_element_key = other_element.getKey(); + String other_element_key = other_element.getKey(); Pokemon other_element_value = other_element.getValue(); - Integer __this__pokemons_copy_key = other_element_key; + String __this__pokemons_copy_key = other_element_key; Pokemon __this__pokemons_copy_value = new Pokemon(other_element_value); @@ -287,6 +296,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase __this__guildSkill = new HashMap(other.guildSkill); this.guildSkill = __this__guildSkill; } + if (other.isSetPokemonTeamMap()) { + Map __this__pokemonTeamMap = new HashMap(other.pokemonTeamMap); + this.pokemonTeamMap = __this__pokemonTeamMap; + } } public CrossArenaManager deepCopy() { @@ -306,6 +319,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase(); + this.pokemons = new HashMap(); } this.pokemons.put(key, val); } - public Map getPokemons() { + public Map getPokemons() { return this.pokemons; } - public CrossArenaManager setPokemons(Map pokemons) { + public CrossArenaManager setPokemons(Map pokemons) { this.pokemons = pokemons; return this; } @@ -599,6 +613,41 @@ public class CrossArenaManager implements org.apache.thrift.TBase(); + } + this.pokemonTeamMap.put(key, val); + } + + public Map getPokemonTeamMap() { + return this.pokemonTeamMap; + } + + public CrossArenaManager setPokemonTeamMap(Map pokemonTeamMap) { + this.pokemonTeamMap = pokemonTeamMap; + return this; + } + + public void unsetPokemonTeamMap() { + this.pokemonTeamMap = null; + } + + /** Returns true if field pokemonTeamMap is set (has been assigned a value) and false otherwise */ + public boolean isSetPokemonTeamMap() { + return this.pokemonTeamMap != null; + } + + public void setPokemonTeamMapIsSet(boolean value) { + if (!value) { + this.pokemonTeamMap = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case TEAMS: @@ -653,7 +702,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase)value); + setPokemons((Map)value); } break; @@ -673,6 +722,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase)value); + } + break; + } } @@ -705,6 +762,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map105.size); - int _key106; + struct.pokemons = new HashMap(2*_map105.size); + String _key106; Pokemon _val107; for (int _i108 = 0; _i108 < _map105.size; ++_i108) { - _key106 = iprot.readI32(); + _key106 = iprot.readString(); _val107 = new Pokemon(); _val107.read(iprot); struct.pokemons.put(_key106, _val107); @@ -1302,6 +1398,26 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map117.size); + int _key118; + String _val119; + for (int _i120 = 0; _i120 < _map117.size; ++_i120) + { + _key118 = iprot.readI32(); + _val119 = iprot.readString(); + struct.pokemonTeamMap.put(_key118, _val119); + } + iprot.readMapEnd(); + } + struct.setPokemonTeamMapIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1322,14 +1438,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter117 : struct.teams.entrySet()) + for (Map.Entry> _iter121 : struct.teams.entrySet()) { - oprot.writeI32(_iter117.getKey()); + oprot.writeI32(_iter121.getKey()); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter117.getValue().size())); - for (TeamPosHeroInfo _iter118 : _iter117.getValue()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter121.getValue().size())); + for (TeamPosHeroInfo _iter122 : _iter121.getValue()) { - _iter118.write(oprot); + _iter122.write(oprot); } oprot.writeListEnd(); } @@ -1344,10 +1460,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter119 : struct.heros.entrySet()) + for (Map.Entry _iter123 : struct.heros.entrySet()) { - oprot.writeString(_iter119.getKey()); - _iter119.getValue().write(oprot); + oprot.writeString(_iter123.getKey()); + _iter123.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1359,10 +1475,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter120 : struct.jewels.entrySet()) + for (Map.Entry _iter124 : struct.jewels.entrySet()) { - oprot.writeString(_iter120.getKey()); - _iter120.getValue().write(oprot); + oprot.writeString(_iter124.getKey()); + _iter124.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1374,10 +1490,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter121 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter125 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter121.getKey()); - oprot.writeI32(_iter121.getValue()); + oprot.writeI32(_iter125.getKey()); + oprot.writeI32(_iter125.getValue()); } oprot.writeMapEnd(); } @@ -1398,11 +1514,11 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter122 : struct.pokemons.entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.pokemons.size())); + for (Map.Entry _iter126 : struct.pokemons.entrySet()) { - oprot.writeI32(_iter122.getKey()); - _iter122.getValue().write(oprot); + oprot.writeString(_iter126.getKey()); + _iter126.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1414,10 +1530,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter123 : struct.seals.entrySet()) + for (Map.Entry _iter127 : struct.seals.entrySet()) { - oprot.writeI32(_iter123.getKey()); - _iter123.getValue().write(oprot); + oprot.writeI32(_iter127.getKey()); + _iter127.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1429,10 +1545,25 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter124 : struct.guildSkill.entrySet()) + for (Map.Entry _iter128 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter124.getKey()); - oprot.writeI32(_iter124.getValue()); + oprot.writeI32(_iter128.getKey()); + oprot.writeI32(_iter128.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } + if (struct.pokemonTeamMap != null) { + if (struct.isSetPokemonTeamMap()) { + oprot.writeFieldBegin(POKEMON_TEAM_MAP_FIELD_DESC); + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, struct.pokemonTeamMap.size())); + for (Map.Entry _iter129 : struct.pokemonTeamMap.entrySet()) + { + oprot.writeI32(_iter129.getKey()); + oprot.writeString(_iter129.getValue()); } oprot.writeMapEnd(); } @@ -1484,18 +1615,21 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter125 : struct.teams.entrySet()) + for (Map.Entry> _iter130 : struct.teams.entrySet()) { - oprot.writeI32(_iter125.getKey()); + oprot.writeI32(_iter130.getKey()); { - oprot.writeI32(_iter125.getValue().size()); - for (TeamPosHeroInfo _iter126 : _iter125.getValue()) + oprot.writeI32(_iter130.getValue().size()); + for (TeamPosHeroInfo _iter131 : _iter130.getValue()) { - _iter126.write(oprot); + _iter131.write(oprot); } } } @@ -1504,30 +1638,30 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter127 : struct.heros.entrySet()) + for (Map.Entry _iter132 : struct.heros.entrySet()) { - oprot.writeString(_iter127.getKey()); - _iter127.getValue().write(oprot); + oprot.writeString(_iter132.getKey()); + _iter132.getValue().write(oprot); } } } if (struct.isSetJewels()) { { oprot.writeI32(struct.jewels.size()); - for (Map.Entry _iter128 : struct.jewels.entrySet()) + for (Map.Entry _iter133 : struct.jewels.entrySet()) { - oprot.writeString(_iter128.getKey()); - _iter128.getValue().write(oprot); + oprot.writeString(_iter133.getKey()); + _iter133.getValue().write(oprot); } } } if (struct.isSetTotalForceByTeam()) { { oprot.writeI32(struct.totalForceByTeam.size()); - for (Map.Entry _iter129 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter134 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter129.getKey()); - oprot.writeI32(_iter129.getValue()); + oprot.writeI32(_iter134.getKey()); + oprot.writeI32(_iter134.getValue()); } } } @@ -1540,30 +1674,40 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter130 : struct.pokemons.entrySet()) + for (Map.Entry _iter135 : struct.pokemons.entrySet()) { - oprot.writeI32(_iter130.getKey()); - _iter130.getValue().write(oprot); + oprot.writeString(_iter135.getKey()); + _iter135.getValue().write(oprot); } } } if (struct.isSetSeals()) { { oprot.writeI32(struct.seals.size()); - for (Map.Entry _iter131 : struct.seals.entrySet()) + for (Map.Entry _iter136 : struct.seals.entrySet()) { - oprot.writeI32(_iter131.getKey()); - _iter131.getValue().write(oprot); + oprot.writeI32(_iter136.getKey()); + _iter136.getValue().write(oprot); } } } if (struct.isSetGuildSkill()) { { oprot.writeI32(struct.guildSkill.size()); - for (Map.Entry _iter132 : struct.guildSkill.entrySet()) + for (Map.Entry _iter137 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter132.getKey()); - oprot.writeI32(_iter132.getValue()); + oprot.writeI32(_iter137.getKey()); + oprot.writeI32(_iter137.getValue()); + } + } + } + if (struct.isSetPokemonTeamMap()) { + { + oprot.writeI32(struct.pokemonTeamMap.size()); + for (Map.Entry _iter138 : struct.pokemonTeamMap.entrySet()) + { + oprot.writeI32(_iter138.getKey()); + oprot.writeString(_iter138.getValue()); } } } @@ -1572,75 +1716,75 @@ public class CrossArenaManager implements org.apache.thrift.TBase>(2*_map133.size); - int _key134; - List _val135; - for (int _i136 = 0; _i136 < _map133.size; ++_i136) + org.apache.thrift.protocol.TMap _map139 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST, iprot.readI32()); + struct.teams = new HashMap>(2*_map139.size); + int _key140; + List _val141; + for (int _i142 = 0; _i142 < _map139.size; ++_i142) { - _key134 = iprot.readI32(); + _key140 = iprot.readI32(); { - org.apache.thrift.protocol.TList _list137 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - _val135 = new ArrayList(_list137.size); - TeamPosHeroInfo _elem138; - for (int _i139 = 0; _i139 < _list137.size; ++_i139) + org.apache.thrift.protocol.TList _list143 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + _val141 = new ArrayList(_list143.size); + TeamPosHeroInfo _elem144; + for (int _i145 = 0; _i145 < _list143.size; ++_i145) { - _elem138 = new TeamPosHeroInfo(); - _elem138.read(iprot); - _val135.add(_elem138); + _elem144 = new TeamPosHeroInfo(); + _elem144.read(iprot); + _val141.add(_elem144); } } - struct.teams.put(_key134, _val135); + struct.teams.put(_key140, _val141); } } struct.setTeamsIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map140 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.heros = new HashMap(2*_map140.size); - String _key141; - ArenaOfHero _val142; - for (int _i143 = 0; _i143 < _map140.size; ++_i143) + org.apache.thrift.protocol.TMap _map146 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.heros = new HashMap(2*_map146.size); + String _key147; + ArenaOfHero _val148; + for (int _i149 = 0; _i149 < _map146.size; ++_i149) { - _key141 = iprot.readString(); - _val142 = new ArenaOfHero(); - _val142.read(iprot); - struct.heros.put(_key141, _val142); + _key147 = iprot.readString(); + _val148 = new ArenaOfHero(); + _val148.read(iprot); + struct.heros.put(_key147, _val148); } } struct.setHerosIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map144 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.jewels = new HashMap(2*_map144.size); - String _key145; - PropertyItem _val146; - for (int _i147 = 0; _i147 < _map144.size; ++_i147) + org.apache.thrift.protocol.TMap _map150 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.jewels = new HashMap(2*_map150.size); + String _key151; + PropertyItem _val152; + for (int _i153 = 0; _i153 < _map150.size; ++_i153) { - _key145 = iprot.readString(); - _val146 = new PropertyItem(); - _val146.read(iprot); - struct.jewels.put(_key145, _val146); + _key151 = iprot.readString(); + _val152 = new PropertyItem(); + _val152.read(iprot); + struct.jewels.put(_key151, _val152); } } struct.setJewelsIsSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map148 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.totalForceByTeam = new HashMap(2*_map148.size); - int _key149; - int _val150; - for (int _i151 = 0; _i151 < _map148.size; ++_i151) + org.apache.thrift.protocol.TMap _map154 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.totalForceByTeam = new HashMap(2*_map154.size); + int _key155; + int _val156; + for (int _i157 = 0; _i157 < _map154.size; ++_i157) { - _key149 = iprot.readI32(); - _val150 = iprot.readI32(); - struct.totalForceByTeam.put(_key149, _val150); + _key155 = iprot.readI32(); + _val156 = iprot.readI32(); + struct.totalForceByTeam.put(_key155, _val156); } } struct.setTotalForceByTeamIsSet(true); @@ -1655,51 +1799,66 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map152.size); - int _key153; - Pokemon _val154; - for (int _i155 = 0; _i155 < _map152.size; ++_i155) + org.apache.thrift.protocol.TMap _map158 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.pokemons = new HashMap(2*_map158.size); + String _key159; + Pokemon _val160; + for (int _i161 = 0; _i161 < _map158.size; ++_i161) { - _key153 = iprot.readI32(); - _val154 = new Pokemon(); - _val154.read(iprot); - struct.pokemons.put(_key153, _val154); + _key159 = iprot.readString(); + _val160 = new Pokemon(); + _val160.read(iprot); + struct.pokemons.put(_key159, _val160); } } struct.setPokemonsIsSet(true); } if (incoming.get(7)) { { - org.apache.thrift.protocol.TMap _map156 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.seals = new HashMap(2*_map156.size); - int _key157; - PurpleMansionSeal _val158; - for (int _i159 = 0; _i159 < _map156.size; ++_i159) + org.apache.thrift.protocol.TMap _map162 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.seals = new HashMap(2*_map162.size); + int _key163; + PurpleMansionSeal _val164; + for (int _i165 = 0; _i165 < _map162.size; ++_i165) { - _key157 = iprot.readI32(); - _val158 = new PurpleMansionSeal(); - _val158.read(iprot); - struct.seals.put(_key157, _val158); + _key163 = iprot.readI32(); + _val164 = new PurpleMansionSeal(); + _val164.read(iprot); + struct.seals.put(_key163, _val164); } } struct.setSealsIsSet(true); } if (incoming.get(8)) { { - org.apache.thrift.protocol.TMap _map160 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.guildSkill = new HashMap(2*_map160.size); - int _key161; - int _val162; - for (int _i163 = 0; _i163 < _map160.size; ++_i163) + org.apache.thrift.protocol.TMap _map166 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.guildSkill = new HashMap(2*_map166.size); + int _key167; + int _val168; + for (int _i169 = 0; _i169 < _map166.size; ++_i169) { - _key161 = iprot.readI32(); - _val162 = iprot.readI32(); - struct.guildSkill.put(_key161, _val162); + _key167 = iprot.readI32(); + _val168 = iprot.readI32(); + struct.guildSkill.put(_key167, _val168); } } struct.setGuildSkillIsSet(true); } + if (incoming.get(9)) { + { + org.apache.thrift.protocol.TMap _map170 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.pokemonTeamMap = new HashMap(2*_map170.size); + int _key171; + String _val172; + for (int _i173 = 0; _i173 < _map170.size; ++_i173) + { + _key171 = iprot.readI32(); + _val172 = iprot.readString(); + struct.pokemonTeamMap.put(_key171, _val172); + } + } + struct.setPokemonTeamMapIsSet(true); + } } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java index e28faa02a..3c69c91d5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class InvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidOperException"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java index 78e9217cc..e2c895313 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class Pokemon implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Pokemon"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java index 8c432e5bf..d3e5d237a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class PropertyItem implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PropertyItem"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java index 016d1c7af..bbec6bbf3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class PurpleMansionSeal implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PurpleMansionSeal"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java index ac04b3ae9..cc81bd54b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RPCMatchRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java index 6d32098ba..79f2c4c2b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RPCRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java index 6bf406ea5..d4119dda8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RechargeResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RechargeResult"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java index 873cf177c..13ad52f79 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class Result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Result"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java index de2c1733b..cfee0da2f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * ArenaOfHeroManager 结构体 */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class TeamPosHeroInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TeamPosHeroInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 17fe1efd8..c9c6d570e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -440,7 +440,7 @@ public class CBean2Proto { public static CommonProto.Equip getEquipProto(PropertyItem equip){ //前端读表 - // Map propertyValueByIdMap = equip.getPropertyValueByIdMap(); + // Map propertyValueByIdMap = equip.getPropertyValueByIdMap(); Map secondValueByIdMap = equip.getSecondValueByIdMap(); CommonProto.Equip.Builder equipProto =CommonProto.Equip.newBuilder() .setEquipId(equip.getEquipId()) @@ -462,6 +462,28 @@ public class CBean2Proto { return equipProto.build(); } + //TODO + public static CommonProto.Equip getEquipProto(com.ljsd.jieling.thrift.idl.PropertyItem equip){ + //前端读表 + // Map propertyValueByIdMap = equip.getPropertyValueByIdMap(); + Map secondValueByIdMap = equip.getSecondValueByIdMap(); + CommonProto.Equip.Builder equipProto =CommonProto.Equip.newBuilder() + .setEquipId(equip.getEquipId()) + .setId(equip.getId()) + + + .setCreateTime(equip.getCreateTime()) + .setIsLocked(equip.getIsLocked()); + + //if(equip instanceof Jewel){ + //Jewel tempEquip =(Jewel)equip; + equipProto.setRebuildLevel(1) + .setExp(equip.getLevel()); + //} + + return equipProto.build(); + } + public static CommonProto.Equip getEquipProto(PropertyItem equip,User user,String heroId){ CommonProto.Equip.Builder proto = getEquipProto(equip).toBuilder(); @@ -986,6 +1008,9 @@ public class CBean2Proto { public static CommonProto.TeamSimpleInfo getSimpleTeamInfoByPokeMon(Pokemon pokemon,int position){ return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(pokemon.getId()).setHeroTid(pokemon.getTmpId()).setLevel(pokemon.getLevel()).setStar(pokemon.getStar()).setPosition(position).build(); } + public static CommonProto.TeamSimpleInfo getSimpleTeamInfoByPokeMon( com.ljsd.jieling.thrift.idl.Pokemon pokemon,int position){ + return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(pokemon.getId()).setHeroTid(pokemon.getTmpId()).setLevel(pokemon.getLevel()).setStar(pokemon.getStar()).setPosition(position).build(); + } public static CommonProto.HardStagePlayerInfo getHardStagePlayerInfo(ArenaRecord arenaRecord,int type,User user)throws Exception { CommonProto.FightData fightDataProto = CommonProto.FightData.parseFrom(arenaRecord.getFightData()); diff --git a/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java index 14b7e5c21..893823cb5 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java b/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java index 1b8a33a04..315477181 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java b/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java index eef4cfe2f..42b01856c 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RPCgTwRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java b/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java index 76436e61f..b328ae5cd 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RPCwTgRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/core.thrift b/serverlogic/src/main/thrift/idl/core.thrift index 219251f7e..ce759432f 100644 --- a/serverlogic/src/main/thrift/idl/core.thrift +++ b/serverlogic/src/main/thrift/idl/core.thrift @@ -79,9 +79,10 @@ struct CrossArenaManager{ 4:optional map totalForceByTeam ; 5:optional i32 totalForce; 6:optional i32 yxldForce; - 7:optional map pokemons; + 7:optional map pokemons; 8:optional map seals; 9:optional map guildSkill; + 10:optional map pokemonTeamMap; } diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java index 17f9ceff8..eb0d4a6a3 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class CrossArenaManager implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CrossArenaManager"); @@ -47,6 +47,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -60,9 +61,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase totalForceByTeam; // optional public int totalForce; // optional public int yxldForce; // optional - public Map pokemons; // optional + public Map pokemons; // optional public Map seals; // optional public Map guildSkill; // optional + public Map pokemonTeamMap; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -74,7 +76,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase byName = new HashMap(); @@ -107,6 +110,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -177,7 +182,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase __this__pokemons = new HashMap(other.pokemons.size()); - for (Map.Entry other_element : other.pokemons.entrySet()) { + Map __this__pokemons = new HashMap(other.pokemons.size()); + for (Map.Entry other_element : other.pokemons.entrySet()) { - Integer other_element_key = other_element.getKey(); + String other_element_key = other_element.getKey(); Pokemon other_element_value = other_element.getValue(); - Integer __this__pokemons_copy_key = other_element_key; + String __this__pokemons_copy_key = other_element_key; Pokemon __this__pokemons_copy_value = new Pokemon(other_element_value); @@ -287,6 +296,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase __this__guildSkill = new HashMap(other.guildSkill); this.guildSkill = __this__guildSkill; } + if (other.isSetPokemonTeamMap()) { + Map __this__pokemonTeamMap = new HashMap(other.pokemonTeamMap); + this.pokemonTeamMap = __this__pokemonTeamMap; + } } public CrossArenaManager deepCopy() { @@ -306,6 +319,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase(); + this.pokemons = new HashMap(); } this.pokemons.put(key, val); } - public Map getPokemons() { + public Map getPokemons() { return this.pokemons; } - public CrossArenaManager setPokemons(Map pokemons) { + public CrossArenaManager setPokemons(Map pokemons) { this.pokemons = pokemons; return this; } @@ -599,6 +613,41 @@ public class CrossArenaManager implements org.apache.thrift.TBase(); + } + this.pokemonTeamMap.put(key, val); + } + + public Map getPokemonTeamMap() { + return this.pokemonTeamMap; + } + + public CrossArenaManager setPokemonTeamMap(Map pokemonTeamMap) { + this.pokemonTeamMap = pokemonTeamMap; + return this; + } + + public void unsetPokemonTeamMap() { + this.pokemonTeamMap = null; + } + + /** Returns true if field pokemonTeamMap is set (has been assigned a value) and false otherwise */ + public boolean isSetPokemonTeamMap() { + return this.pokemonTeamMap != null; + } + + public void setPokemonTeamMapIsSet(boolean value) { + if (!value) { + this.pokemonTeamMap = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case TEAMS: @@ -653,7 +702,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase)value); + setPokemons((Map)value); } break; @@ -673,6 +722,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase)value); + } + break; + } } @@ -705,6 +762,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map105.size); - int _key106; + struct.pokemons = new HashMap(2*_map105.size); + String _key106; Pokemon _val107; for (int _i108 = 0; _i108 < _map105.size; ++_i108) { - _key106 = iprot.readI32(); + _key106 = iprot.readString(); _val107 = new Pokemon(); _val107.read(iprot); struct.pokemons.put(_key106, _val107); @@ -1302,6 +1398,26 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map117.size); + int _key118; + String _val119; + for (int _i120 = 0; _i120 < _map117.size; ++_i120) + { + _key118 = iprot.readI32(); + _val119 = iprot.readString(); + struct.pokemonTeamMap.put(_key118, _val119); + } + iprot.readMapEnd(); + } + struct.setPokemonTeamMapIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1322,14 +1438,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter117 : struct.teams.entrySet()) + for (Map.Entry> _iter121 : struct.teams.entrySet()) { - oprot.writeI32(_iter117.getKey()); + oprot.writeI32(_iter121.getKey()); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter117.getValue().size())); - for (TeamPosHeroInfo _iter118 : _iter117.getValue()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter121.getValue().size())); + for (TeamPosHeroInfo _iter122 : _iter121.getValue()) { - _iter118.write(oprot); + _iter122.write(oprot); } oprot.writeListEnd(); } @@ -1344,10 +1460,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter119 : struct.heros.entrySet()) + for (Map.Entry _iter123 : struct.heros.entrySet()) { - oprot.writeString(_iter119.getKey()); - _iter119.getValue().write(oprot); + oprot.writeString(_iter123.getKey()); + _iter123.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1359,10 +1475,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter120 : struct.jewels.entrySet()) + for (Map.Entry _iter124 : struct.jewels.entrySet()) { - oprot.writeString(_iter120.getKey()); - _iter120.getValue().write(oprot); + oprot.writeString(_iter124.getKey()); + _iter124.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1374,10 +1490,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter121 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter125 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter121.getKey()); - oprot.writeI32(_iter121.getValue()); + oprot.writeI32(_iter125.getKey()); + oprot.writeI32(_iter125.getValue()); } oprot.writeMapEnd(); } @@ -1398,11 +1514,11 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter122 : struct.pokemons.entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.pokemons.size())); + for (Map.Entry _iter126 : struct.pokemons.entrySet()) { - oprot.writeI32(_iter122.getKey()); - _iter122.getValue().write(oprot); + oprot.writeString(_iter126.getKey()); + _iter126.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1414,10 +1530,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter123 : struct.seals.entrySet()) + for (Map.Entry _iter127 : struct.seals.entrySet()) { - oprot.writeI32(_iter123.getKey()); - _iter123.getValue().write(oprot); + oprot.writeI32(_iter127.getKey()); + _iter127.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1429,10 +1545,25 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter124 : struct.guildSkill.entrySet()) + for (Map.Entry _iter128 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter124.getKey()); - oprot.writeI32(_iter124.getValue()); + oprot.writeI32(_iter128.getKey()); + oprot.writeI32(_iter128.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } + if (struct.pokemonTeamMap != null) { + if (struct.isSetPokemonTeamMap()) { + oprot.writeFieldBegin(POKEMON_TEAM_MAP_FIELD_DESC); + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, struct.pokemonTeamMap.size())); + for (Map.Entry _iter129 : struct.pokemonTeamMap.entrySet()) + { + oprot.writeI32(_iter129.getKey()); + oprot.writeString(_iter129.getValue()); } oprot.writeMapEnd(); } @@ -1484,18 +1615,21 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter125 : struct.teams.entrySet()) + for (Map.Entry> _iter130 : struct.teams.entrySet()) { - oprot.writeI32(_iter125.getKey()); + oprot.writeI32(_iter130.getKey()); { - oprot.writeI32(_iter125.getValue().size()); - for (TeamPosHeroInfo _iter126 : _iter125.getValue()) + oprot.writeI32(_iter130.getValue().size()); + for (TeamPosHeroInfo _iter131 : _iter130.getValue()) { - _iter126.write(oprot); + _iter131.write(oprot); } } } @@ -1504,30 +1638,30 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter127 : struct.heros.entrySet()) + for (Map.Entry _iter132 : struct.heros.entrySet()) { - oprot.writeString(_iter127.getKey()); - _iter127.getValue().write(oprot); + oprot.writeString(_iter132.getKey()); + _iter132.getValue().write(oprot); } } } if (struct.isSetJewels()) { { oprot.writeI32(struct.jewels.size()); - for (Map.Entry _iter128 : struct.jewels.entrySet()) + for (Map.Entry _iter133 : struct.jewels.entrySet()) { - oprot.writeString(_iter128.getKey()); - _iter128.getValue().write(oprot); + oprot.writeString(_iter133.getKey()); + _iter133.getValue().write(oprot); } } } if (struct.isSetTotalForceByTeam()) { { oprot.writeI32(struct.totalForceByTeam.size()); - for (Map.Entry _iter129 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter134 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter129.getKey()); - oprot.writeI32(_iter129.getValue()); + oprot.writeI32(_iter134.getKey()); + oprot.writeI32(_iter134.getValue()); } } } @@ -1540,30 +1674,40 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter130 : struct.pokemons.entrySet()) + for (Map.Entry _iter135 : struct.pokemons.entrySet()) { - oprot.writeI32(_iter130.getKey()); - _iter130.getValue().write(oprot); + oprot.writeString(_iter135.getKey()); + _iter135.getValue().write(oprot); } } } if (struct.isSetSeals()) { { oprot.writeI32(struct.seals.size()); - for (Map.Entry _iter131 : struct.seals.entrySet()) + for (Map.Entry _iter136 : struct.seals.entrySet()) { - oprot.writeI32(_iter131.getKey()); - _iter131.getValue().write(oprot); + oprot.writeI32(_iter136.getKey()); + _iter136.getValue().write(oprot); } } } if (struct.isSetGuildSkill()) { { oprot.writeI32(struct.guildSkill.size()); - for (Map.Entry _iter132 : struct.guildSkill.entrySet()) + for (Map.Entry _iter137 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter132.getKey()); - oprot.writeI32(_iter132.getValue()); + oprot.writeI32(_iter137.getKey()); + oprot.writeI32(_iter137.getValue()); + } + } + } + if (struct.isSetPokemonTeamMap()) { + { + oprot.writeI32(struct.pokemonTeamMap.size()); + for (Map.Entry _iter138 : struct.pokemonTeamMap.entrySet()) + { + oprot.writeI32(_iter138.getKey()); + oprot.writeString(_iter138.getValue()); } } } @@ -1572,75 +1716,75 @@ public class CrossArenaManager implements org.apache.thrift.TBase>(2*_map133.size); - int _key134; - List _val135; - for (int _i136 = 0; _i136 < _map133.size; ++_i136) + org.apache.thrift.protocol.TMap _map139 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST, iprot.readI32()); + struct.teams = new HashMap>(2*_map139.size); + int _key140; + List _val141; + for (int _i142 = 0; _i142 < _map139.size; ++_i142) { - _key134 = iprot.readI32(); + _key140 = iprot.readI32(); { - org.apache.thrift.protocol.TList _list137 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - _val135 = new ArrayList(_list137.size); - TeamPosHeroInfo _elem138; - for (int _i139 = 0; _i139 < _list137.size; ++_i139) + org.apache.thrift.protocol.TList _list143 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + _val141 = new ArrayList(_list143.size); + TeamPosHeroInfo _elem144; + for (int _i145 = 0; _i145 < _list143.size; ++_i145) { - _elem138 = new TeamPosHeroInfo(); - _elem138.read(iprot); - _val135.add(_elem138); + _elem144 = new TeamPosHeroInfo(); + _elem144.read(iprot); + _val141.add(_elem144); } } - struct.teams.put(_key134, _val135); + struct.teams.put(_key140, _val141); } } struct.setTeamsIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map140 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.heros = new HashMap(2*_map140.size); - String _key141; - ArenaOfHero _val142; - for (int _i143 = 0; _i143 < _map140.size; ++_i143) + org.apache.thrift.protocol.TMap _map146 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.heros = new HashMap(2*_map146.size); + String _key147; + ArenaOfHero _val148; + for (int _i149 = 0; _i149 < _map146.size; ++_i149) { - _key141 = iprot.readString(); - _val142 = new ArenaOfHero(); - _val142.read(iprot); - struct.heros.put(_key141, _val142); + _key147 = iprot.readString(); + _val148 = new ArenaOfHero(); + _val148.read(iprot); + struct.heros.put(_key147, _val148); } } struct.setHerosIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map144 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.jewels = new HashMap(2*_map144.size); - String _key145; - PropertyItem _val146; - for (int _i147 = 0; _i147 < _map144.size; ++_i147) + org.apache.thrift.protocol.TMap _map150 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.jewels = new HashMap(2*_map150.size); + String _key151; + PropertyItem _val152; + for (int _i153 = 0; _i153 < _map150.size; ++_i153) { - _key145 = iprot.readString(); - _val146 = new PropertyItem(); - _val146.read(iprot); - struct.jewels.put(_key145, _val146); + _key151 = iprot.readString(); + _val152 = new PropertyItem(); + _val152.read(iprot); + struct.jewels.put(_key151, _val152); } } struct.setJewelsIsSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map148 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.totalForceByTeam = new HashMap(2*_map148.size); - int _key149; - int _val150; - for (int _i151 = 0; _i151 < _map148.size; ++_i151) + org.apache.thrift.protocol.TMap _map154 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.totalForceByTeam = new HashMap(2*_map154.size); + int _key155; + int _val156; + for (int _i157 = 0; _i157 < _map154.size; ++_i157) { - _key149 = iprot.readI32(); - _val150 = iprot.readI32(); - struct.totalForceByTeam.put(_key149, _val150); + _key155 = iprot.readI32(); + _val156 = iprot.readI32(); + struct.totalForceByTeam.put(_key155, _val156); } } struct.setTotalForceByTeamIsSet(true); @@ -1655,51 +1799,66 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map152.size); - int _key153; - Pokemon _val154; - for (int _i155 = 0; _i155 < _map152.size; ++_i155) + org.apache.thrift.protocol.TMap _map158 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.pokemons = new HashMap(2*_map158.size); + String _key159; + Pokemon _val160; + for (int _i161 = 0; _i161 < _map158.size; ++_i161) { - _key153 = iprot.readI32(); - _val154 = new Pokemon(); - _val154.read(iprot); - struct.pokemons.put(_key153, _val154); + _key159 = iprot.readString(); + _val160 = new Pokemon(); + _val160.read(iprot); + struct.pokemons.put(_key159, _val160); } } struct.setPokemonsIsSet(true); } if (incoming.get(7)) { { - org.apache.thrift.protocol.TMap _map156 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.seals = new HashMap(2*_map156.size); - int _key157; - PurpleMansionSeal _val158; - for (int _i159 = 0; _i159 < _map156.size; ++_i159) + org.apache.thrift.protocol.TMap _map162 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.seals = new HashMap(2*_map162.size); + int _key163; + PurpleMansionSeal _val164; + for (int _i165 = 0; _i165 < _map162.size; ++_i165) { - _key157 = iprot.readI32(); - _val158 = new PurpleMansionSeal(); - _val158.read(iprot); - struct.seals.put(_key157, _val158); + _key163 = iprot.readI32(); + _val164 = new PurpleMansionSeal(); + _val164.read(iprot); + struct.seals.put(_key163, _val164); } } struct.setSealsIsSet(true); } if (incoming.get(8)) { { - org.apache.thrift.protocol.TMap _map160 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.guildSkill = new HashMap(2*_map160.size); - int _key161; - int _val162; - for (int _i163 = 0; _i163 < _map160.size; ++_i163) + org.apache.thrift.protocol.TMap _map166 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.guildSkill = new HashMap(2*_map166.size); + int _key167; + int _val168; + for (int _i169 = 0; _i169 < _map166.size; ++_i169) { - _key161 = iprot.readI32(); - _val162 = iprot.readI32(); - struct.guildSkill.put(_key161, _val162); + _key167 = iprot.readI32(); + _val168 = iprot.readI32(); + struct.guildSkill.put(_key167, _val168); } } struct.setGuildSkillIsSet(true); } + if (incoming.get(9)) { + { + org.apache.thrift.protocol.TMap _map170 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.pokemonTeamMap = new HashMap(2*_map170.size); + int _key171; + String _val172; + for (int _i173 = 0; _i173 < _map170.size; ++_i173) + { + _key171 = iprot.readI32(); + _val172 = iprot.readString(); + struct.pokemonTeamMap.put(_key171, _val172); + } + } + struct.setPokemonTeamMapIsSet(true); + } } } diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java index 78e9217cc..e2c895313 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class Pokemon implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Pokemon"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java index 8c432e5bf..d3e5d237a 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class PropertyItem implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PropertyItem"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java index 016d1c7af..bbec6bbf3 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class PurpleMansionSeal implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PurpleMansionSeal"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java index ac04b3ae9..cc81bd54b 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RPCMatchRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java index 6d32098ba..79f2c4c2b 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RPCRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java index 6bf406ea5..d4119dda8 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RechargeResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RechargeResult"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java index 873cf177c..13ad52f79 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class Result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Result"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java index de2c1733b..cfee0da2f 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * ArenaOfHeroManager 结构体 */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class TeamPosHeroInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TeamPosHeroInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java index 14b7e5c21..893823cb5 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java index 1b8a33a04..315477181 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java index eef4cfe2f..42b01856c 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RPCgTwRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java index 76436e61f..b328ae5cd 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RPCwTgRequestIFace { public interface Iface { diff --git a/tablemanager/src/main/java/config/SArenaRobotConfig.java b/tablemanager/src/main/java/config/SArenaRobotConfig.java index 015718676..a4c5ae5e3 100644 --- a/tablemanager/src/main/java/config/SArenaRobotConfig.java +++ b/tablemanager/src/main/java/config/SArenaRobotConfig.java @@ -109,7 +109,11 @@ public class SArenaRobotConfig implements BaseConfig { } } Collections.shuffle(robotIdList); - return robotIdList.subList(0,count); + if(robotIdList.size() >= count){ + return robotIdList.subList(0,count); + }else{ + return robotIdList; + } } public static Map getsArenaRobotConfigMap() { diff --git a/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java b/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java index 14b7e5c21..893823cb5 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java +++ b/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java b/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java index 1b8a33a04..315477181 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java +++ b/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java b/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java index eef4cfe2f..42b01856c 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java +++ b/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RPCgTwRequestIFace { public interface Iface { diff --git a/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java b/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java index 76436e61f..b328ae5cd 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java +++ b/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-9-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-13") public class RPCwTgRequestIFace { public interface Iface {