From f2c43c90422a079bdff721c1ed27ab4eaf885bca Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Fri, 15 Oct 2021 17:31:16 +0800 Subject: [PATCH] =?UTF-8?q?yxld=20=E7=A7=AF=E5=88=86=20=20=E8=8B=B1?= =?UTF-8?q?=E9=9B=84=E5=B1=9E=E6=80=A7=20=20=20=E6=9F=A5=E7=9C=8B=E8=8B=B1?= =?UTF-8?q?=E9=9B=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/global/thrift/idl/InnerResult.java | 2 +- .../global/thrift/idl/RPCgTGRequestIFace.java | 2 +- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/global/thrift/idl/InnerResult.java | 2 +- .../global/thrift/idl/RPCgTGRequestIFace.java | 2 +- .../src/main/java/com/ljsd/CoreService.java | 6 + .../CrossYuxulundaoChallengeHandler.java | 12 +- .../CrossYuxulundaoEnemyInfoHandler.java | 2 +- .../CrossYuxulundaoGetInfoHandler.java | 2 +- .../handler/player/ViewHeroInfoHandler.java | 14 ++- .../logic/arena/CrossYuxulundaoLogic.java | 6 +- .../jieling/logic/player/PlayerLogic.java | 16 ++- .../ljsd/jieling/thrift/idl/ArenaOfHero.java | 2 +- .../jieling/thrift/idl/CrossArenaManager.java | 2 +- .../thrift/idl/InvalidOperException.java | 2 +- .../com/ljsd/jieling/thrift/idl/Pokemon.java | 2 +- .../ljsd/jieling/thrift/idl/PropertyItem.java | 110 +++++++++++++++++- .../jieling/thrift/idl/PurpleMansionSeal.java | 2 +- .../thrift/idl/RPCMatchRequestIFace.java | 2 +- .../jieling/thrift/idl/RPCRequestIFace.java | 2 +- .../jieling/thrift/idl/RechargeResult.java | 2 +- .../com/ljsd/jieling/thrift/idl/Result.java | 2 +- .../jieling/thrift/idl/TeamPosHeroInfo.java | 2 +- .../com/ljsd/jieling/util/CBean2Proto.java | 14 +-- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/world/thrift/idl/InnerResult.java | 2 +- .../world/thrift/idl/RPCgTwRequestIFace.java | 2 +- .../world/thrift/idl/RPCwTgRequestIFace.java | 2 +- serverlogic/src/main/thrift/idl/core.thrift | 2 + .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/global/thrift/idl/InnerResult.java | 2 +- .../global/thrift/idl/RPCgTGRequestIFace.java | 2 +- .../ljsd/jieling/thrift/idl/ArenaOfHero.java | 2 +- .../jieling/thrift/idl/CrossArenaManager.java | 2 +- .../thrift/idl/InvalidOperException.java | 2 +- .../com/ljsd/jieling/thrift/idl/Pokemon.java | 2 +- .../ljsd/jieling/thrift/idl/PropertyItem.java | 110 +++++++++++++++++- .../jieling/thrift/idl/PurpleMansionSeal.java | 2 +- .../thrift/idl/RPCMatchRequestIFace.java | 2 +- .../jieling/thrift/idl/RPCRequestIFace.java | 2 +- .../jieling/thrift/idl/RechargeResult.java | 2 +- .../com/ljsd/jieling/thrift/idl/Result.java | 2 +- .../jieling/thrift/idl/TeamPosHeroInfo.java | 2 +- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/world/thrift/idl/InnerResult.java | 2 +- .../world/thrift/idl/RPCgTwRequestIFace.java | 2 +- .../world/thrift/idl/RPCwTgRequestIFace.java | 2 +- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/world/thrift/idl/InnerResult.java | 2 +- .../world/thrift/idl/RPCgTwRequestIFace.java | 2 +- .../world/thrift/idl/RPCwTgRequestIFace.java | 2 +- 52 files changed, 298 insertions(+), 78 deletions(-) diff --git a/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java b/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java index 5d84bcb73..e38abf796 100644 --- a/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java +++ b/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 358e45789..79c457fdf 100644 --- a/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java +++ b/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 2b7dc5729..8b3c1b419 100644 --- a/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java +++ b/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 5d84bcb73..e38abf796 100644 --- a/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 358e45789..79c457fdf 100644 --- a/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 2b7dc5729..8b3c1b419 100644 --- a/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java +++ b/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 8fb144dd3..403bdc9f9 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -8,6 +8,7 @@ import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.dao.Hero; import com.ljsd.jieling.logic.dao.HeroManager; +import com.ljsd.jieling.logic.dao.Jewel; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.hero.HeroLogic; @@ -177,6 +178,7 @@ public class CoreService implements RPCRequestIFace.Iface { return null; } private PropertyItem buildrprcPropertyItem(com.ljsd.jieling.logic.dao.PropertyItem propertyItem){ + PropertyItem rpcPropertyItem = new PropertyItem(); rpcPropertyItem.setId(propertyItem.getId()); rpcPropertyItem.setEquipId(propertyItem.getEquipId()); @@ -187,6 +189,10 @@ public class CoreService implements RPCRequestIFace.Iface { rpcPropertyItem.setCreateTime(propertyItem.getCreateTime()); rpcPropertyItem.setSkill(propertyItem.getSkill()); rpcPropertyItem.setIsLocked(propertyItem.getIsLocked()); + if(propertyItem instanceof Jewel){ + Jewel tempEquip =(Jewel)propertyItem; + rpcPropertyItem.setRebuildLevel(tempEquip.getBuildLevel()); + } return rpcPropertyItem; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java index dc5d17858..4c27e2d1b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java @@ -127,7 +127,7 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler n == 1).count(); List enemyList = arenaManager.getCrossYuxulundaoEnemies(); - enemyList.forEach(n -> res.addArenaEnemys(CrossYuxulundaoLogic.getInstance().getMatchRivalInfo(n.getEnemyId(), 0, 0))); + enemyList.forEach(n -> res.addArenaEnemys(CrossYuxulundaoLogic.getInstance().getMatchRivalInfo(n.getEnemyId(), 0))); CSPlayer myQuery = CrossServiceLogic.getPlayerByRedis(user.getId()); CSPlayer defQuery = null; //根据双方现有分数计算出 得分 @@ -151,10 +151,10 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandlersetting.getScoreRange()[1]){ + int loserGetScore = setting.getBattleLoseReward()[0]+(defScores-ackScores); + if(winerGetScore>setting.getScoreRange()[1]){ //35 winerGetScore = setting.getScoreRange()[1]; - }else if(winerGetScore-setting.getScoreRange()[0]){//-1 @@ -317,9 +317,9 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler enemyList = arenaManager.getCrossYuxulundaoEnemies(); - enemyList.forEach(n -> builder.addArenaEnemys(CrossYuxulundaoLogic.getInstance().getMatchRivalInfo(n.getEnemyId(), 0, 0))); + enemyList.forEach(n -> builder.addArenaEnemys(CrossYuxulundaoLogic.getInstance().getMatchRivalInfo(n.getEnemyId(), 0))); MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.CrossYuXuLunDaoChangeEnemyInfoResponse.getNumber(), builder.build(), true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoGetInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoGetInfoHandler.java index c8e1c5ded..f9f289a29 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoGetInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoGetInfoHandler.java @@ -123,7 +123,7 @@ public class CrossYuxulundaoGetInfoHandler extends BaseHandler enemyList = arenaManager.getCrossYuxulundaoEnemies(); if (enemyList != null && enemyList.size() > 0) { - enemyList.forEach(n -> builder.addArenaEnemys(CrossYuxulundaoLogic.getInstance().getMatchRivalInfo(n.getEnemyId(), 0, 0))); + enemyList.forEach(n -> builder.addArenaEnemys(CrossYuxulundaoLogic.getInstance().getMatchRivalInfo(n.getEnemyId(), 0))); } if (csPlayer != null) { int oldScore = csPlayer.getCrossYuxulundaoOldScore(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ViewHeroInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ViewHeroInfoHandler.java index 3fdac38e0..a7d6d863a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ViewHeroInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ViewHeroInfoHandler.java @@ -30,7 +30,7 @@ public class ViewHeroInfoHandler extends BaseHandler arenaRank = new ArrayList(); SMServerRankConfig con = robotConfigMap.get(SMServerRankConfig.getIdByScore(myQuery.getCrossYuxulundaoNewScore())); Set> matchRival= RedisUtil.getInstence().getZsetRangeWithScores(RedisKey.CROSS_YUXULUNDAO_RANK_PERSON, - Integer.toString(crossGroup),con.getScoreLow(),con.getScoreUp()); + Integer.toString(crossGroup),con.getScoreLow1(),con.getScoreUp1()); matchRival = matchRival.stream().filter(n->Integer.valueOf(n.getValue())!=user.getId()).collect(Collectors.toSet()); if(matchRival.size() >0){ if(matchRival.size()<5){ @@ -288,7 +288,7 @@ public class CrossYuxulundaoLogic { /** * 获取匹配队手信息 */ - public static CommonProto.ArenaPersonInfo getMatchRivalInfo(int enemyId, int rank, int score) { + public static CommonProto.ArenaPersonInfo getMatchRivalInfo(int enemyId, int rank) { Map robotConfigMap = STableManager.getConfig(SArenaRobotConfig.class); if (robotConfigMap.containsKey(enemyId)) { SArenaRobotConfig sArenaRobotConfig = robotConfigMap.get(enemyId); @@ -300,7 +300,7 @@ public class CrossYuxulundaoLogic { .setRank(rank) .setTotalForce(sArenaRobotConfig.getYxldTotalForce()) //三个队伍的总战力 .setHeadFrame(0) - .setScore(score) + .setScore(robotConfigMap.get(enemyId).getMsScroe()) .build(); return personInfoBuild; } 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 b57c693a4..1f6f34f7e 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 @@ -1086,7 +1086,7 @@ public class PlayerLogic { return playerTeamInfo.build(); } - public void viewRobotHeroInfo(ISession session, SArenaRobotConfig sArenaRobotConfig,String robotHeroId) throws Exception { + public void viewRobotHeroInfo(ISession session, SArenaRobotConfig sArenaRobotConfig,String robotHeroId,int teamId) throws Exception { PlayerInfoProto.ViewHeroInfoResponse.Builder builder = PlayerInfoProto.ViewHeroInfoResponse.newBuilder(); int[] differDemonsId = sArenaRobotConfig.getDifferDemonsId(); @@ -1100,8 +1100,16 @@ public class PlayerLogic { builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(item.getKey()).setPropertyValue(item.getValue().intValue()).build()); } builder.setForce(HeroLogic.getInstance().calForce(robotHeroAttribute)); - builder.setHero(sArenaRobotConfig.getHeroMapList().get(scHero.getId())); - + if(teamId==GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE){ + builder.setHero(sArenaRobotConfig.getHeroMapList().get(scHero.getId())); + }else if(teamId==GlobalsDef.CROSS_YU_XU_LUN_DAO_TWO){ + builder.setHero(sArenaRobotConfig.getHeroMapList2().get(scHero.getId())); + } + else if(teamId==GlobalsDef.CROSS_YU_XU_LUN_DAO_THREE){ + builder.setHero(sArenaRobotConfig.getHeroMapList3().get(scHero.getId())); + }else { + builder.setHero(sArenaRobotConfig.getHeroMapList().get(scHero.getId())); + } int resMsgId = MessageTypeProto.MessageType.VIEW_HERO_INFO_RESPONSE_VALUE; MessageUtil.sendMessage(session,1,resMsgId,builder.build(),true); } @@ -1177,7 +1185,7 @@ public class PlayerLogic { Map jewels = crossArenaManager.getJewels(); for(String equipId : rpcHero.getJewelInfo()){ heroBuilder.addJewels(equipId); - builder.addEquip(CBean2Proto.getEquipProto(jewels.get(equipId))); + builder.addEquip(CBean2Proto.getEquipProto(jewels.get(equipId),crossArenaManager.getTreeLevel())); } // 装备 for(int equipId : rpcHero.getEquipByPositionMap().values()){ 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 1b9f1e5f3..1f6926687 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 620abaf77..9a3b74006 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 b4bf71898..35f489cb5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") public class InvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidOperException"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java index cc10a934f..b0f93196a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 485a50378..a8bf86891 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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"); @@ -47,6 +47,7 @@ public class PropertyItem implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -63,6 +64,7 @@ public class PropertyItem implements org.apache.thrift.TBase byName = new HashMap(); @@ -107,6 +110,8 @@ public class PropertyItem 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); @@ -179,6 +185,8 @@ 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("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 1df327e4c..ab36564bb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 96464d9f4..eb2cd0590 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") public class RPCRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java index 4e36b1ecd..175f82fb4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 5620d6a0b..69207afbb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") public class Result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Result"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java index 147b18102..40d704eb1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * ArenaOfHeroManager 结构体 */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") public class TeamPosHeroInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TeamPosHeroInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index c9c6d570e..e4d2dbae8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -458,27 +458,27 @@ public class CBean2Proto { equipProto.setRebuildLevel(tempEquip.getBuildLevel()) .setExp(tempEquip.getLevel()); } - return equipProto.build(); } - //TODO - public static CommonProto.Equip getEquipProto(com.ljsd.jieling.thrift.idl.PropertyItem equip){ + //玉虚论道 + public static CommonProto.Equip getEquipProto(com.ljsd.jieling.thrift.idl.PropertyItem equip,int treeLv){ //前端读表 // Map propertyValueByIdMap = equip.getPropertyValueByIdMap(); Map secondValueByIdMap = equip.getSecondValueByIdMap(); + CommonProto.Equip.Builder equipProto =CommonProto.Equip.newBuilder() .setEquipId(equip.getEquipId()) .setId(equip.getId()) - - + .setRebuildLevel(equip.getRebuildLevel()) + .setExp(equip.getLevel()) .setCreateTime(equip.getCreateTime()) .setIsLocked(equip.getIsLocked()); //if(equip instanceof Jewel){ //Jewel tempEquip =(Jewel)equip; - equipProto.setRebuildLevel(1) - .setExp(equip.getLevel()); + equipProto.setTreeLv(treeLv) + ; //} return equipProto.build(); 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 9c01708a7..02ab7ef3a 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 89bb5f339..0fba552b2 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 3ac42fb7f..ae4f856bf 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 4f9f40e4e..e90aeb28f 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 19f568b9d..735194a44 100644 --- a/serverlogic/src/main/thrift/idl/core.thrift +++ b/serverlogic/src/main/thrift/idl/core.thrift @@ -55,6 +55,8 @@ struct PropertyItem { 7:optional i32 createTime; 8:optional i32 skill; 9:optional i32 isLocked; + 10:optional i32 rebuildLevel; + } struct Pokemon { 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 5d84bcb73..e38abf796 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 358e45789..79c457fdf 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 2b7dc5729..8b3c1b419 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 1b9f1e5f3..1f6926687 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 620abaf77..9a3b74006 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 b4bf71898..35f489cb5 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") public class InvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidOperException"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java index cc10a934f..b0f93196a 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 485a50378..a8bf86891 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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"); @@ -47,6 +47,7 @@ public class PropertyItem implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -63,6 +64,7 @@ public class PropertyItem implements org.apache.thrift.TBase byName = new HashMap(); @@ -107,6 +110,8 @@ public class PropertyItem 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); @@ -179,6 +185,8 @@ 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("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 1df327e4c..ab36564bb 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 96464d9f4..eb2cd0590 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") public class RPCRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java index 4e36b1ecd..175f82fb4 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 5620d6a0b..69207afbb 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") public class Result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Result"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java index 147b18102..40d704eb1 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * ArenaOfHeroManager 结构体 */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") public class TeamPosHeroInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TeamPosHeroInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java index 9c01708a7..02ab7ef3a 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 89bb5f339..0fba552b2 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 3ac42fb7f..ae4f856bf 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 4f9f40e4e..e90aeb28f 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 9c01708a7..02ab7ef3a 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java +++ b/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 89bb5f339..0fba552b2 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java +++ b/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 3ac42fb7f..ae4f856bf 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java +++ b/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") 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 4f9f40e4e..e90aeb28f 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java +++ b/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-14") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-15") public class RPCwTgRequestIFace { public interface Iface {