root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

神印功能提交

back_recharge
duhui 2022-04-22 18:27:17 +08:00
parent 913af67528
commit 6ce4c11c7d
23 changed files with 1591 additions and 1085 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
serverlogic/src/main/java/com/ljsd/CoreService.java
View File

@ -314,6 +314,7 @@ public class CoreService implements RPCRequestIFace.Iface {
arenaOfHero.setStar(hero.getStar());
arenaOfHero.setEquipByPositionMap(new HashMap<>(hero.getEquipByHongmengPositionMap(heroManager)));
arenaOfHero.setSoulEquipByPositionMap(new HashMap<>(hero.getSoulEquipByPositionMap()));
arenaOfHero.setGodSealByPositionMap(new HashMap<>(hero.getGodSealByPositionMap()));
arenaOfHero.setBreakId(hero.getBreakIdByHongMeng(heroManager));
arenaOfHero.setStarBreakId(hero.getStarBreakId());
arenaOfHero.setCreateTime(hero.getCreateTime());

4
serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
View File

@ -396,4 +396,8 @@ public interface BIReason {
int EXPLORE_EVENT_BOX =1238;//探索试炼宝箱
int EXPLORE_EVENT_MONSTER =1239;//探索兽潮
int UPLOAD_GOD_SEAL =1240;//卸下神印
int UP_GOD_SEAL =1241;//装备神印
int MARGE_GOD_SEAL =1242;//合成神印
}

3
serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java
View File

@ -40,6 +40,9 @@ public interface GlobalItemType {
int TRUMP_CHIP=30;//法宝碎片(法宝聚灵使用)
int LIFE_STONE=31;//命石
int HOOK_PROP=32;//挂机奖励资源道具
int GOD_SEAL= 34;//神印
//物品使用类型
int NO_USE = 0 ; //不使用
int RANDOM_USE = 1; // 随机使用

3
serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java
View File

@ -266,7 +266,8 @@ public class GMRequestHandler extends BaseHandler{
int itemId = sItem.getId();
int itemType = sItem.getItemType();
int itemNum = 9999;
if(itemType == GlobalItemType.CARD ||itemType == GlobalItemType.EQUIP ||itemType == GlobalItemType.ESPECIAL_EQUIP||itemType==GlobalItemType.SOUL_MARK||itemType==GlobalItemType.JEWEL){
if(itemType == GlobalItemType.CARD || itemType == GlobalItemType.EQUIP || itemType == GlobalItemType.ESPECIAL_EQUIP
|| itemType==GlobalItemType.SOUL_MARK || itemType==GlobalItemType.JEWEL || itemType == GlobalItemType.GOD_SEAL){
itemNum =1;
}
gmDrop[i++] = new int[]{itemId,itemNum};

2
serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulMergeHandler.java
View File

@ -16,6 +16,6 @@ public class SoulMergeHandler extends BaseHandler<HeroInfoProto.MergeSoulRequest
@Override
public void processWithProto(ISession iSession, HeroInfoProto.MergeSoulRequest proto) throws Exception {
HeroLogic.mergeSoul(iSession,proto.getTargetId(),proto.getSoulIdList());
HeroLogic.getInstance().margeSeal(iSession,proto.getTargetId(),proto.getSoulIdList());
}
}

25
serverlogic/src/main/java/com/ljsd/jieling/handler/equip/UpGodSearHandler.java 100644
View File

@ -0,0 +1,25 @@
package com.ljsd.jieling.handler.equip;
import com.ljsd.jieling.handler.BaseHandler;
import com.ljsd.jieling.logic.hero.HeroLogic;
import com.ljsd.jieling.network.session.ISession;
import org.springframework.stereotype.Component;
import rpc.protocols.HeroInfoProto;
import rpc.protocols.MessageTypeProto;
/**
* @author hj
* 升品神印
*/
@Component
public class UpGodSearHandler extends BaseHandler<HeroInfoProto.UpGodSealRequest> {
@Override
public MessageTypeProto.MessageType getMessageCode() {
return MessageTypeProto.MessageType.UpGodSealRequest;
}
@Override
public void processWithProto(ISession iSession, HeroInfoProto.UpGodSealRequest proto) throws Exception {
HeroLogic.getInstance().upGodSeal(iSession,proto.getItemId(),proto.getHeroId());
}
}

30
serverlogic/src/main/java/com/ljsd/jieling/handler/equip/WearGodSealHandler.java 100644
View File

@ -0,0 +1,30 @@
package com.ljsd.jieling.handler.equip;
import com.ljsd.jieling.handler.BaseHandler;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.hero.HeroLogic;
import com.ljsd.jieling.network.session.ISession;
import org.springframework.stereotype.Component;
import rpc.protocols.HeroInfoProto;
import rpc.protocols.MessageTypeProto;
/**
* @author hj
* 穿戴神印
*/
@Component
public class WearGodSealHandler extends BaseHandler<HeroInfoProto.WearGodSealRequest> {
@Override
public MessageTypeProto.MessageType getMessageCode() {
return MessageTypeProto.MessageType.WearGodSealRequest;
}
@Override
public void processWithProto(ISession iSession, HeroInfoProto.WearGodSealRequest godSealRequest) throws Exception {
int type = godSealRequest.getType();
HeroInfoProto.OptHeroSoul wearInfo = godSealRequest.getWearInfo();
HeroLogic.getInstance().wearGodSeal(iSession,type,wearInfo);
}
}

16
serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java
View File

@ -31,6 +31,8 @@ public class Hero extends MongoBase implements Comparable<Hero>,Cloneable {
private Map<Integer,Integer> soulEquipByPositionMap = new HashMap<>();
private Map<Integer, Integer> godSealByPositionMap = new HashMap<>();
private int breakId;
private int starBreakId;
@ -333,6 +335,20 @@ public class Hero extends MongoBase implements Comparable<Hero>,Cloneable {
this.soulEquipByPositionMap.remove(position);
}
public Map<Integer, Integer> getGodSealByPositionMap() {
return godSealByPositionMap;
}
public void putGodSealByPositionMap(int position, int equipId) {
updateString("godSealByPositionMap." + position, equipId);
this.godSealByPositionMap.put(position, equipId);
}
public void removeGodSeal(int position) {
removeString(getMongoKey() + ".godSealByPositionMap." + position);
this.godSealByPositionMap.remove(position);
}
/**
* breaId 鸿蒙阵
*

316
serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
View File

@ -30,7 +30,6 @@ import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.logic.dao.cross.CSPlayer;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.expedition.ExpeditionLogic;
import com.ljsd.jieling.logic.family.GuildDef;
import com.ljsd.jieling.logic.fight.CombatLogic;
import com.ljsd.jieling.logic.fight.passiveSkillCal.PassiveskillCalEnum;
import com.ljsd.jieling.logic.help.HelpHero;
@ -2041,13 +2040,20 @@ public class HeroLogic {
skillList.addAll(tempHero.getPassiveSkills(2, hero.getStarBreakId()));
}
Map<Integer, SEquipConfig> config = STableManager.getConfig(SEquipConfig.class);
//魂印
Map<Integer, Integer> soulEquipByPositionMap = hero.getSoulEquipByPositionMap();
Map<Integer, SEquipConfig> config = STableManager.getConfig(SEquipConfig.class);
soulEquipByPositionMap.values().forEach(e -> {
Arrays.stream(config.get(e).getPassiveSkill()).forEach(skillList::add);
});
//神印
Map<Integer, Integer> godSealByPositionMap = hero.getGodSealByPositionMap();
godSealByPositionMap.values().forEach(e -> {
Arrays.stream(config.get(e).getPassiveSkill()).forEach(skillList::add);
});
//法宝技能
int[] equipTalismana = tempHero.getEquipTalismana();
if (equipTalismana.length >= 2 && hero.getStar() >= equipTalismana[0]) {
@ -2080,12 +2086,11 @@ public class HeroLogic {
});
Iterator<Map.Entry<Integer, Integer>> iterator = hero.getEquipByHongmengPositionMap(user.getHeroManager()).entrySet().iterator();
Map<Integer, Integer> intensifyMap = user.getEquipManager().getEquipIntensifyMap();
// 套装list初始化
ArrayList<SEquipConfig> suiteNumList = new ArrayList<>();
while (iterator.hasNext()) {
Map.Entry<Integer, Integer> next = iterator.next();
SEquipConfig sEquipConfig = STableManager.getConfig(SEquipConfig.class).get(next.getValue());
SEquipConfig sEquipConfig = config.get(next.getValue());
// 添加到套装list
suiteNumList.add(sEquipConfig);
}
@ -2181,13 +2186,19 @@ public class HeroLogic {
skillList.addAll(tempHero.getPassiveSkills(2, hero.getStarBreakId()));
}
Map<Integer, SEquipConfig> config = STableManager.getConfig(SEquipConfig.class);
//魂印
Map<Integer, Integer> soulEquipByPositionMap = hero.getSoulEquipByPositionMap();
Map<Integer, SEquipConfig> config = STableManager.getConfig(SEquipConfig.class);
soulEquipByPositionMap.values().forEach(e -> {
Arrays.stream(config.get(e).getPassiveSkill()).forEach(skillList::add);
});
//神印
Map<Integer, Integer> godSealByPositionMap = hero.getGodSealByPositionMap();
godSealByPositionMap.values().forEach(e -> {
Arrays.stream(config.get(e).getPassiveSkill()).forEach(skillList::add);
});
//法宝技能
int[] equipTalismana = tempHero.getEquipTalismana();
if (equipTalismana.length >= 1 && hero.getStar() >= equipTalismana[0]) {
@ -2886,9 +2897,10 @@ public class HeroLogic {
int homeRankUp = user.getEquipManager().getEquipHomeRankUp();
// 套装list初始化
ArrayList<SEquipConfig> suiteNumList = new ArrayList<>();
Map<Integer, SEquipConfig> equipConfigMap = STableManager.getConfig(SEquipConfig.class);
while (iterator.hasNext()) {
Map.Entry<Integer, Integer> next = iterator.next();
SEquipConfig sEquipConfig = STableManager.getConfig(SEquipConfig.class).get(next.getValue());
SEquipConfig sEquipConfig = equipConfigMap.get(next.getValue());
int[][] property = sEquipConfig.getProperty();
Map<Integer, Long> propertyValueByIdMap = new HashMap<>();
for (int[] prop : property) {
@ -3061,10 +3073,21 @@ public class HeroLogic {
combinedAttribute(config.get(buildLevelProperty).getProperty(), heroAllAttribute);
}
}
//魂印
Map<Integer, Integer> soulEquipByPositionMap = hero.getSoulEquipByPositionMap();
soulEquipByPositionMap.forEach((k, v) -> {
SEquipConfig sEquipConfig = STableManager.getConfig(SEquipConfig.class).get(v);
SEquipConfig sEquipConfig = equipConfigMap.get(v);
int[][] property = sEquipConfig.getProperty();
if (property != null && property.length > 0 && property[0].length > 0) {
combinedAttribute(property, heroAllAttribute);
}
});
//神印
Map<Integer, Integer> godSealByPositionMap = hero.getGodSealByPositionMap();
godSealByPositionMap.forEach((k, v) -> {
SEquipConfig sEquipConfig = equipConfigMap.get(v);
int[][] property = sEquipConfig.getProperty();
if (property != null && property.length > 0 && property[0].length > 0) {
combinedAttribute(property, heroAllAttribute);
@ -4478,41 +4501,58 @@ public class HeroLogic {
}
public static void mergeSoul(ISession session, int targetId, List<Integer> soulIdList) throws Exception {
int uid = session.getUid();
User user = UserManager.getUser(uid);
SEquipConfig sEquipConfig = STableManager.getConfig(SEquipConfig.class).get(targetId);
int[][] resource = sEquipConfig.getResource();
/**
* 印章合成：魂印，神印
* @param session
* @param targetId
* @param soulIdList
* @throws Exception
*/
public void margeSeal(ISession session, int targetId, List<Integer> soulIdList) throws Exception {
User user = UserManager.getUser(session.getUid());
Map<Integer, SEquipConfig> config = STableManager.getConfig(SEquipConfig.class);
CommonProto.Drop.Builder dropBuilder;
dropBuilder = mergeSoul(user, targetId, soulIdList);
HeroInfoProto.MergeSoulResponse build = HeroInfoProto.MergeSoulResponse.newBuilder().setDrop(dropBuilder).build();
MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.SOUL_MERGE_RESPONSE_VALUE, build, true);
ReportUtil.onReportEvent(user, ReportEventEnum.FATALITY_SYNTHESIS.getType(), targetId, "", soulIdList);
}
/**
* 合成魂印
* @param user
* @param targetId
* @param soulIdList
* @return
* @throws Exception
*/
public CommonProto.Drop.Builder mergeSoul(User user, int targetId, List<Integer> soulIdList) throws Exception {
Map<Integer, SEquipConfig> config = STableManager.getConfig(SEquipConfig.class);
SEquipConfig sEquipConfig = config.get(targetId);
int[][] resource = sEquipConfig.getResource();
Map<Integer, Integer> itemTemplateCost = new HashMap<>();
Map<Integer, Integer> itemReallyCost = new HashMap<>();
soulIdList.forEach(e -> {
itemTemplateCost.put(STableManager.getConfig(SEquipConfig.class).get(e).getQuality(), itemTemplateCost.getOrDefault(STableManager.getConfig(SEquipConfig.class).get(e).getQuality(), 0) + 1);
itemTemplateCost.put(config.get(e).getQuality(), itemTemplateCost.getOrDefault(config.get(e).getQuality(), 0) + 1);
itemReallyCost.put(e, itemReallyCost.getOrDefault(e, 0) + 1);
});
Arrays.stream(resource).forEach(item -> {
itemReallyCost.put(item[0], itemReallyCost.getOrDefault(item[0], 0) + item[1]);
});
int[][] formula = sEquipConfig.getFormula();
for (int[] item : formula) {
if (itemTemplateCost.getOrDefault(item[0], 0) != item[1]) {
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
}
}
boolean b = ItemUtil.itemCost(user, itemReallyCost, BIReason.SOUL_EQUIP_MERGE_CONSUME, targetId);
if (!b) {
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
}
int[][] drop = new int[1][];
drop[0] = new int[2];
drop[0][0] = targetId;
drop[0][1] = 1;
CommonProto.Drop.Builder dropBuilder = ItemUtil.drop(user, drop, 1);
HeroInfoProto.MergeSoulResponse build = HeroInfoProto.MergeSoulResponse.newBuilder().setDrop(dropBuilder).build();
MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.SOUL_MERGE_RESPONSE_VALUE, build, true);
ReportUtil.onReportEvent(user, ReportEventEnum.FATALITY_SYNTHESIS.getType(), targetId, "", soulIdList);
int[][] drop = new int[][]{{targetId,1}};
return ItemUtil.drop(user, drop, 1);
}
public static void unloadSoulEquipOpt(ISession iSession, String heroId, List<HeroInfoProto.SoulEquipPos> equipIdsList) throws Exception {
@ -6148,4 +6188,234 @@ public class HeroLogic {
}
return skillList;
}
/**
* 穿戴神印
* @param iSession
* @param type 0：卸下，1：戴上
* @param optHeroSoul
*/
public void wearGodSeal(ISession iSession, int type, HeroInfoProto.OptHeroSoul optHeroSoul) throws Exception {
User user = UserManager.getUser(iSession.getUid());
String heroId = optHeroSoul.getHeroId();
HeroManager heroManager = user.getHeroManager();
Hero hero = heroManager.getHero(heroId);
if (hero == null){
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"英雄不存在");
}
// 英雄身上的神印
Map<Integer, Integer> godSealByHero = hero.getGodSealByPositionMap();
// 客户端传来的神印
List<HeroInfoProto.SoulEquipPos> godSealByOpt = optHeroSoul.getSoulEquipIdsList();
CommonProto.Drop.Builder drop = CommonProto.Drop.newBuilder();
// 卸下魂印
if (type == 0){
ArrayList<int[][]> list = new ArrayList<>();
// 先循环验证
for (HeroInfoProto.SoulEquipPos pos : godSealByOpt) {
if (godSealByHero.get(pos.getPosition()) == null || godSealByHero.get(pos.getPosition()) == 0){
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"位置不存在神印："+pos.getPosition());
}
}
for (HeroInfoProto.SoulEquipPos pos : godSealByOpt) {
// 删除英雄身上的神印信息
hero.removeGodSeal(pos.getPosition());
// 卸下的神印需要放回物品背包
list.add(new int[][]{{pos.getEquipId(),1}});
}
ItemUtil.drop(user,list,BIReason.UPLOAD_GOD_SEAL);
}
// 装备神印
if (type == 1){
int[] value = SSpecialConfig.getIntegerArrayValue(SSpecialConfig.GodSignOpenStar);
// 存放已解锁的位置id
ArrayList<Integer> indexBox = new ArrayList<>();
for (int i = 0; i < value.length; i++) {
if (hero.getStar() >= value[i]){
indexBox.add(i+1);
}
}
Map<Integer, SEquipConfig> configMap = STableManager.getConfig(SEquipConfig.class);
HashMap<Integer, Integer> costMap = new HashMap<>();
// 循环验证
for (HeroInfoProto.SoulEquipPos pos : godSealByOpt) {
int position = pos.getPosition();
int equipId = pos.getEquipId();
if (!indexBox.contains(position)){
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"位置未解锁："+position);
}
boolean profession = verifyProfessionByGodSeal(hero.getTemplateId(), equipId);
if (!profession){
throw new ErrorCodeException(ErrorCode.HERO_UN_MATCH,"职业不满足条件："+equipId);
}
SEquipConfig equipConfig = configMap.get(equipId);
for (Integer godSealId : godSealByHero.values()) {
SEquipConfig equipConfig1 = configMap.get(godSealId);
if (equipConfig.getSuiteID() == equipConfig1.getSuiteID()){
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"已装备相同种类的神印："+equipId);
}
if (equipConfig.getPosition() != 6){
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"非神印不能安装："+equipId);
}
}
// 安装后需要从背包里消耗的装备id
costMap.put(equipId,1);
}
// 消耗
boolean cost = ItemUtil.itemCost(user, costMap, BIReason.UP_GOD_SEAL, 0);
if (!cost){
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
}
ArrayList<int[][]> list = new ArrayList<>();
// 装备神印
for (HeroInfoProto.SoulEquipPos pos : godSealByOpt) {
// 已装备的神印，放回背包
if (godSealByHero.get(pos.getPosition()) != null){
list.add(new int[][]{{pos.getEquipId(),1}});
}
hero.putGodSealByPositionMap(pos.getPosition(),pos.getEquipId());
}
drop = ItemUtil.drop(user, list, BIReason.UP_GOD_SEAL);
}
if (isInTeam(user, heroId, 1)) {
Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(user.getId()));
}
HeroInfoProto.WearGodSealResponse.Builder builder = HeroInfoProto.WearGodSealResponse.newBuilder().setDrop(drop);
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.WearGodSealResponse_VALUE, builder.build());
}
/**
* 合成神印
* @param iSession
* @param ItemId
* @param heroId
* @return
* @throws Exception
*/
public void upGodSeal(ISession iSession, int ItemId, String heroId) throws Exception {
// 获取玩家参数
User user = UserManager.getUser(iSession.getUid());
// 升品神印参数
Map<Integer, SEquipConfig> config = STableManager.getConfig(SEquipConfig.class);
SEquipConfig sEquipConfig = config.get(ItemId);
// 升品消耗
int[][] resource = sEquipConfig.getResource();
// 一些需要记录的参数
int position = 0;
int targetId = sEquipConfig.getFormula()[0][0];
Hero hero = null;
// 英雄身上的神印升品
if (!"".equals(heroId)){
ArrayList<int[][]> list = new ArrayList<>();
// hero信息
hero = user.getHeroManager().getHero(heroId);
// hero godseal 信息
Map<Integer, Integer> godSealByPositionMap = hero.getGodSealByPositionMap();
for (Map.Entry<Integer, Integer> entry : godSealByPositionMap.entrySet()) {
if (entry.getValue() == ItemId){
// 删除英雄身上的神印信息
hero.removeGodSeal(entry.getKey());
// 入背包
list.add(new int[][]{{entry.getValue(),1}});
// 记录神印位置
position = entry.getKey();
}
}
// 卸下的神印需要放回物品背包
ItemUtil.drop(user,list,BIReason.MARGE_GOD_SEAL);
}
// 验证道具消耗
boolean b = ItemUtil.itemCost(user, resource, BIReason.MARGE_GOD_SEAL, 0);
if (!b) {
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
}
// 合成奖励放入背包
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sEquipConfig.getFormula(), BIReason.MARGE_GOD_SEAL);
// 原本是英雄身上的需要重新装备，并删除背包中的
if (position != 0 && hero != null){
// 给英雄重新装备上改id
hero.putGodSealByPositionMap(position,targetId);
// 删除背包里的神印
ItemUtil.itemCost(user, sEquipConfig.getFormula(), BIReason.MARGE_GOD_SEAL,0);
}
if (isInTeam(user, heroId, 1)) {
Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(user.getId()));
}
HeroInfoProto.UpGodSealResponse.Builder builder = HeroInfoProto.UpGodSealResponse.newBuilder().setDrop(drop);
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.UpGodSealResponse_VALUE, builder.build());
}
/**
* 装备神印验证职业条件
* @param heroId
* @param equipId
* @return
*/
private boolean verifyProfessionByGodSeal(int heroId,int equipId){
// 默认值
boolean result = false;
// 装备信息
SEquipConfig equip = STableManager.getConfig(SEquipConfig.class).get(equipId);
// 英雄信息
SCHero hero = SCHero.getsCHero().get(heroId);
if (equip == null || hero == null){
LOGGER.error("装备神印，装备ID或者英雄ID错误，表内容查询失败,equip:{},hero:{}",equipId,heroId);
return result;
}
// 判断条件查表去
switch (equip.getProfessionLimit()){
case 0:
result = true;
break;
case 1:
if (hero.getProfession() == 1){
result = true;
}
break;
case 2:
if (hero.getProfession() == 2){
result = true;
}
break;
case 3:
if (hero.getProfession() == 4){
result = true;
}
break;
case 4:
if (hero.getProfession() == 3){
result = true;
}
break;
case 5:
if (hero.getJob() == 1){
result = true;
}
break;
case 6:
if (hero.getJob() == 2){
result = true;
}
break;
case 7:
if (hero.getProfession() == 2 || hero.getProfession() == 3){
result = true;
}
break;
default:
break;
}
return result;
}
}

9
serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
View File

@ -1278,7 +1278,7 @@ public class PlayerLogic {
MessageUtil.sendMessage(session,1,resMsgId,builder.build(),true);
}
public PlayerInfoProto.ViewHeroInfoResponse viewHeroInfo(int uid,String heroId,int teamId) throws Exception {
public PlayerInfoProto.ViewHeroInfoResponse viewHeroInfo(int uid,String heroId,int teamId) throws Exception {
User userInMem = UserManager.getUserInMem(uid);
if(userInMem == null){
throw new ErrorCodeException(ErrorCode.FRIENDS_USER_NULL);
@ -1358,11 +1358,16 @@ public class PlayerLogic {
heroBuilder.addEquipIdList(equipId);
builder.addEquip(CBean2Proto.getEquipProto(equipId,crossArenaManager.getHomeEquipLv()));
}
// 法宝
// 魂印
Map<Integer, Integer> soulEquipByPositionMap = rpcHero.getSoulEquipByPositionMap();
for(Map.Entry<Integer,Integer> entry: soulEquipByPositionMap.entrySet()){
heroBuilder.addSoulPos(CommonProto.SoulPos.newBuilder().setEquipId(entry.getValue()).setPosition(entry.getKey()));
}
// 神印
Map<Integer, Integer> godSealByPositionMap = rpcHero.getGodSealByPositionMap();
for(Map.Entry<Integer,Integer> entry: godSealByPositionMap.entrySet()){
heroBuilder.addGodSeals(CommonProto.SoulPos.newBuilder().setEquipId(entry.getValue()).setPosition(entry.getKey()));
}
// 皮肤
heroBuilder.setSkinId(rpcHero.getSkin());
// 英雄技能

740
serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java
View File

File diff suppressed because it is too large Load Diff

88
serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java
View File

@ -1099,15 +1099,15 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
case 5: // PROPERTY_VALUE_BY_ID_MAP
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map86 = iprot.readMapBegin();
struct.propertyValueByIdMap = new HashMap<Integer,Long>(2*_map86.size);
int _key87;
long _val88;
for (int _i89 = 0; _i89 < _map86.size; ++_i89)
org.apache.thrift.protocol.TMap _map96 = iprot.readMapBegin();
struct.propertyValueByIdMap = new HashMap<Integer,Long>(2*_map96.size);
int _key97;
long _val98;
for (int _i99 = 0; _i99 < _map96.size; ++_i99)
{
_key87 = iprot.readI32();
_val88 = iprot.readI64();
struct.propertyValueByIdMap.put(_key87, _val88);
_key97 = iprot.readI32();
_val98 = iprot.readI64();
struct.propertyValueByIdMap.put(_key97, _val98);
}
iprot.readMapEnd();
}
@ -1119,15 +1119,15 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
case 6: // SECOND_VALUE_BY_ID_MAP
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map90 = iprot.readMapBegin();
struct.secondValueByIdMap = new HashMap<Integer,Long>(2*_map90.size);
int _key91;
long _val92;
for (int _i93 = 0; _i93 < _map90.size; ++_i93)
org.apache.thrift.protocol.TMap _map100 = iprot.readMapBegin();
struct.secondValueByIdMap = new HashMap<Integer,Long>(2*_map100.size);
int _key101;
long _val102;
for (int _i103 = 0; _i103 < _map100.size; ++_i103)
{
_key91 = iprot.readI32();
_val92 = iprot.readI64();
struct.secondValueByIdMap.put(_key91, _val92);
_key101 = iprot.readI32();
_val102 = iprot.readI64();
struct.secondValueByIdMap.put(_key101, _val102);
}
iprot.readMapEnd();
}
@ -1212,10 +1212,10 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
oprot.writeFieldBegin(PROPERTY_VALUE_BY_ID_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, struct.propertyValueByIdMap.size()));
for (Map.Entry<Integer, Long> _iter94 : struct.propertyValueByIdMap.entrySet())
for (Map.Entry<Integer, Long> _iter104 : struct.propertyValueByIdMap.entrySet())
{
oprot.writeI32(_iter94.getKey());
oprot.writeI64(_iter94.getValue());
oprot.writeI32(_iter104.getKey());
oprot.writeI64(_iter104.getValue());
}
oprot.writeMapEnd();
}
@ -1227,10 +1227,10 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
oprot.writeFieldBegin(SECOND_VALUE_BY_ID_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, struct.secondValueByIdMap.size()));
for (Map.Entry<Integer, Long> _iter95 : struct.secondValueByIdMap.entrySet())
for (Map.Entry<Integer, Long> _iter105 : struct.secondValueByIdMap.entrySet())
{
oprot.writeI32(_iter95.getKey());
oprot.writeI64(_iter95.getValue());
oprot.writeI32(_iter105.getKey());
oprot.writeI64(_iter105.getValue());
}
oprot.writeMapEnd();
}
@ -1321,20 +1321,20 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
if (struct.isSetPropertyValueByIdMap()) {
{
oprot.writeI32(struct.propertyValueByIdMap.size());
for (Map.Entry<Integer, Long> _iter96 : struct.propertyValueByIdMap.entrySet())
for (Map.Entry<Integer, Long> _iter106 : struct.propertyValueByIdMap.entrySet())
{
oprot.writeI32(_iter96.getKey());
oprot.writeI64(_iter96.getValue());
oprot.writeI32(_iter106.getKey());
oprot.writeI64(_iter106.getValue());
}
}
}
if (struct.isSetSecondValueByIdMap()) {
{
oprot.writeI32(struct.secondValueByIdMap.size());
for (Map.Entry<Integer, Long> _iter97 : struct.secondValueByIdMap.entrySet())
for (Map.Entry<Integer, Long> _iter107 : struct.secondValueByIdMap.entrySet())
{
oprot.writeI32(_iter97.getKey());
oprot.writeI64(_iter97.getValue());
oprot.writeI32(_iter107.getKey());
oprot.writeI64(_iter107.getValue());
}
}
}
@ -1374,30 +1374,30 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
}
if (incoming.get(4)) {
{
org.apache.thrift.protocol.TMap _map98 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
struct.propertyValueByIdMap = new HashMap<Integer,Long>(2*_map98.size);
int _key99;
long _val100;
for (int _i101 = 0; _i101 < _map98.size; ++_i101)
org.apache.thrift.protocol.TMap _map108 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
struct.propertyValueByIdMap = new HashMap<Integer,Long>(2*_map108.size);
int _key109;
long _val110;
for (int _i111 = 0; _i111 < _map108.size; ++_i111)
{
_key99 = iprot.readI32();
_val100 = iprot.readI64();
struct.propertyValueByIdMap.put(_key99, _val100);
_key109 = iprot.readI32();
_val110 = iprot.readI64();
struct.propertyValueByIdMap.put(_key109, _val110);
}
}
struct.setPropertyValueByIdMapIsSet(true);
}
if (incoming.get(5)) {
{
org.apache.thrift.protocol.TMap _map102 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
struct.secondValueByIdMap = new HashMap<Integer,Long>(2*_map102.size);
int _key103;
long _val104;
for (int _i105 = 0; _i105 < _map102.size; ++_i105)
org.apache.thrift.protocol.TMap _map112 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
struct.secondValueByIdMap = new HashMap<Integer,Long>(2*_map112.size);
int _key113;
long _val114;
for (int _i115 = 0; _i115 < _map112.size; ++_i115)
{
_key103 = iprot.readI32();
_val104 = iprot.readI64();
struct.secondValueByIdMap.put(_key103, _val104);
_key113 = iprot.readI32();
_val114 = iprot.readI64();
struct.secondValueByIdMap.put(_key113, _val114);
}
}
struct.setSecondValueByIdMapIsSet(true);

50
serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java
View File

@ -1317,7 +1317,7 @@ public class RPCRequestIFace {
public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<Void>() {
return new AsyncMethodCallback<Void>() {
public void onComplete(Void o) {
updateUserInfoByRpc_result result = new updateUserInfoByRpc_result();
try {
@ -7286,13 +7286,13 @@ public class RPCRequestIFace {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
org.apache.thrift.protocol.TSet _set280 = iprot.readSetBegin();
struct.success = new HashSet<String>(2*_set280.size);
String _elem281;
for (int _i282 = 0; _i282 < _set280.size; ++_i282)
org.apache.thrift.protocol.TSet _set290 = iprot.readSetBegin();
struct.success = new HashSet<String>(2*_set290.size);
String _elem291;
for (int _i292 = 0; _i292 < _set290.size; ++_i292)
{
_elem281 = iprot.readString();
struct.success.add(_elem281);
_elem291 = iprot.readString();
struct.success.add(_elem291);
}
iprot.readSetEnd();
}
@ -7320,9 +7320,9 @@ public class RPCRequestIFace {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.success.size()));
for (String _iter283 : struct.success)
for (String _iter293 : struct.success)
{
oprot.writeString(_iter283);
oprot.writeString(_iter293);
}
oprot.writeSetEnd();
}
@ -7353,9 +7353,9 @@ public class RPCRequestIFace {
if (struct.isSetSuccess()) {
{
oprot.writeI32(struct.success.size());
for (String _iter284 : struct.success)
for (String _iter294 : struct.success)
{
oprot.writeString(_iter284);
oprot.writeString(_iter294);
}
}
}
@ -7367,13 +7367,13 @@ public class RPCRequestIFace {
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
org.apache.thrift.protocol.TSet _set285 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.success = new HashSet<String>(2*_set285.size);
String _elem286;
for (int _i287 = 0; _i287 < _set285.size; ++_i287)
org.apache.thrift.protocol.TSet _set295 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.success = new HashSet<String>(2*_set295.size);
String _elem296;
for (int _i297 = 0; _i297 < _set295.size; ++_i297)
{
_elem286 = iprot.readString();
struct.success.add(_elem286);
_elem296 = iprot.readString();
struct.success.add(_elem296);
}
}
struct.setSuccessIsSet(true);
@ -8191,11 +8191,11 @@ public class RPCRequestIFace {
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.UID, new org.apache.thrift.meta_data.FieldMetaData("uid", org.apache.thrift.TFieldRequirementType.DEFAULT,
tmpMap.put(_Fields.UID, new org.apache.thrift.meta_data.FieldMetaData("uid", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.USER_STR, new org.apache.thrift.meta_data.FieldMetaData("userStr", org.apache.thrift.TFieldRequirementType.DEFAULT,
tmpMap.put(_Fields.USER_STR, new org.apache.thrift.meta_data.FieldMetaData("userStr", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT,
tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateUserInfoByRpc_args.class, metaDataMap);
@ -8552,7 +8552,7 @@ public class RPCRequestIFace {
while (true)
{
schemeField = iprot.readFieldBegin();
if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@ -8560,7 +8560,7 @@ public class RPCRequestIFace {
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.uid = iprot.readI32();
struct.setUidIsSet(true);
} else {
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@ -8568,7 +8568,7 @@ public class RPCRequestIFace {
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.userStr = iprot.readString();
struct.setUserStrIsSet(true);
} else {
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@ -8576,7 +8576,7 @@ public class RPCRequestIFace {
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.type = iprot.readI32();
struct.setTypeIsSet(true);
} else {
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@ -8868,7 +8868,7 @@ public class RPCRequestIFace {
while (true)
{
schemeField = iprot.readFieldBegin();
if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {

36
serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java
View File

@ -526,14 +526,14 @@ public class SixiangxinfaInfo implements org.apache.thrift.TBase<SixiangxinfaInf
case 3: // PROPERTY_INFO_LIST
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list106 = iprot.readListBegin();
struct.propertyInfoList = new ArrayList<SixiangxinfaPropertyInfo>(_list106.size);
SixiangxinfaPropertyInfo _elem107;
for (int _i108 = 0; _i108 < _list106.size; ++_i108)
org.apache.thrift.protocol.TList _list116 = iprot.readListBegin();
struct.propertyInfoList = new ArrayList<SixiangxinfaPropertyInfo>(_list116.size);
SixiangxinfaPropertyInfo _elem117;
for (int _i118 = 0; _i118 < _list116.size; ++_i118)
{
_elem107 = new SixiangxinfaPropertyInfo();
_elem107.read(iprot);
struct.propertyInfoList.add(_elem107);
_elem117 = new SixiangxinfaPropertyInfo();
_elem117.read(iprot);
struct.propertyInfoList.add(_elem117);
}
iprot.readListEnd();
}
@ -571,9 +571,9 @@ public class SixiangxinfaInfo implements org.apache.thrift.TBase<SixiangxinfaInf
oprot.writeFieldBegin(PROPERTY_INFO_LIST_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.propertyInfoList.size()));
for (SixiangxinfaPropertyInfo _iter109 : struct.propertyInfoList)
for (SixiangxinfaPropertyInfo _iter119 : struct.propertyInfoList)
{
_iter109.write(oprot);
_iter119.write(oprot);
}
oprot.writeListEnd();
}
@ -616,9 +616,9 @@ public class SixiangxinfaInfo implements org.apache.thrift.TBase<SixiangxinfaInf
if (struct.isSetPropertyInfoList()) {
{
oprot.writeI32(struct.propertyInfoList.size());
for (SixiangxinfaPropertyInfo _iter110 : struct.propertyInfoList)
for (SixiangxinfaPropertyInfo _iter120 : struct.propertyInfoList)
{
_iter110.write(oprot);
_iter120.write(oprot);
}
}
}
@ -638,14 +638,14 @@ public class SixiangxinfaInfo implements org.apache.thrift.TBase<SixiangxinfaInf
}
if (incoming.get(2)) {
{
org.apache.thrift.protocol.TList _list111 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.propertyInfoList = new ArrayList<SixiangxinfaPropertyInfo>(_list111.size);
SixiangxinfaPropertyInfo _elem112;
for (int _i113 = 0; _i113 < _list111.size; ++_i113)
org.apache.thrift.protocol.TList _list121 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.propertyInfoList = new ArrayList<SixiangxinfaPropertyInfo>(_list121.size);
SixiangxinfaPropertyInfo _elem122;
for (int _i123 = 0; _i123 < _list121.size; ++_i123)
{
_elem112 = new SixiangxinfaPropertyInfo();
_elem112.read(iprot);
struct.propertyInfoList.add(_elem112);
_elem122 = new SixiangxinfaPropertyInfo();
_elem122.read(iprot);
struct.propertyInfoList.add(_elem122);
}
}
struct.setPropertyInfoListIsSet(true);

53
serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
View File

@ -376,46 +376,20 @@ public class CBean2Proto {
}
public static CommonProto.Hero getHero(Hero hero,HeroManager heroManager){
List<CommonProto.SoulPos> soulPoss = new ArrayList<>();
Map<Integer, Integer> soulEquipMap = hero.getSoulEquipByPositionMap();
if(soulEquipMap!=null&&!soulEquipMap.isEmpty()){
for (Map.Entry<Integer,Integer> entry:soulEquipMap.entrySet()){
CommonProto.SoulPos.Builder builder = CommonProto.SoulPos.newBuilder();
builder.setEquipId(entry.getValue());
builder.setPosition(entry.getKey());
soulPoss.add(builder.build());
}
}
//Collection<Integer> equipList = hero.getEquipByHongmengPositionMap(heroManager).values();
// 鸿蒙阵装备同步
Collection<Integer> equipList =hero.getEquipByPositionMap().values();
if(equipList.size() ==0 ){
equipList = hero.getEquipByHongmengPositionMap(heroManager).values();
}
return CommonProto.Hero
.newBuilder()
.setId(hero.getId())
.setHeroId(hero.getTemplateId())
.setLevel(hero.getOriginalLevel())
.setStar(hero.getStar())
.setBreakId(hero.getBreakId())
.setStarBreakId(hero.getStarBreakId())
.setCreateTime(hero.getCreateTime())
//.addAllEquipIdList(hero.getEquipByPositionMap().values())
.addAllEquipIdList(equipList)
.setEspecialEquipLevel(hero.getEspecialEquipLevel())
.addAllSoulPos(soulPoss)
.setLockState(hero.getIsLock())
.addAllJewels(hero.getJewelInfo())
.setCreatetype(hero.getCreateType())
.setChangeId(hero.getChangeId())
.setSkinId(hero.getSkin())
.setGodSoulLv(hero.getGodSoulLv())
.setPropertyId(hero.getPropertyId())
.build();
CommonProto.Hero hero1 = getHero(hero);
hero1.toBuilder().addAllEquipIdList(equipList);
return hero1;
}
public static CommonProto.Hero getHero(Hero hero){
// 魂印
List<CommonProto.SoulPos> soulPoss = new ArrayList<>();
Map<Integer, Integer> soulEquipMap = hero.getSoulEquipByPositionMap();
if(soulEquipMap!=null&&!soulEquipMap.isEmpty()){
@ -426,6 +400,7 @@ public class CBean2Proto {
soulPoss.add(builder.build());
}
}
// 神魂
List<CommonProto.HeroGodSoulInfo>godSoulList=new ArrayList<>();
for (Map.Entry<Integer, List<String>> godSoul : hero.getGodSoulBindMap().entrySet()) {
CommonProto.HeroGodSoulInfo godSoulInfo=CommonProto.HeroGodSoulInfo.newBuilder()
@ -434,6 +409,17 @@ public class CBean2Proto {
.build();
godSoulList.add(godSoulInfo);
}
// 神印
List<CommonProto.SoulPos> godSeals = new ArrayList<>();
Map<Integer, Integer> godSealMap = hero.getGodSealByPositionMap();
if(godSealMap!=null&&!godSealMap.isEmpty()){
for (Map.Entry<Integer,Integer> entry:godSealMap.entrySet()){
CommonProto.SoulPos.Builder builder = CommonProto.SoulPos.newBuilder();
builder.setEquipId(entry.getValue());
builder.setPosition(entry.getKey());
godSeals.add(builder.build());
}
}
return CommonProto.Hero
.newBuilder()
.setId(hero.getId())
@ -454,6 +440,7 @@ public class CBean2Proto {
.addAllGodSoulList(godSoulList)
.setGodSoulLv(hero.getGodSoulLv())
.setPropertyId(hero.getPropertyId())
.addAllGodSeals(godSeals)
.build();
}

4
serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
View File

@ -579,7 +579,7 @@ public class ItemUtil {
}
}
private static void getMap(int itemId ,long itemNum,ItemMap itemObj,float dropRatio) throws ErrorCodeException{
private static void getMap(int itemId ,long itemNum,ItemMap itemObj,float dropRatio) {
SItem sItem = SItem.getsItemMap().get(itemId);
if(sItem==null){
LOGGER.info("getMap SItem配置不存在 id:{}", itemId);
@ -589,6 +589,7 @@ public class ItemUtil {
long amount = MathUtils.numRount((itemNum * MathUtils.floatToDouble(dropRatio)));
switch (itemType) {
case GlobalItemType.SOUL_MARK:
case GlobalItemType.GOD_SEAL:
case GlobalItemType.ITEM:
case GlobalItemType.EQUIP:
putCountLongMap(itemId,amount, itemObj.getItemMap());
@ -1600,6 +1601,7 @@ public class ItemUtil {
switch (itemType) {
case GlobalItemType.ITEM:
case GlobalItemType.SOUL_MARK:
case GlobalItemType.GOD_SEAL:
case GlobalItemType.EQUIP:
putCountMap(itemId,itemNum,itemMap);
break;

1
serverlogic/src/main/thrift/idl/core.thrift
View File

@ -46,6 +46,7 @@ struct ArenaOfHero {
17:optional map<i32,map<i32,i64>> attributeMapByTeamBattle ;
18:optional i32 godSoulLv;//神魂等级
19:optional i32 propertyId;//阵营id
20:optional map<i32,i32> godSealByPositionMap;
}
struct PropertyItem {

379
serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java
View File

@ -57,6 +57,7 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
private static final org.apache.thrift.protocol.TField ATTRIBUTE_MAP_BY_TEAM_BATTLE_FIELD_DESC = new org.apache.thrift.protocol.TField("attributeMapByTeamBattle", org.apache.thrift.protocol.TType.MAP, (short)17);
private static final org.apache.thrift.protocol.TField GOD_SOUL_LV_FIELD_DESC = new org.apache.thrift.protocol.TField("godSoulLv", org.apache.thrift.protocol.TType.I32, (short)18);
private static final org.apache.thrift.protocol.TField PROPERTY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("propertyId", org.apache.thrift.protocol.TType.I32, (short)19);
private static final org.apache.thrift.protocol.TField GOD_SEAL_BY_POSITION_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("godSealByPositionMap", org.apache.thrift.protocol.TType.MAP, (short)20);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@ -83,6 +84,7 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
public Map<Integer,Map<Integer,Long>> attributeMapByTeamBattle; // optional
public int godSoulLv; // optional
public int propertyId; // optional
public Map<Integer,Integer> godSealByPositionMap; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -104,7 +106,8 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
ATTRIBUTE_MAP_BY_TEAM((short)16, "attributeMapByTeam"),
ATTRIBUTE_MAP_BY_TEAM_BATTLE((short)17, "attributeMapByTeamBattle"),
GOD_SOUL_LV((short)18, "godSoulLv"),
PROPERTY_ID((short)19, "propertyId");
PROPERTY_ID((short)19, "propertyId"),
GOD_SEAL_BY_POSITION_MAP((short)20, "godSealByPositionMap");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@ -157,6 +160,8 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
return GOD_SOUL_LV;
case 19: // PROPERTY_ID
return PROPERTY_ID;
case 20: // GOD_SEAL_BY_POSITION_MAP
return GOD_SEAL_BY_POSITION_MAP;
default:
return null;
}
@ -210,7 +215,7 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
private static final int __GODSOULLV_ISSET_ID = 10;
private static final int __PROPERTYID_ISSET_ID = 11;
private short __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.ID,_Fields.TEMPLATE_ID,_Fields.LEVEL,_Fields.STAR,_Fields.EQUIP_BY_POSITION_MAP,_Fields.SOUL_EQUIP_BY_POSITION_MAP,_Fields.BREAK_ID,_Fields.STAR_BREAK_ID,_Fields.CREATE_TIME,_Fields.ESPECIAL_EQUIP_LEVEL,_Fields.CREATE_TYPE,_Fields.CHANGE_ID,_Fields.SKIN,_Fields.JEWEL_INFO,_Fields.ATTRIBUTE_MAP,_Fields.ATTRIBUTE_MAP_BY_TEAM,_Fields.ATTRIBUTE_MAP_BY_TEAM_BATTLE,_Fields.GOD_SOUL_LV,_Fields.PROPERTY_ID};
private static final _Fields optionals[] = {_Fields.ID,_Fields.TEMPLATE_ID,_Fields.LEVEL,_Fields.STAR,_Fields.EQUIP_BY_POSITION_MAP,_Fields.SOUL_EQUIP_BY_POSITION_MAP,_Fields.BREAK_ID,_Fields.STAR_BREAK_ID,_Fields.CREATE_TIME,_Fields.ESPECIAL_EQUIP_LEVEL,_Fields.CREATE_TYPE,_Fields.CHANGE_ID,_Fields.SKIN,_Fields.JEWEL_INFO,_Fields.ATTRIBUTE_MAP,_Fields.ATTRIBUTE_MAP_BY_TEAM,_Fields.ATTRIBUTE_MAP_BY_TEAM_BATTLE,_Fields.GOD_SOUL_LV,_Fields.PROPERTY_ID,_Fields.GOD_SEAL_BY_POSITION_MAP};
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);
@ -267,6 +272,10 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.PROPERTY_ID, new org.apache.thrift.meta_data.FieldMetaData("propertyId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.GOD_SEAL_BY_POSITION_MAP, new org.apache.thrift.meta_data.FieldMetaData("godSealByPositionMap", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32),
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ArenaOfHero.class, metaDataMap);
}
@ -340,6 +349,10 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
}
this.godSoulLv = other.godSoulLv;
this.propertyId = other.propertyId;
if (other.isSetGodSealByPositionMap()) {
Map<Integer,Integer> __this__godSealByPositionMap = new HashMap<Integer,Integer>(other.godSealByPositionMap);
this.godSealByPositionMap = __this__godSealByPositionMap;
}
}
public ArenaOfHero deepCopy() {
@ -379,6 +392,7 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
this.godSoulLv = 0;
setPropertyIdIsSet(false);
this.propertyId = 0;
this.godSealByPositionMap = null;
}
public String getId() {
@ -895,6 +909,41 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PROPERTYID_ISSET_ID, value);
}
public int getGodSealByPositionMapSize() {
return (this.godSealByPositionMap == null) ? 0 : this.godSealByPositionMap.size();
}
public void putToGodSealByPositionMap(int key, int val) {
if (this.godSealByPositionMap == null) {
this.godSealByPositionMap = new HashMap<Integer,Integer>();
}
this.godSealByPositionMap.put(key, val);
}
public Map<Integer,Integer> getGodSealByPositionMap() {
return this.godSealByPositionMap;
}
public ArenaOfHero setGodSealByPositionMap(Map<Integer,Integer> godSealByPositionMap) {
this.godSealByPositionMap = godSealByPositionMap;
return this;
}
public void unsetGodSealByPositionMap() {
this.godSealByPositionMap = null;
}
/** Returns true if field godSealByPositionMap is set (has been assigned a value) and false otherwise */
public boolean isSetGodSealByPositionMap() {
return this.godSealByPositionMap != null;
}
public void setGodSealByPositionMapIsSet(boolean value) {
if (!value) {
this.godSealByPositionMap = null;
}
}
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case ID:
@ -1049,6 +1098,14 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
}
break;
case GOD_SEAL_BY_POSITION_MAP:
if (value == null) {
unsetGodSealByPositionMap();
} else {
setGodSealByPositionMap((Map<Integer,Integer>)value);
}
break;
}
}
@ -1111,6 +1168,9 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
case PROPERTY_ID:
return Integer.valueOf(getPropertyId());
case GOD_SEAL_BY_POSITION_MAP:
return getGodSealByPositionMap();
}
throw new IllegalStateException();
}
@ -1160,6 +1220,8 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
return isSetGodSoulLv();
case PROPERTY_ID:
return isSetPropertyId();
case GOD_SEAL_BY_POSITION_MAP:
return isSetGodSealByPositionMap();
}
throw new IllegalStateException();
}
@ -1348,6 +1410,15 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
return false;
}
boolean this_present_godSealByPositionMap = true && this.isSetGodSealByPositionMap();
boolean that_present_godSealByPositionMap = true && that.isSetGodSealByPositionMap();
if (this_present_godSealByPositionMap || that_present_godSealByPositionMap) {
if (!(this_present_godSealByPositionMap && that_present_godSealByPositionMap))
return false;
if (!this.godSealByPositionMap.equals(that.godSealByPositionMap))
return false;
}
return true;
}
@ -1450,6 +1521,11 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
if (present_propertyId)
list.add(propertyId);
boolean present_godSealByPositionMap = true && (isSetGodSealByPositionMap());
list.add(present_godSealByPositionMap);
if (present_godSealByPositionMap)
list.add(godSealByPositionMap);
return list.hashCode();
}
@ -1651,6 +1727,16 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetGodSealByPositionMap()).compareTo(other.isSetGodSealByPositionMap());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetGodSealByPositionMap()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.godSealByPositionMap, other.godSealByPositionMap);
if (lastComparison != 0) {
return lastComparison;
}
}
return 0;
}
@ -1812,6 +1898,16 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
sb.append(this.propertyId);
first = false;
}
if (isSetGodSealByPositionMap()) {
if (!first) sb.append(", ");
sb.append("godSealByPositionMap:");
if (this.godSealByPositionMap == null) {
sb.append("null");
} else {
sb.append(this.godSealByPositionMap);
}
first = false;
}
sb.append(")");
return sb.toString();
}
@ -2103,6 +2199,26 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
case 20: // GOD_SEAL_BY_POSITION_MAP
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map39 = iprot.readMapBegin();
struct.godSealByPositionMap = new HashMap<Integer,Integer>(2*_map39.size);
int _key40;
int _val41;
for (int _i42 = 0; _i42 < _map39.size; ++_i42)
{
_key40 = iprot.readI32();
_val41 = iprot.readI32();
struct.godSealByPositionMap.put(_key40, _val41);
}
iprot.readMapEnd();
}
struct.setGodSealByPositionMapIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@ -2145,10 +2261,10 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
oprot.writeFieldBegin(EQUIP_BY_POSITION_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, struct.equipByPositionMap.size()));
for (Map.Entry<Integer, Integer> _iter39 : struct.equipByPositionMap.entrySet())
for (Map.Entry<Integer, Integer> _iter43 : struct.equipByPositionMap.entrySet())
{
oprot.writeI32(_iter39.getKey());
oprot.writeI32(_iter39.getValue());
oprot.writeI32(_iter43.getKey());
oprot.writeI32(_iter43.getValue());
}
oprot.writeMapEnd();
}
@ -2160,10 +2276,10 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
oprot.writeFieldBegin(SOUL_EQUIP_BY_POSITION_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, struct.soulEquipByPositionMap.size()));
for (Map.Entry<Integer, Integer> _iter40 : struct.soulEquipByPositionMap.entrySet())
for (Map.Entry<Integer, Integer> _iter44 : struct.soulEquipByPositionMap.entrySet())
{
oprot.writeI32(_iter40.getKey());
oprot.writeI32(_iter40.getValue());
oprot.writeI32(_iter44.getKey());
oprot.writeI32(_iter44.getValue());
}
oprot.writeMapEnd();
}
@ -2210,9 +2326,9 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
oprot.writeFieldBegin(JEWEL_INFO_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.jewelInfo.size()));
for (String _iter41 : struct.jewelInfo)
for (String _iter45 : struct.jewelInfo)
{
oprot.writeString(_iter41);
oprot.writeString(_iter45);
}
oprot.writeSetEnd();
}
@ -2224,10 +2340,10 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
oprot.writeFieldBegin(ATTRIBUTE_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, struct.attributeMap.size()));
for (Map.Entry<Integer, Long> _iter42 : struct.attributeMap.entrySet())
for (Map.Entry<Integer, Long> _iter46 : struct.attributeMap.entrySet())
{
oprot.writeI32(_iter42.getKey());
oprot.writeI64(_iter42.getValue());
oprot.writeI32(_iter46.getKey());
oprot.writeI64(_iter46.getValue());
}
oprot.writeMapEnd();
}
@ -2239,15 +2355,15 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
oprot.writeFieldBegin(ATTRIBUTE_MAP_BY_TEAM_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.MAP, struct.attributeMapByTeam.size()));
for (Map.Entry<Integer, Map<Integer,Long>> _iter43 : struct.attributeMapByTeam.entrySet())
for (Map.Entry<Integer, Map<Integer,Long>> _iter47 : struct.attributeMapByTeam.entrySet())
{
oprot.writeI32(_iter43.getKey());
oprot.writeI32(_iter47.getKey());
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, _iter43.getValue().size()));
for (Map.Entry<Integer, Long> _iter44 : _iter43.getValue().entrySet())
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, _iter47.getValue().size()));
for (Map.Entry<Integer, Long> _iter48 : _iter47.getValue().entrySet())
{
oprot.writeI32(_iter44.getKey());
oprot.writeI64(_iter44.getValue());
oprot.writeI32(_iter48.getKey());
oprot.writeI64(_iter48.getValue());
}
oprot.writeMapEnd();
}
@ -2262,15 +2378,15 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
oprot.writeFieldBegin(ATTRIBUTE_MAP_BY_TEAM_BATTLE_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.MAP, struct.attributeMapByTeamBattle.size()));
for (Map.Entry<Integer, Map<Integer,Long>> _iter45 : struct.attributeMapByTeamBattle.entrySet())
for (Map.Entry<Integer, Map<Integer,Long>> _iter49 : struct.attributeMapByTeamBattle.entrySet())
{
oprot.writeI32(_iter45.getKey());
oprot.writeI32(_iter49.getKey());
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, _iter45.getValue().size()));
for (Map.Entry<Integer, Long> _iter46 : _iter45.getValue().entrySet())
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, _iter49.getValue().size()));
for (Map.Entry<Integer, Long> _iter50 : _iter49.getValue().entrySet())
{
oprot.writeI32(_iter46.getKey());
oprot.writeI64(_iter46.getValue());
oprot.writeI32(_iter50.getKey());
oprot.writeI64(_iter50.getValue());
}
oprot.writeMapEnd();
}
@ -2290,6 +2406,21 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
oprot.writeI32(struct.propertyId);
oprot.writeFieldEnd();
}
if (struct.godSealByPositionMap != null) {
if (struct.isSetGodSealByPositionMap()) {
oprot.writeFieldBegin(GOD_SEAL_BY_POSITION_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, struct.godSealByPositionMap.size()));
for (Map.Entry<Integer, Integer> _iter51 : struct.godSealByPositionMap.entrySet())
{
oprot.writeI32(_iter51.getKey());
oprot.writeI32(_iter51.getValue());
}
oprot.writeMapEnd();
}
oprot.writeFieldEnd();
}
}
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@ -2365,7 +2496,10 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
if (struct.isSetPropertyId()) {
optionals.set(18);
}
oprot.writeBitSet(optionals, 19);
if (struct.isSetGodSealByPositionMap()) {
optionals.set(19);
}
oprot.writeBitSet(optionals, 20);
if (struct.isSetId()) {
oprot.writeString(struct.id);
}
@ -2381,20 +2515,20 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
if (struct.isSetEquipByPositionMap()) {
{
oprot.writeI32(struct.equipByPositionMap.size());
for (Map.Entry<Integer, Integer> _iter47 : struct.equipByPositionMap.entrySet())
for (Map.Entry<Integer, Integer> _iter52 : struct.equipByPositionMap.entrySet())
{
oprot.writeI32(_iter47.getKey());
oprot.writeI32(_iter47.getValue());
oprot.writeI32(_iter52.getKey());
oprot.writeI32(_iter52.getValue());
}
}
}
if (struct.isSetSoulEquipByPositionMap()) {
{
oprot.writeI32(struct.soulEquipByPositionMap.size());
for (Map.Entry<Integer, Integer> _iter48 : struct.soulEquipByPositionMap.entrySet())
for (Map.Entry<Integer, Integer> _iter53 : struct.soulEquipByPositionMap.entrySet())
{
oprot.writeI32(_iter48.getKey());
oprot.writeI32(_iter48.getValue());
oprot.writeI32(_iter53.getKey());
oprot.writeI32(_iter53.getValue());
}
}
}
@ -2422,34 +2556,34 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
if (struct.isSetJewelInfo()) {
{
oprot.writeI32(struct.jewelInfo.size());
for (String _iter49 : struct.jewelInfo)
for (String _iter54 : struct.jewelInfo)
{
oprot.writeString(_iter49);
oprot.writeString(_iter54);
}
}
}
if (struct.isSetAttributeMap()) {
{
oprot.writeI32(struct.attributeMap.size());
for (Map.Entry<Integer, Long> _iter50 : struct.attributeMap.entrySet())
for (Map.Entry<Integer, Long> _iter55 : struct.attributeMap.entrySet())
{
oprot.writeI32(_iter50.getKey());
oprot.writeI64(_iter50.getValue());
oprot.writeI32(_iter55.getKey());
oprot.writeI64(_iter55.getValue());
}
}
}
if (struct.isSetAttributeMapByTeam()) {
{
oprot.writeI32(struct.attributeMapByTeam.size());
for (Map.Entry<Integer, Map<Integer,Long>> _iter51 : struct.attributeMapByTeam.entrySet())
for (Map.Entry<Integer, Map<Integer,Long>> _iter56 : struct.attributeMapByTeam.entrySet())
{
oprot.writeI32(_iter51.getKey());
oprot.writeI32(_iter56.getKey());
{
oprot.writeI32(_iter51.getValue().size());
for (Map.Entry<Integer, Long> _iter52 : _iter51.getValue().entrySet())
oprot.writeI32(_iter56.getValue().size());
for (Map.Entry<Integer, Long> _iter57 : _iter56.getValue().entrySet())
{
oprot.writeI32(_iter52.getKey());
oprot.writeI64(_iter52.getValue());
oprot.writeI32(_iter57.getKey());
oprot.writeI64(_iter57.getValue());
}
}
}
@ -2458,15 +2592,15 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
if (struct.isSetAttributeMapByTeamBattle()) {
{
oprot.writeI32(struct.attributeMapByTeamBattle.size());
for (Map.Entry<Integer, Map<Integer,Long>> _iter53 : struct.attributeMapByTeamBattle.entrySet())
for (Map.Entry<Integer, Map<Integer,Long>> _iter58 : struct.attributeMapByTeamBattle.entrySet())
{
oprot.writeI32(_iter53.getKey());
oprot.writeI32(_iter58.getKey());
{
oprot.writeI32(_iter53.getValue().size());
for (Map.Entry<Integer, Long> _iter54 : _iter53.getValue().entrySet())
oprot.writeI32(_iter58.getValue().size());
for (Map.Entry<Integer, Long> _iter59 : _iter58.getValue().entrySet())
{
oprot.writeI32(_iter54.getKey());
oprot.writeI64(_iter54.getValue());
oprot.writeI32(_iter59.getKey());
oprot.writeI64(_iter59.getValue());
}
}
}
@ -2478,12 +2612,22 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
if (struct.isSetPropertyId()) {
oprot.writeI32(struct.propertyId);
}
if (struct.isSetGodSealByPositionMap()) {
{
oprot.writeI32(struct.godSealByPositionMap.size());
for (Map.Entry<Integer, Integer> _iter60 : struct.godSealByPositionMap.entrySet())
{
oprot.writeI32(_iter60.getKey());
oprot.writeI32(_iter60.getValue());
}
}
}
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, ArenaOfHero struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
BitSet incoming = iprot.readBitSet(19);
BitSet incoming = iprot.readBitSet(20);
if (incoming.get(0)) {
struct.id = iprot.readString();
struct.setIdIsSet(true);
@ -2502,30 +2646,30 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
}
if (incoming.get(4)) {
{
org.apache.thrift.protocol.TMap _map55 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32());
struct.equipByPositionMap = new HashMap<Integer,Integer>(2*_map55.size);
int _key56;
int _val57;
for (int _i58 = 0; _i58 < _map55.size; ++_i58)
org.apache.thrift.protocol.TMap _map61 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32());
struct.equipByPositionMap = new HashMap<Integer,Integer>(2*_map61.size);
int _key62;
int _val63;
for (int _i64 = 0; _i64 < _map61.size; ++_i64)
{
_key56 = iprot.readI32();
_val57 = iprot.readI32();
struct.equipByPositionMap.put(_key56, _val57);
_key62 = iprot.readI32();
_val63 = iprot.readI32();
struct.equipByPositionMap.put(_key62, _val63);
}
}
struct.setEquipByPositionMapIsSet(true);
}
if (incoming.get(5)) {
{
org.apache.thrift.protocol.TMap _map59 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32());
struct.soulEquipByPositionMap = new HashMap<Integer,Integer>(2*_map59.size);
int _key60;
int _val61;
for (int _i62 = 0; _i62 < _map59.size; ++_i62)
org.apache.thrift.protocol.TMap _map65 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32());
struct.soulEquipByPositionMap = new HashMap<Integer,Integer>(2*_map65.size);
int _key66;
int _val67;
for (int _i68 = 0; _i68 < _map65.size; ++_i68)
{
_key60 = iprot.readI32();
_val61 = iprot.readI32();
struct.soulEquipByPositionMap.put(_key60, _val61);
_key66 = iprot.readI32();
_val67 = iprot.readI32();
struct.soulEquipByPositionMap.put(_key66, _val67);
}
}
struct.setSoulEquipByPositionMapIsSet(true);
@ -2560,80 +2704,80 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
}
if (incoming.get(13)) {
{
org.apache.thrift.protocol.TSet _set63 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.jewelInfo = new HashSet<String>(2*_set63.size);
String _elem64;
for (int _i65 = 0; _i65 < _set63.size; ++_i65)
org.apache.thrift.protocol.TSet _set69 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.jewelInfo = new HashSet<String>(2*_set69.size);
String _elem70;
for (int _i71 = 0; _i71 < _set69.size; ++_i71)
{
_elem64 = iprot.readString();
struct.jewelInfo.add(_elem64);
_elem70 = iprot.readString();
struct.jewelInfo.add(_elem70);
}
}
struct.setJewelInfoIsSet(true);
}
if (incoming.get(14)) {
{
org.apache.thrift.protocol.TMap _map66 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
struct.attributeMap = new HashMap<Integer,Long>(2*_map66.size);
int _key67;
long _val68;
for (int _i69 = 0; _i69 < _map66.size; ++_i69)
org.apache.thrift.protocol.TMap _map72 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
struct.attributeMap = new HashMap<Integer,Long>(2*_map72.size);
int _key73;
long _val74;
for (int _i75 = 0; _i75 < _map72.size; ++_i75)
{
_key67 = iprot.readI32();
_val68 = iprot.readI64();
struct.attributeMap.put(_key67, _val68);
_key73 = iprot.readI32();
_val74 = iprot.readI64();
struct.attributeMap.put(_key73, _val74);
}
}
struct.setAttributeMapIsSet(true);
}
if (incoming.get(15)) {
{
org.apache.thrift.protocol.TMap _map70 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
struct.attributeMapByTeam = new HashMap<Integer,Map<Integer,Long>>(2*_map70.size);
int _key71;
Map<Integer,Long> _val72;
for (int _i73 = 0; _i73 < _map70.size; ++_i73)
org.apache.thrift.protocol.TMap _map76 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
struct.attributeMapByTeam = new HashMap<Integer,Map<Integer,Long>>(2*_map76.size);
int _key77;
Map<Integer,Long> _val78;
for (int _i79 = 0; _i79 < _map76.size; ++_i79)
{
_key71 = iprot.readI32();
_key77 = iprot.readI32();
{
org.apache.thrift.protocol.TMap _map74 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
_val72 = new HashMap<Integer,Long>(2*_map74.size);
int _key75;
long _val76;
for (int _i77 = 0; _i77 < _map74.size; ++_i77)
org.apache.thrift.protocol.TMap _map80 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
_val78 = new HashMap<Integer,Long>(2*_map80.size);
int _key81;
long _val82;
for (int _i83 = 0; _i83 < _map80.size; ++_i83)
{
_key75 = iprot.readI32();
_val76 = iprot.readI64();
_val72.put(_key75, _val76);
_key81 = iprot.readI32();
_val82 = iprot.readI64();
_val78.put(_key81, _val82);
}
}
struct.attributeMapByTeam.put(_key71, _val72);
struct.attributeMapByTeam.put(_key77, _val78);
}
}
struct.setAttributeMapByTeamIsSet(true);
}
if (incoming.get(16)) {
{
org.apache.thrift.protocol.TMap _map78 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
struct.attributeMapByTeamBattle = new HashMap<Integer,Map<Integer,Long>>(2*_map78.size);
int _key79;
Map<Integer,Long> _val80;
for (int _i81 = 0; _i81 < _map78.size; ++_i81)
org.apache.thrift.protocol.TMap _map84 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
struct.attributeMapByTeamBattle = new HashMap<Integer,Map<Integer,Long>>(2*_map84.size);
int _key85;
Map<Integer,Long> _val86;
for (int _i87 = 0; _i87 < _map84.size; ++_i87)
{
_key79 = iprot.readI32();
_key85 = iprot.readI32();
{
org.apache.thrift.protocol.TMap _map82 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
_val80 = new HashMap<Integer,Long>(2*_map82.size);
int _key83;
long _val84;
for (int _i85 = 0; _i85 < _map82.size; ++_i85)
org.apache.thrift.protocol.TMap _map88 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
_val86 = new HashMap<Integer,Long>(2*_map88.size);
int _key89;
long _val90;
for (int _i91 = 0; _i91 < _map88.size; ++_i91)
{
_key83 = iprot.readI32();
_val84 = iprot.readI64();
_val80.put(_key83, _val84);
_key89 = iprot.readI32();
_val90 = iprot.readI64();
_val86.put(_key89, _val90);
}
}
struct.attributeMapByTeamBattle.put(_key79, _val80);
struct.attributeMapByTeamBattle.put(_key85, _val86);
}
}
struct.setAttributeMapByTeamBattleIsSet(true);
@ -2646,6 +2790,21 @@ public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOf
struct.propertyId = iprot.readI32();
struct.setPropertyIdIsSet(true);
}
if (incoming.get(19)) {
{
org.apache.thrift.protocol.TMap _map92 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32());
struct.godSealByPositionMap = new HashMap<Integer,Integer>(2*_map92.size);
int _key93;
int _val94;
for (int _i95 = 0; _i95 < _map92.size; ++_i95)
{
_key93 = iprot.readI32();
_val94 = iprot.readI32();
struct.godSealByPositionMap.put(_key93, _val94);
}
}
struct.setGodSealByPositionMapIsSet(true);
}
}
}

740
serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java
View File

File diff suppressed because it is too large Load Diff

88
serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java
View File

@ -1099,15 +1099,15 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
case 5: // PROPERTY_VALUE_BY_ID_MAP
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map86 = iprot.readMapBegin();
struct.propertyValueByIdMap = new HashMap<Integer,Long>(2*_map86.size);
int _key87;
long _val88;
for (int _i89 = 0; _i89 < _map86.size; ++_i89)
org.apache.thrift.protocol.TMap _map96 = iprot.readMapBegin();
struct.propertyValueByIdMap = new HashMap<Integer,Long>(2*_map96.size);
int _key97;
long _val98;
for (int _i99 = 0; _i99 < _map96.size; ++_i99)
{
_key87 = iprot.readI32();
_val88 = iprot.readI64();
struct.propertyValueByIdMap.put(_key87, _val88);
_key97 = iprot.readI32();
_val98 = iprot.readI64();
struct.propertyValueByIdMap.put(_key97, _val98);
}
iprot.readMapEnd();
}
@ -1119,15 +1119,15 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
case 6: // SECOND_VALUE_BY_ID_MAP
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map90 = iprot.readMapBegin();
struct.secondValueByIdMap = new HashMap<Integer,Long>(2*_map90.size);
int _key91;
long _val92;
for (int _i93 = 0; _i93 < _map90.size; ++_i93)
org.apache.thrift.protocol.TMap _map100 = iprot.readMapBegin();
struct.secondValueByIdMap = new HashMap<Integer,Long>(2*_map100.size);
int _key101;
long _val102;
for (int _i103 = 0; _i103 < _map100.size; ++_i103)
{
_key91 = iprot.readI32();
_val92 = iprot.readI64();
struct.secondValueByIdMap.put(_key91, _val92);
_key101 = iprot.readI32();
_val102 = iprot.readI64();
struct.secondValueByIdMap.put(_key101, _val102);
}
iprot.readMapEnd();
}
@ -1212,10 +1212,10 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
oprot.writeFieldBegin(PROPERTY_VALUE_BY_ID_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, struct.propertyValueByIdMap.size()));
for (Map.Entry<Integer, Long> _iter94 : struct.propertyValueByIdMap.entrySet())
for (Map.Entry<Integer, Long> _iter104 : struct.propertyValueByIdMap.entrySet())
{
oprot.writeI32(_iter94.getKey());
oprot.writeI64(_iter94.getValue());
oprot.writeI32(_iter104.getKey());
oprot.writeI64(_iter104.getValue());
}
oprot.writeMapEnd();
}
@ -1227,10 +1227,10 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
oprot.writeFieldBegin(SECOND_VALUE_BY_ID_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, struct.secondValueByIdMap.size()));
for (Map.Entry<Integer, Long> _iter95 : struct.secondValueByIdMap.entrySet())
for (Map.Entry<Integer, Long> _iter105 : struct.secondValueByIdMap.entrySet())
{
oprot.writeI32(_iter95.getKey());
oprot.writeI64(_iter95.getValue());
oprot.writeI32(_iter105.getKey());
oprot.writeI64(_iter105.getValue());
}
oprot.writeMapEnd();
}
@ -1321,20 +1321,20 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
if (struct.isSetPropertyValueByIdMap()) {
{
oprot.writeI32(struct.propertyValueByIdMap.size());
for (Map.Entry<Integer, Long> _iter96 : struct.propertyValueByIdMap.entrySet())
for (Map.Entry<Integer, Long> _iter106 : struct.propertyValueByIdMap.entrySet())
{
oprot.writeI32(_iter96.getKey());
oprot.writeI64(_iter96.getValue());
oprot.writeI32(_iter106.getKey());
oprot.writeI64(_iter106.getValue());
}
}
}
if (struct.isSetSecondValueByIdMap()) {
{
oprot.writeI32(struct.secondValueByIdMap.size());
for (Map.Entry<Integer, Long> _iter97 : struct.secondValueByIdMap.entrySet())
for (Map.Entry<Integer, Long> _iter107 : struct.secondValueByIdMap.entrySet())
{
oprot.writeI32(_iter97.getKey());
oprot.writeI64(_iter97.getValue());
oprot.writeI32(_iter107.getKey());
oprot.writeI64(_iter107.getValue());
}
}
}
@ -1374,30 +1374,30 @@ public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, Prope
}
if (incoming.get(4)) {
{
org.apache.thrift.protocol.TMap _map98 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
struct.propertyValueByIdMap = new HashMap<Integer,Long>(2*_map98.size);
int _key99;
long _val100;
for (int _i101 = 0; _i101 < _map98.size; ++_i101)
org.apache.thrift.protocol.TMap _map108 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
struct.propertyValueByIdMap = new HashMap<Integer,Long>(2*_map108.size);
int _key109;
long _val110;
for (int _i111 = 0; _i111 < _map108.size; ++_i111)
{
_key99 = iprot.readI32();
_val100 = iprot.readI64();
struct.propertyValueByIdMap.put(_key99, _val100);
_key109 = iprot.readI32();
_val110 = iprot.readI64();
struct.propertyValueByIdMap.put(_key109, _val110);
}
}
struct.setPropertyValueByIdMapIsSet(true);
}
if (incoming.get(5)) {
{
org.apache.thrift.protocol.TMap _map102 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
struct.secondValueByIdMap = new HashMap<Integer,Long>(2*_map102.size);
int _key103;
long _val104;
for (int _i105 = 0; _i105 < _map102.size; ++_i105)
org.apache.thrift.protocol.TMap _map112 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I64, iprot.readI32());
struct.secondValueByIdMap = new HashMap<Integer,Long>(2*_map112.size);
int _key113;
long _val114;
for (int _i115 = 0; _i115 < _map112.size; ++_i115)
{
_key103 = iprot.readI32();
_val104 = iprot.readI64();
struct.secondValueByIdMap.put(_key103, _val104);
_key113 = iprot.readI32();
_val114 = iprot.readI64();
struct.secondValueByIdMap.put(_key113, _val114);
}
}
struct.setSecondValueByIdMapIsSet(true);

50
serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java
View File

@ -1317,7 +1317,7 @@ public class RPCRequestIFace {
public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<Void>() {
return new AsyncMethodCallback<Void>() {
public void onComplete(Void o) {
updateUserInfoByRpc_result result = new updateUserInfoByRpc_result();
try {
@ -7286,13 +7286,13 @@ public class RPCRequestIFace {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
org.apache.thrift.protocol.TSet _set280 = iprot.readSetBegin();
struct.success = new HashSet<String>(2*_set280.size);
String _elem281;
for (int _i282 = 0; _i282 < _set280.size; ++_i282)
org.apache.thrift.protocol.TSet _set290 = iprot.readSetBegin();
struct.success = new HashSet<String>(2*_set290.size);
String _elem291;
for (int _i292 = 0; _i292 < _set290.size; ++_i292)
{
_elem281 = iprot.readString();
struct.success.add(_elem281);
_elem291 = iprot.readString();
struct.success.add(_elem291);
}
iprot.readSetEnd();
}
@ -7320,9 +7320,9 @@ public class RPCRequestIFace {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.success.size()));
for (String _iter283 : struct.success)
for (String _iter293 : struct.success)
{
oprot.writeString(_iter283);
oprot.writeString(_iter293);
}
oprot.writeSetEnd();
}
@ -7353,9 +7353,9 @@ public class RPCRequestIFace {
if (struct.isSetSuccess()) {
{
oprot.writeI32(struct.success.size());
for (String _iter284 : struct.success)
for (String _iter294 : struct.success)
{
oprot.writeString(_iter284);
oprot.writeString(_iter294);
}
}
}
@ -7367,13 +7367,13 @@ public class RPCRequestIFace {
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
org.apache.thrift.protocol.TSet _set285 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.success = new HashSet<String>(2*_set285.size);
String _elem286;
for (int _i287 = 0; _i287 < _set285.size; ++_i287)
org.apache.thrift.protocol.TSet _set295 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.success = new HashSet<String>(2*_set295.size);
String _elem296;
for (int _i297 = 0; _i297 < _set295.size; ++_i297)
{
_elem286 = iprot.readString();
struct.success.add(_elem286);
_elem296 = iprot.readString();
struct.success.add(_elem296);
}
}
struct.setSuccessIsSet(true);
@ -8191,11 +8191,11 @@ public class RPCRequestIFace {
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.UID, new org.apache.thrift.meta_data.FieldMetaData("uid", org.apache.thrift.TFieldRequirementType.DEFAULT,
tmpMap.put(_Fields.UID, new org.apache.thrift.meta_data.FieldMetaData("uid", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.USER_STR, new org.apache.thrift.meta_data.FieldMetaData("userStr", org.apache.thrift.TFieldRequirementType.DEFAULT,
tmpMap.put(_Fields.USER_STR, new org.apache.thrift.meta_data.FieldMetaData("userStr", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT,
tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateUserInfoByRpc_args.class, metaDataMap);
@ -8552,7 +8552,7 @@ public class RPCRequestIFace {
while (true)
{
schemeField = iprot.readFieldBegin();
if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@ -8560,7 +8560,7 @@ public class RPCRequestIFace {
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.uid = iprot.readI32();
struct.setUidIsSet(true);
} else {
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@ -8568,7 +8568,7 @@ public class RPCRequestIFace {
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.userStr = iprot.readString();
struct.setUserStrIsSet(true);
} else {
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@ -8576,7 +8576,7 @@ public class RPCRequestIFace {
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.type = iprot.readI32();
struct.setTypeIsSet(true);
} else {
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@ -8868,7 +8868,7 @@ public class RPCRequestIFace {
while (true)
{
schemeField = iprot.readFieldBegin();
if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {

36
serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java
View File

@ -526,14 +526,14 @@ public class SixiangxinfaInfo implements org.apache.thrift.TBase<SixiangxinfaInf
case 3: // PROPERTY_INFO_LIST
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list106 = iprot.readListBegin();
struct.propertyInfoList = new ArrayList<SixiangxinfaPropertyInfo>(_list106.size);
SixiangxinfaPropertyInfo _elem107;
for (int _i108 = 0; _i108 < _list106.size; ++_i108)
org.apache.thrift.protocol.TList _list116 = iprot.readListBegin();
struct.propertyInfoList = new ArrayList<SixiangxinfaPropertyInfo>(_list116.size);
SixiangxinfaPropertyInfo _elem117;
for (int _i118 = 0; _i118 < _list116.size; ++_i118)
{
_elem107 = new SixiangxinfaPropertyInfo();
_elem107.read(iprot);
struct.propertyInfoList.add(_elem107);
_elem117 = new SixiangxinfaPropertyInfo();
_elem117.read(iprot);
struct.propertyInfoList.add(_elem117);
}
iprot.readListEnd();
}
@ -571,9 +571,9 @@ public class SixiangxinfaInfo implements org.apache.thrift.TBase<SixiangxinfaInf
oprot.writeFieldBegin(PROPERTY_INFO_LIST_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.propertyInfoList.size()));
for (SixiangxinfaPropertyInfo _iter109 : struct.propertyInfoList)
for (SixiangxinfaPropertyInfo _iter119 : struct.propertyInfoList)
{
_iter109.write(oprot);
_iter119.write(oprot);
}
oprot.writeListEnd();
}
@ -616,9 +616,9 @@ public class SixiangxinfaInfo implements org.apache.thrift.TBase<SixiangxinfaInf
if (struct.isSetPropertyInfoList()) {
{
oprot.writeI32(struct.propertyInfoList.size());
for (SixiangxinfaPropertyInfo _iter110 : struct.propertyInfoList)
for (SixiangxinfaPropertyInfo _iter120 : struct.propertyInfoList)
{
_iter110.write(oprot);
_iter120.write(oprot);
}
}
}
@ -638,14 +638,14 @@ public class SixiangxinfaInfo implements org.apache.thrift.TBase<SixiangxinfaInf
}
if (incoming.get(2)) {
{
org.apache.thrift.protocol.TList _list111 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.propertyInfoList = new ArrayList<SixiangxinfaPropertyInfo>(_list111.size);
SixiangxinfaPropertyInfo _elem112;
for (int _i113 = 0; _i113 < _list111.size; ++_i113)
org.apache.thrift.protocol.TList _list121 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.propertyInfoList = new ArrayList<SixiangxinfaPropertyInfo>(_list121.size);
SixiangxinfaPropertyInfo _elem122;
for (int _i123 = 0; _i123 < _list121.size; ++_i123)
{
_elem112 = new SixiangxinfaPropertyInfo();
_elem112.read(iprot);
struct.propertyInfoList.add(_elem112);
_elem122 = new SixiangxinfaPropertyInfo();
_elem122.read(iprot);
struct.propertyInfoList.add(_elem122);
}
}
struct.setPropertyInfoListIsSet(true);

2
tablemanager/src/main/java/config/SSpecialConfig.java
View File

@ -131,6 +131,8 @@ public class SSpecialConfig implements BaseConfig {
public static final String BUILDING_TIME_REDUCE = "BuildingTimeReduce";//浮生特权每日每次减少建筑升级时间：秒
public static final String CHANGE_CAMP_COST = "ChangeCampCost";//神转换阵营消耗
public static final String GodSignOpenStar = "GodSignOpenStar";//神印格子开启所需神将星级
@Override
public void init() throws Exception {