From b0d4de5917264bc6f1f90daf7a3a087877ff7e13 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 28 Oct 2021 15:32:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=A8=E6=9C=8D=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=A5=9E=E5=B0=86=E7=A5=9E=E9=AD=82=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/CoreService.java | 1 + .../crossService/CrossServiceLogic.java | 1 + .../jieling/logic/dao/gm/ArenaOfHero.java | 9 ++ .../jieling/logic/player/PlayerLogic.java | 2 + .../ljsd/jieling/thrift/idl/ArenaOfHero.java | 110 +++++++++++++++++- .../com/ljsd/jieling/util/CBean2Proto.java | 1 + serverlogic/src/main/thrift/idl/core.thrift | 1 + .../ljsd/jieling/thrift/idl/ArenaOfHero.java | 110 +++++++++++++++++- 8 files changed, 225 insertions(+), 10 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index 2a5085881..d81cbe4bf 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -237,6 +237,7 @@ public class CoreService implements RPCRequestIFace.Iface { arenaOfHero.setCreateTime(hero.getCreateType()); arenaOfHero.setChangeId(hero.getChangeId()); arenaOfHero.setSkin(hero.getSkin()); + arenaOfHero.setGodSoulLv(hero.getGodSoulLv()); for (Map.Entry> entry : teamMap.entrySet()) { Integer teamId = entry.getKey(); List teamList = entry.getValue(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java index 14f758a9d..96879af5c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java @@ -241,6 +241,7 @@ public class CrossServiceLogic { arenaOfHero.setCreateTime(hero.getCreateType()); arenaOfHero.setChangeId(hero.getChangeId()); arenaOfHero.setSkin(hero.getSkin()); + arenaOfHero.setGodSoulLv(hero.getGodSoulLv()); for (Map.Entry> entry : teamMap.entrySet()) { Integer teamId = entry.getKey(); List teamList = entry.getValue(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfHero.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfHero.java index b06932eda..bb336554b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfHero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfHero.java @@ -25,6 +25,7 @@ public class ArenaOfHero { private int createType; private int changeId; private int skin; + private int godSoulLv;//神魂等级 private Set jewelInfo = new HashSet<>(); private Map attributeMap = new HashMap<>(); private Map> attributeMapByTeam = new HashMap<>(); @@ -167,4 +168,12 @@ public class ArenaOfHero { public void setSkin(int skin) { this.skin = skin; } + + public int getGodSoulLv() { + return godSoulLv; + } + + public void setGodSoulLv(int godSoulLv) { + this.godSoulLv = godSoulLv; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index ca60cb314..7239f9288 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1077,6 +1077,7 @@ public class PlayerLogic { .setStar(hero.getStar()) .setPosition(heroInfo.getPosition()) .setSkinId(hero.getSkin()) + .setGodSoulLv(hero.getGodSoulLv()) .build()); } } @@ -1157,6 +1158,7 @@ public class PlayerLogic { .setStar(hero.getStar()) .setPosition(heroInfo.getPosition()) .setSkinId(hero.getSkin()) + .setGodSoulLv(hero.getGodSoulLv()) .build()); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java index c006af38c..2eb006953 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-28") public class ArenaOfHero implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArenaOfHero"); @@ -55,6 +55,7 @@ public class ArenaOfHero implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -79,6 +80,7 @@ public class ArenaOfHero implements org.apache.thrift.TBase attributeMap; // optional public Map> attributeMapByTeam; // optional public Map> attributeMapByTeamBattle; // optional + public int godSoulLv; // 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 { @@ -98,7 +100,8 @@ public class ArenaOfHero implements org.apache.thrift.TBase byName = new HashMap(); @@ -147,6 +150,8 @@ public class ArenaOfHero 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); @@ -251,6 +257,8 @@ public class ArenaOfHero implements org.apache.thrift.TBase attributeMap; 16:optional map> attributeMapByTeam ; 17:optional map> attributeMapByTeamBattle ; + 18:optional i32 godSoulLv;//神魂等级 } struct PropertyItem { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java index c006af38c..2eb006953 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-28") public class ArenaOfHero implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArenaOfHero"); @@ -55,6 +55,7 @@ public class ArenaOfHero implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -79,6 +80,7 @@ public class ArenaOfHero implements org.apache.thrift.TBase attributeMap; // optional public Map> attributeMapByTeam; // optional public Map> attributeMapByTeamBattle; // optional + public int godSoulLv; // 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 { @@ -98,7 +100,8 @@ public class ArenaOfHero implements org.apache.thrift.TBase byName = new HashMap(); @@ -147,6 +150,8 @@ public class ArenaOfHero 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); @@ -251,6 +257,8 @@ public class ArenaOfHero implements org.apache.thrift.TBase