diff --git a/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java b/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java index 951b7d083..47918924d 100644 --- a/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java +++ b/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java b/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java index 878204183..59b6c2eda 100644 --- a/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java +++ b/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java b/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java index ed3565ad4..3d3f928bd 100644 --- a/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java +++ b/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCgTGRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java index 951b7d083..47918924d 100644 --- a/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java b/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java index 878204183..59b6c2eda 100644 --- a/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java b/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java index ed3565ad4..3d3f928bd 100644 --- a/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java +++ b/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCgTGRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index ddb65ce38..e88c79c6f 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -213,8 +213,10 @@ public class CoreService implements RPCRequestIFace.Iface { for (TransformationInfo value : user.getHeroManager().getTransformationList().values().stream().filter(v -> v.getStatus() == 1).collect(Collectors.toList())) { TransformationCardInfo builder = new TransformationCardInfo(); builder.setId(value.getCardId()); - builder .setIndex(value.getIndex()); - builder .setStatus(value.getStatus()); + builder.setIndex(value.getIndex()); + builder.setStatus(value.getStatus()); + builder.setLevel(value.getLevel()); + builder.setStar(value.getStar()); list.add(builder); } return list; 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 9126887f9..49a561108 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -400,4 +400,10 @@ public interface BIReason { int UP_GOD_SEAL =1241;//装备神印 int MARGE_GOD_SEAL =1242;//合成神印 + int TRANSFORMATION_CARD_LEVEL_COST = 1243;//身外化身卡片升级消耗 + int TRANSFORMATION_CARD_STAR_COST = 1244;//身外化身卡片升星消耗 + int TRANSFORMATION_CARD_LEVEL_REWARD = 1245;//身外化身卡片升星奖励 + int TRANSFORMATION_CARD_STAR_REWARD= 1246;//身外化身卡片升星奖励 + int TRANSFORMATION_FORCE_STAR_COST= 1247;//身外化身之力消耗 + } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/GetTransformationHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/GetTransformationHandler.java index c4e9d71ea..7fdcd2eb6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/GetTransformationHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/GetTransformationHandler.java @@ -32,7 +32,7 @@ public class GetTransformationHandler extends BaseHandler cardMap = STableManager.getConfig(SChangingForce.class); SChangingForce config = cardMap.get(id); - if(config == null){ + if (config == null) { return; } - int[][] costItem = {{config.getExpCost()[0],config.getExpCost()[1]}}; - if(!ItemUtil.itemCost(user,costItem, BIReason.TRANSFORMATION_CARD_COST,1)){ + int[][] costItem = {{config.getExpCost()[0], config.getExpCost()[1]}}; + if (!ItemUtil.itemCost(user, costItem, BIReason.TRANSFORMATION_FORCE_STAR_COST, 1)) { return; } user.getHeroManager().addTransformationForce(1); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/TransformationUpGradeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/TransformationUpGradeHandler.java index 43091d912..c6cb60ebb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/TransformationUpGradeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/TransformationUpGradeHandler.java @@ -17,7 +17,6 @@ import org.springframework.stereotype.Component; import rpc.protocols.CommonProto; import rpc.protocols.HeroInfoProto; import rpc.protocols.MessageTypeProto; -import rpc.protocols.PlayerInfoProto; import java.util.HashMap; import java.util.List; @@ -42,58 +41,57 @@ public class TransformationUpGradeHandler extends BaseHandler cardMap = STableManager.getConfig(SChangingCard.class); SChangingCard changingCard = cardMap.get(id); - if (changingCard == null || changingCard.getIsOpen() == 0){ - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE,"该卡片版本错误"); + if (changingCard == null || changingCard.getIsOpen() == 0) { + throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE, "该卡片版本错误"); } Map infoMap = user.getHeroManager().getTransformationList(); TransformationInfo info = infoMap.get(id); HeroInfoProto.TransformationUpGradeResponse.Builder builder = HeroInfoProto.TransformationUpGradeResponse.newBuilder(); CommonProto.Drop.Builder drop = CommonProto.Drop.newBuilder(); - if(type == 1){ + if (type == 1) { //升级 - int pool = changingCard.getLevelUpPool(); + int pool = changingCard.getLevelUpPool(); Map poolConfig = SChangingCardLevel.getConfigByPoolId(pool); - if(poolConfig == null){ - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE,"该卡片版本错误"); + if (poolConfig == null) { + throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE, "该卡片版本错误"); } - SChangingCardLevel nextConfig = poolConfig.get(info.getLevel()+1); - if(nextConfig == null){ - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE,"该卡片版本错误"); + SChangingCardLevel nextConfig = poolConfig.get(info.getLevel() + 1); + if (nextConfig == null) { + throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE, "该卡片版本错误"); } - int[][] costItem = {{nextConfig.getExp()[0],nextConfig.getExp()[1]}}; - if(!ItemUtil.itemCost(user,costItem, BIReason.TRANSFORMATION_CARD_COST,1)){ + int[][] costItem = {{nextConfig.getExp()[0], nextConfig.getExp()[1]}}; + if (!ItemUtil.itemCost(user, costItem, BIReason.TRANSFORMATION_CARD_LEVEL_COST, 1)) { return; } - info.setLevel(info.getLevel()+1); + info.setLevel(info.getLevel() + 1); user.getHeroManager().putTransformationList(info); int[][] dropItem = {nextConfig.getChangingForceExp()}; - ItemUtil.drop(user, dropItem, drop, BIReason.SEVEN_WORLD_TREASURE); + ItemUtil.drop(user, dropItem, drop, BIReason.TRANSFORMATION_CARD_LEVEL_REWARD); builder.setDrop(drop); - }else if(type == 2 ){ + } else if (type == 2) { //升星 List itemIdList = proto.getItemListList(); - Map costMap = new HashMap<>(); - for(CommonProto.KeyVal keyVal :itemIdList){ - if(costMap.containsKey(keyVal.getKey())){ - costMap.put(keyVal.getKey(),costMap.get(keyVal.getKey())+1); - }else { - costMap.put(keyVal.getKey(),1); + Map costMap = new HashMap<>(); + for (CommonProto.KeyVal keyVal : itemIdList) { + if (costMap.containsKey(keyVal.getKey())) { + costMap.put(keyVal.getKey(), costMap.get(keyVal.getKey()) + 1); + } else { + costMap.put(keyVal.getKey(), 1); } } - if(!ItemUtil.itemCost(user, costMap, BIReason.TRANSFORMATION_CARD_COST,1)){ + if (!ItemUtil.itemCost(user, costMap, BIReason.TRANSFORMATION_CARD_STAR_COST, 1)) { return; } - if (info != null){ - info.setStar(info.getStar()+ 1); + if (info != null) { + info.setStar(info.getStar() + 1); user.getHeroManager().putTransformationList(info); - Map itemMap = new HashMap<>(1); - int [] item = changingCard.getStarUpExp()[info.getStar()-1]; - itemMap.put(item[0],Long.valueOf(item[1])); - ItemUtil.addItem(user,itemMap,drop, BIReason.VIP_DAY_REWARD); + Map itemMap = new HashMap<>(1); + int[] item = changingCard.getStarUpExp()[info.getStar() - 1]; + itemMap.put(item[0], Long.valueOf(item[1])); + ItemUtil.addItem(user, itemMap, drop, BIReason.TRANSFORMATION_CARD_STAR_REWARD); builder.setDrop(drop); - //user.getHeroManager().addTransformationForce(changingCard.getStarUpExp()[info.getStar()-1][1]); } } CommonProto.TransformationCardInfo cardInfo = CommonProto.TransformationCardInfo.newBuilder() @@ -105,5 +103,5 @@ public class TransformationUpGradeHandler extends BaseHandler infoList, - Map practiceSkillMap, + User user, + long maxForce,int sex,int userLv,List tfInfoList) { + Map practiceSkillMap =user.getHeroManager().getPracticeSkillMap(); + StringBuilder skillStr = new StringBuilder(); + // 身外化身技能 + if (tfInfoList != null){ + Map cardMap = STableManager.getConfig(SChangingCard.class); + Map infoMap = user.getHeroManager().getTransformationList(); + for (int cardId : tfInfoList) { + SChangingCard card = cardMap.get(cardId); + TransformationInfo info = infoMap.get(cardId); + if(info == null){ + continue; + } + if (card != null){ + skillStr.append(card.getSkill()[info.getStar()]).append("#"); + } + } + } + // 修行技能 + if (practiceSkillMap != null){ + StringBuilder passivitySkillStr=new StringBuilder(); + for (Map.Entry entry : practiceSkillMap.entrySet()) { + SPlayerSkill playerSkill = SPlayerSkill.GetSPlayerSkill(entry.getKey(), entry.getValue()); + if (playerSkill != null){ + ///第一个技能是主动技 + if (playerSkill.getSort()==1){ + skillStr.append(playerSkill.getId()); + skillStr.append("|"); + }else{ + ///第一个技能是被动技能 + passivitySkillStr.append(playerSkill.getSkillIDList()[0]); + passivitySkillStr.append("#"); + } + } + } + skillStr.append(passivitySkillStr); + } + + // 去除最后一位得#号 + String skill = skillStr.toString(); + if (!StringUtil.isEmpty(skill)){ + skill = skill.substring(0,skill.length()-1); + } + + CommonProto.FightUnitInfo skillInfo = CommonProto.FightUnitInfo + .newBuilder() + .setUnitId("0") + .setUnitSkillIds(skill) + .setProperty("0") + .setPosition(100) + .setStar(userLv) + .setSkinId(0) + .setForceScore(maxForce) + .setPlayerSex(sex) + .build(); + infoList.add(skillInfo); + } + /** + * 主角技能数据 + */ + public void getPracticeSkill(List infoList, + Map practiceSkillMap , long maxForce,int sex,int userLv,List tfInfoList) { StringBuilder skillStr = new StringBuilder(); // 身外化身技能 @@ -2478,7 +2540,7 @@ public class HeroLogic { Map cardMap = STableManager.getConfig(SChangingCard.class); for (int cardId : tfInfoList) { SChangingCard card = cardMap.get(cardId); - if (card != null){ //TODO + if (card != null){ for(int skill:card.getSkill()){ skillStr.append(skill).append("#"); } @@ -2524,7 +2586,6 @@ public class HeroLogic { .build(); infoList.add(skillInfo); } - /** * 这里放全部得主动技能 * @param user @@ -2559,8 +2620,7 @@ public class HeroLogic { .filter(v -> v.getStatus() == 1) .mapToInt(TransformationInfo::getCardId) .boxed().collect(Collectors.toList()); - - getPracticeSkill(pokemonInfos, user.getHeroManager().getPracticeSkillMap(), + getPracticeSkill(pokemonInfos, user, user.getPlayerInfoManager().getMaxForce(),user.getPlayerInfoManager().getSex(), user.getPlayerInfoManager().getLevel(),list); return pokemonInfos; @@ -2634,7 +2694,7 @@ public class HeroLogic { .filter(v -> v.getStatus() == 1) .mapToInt(TransformationInfo::getCardId) .boxed().collect(Collectors.toList()); - getPracticeSkill(pokemonInfos,user.getHeroManager().getPracticeSkillMap(), + getPracticeSkill(pokemonInfos,user, user.getPlayerInfoManager().getMaxForce(),user.getPlayerInfoManager().getSex(), user.getPlayerInfoManager().getLevel(),list); return pokemonInfos; 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 558048af1..023df5b7d 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 @@ -1196,7 +1196,8 @@ public class PlayerLogic { List list = new ArrayList<>(); for(TransformationCardInfo rpcData:listRpc){ CommonProto.TransformationCardInfo perData = CommonProto.TransformationCardInfo.newBuilder() - .setId(rpcData.getId()).setIndex(rpcData.getIndex()).setStatus(rpcData.getStatus()).build(); + .setId(rpcData.getId()).setIndex(rpcData.getIndex()).setStatus(rpcData.getStatus()) + .setLevel(rpcData.getLevel()).setStar(rpcData.getStar()).build(); list.add(perData); } return list; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java index f23a21f65..e672145cc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class ArenaOfHero implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArenaOfHero"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java index 1652e9b80..44ccee7fa 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class CrossArenaManager implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CrossArenaManager"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java index c937fb05c..4ae4787f9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidOperException"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java index 57f52cead..7ffefa0e7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class LifeGridInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LifeGridInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java index 93f9086b6..1c3c9edaa 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class Pokemon implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Pokemon"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java index baa995ad7..5a4b30bd8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class PropertyItem implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PropertyItem"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java index 0b78e7735..847bf5f8a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class PurpleMansionSeal implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PurpleMansionSeal"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java index 0880ebdd0..4fe54c59e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCMatchRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java index 1d5074697..2b0faf701 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-20") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCRequestIFace { public interface Iface { @@ -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 { @@ -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/RechargeResult.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java index 2b0f0a3d2..87ba48eac 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RechargeResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RechargeResult"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java index fe327b936..69a72d2f6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class Result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Result"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java index cf54f8790..3502639c8 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 @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class SixiangxinfaInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SixiangxinfaInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java index 51382bb51..d0a4120c4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class SixiangxinfaPropertyInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SixiangxinfaPropertyInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java index afb30b830..5fab56916 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * ArenaOfHeroManager 结构体 */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class TeamPosHeroInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TeamPosHeroInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java index 8b41d74f3..38397998b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java @@ -34,13 +34,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class TransformationCardInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TransformationCardInfo"); private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField INDEX_FIELD_DESC = new org.apache.thrift.protocol.TField("index", org.apache.thrift.protocol.TType.I32, (short)2); private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("level", org.apache.thrift.protocol.TType.I32, (short)4); + private static final org.apache.thrift.protocol.TField STAR_FIELD_DESC = new org.apache.thrift.protocol.TField("star", org.apache.thrift.protocol.TType.I32, (short)5); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -51,12 +53,16 @@ public class TransformationCardInfo implements org.apache.thrift.TBase byName = new HashMap(); @@ -77,6 +83,10 @@ public class TransformationCardInfo 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); @@ -131,6 +143,10 @@ public class TransformationCardInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserMountInfo"); 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 ae7fdc3d2..b05531f0a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -1300,6 +1300,8 @@ public class CBean2Proto { .setId(value.getCardId()) .setIndex(value.getIndex()) .setStatus(value.getStatus()) + .setLevel(value.getLevel()) + .setStar(value.getStar()) .build(); list.add(builder); } diff --git a/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java index b2dcb6284..927075d47 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java b/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java index d25d89eb8..b0b52724d 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java b/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java index 6e003cd34..68c2f48fd 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCgTwRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java b/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java index 8cef029c4..7765fb6c5 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCwTgRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/core.thrift b/serverlogic/src/main/thrift/idl/core.thrift index 39eeaf9a1..4f2ea8c91 100644 --- a/serverlogic/src/main/thrift/idl/core.thrift +++ b/serverlogic/src/main/thrift/idl/core.thrift @@ -107,6 +107,8 @@ struct TransformationCardInfo{ 1:optional i32 id ;//卡id 2:optional i32 index;// 位置 3:optional i32 status ;// 状态 + 4:optional i32 level ;//等级 + 5:optional i32 star ;//星级 } struct CrossArenaManager{ diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java index 951b7d083..47918924d 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java index 878204183..59b6c2eda 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java index ed3565ad4..3d3f928bd 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCgTGRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java index f23a21f65..e672145cc 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class ArenaOfHero implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArenaOfHero"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java index 1652e9b80..44ccee7fa 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class CrossArenaManager implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CrossArenaManager"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java index c937fb05c..4ae4787f9 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidOperException"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java index 57f52cead..7ffefa0e7 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class LifeGridInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LifeGridInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java index 93f9086b6..1c3c9edaa 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class Pokemon implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Pokemon"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java index baa995ad7..5a4b30bd8 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class PropertyItem implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PropertyItem"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java index 0b78e7735..847bf5f8a 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class PurpleMansionSeal implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PurpleMansionSeal"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java index 0880ebdd0..4fe54c59e 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCMatchRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java index 1d5074697..2b0faf701 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-20") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCRequestIFace { public interface Iface { @@ -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 { @@ -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/RechargeResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java index 2b0f0a3d2..87ba48eac 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RechargeResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RechargeResult"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java index fe327b936..69a72d2f6 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class Result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Result"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java index cf54f8790..3502639c8 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 @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class SixiangxinfaInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SixiangxinfaInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java index 51382bb51..d0a4120c4 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class SixiangxinfaPropertyInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SixiangxinfaPropertyInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java index afb30b830..5fab56916 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * ArenaOfHeroManager 结构体 */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class TeamPosHeroInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TeamPosHeroInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java index 8b41d74f3..38397998b 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java @@ -34,13 +34,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class TransformationCardInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TransformationCardInfo"); private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField INDEX_FIELD_DESC = new org.apache.thrift.protocol.TField("index", org.apache.thrift.protocol.TType.I32, (short)2); private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("level", org.apache.thrift.protocol.TType.I32, (short)4); + private static final org.apache.thrift.protocol.TField STAR_FIELD_DESC = new org.apache.thrift.protocol.TField("star", org.apache.thrift.protocol.TType.I32, (short)5); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -51,12 +53,16 @@ public class TransformationCardInfo implements org.apache.thrift.TBase byName = new HashMap(); @@ -77,6 +83,10 @@ public class TransformationCardInfo 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); @@ -131,6 +143,10 @@ public class TransformationCardInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserMountInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java index b2dcb6284..927075d47 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java index d25d89eb8..b0b52724d 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java index 6e003cd34..68c2f48fd 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCgTwRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java index 8cef029c4..7765fb6c5 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCwTgRequestIFace { public interface Iface { diff --git a/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java b/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java index b2dcb6284..927075d47 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java +++ b/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java b/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java index d25d89eb8..b0b52724d 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java +++ b/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java b/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java index 6e003cd34..68c2f48fd 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java +++ b/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCgTwRequestIFace { public interface Iface { diff --git a/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java b/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java index 8cef029c4..7765fb6c5 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java +++ b/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-19") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-24") public class RPCwTgRequestIFace { public interface Iface {