跨服服务器

gamecommon/src/main/java/rpc/protocols/MessageTypeProto.java

@@ -4181,22 +4181,26 @@ public final class MessageTypeProto {
      * <code>GetDeathPathRewardRequest = 900014;</code>
      */
     GetDeathPathRewardRequest(676, 900014),
+    /**
+     * <code>DeathPathWorldRewardRequest = 900015;</code>
+     */
+    DeathPathWorldRewardRequest(677, 900015),
     /**
      * <code>ViewHeroInfoRequest = 9000015;</code>
      */
-    ViewHeroInfoRequest(677, 9000015),
+    ViewHeroInfoRequest(678, 9000015),
     /**
      * <code>ViewHeroInfoResponse = 900016;</code>
      */
-    ViewHeroInfoResponse(678, 900016),
+    ViewHeroInfoResponse(679, 900016),
     /**
      * <code>GetPlayerOneTeamInfoRequest = 900017;</code>
      */
-    GetPlayerOneTeamInfoRequest(679, 900017),
+    GetPlayerOneTeamInfoRequest(680, 900017),
     /**
      * <code>GetPlayerOneTeamInfoResponse = 900018;</code>
      */
-    GetPlayerOneTeamInfoResponse(680, 900018),
+    GetPlayerOneTeamInfoResponse(681, 900018),
     ;
 
     /**
@@ -8367,6 +8371,10 @@ public final class MessageTypeProto {
      * <code>GetDeathPathRewardRequest = 900014;</code>
      */
     public static final int GetDeathPathRewardRequest_VALUE = 900014;
+    /**
+     * <code>DeathPathWorldRewardRequest = 900015;</code>
+     */
+    public static final int DeathPathWorldRewardRequest_VALUE = 900015;
     /**
      * <code>ViewHeroInfoRequest = 9000015;</code>
      */
@@ -9066,6 +9074,7 @@ public final class MessageTypeProto {
         case 900012: return AddDeathPathRankRequest;
         case 900013: return GetDeathPathFirstRequest;
         case 900014: return GetDeathPathRewardRequest;
+        case 900015: return DeathPathWorldRewardRequest;
         case 9000015: return ViewHeroInfoRequest;
         case 900016: return ViewHeroInfoResponse;
         case 900017: return GetPlayerOneTeamInfoRequest;
@@ -9131,7 +9140,7 @@ public final class MessageTypeProto {
   static {
     java.lang.String[] descriptorData = {
       "\n\026MessageTypeProto.proto\022\rrpc.protocols*" +
-      "\374\255\001\n\013MessageType\022\027\n\022HEART_BEAT_REQUEST\020\350" +
+      "\237\256\001\n\013MessageType\022\027\n\022HEART_BEAT_REQUEST\020\350" +
       "\007\022\030\n\023HEART_BEAT_RESPONSE\020\351\007\022\036\n\031ACTIVITE_" +
       "WORKSHOP_REQUEST\020\224N\022\037\n\032ACTIVITE_WORKSHOP" +
       "_RESPONSE\020\225N\022\027\n\022ARENA_INFO_REQUEST\020\226N\022\030\n" +
@@ -9684,10 +9693,11 @@ public final class MessageTypeProto {
       "SUserArenaInfoResponse\020\252\3676\022\024\n\016GetRankReq" +
       "uest\020\253\3676\022\035\n\027AddDeathPathRankRequest\020\254\3676\022" +
       "\036\n\030GetDeathPathFirstRequest\020\255\3676\022\037\n\031GetDe" +
-      "athPathRewardRequest\020\256\3676\022\032\n\023ViewHeroInfo" +
+      "athPathRewardRequest\020\256\3676\022!\n\033DeathPathWor" +
-      "Request\020\317\250\245\004\022\032\n\024ViewHeroInfoResponse\020\260\3676" +
+      "ldRewardRequest\020\257\3676\022\032\n\023ViewHeroInfoReque" +
-      "\022!\n\033GetPlayerOneTeamInfoRequest\020\261\3676\022\"\n\034G" +
+      "st\020\317\250\245\004\022\032\n\024ViewHeroInfoResponse\020\260\3676\022!\n\033G" +
-      "etPlayerOneTeamInfoResponse\020\262\3676B\002H\001"
+      "etPlayerOneTeamInfoRequest\020\261\3676\022\"\n\034GetPla" +
+      "yerOneTeamInfoResponse\020\262\3676B\002H\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {

serverlogic/src/main/java/com/ljsd/jieling/handler/activity/NewGeneralAttackHandler.java

@@ -13,15 +13,15 @@ import com.ljsd.jieling.logic.fight.GameFightType;
 import com.ljsd.jieling.logic.fight.PVEFightEvent;
 import com.ljsd.jieling.logic.fight.result.FightResult;
 import com.ljsd.jieling.logic.player.PlayerLogic;
-import com.ljsd.jieling.protocols.ActivityProto;
-import com.ljsd.jieling.protocols.CommonProto;
-import com.ljsd.jieling.protocols.MessageTypeProto;
 import com.ljsd.jieling.util.ItemUtil;
 import config.SMonsterConfig;
 import config.SMonsterGroup;
 import config.SNewHeroConfig;
 import manager.STableManager;
 import org.springframework.stereotype.Component;
+import rpc.protocols.ActivityProto;
+import rpc.protocols.CommonProto;
+import rpc.protocols.MessageTypeProto;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;

serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java

@@ -45,7 +45,7 @@ import com.ljsd.jieling.logic.store.StoreLogic;
 import com.ljsd.jieling.logic.store.StoreType;
 
 import com.ljsd.jieling.network.session.ISession;
-import com.ljsd.jieling.protocols.*;
+import rpc.protocols.*;
 import com.ljsd.jieling.util.*;
 import config.*;
 import manager.STableManager;

serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java

@@ -1,8 +1,10 @@
 package com.ljsd.jieling.handler.pokemon;
 
+import com.ljsd.jieling.handler.BaseHandler;
 import com.ljsd.jieling.logic.hero.HeroLogic;
 import com.ljsd.jieling.network.session.ISession;
 import org.springframework.stereotype.Component;
+import rpc.protocols.HeroInfoProto;
 import rpc.protocols.MessageTypeProto;
 
 @Component

serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java

@@ -5,6 +5,7 @@ import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
 import com.ljsd.jieling.core.GlobalsDef;
 import com.ljsd.jieling.core.VipPrivilegeType;
 import com.ljsd.jieling.dataReport.reportBeans_37.Repot37EventUtil;
+import com.ljsd.jieling.exception.ErrorCode;
 import com.ljsd.jieling.exception.ErrorCodeException;
 import com.ljsd.jieling.globals.BIReason;
 import com.ljsd.jieling.globals.Global;