From b21cb8f45ac229ac4d8546fd0dc524a1a6f6f614 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Sat, 30 Oct 2021 01:00:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=99=BD=E9=87=91=E5=A5=97?= =?UTF-8?q?=E8=A3=85=E6=8A=80=E8=83=BD=EF=BC=8C=E5=9D=90=E9=AA=91=E6=8A=80?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../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 | 2 + .../ljsd/jieling/logic/fight/FightUtil.java | 4 +- .../ljsd/jieling/logic/hero/HeroLogic.java | 47 +- .../ljsd/jieling/thrift/idl/ArenaOfHero.java | 2 +- .../jieling/thrift/idl/CrossArenaManager.java | 418 ++++++++++++------ .../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 +- .../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 | 1 + .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/global/thrift/idl/InnerResult.java | 2 +- .../global/thrift/idl/RPCgTGRequestIFace.java | 2 +- .../ljsd/jieling/thrift/idl/ArenaOfHero.java | 2 +- .../jieling/thrift/idl/CrossArenaManager.java | 418 ++++++++++++------ .../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 +- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/world/thrift/idl/InnerResult.java | 2 +- .../world/thrift/idl/RPCgTwRequestIFace.java | 2 +- .../world/thrift/idl/RPCwTgRequestIFace.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 +- 47 files changed, 666 insertions(+), 306 deletions(-) diff --git a/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java b/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java index e38abf796..9b52ebd86 100644 --- a/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java +++ b/globalidserver/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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java b/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java index 79c457fdf..99f73adc6 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 8b3c1b419..042f33b4f 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 e38abf796..9b52ebd86 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 79c457fdf..99f73adc6 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 8b3c1b419..042f33b4f 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 1381180d3..786a1d25e 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -193,6 +193,8 @@ public class CoreService implements RPCRequestIFace.Iface { rpcArenaManager.setPokemonTeamMap(teamMap); rpcArenaManager.setGuildSkill(new HashMap<>(user.getGuildMyInfo().getGuildSkill())); rpcArenaManager.setTreeLevel(user.getPlayerInfoManager().getTreeLevel()); + //坐骑技能 + rpcArenaManager.setSkill(Arrays.asList(user.getPlayerInfoManager().getUserMountValidTime().keySet().toArray(new Integer[0]))); return rpcArenaManager; }catch (Exception e){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java index f268699e0..3786f422c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java @@ -715,14 +715,14 @@ public class FightUtil { int addforcerpc = crossArenaManager.getTotalForceByTeam().get(teamId); arenaRecord.getYxldDefForce().add(addforcerpc); arenaRecord.setAttackForce(arenaRecord.getAttackForce() + addforcerpc); - Collection seals = crossArenaManager.getSeals().values(); + //Collection seals = crossArenaManager.getSeals().values(); for (com.ljsd.jieling.thrift.idl.TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) { com.ljsd.jieling.thrift.idl.ArenaOfHero hero = crossArenaManager.getHeros().get(teamPosHeroInfo.getHeroId()); if (hero == null) { continue; } StringBuilder propertySb = new StringBuilder(); - String heroSkill = HeroLogic.getInstance().getCrossHeroSkillStr(seals, hero).toString(); + String heroSkill = HeroLogic.getInstance().getCrossHeroSkillStr(crossArenaManager, hero).toString(); Map attributeMap = crossArenaManager.getHeros().get(hero.getId()).getAttributeMapByTeam().get(teamId); String property = HeroLogic.getInstance().getHeroPropertyBuilder(propertySb, hero.getTemplateId(), hero.getLevel(), attributeMap).toString(); CommonProto.FightUnitInfo heroFightInfo = CommonProto.FightUnitInfo 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 cfa485eb3..288e8e52a 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 @@ -2061,7 +2061,7 @@ public class HeroLogic{ return sb; } - public StringBuilder getCrossHeroSkillStr(Collection seals, com.ljsd.jieling.thrift.idl.ArenaOfHero hero){ + public StringBuilder getCrossHeroSkillStr(CrossArenaManager crossArenaManager, com.ljsd.jieling.thrift.idl.ArenaOfHero hero){ List skillList = new ArrayList<>(); SCHero tempHero = SCHero.getsCHero().get(hero.getTemplateId()); @@ -2100,6 +2100,7 @@ public class HeroLogic{ // 紫府神印技能 //Collection seals = user.getHeroManager().getPurpleMansionSeal().values(); + Collection seals = crossArenaManager.getSeals().values(); seals.forEach(v->{ // 使用中神印 if (v.getState() == 1){ @@ -2115,6 +2116,50 @@ public class HeroLogic{ } } }); + // 坐骑技能 + for(int skill : crossArenaManager.getSkill()){ + if(!SPlayerHeadIcon.getHeadIconMap().containsKey(skill)){ + continue; + } + SPlayerHeadIcon sPlayerHeadIcon = SPlayerHeadIcon.getHeadIconMap().get(skill); + if (sPlayerHeadIcon.getSkill() == null || sPlayerHeadIcon.getSkill().length <= 0){ + continue; + } + skillList.add(sPlayerHeadIcon.getSkill()[0][0]); + //sb.append(sPlayerHeadIcon.getSkill()[0][0]).append(DIVISION); + } + + Iterator> iterator = hero.getEquipByPositionMap().entrySet().iterator(); + // 套装list初始化 + ArrayList suiteNumList = new ArrayList<>(); + while (iterator.hasNext()){ + Map.Entry next = iterator.next(); + SEquipConfig sEquipConfig = STableManager.getConfig(SEquipConfig.class).get(next.getValue()); + // 添加到套装list + suiteNumList.add(sEquipConfig); + } + Collections.sort(suiteNumList); + // 记录当前长度(位置) + int num = suiteNumList.size(); + if (!suiteNumList.isEmpty()){ + // 遍历套装list + for (SEquipConfig item : suiteNumList) { + //根据星级读取配置表,为空表示不是套装 + SEquipSuiteConfig sEquipSuiteConfig =SEquipSuiteConfig.config.get(item.getStar()); + if (null != sEquipSuiteConfig){ + // 根据套装数量读表,为空标是套装数量不足 + Integer integer = sEquipSuiteConfig.getSuiteSkills().get(num); + if (integer == null) { + num-=1; + continue; + } + skillList.add(integer); + //sb.append(integer).append(DIVISION); + } + // 不管是否是套装,都要-1 + num-=1; + } + } StringBuilder sb = new StringBuilder(); coverSkill(skillList); 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 1f6926687..b4ee06530 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 9a3b74006..134b7bb49 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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"); @@ -49,6 +49,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -67,6 +68,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase guildSkill; // optional public Map pokemonTeamMap; // optional public int treeLevel; // optional + public List skill; // 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 { @@ -80,7 +82,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase byName = new HashMap(); @@ -117,6 +120,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); @@ -204,6 +209,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase __this__skill = new ArrayList(other.skill); + this.skill = __this__skill; + } } public CrossArenaManager deepCopy() { @@ -331,6 +343,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase getSkillIterator() { + return (this.skill == null) ? null : this.skill.iterator(); + } + + public void addToSkill(int elem) { + if (this.skill == null) { + this.skill = new ArrayList(); + } + this.skill.add(elem); + } + + public List getSkill() { + return this.skill; + } + + public CrossArenaManager setSkill(List skill) { + this.skill = skill; + return this; + } + + public void unsetSkill() { + this.skill = null; + } + + /** Returns true if field skill is set (has been assigned a value) and false otherwise */ + public boolean isSetSkill() { + return this.skill != null; + } + + public void setSkillIsSet(boolean value) { + if (!value) { + this.skill = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case TEAMS: @@ -772,6 +824,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase)value); + } + break; + } } @@ -810,6 +870,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list121.size); + int _elem122; + for (int _i123 = 0; _i123 < _list121.size; ++_i123) + { + _elem122 = iprot.readI32(); + struct.skill.add(_elem122); + } + iprot.readListEnd(); + } + struct.setSkillIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1523,14 +1640,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter121 : struct.teams.entrySet()) + for (Map.Entry> _iter124 : struct.teams.entrySet()) { - oprot.writeI32(_iter121.getKey()); + oprot.writeI32(_iter124.getKey()); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter121.getValue().size())); - for (TeamPosHeroInfo _iter122 : _iter121.getValue()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter124.getValue().size())); + for (TeamPosHeroInfo _iter125 : _iter124.getValue()) { - _iter122.write(oprot); + _iter125.write(oprot); } oprot.writeListEnd(); } @@ -1545,10 +1662,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter123 : struct.heros.entrySet()) + for (Map.Entry _iter126 : struct.heros.entrySet()) { - oprot.writeString(_iter123.getKey()); - _iter123.getValue().write(oprot); + oprot.writeString(_iter126.getKey()); + _iter126.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1560,10 +1677,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter124 : struct.jewels.entrySet()) + for (Map.Entry _iter127 : struct.jewels.entrySet()) { - oprot.writeString(_iter124.getKey()); - _iter124.getValue().write(oprot); + oprot.writeString(_iter127.getKey()); + _iter127.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1575,10 +1692,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter125 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter128 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter125.getKey()); - oprot.writeI32(_iter125.getValue()); + oprot.writeI32(_iter128.getKey()); + oprot.writeI32(_iter128.getValue()); } oprot.writeMapEnd(); } @@ -1600,10 +1717,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter126 : struct.pokemons.entrySet()) + for (Map.Entry _iter129 : struct.pokemons.entrySet()) { - oprot.writeString(_iter126.getKey()); - _iter126.getValue().write(oprot); + oprot.writeString(_iter129.getKey()); + _iter129.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1615,10 +1732,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter127 : struct.seals.entrySet()) + for (Map.Entry _iter130 : struct.seals.entrySet()) { - oprot.writeI32(_iter127.getKey()); - _iter127.getValue().write(oprot); + oprot.writeI32(_iter130.getKey()); + _iter130.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1630,10 +1747,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter128 : struct.guildSkill.entrySet()) + for (Map.Entry _iter131 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter128.getKey()); - oprot.writeI32(_iter128.getValue()); + oprot.writeI32(_iter131.getKey()); + oprot.writeI32(_iter131.getValue()); } oprot.writeMapEnd(); } @@ -1645,10 +1762,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter129 : struct.pokemonTeamMap.entrySet()) + for (Map.Entry _iter132 : struct.pokemonTeamMap.entrySet()) { - oprot.writeI32(_iter129.getKey()); - oprot.writeString(_iter129.getValue()); + oprot.writeI32(_iter132.getKey()); + oprot.writeString(_iter132.getValue()); } oprot.writeMapEnd(); } @@ -1660,6 +1777,20 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter130 : struct.teams.entrySet()) + for (Map.Entry> _iter134 : struct.teams.entrySet()) { - oprot.writeI32(_iter130.getKey()); + oprot.writeI32(_iter134.getKey()); { - oprot.writeI32(_iter130.getValue().size()); - for (TeamPosHeroInfo _iter131 : _iter130.getValue()) + oprot.writeI32(_iter134.getValue().size()); + for (TeamPosHeroInfo _iter135 : _iter134.getValue()) { - _iter131.write(oprot); + _iter135.write(oprot); } } } @@ -1731,30 +1865,30 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter132 : struct.heros.entrySet()) + for (Map.Entry _iter136 : struct.heros.entrySet()) { - oprot.writeString(_iter132.getKey()); - _iter132.getValue().write(oprot); + oprot.writeString(_iter136.getKey()); + _iter136.getValue().write(oprot); } } } if (struct.isSetJewels()) { { oprot.writeI32(struct.jewels.size()); - for (Map.Entry _iter133 : struct.jewels.entrySet()) + for (Map.Entry _iter137 : struct.jewels.entrySet()) { - oprot.writeString(_iter133.getKey()); - _iter133.getValue().write(oprot); + oprot.writeString(_iter137.getKey()); + _iter137.getValue().write(oprot); } } } if (struct.isSetTotalForceByTeam()) { { oprot.writeI32(struct.totalForceByTeam.size()); - for (Map.Entry _iter134 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter138 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter134.getKey()); - oprot.writeI32(_iter134.getValue()); + oprot.writeI32(_iter138.getKey()); + oprot.writeI32(_iter138.getValue()); } } } @@ -1767,120 +1901,129 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter135 : struct.pokemons.entrySet()) + for (Map.Entry _iter139 : struct.pokemons.entrySet()) { - oprot.writeString(_iter135.getKey()); - _iter135.getValue().write(oprot); + oprot.writeString(_iter139.getKey()); + _iter139.getValue().write(oprot); } } } if (struct.isSetSeals()) { { oprot.writeI32(struct.seals.size()); - for (Map.Entry _iter136 : struct.seals.entrySet()) + for (Map.Entry _iter140 : struct.seals.entrySet()) { - oprot.writeI32(_iter136.getKey()); - _iter136.getValue().write(oprot); + oprot.writeI32(_iter140.getKey()); + _iter140.getValue().write(oprot); } } } if (struct.isSetGuildSkill()) { { oprot.writeI32(struct.guildSkill.size()); - for (Map.Entry _iter137 : struct.guildSkill.entrySet()) + for (Map.Entry _iter141 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter137.getKey()); - oprot.writeI32(_iter137.getValue()); + oprot.writeI32(_iter141.getKey()); + oprot.writeI32(_iter141.getValue()); } } } if (struct.isSetPokemonTeamMap()) { { oprot.writeI32(struct.pokemonTeamMap.size()); - for (Map.Entry _iter138 : struct.pokemonTeamMap.entrySet()) + for (Map.Entry _iter142 : struct.pokemonTeamMap.entrySet()) { - oprot.writeI32(_iter138.getKey()); - oprot.writeString(_iter138.getValue()); + oprot.writeI32(_iter142.getKey()); + oprot.writeString(_iter142.getValue()); } } } if (struct.isSetTreeLevel()) { oprot.writeI32(struct.treeLevel); } + if (struct.isSetSkill()) { + { + oprot.writeI32(struct.skill.size()); + for (int _iter143 : struct.skill) + { + oprot.writeI32(_iter143); + } + } + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, CrossArenaManager struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(11); + BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { { - 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) + org.apache.thrift.protocol.TMap _map144 = 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*_map144.size); + int _key145; + List _val146; + for (int _i147 = 0; _i147 < _map144.size; ++_i147) { - _key140 = iprot.readI32(); + _key145 = iprot.readI32(); { - 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) + org.apache.thrift.protocol.TList _list148 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + _val146 = new ArrayList(_list148.size); + TeamPosHeroInfo _elem149; + for (int _i150 = 0; _i150 < _list148.size; ++_i150) { - _elem144 = new TeamPosHeroInfo(); - _elem144.read(iprot); - _val141.add(_elem144); + _elem149 = new TeamPosHeroInfo(); + _elem149.read(iprot); + _val146.add(_elem149); } } - struct.teams.put(_key140, _val141); + struct.teams.put(_key145, _val146); } } struct.setTeamsIsSet(true); } if (incoming.get(1)) { { - 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) + org.apache.thrift.protocol.TMap _map151 = 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*_map151.size); + String _key152; + ArenaOfHero _val153; + for (int _i154 = 0; _i154 < _map151.size; ++_i154) { - _key147 = iprot.readString(); - _val148 = new ArenaOfHero(); - _val148.read(iprot); - struct.heros.put(_key147, _val148); + _key152 = iprot.readString(); + _val153 = new ArenaOfHero(); + _val153.read(iprot); + struct.heros.put(_key152, _val153); } } struct.setHerosIsSet(true); } if (incoming.get(2)) { { - 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) + org.apache.thrift.protocol.TMap _map155 = 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*_map155.size); + String _key156; + PropertyItem _val157; + for (int _i158 = 0; _i158 < _map155.size; ++_i158) { - _key151 = iprot.readString(); - _val152 = new PropertyItem(); - _val152.read(iprot); - struct.jewels.put(_key151, _val152); + _key156 = iprot.readString(); + _val157 = new PropertyItem(); + _val157.read(iprot); + struct.jewels.put(_key156, _val157); } } struct.setJewelsIsSet(true); } if (incoming.get(3)) { { - 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) + org.apache.thrift.protocol.TMap _map159 = 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*_map159.size); + int _key160; + int _val161; + for (int _i162 = 0; _i162 < _map159.size; ++_i162) { - _key155 = iprot.readI32(); - _val156 = iprot.readI32(); - struct.totalForceByTeam.put(_key155, _val156); + _key160 = iprot.readI32(); + _val161 = iprot.readI32(); + struct.totalForceByTeam.put(_key160, _val161); } } struct.setTotalForceByTeamIsSet(true); @@ -1895,62 +2038,62 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map158.size); - String _key159; - Pokemon _val160; - for (int _i161 = 0; _i161 < _map158.size; ++_i161) + org.apache.thrift.protocol.TMap _map163 = 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*_map163.size); + String _key164; + Pokemon _val165; + for (int _i166 = 0; _i166 < _map163.size; ++_i166) { - _key159 = iprot.readString(); - _val160 = new Pokemon(); - _val160.read(iprot); - struct.pokemons.put(_key159, _val160); + _key164 = iprot.readString(); + _val165 = new Pokemon(); + _val165.read(iprot); + struct.pokemons.put(_key164, _val165); } } struct.setPokemonsIsSet(true); } if (incoming.get(7)) { { - 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) + org.apache.thrift.protocol.TMap _map167 = 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*_map167.size); + int _key168; + PurpleMansionSeal _val169; + for (int _i170 = 0; _i170 < _map167.size; ++_i170) { - _key163 = iprot.readI32(); - _val164 = new PurpleMansionSeal(); - _val164.read(iprot); - struct.seals.put(_key163, _val164); + _key168 = iprot.readI32(); + _val169 = new PurpleMansionSeal(); + _val169.read(iprot); + struct.seals.put(_key168, _val169); } } struct.setSealsIsSet(true); } if (incoming.get(8)) { { - 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) + org.apache.thrift.protocol.TMap _map171 = 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*_map171.size); + int _key172; + int _val173; + for (int _i174 = 0; _i174 < _map171.size; ++_i174) { - _key167 = iprot.readI32(); - _val168 = iprot.readI32(); - struct.guildSkill.put(_key167, _val168); + _key172 = iprot.readI32(); + _val173 = iprot.readI32(); + struct.guildSkill.put(_key172, _val173); } } 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) + org.apache.thrift.protocol.TMap _map175 = 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*_map175.size); + int _key176; + String _val177; + for (int _i178 = 0; _i178 < _map175.size; ++_i178) { - _key171 = iprot.readI32(); - _val172 = iprot.readString(); - struct.pokemonTeamMap.put(_key171, _val172); + _key176 = iprot.readI32(); + _val177 = iprot.readString(); + struct.pokemonTeamMap.put(_key176, _val177); } } struct.setPokemonTeamMapIsSet(true); @@ -1959,6 +2102,19 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list179.size); + int _elem180; + for (int _i181 = 0; _i181 < _list179.size; ++_i181) + { + _elem180 = iprot.readI32(); + struct.skill.add(_elem180); + } + } + struct.setSkillIsSet(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 35f489cb5..1f02c2ffd 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 b0f93196a..599fc7db7 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 a8bf86891..507f71384 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 b151969b0..72f808430 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 ab36564bb..44add01b2 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 eb2cd0590..c36bb6790 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 175f82fb4..bb9fc3234 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 69207afbb..ce6541baa 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 40d704eb1..dd127d855 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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/world/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java index 02ab7ef3a..86a2107ad 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 0fba552b2..e1c7fa73e 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 ae4f856bf..fbd278ec9 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 e90aeb28f..1376beb0c 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 735194a44..7c87ba254 100644 --- a/serverlogic/src/main/thrift/idl/core.thrift +++ b/serverlogic/src/main/thrift/idl/core.thrift @@ -86,6 +86,7 @@ struct CrossArenaManager{ 9:optional map guildSkill; 10:optional map pokemonTeamMap; 11:optional i32 treeLevel; + 12:optional list skill;//坐骑的技能id } diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java index e38abf796..9b52ebd86 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/thrift/idl/gen-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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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/global/thrift/idl/InnerResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java index 79c457fdf..99f73adc6 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/thrift/idl/gen-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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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/global/thrift/idl/RPCgTGRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java index 8b3c1b419..042f33b4f 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") public class RPCgTGRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java index 1f6926687..b4ee06530 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java +++ b/serverlogic/src/main/thrift/idl/gen-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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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/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 9a3b74006..134b7bb49 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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"); @@ -49,6 +49,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -67,6 +68,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase guildSkill; // optional public Map pokemonTeamMap; // optional public int treeLevel; // optional + public List skill; // 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 { @@ -80,7 +82,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase byName = new HashMap(); @@ -117,6 +120,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); @@ -204,6 +209,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase __this__skill = new ArrayList(other.skill); + this.skill = __this__skill; + } } public CrossArenaManager deepCopy() { @@ -331,6 +343,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase getSkillIterator() { + return (this.skill == null) ? null : this.skill.iterator(); + } + + public void addToSkill(int elem) { + if (this.skill == null) { + this.skill = new ArrayList(); + } + this.skill.add(elem); + } + + public List getSkill() { + return this.skill; + } + + public CrossArenaManager setSkill(List skill) { + this.skill = skill; + return this; + } + + public void unsetSkill() { + this.skill = null; + } + + /** Returns true if field skill is set (has been assigned a value) and false otherwise */ + public boolean isSetSkill() { + return this.skill != null; + } + + public void setSkillIsSet(boolean value) { + if (!value) { + this.skill = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case TEAMS: @@ -772,6 +824,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase)value); + } + break; + } } @@ -810,6 +870,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list121.size); + int _elem122; + for (int _i123 = 0; _i123 < _list121.size; ++_i123) + { + _elem122 = iprot.readI32(); + struct.skill.add(_elem122); + } + iprot.readListEnd(); + } + struct.setSkillIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1523,14 +1640,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter121 : struct.teams.entrySet()) + for (Map.Entry> _iter124 : struct.teams.entrySet()) { - oprot.writeI32(_iter121.getKey()); + oprot.writeI32(_iter124.getKey()); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter121.getValue().size())); - for (TeamPosHeroInfo _iter122 : _iter121.getValue()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter124.getValue().size())); + for (TeamPosHeroInfo _iter125 : _iter124.getValue()) { - _iter122.write(oprot); + _iter125.write(oprot); } oprot.writeListEnd(); } @@ -1545,10 +1662,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter123 : struct.heros.entrySet()) + for (Map.Entry _iter126 : struct.heros.entrySet()) { - oprot.writeString(_iter123.getKey()); - _iter123.getValue().write(oprot); + oprot.writeString(_iter126.getKey()); + _iter126.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1560,10 +1677,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter124 : struct.jewels.entrySet()) + for (Map.Entry _iter127 : struct.jewels.entrySet()) { - oprot.writeString(_iter124.getKey()); - _iter124.getValue().write(oprot); + oprot.writeString(_iter127.getKey()); + _iter127.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1575,10 +1692,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter125 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter128 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter125.getKey()); - oprot.writeI32(_iter125.getValue()); + oprot.writeI32(_iter128.getKey()); + oprot.writeI32(_iter128.getValue()); } oprot.writeMapEnd(); } @@ -1600,10 +1717,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter126 : struct.pokemons.entrySet()) + for (Map.Entry _iter129 : struct.pokemons.entrySet()) { - oprot.writeString(_iter126.getKey()); - _iter126.getValue().write(oprot); + oprot.writeString(_iter129.getKey()); + _iter129.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1615,10 +1732,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter127 : struct.seals.entrySet()) + for (Map.Entry _iter130 : struct.seals.entrySet()) { - oprot.writeI32(_iter127.getKey()); - _iter127.getValue().write(oprot); + oprot.writeI32(_iter130.getKey()); + _iter130.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1630,10 +1747,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter128 : struct.guildSkill.entrySet()) + for (Map.Entry _iter131 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter128.getKey()); - oprot.writeI32(_iter128.getValue()); + oprot.writeI32(_iter131.getKey()); + oprot.writeI32(_iter131.getValue()); } oprot.writeMapEnd(); } @@ -1645,10 +1762,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter129 : struct.pokemonTeamMap.entrySet()) + for (Map.Entry _iter132 : struct.pokemonTeamMap.entrySet()) { - oprot.writeI32(_iter129.getKey()); - oprot.writeString(_iter129.getValue()); + oprot.writeI32(_iter132.getKey()); + oprot.writeString(_iter132.getValue()); } oprot.writeMapEnd(); } @@ -1660,6 +1777,20 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter130 : struct.teams.entrySet()) + for (Map.Entry> _iter134 : struct.teams.entrySet()) { - oprot.writeI32(_iter130.getKey()); + oprot.writeI32(_iter134.getKey()); { - oprot.writeI32(_iter130.getValue().size()); - for (TeamPosHeroInfo _iter131 : _iter130.getValue()) + oprot.writeI32(_iter134.getValue().size()); + for (TeamPosHeroInfo _iter135 : _iter134.getValue()) { - _iter131.write(oprot); + _iter135.write(oprot); } } } @@ -1731,30 +1865,30 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter132 : struct.heros.entrySet()) + for (Map.Entry _iter136 : struct.heros.entrySet()) { - oprot.writeString(_iter132.getKey()); - _iter132.getValue().write(oprot); + oprot.writeString(_iter136.getKey()); + _iter136.getValue().write(oprot); } } } if (struct.isSetJewels()) { { oprot.writeI32(struct.jewels.size()); - for (Map.Entry _iter133 : struct.jewels.entrySet()) + for (Map.Entry _iter137 : struct.jewels.entrySet()) { - oprot.writeString(_iter133.getKey()); - _iter133.getValue().write(oprot); + oprot.writeString(_iter137.getKey()); + _iter137.getValue().write(oprot); } } } if (struct.isSetTotalForceByTeam()) { { oprot.writeI32(struct.totalForceByTeam.size()); - for (Map.Entry _iter134 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter138 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter134.getKey()); - oprot.writeI32(_iter134.getValue()); + oprot.writeI32(_iter138.getKey()); + oprot.writeI32(_iter138.getValue()); } } } @@ -1767,120 +1901,129 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter135 : struct.pokemons.entrySet()) + for (Map.Entry _iter139 : struct.pokemons.entrySet()) { - oprot.writeString(_iter135.getKey()); - _iter135.getValue().write(oprot); + oprot.writeString(_iter139.getKey()); + _iter139.getValue().write(oprot); } } } if (struct.isSetSeals()) { { oprot.writeI32(struct.seals.size()); - for (Map.Entry _iter136 : struct.seals.entrySet()) + for (Map.Entry _iter140 : struct.seals.entrySet()) { - oprot.writeI32(_iter136.getKey()); - _iter136.getValue().write(oprot); + oprot.writeI32(_iter140.getKey()); + _iter140.getValue().write(oprot); } } } if (struct.isSetGuildSkill()) { { oprot.writeI32(struct.guildSkill.size()); - for (Map.Entry _iter137 : struct.guildSkill.entrySet()) + for (Map.Entry _iter141 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter137.getKey()); - oprot.writeI32(_iter137.getValue()); + oprot.writeI32(_iter141.getKey()); + oprot.writeI32(_iter141.getValue()); } } } if (struct.isSetPokemonTeamMap()) { { oprot.writeI32(struct.pokemonTeamMap.size()); - for (Map.Entry _iter138 : struct.pokemonTeamMap.entrySet()) + for (Map.Entry _iter142 : struct.pokemonTeamMap.entrySet()) { - oprot.writeI32(_iter138.getKey()); - oprot.writeString(_iter138.getValue()); + oprot.writeI32(_iter142.getKey()); + oprot.writeString(_iter142.getValue()); } } } if (struct.isSetTreeLevel()) { oprot.writeI32(struct.treeLevel); } + if (struct.isSetSkill()) { + { + oprot.writeI32(struct.skill.size()); + for (int _iter143 : struct.skill) + { + oprot.writeI32(_iter143); + } + } + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, CrossArenaManager struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(11); + BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { { - 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) + org.apache.thrift.protocol.TMap _map144 = 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*_map144.size); + int _key145; + List _val146; + for (int _i147 = 0; _i147 < _map144.size; ++_i147) { - _key140 = iprot.readI32(); + _key145 = iprot.readI32(); { - 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) + org.apache.thrift.protocol.TList _list148 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + _val146 = new ArrayList(_list148.size); + TeamPosHeroInfo _elem149; + for (int _i150 = 0; _i150 < _list148.size; ++_i150) { - _elem144 = new TeamPosHeroInfo(); - _elem144.read(iprot); - _val141.add(_elem144); + _elem149 = new TeamPosHeroInfo(); + _elem149.read(iprot); + _val146.add(_elem149); } } - struct.teams.put(_key140, _val141); + struct.teams.put(_key145, _val146); } } struct.setTeamsIsSet(true); } if (incoming.get(1)) { { - 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) + org.apache.thrift.protocol.TMap _map151 = 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*_map151.size); + String _key152; + ArenaOfHero _val153; + for (int _i154 = 0; _i154 < _map151.size; ++_i154) { - _key147 = iprot.readString(); - _val148 = new ArenaOfHero(); - _val148.read(iprot); - struct.heros.put(_key147, _val148); + _key152 = iprot.readString(); + _val153 = new ArenaOfHero(); + _val153.read(iprot); + struct.heros.put(_key152, _val153); } } struct.setHerosIsSet(true); } if (incoming.get(2)) { { - 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) + org.apache.thrift.protocol.TMap _map155 = 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*_map155.size); + String _key156; + PropertyItem _val157; + for (int _i158 = 0; _i158 < _map155.size; ++_i158) { - _key151 = iprot.readString(); - _val152 = new PropertyItem(); - _val152.read(iprot); - struct.jewels.put(_key151, _val152); + _key156 = iprot.readString(); + _val157 = new PropertyItem(); + _val157.read(iprot); + struct.jewels.put(_key156, _val157); } } struct.setJewelsIsSet(true); } if (incoming.get(3)) { { - 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) + org.apache.thrift.protocol.TMap _map159 = 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*_map159.size); + int _key160; + int _val161; + for (int _i162 = 0; _i162 < _map159.size; ++_i162) { - _key155 = iprot.readI32(); - _val156 = iprot.readI32(); - struct.totalForceByTeam.put(_key155, _val156); + _key160 = iprot.readI32(); + _val161 = iprot.readI32(); + struct.totalForceByTeam.put(_key160, _val161); } } struct.setTotalForceByTeamIsSet(true); @@ -1895,62 +2038,62 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map158.size); - String _key159; - Pokemon _val160; - for (int _i161 = 0; _i161 < _map158.size; ++_i161) + org.apache.thrift.protocol.TMap _map163 = 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*_map163.size); + String _key164; + Pokemon _val165; + for (int _i166 = 0; _i166 < _map163.size; ++_i166) { - _key159 = iprot.readString(); - _val160 = new Pokemon(); - _val160.read(iprot); - struct.pokemons.put(_key159, _val160); + _key164 = iprot.readString(); + _val165 = new Pokemon(); + _val165.read(iprot); + struct.pokemons.put(_key164, _val165); } } struct.setPokemonsIsSet(true); } if (incoming.get(7)) { { - 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) + org.apache.thrift.protocol.TMap _map167 = 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*_map167.size); + int _key168; + PurpleMansionSeal _val169; + for (int _i170 = 0; _i170 < _map167.size; ++_i170) { - _key163 = iprot.readI32(); - _val164 = new PurpleMansionSeal(); - _val164.read(iprot); - struct.seals.put(_key163, _val164); + _key168 = iprot.readI32(); + _val169 = new PurpleMansionSeal(); + _val169.read(iprot); + struct.seals.put(_key168, _val169); } } struct.setSealsIsSet(true); } if (incoming.get(8)) { { - 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) + org.apache.thrift.protocol.TMap _map171 = 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*_map171.size); + int _key172; + int _val173; + for (int _i174 = 0; _i174 < _map171.size; ++_i174) { - _key167 = iprot.readI32(); - _val168 = iprot.readI32(); - struct.guildSkill.put(_key167, _val168); + _key172 = iprot.readI32(); + _val173 = iprot.readI32(); + struct.guildSkill.put(_key172, _val173); } } 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) + org.apache.thrift.protocol.TMap _map175 = 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*_map175.size); + int _key176; + String _val177; + for (int _i178 = 0; _i178 < _map175.size; ++_i178) { - _key171 = iprot.readI32(); - _val172 = iprot.readString(); - struct.pokemonTeamMap.put(_key171, _val172); + _key176 = iprot.readI32(); + _val177 = iprot.readString(); + struct.pokemonTeamMap.put(_key176, _val177); } } struct.setPokemonTeamMapIsSet(true); @@ -1959,6 +2102,19 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list179.size); + int _elem180; + for (int _i181 = 0; _i181 < _list179.size; ++_i181) + { + _elem180 = iprot.readI32(); + struct.skill.add(_elem180); + } + } + struct.setSkillIsSet(true); + } } } diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java index 35f489cb5..1f02c2ffd 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java +++ b/serverlogic/src/main/thrift/idl/gen-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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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/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 b0f93196a..599fc7db7 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 a8bf86891..507f71384 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 b151969b0..72f808430 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 ab36564bb..44add01b2 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 eb2cd0590..c36bb6790 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 175f82fb4..bb9fc3234 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 69207afbb..ce6541baa 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 40d704eb1..dd127d855 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 02ab7ef3a..86a2107ad 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 0fba552b2..e1c7fa73e 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 ae4f856bf..fbd278ec9 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 e90aeb28f..1376beb0c 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") public class RPCwTgRequestIFace { public interface Iface { 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 02ab7ef3a..86a2107ad 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 0fba552b2..e1c7fa73e 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 ae4f856bf..fbd278ec9 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") 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 e90aeb28f..1376beb0c 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-10-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30") public class RPCwTgRequestIFace { public interface Iface {