diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index 266e9dbec..ddb65ce38 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -314,6 +314,7 @@ public class CoreService implements RPCRequestIFace.Iface { arenaOfHero.setStar(hero.getStar()); arenaOfHero.setEquipByPositionMap(new HashMap<>(hero.getEquipByHongmengPositionMap(heroManager))); arenaOfHero.setSoulEquipByPositionMap(new HashMap<>(hero.getSoulEquipByPositionMap())); + arenaOfHero.setGodSealByPositionMap(new HashMap<>(hero.getGodSealByPositionMap())); arenaOfHero.setBreakId(hero.getBreakIdByHongMeng(heroManager)); arenaOfHero.setStarBreakId(hero.getStarBreakId()); arenaOfHero.setCreateTime(hero.getCreateTime()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java index d0983b402..9126887f9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -396,4 +396,8 @@ public interface BIReason { int EXPLORE_EVENT_BOX =1238;//探索试炼宝箱 int EXPLORE_EVENT_MONSTER =1239;//探索兽潮 + int UPLOAD_GOD_SEAL =1240;//卸下神印 + int UP_GOD_SEAL =1241;//装备神印 + int MARGE_GOD_SEAL =1242;//合成神印 + } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java index 74fb8bde8..4a67582bd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java @@ -40,6 +40,9 @@ public interface GlobalItemType { int TRUMP_CHIP=30;//法宝碎片(法宝聚灵使用) int LIFE_STONE=31;//命石 int HOOK_PROP=32;//挂机奖励资源道具 + + int GOD_SEAL= 34;//神印 + //物品使用类型 int NO_USE = 0 ; //不使用 int RANDOM_USE = 1; // 随机使用 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 4e3bafb07..038e226d6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -266,7 +266,8 @@ public class GMRequestHandler extends BaseHandler{ int itemId = sItem.getId(); int itemType = sItem.getItemType(); int itemNum = 9999; - if(itemType == GlobalItemType.CARD ||itemType == GlobalItemType.EQUIP ||itemType == GlobalItemType.ESPECIAL_EQUIP||itemType==GlobalItemType.SOUL_MARK||itemType==GlobalItemType.JEWEL){ + if(itemType == GlobalItemType.CARD || itemType == GlobalItemType.EQUIP || itemType == GlobalItemType.ESPECIAL_EQUIP + || itemType==GlobalItemType.SOUL_MARK || itemType==GlobalItemType.JEWEL || itemType == GlobalItemType.GOD_SEAL){ itemNum =1; } gmDrop[i++] = new int[]{itemId,itemNum}; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulMergeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulMergeHandler.java index 2f2f826e9..1f89902d8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulMergeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulMergeHandler.java @@ -16,6 +16,6 @@ public class SoulMergeHandler extends BaseHandler { + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.UpGodSealRequest; + } + + @Override + public void processWithProto(ISession iSession, HeroInfoProto.UpGodSealRequest proto) throws Exception { + HeroLogic.getInstance().upGodSeal(iSession,proto.getItemId(),proto.getHeroId()); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/WearGodSealHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/WearGodSealHandler.java new file mode 100644 index 000000000..725721338 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/WearGodSealHandler.java @@ -0,0 +1,30 @@ +package com.ljsd.jieling.handler.equip; + +import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.hero.HeroLogic; +import com.ljsd.jieling.network.session.ISession; +import org.springframework.stereotype.Component; +import rpc.protocols.HeroInfoProto; +import rpc.protocols.MessageTypeProto; + +/** + * @author hj + * 穿戴神印 + */ +@Component +public class WearGodSealHandler extends BaseHandler { + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.WearGodSealRequest; + } + + @Override + public void processWithProto(ISession iSession, HeroInfoProto.WearGodSealRequest godSealRequest) throws Exception { + int type = godSealRequest.getType(); + HeroInfoProto.OptHeroSoul wearInfo = godSealRequest.getWearInfo(); + HeroLogic.getInstance().wearGodSeal(iSession,type,wearInfo); + + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java index 9ad43cd62..5e8f00119 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java @@ -31,6 +31,8 @@ public class Hero extends MongoBase implements Comparable,Cloneable { private Map soulEquipByPositionMap = new HashMap<>(); + private Map godSealByPositionMap = new HashMap<>(); + private int breakId; private int starBreakId; @@ -333,6 +335,20 @@ public class Hero extends MongoBase implements Comparable,Cloneable { this.soulEquipByPositionMap.remove(position); } + public Map getGodSealByPositionMap() { + return godSealByPositionMap; + } + + public void putGodSealByPositionMap(int position, int equipId) { + updateString("godSealByPositionMap." + position, equipId); + this.godSealByPositionMap.put(position, equipId); + } + + public void removeGodSeal(int position) { + removeString(getMongoKey() + ".godSealByPositionMap." + position); + this.godSealByPositionMap.remove(position); + } + /** * breaId 鸿蒙阵 * 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 01c9237d7..84786e166 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 @@ -30,7 +30,6 @@ import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.cross.CSPlayer; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.expedition.ExpeditionLogic; -import com.ljsd.jieling.logic.family.GuildDef; import com.ljsd.jieling.logic.fight.CombatLogic; import com.ljsd.jieling.logic.fight.passiveSkillCal.PassiveskillCalEnum; import com.ljsd.jieling.logic.help.HelpHero; @@ -2041,13 +2040,20 @@ public class HeroLogic { skillList.addAll(tempHero.getPassiveSkills(2, hero.getStarBreakId())); } + Map config = STableManager.getConfig(SEquipConfig.class); + //魂印 Map soulEquipByPositionMap = hero.getSoulEquipByPositionMap(); - Map config = STableManager.getConfig(SEquipConfig.class); soulEquipByPositionMap.values().forEach(e -> { Arrays.stream(config.get(e).getPassiveSkill()).forEach(skillList::add); }); + //神印 + Map godSealByPositionMap = hero.getGodSealByPositionMap(); + godSealByPositionMap.values().forEach(e -> { + Arrays.stream(config.get(e).getPassiveSkill()).forEach(skillList::add); + }); + //法宝技能 int[] equipTalismana = tempHero.getEquipTalismana(); if (equipTalismana.length >= 2 && hero.getStar() >= equipTalismana[0]) { @@ -2080,12 +2086,11 @@ public class HeroLogic { }); Iterator> iterator = hero.getEquipByHongmengPositionMap(user.getHeroManager()).entrySet().iterator(); - Map intensifyMap = user.getEquipManager().getEquipIntensifyMap(); // 套装list初始化 ArrayList suiteNumList = new ArrayList<>(); while (iterator.hasNext()) { Map.Entry next = iterator.next(); - SEquipConfig sEquipConfig = STableManager.getConfig(SEquipConfig.class).get(next.getValue()); + SEquipConfig sEquipConfig = config.get(next.getValue()); // 添加到套装list suiteNumList.add(sEquipConfig); } @@ -2181,13 +2186,19 @@ public class HeroLogic { skillList.addAll(tempHero.getPassiveSkills(2, hero.getStarBreakId())); } + Map config = STableManager.getConfig(SEquipConfig.class); //魂印 Map soulEquipByPositionMap = hero.getSoulEquipByPositionMap(); - Map config = STableManager.getConfig(SEquipConfig.class); soulEquipByPositionMap.values().forEach(e -> { Arrays.stream(config.get(e).getPassiveSkill()).forEach(skillList::add); }); + //神印 + Map godSealByPositionMap = hero.getGodSealByPositionMap(); + godSealByPositionMap.values().forEach(e -> { + Arrays.stream(config.get(e).getPassiveSkill()).forEach(skillList::add); + }); + //法宝技能 int[] equipTalismana = tempHero.getEquipTalismana(); if (equipTalismana.length >= 1 && hero.getStar() >= equipTalismana[0]) { @@ -2886,9 +2897,10 @@ public class HeroLogic { int homeRankUp = user.getEquipManager().getEquipHomeRankUp(); // 套装list初始化 ArrayList suiteNumList = new ArrayList<>(); + Map equipConfigMap = STableManager.getConfig(SEquipConfig.class); while (iterator.hasNext()) { Map.Entry next = iterator.next(); - SEquipConfig sEquipConfig = STableManager.getConfig(SEquipConfig.class).get(next.getValue()); + SEquipConfig sEquipConfig = equipConfigMap.get(next.getValue()); int[][] property = sEquipConfig.getProperty(); Map propertyValueByIdMap = new HashMap<>(); for (int[] prop : property) { @@ -3061,10 +3073,21 @@ public class HeroLogic { combinedAttribute(config.get(buildLevelProperty).getProperty(), heroAllAttribute); } } + //魂印 Map soulEquipByPositionMap = hero.getSoulEquipByPositionMap(); soulEquipByPositionMap.forEach((k, v) -> { - SEquipConfig sEquipConfig = STableManager.getConfig(SEquipConfig.class).get(v); + SEquipConfig sEquipConfig = equipConfigMap.get(v); + int[][] property = sEquipConfig.getProperty(); + if (property != null && property.length > 0 && property[0].length > 0) { + combinedAttribute(property, heroAllAttribute); + } + }); + + //神印 + Map godSealByPositionMap = hero.getGodSealByPositionMap(); + godSealByPositionMap.forEach((k, v) -> { + SEquipConfig sEquipConfig = equipConfigMap.get(v); int[][] property = sEquipConfig.getProperty(); if (property != null && property.length > 0 && property[0].length > 0) { combinedAttribute(property, heroAllAttribute); @@ -4478,41 +4501,58 @@ public class HeroLogic { } - public static void mergeSoul(ISession session, int targetId, List soulIdList) throws Exception { - int uid = session.getUid(); - User user = UserManager.getUser(uid); - SEquipConfig sEquipConfig = STableManager.getConfig(SEquipConfig.class).get(targetId); - int[][] resource = sEquipConfig.getResource(); + /** + * 印章合成：魂印，神印 + * @param session + * @param targetId + * @param soulIdList + * @throws Exception + */ + public void margeSeal(ISession session, int targetId, List soulIdList) throws Exception { + User user = UserManager.getUser(session.getUid()); + Map config = STableManager.getConfig(SEquipConfig.class); + CommonProto.Drop.Builder dropBuilder; + dropBuilder = mergeSoul(user, targetId, soulIdList); + HeroInfoProto.MergeSoulResponse build = HeroInfoProto.MergeSoulResponse.newBuilder().setDrop(dropBuilder).build(); + MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.SOUL_MERGE_RESPONSE_VALUE, build, true); + ReportUtil.onReportEvent(user, ReportEventEnum.FATALITY_SYNTHESIS.getType(), targetId, "", soulIdList); + } + /** + * 合成魂印 + * @param user + * @param targetId + * @param soulIdList + * @return + * @throws Exception + */ + public CommonProto.Drop.Builder mergeSoul(User user, int targetId, List soulIdList) throws Exception { + Map config = STableManager.getConfig(SEquipConfig.class); + SEquipConfig sEquipConfig = config.get(targetId); + int[][] resource = sEquipConfig.getResource(); Map itemTemplateCost = new HashMap<>(); Map itemReallyCost = new HashMap<>(); soulIdList.forEach(e -> { - - itemTemplateCost.put(STableManager.getConfig(SEquipConfig.class).get(e).getQuality(), itemTemplateCost.getOrDefault(STableManager.getConfig(SEquipConfig.class).get(e).getQuality(), 0) + 1); + itemTemplateCost.put(config.get(e).getQuality(), itemTemplateCost.getOrDefault(config.get(e).getQuality(), 0) + 1); itemReallyCost.put(e, itemReallyCost.getOrDefault(e, 0) + 1); }); Arrays.stream(resource).forEach(item -> { itemReallyCost.put(item[0], itemReallyCost.getOrDefault(item[0], 0) + item[1]); }); + int[][] formula = sEquipConfig.getFormula(); for (int[] item : formula) { if (itemTemplateCost.getOrDefault(item[0], 0) != item[1]) { throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } } + boolean b = ItemUtil.itemCost(user, itemReallyCost, BIReason.SOUL_EQUIP_MERGE_CONSUME, targetId); if (!b) { throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } - int[][] drop = new int[1][]; - drop[0] = new int[2]; - drop[0][0] = targetId; - drop[0][1] = 1; - CommonProto.Drop.Builder dropBuilder = ItemUtil.drop(user, drop, 1); - - HeroInfoProto.MergeSoulResponse build = HeroInfoProto.MergeSoulResponse.newBuilder().setDrop(dropBuilder).build(); - MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.SOUL_MERGE_RESPONSE_VALUE, build, true); - ReportUtil.onReportEvent(user, ReportEventEnum.FATALITY_SYNTHESIS.getType(), targetId, "", soulIdList); + int[][] drop = new int[][]{{targetId,1}}; + return ItemUtil.drop(user, drop, 1); } public static void unloadSoulEquipOpt(ISession iSession, String heroId, List equipIdsList) throws Exception { @@ -6148,4 +6188,234 @@ public class HeroLogic { } return skillList; } + + /** + * 穿戴神印 + * @param iSession + * @param type 0：卸下，1：戴上 + * @param optHeroSoul + */ + public void wearGodSeal(ISession iSession, int type, HeroInfoProto.OptHeroSoul optHeroSoul) throws Exception { + User user = UserManager.getUser(iSession.getUid()); + String heroId = optHeroSoul.getHeroId(); + HeroManager heroManager = user.getHeroManager(); + Hero hero = heroManager.getHero(heroId); + if (hero == null){ + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"英雄不存在"); + } + // 英雄身上的神印 + Map godSealByHero = hero.getGodSealByPositionMap(); + // 客户端传来的神印 + List godSealByOpt = optHeroSoul.getSoulEquipIdsList(); + + CommonProto.Drop.Builder drop = CommonProto.Drop.newBuilder(); + + // 卸下魂印 + if (type == 0){ + ArrayList list = new ArrayList<>(); + // 先循环验证 + for (HeroInfoProto.SoulEquipPos pos : godSealByOpt) { + if (godSealByHero.get(pos.getPosition()) == null || godSealByHero.get(pos.getPosition()) == 0){ + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"位置不存在神印："+pos.getPosition()); + } + } + for (HeroInfoProto.SoulEquipPos pos : godSealByOpt) { + // 删除英雄身上的神印信息 + hero.removeGodSeal(pos.getPosition()); + // 卸下的神印需要放回物品背包 + list.add(new int[][]{{pos.getEquipId(),1}}); + } + ItemUtil.drop(user,list,BIReason.UPLOAD_GOD_SEAL); + } + + // 装备神印 + if (type == 1){ + int[] value = SSpecialConfig.getIntegerArrayValue(SSpecialConfig.GodSignOpenStar); + // 存放已解锁的位置id + ArrayList indexBox = new ArrayList<>(); + for (int i = 0; i < value.length; i++) { + if (hero.getStar() >= value[i]){ + indexBox.add(i+1); + } + } + Map configMap = STableManager.getConfig(SEquipConfig.class); + HashMap costMap = new HashMap<>(); + // 循环验证 + for (HeroInfoProto.SoulEquipPos pos : godSealByOpt) { + int position = pos.getPosition(); + int equipId = pos.getEquipId(); + if (!indexBox.contains(position)){ + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"位置未解锁："+position); + } + boolean profession = verifyProfessionByGodSeal(hero.getTemplateId(), equipId); + if (!profession){ + throw new ErrorCodeException(ErrorCode.HERO_UN_MATCH,"职业不满足条件："+equipId); + } + SEquipConfig equipConfig = configMap.get(equipId); + for (Integer godSealId : godSealByHero.values()) { + SEquipConfig equipConfig1 = configMap.get(godSealId); + if (equipConfig.getSuiteID() == equipConfig1.getSuiteID()){ + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"已装备相同种类的神印："+equipId); + } + if (equipConfig.getPosition() != 6){ + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"非神印不能安装："+equipId); + } + } + // 安装后需要从背包里消耗的装备id + costMap.put(equipId,1); + } + // 消耗 + boolean cost = ItemUtil.itemCost(user, costMap, BIReason.UP_GOD_SEAL, 0); + if (!cost){ + throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); + } + ArrayList list = new ArrayList<>(); + // 装备神印 + for (HeroInfoProto.SoulEquipPos pos : godSealByOpt) { + // 已装备的神印，放回背包 + if (godSealByHero.get(pos.getPosition()) != null){ + list.add(new int[][]{{pos.getEquipId(),1}}); + } + hero.putGodSealByPositionMap(pos.getPosition(),pos.getEquipId()); + } + drop = ItemUtil.drop(user, list, BIReason.UP_GOD_SEAL); + } + + if (isInTeam(user, heroId, 1)) { + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(user.getId())); + } + + HeroInfoProto.WearGodSealResponse.Builder builder = HeroInfoProto.WearGodSealResponse.newBuilder().setDrop(drop); + MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.WearGodSealResponse_VALUE, builder.build()); + } + + /** + * 合成神印 + * @param iSession + * @param ItemId + * @param heroId + * @return + * @throws Exception + */ + public void upGodSeal(ISession iSession, int ItemId, String heroId) throws Exception { + // 获取玩家参数 + User user = UserManager.getUser(iSession.getUid()); + // 升品神印参数 + Map config = STableManager.getConfig(SEquipConfig.class); + SEquipConfig sEquipConfig = config.get(ItemId); + // 升品消耗 + int[][] resource = sEquipConfig.getResource(); + + // 一些需要记录的参数 + int position = 0; + int targetId = sEquipConfig.getFormula()[0][0]; + Hero hero = null; + + // 英雄身上的神印升品 + if (!"".equals(heroId)){ + ArrayList list = new ArrayList<>(); + // hero信息 + hero = user.getHeroManager().getHero(heroId); + // hero godseal 信息 + Map godSealByPositionMap = hero.getGodSealByPositionMap(); + for (Map.Entry entry : godSealByPositionMap.entrySet()) { + if (entry.getValue() == ItemId){ + // 删除英雄身上的神印信息 + hero.removeGodSeal(entry.getKey()); + // 入背包 + list.add(new int[][]{{entry.getValue(),1}}); + // 记录神印位置 + position = entry.getKey(); + } + } + // 卸下的神印需要放回物品背包 + ItemUtil.drop(user,list,BIReason.MARGE_GOD_SEAL); + } + + // 验证道具消耗 + boolean b = ItemUtil.itemCost(user, resource, BIReason.MARGE_GOD_SEAL, 0); + if (!b) { + throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); + } + // 合成奖励放入背包 + CommonProto.Drop.Builder drop = ItemUtil.drop(user, sEquipConfig.getFormula(), BIReason.MARGE_GOD_SEAL); + // 原本是英雄身上的需要重新装备，并删除背包中的 + if (position != 0 && hero != null){ + // 给英雄重新装备上改id + hero.putGodSealByPositionMap(position,targetId); + // 删除背包里的神印 + ItemUtil.itemCost(user, sEquipConfig.getFormula(), BIReason.MARGE_GOD_SEAL,0); + } + + if (isInTeam(user, heroId, 1)) { + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(user.getId())); + } + + HeroInfoProto.UpGodSealResponse.Builder builder = HeroInfoProto.UpGodSealResponse.newBuilder().setDrop(drop); + MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.UpGodSealResponse_VALUE, builder.build()); + } + + /** + * 装备神印验证职业条件 + * @param heroId + * @param equipId + * @return + */ + private boolean verifyProfessionByGodSeal(int heroId,int equipId){ + // 默认值 + boolean result = false; + // 装备信息 + SEquipConfig equip = STableManager.getConfig(SEquipConfig.class).get(equipId); + // 英雄信息 + SCHero hero = SCHero.getsCHero().get(heroId); + if (equip == null || hero == null){ + LOGGER.error("装备神印，装备ID或者英雄ID错误，表内容查询失败,equip:{},hero:{}",equipId,heroId); + return result; + } + // 判断条件查表去 + switch (equip.getProfessionLimit()){ + case 0: + result = true; + break; + case 1: + if (hero.getProfession() == 1){ + result = true; + } + break; + case 2: + if (hero.getProfession() == 2){ + result = true; + } + break; + case 3: + if (hero.getProfession() == 4){ + result = true; + } + break; + case 4: + if (hero.getProfession() == 3){ + result = true; + } + break; + case 5: + if (hero.getJob() == 1){ + result = true; + } + break; + case 6: + if (hero.getJob() == 2){ + result = true; + } + break; + case 7: + if (hero.getProfession() == 2 || hero.getProfession() == 3){ + result = true; + } + break; + default: + break; + } + return result; + } + } 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 88ab6b923..558048af1 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 @@ -1278,7 +1278,7 @@ public class PlayerLogic { MessageUtil.sendMessage(session,1,resMsgId,builder.build(),true); } - public PlayerInfoProto.ViewHeroInfoResponse viewHeroInfo(int uid,String heroId,int teamId) throws Exception { + public PlayerInfoProto.ViewHeroInfoResponse viewHeroInfo(int uid,String heroId,int teamId) throws Exception { User userInMem = UserManager.getUserInMem(uid); if(userInMem == null){ throw new ErrorCodeException(ErrorCode.FRIENDS_USER_NULL); @@ -1358,11 +1358,16 @@ public class PlayerLogic { heroBuilder.addEquipIdList(equipId); builder.addEquip(CBean2Proto.getEquipProto(equipId,crossArenaManager.getHomeEquipLv())); } - // 法宝 + // 魂印 Map soulEquipByPositionMap = rpcHero.getSoulEquipByPositionMap(); for(Map.Entry entry: soulEquipByPositionMap.entrySet()){ heroBuilder.addSoulPos(CommonProto.SoulPos.newBuilder().setEquipId(entry.getValue()).setPosition(entry.getKey())); } + // 神印 + Map godSealByPositionMap = rpcHero.getGodSealByPositionMap(); + for(Map.Entry entry: godSealByPositionMap.entrySet()){ + heroBuilder.addGodSeals(CommonProto.SoulPos.newBuilder().setEquipId(entry.getValue()).setPosition(entry.getKey())); + } // 皮肤 heroBuilder.setSkinId(rpcHero.getSkin()); // 英雄技能 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 251addbc7..1652e9b80 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 @@ -2355,26 +2355,26 @@ public class CrossArenaManager implements org.apache.thrift.TBase>(2*_map114.size); - int _key115; - List _val116; - for (int _i117 = 0; _i117 < _map114.size; ++_i117) + org.apache.thrift.protocol.TMap _map124 = iprot.readMapBegin(); + struct.teams = new HashMap>(2*_map124.size); + int _key125; + List _val126; + for (int _i127 = 0; _i127 < _map124.size; ++_i127) { - _key115 = iprot.readI32(); + _key125 = iprot.readI32(); { - org.apache.thrift.protocol.TList _list118 = iprot.readListBegin(); - _val116 = new ArrayList(_list118.size); - TeamPosHeroInfo _elem119; - for (int _i120 = 0; _i120 < _list118.size; ++_i120) + org.apache.thrift.protocol.TList _list128 = iprot.readListBegin(); + _val126 = new ArrayList(_list128.size); + TeamPosHeroInfo _elem129; + for (int _i130 = 0; _i130 < _list128.size; ++_i130) { - _elem119 = new TeamPosHeroInfo(); - _elem119.read(iprot); - _val116.add(_elem119); + _elem129 = new TeamPosHeroInfo(); + _elem129.read(iprot); + _val126.add(_elem129); } iprot.readListEnd(); } - struct.teams.put(_key115, _val116); + struct.teams.put(_key125, _val126); } iprot.readMapEnd(); } @@ -2386,16 +2386,16 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map121.size); - String _key122; - ArenaOfHero _val123; - for (int _i124 = 0; _i124 < _map121.size; ++_i124) + org.apache.thrift.protocol.TMap _map131 = iprot.readMapBegin(); + struct.heros = new HashMap(2*_map131.size); + String _key132; + ArenaOfHero _val133; + for (int _i134 = 0; _i134 < _map131.size; ++_i134) { - _key122 = iprot.readString(); - _val123 = new ArenaOfHero(); - _val123.read(iprot); - struct.heros.put(_key122, _val123); + _key132 = iprot.readString(); + _val133 = new ArenaOfHero(); + _val133.read(iprot); + struct.heros.put(_key132, _val133); } iprot.readMapEnd(); } @@ -2407,16 +2407,16 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map125.size); - String _key126; - PropertyItem _val127; - for (int _i128 = 0; _i128 < _map125.size; ++_i128) + org.apache.thrift.protocol.TMap _map135 = iprot.readMapBegin(); + struct.jewels = new HashMap(2*_map135.size); + String _key136; + PropertyItem _val137; + for (int _i138 = 0; _i138 < _map135.size; ++_i138) { - _key126 = iprot.readString(); - _val127 = new PropertyItem(); - _val127.read(iprot); - struct.jewels.put(_key126, _val127); + _key136 = iprot.readString(); + _val137 = new PropertyItem(); + _val137.read(iprot); + struct.jewels.put(_key136, _val137); } iprot.readMapEnd(); } @@ -2428,15 +2428,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map129.size); - int _key130; - int _val131; - for (int _i132 = 0; _i132 < _map129.size; ++_i132) + org.apache.thrift.protocol.TMap _map139 = iprot.readMapBegin(); + struct.totalForceByTeam = new HashMap(2*_map139.size); + int _key140; + int _val141; + for (int _i142 = 0; _i142 < _map139.size; ++_i142) { - _key130 = iprot.readI32(); - _val131 = iprot.readI32(); - struct.totalForceByTeam.put(_key130, _val131); + _key140 = iprot.readI32(); + _val141 = iprot.readI32(); + struct.totalForceByTeam.put(_key140, _val141); } iprot.readMapEnd(); } @@ -2464,16 +2464,16 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map133.size); - String _key134; - Pokemon _val135; - for (int _i136 = 0; _i136 < _map133.size; ++_i136) + org.apache.thrift.protocol.TMap _map143 = iprot.readMapBegin(); + struct.pokemons = new HashMap(2*_map143.size); + String _key144; + Pokemon _val145; + for (int _i146 = 0; _i146 < _map143.size; ++_i146) { - _key134 = iprot.readString(); - _val135 = new Pokemon(); - _val135.read(iprot); - struct.pokemons.put(_key134, _val135); + _key144 = iprot.readString(); + _val145 = new Pokemon(); + _val145.read(iprot); + struct.pokemons.put(_key144, _val145); } iprot.readMapEnd(); } @@ -2485,16 +2485,16 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map137.size); - int _key138; - PurpleMansionSeal _val139; - for (int _i140 = 0; _i140 < _map137.size; ++_i140) + org.apache.thrift.protocol.TMap _map147 = iprot.readMapBegin(); + struct.seals = new HashMap(2*_map147.size); + int _key148; + PurpleMansionSeal _val149; + for (int _i150 = 0; _i150 < _map147.size; ++_i150) { - _key138 = iprot.readI32(); - _val139 = new PurpleMansionSeal(); - _val139.read(iprot); - struct.seals.put(_key138, _val139); + _key148 = iprot.readI32(); + _val149 = new PurpleMansionSeal(); + _val149.read(iprot); + struct.seals.put(_key148, _val149); } iprot.readMapEnd(); } @@ -2506,15 +2506,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map141.size); - int _key142; - int _val143; - for (int _i144 = 0; _i144 < _map141.size; ++_i144) + org.apache.thrift.protocol.TMap _map151 = iprot.readMapBegin(); + struct.guildSkill = new HashMap(2*_map151.size); + int _key152; + int _val153; + for (int _i154 = 0; _i154 < _map151.size; ++_i154) { - _key142 = iprot.readI32(); - _val143 = iprot.readI32(); - struct.guildSkill.put(_key142, _val143); + _key152 = iprot.readI32(); + _val153 = iprot.readI32(); + struct.guildSkill.put(_key152, _val153); } iprot.readMapEnd(); } @@ -2526,15 +2526,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map145.size); - int _key146; - String _val147; - for (int _i148 = 0; _i148 < _map145.size; ++_i148) + org.apache.thrift.protocol.TMap _map155 = iprot.readMapBegin(); + struct.pokemonTeamMap = new HashMap(2*_map155.size); + int _key156; + String _val157; + for (int _i158 = 0; _i158 < _map155.size; ++_i158) { - _key146 = iprot.readI32(); - _val147 = iprot.readString(); - struct.pokemonTeamMap.put(_key146, _val147); + _key156 = iprot.readI32(); + _val157 = iprot.readString(); + struct.pokemonTeamMap.put(_key156, _val157); } iprot.readMapEnd(); } @@ -2554,13 +2554,13 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list149.size); - int _elem150; - for (int _i151 = 0; _i151 < _list149.size; ++_i151) + org.apache.thrift.protocol.TList _list159 = iprot.readListBegin(); + struct.skill = new ArrayList(_list159.size); + int _elem160; + for (int _i161 = 0; _i161 < _list159.size; ++_i161) { - _elem150 = iprot.readI32(); - struct.skill.add(_elem150); + _elem160 = iprot.readI32(); + struct.skill.add(_elem160); } iprot.readListEnd(); } @@ -2580,15 +2580,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map152.size); - int _key153; - int _val154; - for (int _i155 = 0; _i155 < _map152.size; ++_i155) + org.apache.thrift.protocol.TMap _map162 = iprot.readMapBegin(); + struct.practiceSkillMap = new HashMap(2*_map162.size); + int _key163; + int _val164; + for (int _i165 = 0; _i165 < _map162.size; ++_i165) { - _key153 = iprot.readI32(); - _val154 = iprot.readI32(); - struct.practiceSkillMap.put(_key153, _val154); + _key163 = iprot.readI32(); + _val164 = iprot.readI32(); + struct.practiceSkillMap.put(_key163, _val164); } iprot.readMapEnd(); } @@ -2608,15 +2608,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map156.size); - int _key157; - int _val158; - for (int _i159 = 0; _i159 < _map156.size; ++_i159) + org.apache.thrift.protocol.TMap _map166 = iprot.readMapBegin(); + struct.faBaoGongMingSkillMap = new HashMap(2*_map166.size); + int _key167; + int _val168; + for (int _i169 = 0; _i169 < _map166.size; ++_i169) { - _key157 = iprot.readI32(); - _val158 = iprot.readI32(); - struct.faBaoGongMingSkillMap.put(_key157, _val158); + _key167 = iprot.readI32(); + _val168 = iprot.readI32(); + struct.faBaoGongMingSkillMap.put(_key167, _val168); } iprot.readMapEnd(); } @@ -2628,13 +2628,13 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list160.size); - int _elem161; - for (int _i162 = 0; _i162 < _list160.size; ++_i162) + org.apache.thrift.protocol.TList _list170 = iprot.readListBegin(); + struct.tfInfoList = new ArrayList(_list170.size); + int _elem171; + for (int _i172 = 0; _i172 < _list170.size; ++_i172) { - _elem161 = iprot.readI32(); - struct.tfInfoList.add(_elem161); + _elem171 = iprot.readI32(); + struct.tfInfoList.add(_elem171); } iprot.readListEnd(); } @@ -2646,15 +2646,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map163.size); - int _key164; - int _val165; - for (int _i166 = 0; _i166 < _map163.size; ++_i166) + org.apache.thrift.protocol.TMap _map173 = iprot.readMapBegin(); + struct.homeEquipLv = new HashMap(2*_map173.size); + int _key174; + int _val175; + for (int _i176 = 0; _i176 < _map173.size; ++_i176) { - _key164 = iprot.readI32(); - _val165 = iprot.readI32(); - struct.homeEquipLv.put(_key164, _val165); + _key174 = iprot.readI32(); + _val175 = iprot.readI32(); + struct.homeEquipLv.put(_key174, _val175); } iprot.readMapEnd(); } @@ -2666,14 +2666,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list167.size); - SixiangxinfaInfo _elem168; - for (int _i169 = 0; _i169 < _list167.size; ++_i169) + org.apache.thrift.protocol.TList _list177 = iprot.readListBegin(); + struct.sixiangInfos = new ArrayList(_list177.size); + SixiangxinfaInfo _elem178; + for (int _i179 = 0; _i179 < _list177.size; ++_i179) { - _elem168 = new SixiangxinfaInfo(); - _elem168.read(iprot); - struct.sixiangInfos.add(_elem168); + _elem178 = new SixiangxinfaInfo(); + _elem178.read(iprot); + struct.sixiangInfos.add(_elem178); } iprot.readListEnd(); } @@ -2685,14 +2685,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list170.size); - LifeGridInfo _elem171; - for (int _i172 = 0; _i172 < _list170.size; ++_i172) + org.apache.thrift.protocol.TList _list180 = iprot.readListBegin(); + struct.lifeGridInfos = new ArrayList(_list180.size); + LifeGridInfo _elem181; + for (int _i182 = 0; _i182 < _list180.size; ++_i182) { - _elem171 = new LifeGridInfo(); - _elem171.read(iprot); - struct.lifeGridInfos.add(_elem171); + _elem181 = new LifeGridInfo(); + _elem181.read(iprot); + struct.lifeGridInfos.add(_elem181); } iprot.readListEnd(); } @@ -2704,14 +2704,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list173.size); - UserMountInfo _elem174; - for (int _i175 = 0; _i175 < _list173.size; ++_i175) + org.apache.thrift.protocol.TList _list183 = iprot.readListBegin(); + struct.userMountValidTime = new ArrayList(_list183.size); + UserMountInfo _elem184; + for (int _i185 = 0; _i185 < _list183.size; ++_i185) { - _elem174 = new UserMountInfo(); - _elem174.read(iprot); - struct.userMountValidTime.add(_elem174); + _elem184 = new UserMountInfo(); + _elem184.read(iprot); + struct.userMountValidTime.add(_elem184); } iprot.readListEnd(); } @@ -2723,14 +2723,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list176.size); - TransformationCardInfo _elem177; - for (int _i178 = 0; _i178 < _list176.size; ++_i178) + org.apache.thrift.protocol.TList _list186 = iprot.readListBegin(); + struct.transformationList = new ArrayList(_list186.size); + TransformationCardInfo _elem187; + for (int _i188 = 0; _i188 < _list186.size; ++_i188) { - _elem177 = new TransformationCardInfo(); - _elem177.read(iprot); - struct.transformationList.add(_elem177); + _elem187 = new TransformationCardInfo(); + _elem187.read(iprot); + struct.transformationList.add(_elem187); } iprot.readListEnd(); } @@ -2759,14 +2759,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter179 : struct.teams.entrySet()) + for (Map.Entry> _iter189 : struct.teams.entrySet()) { - oprot.writeI32(_iter179.getKey()); + oprot.writeI32(_iter189.getKey()); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter179.getValue().size())); - for (TeamPosHeroInfo _iter180 : _iter179.getValue()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter189.getValue().size())); + for (TeamPosHeroInfo _iter190 : _iter189.getValue()) { - _iter180.write(oprot); + _iter190.write(oprot); } oprot.writeListEnd(); } @@ -2781,10 +2781,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter181 : struct.heros.entrySet()) + for (Map.Entry _iter191 : struct.heros.entrySet()) { - oprot.writeString(_iter181.getKey()); - _iter181.getValue().write(oprot); + oprot.writeString(_iter191.getKey()); + _iter191.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2796,10 +2796,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter182 : struct.jewels.entrySet()) + for (Map.Entry _iter192 : struct.jewels.entrySet()) { - oprot.writeString(_iter182.getKey()); - _iter182.getValue().write(oprot); + oprot.writeString(_iter192.getKey()); + _iter192.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2811,10 +2811,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter183 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter193 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter183.getKey()); - oprot.writeI32(_iter183.getValue()); + oprot.writeI32(_iter193.getKey()); + oprot.writeI32(_iter193.getValue()); } oprot.writeMapEnd(); } @@ -2836,10 +2836,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter184 : struct.pokemons.entrySet()) + for (Map.Entry _iter194 : struct.pokemons.entrySet()) { - oprot.writeString(_iter184.getKey()); - _iter184.getValue().write(oprot); + oprot.writeString(_iter194.getKey()); + _iter194.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2851,10 +2851,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter185 : struct.seals.entrySet()) + for (Map.Entry _iter195 : struct.seals.entrySet()) { - oprot.writeI32(_iter185.getKey()); - _iter185.getValue().write(oprot); + oprot.writeI32(_iter195.getKey()); + _iter195.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2866,10 +2866,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter186 : struct.guildSkill.entrySet()) + for (Map.Entry _iter196 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter186.getKey()); - oprot.writeI32(_iter186.getValue()); + oprot.writeI32(_iter196.getKey()); + oprot.writeI32(_iter196.getValue()); } oprot.writeMapEnd(); } @@ -2881,10 +2881,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter187 : struct.pokemonTeamMap.entrySet()) + for (Map.Entry _iter197 : struct.pokemonTeamMap.entrySet()) { - oprot.writeI32(_iter187.getKey()); - oprot.writeString(_iter187.getValue()); + oprot.writeI32(_iter197.getKey()); + oprot.writeString(_iter197.getValue()); } oprot.writeMapEnd(); } @@ -2901,9 +2901,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter189 : struct.practiceSkillMap.entrySet()) + for (Map.Entry _iter199 : struct.practiceSkillMap.entrySet()) { - oprot.writeI32(_iter189.getKey()); - oprot.writeI32(_iter189.getValue()); + oprot.writeI32(_iter199.getKey()); + oprot.writeI32(_iter199.getValue()); } oprot.writeMapEnd(); } @@ -2940,10 +2940,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter190 : struct.faBaoGongMingSkillMap.entrySet()) + for (Map.Entry _iter200 : struct.faBaoGongMingSkillMap.entrySet()) { - oprot.writeI32(_iter190.getKey()); - oprot.writeI32(_iter190.getValue()); + oprot.writeI32(_iter200.getKey()); + oprot.writeI32(_iter200.getValue()); } oprot.writeMapEnd(); } @@ -2955,9 +2955,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter192 : struct.homeEquipLv.entrySet()) + for (Map.Entry _iter202 : struct.homeEquipLv.entrySet()) { - oprot.writeI32(_iter192.getKey()); - oprot.writeI32(_iter192.getValue()); + oprot.writeI32(_iter202.getKey()); + oprot.writeI32(_iter202.getValue()); } oprot.writeMapEnd(); } @@ -2984,9 +2984,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter197 : struct.teams.entrySet()) + for (Map.Entry> _iter207 : struct.teams.entrySet()) { - oprot.writeI32(_iter197.getKey()); + oprot.writeI32(_iter207.getKey()); { - oprot.writeI32(_iter197.getValue().size()); - for (TeamPosHeroInfo _iter198 : _iter197.getValue()) + oprot.writeI32(_iter207.getValue().size()); + for (TeamPosHeroInfo _iter208 : _iter207.getValue()) { - _iter198.write(oprot); + _iter208.write(oprot); } } } @@ -3139,30 +3139,30 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter199 : struct.heros.entrySet()) + for (Map.Entry _iter209 : struct.heros.entrySet()) { - oprot.writeString(_iter199.getKey()); - _iter199.getValue().write(oprot); + oprot.writeString(_iter209.getKey()); + _iter209.getValue().write(oprot); } } } if (struct.isSetJewels()) { { oprot.writeI32(struct.jewels.size()); - for (Map.Entry _iter200 : struct.jewels.entrySet()) + for (Map.Entry _iter210 : struct.jewels.entrySet()) { - oprot.writeString(_iter200.getKey()); - _iter200.getValue().write(oprot); + oprot.writeString(_iter210.getKey()); + _iter210.getValue().write(oprot); } } } if (struct.isSetTotalForceByTeam()) { { oprot.writeI32(struct.totalForceByTeam.size()); - for (Map.Entry _iter201 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter211 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter201.getKey()); - oprot.writeI32(_iter201.getValue()); + oprot.writeI32(_iter211.getKey()); + oprot.writeI32(_iter211.getValue()); } } } @@ -3175,40 +3175,40 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter202 : struct.pokemons.entrySet()) + for (Map.Entry _iter212 : struct.pokemons.entrySet()) { - oprot.writeString(_iter202.getKey()); - _iter202.getValue().write(oprot); + oprot.writeString(_iter212.getKey()); + _iter212.getValue().write(oprot); } } } if (struct.isSetSeals()) { { oprot.writeI32(struct.seals.size()); - for (Map.Entry _iter203 : struct.seals.entrySet()) + for (Map.Entry _iter213 : struct.seals.entrySet()) { - oprot.writeI32(_iter203.getKey()); - _iter203.getValue().write(oprot); + oprot.writeI32(_iter213.getKey()); + _iter213.getValue().write(oprot); } } } if (struct.isSetGuildSkill()) { { oprot.writeI32(struct.guildSkill.size()); - for (Map.Entry _iter204 : struct.guildSkill.entrySet()) + for (Map.Entry _iter214 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter204.getKey()); - oprot.writeI32(_iter204.getValue()); + oprot.writeI32(_iter214.getKey()); + oprot.writeI32(_iter214.getValue()); } } } if (struct.isSetPokemonTeamMap()) { { oprot.writeI32(struct.pokemonTeamMap.size()); - for (Map.Entry _iter205 : struct.pokemonTeamMap.entrySet()) + for (Map.Entry _iter215 : struct.pokemonTeamMap.entrySet()) { - oprot.writeI32(_iter205.getKey()); - oprot.writeString(_iter205.getValue()); + oprot.writeI32(_iter215.getKey()); + oprot.writeString(_iter215.getValue()); } } } @@ -3218,9 +3218,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter207 : struct.practiceSkillMap.entrySet()) + for (Map.Entry _iter217 : struct.practiceSkillMap.entrySet()) { - oprot.writeI32(_iter207.getKey()); - oprot.writeI32(_iter207.getValue()); + oprot.writeI32(_iter217.getKey()); + oprot.writeI32(_iter217.getValue()); } } } @@ -3243,65 +3243,65 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter208 : struct.faBaoGongMingSkillMap.entrySet()) + for (Map.Entry _iter218 : struct.faBaoGongMingSkillMap.entrySet()) { - oprot.writeI32(_iter208.getKey()); - oprot.writeI32(_iter208.getValue()); + oprot.writeI32(_iter218.getKey()); + oprot.writeI32(_iter218.getValue()); } } } if (struct.isSetTfInfoList()) { { oprot.writeI32(struct.tfInfoList.size()); - for (int _iter209 : struct.tfInfoList) + for (int _iter219 : struct.tfInfoList) { - oprot.writeI32(_iter209); + oprot.writeI32(_iter219); } } } if (struct.isSetHomeEquipLv()) { { oprot.writeI32(struct.homeEquipLv.size()); - for (Map.Entry _iter210 : struct.homeEquipLv.entrySet()) + for (Map.Entry _iter220 : struct.homeEquipLv.entrySet()) { - oprot.writeI32(_iter210.getKey()); - oprot.writeI32(_iter210.getValue()); + oprot.writeI32(_iter220.getKey()); + oprot.writeI32(_iter220.getValue()); } } } if (struct.isSetSixiangInfos()) { { oprot.writeI32(struct.sixiangInfos.size()); - for (SixiangxinfaInfo _iter211 : struct.sixiangInfos) + for (SixiangxinfaInfo _iter221 : struct.sixiangInfos) { - _iter211.write(oprot); + _iter221.write(oprot); } } } if (struct.isSetLifeGridInfos()) { { oprot.writeI32(struct.lifeGridInfos.size()); - for (LifeGridInfo _iter212 : struct.lifeGridInfos) + for (LifeGridInfo _iter222 : struct.lifeGridInfos) { - _iter212.write(oprot); + _iter222.write(oprot); } } } if (struct.isSetUserMountValidTime()) { { oprot.writeI32(struct.userMountValidTime.size()); - for (UserMountInfo _iter213 : struct.userMountValidTime) + for (UserMountInfo _iter223 : struct.userMountValidTime) { - _iter213.write(oprot); + _iter223.write(oprot); } } } if (struct.isSetTransformationList()) { { oprot.writeI32(struct.transformationList.size()); - for (TransformationCardInfo _iter214 : struct.transformationList) + for (TransformationCardInfo _iter224 : struct.transformationList) { - _iter214.write(oprot); + _iter224.write(oprot); } } } @@ -3313,72 +3313,72 @@ public class CrossArenaManager implements org.apache.thrift.TBase>(2*_map215.size); - int _key216; - List _val217; - for (int _i218 = 0; _i218 < _map215.size; ++_i218) + org.apache.thrift.protocol.TMap _map225 = 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*_map225.size); + int _key226; + List _val227; + for (int _i228 = 0; _i228 < _map225.size; ++_i228) { - _key216 = iprot.readI32(); + _key226 = iprot.readI32(); { - org.apache.thrift.protocol.TList _list219 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - _val217 = new ArrayList(_list219.size); - TeamPosHeroInfo _elem220; - for (int _i221 = 0; _i221 < _list219.size; ++_i221) + org.apache.thrift.protocol.TList _list229 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + _val227 = new ArrayList(_list229.size); + TeamPosHeroInfo _elem230; + for (int _i231 = 0; _i231 < _list229.size; ++_i231) { - _elem220 = new TeamPosHeroInfo(); - _elem220.read(iprot); - _val217.add(_elem220); + _elem230 = new TeamPosHeroInfo(); + _elem230.read(iprot); + _val227.add(_elem230); } } - struct.teams.put(_key216, _val217); + struct.teams.put(_key226, _val227); } } struct.setTeamsIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map222 = 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*_map222.size); - String _key223; - ArenaOfHero _val224; - for (int _i225 = 0; _i225 < _map222.size; ++_i225) + org.apache.thrift.protocol.TMap _map232 = 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*_map232.size); + String _key233; + ArenaOfHero _val234; + for (int _i235 = 0; _i235 < _map232.size; ++_i235) { - _key223 = iprot.readString(); - _val224 = new ArenaOfHero(); - _val224.read(iprot); - struct.heros.put(_key223, _val224); + _key233 = iprot.readString(); + _val234 = new ArenaOfHero(); + _val234.read(iprot); + struct.heros.put(_key233, _val234); } } struct.setHerosIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map226 = 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*_map226.size); - String _key227; - PropertyItem _val228; - for (int _i229 = 0; _i229 < _map226.size; ++_i229) + org.apache.thrift.protocol.TMap _map236 = 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*_map236.size); + String _key237; + PropertyItem _val238; + for (int _i239 = 0; _i239 < _map236.size; ++_i239) { - _key227 = iprot.readString(); - _val228 = new PropertyItem(); - _val228.read(iprot); - struct.jewels.put(_key227, _val228); + _key237 = iprot.readString(); + _val238 = new PropertyItem(); + _val238.read(iprot); + struct.jewels.put(_key237, _val238); } } struct.setJewelsIsSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map230 = 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*_map230.size); - int _key231; - int _val232; - for (int _i233 = 0; _i233 < _map230.size; ++_i233) + org.apache.thrift.protocol.TMap _map240 = 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*_map240.size); + int _key241; + int _val242; + for (int _i243 = 0; _i243 < _map240.size; ++_i243) { - _key231 = iprot.readI32(); - _val232 = iprot.readI32(); - struct.totalForceByTeam.put(_key231, _val232); + _key241 = iprot.readI32(); + _val242 = iprot.readI32(); + struct.totalForceByTeam.put(_key241, _val242); } } struct.setTotalForceByTeamIsSet(true); @@ -3393,62 +3393,62 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map234.size); - String _key235; - Pokemon _val236; - for (int _i237 = 0; _i237 < _map234.size; ++_i237) + org.apache.thrift.protocol.TMap _map244 = 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*_map244.size); + String _key245; + Pokemon _val246; + for (int _i247 = 0; _i247 < _map244.size; ++_i247) { - _key235 = iprot.readString(); - _val236 = new Pokemon(); - _val236.read(iprot); - struct.pokemons.put(_key235, _val236); + _key245 = iprot.readString(); + _val246 = new Pokemon(); + _val246.read(iprot); + struct.pokemons.put(_key245, _val246); } } struct.setPokemonsIsSet(true); } if (incoming.get(7)) { { - org.apache.thrift.protocol.TMap _map238 = 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*_map238.size); - int _key239; - PurpleMansionSeal _val240; - for (int _i241 = 0; _i241 < _map238.size; ++_i241) + org.apache.thrift.protocol.TMap _map248 = 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*_map248.size); + int _key249; + PurpleMansionSeal _val250; + for (int _i251 = 0; _i251 < _map248.size; ++_i251) { - _key239 = iprot.readI32(); - _val240 = new PurpleMansionSeal(); - _val240.read(iprot); - struct.seals.put(_key239, _val240); + _key249 = iprot.readI32(); + _val250 = new PurpleMansionSeal(); + _val250.read(iprot); + struct.seals.put(_key249, _val250); } } struct.setSealsIsSet(true); } if (incoming.get(8)) { { - org.apache.thrift.protocol.TMap _map242 = 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*_map242.size); - int _key243; - int _val244; - for (int _i245 = 0; _i245 < _map242.size; ++_i245) + org.apache.thrift.protocol.TMap _map252 = 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*_map252.size); + int _key253; + int _val254; + for (int _i255 = 0; _i255 < _map252.size; ++_i255) { - _key243 = iprot.readI32(); - _val244 = iprot.readI32(); - struct.guildSkill.put(_key243, _val244); + _key253 = iprot.readI32(); + _val254 = iprot.readI32(); + struct.guildSkill.put(_key253, _val254); } } struct.setGuildSkillIsSet(true); } if (incoming.get(9)) { { - org.apache.thrift.protocol.TMap _map246 = 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*_map246.size); - int _key247; - String _val248; - for (int _i249 = 0; _i249 < _map246.size; ++_i249) + org.apache.thrift.protocol.TMap _map256 = 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*_map256.size); + int _key257; + String _val258; + for (int _i259 = 0; _i259 < _map256.size; ++_i259) { - _key247 = iprot.readI32(); - _val248 = iprot.readString(); - struct.pokemonTeamMap.put(_key247, _val248); + _key257 = iprot.readI32(); + _val258 = iprot.readString(); + struct.pokemonTeamMap.put(_key257, _val258); } } struct.setPokemonTeamMapIsSet(true); @@ -3459,13 +3459,13 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list250.size); - int _elem251; - for (int _i252 = 0; _i252 < _list250.size; ++_i252) + org.apache.thrift.protocol.TList _list260 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.skill = new ArrayList(_list260.size); + int _elem261; + for (int _i262 = 0; _i262 < _list260.size; ++_i262) { - _elem251 = iprot.readI32(); - struct.skill.add(_elem251); + _elem261 = iprot.readI32(); + struct.skill.add(_elem261); } } struct.setSkillIsSet(true); @@ -3476,15 +3476,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map253.size); - int _key254; - int _val255; - for (int _i256 = 0; _i256 < _map253.size; ++_i256) + org.apache.thrift.protocol.TMap _map263 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.practiceSkillMap = new HashMap(2*_map263.size); + int _key264; + int _val265; + for (int _i266 = 0; _i266 < _map263.size; ++_i266) { - _key254 = iprot.readI32(); - _val255 = iprot.readI32(); - struct.practiceSkillMap.put(_key254, _val255); + _key264 = iprot.readI32(); + _val265 = iprot.readI32(); + struct.practiceSkillMap.put(_key264, _val265); } } struct.setPracticeSkillMapIsSet(true); @@ -3495,99 +3495,99 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map257.size); - int _key258; - int _val259; - for (int _i260 = 0; _i260 < _map257.size; ++_i260) + org.apache.thrift.protocol.TMap _map267 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.faBaoGongMingSkillMap = new HashMap(2*_map267.size); + int _key268; + int _val269; + for (int _i270 = 0; _i270 < _map267.size; ++_i270) { - _key258 = iprot.readI32(); - _val259 = iprot.readI32(); - struct.faBaoGongMingSkillMap.put(_key258, _val259); + _key268 = iprot.readI32(); + _val269 = iprot.readI32(); + struct.faBaoGongMingSkillMap.put(_key268, _val269); } } struct.setFaBaoGongMingSkillMapIsSet(true); } if (incoming.get(16)) { { - org.apache.thrift.protocol.TList _list261 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.tfInfoList = new ArrayList(_list261.size); - int _elem262; - for (int _i263 = 0; _i263 < _list261.size; ++_i263) + org.apache.thrift.protocol.TList _list271 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.tfInfoList = new ArrayList(_list271.size); + int _elem272; + for (int _i273 = 0; _i273 < _list271.size; ++_i273) { - _elem262 = iprot.readI32(); - struct.tfInfoList.add(_elem262); + _elem272 = iprot.readI32(); + struct.tfInfoList.add(_elem272); } } struct.setTfInfoListIsSet(true); } if (incoming.get(17)) { { - org.apache.thrift.protocol.TMap _map264 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.homeEquipLv = new HashMap(2*_map264.size); - int _key265; - int _val266; - for (int _i267 = 0; _i267 < _map264.size; ++_i267) + org.apache.thrift.protocol.TMap _map274 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.homeEquipLv = new HashMap(2*_map274.size); + int _key275; + int _val276; + for (int _i277 = 0; _i277 < _map274.size; ++_i277) { - _key265 = iprot.readI32(); - _val266 = iprot.readI32(); - struct.homeEquipLv.put(_key265, _val266); + _key275 = iprot.readI32(); + _val276 = iprot.readI32(); + struct.homeEquipLv.put(_key275, _val276); } } struct.setHomeEquipLvIsSet(true); } if (incoming.get(18)) { { - org.apache.thrift.protocol.TList _list268 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.sixiangInfos = new ArrayList(_list268.size); - SixiangxinfaInfo _elem269; - for (int _i270 = 0; _i270 < _list268.size; ++_i270) + org.apache.thrift.protocol.TList _list278 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.sixiangInfos = new ArrayList(_list278.size); + SixiangxinfaInfo _elem279; + for (int _i280 = 0; _i280 < _list278.size; ++_i280) { - _elem269 = new SixiangxinfaInfo(); - _elem269.read(iprot); - struct.sixiangInfos.add(_elem269); + _elem279 = new SixiangxinfaInfo(); + _elem279.read(iprot); + struct.sixiangInfos.add(_elem279); } } struct.setSixiangInfosIsSet(true); } if (incoming.get(19)) { { - org.apache.thrift.protocol.TList _list271 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.lifeGridInfos = new ArrayList(_list271.size); - LifeGridInfo _elem272; - for (int _i273 = 0; _i273 < _list271.size; ++_i273) + org.apache.thrift.protocol.TList _list281 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.lifeGridInfos = new ArrayList(_list281.size); + LifeGridInfo _elem282; + for (int _i283 = 0; _i283 < _list281.size; ++_i283) { - _elem272 = new LifeGridInfo(); - _elem272.read(iprot); - struct.lifeGridInfos.add(_elem272); + _elem282 = new LifeGridInfo(); + _elem282.read(iprot); + struct.lifeGridInfos.add(_elem282); } } struct.setLifeGridInfosIsSet(true); } if (incoming.get(20)) { { - org.apache.thrift.protocol.TList _list274 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.userMountValidTime = new ArrayList(_list274.size); - UserMountInfo _elem275; - for (int _i276 = 0; _i276 < _list274.size; ++_i276) + org.apache.thrift.protocol.TList _list284 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.userMountValidTime = new ArrayList(_list284.size); + UserMountInfo _elem285; + for (int _i286 = 0; _i286 < _list284.size; ++_i286) { - _elem275 = new UserMountInfo(); - _elem275.read(iprot); - struct.userMountValidTime.add(_elem275); + _elem285 = new UserMountInfo(); + _elem285.read(iprot); + struct.userMountValidTime.add(_elem285); } } struct.setUserMountValidTimeIsSet(true); } if (incoming.get(21)) { { - org.apache.thrift.protocol.TList _list277 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.transformationList = new ArrayList(_list277.size); - TransformationCardInfo _elem278; - for (int _i279 = 0; _i279 < _list277.size; ++_i279) + org.apache.thrift.protocol.TList _list287 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.transformationList = new ArrayList(_list287.size); + TransformationCardInfo _elem288; + for (int _i289 = 0; _i289 < _list287.size; ++_i289) { - _elem278 = new TransformationCardInfo(); - _elem278.read(iprot); - struct.transformationList.add(_elem278); + _elem288 = new TransformationCardInfo(); + _elem288.read(iprot); + struct.transformationList.add(_elem288); } } struct.setTransformationListIsSet(true); 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 3a928f139..baa995ad7 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 @@ -1099,15 +1099,15 @@ public class PropertyItem implements org.apache.thrift.TBase(2*_map86.size); - int _key87; - long _val88; - for (int _i89 = 0; _i89 < _map86.size; ++_i89) + org.apache.thrift.protocol.TMap _map96 = iprot.readMapBegin(); + struct.propertyValueByIdMap = new HashMap(2*_map96.size); + int _key97; + long _val98; + for (int _i99 = 0; _i99 < _map96.size; ++_i99) { - _key87 = iprot.readI32(); - _val88 = iprot.readI64(); - struct.propertyValueByIdMap.put(_key87, _val88); + _key97 = iprot.readI32(); + _val98 = iprot.readI64(); + struct.propertyValueByIdMap.put(_key97, _val98); } iprot.readMapEnd(); } @@ -1119,15 +1119,15 @@ public class PropertyItem implements org.apache.thrift.TBase(2*_map90.size); - int _key91; - long _val92; - for (int _i93 = 0; _i93 < _map90.size; ++_i93) + org.apache.thrift.protocol.TMap _map100 = iprot.readMapBegin(); + struct.secondValueByIdMap = new HashMap(2*_map100.size); + int _key101; + long _val102; + for (int _i103 = 0; _i103 < _map100.size; ++_i103) { - _key91 = iprot.readI32(); - _val92 = iprot.readI64(); - struct.secondValueByIdMap.put(_key91, _val92); + _key101 = iprot.readI32(); + _val102 = iprot.readI64(); + struct.secondValueByIdMap.put(_key101, _val102); } iprot.readMapEnd(); } @@ -1212,10 +1212,10 @@ public class PropertyItem implements org.apache.thrift.TBase _iter94 : struct.propertyValueByIdMap.entrySet()) + for (Map.Entry _iter104 : struct.propertyValueByIdMap.entrySet()) { - oprot.writeI32(_iter94.getKey()); - oprot.writeI64(_iter94.getValue()); + oprot.writeI32(_iter104.getKey()); + oprot.writeI64(_iter104.getValue()); } oprot.writeMapEnd(); } @@ -1227,10 +1227,10 @@ public class PropertyItem implements org.apache.thrift.TBase _iter95 : struct.secondValueByIdMap.entrySet()) + for (Map.Entry _iter105 : struct.secondValueByIdMap.entrySet()) { - oprot.writeI32(_iter95.getKey()); - oprot.writeI64(_iter95.getValue()); + oprot.writeI32(_iter105.getKey()); + oprot.writeI64(_iter105.getValue()); } oprot.writeMapEnd(); } @@ -1321,20 +1321,20 @@ public class PropertyItem implements org.apache.thrift.TBase _iter96 : struct.propertyValueByIdMap.entrySet()) + for (Map.Entry _iter106 : struct.propertyValueByIdMap.entrySet()) { - oprot.writeI32(_iter96.getKey()); - oprot.writeI64(_iter96.getValue()); + oprot.writeI32(_iter106.getKey()); + oprot.writeI64(_iter106.getValue()); } } } if (struct.isSetSecondValueByIdMap()) { { oprot.writeI32(struct.secondValueByIdMap.size()); - for (Map.Entry _iter97 : struct.secondValueByIdMap.entrySet()) + for (Map.Entry _iter107 : struct.secondValueByIdMap.entrySet()) { - oprot.writeI32(_iter97.getKey()); - oprot.writeI64(_iter97.getValue()); + oprot.writeI32(_iter107.getKey()); + oprot.writeI64(_iter107.getValue()); } } } @@ -1374,30 +1374,30 @@ public class PropertyItem implements org.apache.thrift.TBase(2*_map98.size); - int _key99; - long _val100; - for (int _i101 = 0; _i101 < _map98.size; ++_i101) + org.apache.thrift.protocol.TMap _map108 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.propertyValueByIdMap = new HashMap(2*_map108.size); + int _key109; + long _val110; + for (int _i111 = 0; _i111 < _map108.size; ++_i111) { - _key99 = iprot.readI32(); - _val100 = iprot.readI64(); - struct.propertyValueByIdMap.put(_key99, _val100); + _key109 = iprot.readI32(); + _val110 = iprot.readI64(); + struct.propertyValueByIdMap.put(_key109, _val110); } } struct.setPropertyValueByIdMapIsSet(true); } if (incoming.get(5)) { { - org.apache.thrift.protocol.TMap _map102 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.secondValueByIdMap = new HashMap(2*_map102.size); - int _key103; - long _val104; - for (int _i105 = 0; _i105 < _map102.size; ++_i105) + org.apache.thrift.protocol.TMap _map112 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.secondValueByIdMap = new HashMap(2*_map112.size); + int _key113; + long _val114; + for (int _i115 = 0; _i115 < _map112.size; ++_i115) { - _key103 = iprot.readI32(); - _val104 = iprot.readI64(); - struct.secondValueByIdMap.put(_key103, _val104); + _key113 = iprot.readI32(); + _val114 = iprot.readI64(); + struct.secondValueByIdMap.put(_key113, _val114); } } struct.setSecondValueByIdMapIsSet(true); 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 2b870e56f..1d5074697 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 @@ -1317,7 +1317,7 @@ public class RPCRequestIFace { public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new AsyncMethodCallback() { public void onComplete(Void o) { updateUserInfoByRpc_result result = new updateUserInfoByRpc_result(); try { @@ -7286,13 +7286,13 @@ public class RPCRequestIFace { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set280 = iprot.readSetBegin(); - struct.success = new HashSet(2*_set280.size); - String _elem281; - for (int _i282 = 0; _i282 < _set280.size; ++_i282) + org.apache.thrift.protocol.TSet _set290 = iprot.readSetBegin(); + struct.success = new HashSet(2*_set290.size); + String _elem291; + for (int _i292 = 0; _i292 < _set290.size; ++_i292) { - _elem281 = iprot.readString(); - struct.success.add(_elem281); + _elem291 = iprot.readString(); + struct.success.add(_elem291); } iprot.readSetEnd(); } @@ -7320,9 +7320,9 @@ public class RPCRequestIFace { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.success.size())); - for (String _iter283 : struct.success) + for (String _iter293 : struct.success) { - oprot.writeString(_iter283); + oprot.writeString(_iter293); } oprot.writeSetEnd(); } @@ -7353,9 +7353,9 @@ public class RPCRequestIFace { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (String _iter284 : struct.success) + for (String _iter294 : struct.success) { - oprot.writeString(_iter284); + oprot.writeString(_iter294); } } } @@ -7367,13 +7367,13 @@ public class RPCRequestIFace { BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TSet _set285 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.success = new HashSet(2*_set285.size); - String _elem286; - for (int _i287 = 0; _i287 < _set285.size; ++_i287) + org.apache.thrift.protocol.TSet _set295 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.success = new HashSet(2*_set295.size); + String _elem296; + for (int _i297 = 0; _i297 < _set295.size; ++_i297) { - _elem286 = iprot.readString(); - struct.success.add(_elem286); + _elem296 = iprot.readString(); + struct.success.add(_elem296); } } struct.setSuccessIsSet(true); @@ -8191,11 +8191,11 @@ public class RPCRequestIFace { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.UID, new org.apache.thrift.meta_data.FieldMetaData("uid", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.UID, new org.apache.thrift.meta_data.FieldMetaData("uid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.USER_STR, new org.apache.thrift.meta_data.FieldMetaData("userStr", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.USER_STR, new org.apache.thrift.meta_data.FieldMetaData("userStr", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateUserInfoByRpc_args.class, metaDataMap); @@ -8552,7 +8552,7 @@ public class RPCRequestIFace { while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -8560,7 +8560,7 @@ public class RPCRequestIFace { if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.uid = iprot.readI32(); struct.setUidIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -8568,7 +8568,7 @@ public class RPCRequestIFace { if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.userStr = iprot.readString(); struct.setUserStrIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -8576,7 +8576,7 @@ public class RPCRequestIFace { if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.type = iprot.readI32(); struct.setTypeIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -8868,7 +8868,7 @@ public class RPCRequestIFace { while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java index 1c6aeaf97..cf54f8790 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java @@ -526,14 +526,14 @@ public class SixiangxinfaInfo implements org.apache.thrift.TBase(_list106.size); - SixiangxinfaPropertyInfo _elem107; - for (int _i108 = 0; _i108 < _list106.size; ++_i108) + org.apache.thrift.protocol.TList _list116 = iprot.readListBegin(); + struct.propertyInfoList = new ArrayList(_list116.size); + SixiangxinfaPropertyInfo _elem117; + for (int _i118 = 0; _i118 < _list116.size; ++_i118) { - _elem107 = new SixiangxinfaPropertyInfo(); - _elem107.read(iprot); - struct.propertyInfoList.add(_elem107); + _elem117 = new SixiangxinfaPropertyInfo(); + _elem117.read(iprot); + struct.propertyInfoList.add(_elem117); } iprot.readListEnd(); } @@ -571,9 +571,9 @@ public class SixiangxinfaInfo implements org.apache.thrift.TBase(_list111.size); - SixiangxinfaPropertyInfo _elem112; - for (int _i113 = 0; _i113 < _list111.size; ++_i113) + org.apache.thrift.protocol.TList _list121 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.propertyInfoList = new ArrayList(_list121.size); + SixiangxinfaPropertyInfo _elem122; + for (int _i123 = 0; _i123 < _list121.size; ++_i123) { - _elem112 = new SixiangxinfaPropertyInfo(); - _elem112.read(iprot); - struct.propertyInfoList.add(_elem112); + _elem122 = new SixiangxinfaPropertyInfo(); + _elem122.read(iprot); + struct.propertyInfoList.add(_elem122); } } struct.setPropertyInfoListIsSet(true); 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 412e5ae42..ae7fdc3d2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -376,46 +376,20 @@ public class CBean2Proto { } public static CommonProto.Hero getHero(Hero hero,HeroManager heroManager){ - List soulPoss = new ArrayList<>(); - Map soulEquipMap = hero.getSoulEquipByPositionMap(); - if(soulEquipMap!=null&&!soulEquipMap.isEmpty()){ - for (Map.Entry entry:soulEquipMap.entrySet()){ - CommonProto.SoulPos.Builder builder = CommonProto.SoulPos.newBuilder(); - builder.setEquipId(entry.getValue()); - builder.setPosition(entry.getKey()); - soulPoss.add(builder.build()); - } - } - //Collection equipList = hero.getEquipByHongmengPositionMap(heroManager).values(); - + // 鸿蒙阵装备同步 Collection equipList =hero.getEquipByPositionMap().values(); if(equipList.size() ==0 ){ equipList = hero.getEquipByHongmengPositionMap(heroManager).values(); } - return CommonProto.Hero - .newBuilder() - .setId(hero.getId()) - .setHeroId(hero.getTemplateId()) - .setLevel(hero.getOriginalLevel()) - .setStar(hero.getStar()) - .setBreakId(hero.getBreakId()) - .setStarBreakId(hero.getStarBreakId()) - .setCreateTime(hero.getCreateTime()) - //.addAllEquipIdList(hero.getEquipByPositionMap().values()) - .addAllEquipIdList(equipList) - .setEspecialEquipLevel(hero.getEspecialEquipLevel()) - .addAllSoulPos(soulPoss) - .setLockState(hero.getIsLock()) - .addAllJewels(hero.getJewelInfo()) - .setCreatetype(hero.getCreateType()) - .setChangeId(hero.getChangeId()) - .setSkinId(hero.getSkin()) - .setGodSoulLv(hero.getGodSoulLv()) - .setPropertyId(hero.getPropertyId()) - .build(); + + CommonProto.Hero hero1 = getHero(hero); + hero1.toBuilder().addAllEquipIdList(equipList); + + return hero1; } public static CommonProto.Hero getHero(Hero hero){ + // 魂印 List soulPoss = new ArrayList<>(); Map soulEquipMap = hero.getSoulEquipByPositionMap(); if(soulEquipMap!=null&&!soulEquipMap.isEmpty()){ @@ -426,6 +400,7 @@ public class CBean2Proto { soulPoss.add(builder.build()); } } + // 神魂 ListgodSoulList=new ArrayList<>(); for (Map.Entry> godSoul : hero.getGodSoulBindMap().entrySet()) { CommonProto.HeroGodSoulInfo godSoulInfo=CommonProto.HeroGodSoulInfo.newBuilder() @@ -434,6 +409,17 @@ public class CBean2Proto { .build(); godSoulList.add(godSoulInfo); } + // 神印 + List godSeals = new ArrayList<>(); + Map godSealMap = hero.getGodSealByPositionMap(); + if(godSealMap!=null&&!godSealMap.isEmpty()){ + for (Map.Entry entry:godSealMap.entrySet()){ + CommonProto.SoulPos.Builder builder = CommonProto.SoulPos.newBuilder(); + builder.setEquipId(entry.getValue()); + builder.setPosition(entry.getKey()); + godSeals.add(builder.build()); + } + } return CommonProto.Hero .newBuilder() .setId(hero.getId()) @@ -454,6 +440,7 @@ public class CBean2Proto { .addAllGodSoulList(godSoulList) .setGodSoulLv(hero.getGodSoulLv()) .setPropertyId(hero.getPropertyId()) + .addAllGodSeals(godSeals) .build(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 58d9981b8..d22b442cb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -579,7 +579,7 @@ public class ItemUtil { } } - private static void getMap(int itemId ,long itemNum,ItemMap itemObj,float dropRatio) throws ErrorCodeException{ + private static void getMap(int itemId ,long itemNum,ItemMap itemObj,float dropRatio) { SItem sItem = SItem.getsItemMap().get(itemId); if(sItem==null){ LOGGER.info("getMap SItem配置不存在 id:{}", itemId); @@ -589,6 +589,7 @@ public class ItemUtil { long amount = MathUtils.numRount((itemNum * MathUtils.floatToDouble(dropRatio))); switch (itemType) { case GlobalItemType.SOUL_MARK: + case GlobalItemType.GOD_SEAL: case GlobalItemType.ITEM: case GlobalItemType.EQUIP: putCountLongMap(itemId,amount, itemObj.getItemMap()); @@ -1600,6 +1601,7 @@ public class ItemUtil { switch (itemType) { case GlobalItemType.ITEM: case GlobalItemType.SOUL_MARK: + case GlobalItemType.GOD_SEAL: case GlobalItemType.EQUIP: putCountMap(itemId,itemNum,itemMap); break; diff --git a/serverlogic/src/main/thrift/idl/core.thrift b/serverlogic/src/main/thrift/idl/core.thrift index b9617a923..39eeaf9a1 100644 --- a/serverlogic/src/main/thrift/idl/core.thrift +++ b/serverlogic/src/main/thrift/idl/core.thrift @@ -46,6 +46,7 @@ struct ArenaOfHero { 17:optional map> attributeMapByTeamBattle ; 18:optional i32 godSoulLv;//神魂等级 19:optional i32 propertyId;//阵营id + 20:optional map godSealByPositionMap; } struct PropertyItem { 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 234f99886..f23a21f65 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 @@ -57,6 +57,7 @@ public class ArenaOfHero implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -83,6 +84,7 @@ public class ArenaOfHero implements org.apache.thrift.TBase> attributeMapByTeamBattle; // optional public int godSoulLv; // optional public int propertyId; // optional + public Map godSealByPositionMap; // 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 { @@ -104,7 +106,8 @@ public class ArenaOfHero implements org.apache.thrift.TBase byName = new HashMap(); @@ -157,6 +160,8 @@ public class ArenaOfHero 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); @@ -267,6 +272,10 @@ public class ArenaOfHero implements org.apache.thrift.TBase __this__godSealByPositionMap = new HashMap(other.godSealByPositionMap); + this.godSealByPositionMap = __this__godSealByPositionMap; + } } public ArenaOfHero deepCopy() { @@ -379,6 +392,7 @@ public class ArenaOfHero implements org.apache.thrift.TBase(); + } + this.godSealByPositionMap.put(key, val); + } + + public Map getGodSealByPositionMap() { + return this.godSealByPositionMap; + } + + public ArenaOfHero setGodSealByPositionMap(Map godSealByPositionMap) { + this.godSealByPositionMap = godSealByPositionMap; + return this; + } + + public void unsetGodSealByPositionMap() { + this.godSealByPositionMap = null; + } + + /** Returns true if field godSealByPositionMap is set (has been assigned a value) and false otherwise */ + public boolean isSetGodSealByPositionMap() { + return this.godSealByPositionMap != null; + } + + public void setGodSealByPositionMapIsSet(boolean value) { + if (!value) { + this.godSealByPositionMap = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case ID: @@ -1049,6 +1098,14 @@ public class ArenaOfHero implements org.apache.thrift.TBase)value); + } + break; + } } @@ -1111,6 +1168,9 @@ public class ArenaOfHero implements org.apache.thrift.TBase(2*_map39.size); + int _key40; + int _val41; + for (int _i42 = 0; _i42 < _map39.size; ++_i42) + { + _key40 = iprot.readI32(); + _val41 = iprot.readI32(); + struct.godSealByPositionMap.put(_key40, _val41); + } + iprot.readMapEnd(); + } + struct.setGodSealByPositionMapIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -2145,10 +2261,10 @@ public class ArenaOfHero implements org.apache.thrift.TBase _iter39 : struct.equipByPositionMap.entrySet()) + for (Map.Entry _iter43 : struct.equipByPositionMap.entrySet()) { - oprot.writeI32(_iter39.getKey()); - oprot.writeI32(_iter39.getValue()); + oprot.writeI32(_iter43.getKey()); + oprot.writeI32(_iter43.getValue()); } oprot.writeMapEnd(); } @@ -2160,10 +2276,10 @@ public class ArenaOfHero implements org.apache.thrift.TBase _iter40 : struct.soulEquipByPositionMap.entrySet()) + for (Map.Entry _iter44 : struct.soulEquipByPositionMap.entrySet()) { - oprot.writeI32(_iter40.getKey()); - oprot.writeI32(_iter40.getValue()); + oprot.writeI32(_iter44.getKey()); + oprot.writeI32(_iter44.getValue()); } oprot.writeMapEnd(); } @@ -2210,9 +2326,9 @@ public class ArenaOfHero implements org.apache.thrift.TBase _iter42 : struct.attributeMap.entrySet()) + for (Map.Entry _iter46 : struct.attributeMap.entrySet()) { - oprot.writeI32(_iter42.getKey()); - oprot.writeI64(_iter42.getValue()); + oprot.writeI32(_iter46.getKey()); + oprot.writeI64(_iter46.getValue()); } oprot.writeMapEnd(); } @@ -2239,15 +2355,15 @@ public class ArenaOfHero implements org.apache.thrift.TBase> _iter43 : struct.attributeMapByTeam.entrySet()) + for (Map.Entry> _iter47 : struct.attributeMapByTeam.entrySet()) { - oprot.writeI32(_iter43.getKey()); + oprot.writeI32(_iter47.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, _iter43.getValue().size())); - for (Map.Entry _iter44 : _iter43.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, _iter47.getValue().size())); + for (Map.Entry _iter48 : _iter47.getValue().entrySet()) { - oprot.writeI32(_iter44.getKey()); - oprot.writeI64(_iter44.getValue()); + oprot.writeI32(_iter48.getKey()); + oprot.writeI64(_iter48.getValue()); } oprot.writeMapEnd(); } @@ -2262,15 +2378,15 @@ public class ArenaOfHero implements org.apache.thrift.TBase> _iter45 : struct.attributeMapByTeamBattle.entrySet()) + for (Map.Entry> _iter49 : struct.attributeMapByTeamBattle.entrySet()) { - oprot.writeI32(_iter45.getKey()); + oprot.writeI32(_iter49.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, _iter45.getValue().size())); - for (Map.Entry _iter46 : _iter45.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, _iter49.getValue().size())); + for (Map.Entry _iter50 : _iter49.getValue().entrySet()) { - oprot.writeI32(_iter46.getKey()); - oprot.writeI64(_iter46.getValue()); + oprot.writeI32(_iter50.getKey()); + oprot.writeI64(_iter50.getValue()); } oprot.writeMapEnd(); } @@ -2290,6 +2406,21 @@ public class ArenaOfHero implements org.apache.thrift.TBase _iter51 : struct.godSealByPositionMap.entrySet()) + { + oprot.writeI32(_iter51.getKey()); + oprot.writeI32(_iter51.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -2365,7 +2496,10 @@ public class ArenaOfHero implements org.apache.thrift.TBase _iter47 : struct.equipByPositionMap.entrySet()) + for (Map.Entry _iter52 : struct.equipByPositionMap.entrySet()) { - oprot.writeI32(_iter47.getKey()); - oprot.writeI32(_iter47.getValue()); + oprot.writeI32(_iter52.getKey()); + oprot.writeI32(_iter52.getValue()); } } } if (struct.isSetSoulEquipByPositionMap()) { { oprot.writeI32(struct.soulEquipByPositionMap.size()); - for (Map.Entry _iter48 : struct.soulEquipByPositionMap.entrySet()) + for (Map.Entry _iter53 : struct.soulEquipByPositionMap.entrySet()) { - oprot.writeI32(_iter48.getKey()); - oprot.writeI32(_iter48.getValue()); + oprot.writeI32(_iter53.getKey()); + oprot.writeI32(_iter53.getValue()); } } } @@ -2422,34 +2556,34 @@ public class ArenaOfHero implements org.apache.thrift.TBase _iter50 : struct.attributeMap.entrySet()) + for (Map.Entry _iter55 : struct.attributeMap.entrySet()) { - oprot.writeI32(_iter50.getKey()); - oprot.writeI64(_iter50.getValue()); + oprot.writeI32(_iter55.getKey()); + oprot.writeI64(_iter55.getValue()); } } } if (struct.isSetAttributeMapByTeam()) { { oprot.writeI32(struct.attributeMapByTeam.size()); - for (Map.Entry> _iter51 : struct.attributeMapByTeam.entrySet()) + for (Map.Entry> _iter56 : struct.attributeMapByTeam.entrySet()) { - oprot.writeI32(_iter51.getKey()); + oprot.writeI32(_iter56.getKey()); { - oprot.writeI32(_iter51.getValue().size()); - for (Map.Entry _iter52 : _iter51.getValue().entrySet()) + oprot.writeI32(_iter56.getValue().size()); + for (Map.Entry _iter57 : _iter56.getValue().entrySet()) { - oprot.writeI32(_iter52.getKey()); - oprot.writeI64(_iter52.getValue()); + oprot.writeI32(_iter57.getKey()); + oprot.writeI64(_iter57.getValue()); } } } @@ -2458,15 +2592,15 @@ public class ArenaOfHero implements org.apache.thrift.TBase> _iter53 : struct.attributeMapByTeamBattle.entrySet()) + for (Map.Entry> _iter58 : struct.attributeMapByTeamBattle.entrySet()) { - oprot.writeI32(_iter53.getKey()); + oprot.writeI32(_iter58.getKey()); { - oprot.writeI32(_iter53.getValue().size()); - for (Map.Entry _iter54 : _iter53.getValue().entrySet()) + oprot.writeI32(_iter58.getValue().size()); + for (Map.Entry _iter59 : _iter58.getValue().entrySet()) { - oprot.writeI32(_iter54.getKey()); - oprot.writeI64(_iter54.getValue()); + oprot.writeI32(_iter59.getKey()); + oprot.writeI64(_iter59.getValue()); } } } @@ -2478,12 +2612,22 @@ public class ArenaOfHero implements org.apache.thrift.TBase _iter60 : struct.godSealByPositionMap.entrySet()) + { + oprot.writeI32(_iter60.getKey()); + oprot.writeI32(_iter60.getValue()); + } + } + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, ArenaOfHero struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(19); + BitSet incoming = iprot.readBitSet(20); if (incoming.get(0)) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -2502,30 +2646,30 @@ public class ArenaOfHero implements org.apache.thrift.TBase(2*_map55.size); - int _key56; - int _val57; - for (int _i58 = 0; _i58 < _map55.size; ++_i58) + org.apache.thrift.protocol.TMap _map61 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.equipByPositionMap = new HashMap(2*_map61.size); + int _key62; + int _val63; + for (int _i64 = 0; _i64 < _map61.size; ++_i64) { - _key56 = iprot.readI32(); - _val57 = iprot.readI32(); - struct.equipByPositionMap.put(_key56, _val57); + _key62 = iprot.readI32(); + _val63 = iprot.readI32(); + struct.equipByPositionMap.put(_key62, _val63); } } struct.setEquipByPositionMapIsSet(true); } if (incoming.get(5)) { { - org.apache.thrift.protocol.TMap _map59 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.soulEquipByPositionMap = new HashMap(2*_map59.size); - int _key60; - int _val61; - for (int _i62 = 0; _i62 < _map59.size; ++_i62) + org.apache.thrift.protocol.TMap _map65 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.soulEquipByPositionMap = new HashMap(2*_map65.size); + int _key66; + int _val67; + for (int _i68 = 0; _i68 < _map65.size; ++_i68) { - _key60 = iprot.readI32(); - _val61 = iprot.readI32(); - struct.soulEquipByPositionMap.put(_key60, _val61); + _key66 = iprot.readI32(); + _val67 = iprot.readI32(); + struct.soulEquipByPositionMap.put(_key66, _val67); } } struct.setSoulEquipByPositionMapIsSet(true); @@ -2560,80 +2704,80 @@ public class ArenaOfHero implements org.apache.thrift.TBase(2*_set63.size); - String _elem64; - for (int _i65 = 0; _i65 < _set63.size; ++_i65) + org.apache.thrift.protocol.TSet _set69 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.jewelInfo = new HashSet(2*_set69.size); + String _elem70; + for (int _i71 = 0; _i71 < _set69.size; ++_i71) { - _elem64 = iprot.readString(); - struct.jewelInfo.add(_elem64); + _elem70 = iprot.readString(); + struct.jewelInfo.add(_elem70); } } struct.setJewelInfoIsSet(true); } if (incoming.get(14)) { { - org.apache.thrift.protocol.TMap _map66 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.attributeMap = new HashMap(2*_map66.size); - int _key67; - long _val68; - for (int _i69 = 0; _i69 < _map66.size; ++_i69) + org.apache.thrift.protocol.TMap _map72 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.attributeMap = new HashMap(2*_map72.size); + int _key73; + long _val74; + for (int _i75 = 0; _i75 < _map72.size; ++_i75) { - _key67 = iprot.readI32(); - _val68 = iprot.readI64(); - struct.attributeMap.put(_key67, _val68); + _key73 = iprot.readI32(); + _val74 = iprot.readI64(); + struct.attributeMap.put(_key73, _val74); } } struct.setAttributeMapIsSet(true); } if (incoming.get(15)) { { - org.apache.thrift.protocol.TMap _map70 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.attributeMapByTeam = new HashMap>(2*_map70.size); - int _key71; - Map _val72; - for (int _i73 = 0; _i73 < _map70.size; ++_i73) + org.apache.thrift.protocol.TMap _map76 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.attributeMapByTeam = new HashMap>(2*_map76.size); + int _key77; + Map _val78; + for (int _i79 = 0; _i79 < _map76.size; ++_i79) { - _key71 = iprot.readI32(); + _key77 = iprot.readI32(); { - org.apache.thrift.protocol.TMap _map74 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _val72 = new HashMap(2*_map74.size); - int _key75; - long _val76; - for (int _i77 = 0; _i77 < _map74.size; ++_i77) + org.apache.thrift.protocol.TMap _map80 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _val78 = new HashMap(2*_map80.size); + int _key81; + long _val82; + for (int _i83 = 0; _i83 < _map80.size; ++_i83) { - _key75 = iprot.readI32(); - _val76 = iprot.readI64(); - _val72.put(_key75, _val76); + _key81 = iprot.readI32(); + _val82 = iprot.readI64(); + _val78.put(_key81, _val82); } } - struct.attributeMapByTeam.put(_key71, _val72); + struct.attributeMapByTeam.put(_key77, _val78); } } struct.setAttributeMapByTeamIsSet(true); } if (incoming.get(16)) { { - org.apache.thrift.protocol.TMap _map78 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.attributeMapByTeamBattle = new HashMap>(2*_map78.size); - int _key79; - Map _val80; - for (int _i81 = 0; _i81 < _map78.size; ++_i81) + org.apache.thrift.protocol.TMap _map84 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.attributeMapByTeamBattle = new HashMap>(2*_map84.size); + int _key85; + Map _val86; + for (int _i87 = 0; _i87 < _map84.size; ++_i87) { - _key79 = iprot.readI32(); + _key85 = iprot.readI32(); { - org.apache.thrift.protocol.TMap _map82 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _val80 = new HashMap(2*_map82.size); - int _key83; - long _val84; - for (int _i85 = 0; _i85 < _map82.size; ++_i85) + org.apache.thrift.protocol.TMap _map88 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _val86 = new HashMap(2*_map88.size); + int _key89; + long _val90; + for (int _i91 = 0; _i91 < _map88.size; ++_i91) { - _key83 = iprot.readI32(); - _val84 = iprot.readI64(); - _val80.put(_key83, _val84); + _key89 = iprot.readI32(); + _val90 = iprot.readI64(); + _val86.put(_key89, _val90); } } - struct.attributeMapByTeamBattle.put(_key79, _val80); + struct.attributeMapByTeamBattle.put(_key85, _val86); } } struct.setAttributeMapByTeamBattleIsSet(true); @@ -2646,6 +2790,21 @@ public class ArenaOfHero implements org.apache.thrift.TBase(2*_map92.size); + int _key93; + int _val94; + for (int _i95 = 0; _i95 < _map92.size; ++_i95) + { + _key93 = iprot.readI32(); + _val94 = iprot.readI32(); + struct.godSealByPositionMap.put(_key93, _val94); + } + } + struct.setGodSealByPositionMapIsSet(true); + } } } 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 251addbc7..1652e9b80 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 @@ -2355,26 +2355,26 @@ public class CrossArenaManager implements org.apache.thrift.TBase>(2*_map114.size); - int _key115; - List _val116; - for (int _i117 = 0; _i117 < _map114.size; ++_i117) + org.apache.thrift.protocol.TMap _map124 = iprot.readMapBegin(); + struct.teams = new HashMap>(2*_map124.size); + int _key125; + List _val126; + for (int _i127 = 0; _i127 < _map124.size; ++_i127) { - _key115 = iprot.readI32(); + _key125 = iprot.readI32(); { - org.apache.thrift.protocol.TList _list118 = iprot.readListBegin(); - _val116 = new ArrayList(_list118.size); - TeamPosHeroInfo _elem119; - for (int _i120 = 0; _i120 < _list118.size; ++_i120) + org.apache.thrift.protocol.TList _list128 = iprot.readListBegin(); + _val126 = new ArrayList(_list128.size); + TeamPosHeroInfo _elem129; + for (int _i130 = 0; _i130 < _list128.size; ++_i130) { - _elem119 = new TeamPosHeroInfo(); - _elem119.read(iprot); - _val116.add(_elem119); + _elem129 = new TeamPosHeroInfo(); + _elem129.read(iprot); + _val126.add(_elem129); } iprot.readListEnd(); } - struct.teams.put(_key115, _val116); + struct.teams.put(_key125, _val126); } iprot.readMapEnd(); } @@ -2386,16 +2386,16 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map121.size); - String _key122; - ArenaOfHero _val123; - for (int _i124 = 0; _i124 < _map121.size; ++_i124) + org.apache.thrift.protocol.TMap _map131 = iprot.readMapBegin(); + struct.heros = new HashMap(2*_map131.size); + String _key132; + ArenaOfHero _val133; + for (int _i134 = 0; _i134 < _map131.size; ++_i134) { - _key122 = iprot.readString(); - _val123 = new ArenaOfHero(); - _val123.read(iprot); - struct.heros.put(_key122, _val123); + _key132 = iprot.readString(); + _val133 = new ArenaOfHero(); + _val133.read(iprot); + struct.heros.put(_key132, _val133); } iprot.readMapEnd(); } @@ -2407,16 +2407,16 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map125.size); - String _key126; - PropertyItem _val127; - for (int _i128 = 0; _i128 < _map125.size; ++_i128) + org.apache.thrift.protocol.TMap _map135 = iprot.readMapBegin(); + struct.jewels = new HashMap(2*_map135.size); + String _key136; + PropertyItem _val137; + for (int _i138 = 0; _i138 < _map135.size; ++_i138) { - _key126 = iprot.readString(); - _val127 = new PropertyItem(); - _val127.read(iprot); - struct.jewels.put(_key126, _val127); + _key136 = iprot.readString(); + _val137 = new PropertyItem(); + _val137.read(iprot); + struct.jewels.put(_key136, _val137); } iprot.readMapEnd(); } @@ -2428,15 +2428,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map129.size); - int _key130; - int _val131; - for (int _i132 = 0; _i132 < _map129.size; ++_i132) + org.apache.thrift.protocol.TMap _map139 = iprot.readMapBegin(); + struct.totalForceByTeam = new HashMap(2*_map139.size); + int _key140; + int _val141; + for (int _i142 = 0; _i142 < _map139.size; ++_i142) { - _key130 = iprot.readI32(); - _val131 = iprot.readI32(); - struct.totalForceByTeam.put(_key130, _val131); + _key140 = iprot.readI32(); + _val141 = iprot.readI32(); + struct.totalForceByTeam.put(_key140, _val141); } iprot.readMapEnd(); } @@ -2464,16 +2464,16 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map133.size); - String _key134; - Pokemon _val135; - for (int _i136 = 0; _i136 < _map133.size; ++_i136) + org.apache.thrift.protocol.TMap _map143 = iprot.readMapBegin(); + struct.pokemons = new HashMap(2*_map143.size); + String _key144; + Pokemon _val145; + for (int _i146 = 0; _i146 < _map143.size; ++_i146) { - _key134 = iprot.readString(); - _val135 = new Pokemon(); - _val135.read(iprot); - struct.pokemons.put(_key134, _val135); + _key144 = iprot.readString(); + _val145 = new Pokemon(); + _val145.read(iprot); + struct.pokemons.put(_key144, _val145); } iprot.readMapEnd(); } @@ -2485,16 +2485,16 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map137.size); - int _key138; - PurpleMansionSeal _val139; - for (int _i140 = 0; _i140 < _map137.size; ++_i140) + org.apache.thrift.protocol.TMap _map147 = iprot.readMapBegin(); + struct.seals = new HashMap(2*_map147.size); + int _key148; + PurpleMansionSeal _val149; + for (int _i150 = 0; _i150 < _map147.size; ++_i150) { - _key138 = iprot.readI32(); - _val139 = new PurpleMansionSeal(); - _val139.read(iprot); - struct.seals.put(_key138, _val139); + _key148 = iprot.readI32(); + _val149 = new PurpleMansionSeal(); + _val149.read(iprot); + struct.seals.put(_key148, _val149); } iprot.readMapEnd(); } @@ -2506,15 +2506,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map141.size); - int _key142; - int _val143; - for (int _i144 = 0; _i144 < _map141.size; ++_i144) + org.apache.thrift.protocol.TMap _map151 = iprot.readMapBegin(); + struct.guildSkill = new HashMap(2*_map151.size); + int _key152; + int _val153; + for (int _i154 = 0; _i154 < _map151.size; ++_i154) { - _key142 = iprot.readI32(); - _val143 = iprot.readI32(); - struct.guildSkill.put(_key142, _val143); + _key152 = iprot.readI32(); + _val153 = iprot.readI32(); + struct.guildSkill.put(_key152, _val153); } iprot.readMapEnd(); } @@ -2526,15 +2526,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map145.size); - int _key146; - String _val147; - for (int _i148 = 0; _i148 < _map145.size; ++_i148) + org.apache.thrift.protocol.TMap _map155 = iprot.readMapBegin(); + struct.pokemonTeamMap = new HashMap(2*_map155.size); + int _key156; + String _val157; + for (int _i158 = 0; _i158 < _map155.size; ++_i158) { - _key146 = iprot.readI32(); - _val147 = iprot.readString(); - struct.pokemonTeamMap.put(_key146, _val147); + _key156 = iprot.readI32(); + _val157 = iprot.readString(); + struct.pokemonTeamMap.put(_key156, _val157); } iprot.readMapEnd(); } @@ -2554,13 +2554,13 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list149.size); - int _elem150; - for (int _i151 = 0; _i151 < _list149.size; ++_i151) + org.apache.thrift.protocol.TList _list159 = iprot.readListBegin(); + struct.skill = new ArrayList(_list159.size); + int _elem160; + for (int _i161 = 0; _i161 < _list159.size; ++_i161) { - _elem150 = iprot.readI32(); - struct.skill.add(_elem150); + _elem160 = iprot.readI32(); + struct.skill.add(_elem160); } iprot.readListEnd(); } @@ -2580,15 +2580,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map152.size); - int _key153; - int _val154; - for (int _i155 = 0; _i155 < _map152.size; ++_i155) + org.apache.thrift.protocol.TMap _map162 = iprot.readMapBegin(); + struct.practiceSkillMap = new HashMap(2*_map162.size); + int _key163; + int _val164; + for (int _i165 = 0; _i165 < _map162.size; ++_i165) { - _key153 = iprot.readI32(); - _val154 = iprot.readI32(); - struct.practiceSkillMap.put(_key153, _val154); + _key163 = iprot.readI32(); + _val164 = iprot.readI32(); + struct.practiceSkillMap.put(_key163, _val164); } iprot.readMapEnd(); } @@ -2608,15 +2608,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map156.size); - int _key157; - int _val158; - for (int _i159 = 0; _i159 < _map156.size; ++_i159) + org.apache.thrift.protocol.TMap _map166 = iprot.readMapBegin(); + struct.faBaoGongMingSkillMap = new HashMap(2*_map166.size); + int _key167; + int _val168; + for (int _i169 = 0; _i169 < _map166.size; ++_i169) { - _key157 = iprot.readI32(); - _val158 = iprot.readI32(); - struct.faBaoGongMingSkillMap.put(_key157, _val158); + _key167 = iprot.readI32(); + _val168 = iprot.readI32(); + struct.faBaoGongMingSkillMap.put(_key167, _val168); } iprot.readMapEnd(); } @@ -2628,13 +2628,13 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list160.size); - int _elem161; - for (int _i162 = 0; _i162 < _list160.size; ++_i162) + org.apache.thrift.protocol.TList _list170 = iprot.readListBegin(); + struct.tfInfoList = new ArrayList(_list170.size); + int _elem171; + for (int _i172 = 0; _i172 < _list170.size; ++_i172) { - _elem161 = iprot.readI32(); - struct.tfInfoList.add(_elem161); + _elem171 = iprot.readI32(); + struct.tfInfoList.add(_elem171); } iprot.readListEnd(); } @@ -2646,15 +2646,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map163.size); - int _key164; - int _val165; - for (int _i166 = 0; _i166 < _map163.size; ++_i166) + org.apache.thrift.protocol.TMap _map173 = iprot.readMapBegin(); + struct.homeEquipLv = new HashMap(2*_map173.size); + int _key174; + int _val175; + for (int _i176 = 0; _i176 < _map173.size; ++_i176) { - _key164 = iprot.readI32(); - _val165 = iprot.readI32(); - struct.homeEquipLv.put(_key164, _val165); + _key174 = iprot.readI32(); + _val175 = iprot.readI32(); + struct.homeEquipLv.put(_key174, _val175); } iprot.readMapEnd(); } @@ -2666,14 +2666,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list167.size); - SixiangxinfaInfo _elem168; - for (int _i169 = 0; _i169 < _list167.size; ++_i169) + org.apache.thrift.protocol.TList _list177 = iprot.readListBegin(); + struct.sixiangInfos = new ArrayList(_list177.size); + SixiangxinfaInfo _elem178; + for (int _i179 = 0; _i179 < _list177.size; ++_i179) { - _elem168 = new SixiangxinfaInfo(); - _elem168.read(iprot); - struct.sixiangInfos.add(_elem168); + _elem178 = new SixiangxinfaInfo(); + _elem178.read(iprot); + struct.sixiangInfos.add(_elem178); } iprot.readListEnd(); } @@ -2685,14 +2685,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list170.size); - LifeGridInfo _elem171; - for (int _i172 = 0; _i172 < _list170.size; ++_i172) + org.apache.thrift.protocol.TList _list180 = iprot.readListBegin(); + struct.lifeGridInfos = new ArrayList(_list180.size); + LifeGridInfo _elem181; + for (int _i182 = 0; _i182 < _list180.size; ++_i182) { - _elem171 = new LifeGridInfo(); - _elem171.read(iprot); - struct.lifeGridInfos.add(_elem171); + _elem181 = new LifeGridInfo(); + _elem181.read(iprot); + struct.lifeGridInfos.add(_elem181); } iprot.readListEnd(); } @@ -2704,14 +2704,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list173.size); - UserMountInfo _elem174; - for (int _i175 = 0; _i175 < _list173.size; ++_i175) + org.apache.thrift.protocol.TList _list183 = iprot.readListBegin(); + struct.userMountValidTime = new ArrayList(_list183.size); + UserMountInfo _elem184; + for (int _i185 = 0; _i185 < _list183.size; ++_i185) { - _elem174 = new UserMountInfo(); - _elem174.read(iprot); - struct.userMountValidTime.add(_elem174); + _elem184 = new UserMountInfo(); + _elem184.read(iprot); + struct.userMountValidTime.add(_elem184); } iprot.readListEnd(); } @@ -2723,14 +2723,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list176.size); - TransformationCardInfo _elem177; - for (int _i178 = 0; _i178 < _list176.size; ++_i178) + org.apache.thrift.protocol.TList _list186 = iprot.readListBegin(); + struct.transformationList = new ArrayList(_list186.size); + TransformationCardInfo _elem187; + for (int _i188 = 0; _i188 < _list186.size; ++_i188) { - _elem177 = new TransformationCardInfo(); - _elem177.read(iprot); - struct.transformationList.add(_elem177); + _elem187 = new TransformationCardInfo(); + _elem187.read(iprot); + struct.transformationList.add(_elem187); } iprot.readListEnd(); } @@ -2759,14 +2759,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter179 : struct.teams.entrySet()) + for (Map.Entry> _iter189 : struct.teams.entrySet()) { - oprot.writeI32(_iter179.getKey()); + oprot.writeI32(_iter189.getKey()); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter179.getValue().size())); - for (TeamPosHeroInfo _iter180 : _iter179.getValue()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter189.getValue().size())); + for (TeamPosHeroInfo _iter190 : _iter189.getValue()) { - _iter180.write(oprot); + _iter190.write(oprot); } oprot.writeListEnd(); } @@ -2781,10 +2781,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter181 : struct.heros.entrySet()) + for (Map.Entry _iter191 : struct.heros.entrySet()) { - oprot.writeString(_iter181.getKey()); - _iter181.getValue().write(oprot); + oprot.writeString(_iter191.getKey()); + _iter191.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2796,10 +2796,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter182 : struct.jewels.entrySet()) + for (Map.Entry _iter192 : struct.jewels.entrySet()) { - oprot.writeString(_iter182.getKey()); - _iter182.getValue().write(oprot); + oprot.writeString(_iter192.getKey()); + _iter192.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2811,10 +2811,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter183 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter193 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter183.getKey()); - oprot.writeI32(_iter183.getValue()); + oprot.writeI32(_iter193.getKey()); + oprot.writeI32(_iter193.getValue()); } oprot.writeMapEnd(); } @@ -2836,10 +2836,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter184 : struct.pokemons.entrySet()) + for (Map.Entry _iter194 : struct.pokemons.entrySet()) { - oprot.writeString(_iter184.getKey()); - _iter184.getValue().write(oprot); + oprot.writeString(_iter194.getKey()); + _iter194.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2851,10 +2851,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter185 : struct.seals.entrySet()) + for (Map.Entry _iter195 : struct.seals.entrySet()) { - oprot.writeI32(_iter185.getKey()); - _iter185.getValue().write(oprot); + oprot.writeI32(_iter195.getKey()); + _iter195.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2866,10 +2866,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter186 : struct.guildSkill.entrySet()) + for (Map.Entry _iter196 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter186.getKey()); - oprot.writeI32(_iter186.getValue()); + oprot.writeI32(_iter196.getKey()); + oprot.writeI32(_iter196.getValue()); } oprot.writeMapEnd(); } @@ -2881,10 +2881,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter187 : struct.pokemonTeamMap.entrySet()) + for (Map.Entry _iter197 : struct.pokemonTeamMap.entrySet()) { - oprot.writeI32(_iter187.getKey()); - oprot.writeString(_iter187.getValue()); + oprot.writeI32(_iter197.getKey()); + oprot.writeString(_iter197.getValue()); } oprot.writeMapEnd(); } @@ -2901,9 +2901,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter189 : struct.practiceSkillMap.entrySet()) + for (Map.Entry _iter199 : struct.practiceSkillMap.entrySet()) { - oprot.writeI32(_iter189.getKey()); - oprot.writeI32(_iter189.getValue()); + oprot.writeI32(_iter199.getKey()); + oprot.writeI32(_iter199.getValue()); } oprot.writeMapEnd(); } @@ -2940,10 +2940,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter190 : struct.faBaoGongMingSkillMap.entrySet()) + for (Map.Entry _iter200 : struct.faBaoGongMingSkillMap.entrySet()) { - oprot.writeI32(_iter190.getKey()); - oprot.writeI32(_iter190.getValue()); + oprot.writeI32(_iter200.getKey()); + oprot.writeI32(_iter200.getValue()); } oprot.writeMapEnd(); } @@ -2955,9 +2955,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter192 : struct.homeEquipLv.entrySet()) + for (Map.Entry _iter202 : struct.homeEquipLv.entrySet()) { - oprot.writeI32(_iter192.getKey()); - oprot.writeI32(_iter192.getValue()); + oprot.writeI32(_iter202.getKey()); + oprot.writeI32(_iter202.getValue()); } oprot.writeMapEnd(); } @@ -2984,9 +2984,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter197 : struct.teams.entrySet()) + for (Map.Entry> _iter207 : struct.teams.entrySet()) { - oprot.writeI32(_iter197.getKey()); + oprot.writeI32(_iter207.getKey()); { - oprot.writeI32(_iter197.getValue().size()); - for (TeamPosHeroInfo _iter198 : _iter197.getValue()) + oprot.writeI32(_iter207.getValue().size()); + for (TeamPosHeroInfo _iter208 : _iter207.getValue()) { - _iter198.write(oprot); + _iter208.write(oprot); } } } @@ -3139,30 +3139,30 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter199 : struct.heros.entrySet()) + for (Map.Entry _iter209 : struct.heros.entrySet()) { - oprot.writeString(_iter199.getKey()); - _iter199.getValue().write(oprot); + oprot.writeString(_iter209.getKey()); + _iter209.getValue().write(oprot); } } } if (struct.isSetJewels()) { { oprot.writeI32(struct.jewels.size()); - for (Map.Entry _iter200 : struct.jewels.entrySet()) + for (Map.Entry _iter210 : struct.jewels.entrySet()) { - oprot.writeString(_iter200.getKey()); - _iter200.getValue().write(oprot); + oprot.writeString(_iter210.getKey()); + _iter210.getValue().write(oprot); } } } if (struct.isSetTotalForceByTeam()) { { oprot.writeI32(struct.totalForceByTeam.size()); - for (Map.Entry _iter201 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter211 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter201.getKey()); - oprot.writeI32(_iter201.getValue()); + oprot.writeI32(_iter211.getKey()); + oprot.writeI32(_iter211.getValue()); } } } @@ -3175,40 +3175,40 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter202 : struct.pokemons.entrySet()) + for (Map.Entry _iter212 : struct.pokemons.entrySet()) { - oprot.writeString(_iter202.getKey()); - _iter202.getValue().write(oprot); + oprot.writeString(_iter212.getKey()); + _iter212.getValue().write(oprot); } } } if (struct.isSetSeals()) { { oprot.writeI32(struct.seals.size()); - for (Map.Entry _iter203 : struct.seals.entrySet()) + for (Map.Entry _iter213 : struct.seals.entrySet()) { - oprot.writeI32(_iter203.getKey()); - _iter203.getValue().write(oprot); + oprot.writeI32(_iter213.getKey()); + _iter213.getValue().write(oprot); } } } if (struct.isSetGuildSkill()) { { oprot.writeI32(struct.guildSkill.size()); - for (Map.Entry _iter204 : struct.guildSkill.entrySet()) + for (Map.Entry _iter214 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter204.getKey()); - oprot.writeI32(_iter204.getValue()); + oprot.writeI32(_iter214.getKey()); + oprot.writeI32(_iter214.getValue()); } } } if (struct.isSetPokemonTeamMap()) { { oprot.writeI32(struct.pokemonTeamMap.size()); - for (Map.Entry _iter205 : struct.pokemonTeamMap.entrySet()) + for (Map.Entry _iter215 : struct.pokemonTeamMap.entrySet()) { - oprot.writeI32(_iter205.getKey()); - oprot.writeString(_iter205.getValue()); + oprot.writeI32(_iter215.getKey()); + oprot.writeString(_iter215.getValue()); } } } @@ -3218,9 +3218,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter207 : struct.practiceSkillMap.entrySet()) + for (Map.Entry _iter217 : struct.practiceSkillMap.entrySet()) { - oprot.writeI32(_iter207.getKey()); - oprot.writeI32(_iter207.getValue()); + oprot.writeI32(_iter217.getKey()); + oprot.writeI32(_iter217.getValue()); } } } @@ -3243,65 +3243,65 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter208 : struct.faBaoGongMingSkillMap.entrySet()) + for (Map.Entry _iter218 : struct.faBaoGongMingSkillMap.entrySet()) { - oprot.writeI32(_iter208.getKey()); - oprot.writeI32(_iter208.getValue()); + oprot.writeI32(_iter218.getKey()); + oprot.writeI32(_iter218.getValue()); } } } if (struct.isSetTfInfoList()) { { oprot.writeI32(struct.tfInfoList.size()); - for (int _iter209 : struct.tfInfoList) + for (int _iter219 : struct.tfInfoList) { - oprot.writeI32(_iter209); + oprot.writeI32(_iter219); } } } if (struct.isSetHomeEquipLv()) { { oprot.writeI32(struct.homeEquipLv.size()); - for (Map.Entry _iter210 : struct.homeEquipLv.entrySet()) + for (Map.Entry _iter220 : struct.homeEquipLv.entrySet()) { - oprot.writeI32(_iter210.getKey()); - oprot.writeI32(_iter210.getValue()); + oprot.writeI32(_iter220.getKey()); + oprot.writeI32(_iter220.getValue()); } } } if (struct.isSetSixiangInfos()) { { oprot.writeI32(struct.sixiangInfos.size()); - for (SixiangxinfaInfo _iter211 : struct.sixiangInfos) + for (SixiangxinfaInfo _iter221 : struct.sixiangInfos) { - _iter211.write(oprot); + _iter221.write(oprot); } } } if (struct.isSetLifeGridInfos()) { { oprot.writeI32(struct.lifeGridInfos.size()); - for (LifeGridInfo _iter212 : struct.lifeGridInfos) + for (LifeGridInfo _iter222 : struct.lifeGridInfos) { - _iter212.write(oprot); + _iter222.write(oprot); } } } if (struct.isSetUserMountValidTime()) { { oprot.writeI32(struct.userMountValidTime.size()); - for (UserMountInfo _iter213 : struct.userMountValidTime) + for (UserMountInfo _iter223 : struct.userMountValidTime) { - _iter213.write(oprot); + _iter223.write(oprot); } } } if (struct.isSetTransformationList()) { { oprot.writeI32(struct.transformationList.size()); - for (TransformationCardInfo _iter214 : struct.transformationList) + for (TransformationCardInfo _iter224 : struct.transformationList) { - _iter214.write(oprot); + _iter224.write(oprot); } } } @@ -3313,72 +3313,72 @@ public class CrossArenaManager implements org.apache.thrift.TBase>(2*_map215.size); - int _key216; - List _val217; - for (int _i218 = 0; _i218 < _map215.size; ++_i218) + org.apache.thrift.protocol.TMap _map225 = 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*_map225.size); + int _key226; + List _val227; + for (int _i228 = 0; _i228 < _map225.size; ++_i228) { - _key216 = iprot.readI32(); + _key226 = iprot.readI32(); { - org.apache.thrift.protocol.TList _list219 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - _val217 = new ArrayList(_list219.size); - TeamPosHeroInfo _elem220; - for (int _i221 = 0; _i221 < _list219.size; ++_i221) + org.apache.thrift.protocol.TList _list229 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + _val227 = new ArrayList(_list229.size); + TeamPosHeroInfo _elem230; + for (int _i231 = 0; _i231 < _list229.size; ++_i231) { - _elem220 = new TeamPosHeroInfo(); - _elem220.read(iprot); - _val217.add(_elem220); + _elem230 = new TeamPosHeroInfo(); + _elem230.read(iprot); + _val227.add(_elem230); } } - struct.teams.put(_key216, _val217); + struct.teams.put(_key226, _val227); } } struct.setTeamsIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map222 = 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*_map222.size); - String _key223; - ArenaOfHero _val224; - for (int _i225 = 0; _i225 < _map222.size; ++_i225) + org.apache.thrift.protocol.TMap _map232 = 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*_map232.size); + String _key233; + ArenaOfHero _val234; + for (int _i235 = 0; _i235 < _map232.size; ++_i235) { - _key223 = iprot.readString(); - _val224 = new ArenaOfHero(); - _val224.read(iprot); - struct.heros.put(_key223, _val224); + _key233 = iprot.readString(); + _val234 = new ArenaOfHero(); + _val234.read(iprot); + struct.heros.put(_key233, _val234); } } struct.setHerosIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map226 = 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*_map226.size); - String _key227; - PropertyItem _val228; - for (int _i229 = 0; _i229 < _map226.size; ++_i229) + org.apache.thrift.protocol.TMap _map236 = 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*_map236.size); + String _key237; + PropertyItem _val238; + for (int _i239 = 0; _i239 < _map236.size; ++_i239) { - _key227 = iprot.readString(); - _val228 = new PropertyItem(); - _val228.read(iprot); - struct.jewels.put(_key227, _val228); + _key237 = iprot.readString(); + _val238 = new PropertyItem(); + _val238.read(iprot); + struct.jewels.put(_key237, _val238); } } struct.setJewelsIsSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map230 = 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*_map230.size); - int _key231; - int _val232; - for (int _i233 = 0; _i233 < _map230.size; ++_i233) + org.apache.thrift.protocol.TMap _map240 = 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*_map240.size); + int _key241; + int _val242; + for (int _i243 = 0; _i243 < _map240.size; ++_i243) { - _key231 = iprot.readI32(); - _val232 = iprot.readI32(); - struct.totalForceByTeam.put(_key231, _val232); + _key241 = iprot.readI32(); + _val242 = iprot.readI32(); + struct.totalForceByTeam.put(_key241, _val242); } } struct.setTotalForceByTeamIsSet(true); @@ -3393,62 +3393,62 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map234.size); - String _key235; - Pokemon _val236; - for (int _i237 = 0; _i237 < _map234.size; ++_i237) + org.apache.thrift.protocol.TMap _map244 = 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*_map244.size); + String _key245; + Pokemon _val246; + for (int _i247 = 0; _i247 < _map244.size; ++_i247) { - _key235 = iprot.readString(); - _val236 = new Pokemon(); - _val236.read(iprot); - struct.pokemons.put(_key235, _val236); + _key245 = iprot.readString(); + _val246 = new Pokemon(); + _val246.read(iprot); + struct.pokemons.put(_key245, _val246); } } struct.setPokemonsIsSet(true); } if (incoming.get(7)) { { - org.apache.thrift.protocol.TMap _map238 = 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*_map238.size); - int _key239; - PurpleMansionSeal _val240; - for (int _i241 = 0; _i241 < _map238.size; ++_i241) + org.apache.thrift.protocol.TMap _map248 = 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*_map248.size); + int _key249; + PurpleMansionSeal _val250; + for (int _i251 = 0; _i251 < _map248.size; ++_i251) { - _key239 = iprot.readI32(); - _val240 = new PurpleMansionSeal(); - _val240.read(iprot); - struct.seals.put(_key239, _val240); + _key249 = iprot.readI32(); + _val250 = new PurpleMansionSeal(); + _val250.read(iprot); + struct.seals.put(_key249, _val250); } } struct.setSealsIsSet(true); } if (incoming.get(8)) { { - org.apache.thrift.protocol.TMap _map242 = 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*_map242.size); - int _key243; - int _val244; - for (int _i245 = 0; _i245 < _map242.size; ++_i245) + org.apache.thrift.protocol.TMap _map252 = 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*_map252.size); + int _key253; + int _val254; + for (int _i255 = 0; _i255 < _map252.size; ++_i255) { - _key243 = iprot.readI32(); - _val244 = iprot.readI32(); - struct.guildSkill.put(_key243, _val244); + _key253 = iprot.readI32(); + _val254 = iprot.readI32(); + struct.guildSkill.put(_key253, _val254); } } struct.setGuildSkillIsSet(true); } if (incoming.get(9)) { { - org.apache.thrift.protocol.TMap _map246 = 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*_map246.size); - int _key247; - String _val248; - for (int _i249 = 0; _i249 < _map246.size; ++_i249) + org.apache.thrift.protocol.TMap _map256 = 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*_map256.size); + int _key257; + String _val258; + for (int _i259 = 0; _i259 < _map256.size; ++_i259) { - _key247 = iprot.readI32(); - _val248 = iprot.readString(); - struct.pokemonTeamMap.put(_key247, _val248); + _key257 = iprot.readI32(); + _val258 = iprot.readString(); + struct.pokemonTeamMap.put(_key257, _val258); } } struct.setPokemonTeamMapIsSet(true); @@ -3459,13 +3459,13 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list250.size); - int _elem251; - for (int _i252 = 0; _i252 < _list250.size; ++_i252) + org.apache.thrift.protocol.TList _list260 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.skill = new ArrayList(_list260.size); + int _elem261; + for (int _i262 = 0; _i262 < _list260.size; ++_i262) { - _elem251 = iprot.readI32(); - struct.skill.add(_elem251); + _elem261 = iprot.readI32(); + struct.skill.add(_elem261); } } struct.setSkillIsSet(true); @@ -3476,15 +3476,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map253.size); - int _key254; - int _val255; - for (int _i256 = 0; _i256 < _map253.size; ++_i256) + org.apache.thrift.protocol.TMap _map263 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.practiceSkillMap = new HashMap(2*_map263.size); + int _key264; + int _val265; + for (int _i266 = 0; _i266 < _map263.size; ++_i266) { - _key254 = iprot.readI32(); - _val255 = iprot.readI32(); - struct.practiceSkillMap.put(_key254, _val255); + _key264 = iprot.readI32(); + _val265 = iprot.readI32(); + struct.practiceSkillMap.put(_key264, _val265); } } struct.setPracticeSkillMapIsSet(true); @@ -3495,99 +3495,99 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map257.size); - int _key258; - int _val259; - for (int _i260 = 0; _i260 < _map257.size; ++_i260) + org.apache.thrift.protocol.TMap _map267 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.faBaoGongMingSkillMap = new HashMap(2*_map267.size); + int _key268; + int _val269; + for (int _i270 = 0; _i270 < _map267.size; ++_i270) { - _key258 = iprot.readI32(); - _val259 = iprot.readI32(); - struct.faBaoGongMingSkillMap.put(_key258, _val259); + _key268 = iprot.readI32(); + _val269 = iprot.readI32(); + struct.faBaoGongMingSkillMap.put(_key268, _val269); } } struct.setFaBaoGongMingSkillMapIsSet(true); } if (incoming.get(16)) { { - org.apache.thrift.protocol.TList _list261 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.tfInfoList = new ArrayList(_list261.size); - int _elem262; - for (int _i263 = 0; _i263 < _list261.size; ++_i263) + org.apache.thrift.protocol.TList _list271 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.tfInfoList = new ArrayList(_list271.size); + int _elem272; + for (int _i273 = 0; _i273 < _list271.size; ++_i273) { - _elem262 = iprot.readI32(); - struct.tfInfoList.add(_elem262); + _elem272 = iprot.readI32(); + struct.tfInfoList.add(_elem272); } } struct.setTfInfoListIsSet(true); } if (incoming.get(17)) { { - org.apache.thrift.protocol.TMap _map264 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.homeEquipLv = new HashMap(2*_map264.size); - int _key265; - int _val266; - for (int _i267 = 0; _i267 < _map264.size; ++_i267) + org.apache.thrift.protocol.TMap _map274 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.homeEquipLv = new HashMap(2*_map274.size); + int _key275; + int _val276; + for (int _i277 = 0; _i277 < _map274.size; ++_i277) { - _key265 = iprot.readI32(); - _val266 = iprot.readI32(); - struct.homeEquipLv.put(_key265, _val266); + _key275 = iprot.readI32(); + _val276 = iprot.readI32(); + struct.homeEquipLv.put(_key275, _val276); } } struct.setHomeEquipLvIsSet(true); } if (incoming.get(18)) { { - org.apache.thrift.protocol.TList _list268 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.sixiangInfos = new ArrayList(_list268.size); - SixiangxinfaInfo _elem269; - for (int _i270 = 0; _i270 < _list268.size; ++_i270) + org.apache.thrift.protocol.TList _list278 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.sixiangInfos = new ArrayList(_list278.size); + SixiangxinfaInfo _elem279; + for (int _i280 = 0; _i280 < _list278.size; ++_i280) { - _elem269 = new SixiangxinfaInfo(); - _elem269.read(iprot); - struct.sixiangInfos.add(_elem269); + _elem279 = new SixiangxinfaInfo(); + _elem279.read(iprot); + struct.sixiangInfos.add(_elem279); } } struct.setSixiangInfosIsSet(true); } if (incoming.get(19)) { { - org.apache.thrift.protocol.TList _list271 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.lifeGridInfos = new ArrayList(_list271.size); - LifeGridInfo _elem272; - for (int _i273 = 0; _i273 < _list271.size; ++_i273) + org.apache.thrift.protocol.TList _list281 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.lifeGridInfos = new ArrayList(_list281.size); + LifeGridInfo _elem282; + for (int _i283 = 0; _i283 < _list281.size; ++_i283) { - _elem272 = new LifeGridInfo(); - _elem272.read(iprot); - struct.lifeGridInfos.add(_elem272); + _elem282 = new LifeGridInfo(); + _elem282.read(iprot); + struct.lifeGridInfos.add(_elem282); } } struct.setLifeGridInfosIsSet(true); } if (incoming.get(20)) { { - org.apache.thrift.protocol.TList _list274 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.userMountValidTime = new ArrayList(_list274.size); - UserMountInfo _elem275; - for (int _i276 = 0; _i276 < _list274.size; ++_i276) + org.apache.thrift.protocol.TList _list284 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.userMountValidTime = new ArrayList(_list284.size); + UserMountInfo _elem285; + for (int _i286 = 0; _i286 < _list284.size; ++_i286) { - _elem275 = new UserMountInfo(); - _elem275.read(iprot); - struct.userMountValidTime.add(_elem275); + _elem285 = new UserMountInfo(); + _elem285.read(iprot); + struct.userMountValidTime.add(_elem285); } } struct.setUserMountValidTimeIsSet(true); } if (incoming.get(21)) { { - org.apache.thrift.protocol.TList _list277 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.transformationList = new ArrayList(_list277.size); - TransformationCardInfo _elem278; - for (int _i279 = 0; _i279 < _list277.size; ++_i279) + org.apache.thrift.protocol.TList _list287 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.transformationList = new ArrayList(_list287.size); + TransformationCardInfo _elem288; + for (int _i289 = 0; _i289 < _list287.size; ++_i289) { - _elem278 = new TransformationCardInfo(); - _elem278.read(iprot); - struct.transformationList.add(_elem278); + _elem288 = new TransformationCardInfo(); + _elem288.read(iprot); + struct.transformationList.add(_elem288); } } struct.setTransformationListIsSet(true); 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 3a928f139..baa995ad7 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 @@ -1099,15 +1099,15 @@ public class PropertyItem implements org.apache.thrift.TBase(2*_map86.size); - int _key87; - long _val88; - for (int _i89 = 0; _i89 < _map86.size; ++_i89) + org.apache.thrift.protocol.TMap _map96 = iprot.readMapBegin(); + struct.propertyValueByIdMap = new HashMap(2*_map96.size); + int _key97; + long _val98; + for (int _i99 = 0; _i99 < _map96.size; ++_i99) { - _key87 = iprot.readI32(); - _val88 = iprot.readI64(); - struct.propertyValueByIdMap.put(_key87, _val88); + _key97 = iprot.readI32(); + _val98 = iprot.readI64(); + struct.propertyValueByIdMap.put(_key97, _val98); } iprot.readMapEnd(); } @@ -1119,15 +1119,15 @@ public class PropertyItem implements org.apache.thrift.TBase(2*_map90.size); - int _key91; - long _val92; - for (int _i93 = 0; _i93 < _map90.size; ++_i93) + org.apache.thrift.protocol.TMap _map100 = iprot.readMapBegin(); + struct.secondValueByIdMap = new HashMap(2*_map100.size); + int _key101; + long _val102; + for (int _i103 = 0; _i103 < _map100.size; ++_i103) { - _key91 = iprot.readI32(); - _val92 = iprot.readI64(); - struct.secondValueByIdMap.put(_key91, _val92); + _key101 = iprot.readI32(); + _val102 = iprot.readI64(); + struct.secondValueByIdMap.put(_key101, _val102); } iprot.readMapEnd(); } @@ -1212,10 +1212,10 @@ public class PropertyItem implements org.apache.thrift.TBase _iter94 : struct.propertyValueByIdMap.entrySet()) + for (Map.Entry _iter104 : struct.propertyValueByIdMap.entrySet()) { - oprot.writeI32(_iter94.getKey()); - oprot.writeI64(_iter94.getValue()); + oprot.writeI32(_iter104.getKey()); + oprot.writeI64(_iter104.getValue()); } oprot.writeMapEnd(); } @@ -1227,10 +1227,10 @@ public class PropertyItem implements org.apache.thrift.TBase _iter95 : struct.secondValueByIdMap.entrySet()) + for (Map.Entry _iter105 : struct.secondValueByIdMap.entrySet()) { - oprot.writeI32(_iter95.getKey()); - oprot.writeI64(_iter95.getValue()); + oprot.writeI32(_iter105.getKey()); + oprot.writeI64(_iter105.getValue()); } oprot.writeMapEnd(); } @@ -1321,20 +1321,20 @@ public class PropertyItem implements org.apache.thrift.TBase _iter96 : struct.propertyValueByIdMap.entrySet()) + for (Map.Entry _iter106 : struct.propertyValueByIdMap.entrySet()) { - oprot.writeI32(_iter96.getKey()); - oprot.writeI64(_iter96.getValue()); + oprot.writeI32(_iter106.getKey()); + oprot.writeI64(_iter106.getValue()); } } } if (struct.isSetSecondValueByIdMap()) { { oprot.writeI32(struct.secondValueByIdMap.size()); - for (Map.Entry _iter97 : struct.secondValueByIdMap.entrySet()) + for (Map.Entry _iter107 : struct.secondValueByIdMap.entrySet()) { - oprot.writeI32(_iter97.getKey()); - oprot.writeI64(_iter97.getValue()); + oprot.writeI32(_iter107.getKey()); + oprot.writeI64(_iter107.getValue()); } } } @@ -1374,30 +1374,30 @@ public class PropertyItem implements org.apache.thrift.TBase(2*_map98.size); - int _key99; - long _val100; - for (int _i101 = 0; _i101 < _map98.size; ++_i101) + org.apache.thrift.protocol.TMap _map108 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.propertyValueByIdMap = new HashMap(2*_map108.size); + int _key109; + long _val110; + for (int _i111 = 0; _i111 < _map108.size; ++_i111) { - _key99 = iprot.readI32(); - _val100 = iprot.readI64(); - struct.propertyValueByIdMap.put(_key99, _val100); + _key109 = iprot.readI32(); + _val110 = iprot.readI64(); + struct.propertyValueByIdMap.put(_key109, _val110); } } struct.setPropertyValueByIdMapIsSet(true); } if (incoming.get(5)) { { - org.apache.thrift.protocol.TMap _map102 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.secondValueByIdMap = new HashMap(2*_map102.size); - int _key103; - long _val104; - for (int _i105 = 0; _i105 < _map102.size; ++_i105) + org.apache.thrift.protocol.TMap _map112 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.secondValueByIdMap = new HashMap(2*_map112.size); + int _key113; + long _val114; + for (int _i115 = 0; _i115 < _map112.size; ++_i115) { - _key103 = iprot.readI32(); - _val104 = iprot.readI64(); - struct.secondValueByIdMap.put(_key103, _val104); + _key113 = iprot.readI32(); + _val114 = iprot.readI64(); + struct.secondValueByIdMap.put(_key113, _val114); } } struct.setSecondValueByIdMapIsSet(true); 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 2b870e56f..1d5074697 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 @@ -1317,7 +1317,7 @@ public class RPCRequestIFace { public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new AsyncMethodCallback() { public void onComplete(Void o) { updateUserInfoByRpc_result result = new updateUserInfoByRpc_result(); try { @@ -7286,13 +7286,13 @@ public class RPCRequestIFace { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set280 = iprot.readSetBegin(); - struct.success = new HashSet(2*_set280.size); - String _elem281; - for (int _i282 = 0; _i282 < _set280.size; ++_i282) + org.apache.thrift.protocol.TSet _set290 = iprot.readSetBegin(); + struct.success = new HashSet(2*_set290.size); + String _elem291; + for (int _i292 = 0; _i292 < _set290.size; ++_i292) { - _elem281 = iprot.readString(); - struct.success.add(_elem281); + _elem291 = iprot.readString(); + struct.success.add(_elem291); } iprot.readSetEnd(); } @@ -7320,9 +7320,9 @@ public class RPCRequestIFace { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.success.size())); - for (String _iter283 : struct.success) + for (String _iter293 : struct.success) { - oprot.writeString(_iter283); + oprot.writeString(_iter293); } oprot.writeSetEnd(); } @@ -7353,9 +7353,9 @@ public class RPCRequestIFace { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (String _iter284 : struct.success) + for (String _iter294 : struct.success) { - oprot.writeString(_iter284); + oprot.writeString(_iter294); } } } @@ -7367,13 +7367,13 @@ public class RPCRequestIFace { BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TSet _set285 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.success = new HashSet(2*_set285.size); - String _elem286; - for (int _i287 = 0; _i287 < _set285.size; ++_i287) + org.apache.thrift.protocol.TSet _set295 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.success = new HashSet(2*_set295.size); + String _elem296; + for (int _i297 = 0; _i297 < _set295.size; ++_i297) { - _elem286 = iprot.readString(); - struct.success.add(_elem286); + _elem296 = iprot.readString(); + struct.success.add(_elem296); } } struct.setSuccessIsSet(true); @@ -8191,11 +8191,11 @@ public class RPCRequestIFace { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.UID, new org.apache.thrift.meta_data.FieldMetaData("uid", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.UID, new org.apache.thrift.meta_data.FieldMetaData("uid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.USER_STR, new org.apache.thrift.meta_data.FieldMetaData("userStr", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.USER_STR, new org.apache.thrift.meta_data.FieldMetaData("userStr", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateUserInfoByRpc_args.class, metaDataMap); @@ -8552,7 +8552,7 @@ public class RPCRequestIFace { while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -8560,7 +8560,7 @@ public class RPCRequestIFace { if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.uid = iprot.readI32(); struct.setUidIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -8568,7 +8568,7 @@ public class RPCRequestIFace { if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.userStr = iprot.readString(); struct.setUserStrIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -8576,7 +8576,7 @@ public class RPCRequestIFace { if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.type = iprot.readI32(); struct.setTypeIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -8868,7 +8868,7 @@ public class RPCRequestIFace { while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java index 1c6aeaf97..cf54f8790 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java @@ -526,14 +526,14 @@ public class SixiangxinfaInfo implements org.apache.thrift.TBase(_list106.size); - SixiangxinfaPropertyInfo _elem107; - for (int _i108 = 0; _i108 < _list106.size; ++_i108) + org.apache.thrift.protocol.TList _list116 = iprot.readListBegin(); + struct.propertyInfoList = new ArrayList(_list116.size); + SixiangxinfaPropertyInfo _elem117; + for (int _i118 = 0; _i118 < _list116.size; ++_i118) { - _elem107 = new SixiangxinfaPropertyInfo(); - _elem107.read(iprot); - struct.propertyInfoList.add(_elem107); + _elem117 = new SixiangxinfaPropertyInfo(); + _elem117.read(iprot); + struct.propertyInfoList.add(_elem117); } iprot.readListEnd(); } @@ -571,9 +571,9 @@ public class SixiangxinfaInfo implements org.apache.thrift.TBase(_list111.size); - SixiangxinfaPropertyInfo _elem112; - for (int _i113 = 0; _i113 < _list111.size; ++_i113) + org.apache.thrift.protocol.TList _list121 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.propertyInfoList = new ArrayList(_list121.size); + SixiangxinfaPropertyInfo _elem122; + for (int _i123 = 0; _i123 < _list121.size; ++_i123) { - _elem112 = new SixiangxinfaPropertyInfo(); - _elem112.read(iprot); - struct.propertyInfoList.add(_elem112); + _elem122 = new SixiangxinfaPropertyInfo(); + _elem122.read(iprot); + struct.propertyInfoList.add(_elem122); } } struct.setPropertyInfoListIsSet(true); diff --git a/tablemanager/src/main/java/config/SSpecialConfig.java b/tablemanager/src/main/java/config/SSpecialConfig.java index 9f3eaa97a..9a2144e01 100644 --- a/tablemanager/src/main/java/config/SSpecialConfig.java +++ b/tablemanager/src/main/java/config/SSpecialConfig.java @@ -131,6 +131,8 @@ public class SSpecialConfig implements BaseConfig { public static final String BUILDING_TIME_REDUCE = "BuildingTimeReduce";//浮生特权每日每次减少建筑升级时间：秒 public static final String CHANGE_CAMP_COST = "ChangeCampCost";//神转换阵营消耗 + public static final String GodSignOpenStar = "GodSignOpenStar";//神印格子开启所需神将星级 + @Override public void init() throws Exception {