From f8aa4e339bf61ac6d1158cda60afd7d05ff77a50 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Wed, 17 Nov 2021 13:18:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E8=81=9A=E7=81=B5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/core/FunctionIdEnum.java | 1 + .../com/ljsd/jieling/globals/BIReason.java | 2 + .../jieling/handler/GetPlayerInfoHandler.java | 24 ++++++ .../hero/FaBaoSoulUpLvRequestHandler.java | 80 +++++++++++++++++++ .../ljsd/jieling/logic/dao/HeroManager.java | 25 +++++- .../ljsd/jieling/logic/hero/HeroLogic.java | 12 +++ tablemanager/src/main/java/config/STrump.java | 55 +++++++++++++ .../src/main/java/config/STrumpBook.java | 38 +++++++++ .../main/java/config/STrumpLevelupPool.java | 59 ++++++++++++++ 9 files changed, 295 insertions(+), 1 deletion(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/hero/FaBaoSoulUpLvRequestHandler.java create mode 100644 tablemanager/src/main/java/config/STrump.java create mode 100644 tablemanager/src/main/java/config/STrumpBook.java create mode 100644 tablemanager/src/main/java/config/STrumpLevelupPool.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java index 7e99fb305..1466073f9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java @@ -73,6 +73,7 @@ public enum FunctionIdEnum { FourQua(113,null),//四象心法 Likable(114,null),//好感度 GodSoul(116,null),//神魂 + FaBaoSoul(119,null),//法宝聚灵 WeekGood(9091,null), ; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java index 86bdfca37..1612fba97 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -367,4 +367,6 @@ public interface BIReason { int LEVEL_UP_REWARD = 1220;// 玩家升级赠与的道具 int PRACTICE_SKILL_UP_COST=1221;//修行技能升级消耗 int WEEK_CARD_REWARD =1222;//周卡奖励 + + int FABAO_SOUL_UP_COST =1223;//法宝之魂升级消耗 } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index d7c1a2d22..661286c2e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -193,6 +193,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ int randomCount =SLotterySpecialConfig.getLotteryListByDifferentType(7).iterator().next().getCount()- user.getHeroManager().getRandomPoolByType().getOrDefault(11,new HashMap<>()).getOrDefault(7,0); StoreLogic.reloadStoreInfo(user,7);//重载功能商店 ListpracticeSkillInfos=getPracticeSkillInfos(heroManager); + ListfaBaoSoulInfos=getFaBaoSoulInfos(heroManager); // 开服时间戳 long openTime = TimeUtils.stringToTimeLong2(GameApplication.serverConfig.getOpenTime()); PlayerInfoProto.GetPlayerInfoResponse getPlayerInfoResponse @@ -242,6 +243,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ .setServerOpenTime((int) (openTime / 1000)) .setXiuweiLevel(heroManager.getXiuweiLevel()) .addAllPracticeSkillInfos(practiceSkillInfos) + .addAllFaBaoSoulInfos(faBaoSoulInfos) .build(); ReportUtil.onReportEvent(user, ReportEventEnum.APP_LOGIN.getType()); try { @@ -309,6 +311,11 @@ public class GetPlayerInfoHandler extends BaseHandler{ return sixiangxinfaInfos; } + /** + * 初始化修行技能数据 + * @param heroManager + * @return + */ private List getPracticeSkillInfos(HeroManager heroManager) { ListpracticeSkillInfos=new ArrayList<>(heroManager.getPracticeSkillMap().size()); for (Map.Entry entry : heroManager.getPracticeSkillMap().entrySet()) { @@ -321,6 +328,23 @@ public class GetPlayerInfoHandler extends BaseHandler{ return practiceSkillInfos; } + /** + * 初始化法宝之魂数据 + * @param heroManager + * @return + */ + private List getFaBaoSoulInfos(HeroManager heroManager) { + ListfaBaoSoulInfos=new ArrayList<>(heroManager.getFaBaoSoulMap().size()); + for (Map.Entry entry : heroManager.getFaBaoSoulMap().entrySet()) { + CommonProto.FaBaoSoulInfo faBaoInfo=CommonProto.FaBaoSoulInfo.newBuilder() + .setId(entry.getKey()) + .setLevel(entry.getValue()) + .build(); + faBaoSoulInfos.add(faBaoInfo); + } + return faBaoSoulInfos; + } + /** * 初始化英雄星级map(针对老号) * @param user diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/FaBaoSoulUpLvRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/FaBaoSoulUpLvRequestHandler.java new file mode 100644 index 000000000..f910c10eb --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/FaBaoSoulUpLvRequestHandler.java @@ -0,0 +1,80 @@ +package com.ljsd.jieling.handler.hero; + +import com.ljsd.jieling.exception.ErrorCode; +import com.ljsd.jieling.exception.ErrorCodeException; +import com.ljsd.jieling.globals.BIReason; +import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.activity.event.Poster; +import com.ljsd.jieling.logic.activity.event.UserMainTeamForceEvent; +import com.ljsd.jieling.logic.dao.HeroManager; +import com.ljsd.jieling.logic.dao.SixiangProfessionInfo; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.util.ItemUtil; +import com.ljsd.jieling.util.MessageUtil; +import config.SFourQuadrantConfig; +import config.STrump; +import config.STrumpBook; +import config.STrumpLevelupPool; +import org.springframework.stereotype.Component; +import rpc.protocols.CommonProto; +import rpc.protocols.HeroInfoProto; +import rpc.protocols.MessageTypeProto; + +import java.lang.reflect.Array; +import java.util.*; + +@Component +public class FaBaoSoulUpLvRequestHandler extends BaseHandler { + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.FA_BAO_SOUL_UPLV_REQUEST; + } + + //法宝之魂强化消息 + @Override + public void processWithProto(ISession session, HeroInfoProto.FaBaoSoulUpLvRequest proto) throws Exception { + int uid = session.getUid(); + User user = UserManager.getUser(uid); + int faBaoId=proto.getId(); + int faBaoLv=proto.getLevel(); + STrump trumpConfig=STrump.sTrumpMap.get(faBaoId); + if (faBaoLv> trumpConfig.getLvMax()) { + LOGGER.error("法宝之魂强化等级已达上限"); + throw new ErrorCodeException(ErrorCode.HANDLE_FAILED); + } + int[][]costArr=new int[1][2]; + int costLv=faBaoLv-1; + costArr[0][0]=trumpConfig.getLvupCostItem(); + costArr[0][1]=STrumpLevelupPool.levelPoolMap.get(trumpConfig.getLvupPool()).get(costLv).getLvupCostItemNum(); + boolean costResult = ItemUtil.itemCost(user,costArr, BIReason.FABAO_SOUL_UP_COST,faBaoId); + if (!costResult) { + LOGGER.error("法宝之魂强化材料不足"); + throw new ErrorCodeException(ErrorCode.HERO_ITEM_NOT); + } + user.getHeroManager().putFaBaoSoulMap(faBaoId,faBaoLv); + this.updateFaBaoGongMingLv(user,trumpConfig.getBookId()); + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(session.getUid())); + MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.FA_BAO_SOUL_UPLV_RESPONSE_VALUE,null,true); + } + + private void updateFaBaoGongMingLv(User user,int bookId){ + STrumpBook sTrumpBook=STrumpBook.sTrumpBookMap.get(bookId); + int[]trumpList=sTrumpBook.getTrumpList(); + int gongmingLv=0; + for (int trumpId : trumpList) { + if (!user.getHeroManager().getFaBaoSoulMap().containsKey(trumpId)) { + return; + } + if (gongmingLv==0){ + gongmingLv=user.getHeroManager().getFaBaoSoulMap().get(trumpId); + } + if (user.getHeroManager().getFaBaoSoulMap().get(trumpId)faBaoSoulMap= new HashMap<>();//法宝之魂数据 + + public Map getFaBaoSoulMap() { + return faBaoSoulMap; + } + + private MapfaBaoGongMingSkillMap= new HashMap<>();//法宝之魂共鸣数据<法宝组合id：技能id> + + public Map getFaBaoGongMingSkillMap() { + return faBaoGongMingSkillMap; + } + /** * 心愿可以选择的英雄列表 */ @@ -202,7 +215,17 @@ public class HeroManager extends MongoBase { updateString("heroLikableMap."+heroStaticId, likableNum); } - public void putHeroLikablePropAddMap(int heroStaticId,Map _propMap) { + public void putFaBaoSoulMap(int fabaoId,int fabaoLv) { + faBaoSoulMap.put(fabaoId,fabaoLv); + updateString("faBaoSoulMap."+fabaoId, fabaoLv); + } + + public void putFaBaoGongMingSkillMap(int bookId,int skillId) { + faBaoGongMingSkillMap.put(bookId,skillId); + updateString("faBaoGongMingSkillMap."+bookId, skillId); + } + + public void putHeroLikablePropAddMap(int heroStaticId, Map _propMap) { heroLikablePropAddMap.put(heroStaticId,_propMap); updateString("heroLikablePropAddMap."+heroStaticId, _propMap); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 1a817c59e..640f26968 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1978,6 +1978,11 @@ public class HeroLogic { List godSoulSkills = GetGodSoulSkill(hero.getTemplateId(), hero.getGodSoulLv()); skillList.addAll(godSoulSkills); } + if (user.getHeroManager().getFaBaoGongMingSkillMap().size()>0) { + List faBaoSoulSkills=new ArrayList<>(user.getHeroManager().getFaBaoGongMingSkillMap().values()); + skillList.addAll(faBaoSoulSkills); + } + return skillList; } @@ -2592,6 +2597,13 @@ public class HeroLogic { combinedAttribute(allLikableProp, heroAllAttribute); } + ///法宝之魂属性加成 + for (Map.Entry faBaoSoulEntry : user.getHeroManager().getFaBaoSoulMap().entrySet()) { + STrump trumpConfig=STrump.sTrumpMap.get(faBaoSoulEntry.getKey()); + STrumpLevelupPool lvUpProps=STrumpLevelupPool.levelPoolMap.get(trumpConfig.getLvupPool()).get(faBaoSoulEntry.getValue()); + combinedAttribute(lvUpProps.getLvupProps(), heroAllAttribute); + } + //装备总战力评分 int equipForce = 0; Iterator> iterator = hero.getEquipByHongmengPositionMap(user.getHeroManager()).entrySet().iterator(); diff --git a/tablemanager/src/main/java/config/STrump.java b/tablemanager/src/main/java/config/STrump.java new file mode 100644 index 000000000..bc557825d --- /dev/null +++ b/tablemanager/src/main/java/config/STrump.java @@ -0,0 +1,55 @@ +package config; + +import manager.STableManager; +import manager.Table; + +import java.util.HashMap; +import java.util.Map; + +@Table(name ="Trump") +public class STrump implements BaseConfig { + + private int id; + + private int lvupCostItem; + + private int lvupPool; + + private int lvMax; + + private int xiuxianLimit; + + private int bookId; + + public static Map sTrumpMap; + + @Override + public void init() throws Exception { + sTrumpMap=new HashMap<>(); + sTrumpMap = STableManager.getConfig(STrump.class); + } + public int getId() { + return id; + } + + public int getLvupCostItem() { + return lvupCostItem; + } + + public int getLvupPool() { + return lvupPool; + } + + public int getLvMax() { + return lvMax; + } + + public int getXiuxianLimit() { + return xiuxianLimit; + } + + public int getBookId() { + return bookId; + } +} + diff --git a/tablemanager/src/main/java/config/STrumpBook.java b/tablemanager/src/main/java/config/STrumpBook.java new file mode 100644 index 000000000..000b218c7 --- /dev/null +++ b/tablemanager/src/main/java/config/STrumpBook.java @@ -0,0 +1,38 @@ +package config; + +import manager.STableManager; +import manager.Table; + +import java.util.HashMap; +import java.util.Map; + +@Table(name ="TrumpBook") +public class STrumpBook implements BaseConfig { + + private int id; + + private int[] trumpList; + + private int[][] skillList; + + public static Map sTrumpBookMap; + + @Override + public void init() throws Exception { + sTrumpBookMap=new HashMap<>(); + sTrumpBookMap = STableManager.getConfig(STrumpBook.class); + } + + public int getId() { + return id; + } + + public int[] getTrumpList() { + return trumpList; + } + + public int[][] getSkillList() { + return skillList; + } +} + diff --git a/tablemanager/src/main/java/config/STrumpLevelupPool.java b/tablemanager/src/main/java/config/STrumpLevelupPool.java new file mode 100644 index 000000000..cc8e2e419 --- /dev/null +++ b/tablemanager/src/main/java/config/STrumpLevelupPool.java @@ -0,0 +1,59 @@ +package config; + +import manager.STableManager; +import manager.Table; + +import java.util.HashMap; +import java.util.Map; + +@Table(name ="TrumpLevelupPool") +public class STrumpLevelupPool implements BaseConfig { + + private int id; + + private int poolId; + + private int level; + + private int lvupCostItemNum; + + private int[][] lvupProps; + + public static Map sTrumpLevelupPoolMap; + public static Map> levelPoolMap;//<升级库：<等级：表数据>> + + @Override + public void init() throws Exception { + sTrumpLevelupPoolMap=new HashMap<>(); + levelPoolMap=new HashMap<>(); + sTrumpLevelupPoolMap = STableManager.getConfig(STrumpLevelupPool.class); + for (Map.Entry entry : sTrumpLevelupPoolMap.entrySet()) { + STrumpLevelupPool sTrumpLevelupPool=entry.getValue(); + if (!levelPoolMap.containsKey(entry.getValue().getPoolId())){ + MappoolMap=new HashMap<>(); + levelPoolMap.put(sTrumpLevelupPool.getPoolId(),poolMap); + } + levelPoolMap.get(sTrumpLevelupPool.getPoolId()).put(sTrumpLevelupPool.getLevel(),sTrumpLevelupPool); + } + } + public int getId() { + return id; + } + + public int getPoolId() { + return poolId; + } + + public int getLevel() { + return level; + } + + public int getLvupCostItemNum() { + return lvupCostItemNum; + } + + public int[][] getLvupProps() { + return lvupProps; + } +} + From 661594c4225180cbae403b77676d4befe160c4bc Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Wed, 17 Nov 2021 13:55:25 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 640f26968..6d6d8fe5c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1978,6 +1978,7 @@ public class HeroLogic { List godSoulSkills = GetGodSoulSkill(hero.getTemplateId(), hero.getGodSoulLv()); skillList.addAll(godSoulSkills); } + ///法宝之魂共鸣技能 if (user.getHeroManager().getFaBaoGongMingSkillMap().size()>0) { List faBaoSoulSkills=new ArrayList<>(user.getHeroManager().getFaBaoGongMingSkillMap().values()); skillList.addAll(faBaoSoulSkills); From 782d39ab2d8c1f9a33a71c398b1cbc31d0298c9c Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Wed, 17 Nov 2021 14:48:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E4=B9=8B=E9=AD=82?= =?UTF-8?q?=E5=85=B1=E9=B8=A3=E6=8A=80=E8=83=BD=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/CoreService.java | 2 +- .../ljsd/jieling/logic/hero/HeroLogic.java | 5 + .../jieling/thrift/idl/CrossArenaManager.java | 469 ++++++++++++------ serverlogic/src/main/thrift/idl/core.thrift | 1 + .../jieling/thrift/idl/CrossArenaManager.java | 469 ++++++++++++------ 5 files changed, 635 insertions(+), 311 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index ba25acb12..a1bd356ff 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -193,7 +193,7 @@ public class CoreService implements RPCRequestIFace.Iface { rpcArenaManager.setFourSpirit(user.getPlayerInfoManager().getFourChallengeTotal()); ///修行技能数据 rpcArenaManager.setPracticeSkillMap(user.getHeroManager().getPracticeSkillMap()); - + rpcArenaManager.setFaBaoGongMingSkillMap(user.getHeroManager().getFaBaoGongMingSkillMap()); rpcArenaManager.setMaxHistoryForce(user.getPlayerInfoManager().getMaxForce()); LOGGER.info("跨服，获取玩家英雄信息耗时：{}ms",TimeUtils.now()-start); return rpcArenaManager; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 6d6d8fe5c..2471adb60 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -2097,6 +2097,11 @@ public class HeroLogic { List godSoulSkills = GetGodSoulSkill(hero.getTemplateId(), hero.getGodSoulLv()); skillList.addAll(godSoulSkills); } + ///法宝之魂共鸣技能 + if (crossArenaManager.getFaBaoGongMingSkillMap().size()>0) { + List faBaoSoulSkills=new ArrayList<>(crossArenaManager.getFaBaoGongMingSkillMap().values()); + skillList.addAll(faBaoSoulSkills); + } StringBuilder sb = new StringBuilder(); coverSkill(skillList); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java index 06fa39e98..3f173ab00 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-11-17") public class CrossArenaManager implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CrossArenaManager"); @@ -53,6 +53,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -75,6 +76,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase practiceSkillMap; // optional public long maxHistoryForce; // optional + public Map faBaoGongMingSkillMap; // 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 { @@ -92,7 +94,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase byName = new HashMap(); @@ -137,6 +140,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -237,6 +242,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase __this__faBaoGongMingSkillMap = new HashMap(other.faBaoGongMingSkillMap); + this.faBaoGongMingSkillMap = __this__faBaoGongMingSkillMap; + } } public CrossArenaManager deepCopy() { @@ -380,6 +393,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase(); + } + this.faBaoGongMingSkillMap.put(key, val); + } + + public Map getFaBaoGongMingSkillMap() { + return this.faBaoGongMingSkillMap; + } + + public CrossArenaManager setFaBaoGongMingSkillMap(Map faBaoGongMingSkillMap) { + this.faBaoGongMingSkillMap = faBaoGongMingSkillMap; + return this; + } + + public void unsetFaBaoGongMingSkillMap() { + this.faBaoGongMingSkillMap = null; + } + + /** Returns true if field faBaoGongMingSkillMap is set (has been assigned a value) and false otherwise */ + public boolean isSetFaBaoGongMingSkillMap() { + return this.faBaoGongMingSkillMap != null; + } + + public void setFaBaoGongMingSkillMapIsSet(boolean value) { + if (!value) { + this.faBaoGongMingSkillMap = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case TEAMS: @@ -973,6 +1022,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase)value); + } + break; + } } @@ -1023,6 +1080,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map148.size); + int _key149; + int _val150; + for (int _i151 = 0; _i151 < _map148.size; ++_i151) + { + _key149 = iprot.readI32(); + _val150 = iprot.readI32(); + struct.faBaoGongMingSkillMap.put(_key149, _val150); + } + iprot.readMapEnd(); + } + struct.setFaBaoGongMingSkillMapIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1926,14 +2042,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter148 : struct.teams.entrySet()) + for (Map.Entry> _iter152 : struct.teams.entrySet()) { - oprot.writeI32(_iter148.getKey()); + oprot.writeI32(_iter152.getKey()); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter148.getValue().size())); - for (TeamPosHeroInfo _iter149 : _iter148.getValue()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter152.getValue().size())); + for (TeamPosHeroInfo _iter153 : _iter152.getValue()) { - _iter149.write(oprot); + _iter153.write(oprot); } oprot.writeListEnd(); } @@ -1948,10 +2064,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter150 : struct.heros.entrySet()) + for (Map.Entry _iter154 : struct.heros.entrySet()) { - oprot.writeString(_iter150.getKey()); - _iter150.getValue().write(oprot); + oprot.writeString(_iter154.getKey()); + _iter154.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1963,10 +2079,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter151 : struct.jewels.entrySet()) + for (Map.Entry _iter155 : struct.jewels.entrySet()) { - oprot.writeString(_iter151.getKey()); - _iter151.getValue().write(oprot); + oprot.writeString(_iter155.getKey()); + _iter155.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1978,10 +2094,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter152 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter156 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter152.getKey()); - oprot.writeI32(_iter152.getValue()); + oprot.writeI32(_iter156.getKey()); + oprot.writeI32(_iter156.getValue()); } oprot.writeMapEnd(); } @@ -2003,10 +2119,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter153 : struct.pokemons.entrySet()) + for (Map.Entry _iter157 : struct.pokemons.entrySet()) { - oprot.writeString(_iter153.getKey()); - _iter153.getValue().write(oprot); + oprot.writeString(_iter157.getKey()); + _iter157.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2018,10 +2134,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter154 : struct.seals.entrySet()) + for (Map.Entry _iter158 : struct.seals.entrySet()) { - oprot.writeI32(_iter154.getKey()); - _iter154.getValue().write(oprot); + oprot.writeI32(_iter158.getKey()); + _iter158.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2033,10 +2149,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter155 : struct.guildSkill.entrySet()) + for (Map.Entry _iter159 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter155.getKey()); - oprot.writeI32(_iter155.getValue()); + oprot.writeI32(_iter159.getKey()); + oprot.writeI32(_iter159.getValue()); } oprot.writeMapEnd(); } @@ -2048,10 +2164,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter156 : struct.pokemonTeamMap.entrySet()) + for (Map.Entry _iter160 : struct.pokemonTeamMap.entrySet()) { - oprot.writeI32(_iter156.getKey()); - oprot.writeString(_iter156.getValue()); + oprot.writeI32(_iter160.getKey()); + oprot.writeString(_iter160.getValue()); } oprot.writeMapEnd(); } @@ -2068,9 +2184,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter158 : struct.practiceSkillMap.entrySet()) + for (Map.Entry _iter162 : struct.practiceSkillMap.entrySet()) { - oprot.writeI32(_iter158.getKey()); - oprot.writeI32(_iter158.getValue()); + oprot.writeI32(_iter162.getKey()); + oprot.writeI32(_iter162.getValue()); } oprot.writeMapEnd(); } @@ -2102,6 +2218,21 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter163 : struct.faBaoGongMingSkillMap.entrySet()) + { + oprot.writeI32(_iter163.getKey()); + oprot.writeI32(_iter163.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -2165,18 +2296,21 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter159 : struct.teams.entrySet()) + for (Map.Entry> _iter164 : struct.teams.entrySet()) { - oprot.writeI32(_iter159.getKey()); + oprot.writeI32(_iter164.getKey()); { - oprot.writeI32(_iter159.getValue().size()); - for (TeamPosHeroInfo _iter160 : _iter159.getValue()) + oprot.writeI32(_iter164.getValue().size()); + for (TeamPosHeroInfo _iter165 : _iter164.getValue()) { - _iter160.write(oprot); + _iter165.write(oprot); } } } @@ -2185,30 +2319,30 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter161 : struct.heros.entrySet()) + for (Map.Entry _iter166 : struct.heros.entrySet()) { - oprot.writeString(_iter161.getKey()); - _iter161.getValue().write(oprot); + oprot.writeString(_iter166.getKey()); + _iter166.getValue().write(oprot); } } } if (struct.isSetJewels()) { { oprot.writeI32(struct.jewels.size()); - for (Map.Entry _iter162 : struct.jewels.entrySet()) + for (Map.Entry _iter167 : struct.jewels.entrySet()) { - oprot.writeString(_iter162.getKey()); - _iter162.getValue().write(oprot); + oprot.writeString(_iter167.getKey()); + _iter167.getValue().write(oprot); } } } if (struct.isSetTotalForceByTeam()) { { oprot.writeI32(struct.totalForceByTeam.size()); - for (Map.Entry _iter163 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter168 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter163.getKey()); - oprot.writeI32(_iter163.getValue()); + oprot.writeI32(_iter168.getKey()); + oprot.writeI32(_iter168.getValue()); } } } @@ -2221,40 +2355,40 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter164 : struct.pokemons.entrySet()) + for (Map.Entry _iter169 : struct.pokemons.entrySet()) { - oprot.writeString(_iter164.getKey()); - _iter164.getValue().write(oprot); + oprot.writeString(_iter169.getKey()); + _iter169.getValue().write(oprot); } } } if (struct.isSetSeals()) { { oprot.writeI32(struct.seals.size()); - for (Map.Entry _iter165 : struct.seals.entrySet()) + for (Map.Entry _iter170 : struct.seals.entrySet()) { - oprot.writeI32(_iter165.getKey()); - _iter165.getValue().write(oprot); + oprot.writeI32(_iter170.getKey()); + _iter170.getValue().write(oprot); } } } if (struct.isSetGuildSkill()) { { oprot.writeI32(struct.guildSkill.size()); - for (Map.Entry _iter166 : struct.guildSkill.entrySet()) + for (Map.Entry _iter171 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter166.getKey()); - oprot.writeI32(_iter166.getValue()); + oprot.writeI32(_iter171.getKey()); + oprot.writeI32(_iter171.getValue()); } } } if (struct.isSetPokemonTeamMap()) { { oprot.writeI32(struct.pokemonTeamMap.size()); - for (Map.Entry _iter167 : struct.pokemonTeamMap.entrySet()) + for (Map.Entry _iter172 : struct.pokemonTeamMap.entrySet()) { - oprot.writeI32(_iter167.getKey()); - oprot.writeString(_iter167.getValue()); + oprot.writeI32(_iter172.getKey()); + oprot.writeString(_iter172.getValue()); } } } @@ -2264,9 +2398,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter169 : struct.practiceSkillMap.entrySet()) + for (Map.Entry _iter174 : struct.practiceSkillMap.entrySet()) { - oprot.writeI32(_iter169.getKey()); - oprot.writeI32(_iter169.getValue()); + oprot.writeI32(_iter174.getKey()); + oprot.writeI32(_iter174.getValue()); } } } if (struct.isSetMaxHistoryForce()) { oprot.writeI64(struct.maxHistoryForce); } + if (struct.isSetFaBaoGongMingSkillMap()) { + { + oprot.writeI32(struct.faBaoGongMingSkillMap.size()); + for (Map.Entry _iter175 : struct.faBaoGongMingSkillMap.entrySet()) + { + oprot.writeI32(_iter175.getKey()); + oprot.writeI32(_iter175.getValue()); + } + } + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, CrossArenaManager struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(15); + BitSet incoming = iprot.readBitSet(16); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map170 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST, iprot.readI32()); - struct.teams = new HashMap>(2*_map170.size); - int _key171; - List _val172; - for (int _i173 = 0; _i173 < _map170.size; ++_i173) + org.apache.thrift.protocol.TMap _map176 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST, iprot.readI32()); + struct.teams = new HashMap>(2*_map176.size); + int _key177; + List _val178; + for (int _i179 = 0; _i179 < _map176.size; ++_i179) { - _key171 = iprot.readI32(); + _key177 = iprot.readI32(); { - org.apache.thrift.protocol.TList _list174 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - _val172 = new ArrayList(_list174.size); - TeamPosHeroInfo _elem175; - for (int _i176 = 0; _i176 < _list174.size; ++_i176) + org.apache.thrift.protocol.TList _list180 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + _val178 = new ArrayList(_list180.size); + TeamPosHeroInfo _elem181; + for (int _i182 = 0; _i182 < _list180.size; ++_i182) { - _elem175 = new TeamPosHeroInfo(); - _elem175.read(iprot); - _val172.add(_elem175); + _elem181 = new TeamPosHeroInfo(); + _elem181.read(iprot); + _val178.add(_elem181); } } - struct.teams.put(_key171, _val172); + struct.teams.put(_key177, _val178); } } struct.setTeamsIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map177 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.heros = new HashMap(2*_map177.size); - String _key178; - ArenaOfHero _val179; - for (int _i180 = 0; _i180 < _map177.size; ++_i180) + org.apache.thrift.protocol.TMap _map183 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.heros = new HashMap(2*_map183.size); + String _key184; + ArenaOfHero _val185; + for (int _i186 = 0; _i186 < _map183.size; ++_i186) { - _key178 = iprot.readString(); - _val179 = new ArenaOfHero(); - _val179.read(iprot); - struct.heros.put(_key178, _val179); + _key184 = iprot.readString(); + _val185 = new ArenaOfHero(); + _val185.read(iprot); + struct.heros.put(_key184, _val185); } } struct.setHerosIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map181 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.jewels = new HashMap(2*_map181.size); - String _key182; - PropertyItem _val183; - for (int _i184 = 0; _i184 < _map181.size; ++_i184) + org.apache.thrift.protocol.TMap _map187 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.jewels = new HashMap(2*_map187.size); + String _key188; + PropertyItem _val189; + for (int _i190 = 0; _i190 < _map187.size; ++_i190) { - _key182 = iprot.readString(); - _val183 = new PropertyItem(); - _val183.read(iprot); - struct.jewels.put(_key182, _val183); + _key188 = iprot.readString(); + _val189 = new PropertyItem(); + _val189.read(iprot); + struct.jewels.put(_key188, _val189); } } struct.setJewelsIsSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map185 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.totalForceByTeam = new HashMap(2*_map185.size); - int _key186; - int _val187; - for (int _i188 = 0; _i188 < _map185.size; ++_i188) + org.apache.thrift.protocol.TMap _map191 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.totalForceByTeam = new HashMap(2*_map191.size); + int _key192; + int _val193; + for (int _i194 = 0; _i194 < _map191.size; ++_i194) { - _key186 = iprot.readI32(); - _val187 = iprot.readI32(); - struct.totalForceByTeam.put(_key186, _val187); + _key192 = iprot.readI32(); + _val193 = iprot.readI32(); + struct.totalForceByTeam.put(_key192, _val193); } } struct.setTotalForceByTeamIsSet(true); @@ -2374,62 +2518,62 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map189.size); - String _key190; - Pokemon _val191; - for (int _i192 = 0; _i192 < _map189.size; ++_i192) + org.apache.thrift.protocol.TMap _map195 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.pokemons = new HashMap(2*_map195.size); + String _key196; + Pokemon _val197; + for (int _i198 = 0; _i198 < _map195.size; ++_i198) { - _key190 = iprot.readString(); - _val191 = new Pokemon(); - _val191.read(iprot); - struct.pokemons.put(_key190, _val191); + _key196 = iprot.readString(); + _val197 = new Pokemon(); + _val197.read(iprot); + struct.pokemons.put(_key196, _val197); } } struct.setPokemonsIsSet(true); } if (incoming.get(7)) { { - org.apache.thrift.protocol.TMap _map193 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.seals = new HashMap(2*_map193.size); - int _key194; - PurpleMansionSeal _val195; - for (int _i196 = 0; _i196 < _map193.size; ++_i196) + org.apache.thrift.protocol.TMap _map199 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.seals = new HashMap(2*_map199.size); + int _key200; + PurpleMansionSeal _val201; + for (int _i202 = 0; _i202 < _map199.size; ++_i202) { - _key194 = iprot.readI32(); - _val195 = new PurpleMansionSeal(); - _val195.read(iprot); - struct.seals.put(_key194, _val195); + _key200 = iprot.readI32(); + _val201 = new PurpleMansionSeal(); + _val201.read(iprot); + struct.seals.put(_key200, _val201); } } struct.setSealsIsSet(true); } if (incoming.get(8)) { { - org.apache.thrift.protocol.TMap _map197 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.guildSkill = new HashMap(2*_map197.size); - int _key198; - int _val199; - for (int _i200 = 0; _i200 < _map197.size; ++_i200) + org.apache.thrift.protocol.TMap _map203 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.guildSkill = new HashMap(2*_map203.size); + int _key204; + int _val205; + for (int _i206 = 0; _i206 < _map203.size; ++_i206) { - _key198 = iprot.readI32(); - _val199 = iprot.readI32(); - struct.guildSkill.put(_key198, _val199); + _key204 = iprot.readI32(); + _val205 = iprot.readI32(); + struct.guildSkill.put(_key204, _val205); } } struct.setGuildSkillIsSet(true); } if (incoming.get(9)) { { - org.apache.thrift.protocol.TMap _map201 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.pokemonTeamMap = new HashMap(2*_map201.size); - int _key202; - String _val203; - for (int _i204 = 0; _i204 < _map201.size; ++_i204) + org.apache.thrift.protocol.TMap _map207 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.pokemonTeamMap = new HashMap(2*_map207.size); + int _key208; + String _val209; + for (int _i210 = 0; _i210 < _map207.size; ++_i210) { - _key202 = iprot.readI32(); - _val203 = iprot.readString(); - struct.pokemonTeamMap.put(_key202, _val203); + _key208 = iprot.readI32(); + _val209 = iprot.readString(); + struct.pokemonTeamMap.put(_key208, _val209); } } struct.setPokemonTeamMapIsSet(true); @@ -2440,13 +2584,13 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list205.size); - int _elem206; - for (int _i207 = 0; _i207 < _list205.size; ++_i207) + org.apache.thrift.protocol.TList _list211 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.skill = new ArrayList(_list211.size); + int _elem212; + for (int _i213 = 0; _i213 < _list211.size; ++_i213) { - _elem206 = iprot.readI32(); - struct.skill.add(_elem206); + _elem212 = iprot.readI32(); + struct.skill.add(_elem212); } } struct.setSkillIsSet(true); @@ -2457,15 +2601,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map208.size); - int _key209; - int _val210; - for (int _i211 = 0; _i211 < _map208.size; ++_i211) + org.apache.thrift.protocol.TMap _map214 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.practiceSkillMap = new HashMap(2*_map214.size); + int _key215; + int _val216; + for (int _i217 = 0; _i217 < _map214.size; ++_i217) { - _key209 = iprot.readI32(); - _val210 = iprot.readI32(); - struct.practiceSkillMap.put(_key209, _val210); + _key215 = iprot.readI32(); + _val216 = iprot.readI32(); + struct.practiceSkillMap.put(_key215, _val216); } } struct.setPracticeSkillMapIsSet(true); @@ -2474,6 +2618,21 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map218.size); + int _key219; + int _val220; + for (int _i221 = 0; _i221 < _map218.size; ++_i221) + { + _key219 = iprot.readI32(); + _val220 = iprot.readI32(); + struct.faBaoGongMingSkillMap.put(_key219, _val220); + } + } + struct.setFaBaoGongMingSkillMapIsSet(true); + } } } diff --git a/serverlogic/src/main/thrift/idl/core.thrift b/serverlogic/src/main/thrift/idl/core.thrift index 17471cc23..0096feddc 100644 --- a/serverlogic/src/main/thrift/idl/core.thrift +++ b/serverlogic/src/main/thrift/idl/core.thrift @@ -92,6 +92,7 @@ struct CrossArenaManager{ 13:optional i32 fourSpirit; 14:optional map practiceSkillMap;//修行技能数据 15:optional i64 maxHistoryForce;//用户历史最高战力 + 16:optional map faBaoGongMingSkillMap;//法宝之魂共鸣技能 } service RPCRequestIFace{ diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java index 06fa39e98..3f173ab00 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-11-17") public class CrossArenaManager implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CrossArenaManager"); @@ -53,6 +53,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -75,6 +76,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase practiceSkillMap; // optional public long maxHistoryForce; // optional + public Map faBaoGongMingSkillMap; // 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 { @@ -92,7 +94,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase byName = new HashMap(); @@ -137,6 +140,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -237,6 +242,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase __this__faBaoGongMingSkillMap = new HashMap(other.faBaoGongMingSkillMap); + this.faBaoGongMingSkillMap = __this__faBaoGongMingSkillMap; + } } public CrossArenaManager deepCopy() { @@ -380,6 +393,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase(); + } + this.faBaoGongMingSkillMap.put(key, val); + } + + public Map getFaBaoGongMingSkillMap() { + return this.faBaoGongMingSkillMap; + } + + public CrossArenaManager setFaBaoGongMingSkillMap(Map faBaoGongMingSkillMap) { + this.faBaoGongMingSkillMap = faBaoGongMingSkillMap; + return this; + } + + public void unsetFaBaoGongMingSkillMap() { + this.faBaoGongMingSkillMap = null; + } + + /** Returns true if field faBaoGongMingSkillMap is set (has been assigned a value) and false otherwise */ + public boolean isSetFaBaoGongMingSkillMap() { + return this.faBaoGongMingSkillMap != null; + } + + public void setFaBaoGongMingSkillMapIsSet(boolean value) { + if (!value) { + this.faBaoGongMingSkillMap = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case TEAMS: @@ -973,6 +1022,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase)value); + } + break; + } } @@ -1023,6 +1080,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map148.size); + int _key149; + int _val150; + for (int _i151 = 0; _i151 < _map148.size; ++_i151) + { + _key149 = iprot.readI32(); + _val150 = iprot.readI32(); + struct.faBaoGongMingSkillMap.put(_key149, _val150); + } + iprot.readMapEnd(); + } + struct.setFaBaoGongMingSkillMapIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1926,14 +2042,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter148 : struct.teams.entrySet()) + for (Map.Entry> _iter152 : struct.teams.entrySet()) { - oprot.writeI32(_iter148.getKey()); + oprot.writeI32(_iter152.getKey()); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter148.getValue().size())); - for (TeamPosHeroInfo _iter149 : _iter148.getValue()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter152.getValue().size())); + for (TeamPosHeroInfo _iter153 : _iter152.getValue()) { - _iter149.write(oprot); + _iter153.write(oprot); } oprot.writeListEnd(); } @@ -1948,10 +2064,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter150 : struct.heros.entrySet()) + for (Map.Entry _iter154 : struct.heros.entrySet()) { - oprot.writeString(_iter150.getKey()); - _iter150.getValue().write(oprot); + oprot.writeString(_iter154.getKey()); + _iter154.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1963,10 +2079,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter151 : struct.jewels.entrySet()) + for (Map.Entry _iter155 : struct.jewels.entrySet()) { - oprot.writeString(_iter151.getKey()); - _iter151.getValue().write(oprot); + oprot.writeString(_iter155.getKey()); + _iter155.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1978,10 +2094,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter152 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter156 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter152.getKey()); - oprot.writeI32(_iter152.getValue()); + oprot.writeI32(_iter156.getKey()); + oprot.writeI32(_iter156.getValue()); } oprot.writeMapEnd(); } @@ -2003,10 +2119,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter153 : struct.pokemons.entrySet()) + for (Map.Entry _iter157 : struct.pokemons.entrySet()) { - oprot.writeString(_iter153.getKey()); - _iter153.getValue().write(oprot); + oprot.writeString(_iter157.getKey()); + _iter157.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2018,10 +2134,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter154 : struct.seals.entrySet()) + for (Map.Entry _iter158 : struct.seals.entrySet()) { - oprot.writeI32(_iter154.getKey()); - _iter154.getValue().write(oprot); + oprot.writeI32(_iter158.getKey()); + _iter158.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2033,10 +2149,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter155 : struct.guildSkill.entrySet()) + for (Map.Entry _iter159 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter155.getKey()); - oprot.writeI32(_iter155.getValue()); + oprot.writeI32(_iter159.getKey()); + oprot.writeI32(_iter159.getValue()); } oprot.writeMapEnd(); } @@ -2048,10 +2164,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter156 : struct.pokemonTeamMap.entrySet()) + for (Map.Entry _iter160 : struct.pokemonTeamMap.entrySet()) { - oprot.writeI32(_iter156.getKey()); - oprot.writeString(_iter156.getValue()); + oprot.writeI32(_iter160.getKey()); + oprot.writeString(_iter160.getValue()); } oprot.writeMapEnd(); } @@ -2068,9 +2184,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter158 : struct.practiceSkillMap.entrySet()) + for (Map.Entry _iter162 : struct.practiceSkillMap.entrySet()) { - oprot.writeI32(_iter158.getKey()); - oprot.writeI32(_iter158.getValue()); + oprot.writeI32(_iter162.getKey()); + oprot.writeI32(_iter162.getValue()); } oprot.writeMapEnd(); } @@ -2102,6 +2218,21 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter163 : struct.faBaoGongMingSkillMap.entrySet()) + { + oprot.writeI32(_iter163.getKey()); + oprot.writeI32(_iter163.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -2165,18 +2296,21 @@ public class CrossArenaManager implements org.apache.thrift.TBase> _iter159 : struct.teams.entrySet()) + for (Map.Entry> _iter164 : struct.teams.entrySet()) { - oprot.writeI32(_iter159.getKey()); + oprot.writeI32(_iter164.getKey()); { - oprot.writeI32(_iter159.getValue().size()); - for (TeamPosHeroInfo _iter160 : _iter159.getValue()) + oprot.writeI32(_iter164.getValue().size()); + for (TeamPosHeroInfo _iter165 : _iter164.getValue()) { - _iter160.write(oprot); + _iter165.write(oprot); } } } @@ -2185,30 +2319,30 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter161 : struct.heros.entrySet()) + for (Map.Entry _iter166 : struct.heros.entrySet()) { - oprot.writeString(_iter161.getKey()); - _iter161.getValue().write(oprot); + oprot.writeString(_iter166.getKey()); + _iter166.getValue().write(oprot); } } } if (struct.isSetJewels()) { { oprot.writeI32(struct.jewels.size()); - for (Map.Entry _iter162 : struct.jewels.entrySet()) + for (Map.Entry _iter167 : struct.jewels.entrySet()) { - oprot.writeString(_iter162.getKey()); - _iter162.getValue().write(oprot); + oprot.writeString(_iter167.getKey()); + _iter167.getValue().write(oprot); } } } if (struct.isSetTotalForceByTeam()) { { oprot.writeI32(struct.totalForceByTeam.size()); - for (Map.Entry _iter163 : struct.totalForceByTeam.entrySet()) + for (Map.Entry _iter168 : struct.totalForceByTeam.entrySet()) { - oprot.writeI32(_iter163.getKey()); - oprot.writeI32(_iter163.getValue()); + oprot.writeI32(_iter168.getKey()); + oprot.writeI32(_iter168.getValue()); } } } @@ -2221,40 +2355,40 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter164 : struct.pokemons.entrySet()) + for (Map.Entry _iter169 : struct.pokemons.entrySet()) { - oprot.writeString(_iter164.getKey()); - _iter164.getValue().write(oprot); + oprot.writeString(_iter169.getKey()); + _iter169.getValue().write(oprot); } } } if (struct.isSetSeals()) { { oprot.writeI32(struct.seals.size()); - for (Map.Entry _iter165 : struct.seals.entrySet()) + for (Map.Entry _iter170 : struct.seals.entrySet()) { - oprot.writeI32(_iter165.getKey()); - _iter165.getValue().write(oprot); + oprot.writeI32(_iter170.getKey()); + _iter170.getValue().write(oprot); } } } if (struct.isSetGuildSkill()) { { oprot.writeI32(struct.guildSkill.size()); - for (Map.Entry _iter166 : struct.guildSkill.entrySet()) + for (Map.Entry _iter171 : struct.guildSkill.entrySet()) { - oprot.writeI32(_iter166.getKey()); - oprot.writeI32(_iter166.getValue()); + oprot.writeI32(_iter171.getKey()); + oprot.writeI32(_iter171.getValue()); } } } if (struct.isSetPokemonTeamMap()) { { oprot.writeI32(struct.pokemonTeamMap.size()); - for (Map.Entry _iter167 : struct.pokemonTeamMap.entrySet()) + for (Map.Entry _iter172 : struct.pokemonTeamMap.entrySet()) { - oprot.writeI32(_iter167.getKey()); - oprot.writeString(_iter167.getValue()); + oprot.writeI32(_iter172.getKey()); + oprot.writeString(_iter172.getValue()); } } } @@ -2264,9 +2398,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase _iter169 : struct.practiceSkillMap.entrySet()) + for (Map.Entry _iter174 : struct.practiceSkillMap.entrySet()) { - oprot.writeI32(_iter169.getKey()); - oprot.writeI32(_iter169.getValue()); + oprot.writeI32(_iter174.getKey()); + oprot.writeI32(_iter174.getValue()); } } } if (struct.isSetMaxHistoryForce()) { oprot.writeI64(struct.maxHistoryForce); } + if (struct.isSetFaBaoGongMingSkillMap()) { + { + oprot.writeI32(struct.faBaoGongMingSkillMap.size()); + for (Map.Entry _iter175 : struct.faBaoGongMingSkillMap.entrySet()) + { + oprot.writeI32(_iter175.getKey()); + oprot.writeI32(_iter175.getValue()); + } + } + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, CrossArenaManager struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(15); + BitSet incoming = iprot.readBitSet(16); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map170 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST, iprot.readI32()); - struct.teams = new HashMap>(2*_map170.size); - int _key171; - List _val172; - for (int _i173 = 0; _i173 < _map170.size; ++_i173) + org.apache.thrift.protocol.TMap _map176 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST, iprot.readI32()); + struct.teams = new HashMap>(2*_map176.size); + int _key177; + List _val178; + for (int _i179 = 0; _i179 < _map176.size; ++_i179) { - _key171 = iprot.readI32(); + _key177 = iprot.readI32(); { - org.apache.thrift.protocol.TList _list174 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - _val172 = new ArrayList(_list174.size); - TeamPosHeroInfo _elem175; - for (int _i176 = 0; _i176 < _list174.size; ++_i176) + org.apache.thrift.protocol.TList _list180 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + _val178 = new ArrayList(_list180.size); + TeamPosHeroInfo _elem181; + for (int _i182 = 0; _i182 < _list180.size; ++_i182) { - _elem175 = new TeamPosHeroInfo(); - _elem175.read(iprot); - _val172.add(_elem175); + _elem181 = new TeamPosHeroInfo(); + _elem181.read(iprot); + _val178.add(_elem181); } } - struct.teams.put(_key171, _val172); + struct.teams.put(_key177, _val178); } } struct.setTeamsIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map177 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.heros = new HashMap(2*_map177.size); - String _key178; - ArenaOfHero _val179; - for (int _i180 = 0; _i180 < _map177.size; ++_i180) + org.apache.thrift.protocol.TMap _map183 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.heros = new HashMap(2*_map183.size); + String _key184; + ArenaOfHero _val185; + for (int _i186 = 0; _i186 < _map183.size; ++_i186) { - _key178 = iprot.readString(); - _val179 = new ArenaOfHero(); - _val179.read(iprot); - struct.heros.put(_key178, _val179); + _key184 = iprot.readString(); + _val185 = new ArenaOfHero(); + _val185.read(iprot); + struct.heros.put(_key184, _val185); } } struct.setHerosIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map181 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.jewels = new HashMap(2*_map181.size); - String _key182; - PropertyItem _val183; - for (int _i184 = 0; _i184 < _map181.size; ++_i184) + org.apache.thrift.protocol.TMap _map187 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.jewels = new HashMap(2*_map187.size); + String _key188; + PropertyItem _val189; + for (int _i190 = 0; _i190 < _map187.size; ++_i190) { - _key182 = iprot.readString(); - _val183 = new PropertyItem(); - _val183.read(iprot); - struct.jewels.put(_key182, _val183); + _key188 = iprot.readString(); + _val189 = new PropertyItem(); + _val189.read(iprot); + struct.jewels.put(_key188, _val189); } } struct.setJewelsIsSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map185 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.totalForceByTeam = new HashMap(2*_map185.size); - int _key186; - int _val187; - for (int _i188 = 0; _i188 < _map185.size; ++_i188) + org.apache.thrift.protocol.TMap _map191 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.totalForceByTeam = new HashMap(2*_map191.size); + int _key192; + int _val193; + for (int _i194 = 0; _i194 < _map191.size; ++_i194) { - _key186 = iprot.readI32(); - _val187 = iprot.readI32(); - struct.totalForceByTeam.put(_key186, _val187); + _key192 = iprot.readI32(); + _val193 = iprot.readI32(); + struct.totalForceByTeam.put(_key192, _val193); } } struct.setTotalForceByTeamIsSet(true); @@ -2374,62 +2518,62 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map189.size); - String _key190; - Pokemon _val191; - for (int _i192 = 0; _i192 < _map189.size; ++_i192) + org.apache.thrift.protocol.TMap _map195 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.pokemons = new HashMap(2*_map195.size); + String _key196; + Pokemon _val197; + for (int _i198 = 0; _i198 < _map195.size; ++_i198) { - _key190 = iprot.readString(); - _val191 = new Pokemon(); - _val191.read(iprot); - struct.pokemons.put(_key190, _val191); + _key196 = iprot.readString(); + _val197 = new Pokemon(); + _val197.read(iprot); + struct.pokemons.put(_key196, _val197); } } struct.setPokemonsIsSet(true); } if (incoming.get(7)) { { - org.apache.thrift.protocol.TMap _map193 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.seals = new HashMap(2*_map193.size); - int _key194; - PurpleMansionSeal _val195; - for (int _i196 = 0; _i196 < _map193.size; ++_i196) + org.apache.thrift.protocol.TMap _map199 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.seals = new HashMap(2*_map199.size); + int _key200; + PurpleMansionSeal _val201; + for (int _i202 = 0; _i202 < _map199.size; ++_i202) { - _key194 = iprot.readI32(); - _val195 = new PurpleMansionSeal(); - _val195.read(iprot); - struct.seals.put(_key194, _val195); + _key200 = iprot.readI32(); + _val201 = new PurpleMansionSeal(); + _val201.read(iprot); + struct.seals.put(_key200, _val201); } } struct.setSealsIsSet(true); } if (incoming.get(8)) { { - org.apache.thrift.protocol.TMap _map197 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.guildSkill = new HashMap(2*_map197.size); - int _key198; - int _val199; - for (int _i200 = 0; _i200 < _map197.size; ++_i200) + org.apache.thrift.protocol.TMap _map203 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.guildSkill = new HashMap(2*_map203.size); + int _key204; + int _val205; + for (int _i206 = 0; _i206 < _map203.size; ++_i206) { - _key198 = iprot.readI32(); - _val199 = iprot.readI32(); - struct.guildSkill.put(_key198, _val199); + _key204 = iprot.readI32(); + _val205 = iprot.readI32(); + struct.guildSkill.put(_key204, _val205); } } struct.setGuildSkillIsSet(true); } if (incoming.get(9)) { { - org.apache.thrift.protocol.TMap _map201 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.pokemonTeamMap = new HashMap(2*_map201.size); - int _key202; - String _val203; - for (int _i204 = 0; _i204 < _map201.size; ++_i204) + org.apache.thrift.protocol.TMap _map207 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.pokemonTeamMap = new HashMap(2*_map207.size); + int _key208; + String _val209; + for (int _i210 = 0; _i210 < _map207.size; ++_i210) { - _key202 = iprot.readI32(); - _val203 = iprot.readString(); - struct.pokemonTeamMap.put(_key202, _val203); + _key208 = iprot.readI32(); + _val209 = iprot.readString(); + struct.pokemonTeamMap.put(_key208, _val209); } } struct.setPokemonTeamMapIsSet(true); @@ -2440,13 +2584,13 @@ public class CrossArenaManager implements org.apache.thrift.TBase(_list205.size); - int _elem206; - for (int _i207 = 0; _i207 < _list205.size; ++_i207) + org.apache.thrift.protocol.TList _list211 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.skill = new ArrayList(_list211.size); + int _elem212; + for (int _i213 = 0; _i213 < _list211.size; ++_i213) { - _elem206 = iprot.readI32(); - struct.skill.add(_elem206); + _elem212 = iprot.readI32(); + struct.skill.add(_elem212); } } struct.setSkillIsSet(true); @@ -2457,15 +2601,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map208.size); - int _key209; - int _val210; - for (int _i211 = 0; _i211 < _map208.size; ++_i211) + org.apache.thrift.protocol.TMap _map214 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.practiceSkillMap = new HashMap(2*_map214.size); + int _key215; + int _val216; + for (int _i217 = 0; _i217 < _map214.size; ++_i217) { - _key209 = iprot.readI32(); - _val210 = iprot.readI32(); - struct.practiceSkillMap.put(_key209, _val210); + _key215 = iprot.readI32(); + _val216 = iprot.readI32(); + struct.practiceSkillMap.put(_key215, _val216); } } struct.setPracticeSkillMapIsSet(true); @@ -2474,6 +2618,21 @@ public class CrossArenaManager implements org.apache.thrift.TBase(2*_map218.size); + int _key219; + int _val220; + for (int _i221 = 0; _i221 < _map218.size; ++_i221) + { + _key219 = iprot.readI32(); + _val220 = iprot.readI32(); + struct.faBaoGongMingSkillMap.put(_key219, _val220); + } + } + struct.setFaBaoGongMingSkillMapIsSet(true); + } } } From dfa218d8ba3b10ecb832e7b039b4f01b58ecf581 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 18 Nov 2021 15:09:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=98=E4=B8=AD?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/hero/HeroAttributeEnum.java | 20 +-- .../ljsd/jieling/logic/hero/HeroLogic.java | 155 +++++++++--------- 2 files changed, 87 insertions(+), 88 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroAttributeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroAttributeEnum.java index 688f357fc..4b2384eb7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroAttributeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroAttributeEnum.java @@ -24,18 +24,18 @@ public enum HeroAttributeEnum { DifferDemonsBocusFactor(66), CurHpExtra(67), CurHpSpecialExtra(68), - PVPDamageBocusFactor(69), - PVPDamageReduceFactor(70), - FireDamageBonusFactor(101), - WindDamageBonusFactor(102), - WaterDamageBonusFactor(103), - LandDamageBonusFactor(104), + PVPDamageBocusFactor(69),//PVP增伤 + PVPDamageReduceFactor(70),//PVP减伤 + RenBonus(101),//灭人 + FoBonus(102),//灭佛 + YaoBonus(103),//灭妖 + DaoBonus(104),//灭道 LightDamageBonusFactor(105), DarkDamageBonusFactor(106), - FireDamageReduceFactor(107), - WindDamageReduceFactor(108), - WaterDamageReduceFactor(109), - LandDamageReduceFactor(110), + RenReduce(107),//抗人 + FoReduce(108),//抗佛 + YaoReduce(109),//抗妖 + DaoReduce(110),//抗道 LightDamageReduceFactor(111), DarkDamageReduceFactor(112), CritDamageReduceFactor(113), // 暴伤减免 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 2471adb60..06dae1322 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -95,22 +95,18 @@ public class HeroLogic { transTemplate.add(HeroAttributeEnum.AntiCritDamageFactor.getPropertyId()); // 抗暴率 transTemplate.add(HeroAttributeEnum.TreatFacter.getPropertyId()); // 治疗加成系数 transTemplate.add(HeroAttributeEnum.CureFacter.getPropertyId()); // 受治疗 -// transTemplate.add(HeroAttributeEnum.PVPDamageBocusFactor.getPropertyId()); // pvp 增伤 -// transTemplate.add(HeroAttributeEnum.PVPDamageReduceFactor.getPropertyId()); // pvp 减伤 - transTemplate.add(HeroAttributeEnum.DifferDemonsBocusFactor.getPropertyId()); // 增加受到的异妖伤害 - transTemplate.add(HeroAttributeEnum.DifferDemonsReduceFactor.getPropertyId()); // 异妖减伤率 -// transTemplate.add(HeroAttributeEnum.FireDamageBonusFactor.getPropertyId()); // 火系伤害加成系数 - transTemplate.add(HeroAttributeEnum.FireDamageReduceFactor.getPropertyId()); // 火系伤害减免系数 -// transTemplate.add(HeroAttributeEnum.WindDamageBonusFactor.getPropertyId()); // 风系伤害加成系数 - transTemplate.add(HeroAttributeEnum.WindDamageReduceFactor.getPropertyId()); // 风系伤害减免系数 -// transTemplate.add(HeroAttributeEnum.WaterDamageBonusFactor.getPropertyId()); // 冰系伤害加成系数 - transTemplate.add(HeroAttributeEnum.WaterDamageReduceFactor.getPropertyId());// 冰系伤害减免系数 -// transTemplate.add(HeroAttributeEnum.LandDamageBonusFactor.getPropertyId()); // 地系伤害加成系数 - transTemplate.add(HeroAttributeEnum.LandDamageReduceFactor.getPropertyId()); // 地系伤害减免系数 -// transTemplate.add(HeroAttributeEnum.LightDamageBonusFactor.getPropertyId()); // 雷系伤害加成系数 - transTemplate.add(HeroAttributeEnum.LightDamageReduceFactor.getPropertyId());// 雷系伤害减免系数 -// transTemplate.add(HeroAttributeEnum.DarkDamageBonusFactor.getPropertyId()); // 暗系伤害加成系数 - transTemplate.add(HeroAttributeEnum.DarkDamageReduceFactor.getPropertyId()); // 暗系伤害减免系数 + + transTemplate.add(HeroAttributeEnum.RenBonus.getPropertyId()); // 人系伤害加成系数 + transTemplate.add(HeroAttributeEnum.FoBonus.getPropertyId()); // 佛系伤害加成系数 + transTemplate.add(HeroAttributeEnum.YaoBonus.getPropertyId()); // 妖系伤害加成系数 + transTemplate.add(HeroAttributeEnum.DaoBonus.getPropertyId()); // 道系伤害加成系数 + + transTemplate.add(HeroAttributeEnum.RenReduce.getPropertyId()); // 人系伤害减免系数 + transTemplate.add(HeroAttributeEnum.FoReduce.getPropertyId()); // 佛系伤害减免系数 + transTemplate.add(HeroAttributeEnum.YaoReduce.getPropertyId());// 妖系伤害减免系数 + transTemplate.add(HeroAttributeEnum.DaoReduce.getPropertyId()); // 道系伤害减免系数 + + transTemplate.add(HeroAttributeEnum.CritDamageReduceFactor.getPropertyId()); // 暴伤减免 transTemplateByHeroPropertyName.put(1, new ArrayList<>(transTemplate)); transTemplateByHeroPropertyName.put(2, new ArrayList<>(transTemplate)); @@ -119,12 +115,6 @@ public class HeroLogic { transTemplateByHeroPropertyName.put(5, new ArrayList<>(transTemplate)); transTemplateByHeroPropertyName.put(6, new ArrayList<>(transTemplate)); - transTemplateByHeroPropertyName.get(1).add(HeroAttributeEnum.FireDamageBonusFactor.getPropertyId()); - transTemplateByHeroPropertyName.get(2).add(HeroAttributeEnum.WindDamageBonusFactor.getPropertyId()); - transTemplateByHeroPropertyName.get(3).add(HeroAttributeEnum.WaterDamageBonusFactor.getPropertyId()); - transTemplateByHeroPropertyName.get(4).add(HeroAttributeEnum.LandDamageBonusFactor.getPropertyId()); - transTemplateByHeroPropertyName.get(5).add(HeroAttributeEnum.LightDamageBonusFactor.getPropertyId()); - transTemplateByHeroPropertyName.get(6).add(HeroAttributeEnum.DarkDamageBonusFactor.getPropertyId()); equipSkillPositionTemaplge.add(1); equipSkillPositionTemaplge.add(2); @@ -3102,66 +3092,75 @@ public class HeroLogic { public int calForce(Map heroAllAttribute) { double result = 0; - // 旧战力计算 -// for(Map.Entry item : heroAllAttribute.entrySet()){ -// Integer propertyId = item.getKey(); -// float propertyValue = item.getValue(); -// if(propertyId == HeroAttributeEnum.EquipForce.getPropertyId()){ -// continue; -// } -// SPropertyConfig sPropertyConfig = SPropertyConfig.getsPropertyConfigByPID(propertyId); -// if(sPropertyConfig.getStyle() == GlobalsDef.PERCENT_TYPE){ -// propertyValue = propertyValue / 100F; -// } -// float score = sPropertyConfig.getScore(); -// -// result += propertyValue*score; -// } + float forceNum=0;//基础值 + float forceAdd=0;//加成值 + //战力计算 + for(Map.Entry item : heroAllAttribute.entrySet()){ + Integer propertyId = item.getKey(); + float propertyValue = item.getValue(); + ///pvp增伤和减伤在计算之前已经算进去了 + if (propertyId==HeroAttributeEnum.PVPDamageBocusFactor.getPropertyId()||propertyId==HeroAttributeEnum.PVPDamageReduceFactor.getPropertyId()){ + continue; + } + SPropertyConfig sPropertyConfig = SPropertyConfig.getsPropertyConfigByPID(propertyId); + if (sPropertyConfig==null){ + continue; + } + if (sPropertyConfig.getScore()==0){ + continue; + } + if(sPropertyConfig.getStyle() == GlobalsDef.PERCENT_TYPE){ + forceAdd += propertyValue*sPropertyConfig.getScore()/10000; + }else{ + forceNum += propertyValue*sPropertyConfig.getScore(); + } + } + result=forceNum+(forceNum*forceAdd); // 新战力计算2021 9 17 // 面板最大生命值 - SPropertyConfig sPropertyConfigHP = SPropertyConfig.getsPropertyConfigByPID(HeroAttributeEnum.Hp.getPropertyId()); - float hpScore = sPropertyConfigHP.getScore(); - SPropertyConfig sPropertyConfigAttack = SPropertyConfig.getsPropertyConfigByPID(HeroAttributeEnum.Attack.getPropertyId()); - float attackScore = sPropertyConfigAttack.getScore(); - SPropertyConfig sPropertyConfigPhysicalDefence = SPropertyConfig.getsPropertyConfigByPID(HeroAttributeEnum.PhysicalDefence.getPropertyId()); - float pdScore = sPropertyConfigPhysicalDefence.getScore(); - SPropertyConfig sPropertyConfigMagicDefence = SPropertyConfig.getsPropertyConfigByPID(HeroAttributeEnum.MagicDefence.getPropertyId()); - float mdScore = sPropertyConfigMagicDefence.getScore(); - - float xishu = 10000; +// SPropertyConfig sPropertyConfigHP = SPropertyConfig.getsPropertyConfigByPID(HeroAttributeEnum.Hp.getPropertyId()); +// float hpScore = sPropertyConfigHP.getScore(); +// SPropertyConfig sPropertyConfigAttack = SPropertyConfig.getsPropertyConfigByPID(HeroAttributeEnum.Attack.getPropertyId()); +// float attackScore = sPropertyConfigAttack.getScore(); +// SPropertyConfig sPropertyConfigPhysicalDefence = SPropertyConfig.getsPropertyConfigByPID(HeroAttributeEnum.PhysicalDefence.getPropertyId()); +// float pdScore = sPropertyConfigPhysicalDefence.getScore(); +// SPropertyConfig sPropertyConfigMagicDefence = SPropertyConfig.getsPropertyConfigByPID(HeroAttributeEnum.MagicDefence.getPropertyId()); +// float mdScore = sPropertyConfigMagicDefence.getScore(); +// +// float xishu = 10000; float finalHp = heroAllAttribute.getOrDefault(HeroAttributeEnum.Hp.getPropertyId(), 0L).floatValue(); - // 面板攻击 - float finalAttack = heroAllAttribute.getOrDefault(HeroAttributeEnum.Attack.getPropertyId(), 0L).floatValue(); - // 面板护甲 - float finalPhysicalDefence = heroAllAttribute.getOrDefault(HeroAttributeEnum.PhysicalDefence.getPropertyId(), 0L).floatValue(); - // 面板魔抗 - float magicDefence = heroAllAttribute.getOrDefault(HeroAttributeEnum.MagicDefence.getPropertyId(), 0L).floatValue(); - // 伤害加成 - float damageBocusFactor = heroAllAttribute.getOrDefault(HeroAttributeEnum.DamageBocusFactor.getPropertyId(), 0L).floatValue(); - // 伤害减免 - float damageReduceFactor = heroAllAttribute.getOrDefault(HeroAttributeEnum.DamageReduceFactor.getPropertyId(), 0L).floatValue(); - // 命中几率 - float hit = heroAllAttribute.getOrDefault(HeroAttributeEnum.Hit.getPropertyId(), 0L).floatValue(); - // 闪避几率 - float dodge = heroAllAttribute.getOrDefault(HeroAttributeEnum.Dodge.getPropertyId(), 0L).floatValue(); - // 暴击几率 - float critFactor = heroAllAttribute.getOrDefault(HeroAttributeEnum.CritFactor.getPropertyId(), 0L).floatValue(); - // 抗暴几率 - float antiCritDamageFactor = heroAllAttribute.getOrDefault(HeroAttributeEnum.AntiCritDamageFactor.getPropertyId(), 0L).floatValue(); - // 暴伤加成 - float critDamageFactor = heroAllAttribute.getOrDefault(HeroAttributeEnum.CritDamageFactor.getPropertyId(), 0L).floatValue(); - // 暴伤减免 - float critDamageReduceFactor = heroAllAttribute.getOrDefault(HeroAttributeEnum.CritDamageReduceFactor.getPropertyId(), 0L).floatValue(); - // 受疗加成 - float cureFacter = heroAllAttribute.getOrDefault(HeroAttributeEnum.CureFacter.getPropertyId(), 0L).floatValue(); - // 治疗加成 - float treatFacter = heroAllAttribute.getOrDefault(HeroAttributeEnum.TreatFacter.getPropertyId(), 0L).floatValue(); - - result = (finalHp * hpScore + finalAttack * attackScore + finalPhysicalDefence * pdScore + magicDefence * mdScore) - * (1 + (damageBocusFactor + damageReduceFactor + hit + dodge + critFactor + - antiCritDamageFactor + critDamageFactor + critDamageReduceFactor + cureFacter + treatFacter) / 2 / xishu); - return (int) result; +// // 面板攻击 +// float finalAttack = heroAllAttribute.getOrDefault(HeroAttributeEnum.Attack.getPropertyId(), 0L).floatValue(); +// // 面板护甲 +// float finalPhysicalDefence = heroAllAttribute.getOrDefault(HeroAttributeEnum.PhysicalDefence.getPropertyId(), 0L).floatValue(); +// // 面板魔抗 +// float magicDefence = heroAllAttribute.getOrDefault(HeroAttributeEnum.MagicDefence.getPropertyId(), 0L).floatValue(); +// // 伤害加成 +// float damageBocusFactor = heroAllAttribute.getOrDefault(HeroAttributeEnum.DamageBocusFactor.getPropertyId(), 0L).floatValue(); +// // 伤害减免 +// float damageReduceFactor = heroAllAttribute.getOrDefault(HeroAttributeEnum.DamageReduceFactor.getPropertyId(), 0L).floatValue(); +// // 命中几率 +// float hit = heroAllAttribute.getOrDefault(HeroAttributeEnum.Hit.getPropertyId(), 0L).floatValue(); +// // 闪避几率 +// float dodge = heroAllAttribute.getOrDefault(HeroAttributeEnum.Dodge.getPropertyId(), 0L).floatValue(); +// // 暴击几率 +// float critFactor = heroAllAttribute.getOrDefault(HeroAttributeEnum.CritFactor.getPropertyId(), 0L).floatValue(); +// // 抗暴几率 +// float antiCritDamageFactor = heroAllAttribute.getOrDefault(HeroAttributeEnum.AntiCritDamageFactor.getPropertyId(), 0L).floatValue(); +// // 暴伤加成 +// float critDamageFactor = heroAllAttribute.getOrDefault(HeroAttributeEnum.CritDamageFactor.getPropertyId(), 0L).floatValue(); +// // 暴伤减免 +// float critDamageReduceFactor = heroAllAttribute.getOrDefault(HeroAttributeEnum.CritDamageReduceFactor.getPropertyId(), 0L).floatValue(); +// // 受疗加成 +// float cureFacter = heroAllAttribute.getOrDefault(HeroAttributeEnum.CureFacter.getPropertyId(), 0L).floatValue(); +// // 治疗加成 +// float treatFacter = heroAllAttribute.getOrDefault(HeroAttributeEnum.TreatFacter.getPropertyId(), 0L).floatValue(); +// +// result = (finalHp * hpScore + finalAttack * attackScore + finalPhysicalDefence * pdScore + magicDefence * mdScore) +// * (1 + (damageBocusFactor + damageReduceFactor + hit + dodge + critFactor + +// antiCritDamageFactor + critDamageFactor + critDamageReduceFactor + cureFacter + treatFacter) / 2 / xishu); + return (int)result; } public void combinedAttribute(Map otherAttriMaop, Map heroAttributeMap) { From 3614aa978a6ec9908462191a3bb78b8b6571a822 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 18 Nov 2021 17:49:18 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E8=81=9A=E7=81=B5?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/hero/HeroLogic.java | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 06dae1322..8f7b104ac 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1970,8 +1970,24 @@ public class HeroLogic { } ///法宝之魂共鸣技能 if (user.getHeroManager().getFaBaoGongMingSkillMap().size()>0) { - List faBaoSoulSkills=new ArrayList<>(user.getHeroManager().getFaBaoGongMingSkillMap().values()); - skillList.addAll(faBaoSoulSkills); + List faBaoSoulSkills=new ArrayList<>(); + for (Map.Entry entry : user.getHeroManager().getFaBaoGongMingSkillMap().entrySet()) { + SXiuXianSkill sXiuXianSkill= STableManager.getConfig(SXiuXianSkill.class).get(entry.getValue()); + if (sXiuXianSkill.getFitList()[0]==0){ + faBaoSoulSkills.add(sXiuXianSkill.getSkillId()); + }else if(sXiuXianSkill.getFitList()[0]==1){ + if (sXiuXianSkill.getFitList()[1]==tempHero.getPropertyName()){ + faBaoSoulSkills.add(sXiuXianSkill.getSkillId()); + } + }else if(sXiuXianSkill.getFitList()[0]==2){ + if (sXiuXianSkill.getFitList()[1]==tempHero.getPropertyName()){ + faBaoSoulSkills.add(sXiuXianSkill.getSkillId()); + } + } + } + if (faBaoSoulSkills.size()>0) { + skillList.addAll(faBaoSoulSkills); + } } return skillList; @@ -2089,8 +2105,24 @@ public class HeroLogic { } ///法宝之魂共鸣技能 if (crossArenaManager.getFaBaoGongMingSkillMap().size()>0) { - List faBaoSoulSkills=new ArrayList<>(crossArenaManager.getFaBaoGongMingSkillMap().values()); - skillList.addAll(faBaoSoulSkills); + List faBaoSoulSkills=new ArrayList<>(); + for (Map.Entry entry : crossArenaManager.getFaBaoGongMingSkillMap().entrySet()) { + SXiuXianSkill sXiuXianSkill= STableManager.getConfig(SXiuXianSkill.class).get(entry.getValue()); + if (sXiuXianSkill.getFitList()[0]==0){ + faBaoSoulSkills.add(sXiuXianSkill.getSkillId()); + }else if(sXiuXianSkill.getFitList()[0]==1){ + if (sXiuXianSkill.getFitList()[1]==tempHero.getPropertyName()){ + faBaoSoulSkills.add(sXiuXianSkill.getSkillId()); + } + }else if(sXiuXianSkill.getFitList()[0]==2){ + if (sXiuXianSkill.getFitList()[1]==tempHero.getPropertyName()){ + faBaoSoulSkills.add(sXiuXianSkill.getSkillId()); + } + } + } + if (faBaoSoulSkills.size()>0) { + skillList.addAll(faBaoSoulSkills); + } } StringBuilder sb = new StringBuilder(); From 889720d392e079573cbabf9637706fef41ff1967 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Fri, 19 Nov 2021 16:42:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E8=81=9A=E7=81=B5?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/hero/HeroLogic.java | 26 ++++++++++++++----- .../src/main/java/config/SXiuXianSkill.java | 10 ++++--- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 67d3ad651..2bb04fffc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1976,14 +1976,20 @@ public class HeroLogic { for (Map.Entry entry : user.getHeroManager().getFaBaoGongMingSkillMap().entrySet()) { SXiuXianSkill sXiuXianSkill= STableManager.getConfig(SXiuXianSkill.class).get(entry.getValue()); if (sXiuXianSkill.getFitList()[0]==0){ - faBaoSoulSkills.add(sXiuXianSkill.getSkillId()); + for (int skillId : sXiuXianSkill.getSkillId()) { + faBaoSoulSkills.add(skillId); + } }else if(sXiuXianSkill.getFitList()[0]==1){ if (sXiuXianSkill.getFitList()[1]==tempHero.getPropertyName()){ - faBaoSoulSkills.add(sXiuXianSkill.getSkillId()); + for (int skillId : sXiuXianSkill.getSkillId()) { + faBaoSoulSkills.add(skillId); + } } }else if(sXiuXianSkill.getFitList()[0]==2){ if (sXiuXianSkill.getFitList()[1]==tempHero.getPropertyName()){ - faBaoSoulSkills.add(sXiuXianSkill.getSkillId()); + for (int skillId : sXiuXianSkill.getSkillId()) { + faBaoSoulSkills.add(skillId); + } } } } @@ -2111,14 +2117,20 @@ public class HeroLogic { for (Map.Entry entry : crossArenaManager.getFaBaoGongMingSkillMap().entrySet()) { SXiuXianSkill sXiuXianSkill= STableManager.getConfig(SXiuXianSkill.class).get(entry.getValue()); if (sXiuXianSkill.getFitList()[0]==0){ - faBaoSoulSkills.add(sXiuXianSkill.getSkillId()); + for (int skillId : sXiuXianSkill.getSkillId()) { + faBaoSoulSkills.add(skillId); + } }else if(sXiuXianSkill.getFitList()[0]==1){ if (sXiuXianSkill.getFitList()[1]==tempHero.getPropertyName()){ - faBaoSoulSkills.add(sXiuXianSkill.getSkillId()); + for (int skillId : sXiuXianSkill.getSkillId()) { + faBaoSoulSkills.add(skillId); + } } }else if(sXiuXianSkill.getFitList()[0]==2){ if (sXiuXianSkill.getFitList()[1]==tempHero.getPropertyName()){ - faBaoSoulSkills.add(sXiuXianSkill.getSkillId()); + for (int skillId : sXiuXianSkill.getSkillId()) { + faBaoSoulSkills.add(skillId); + } } } } @@ -2154,7 +2166,7 @@ public class HeroLogic { private void getPurpleMansionSealSkill(int sealId, SCHero tempHero, List skillList) { SXiuXianSkill xianSkill = STableManager.getConfig(SXiuXianSkill.class).get(sealId); // 技能数组转list - int skillId = xianSkill.getSkillId(); + int skillId = xianSkill.getSkillId()[0]; if (skillId <= 0) { return; } diff --git a/tablemanager/src/main/java/config/SXiuXianSkill.java b/tablemanager/src/main/java/config/SXiuXianSkill.java index ab5d14cef..4eb7e33dc 100644 --- a/tablemanager/src/main/java/config/SXiuXianSkill.java +++ b/tablemanager/src/main/java/config/SXiuXianSkill.java @@ -15,9 +15,11 @@ public class SXiuXianSkill implements BaseConfig { private int[] fitList; - private int skillId; - - @Override + private int[]skillId; + + + + @Override public void init() throws Exception { } @@ -35,7 +37,7 @@ public class SXiuXianSkill implements BaseConfig { return fitList; } - public int getSkillId() { + public int[] getSkillId() { return skillId; } } \ No newline at end of file