yxld 积分 英雄属性 查看英雄

back_recharge
xuexinpeng 2021-10-15 17:31:16 +08:00
parent 8b1342df9d
commit f2c43c9042
52 changed files with 298 additions and 78 deletions

View File

@ -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<InnerInvalidOperException, InnerInvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InnerInvalidOperException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException");

View File

@ -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<InnerResult, InnerResult._Fields>, java.io.Serializable, Cloneable, Comparable<InnerResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult");

View File

@ -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 {

View File

@ -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<InnerInvalidOperException, InnerInvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InnerInvalidOperException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException");

View File

@ -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<InnerResult, InnerResult._Fields>, java.io.Serializable, Cloneable, Comparable<InnerResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult");

View File

@ -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 {

View File

@ -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;
}

View File

@ -127,7 +127,7 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler<ArenaInfoProto.
long winCount = Arrays.stream(result).boxed().filter(n -> n == 1).count();
List<ArenaEnemy> 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 BaseHandler<ArenaInfoProto.
//失败者获取分数 负数
int loserGetScore = -winerGetScore;*/
int winerGetScore= setting.getBattleWinReward()[0]+(defScores-ackScores);
int loserGetScore = setting.getBattleLoseReward()[0]-(defScores-ackScores);
if(winerGetScore>setting.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]){
}else if(winerGetScore<setting.getScoreRange()[0]){ //1
winerGetScore = setting.getScoreRange()[0];
}
if(loserGetScore>-setting.getScoreRange()[0]){//-1
@ -317,9 +317,9 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler<ArenaInfoProto.
arenaRecord.setServerName(defServerName);
for (int i = 0; i < 3; i++) {
//编队为空 判输赢
/*if (!updateResult(i, myteamId, defTeamId, result)) {
if (!updateResult(myUser,i, myteamId, defTeamId, result)) {
continue;
}*/
}
CommonProto.FightTeamInfo fightTeamInfo = FightUtil.makePersonFightData(myUser, myteamId[i], null, null);
//对手 修行等级 区服名称 战斗类行 积分变化情况
CommonProto.FightTeamInfo defteamInfo = FightUtil.makeCrossPersonData(csPlayer, defTeamId[i], arenaRecord, crossArenaManager);

View File

@ -38,7 +38,7 @@ public class CrossYuxulundaoEnemyInfoHandler extends BaseHandler<ArenaInfoProto.
}
CrossYuxulundaoLogic.getInstance().matchRivals(user);
List<ArenaEnemy> 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);
}

View File

@ -123,7 +123,7 @@ public class CrossYuxulundaoGetInfoHandler extends BaseHandler<ArenaInfoProto.Cr
}
List<ArenaEnemy> 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();

View File

@ -30,7 +30,7 @@ public class ViewHeroInfoHandler extends BaseHandler<PlayerInfoProto.ViewHeroInf
//非跨服功能的查看
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(proto.getTargetUid());
if(sArenaRobotConfig!=null){
PlayerLogic.getInstance().viewRobotHeroInfo(iSession,sArenaRobotConfig,proto.getHeroId());
PlayerLogic.getInstance().viewRobotHeroInfo(iSession,sArenaRobotConfig,proto.getHeroId(),proto.getTeamId());
return;
}
PlayerInfoProto.ViewHeroInfoResponse viewHeroInfoResponse = PlayerLogic.getInstance().viewHeroInfo(proto.getTargetUid(), proto.getHeroId());
@ -47,11 +47,15 @@ public class ViewHeroInfoHandler extends BaseHandler<PlayerInfoProto.ViewHeroInf
CrossArenaEnemy info = RedisUtil.getInstence().getMapEntry(RedisKey.CROSS_ARENA_ROBOT_INFO, String.valueOf(GlobleSystemLogic.getInstence().getCrossGroup()), String.valueOf(proto.getTargetUid()), CrossArenaEnemy.class);
if(info==null){
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
//throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
}
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(info.getEnemyId());
PlayerLogic.getInstance().viewRobotHeroInfo(iSession,sArenaRobotConfig,proto.getHeroId());
SArenaRobotConfig sArenaRobotConfig ;
if(proto.getTeamId()==GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE|| proto.getTeamId()==GlobalsDef.CROSS_YU_XU_LUN_DAO_TWO|| proto.getTeamId()==GlobalsDef.CROSS_YU_XU_LUN_DAO_THREE){
sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(proto.getTargetUid());
}else{
sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(info.getEnemyId());
}
PlayerLogic.getInstance().viewRobotHeroInfo(iSession,sArenaRobotConfig,proto.getHeroId(),proto.getTeamId());
}else{
//真人
if(proto.getTeamId()== GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE||proto.getTeamId()== GlobalsDef.CROSS_YU_XU_LUN_DAO_TWO||proto.getTeamId()== GlobalsDef.CROSS_YU_XU_LUN_DAO_THREE){

View File

@ -225,7 +225,7 @@ public class CrossYuxulundaoLogic {
List<Integer> arenaRank = new ArrayList<Integer>();
SMServerRankConfig con = robotConfigMap.get(SMServerRankConfig.getIdByScore(myQuery.getCrossYuxulundaoNewScore()));
Set<ZSetOperations.TypedTuple<String>> 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<Integer, SArenaRobotConfig> 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;
}

View File

@ -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<String, com.ljsd.jieling.thrift.idl.PropertyItem> 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()){

View File

@ -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<ArenaOfHero, ArenaOfHero._Fields>, java.io.Serializable, Cloneable, Comparable<ArenaOfHero> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArenaOfHero");

View File

@ -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<CrossArenaManager, CrossArenaManager._Fields>, java.io.Serializable, Cloneable, Comparable<CrossArenaManager> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CrossArenaManager");

View File

@ -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<InvalidOperException, InvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidOperException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidOperException");

View File

@ -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<Pokemon, Pokemon._Fields>, java.io.Serializable, Cloneable, Comparable<Pokemon> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Pokemon");

View File

@ -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<PropertyItem, PropertyItem._Fields>, java.io.Serializable, Cloneable, Comparable<PropertyItem> {
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<PropertyItem, Prope
private static final org.apache.thrift.protocol.TField CREATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createTime", org.apache.thrift.protocol.TType.I32, (short)7);
private static final org.apache.thrift.protocol.TField SKILL_FIELD_DESC = new org.apache.thrift.protocol.TField("skill", org.apache.thrift.protocol.TType.I32, (short)8);
private static final org.apache.thrift.protocol.TField IS_LOCKED_FIELD_DESC = new org.apache.thrift.protocol.TField("isLocked", org.apache.thrift.protocol.TType.I32, (short)9);
private static final org.apache.thrift.protocol.TField REBUILD_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("rebuildLevel", org.apache.thrift.protocol.TType.I32, (short)10);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@ -63,6 +64,7 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
public int createTime; // optional
public int skill; // optional
public int isLocked; // optional
public int rebuildLevel; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -74,7 +76,8 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
SECOND_VALUE_BY_ID_MAP((short)6, "secondValueByIdMap"),
CREATE_TIME((short)7, "createTime"),
SKILL((short)8, "skill"),
IS_LOCKED((short)9, "isLocked");
IS_LOCKED((short)9, "isLocked"),
REBUILD_LEVEL((short)10, "rebuildLevel");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@ -107,6 +110,8 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
return SKILL;
case 9: // IS_LOCKED
return IS_LOCKED;
case 10: // REBUILD_LEVEL
return REBUILD_LEVEL;
default:
return null;
}
@ -152,8 +157,9 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
private static final int __CREATETIME_ISSET_ID = 2;
private static final int __SKILL_ISSET_ID = 3;
private static final int __ISLOCKED_ISSET_ID = 4;
private static final int __REBUILDLEVEL_ISSET_ID = 5;
private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.ID,_Fields.EQUIP_ID,_Fields.LEVEL,_Fields.HERO_ID,_Fields.PROPERTY_VALUE_BY_ID_MAP,_Fields.SECOND_VALUE_BY_ID_MAP,_Fields.CREATE_TIME,_Fields.SKILL,_Fields.IS_LOCKED};
private static final _Fields optionals[] = {_Fields.ID,_Fields.EQUIP_ID,_Fields.LEVEL,_Fields.HERO_ID,_Fields.PROPERTY_VALUE_BY_ID_MAP,_Fields.SECOND_VALUE_BY_ID_MAP,_Fields.CREATE_TIME,_Fields.SKILL,_Fields.IS_LOCKED,_Fields.REBUILD_LEVEL};
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);
@ -179,6 +185,8 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.IS_LOCKED, new org.apache.thrift.meta_data.FieldMetaData("isLocked", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.REBUILD_LEVEL, new org.apache.thrift.meta_data.FieldMetaData("rebuildLevel", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PropertyItem.class, metaDataMap);
}
@ -210,6 +218,7 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
this.createTime = other.createTime;
this.skill = other.skill;
this.isLocked = other.isLocked;
this.rebuildLevel = other.rebuildLevel;
}
public PropertyItem deepCopy() {
@ -232,6 +241,8 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
this.skill = 0;
setIsLockedIsSet(false);
this.isLocked = 0;
setRebuildLevelIsSet(false);
this.rebuildLevel = 0;
}
public String getId() {
@ -467,6 +478,29 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISLOCKED_ISSET_ID, value);
}
public int getRebuildLevel() {
return this.rebuildLevel;
}
public PropertyItem setRebuildLevel(int rebuildLevel) {
this.rebuildLevel = rebuildLevel;
setRebuildLevelIsSet(true);
return this;
}
public void unsetRebuildLevel() {
__isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REBUILDLEVEL_ISSET_ID);
}
/** Returns true if field rebuildLevel is set (has been assigned a value) and false otherwise */
public boolean isSetRebuildLevel() {
return EncodingUtils.testBit(__isset_bitfield, __REBUILDLEVEL_ISSET_ID);
}
public void setRebuildLevelIsSet(boolean value) {
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REBUILDLEVEL_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case ID:
@ -541,6 +575,14 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
}
break;
case REBUILD_LEVEL:
if (value == null) {
unsetRebuildLevel();
} else {
setRebuildLevel((Integer)value);
}
break;
}
}
@ -573,6 +615,9 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
case IS_LOCKED:
return Integer.valueOf(getIsLocked());
case REBUILD_LEVEL:
return Integer.valueOf(getRebuildLevel());
}
throw new IllegalStateException();
}
@ -602,6 +647,8 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
return isSetSkill();
case IS_LOCKED:
return isSetIsLocked();
case REBUILD_LEVEL:
return isSetRebuildLevel();
}
throw new IllegalStateException();
}
@ -700,6 +747,15 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
return false;
}
boolean this_present_rebuildLevel = true && this.isSetRebuildLevel();
boolean that_present_rebuildLevel = true && that.isSetRebuildLevel();
if (this_present_rebuildLevel || that_present_rebuildLevel) {
if (!(this_present_rebuildLevel && that_present_rebuildLevel))
return false;
if (this.rebuildLevel != that.rebuildLevel)
return false;
}
return true;
}
@ -752,6 +808,11 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
if (present_isLocked)
list.add(isLocked);
boolean present_rebuildLevel = true && (isSetRebuildLevel());
list.add(present_rebuildLevel);
if (present_rebuildLevel)
list.add(rebuildLevel);
return list.hashCode();
}
@ -853,6 +914,16 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetRebuildLevel()).compareTo(other.isSetRebuildLevel());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRebuildLevel()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rebuildLevel, other.rebuildLevel);
if (lastComparison != 0) {
return lastComparison;
}
}
return 0;
}
@ -942,6 +1013,12 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
sb.append(this.isLocked);
first = false;
}
if (isSetRebuildLevel()) {
if (!first) sb.append(", ");
sb.append("rebuildLevel:");
sb.append(this.rebuildLevel);
first = false;
}
sb.append(")");
return sb.toString();
}
@ -1083,6 +1160,14 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
case 10: // REBUILD_LEVEL
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.rebuildLevel = iprot.readI32();
struct.setRebuildLevelIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@ -1167,6 +1252,11 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
oprot.writeI32(struct.isLocked);
oprot.writeFieldEnd();
}
if (struct.isSetRebuildLevel()) {
oprot.writeFieldBegin(REBUILD_LEVEL_FIELD_DESC);
oprot.writeI32(struct.rebuildLevel);
oprot.writeFieldEnd();
}
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@ -1212,7 +1302,10 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
if (struct.isSetIsLocked()) {
optionals.set(8);
}
oprot.writeBitSet(optionals, 9);
if (struct.isSetRebuildLevel()) {
optionals.set(9);
}
oprot.writeBitSet(optionals, 10);
if (struct.isSetId()) {
oprot.writeString(struct.id);
}
@ -1254,12 +1347,15 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
if (struct.isSetIsLocked()) {
oprot.writeI32(struct.isLocked);
}
if (struct.isSetRebuildLevel()) {
oprot.writeI32(struct.rebuildLevel);
}
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, PropertyItem struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
BitSet incoming = iprot.readBitSet(9);
BitSet incoming = iprot.readBitSet(10);
if (incoming.get(0)) {
struct.id = iprot.readString();
struct.setIdIsSet(true);
@ -1318,6 +1414,10 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
struct.isLocked = iprot.readI32();
struct.setIsLockedIsSet(true);
}
if (incoming.get(9)) {
struct.rebuildLevel = iprot.readI32();
struct.setRebuildLevelIsSet(true);
}
}
}

View File

@ -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 PurpleMansionSeal implements org.apache.thrift.TBase<PurpleMansionSeal, PurpleMansionSeal._Fields>, java.io.Serializable, Cloneable, Comparable<PurpleMansionSeal> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PurpleMansionSeal");

View File

@ -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 {

View File

@ -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 {

View File

@ -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<RechargeResult, RechargeResult._Fields>, java.io.Serializable, Cloneable, Comparable<RechargeResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RechargeResult");

View File

@ -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<Result, Result._Fields>, java.io.Serializable, Cloneable, Comparable<Result> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Result");

View File

@ -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<TeamPosHeroInfo, TeamPosHeroInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TeamPosHeroInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TeamPosHeroInfo");

View File

@ -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<Integer, Integer> propertyValueByIdMap = equip.getPropertyValueByIdMap();
Map<Integer, Long> 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();

View File

@ -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<InnerInvalidOperException, InnerInvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InnerInvalidOperException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException");

View File

@ -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<InnerResult, InnerResult._Fields>, java.io.Serializable, Cloneable, Comparable<InnerResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult");

View File

@ -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 {

View File

@ -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 {

View File

@ -55,6 +55,8 @@ struct PropertyItem {
7:optional i32 createTime;
8:optional i32 skill;
9:optional i32 isLocked;
10:optional i32 rebuildLevel;
}
struct Pokemon {

View File

@ -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<InnerInvalidOperException, InnerInvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InnerInvalidOperException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException");

View File

@ -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<InnerResult, InnerResult._Fields>, java.io.Serializable, Cloneable, Comparable<InnerResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult");

View File

@ -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 {

View File

@ -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<ArenaOfHero, ArenaOfHero._Fields>, java.io.Serializable, Cloneable, Comparable<ArenaOfHero> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArenaOfHero");

View File

@ -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<CrossArenaManager, CrossArenaManager._Fields>, java.io.Serializable, Cloneable, Comparable<CrossArenaManager> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CrossArenaManager");

View File

@ -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<InvalidOperException, InvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidOperException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidOperException");

View File

@ -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<Pokemon, Pokemon._Fields>, java.io.Serializable, Cloneable, Comparable<Pokemon> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Pokemon");

View File

@ -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<PropertyItem, PropertyItem._Fields>, java.io.Serializable, Cloneable, Comparable<PropertyItem> {
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<PropertyItem, Prope
private static final org.apache.thrift.protocol.TField CREATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createTime", org.apache.thrift.protocol.TType.I32, (short)7);
private static final org.apache.thrift.protocol.TField SKILL_FIELD_DESC = new org.apache.thrift.protocol.TField("skill", org.apache.thrift.protocol.TType.I32, (short)8);
private static final org.apache.thrift.protocol.TField IS_LOCKED_FIELD_DESC = new org.apache.thrift.protocol.TField("isLocked", org.apache.thrift.protocol.TType.I32, (short)9);
private static final org.apache.thrift.protocol.TField REBUILD_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("rebuildLevel", org.apache.thrift.protocol.TType.I32, (short)10);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@ -63,6 +64,7 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
public int createTime; // optional
public int skill; // optional
public int isLocked; // optional
public int rebuildLevel; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -74,7 +76,8 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
SECOND_VALUE_BY_ID_MAP((short)6, "secondValueByIdMap"),
CREATE_TIME((short)7, "createTime"),
SKILL((short)8, "skill"),
IS_LOCKED((short)9, "isLocked");
IS_LOCKED((short)9, "isLocked"),
REBUILD_LEVEL((short)10, "rebuildLevel");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@ -107,6 +110,8 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
return SKILL;
case 9: // IS_LOCKED
return IS_LOCKED;
case 10: // REBUILD_LEVEL
return REBUILD_LEVEL;
default:
return null;
}
@ -152,8 +157,9 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
private static final int __CREATETIME_ISSET_ID = 2;
private static final int __SKILL_ISSET_ID = 3;
private static final int __ISLOCKED_ISSET_ID = 4;
private static final int __REBUILDLEVEL_ISSET_ID = 5;
private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.ID,_Fields.EQUIP_ID,_Fields.LEVEL,_Fields.HERO_ID,_Fields.PROPERTY_VALUE_BY_ID_MAP,_Fields.SECOND_VALUE_BY_ID_MAP,_Fields.CREATE_TIME,_Fields.SKILL,_Fields.IS_LOCKED};
private static final _Fields optionals[] = {_Fields.ID,_Fields.EQUIP_ID,_Fields.LEVEL,_Fields.HERO_ID,_Fields.PROPERTY_VALUE_BY_ID_MAP,_Fields.SECOND_VALUE_BY_ID_MAP,_Fields.CREATE_TIME,_Fields.SKILL,_Fields.IS_LOCKED,_Fields.REBUILD_LEVEL};
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);
@ -179,6 +185,8 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.IS_LOCKED, new org.apache.thrift.meta_data.FieldMetaData("isLocked", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.REBUILD_LEVEL, new org.apache.thrift.meta_data.FieldMetaData("rebuildLevel", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PropertyItem.class, metaDataMap);
}
@ -210,6 +218,7 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
this.createTime = other.createTime;
this.skill = other.skill;
this.isLocked = other.isLocked;
this.rebuildLevel = other.rebuildLevel;
}
public PropertyItem deepCopy() {
@ -232,6 +241,8 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
this.skill = 0;
setIsLockedIsSet(false);
this.isLocked = 0;
setRebuildLevelIsSet(false);
this.rebuildLevel = 0;
}
public String getId() {
@ -467,6 +478,29 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISLOCKED_ISSET_ID, value);
}
public int getRebuildLevel() {
return this.rebuildLevel;
}
public PropertyItem setRebuildLevel(int rebuildLevel) {
this.rebuildLevel = rebuildLevel;
setRebuildLevelIsSet(true);
return this;
}
public void unsetRebuildLevel() {
__isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REBUILDLEVEL_ISSET_ID);
}
/** Returns true if field rebuildLevel is set (has been assigned a value) and false otherwise */
public boolean isSetRebuildLevel() {
return EncodingUtils.testBit(__isset_bitfield, __REBUILDLEVEL_ISSET_ID);
}
public void setRebuildLevelIsSet(boolean value) {
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REBUILDLEVEL_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case ID:
@ -541,6 +575,14 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
}
break;
case REBUILD_LEVEL:
if (value == null) {
unsetRebuildLevel();
} else {
setRebuildLevel((Integer)value);
}
break;
}
}
@ -573,6 +615,9 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
case IS_LOCKED:
return Integer.valueOf(getIsLocked());
case REBUILD_LEVEL:
return Integer.valueOf(getRebuildLevel());
}
throw new IllegalStateException();
}
@ -602,6 +647,8 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
return isSetSkill();
case IS_LOCKED:
return isSetIsLocked();
case REBUILD_LEVEL:
return isSetRebuildLevel();
}
throw new IllegalStateException();
}
@ -700,6 +747,15 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
return false;
}
boolean this_present_rebuildLevel = true && this.isSetRebuildLevel();
boolean that_present_rebuildLevel = true && that.isSetRebuildLevel();
if (this_present_rebuildLevel || that_present_rebuildLevel) {
if (!(this_present_rebuildLevel && that_present_rebuildLevel))
return false;
if (this.rebuildLevel != that.rebuildLevel)
return false;
}
return true;
}
@ -752,6 +808,11 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
if (present_isLocked)
list.add(isLocked);
boolean present_rebuildLevel = true && (isSetRebuildLevel());
list.add(present_rebuildLevel);
if (present_rebuildLevel)
list.add(rebuildLevel);
return list.hashCode();
}
@ -853,6 +914,16 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetRebuildLevel()).compareTo(other.isSetRebuildLevel());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRebuildLevel()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rebuildLevel, other.rebuildLevel);
if (lastComparison != 0) {
return lastComparison;
}
}
return 0;
}
@ -942,6 +1013,12 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
sb.append(this.isLocked);
first = false;
}
if (isSetRebuildLevel()) {
if (!first) sb.append(", ");
sb.append("rebuildLevel:");
sb.append(this.rebuildLevel);
first = false;
}
sb.append(")");
return sb.toString();
}
@ -1083,6 +1160,14 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
case 10: // REBUILD_LEVEL
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.rebuildLevel = iprot.readI32();
struct.setRebuildLevelIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@ -1167,6 +1252,11 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
oprot.writeI32(struct.isLocked);
oprot.writeFieldEnd();
}
if (struct.isSetRebuildLevel()) {
oprot.writeFieldBegin(REBUILD_LEVEL_FIELD_DESC);
oprot.writeI32(struct.rebuildLevel);
oprot.writeFieldEnd();
}
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@ -1212,7 +1302,10 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
if (struct.isSetIsLocked()) {
optionals.set(8);
}
oprot.writeBitSet(optionals, 9);
if (struct.isSetRebuildLevel()) {
optionals.set(9);
}
oprot.writeBitSet(optionals, 10);
if (struct.isSetId()) {
oprot.writeString(struct.id);
}
@ -1254,12 +1347,15 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
if (struct.isSetIsLocked()) {
oprot.writeI32(struct.isLocked);
}
if (struct.isSetRebuildLevel()) {
oprot.writeI32(struct.rebuildLevel);
}
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, PropertyItem struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
BitSet incoming = iprot.readBitSet(9);
BitSet incoming = iprot.readBitSet(10);
if (incoming.get(0)) {
struct.id = iprot.readString();
struct.setIdIsSet(true);
@ -1318,6 +1414,10 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
struct.isLocked = iprot.readI32();
struct.setIsLockedIsSet(true);
}
if (incoming.get(9)) {
struct.rebuildLevel = iprot.readI32();
struct.setRebuildLevelIsSet(true);
}
}
}

View File

@ -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 PurpleMansionSeal implements org.apache.thrift.TBase<PurpleMansionSeal, PurpleMansionSeal._Fields>, java.io.Serializable, Cloneable, Comparable<PurpleMansionSeal> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PurpleMansionSeal");

View File

@ -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 {

View File

@ -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 {

View File

@ -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<RechargeResult, RechargeResult._Fields>, java.io.Serializable, Cloneable, Comparable<RechargeResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RechargeResult");

View File

@ -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<Result, Result._Fields>, java.io.Serializable, Cloneable, Comparable<Result> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Result");

View File

@ -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<TeamPosHeroInfo, TeamPosHeroInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TeamPosHeroInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TeamPosHeroInfo");

View File

@ -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<InnerInvalidOperException, InnerInvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InnerInvalidOperException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException");

View File

@ -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<InnerResult, InnerResult._Fields>, java.io.Serializable, Cloneable, Comparable<InnerResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult");

View File

@ -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 {

View File

@ -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 {

View File

@ -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<InnerInvalidOperException, InnerInvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InnerInvalidOperException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException");

View File

@ -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<InnerResult, InnerResult._Fields>, java.io.Serializable, Cloneable, Comparable<InnerResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult");

View File

@ -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 {

View File

@ -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 {