diff --git a/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java b/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java
index 9b52ebd86..ec07681fb 100644
--- a/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java
+++ b/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Structs can also be exceptions, if they are nasty.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase<InnerInvalidOperException, InnerInvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InnerInvalidOperException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException");
 
diff --git a/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java b/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java
index 99f73adc6..ab1b7473e 100644
--- a/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java
+++ b/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InnerResult implements org.apache.thrift.TBase<InnerResult, InnerResult._Fields>, java.io.Serializable, Cloneable, Comparable<InnerResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult");
 
diff --git a/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java b/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java
index 042f33b4f..468d4b58c 100644
--- a/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java
+++ b/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCgTGRequestIFace {
 
   public interface Iface {
diff --git a/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java
index 9b52ebd86..ec07681fb 100644
--- a/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java
+++ b/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Structs can also be exceptions, if they are nasty.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase<InnerInvalidOperException, InnerInvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InnerInvalidOperException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException");
 
diff --git a/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java b/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java
index 99f73adc6..ab1b7473e 100644
--- a/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java
+++ b/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InnerResult implements org.apache.thrift.TBase<InnerResult, InnerResult._Fields>, java.io.Serializable, Cloneable, Comparable<InnerResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult");
 
diff --git a/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java b/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java
index 042f33b4f..468d4b58c 100644
--- a/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java
+++ b/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCgTGRequestIFace {
 
   public interface Iface {
diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java
index 90de50a57..c81bd719b 100644
--- a/serverlogic/src/main/java/com/ljsd/CoreService.java
+++ b/serverlogic/src/main/java/com/ljsd/CoreService.java
@@ -187,6 +187,7 @@ public class CoreService implements RPCRequestIFace.Iface {
             rpcArenaManager.setTreeLevel(user.getPlayerInfoManager().getTreeLevel());
             //坐骑技能
             rpcArenaManager.setSkill(Arrays.asList(user.getPlayerInfoManager().getUserMountValidTime().keySet().toArray(new Integer[0])));
+            rpcArenaManager.setFourSpirit(user.getPlayerInfoManager().getFourChallengeTotal());
             return rpcArenaManager;
         }catch (Exception e){
 
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java
index f5a64ea71..b1557f852 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java
@@ -367,9 +367,18 @@ public class CrossYuxulundaoLogic {
 
 
     public static CommonProto.crossYxldPlayerRecordInfo getCrossYxldPlayerRecordInfo(int uid,ArenaRecord arenaRecord,boolean isSend) throws Exception {
-        CommonProto.FightData fightDataProto1 = CommonProto.FightData.parseFrom(arenaRecord.getYxldFightData1());
-        CommonProto.FightData fightDataProto2 = CommonProto.FightData.parseFrom(arenaRecord.getYxldFightData2());
-        CommonProto.FightData fightDataProto3 = CommonProto.FightData.parseFrom(arenaRecord.getYxldFightData3());
+        CommonProto.FightData fightDataProto1 = null;
+        CommonProto.FightData fightDataProto2 = null;
+        CommonProto.FightData fightDataProto3 = null;
+        if(arenaRecord.getYxldFightData1() != null){
+            fightDataProto1 = CommonProto.FightData.parseFrom(arenaRecord.getYxldFightData1());
+        }
+        if(arenaRecord.getYxldFightData2() != null){
+            fightDataProto2 = CommonProto.FightData.parseFrom(arenaRecord.getYxldFightData2());
+        }
+        if(arenaRecord.getYxldFightData3() != null){
+            fightDataProto3 = CommonProto.FightData.parseFrom(arenaRecord.getYxldFightData3());
+        }
         List<Integer> result = null;//
         if (arenaRecord.getYxldResult() == null) {
             result = new ArrayList<Integer>();
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 29f76a8b1..583b93860 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
@@ -1334,7 +1334,7 @@ public class PlayerLogic {
         Map<String, com.ljsd.jieling.thrift.idl.PropertyItem> jewels = crossArenaManager.getJewels();
         for(String equipId :  rpcHero.getJewelInfo()){
             heroBuilder.addJewels(equipId);
-            builder.addEquip(CBean2Proto.getEquipProto(jewels.get(equipId),crossArenaManager.getTreeLevel()));
+            builder.addEquip(CBean2Proto.getEquipProto(jewels.get(equipId),crossArenaManager.getTreeLevel(),crossArenaManager.getFourSpirit()));
         }
         // 装备
         for(int equipId : rpcHero.getEquipByPositionMap().values()){
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java
index b4ee06530..30fe89aa8 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-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOfHero._Fields>, java.io.Serializable, Cloneable, Comparable<ArenaOfHero> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArenaOfHero");
 
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 134b7bb49..934e03407 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-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaManager, CrossArenaManager._Fields>, java.io.Serializable, Cloneable, Comparable<CrossArenaManager> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CrossArenaManager");
 
@@ -50,6 +50,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
   private static final org.apache.thrift.protocol.TField POKEMON_TEAM_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("pokemonTeamMap", org.apache.thrift.protocol.TType.MAP, (short)10);
   private static final org.apache.thrift.protocol.TField TREE_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("treeLevel", org.apache.thrift.protocol.TType.I32, (short)11);
   private static final org.apache.thrift.protocol.TField SKILL_FIELD_DESC = new org.apache.thrift.protocol.TField("skill", org.apache.thrift.protocol.TType.LIST, (short)12);
+  private static final org.apache.thrift.protocol.TField FOUR_SPIRIT_FIELD_DESC = new org.apache.thrift.protocol.TField("fourSpirit", org.apache.thrift.protocol.TType.I32, (short)13);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -69,6 +70,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
   public Map<Integer,String> pokemonTeamMap; // optional
   public int treeLevel; // optional
   public List<Integer> skill; // optional
+  public int fourSpirit; // 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 {
@@ -83,7 +85,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
     GUILD_SKILL((short)9, "guildSkill"),
     POKEMON_TEAM_MAP((short)10, "pokemonTeamMap"),
     TREE_LEVEL((short)11, "treeLevel"),
-    SKILL((short)12, "skill");
+    SKILL((short)12, "skill"),
+    FOUR_SPIRIT((short)13, "fourSpirit");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -122,6 +125,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
           return TREE_LEVEL;
         case 12: // SKILL
           return SKILL;
+        case 13: // FOUR_SPIRIT
+          return FOUR_SPIRIT;
         default:
           return null;
       }
@@ -165,8 +170,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
   private static final int __TOTALFORCE_ISSET_ID = 0;
   private static final int __YXLDFORCE_ISSET_ID = 1;
   private static final int __TREELEVEL_ISSET_ID = 2;
+  private static final int __FOURSPIRIT_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.TEAMS,_Fields.HEROS,_Fields.JEWELS,_Fields.TOTAL_FORCE_BY_TEAM,_Fields.TOTAL_FORCE,_Fields.YXLD_FORCE,_Fields.POKEMONS,_Fields.SEALS,_Fields.GUILD_SKILL,_Fields.POKEMON_TEAM_MAP,_Fields.TREE_LEVEL,_Fields.SKILL};
+  private static final _Fields optionals[] = {_Fields.TEAMS,_Fields.HEROS,_Fields.JEWELS,_Fields.TOTAL_FORCE_BY_TEAM,_Fields.TOTAL_FORCE,_Fields.YXLD_FORCE,_Fields.POKEMONS,_Fields.SEALS,_Fields.GUILD_SKILL,_Fields.POKEMON_TEAM_MAP,_Fields.TREE_LEVEL,_Fields.SKILL,_Fields.FOUR_SPIRIT};
   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);
@@ -212,6 +218,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
     tmpMap.put(_Fields.SKILL, new org.apache.thrift.meta_data.FieldMetaData("skill", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
+    tmpMap.put(_Fields.FOUR_SPIRIT, new org.apache.thrift.meta_data.FieldMetaData("fourSpirit", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CrossArenaManager.class, metaDataMap);
   }
@@ -321,6 +329,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
       List<Integer> __this__skill = new ArrayList<Integer>(other.skill);
       this.skill = __this__skill;
     }
+    this.fourSpirit = other.fourSpirit;
   }
 
   public CrossArenaManager deepCopy() {
@@ -344,6 +353,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
     setTreeLevelIsSet(false);
     this.treeLevel = 0;
     this.skill = null;
+    setFourSpiritIsSet(false);
+    this.fourSpirit = 0;
   }
 
   public int getTeamsSize() {
@@ -734,6 +745,29 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
     }
   }
 
+  public int getFourSpirit() {
+    return this.fourSpirit;
+  }
+
+  public CrossArenaManager setFourSpirit(int fourSpirit) {
+    this.fourSpirit = fourSpirit;
+    setFourSpiritIsSet(true);
+    return this;
+  }
+
+  public void unsetFourSpirit() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FOURSPIRIT_ISSET_ID);
+  }
+
+  /** Returns true if field fourSpirit is set (has been assigned a value) and false otherwise */
+  public boolean isSetFourSpirit() {
+    return EncodingUtils.testBit(__isset_bitfield, __FOURSPIRIT_ISSET_ID);
+  }
+
+  public void setFourSpiritIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FOURSPIRIT_ISSET_ID, value);
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case TEAMS:
@@ -832,6 +866,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
       }
       break;
 
+    case FOUR_SPIRIT:
+      if (value == null) {
+        unsetFourSpirit();
+      } else {
+        setFourSpirit((Integer)value);
+      }
+      break;
+
     }
   }
 
@@ -873,6 +915,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
     case SKILL:
       return getSkill();
 
+    case FOUR_SPIRIT:
+      return Integer.valueOf(getFourSpirit());
+
     }
     throw new IllegalStateException();
   }
@@ -908,6 +953,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
       return isSetTreeLevel();
     case SKILL:
       return isSetSkill();
+    case FOUR_SPIRIT:
+      return isSetFourSpirit();
     }
     throw new IllegalStateException();
   }
@@ -1033,6 +1080,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
         return false;
     }
 
+    boolean this_present_fourSpirit = true && this.isSetFourSpirit();
+    boolean that_present_fourSpirit = true && that.isSetFourSpirit();
+    if (this_present_fourSpirit || that_present_fourSpirit) {
+      if (!(this_present_fourSpirit && that_present_fourSpirit))
+        return false;
+      if (this.fourSpirit != that.fourSpirit)
+        return false;
+    }
+
     return true;
   }
 
@@ -1100,6 +1156,11 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
     if (present_skill)
       list.add(skill);
 
+    boolean present_fourSpirit = true && (isSetFourSpirit());
+    list.add(present_fourSpirit);
+    if (present_fourSpirit)
+      list.add(fourSpirit);
+
     return list.hashCode();
   }
 
@@ -1231,6 +1292,16 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetFourSpirit()).compareTo(other.isSetFourSpirit());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetFourSpirit()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fourSpirit, other.fourSpirit);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -1358,6 +1429,12 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
       }
       first = false;
     }
+    if (isSetFourSpirit()) {
+      if (!first) sb.append(", ");
+      sb.append("fourSpirit:");
+      sb.append(this.fourSpirit);
+      first = false;
+    }
     sb.append(")");
     return sb.toString();
   }
@@ -1620,6 +1697,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 13: // FOUR_SPIRIT
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.fourSpirit = iprot.readI32();
+              struct.setFourSpiritIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -1791,6 +1876,11 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
           oprot.writeFieldEnd();
         }
       }
+      if (struct.isSetFourSpirit()) {
+        oprot.writeFieldBegin(FOUR_SPIRIT_FIELD_DESC);
+        oprot.writeI32(struct.fourSpirit);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1845,7 +1935,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
       if (struct.isSetSkill()) {
         optionals.set(11);
       }
-      oprot.writeBitSet(optionals, 12);
+      if (struct.isSetFourSpirit()) {
+        optionals.set(12);
+      }
+      oprot.writeBitSet(optionals, 13);
       if (struct.isSetTeams()) {
         {
           oprot.writeI32(struct.teams.size());
@@ -1950,12 +2043,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
           }
         }
       }
+      if (struct.isSetFourSpirit()) {
+        oprot.writeI32(struct.fourSpirit);
+      }
     }
 
     @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(12);
+      BitSet incoming = iprot.readBitSet(13);
       if (incoming.get(0)) {
         {
           org.apache.thrift.protocol.TMap _map144 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
@@ -2115,6 +2211,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
         }
         struct.setSkillIsSet(true);
       }
+      if (incoming.get(12)) {
+        struct.fourSpirit = iprot.readI32();
+        struct.setFourSpiritIsSet(true);
+      }
     }
   }
 
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java
index 1f02c2ffd..f1ab95dcf 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Structs can also be exceptions, if they are nasty.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InvalidOperException extends TException implements org.apache.thrift.TBase<InvalidOperException, InvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidOperException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidOperException");
 
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java
index 599fc7db7..bf77d05f0 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class Pokemon implements org.apache.thrift.TBase<Pokemon, Pokemon._Fields>, java.io.Serializable, Cloneable, Comparable<Pokemon> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Pokemon");
 
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java
index 507f71384..5b9f7b8c4 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, PropertyItem._Fields>, java.io.Serializable, Cloneable, Comparable<PropertyItem> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PropertyItem");
 
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java
index 72f808430..b3df64c59 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.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-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class PurpleMansionSeal implements org.apache.thrift.TBase<PurpleMansionSeal, PurpleMansionSeal._Fields>, java.io.Serializable, Cloneable, Comparable<PurpleMansionSeal> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PurpleMansionSeal");
 
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java
index 44add01b2..df23f9fdb 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCMatchRequestIFace {
 
   public interface Iface {
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java
index c36bb6790..c6e43bbe3 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCRequestIFace {
 
   public interface Iface {
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java
index bb9fc3234..3e4e2af53 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RechargeResult implements org.apache.thrift.TBase<RechargeResult, RechargeResult._Fields>, java.io.Serializable, Cloneable, Comparable<RechargeResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RechargeResult");
 
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java
index ce6541baa..8c919d65d 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class Result implements org.apache.thrift.TBase<Result, Result._Fields>, java.io.Serializable, Cloneable, Comparable<Result> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Result");
 
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java
index dd127d855..80e3be528 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 /**
  * ArenaOfHeroManager 结构体
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class TeamPosHeroInfo implements org.apache.thrift.TBase<TeamPosHeroInfo, TeamPosHeroInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TeamPosHeroInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TeamPosHeroInfo");
 
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
index b891103d4..b1c29280e 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
@@ -516,13 +516,14 @@ public class CBean2Proto {
         if(equip instanceof Jewel){//tempEquip.getLevelByHongMeng(user.getHeroManager(),heroId
             Jewel tempEquip =(Jewel)equip;
             equipProto.setRebuildLevel(tempEquip.getBuildLevel())
-                    .setExp(tempEquip.getLevelByHongMeng(user.getHeroManager(),heroId)).setTreeLv(user.getPlayerInfoManager().getTreeLevel());
+                    .setExp(tempEquip.getLevelByHongMeng(user.getHeroManager(),heroId)).setTreeLv(user.getPlayerInfoManager().getTreeLevel())
+                    .setFourSpirit(user.getPlayerInfoManager().getFourChallengeTotal());
         }
         return equipProto.build();
     }
 
     //玉虚论道
-    public static CommonProto.Equip getEquipProto(com.ljsd.jieling.thrift.idl.PropertyItem equip,int treeLv){
+    public static CommonProto.Equip getEquipProto(com.ljsd.jieling.thrift.idl.PropertyItem equip,int treeLv,int fourSpirit){
         //前端读表
         // Map<Integer, Integer> propertyValueByIdMap = equip.getPropertyValueByIdMap();
         Map<Integer, Long> secondValueByIdMap = equip.getSecondValueByIdMap();
@@ -533,7 +534,8 @@ public class CBean2Proto {
                 .setRebuildLevel(equip.getRebuildLevel())
                 .setExp(equip.getLevel())
                 .setCreateTime(equip.getCreateTime())
-                .setIsLocked(equip.getIsLocked());
+                .setIsLocked(equip.getIsLocked())
+                .setFourSpirit(fourSpirit);
 
         //if(equip instanceof Jewel){
             //Jewel tempEquip =(Jewel)equip;
diff --git a/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java
index 86a2107ad..d97d54c6c 100644
--- a/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java
+++ b/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Structs can also be exceptions, if they are nasty.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase<InnerInvalidOperException, InnerInvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InnerInvalidOperException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException");
 
diff --git a/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java b/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java
index e1c7fa73e..a7142f619 100644
--- a/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java
+++ b/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InnerResult implements org.apache.thrift.TBase<InnerResult, InnerResult._Fields>, java.io.Serializable, Cloneable, Comparable<InnerResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult");
 
diff --git a/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java b/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java
index fbd278ec9..582550b26 100644
--- a/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java
+++ b/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCgTwRequestIFace {
 
   public interface Iface {
diff --git a/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java b/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java
index 1376beb0c..4d8083680 100644
--- a/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java
+++ b/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCwTgRequestIFace {
 
   public interface Iface {
diff --git a/serverlogic/src/main/thrift/idl/core.thrift b/serverlogic/src/main/thrift/idl/core.thrift
index d2f9b0e5c..cdb4b44fa 100644
--- a/serverlogic/src/main/thrift/idl/core.thrift
+++ b/serverlogic/src/main/thrift/idl/core.thrift
@@ -87,6 +87,7 @@ struct CrossArenaManager{
 	10:optional map<i32,string> pokemonTeamMap;//上阵的灵兽
 	11:optional i32 treeLevel;
 	12:optional list<i32> skill;//坐骑的技能id
+	13:optional i32 fourSpirit;
 	
 }
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java
index 9b52ebd86..ec07681fb 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Structs can also be exceptions, if they are nasty.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase<InnerInvalidOperException, InnerInvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InnerInvalidOperException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException");
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java
index 99f73adc6..ab1b7473e 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InnerResult implements org.apache.thrift.TBase<InnerResult, InnerResult._Fields>, java.io.Serializable, Cloneable, Comparable<InnerResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult");
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java
index 042f33b4f..468d4b58c 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCgTGRequestIFace {
 
   public interface Iface {
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java
index b4ee06530..30fe89aa8 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-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class ArenaOfHero implements org.apache.thrift.TBase<ArenaOfHero, ArenaOfHero._Fields>, java.io.Serializable, Cloneable, Comparable<ArenaOfHero> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArenaOfHero");
 
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 134b7bb49..934e03407 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-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaManager, CrossArenaManager._Fields>, java.io.Serializable, Cloneable, Comparable<CrossArenaManager> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CrossArenaManager");
 
@@ -50,6 +50,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
   private static final org.apache.thrift.protocol.TField POKEMON_TEAM_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("pokemonTeamMap", org.apache.thrift.protocol.TType.MAP, (short)10);
   private static final org.apache.thrift.protocol.TField TREE_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("treeLevel", org.apache.thrift.protocol.TType.I32, (short)11);
   private static final org.apache.thrift.protocol.TField SKILL_FIELD_DESC = new org.apache.thrift.protocol.TField("skill", org.apache.thrift.protocol.TType.LIST, (short)12);
+  private static final org.apache.thrift.protocol.TField FOUR_SPIRIT_FIELD_DESC = new org.apache.thrift.protocol.TField("fourSpirit", org.apache.thrift.protocol.TType.I32, (short)13);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -69,6 +70,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
   public Map<Integer,String> pokemonTeamMap; // optional
   public int treeLevel; // optional
   public List<Integer> skill; // optional
+  public int fourSpirit; // 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 {
@@ -83,7 +85,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
     GUILD_SKILL((short)9, "guildSkill"),
     POKEMON_TEAM_MAP((short)10, "pokemonTeamMap"),
     TREE_LEVEL((short)11, "treeLevel"),
-    SKILL((short)12, "skill");
+    SKILL((short)12, "skill"),
+    FOUR_SPIRIT((short)13, "fourSpirit");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -122,6 +125,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
           return TREE_LEVEL;
         case 12: // SKILL
           return SKILL;
+        case 13: // FOUR_SPIRIT
+          return FOUR_SPIRIT;
         default:
           return null;
       }
@@ -165,8 +170,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
   private static final int __TOTALFORCE_ISSET_ID = 0;
   private static final int __YXLDFORCE_ISSET_ID = 1;
   private static final int __TREELEVEL_ISSET_ID = 2;
+  private static final int __FOURSPIRIT_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.TEAMS,_Fields.HEROS,_Fields.JEWELS,_Fields.TOTAL_FORCE_BY_TEAM,_Fields.TOTAL_FORCE,_Fields.YXLD_FORCE,_Fields.POKEMONS,_Fields.SEALS,_Fields.GUILD_SKILL,_Fields.POKEMON_TEAM_MAP,_Fields.TREE_LEVEL,_Fields.SKILL};
+  private static final _Fields optionals[] = {_Fields.TEAMS,_Fields.HEROS,_Fields.JEWELS,_Fields.TOTAL_FORCE_BY_TEAM,_Fields.TOTAL_FORCE,_Fields.YXLD_FORCE,_Fields.POKEMONS,_Fields.SEALS,_Fields.GUILD_SKILL,_Fields.POKEMON_TEAM_MAP,_Fields.TREE_LEVEL,_Fields.SKILL,_Fields.FOUR_SPIRIT};
   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);
@@ -212,6 +218,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
     tmpMap.put(_Fields.SKILL, new org.apache.thrift.meta_data.FieldMetaData("skill", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
+    tmpMap.put(_Fields.FOUR_SPIRIT, new org.apache.thrift.meta_data.FieldMetaData("fourSpirit", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CrossArenaManager.class, metaDataMap);
   }
@@ -321,6 +329,7 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
       List<Integer> __this__skill = new ArrayList<Integer>(other.skill);
       this.skill = __this__skill;
     }
+    this.fourSpirit = other.fourSpirit;
   }
 
   public CrossArenaManager deepCopy() {
@@ -344,6 +353,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
     setTreeLevelIsSet(false);
     this.treeLevel = 0;
     this.skill = null;
+    setFourSpiritIsSet(false);
+    this.fourSpirit = 0;
   }
 
   public int getTeamsSize() {
@@ -734,6 +745,29 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
     }
   }
 
+  public int getFourSpirit() {
+    return this.fourSpirit;
+  }
+
+  public CrossArenaManager setFourSpirit(int fourSpirit) {
+    this.fourSpirit = fourSpirit;
+    setFourSpiritIsSet(true);
+    return this;
+  }
+
+  public void unsetFourSpirit() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FOURSPIRIT_ISSET_ID);
+  }
+
+  /** Returns true if field fourSpirit is set (has been assigned a value) and false otherwise */
+  public boolean isSetFourSpirit() {
+    return EncodingUtils.testBit(__isset_bitfield, __FOURSPIRIT_ISSET_ID);
+  }
+
+  public void setFourSpiritIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FOURSPIRIT_ISSET_ID, value);
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case TEAMS:
@@ -832,6 +866,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
       }
       break;
 
+    case FOUR_SPIRIT:
+      if (value == null) {
+        unsetFourSpirit();
+      } else {
+        setFourSpirit((Integer)value);
+      }
+      break;
+
     }
   }
 
@@ -873,6 +915,9 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
     case SKILL:
       return getSkill();
 
+    case FOUR_SPIRIT:
+      return Integer.valueOf(getFourSpirit());
+
     }
     throw new IllegalStateException();
   }
@@ -908,6 +953,8 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
       return isSetTreeLevel();
     case SKILL:
       return isSetSkill();
+    case FOUR_SPIRIT:
+      return isSetFourSpirit();
     }
     throw new IllegalStateException();
   }
@@ -1033,6 +1080,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
         return false;
     }
 
+    boolean this_present_fourSpirit = true && this.isSetFourSpirit();
+    boolean that_present_fourSpirit = true && that.isSetFourSpirit();
+    if (this_present_fourSpirit || that_present_fourSpirit) {
+      if (!(this_present_fourSpirit && that_present_fourSpirit))
+        return false;
+      if (this.fourSpirit != that.fourSpirit)
+        return false;
+    }
+
     return true;
   }
 
@@ -1100,6 +1156,11 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
     if (present_skill)
       list.add(skill);
 
+    boolean present_fourSpirit = true && (isSetFourSpirit());
+    list.add(present_fourSpirit);
+    if (present_fourSpirit)
+      list.add(fourSpirit);
+
     return list.hashCode();
   }
 
@@ -1231,6 +1292,16 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetFourSpirit()).compareTo(other.isSetFourSpirit());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetFourSpirit()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fourSpirit, other.fourSpirit);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -1358,6 +1429,12 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
       }
       first = false;
     }
+    if (isSetFourSpirit()) {
+      if (!first) sb.append(", ");
+      sb.append("fourSpirit:");
+      sb.append(this.fourSpirit);
+      first = false;
+    }
     sb.append(")");
     return sb.toString();
   }
@@ -1620,6 +1697,14 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 13: // FOUR_SPIRIT
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.fourSpirit = iprot.readI32();
+              struct.setFourSpiritIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -1791,6 +1876,11 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
           oprot.writeFieldEnd();
         }
       }
+      if (struct.isSetFourSpirit()) {
+        oprot.writeFieldBegin(FOUR_SPIRIT_FIELD_DESC);
+        oprot.writeI32(struct.fourSpirit);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1845,7 +1935,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
       if (struct.isSetSkill()) {
         optionals.set(11);
       }
-      oprot.writeBitSet(optionals, 12);
+      if (struct.isSetFourSpirit()) {
+        optionals.set(12);
+      }
+      oprot.writeBitSet(optionals, 13);
       if (struct.isSetTeams()) {
         {
           oprot.writeI32(struct.teams.size());
@@ -1950,12 +2043,15 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
           }
         }
       }
+      if (struct.isSetFourSpirit()) {
+        oprot.writeI32(struct.fourSpirit);
+      }
     }
 
     @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(12);
+      BitSet incoming = iprot.readBitSet(13);
       if (incoming.get(0)) {
         {
           org.apache.thrift.protocol.TMap _map144 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
@@ -2115,6 +2211,10 @@ public class CrossArenaManager implements org.apache.thrift.TBase<CrossArenaMana
         }
         struct.setSkillIsSet(true);
       }
+      if (incoming.get(12)) {
+        struct.fourSpirit = iprot.readI32();
+        struct.setFourSpiritIsSet(true);
+      }
     }
   }
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java
index 1f02c2ffd..f1ab95dcf 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Structs can also be exceptions, if they are nasty.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InvalidOperException extends TException implements org.apache.thrift.TBase<InvalidOperException, InvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidOperException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidOperException");
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java
index 599fc7db7..bf77d05f0 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class Pokemon implements org.apache.thrift.TBase<Pokemon, Pokemon._Fields>, java.io.Serializable, Cloneable, Comparable<Pokemon> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Pokemon");
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java
index 507f71384..5b9f7b8c4 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class PropertyItem implements org.apache.thrift.TBase<PropertyItem, PropertyItem._Fields>, java.io.Serializable, Cloneable, Comparable<PropertyItem> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PropertyItem");
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java
index 72f808430..b3df64c59 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.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-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class PurpleMansionSeal implements org.apache.thrift.TBase<PurpleMansionSeal, PurpleMansionSeal._Fields>, java.io.Serializable, Cloneable, Comparable<PurpleMansionSeal> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PurpleMansionSeal");
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java
index 44add01b2..df23f9fdb 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCMatchRequestIFace {
 
   public interface Iface {
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java
index c36bb6790..c6e43bbe3 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCRequestIFace {
 
   public interface Iface {
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java
index bb9fc3234..3e4e2af53 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RechargeResult implements org.apache.thrift.TBase<RechargeResult, RechargeResult._Fields>, java.io.Serializable, Cloneable, Comparable<RechargeResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RechargeResult");
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java
index ce6541baa..8c919d65d 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class Result implements org.apache.thrift.TBase<Result, Result._Fields>, java.io.Serializable, Cloneable, Comparable<Result> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Result");
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java
index dd127d855..80e3be528 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 /**
  * ArenaOfHeroManager 结构体
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class TeamPosHeroInfo implements org.apache.thrift.TBase<TeamPosHeroInfo, TeamPosHeroInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TeamPosHeroInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TeamPosHeroInfo");
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java
index 86a2107ad..d97d54c6c 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Structs can also be exceptions, if they are nasty.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase<InnerInvalidOperException, InnerInvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InnerInvalidOperException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException");
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java
index e1c7fa73e..a7142f619 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InnerResult implements org.apache.thrift.TBase<InnerResult, InnerResult._Fields>, java.io.Serializable, Cloneable, Comparable<InnerResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult");
 
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java
index fbd278ec9..582550b26 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCgTwRequestIFace {
 
   public interface Iface {
diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java
index 1376beb0c..4d8083680 100644
--- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java
+++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCwTgRequestIFace {
 
   public interface Iface {
diff --git a/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java b/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java
index 86a2107ad..d97d54c6c 100644
--- a/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java
+++ b/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Structs can also be exceptions, if they are nasty.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase<InnerInvalidOperException, InnerInvalidOperException._Fields>, java.io.Serializable, Cloneable, Comparable<InnerInvalidOperException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException");
 
diff --git a/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java b/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java
index e1c7fa73e..a7142f619 100644
--- a/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java
+++ b/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class InnerResult implements org.apache.thrift.TBase<InnerResult, InnerResult._Fields>, java.io.Serializable, Cloneable, Comparable<InnerResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult");
 
diff --git a/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java b/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java
index fbd278ec9..582550b26 100644
--- a/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java
+++ b/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCgTwRequestIFace {
 
   public interface Iface {
diff --git a/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java b/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java
index 1376beb0c..4d8083680 100644
--- a/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java
+++ b/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-30")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2021-10-19")
 public class RPCwTgRequestIFace {
 
   public interface Iface {