update for version 3.1.5x

FreeSR.Dispatch/Handlers/QueryDispatchHandler.cs

@@ -23,11 +23,11 @@
 
             context.Response.StatusCode = HttpStatusCode.OK;
             context.Response.ContentType = "text/plain";
-            await context.Response.WriteAllAsync(Convert.ToBase64String(ProtobufUtil.Serialize(new RegionList
+            await context.Response.WriteAllAsync(Convert.ToBase64String(ProtobufUtil.Serialize(new DispatchRegionData()
             {
                 Retcode = 0,
-                TopServerRegionName = RegionManager.GetTopServerRegionName(),
+                TopSeverRegionName = RegionManager.GetTopServerRegionName(),
-                RegionInfoLists = { RegionManager.GetRegionList() }
+                RegionLists = {  RegionManager.GetRegionList() }
             })));
 
             return true;

FreeSR.Dispatch/Handlers/QueryGatewayHandler.cs

@@ -14,24 +14,22 @@
             await context.Response.WriteAllAsync(Convert.ToBase64String(ProtobufUtil.Serialize(new Gateserver
             {
                 Retcode = 0,
-                Msg0 = "OK",
+                Msg = "OK",
                 Ip = "127.0.0.1",
                 RegionName = "FreeSR",
                 Port = 22301,
-                B1 = true,
+                UseTcp = true,
-                B2 = true,
+                EnableWatermark = true,
-                B3 = true,
+                EnableCdnIpv6 = 1,
-                B4 = true,
+                EnableVersionUpdate = true,
-                B5 = true,
+                EnableAndroidMiddlePackage = true,
-                B6 = true,
+                EnableDesignDataVersionUpdate = true,
-                B7 = true,
+                EnableUploadBattleLog = true,
-                B8 = true,
+                EnableSaveReplayFile = true,
-                useTcp = true,
+                AssetBundleUrl = "",
-                //MdkResVersion = "5335706",
+                ExResourceUrl = "",
-                AssetBundleUrl = "https://autopatchos.starrails.com/asb/BetaLive/output_6510636_cb4da670a18a",
+                IfixVersion = "",
-                ExResourceUrl = "https://autopatchos.starrails.com/design_data/BetaLive/output_6519585_2be8ac313835",
+                LuaUrl = "",
-                IfixVersion = "https://autopatchos.starrails.com/ifix/BetaLive/output_6523427_28cc5c21c689",
-                LuaUrl = "https://autopatchos.starrails.com/lua/BetaLive/output_6516960_dede96733b5b",
             })));
 
             return true;

FreeSR.Dispatch/Service/Manager/RegionManager.cs

@@ -12,9 +12,9 @@
             s_configuration = configuration;
         }
 
-        public static RegionInfo GetRegionList()
+        public static RegionEntry GetRegionList()
         {
-            var region = new RegionInfo
+            var region = new RegionEntry
             {
                 EnvType = s_configuration.EnvType,
                 DispatchUrl = s_configuration.DispatchUrl,

FreeSR.Gateserver/Manager/Handlers/AvatarReqGroup.cs

@@ -14,7 +14,7 @@
             var response = new GetAvatarDataScRsp
             {
                 Retcode = 0,
-                IsAll = request.IsGetAll
+                IsGetAll = request.IsGetAll
             };
 
             uint[] characters = new uint[] { 8001,8002,8003,8004,

FreeSR.Gateserver/Manager/Handlers/BattleReqGroup.cs

@@ -31,7 +31,7 @@ namespace FreeSR.Gateserver.Manager.Handlers
                         Id = id,
                         Hp = 10000,
                         Satiety = 100,
-                        Sp = new AmountInfo{CurAmount = 10000,MaxAmount = 10000},
+                        SpBar = new SpBarInfo {CurSp = 10000, MaxSp = 10000},
                         AvatarType = AvatarType.AvatarFormalType,
                         Slot = (uint)lineupInfo.AvatarLists.Count
                     });
@@ -158,7 +158,7 @@ namespace FreeSR.Gateserver.Manager.Handlers
                     Hp = 10000,
                     AvatarType = AvatarType.AvatarFormalType,
                     WorldLevel = 6,
-                    Sp = new AmountInfo { CurAmount = 10000, MaxAmount = 10000 },
+                    SpBar = new SpBarInfo { CurSp = 10000, MaxSp = 10000 },
                     RelicLists = { testRelic },
                     EquipmentLists = {new BattleEquipment
                     {
@@ -190,8 +190,8 @@ namespace FreeSR.Gateserver.Manager.Handlers
             {
                 SceneMonsterWave monsterInfo = new SceneMonsterWave
                 {
-                    Pkgenfbhofi = i,
+                    WaveId = i,
-                    MonsterParam = new SceneMonsterParam
+                    WaveParam = new SceneMonsterWaveParam
                     {
                         Level = monsterLevels[i],
                     }
@@ -203,7 +203,7 @@ namespace FreeSR.Gateserver.Manager.Handlers
 
                     foreach (uint monsterId in monsterIdList)
                     {
-                        monsterInfo.MonsterLists.Add(new SceneMonsterInfo
+                        monsterInfo.MonsterLists.Add(new SceneMonster
                         {
                             MonsterId = monsterId
                         });

FreeSR.Gateserver/Manager/Handlers/LineupReqGroup.cs

@@ -35,7 +35,7 @@
                 {
                     AvatarType = AvatarType.AvatarFormalType,
                     Hp = 10000,
-                    Sp = new AmountInfo { CurAmount = 10000,MaxAmount = 10000},
+                    SpBar = new SpBarInfo { CurSp = 10000,MaxSp = 10000},
                     Satiety = 100,
                     Id = id,
                     Slot = (uint)response.Lineup.AvatarLists.Count
@@ -70,7 +70,7 @@
                 response.LineupLists[0].AvatarLists.Add(new LineupAvatar
                 {
                     AvatarType = AvatarType.AvatarFormalType,
-                    Sp = new AmountInfo { CurAmount = 10000, MaxAmount = 10000 },
+                    SpBar = new SpBarInfo { CurSp = 10000, MaxSp = 10000 },
                     Hp = 10000,
                     Satiety = 100,
                     Id = id,
@@ -114,7 +114,7 @@
 
             var request = data as ReplaceLineupCsReq;
             Avatar1 = 0; Avatar2 = 0; Avatar3 = 0; Avatar4 = 0;
-            foreach (LineupSlotData slotData in request.LineupSlotLists)
+            foreach (LineupSlotData slotData in request.Slots)
             {
                 if (slotData.Slot == 0) Avatar1 = slotData.Id;
                 if (slotData.Slot == 1) Avatar2 = slotData.Id;
@@ -165,7 +165,7 @@
                 response.Lineup.AvatarLists.Add(new LineupAvatar
                 {
                     AvatarType = AvatarType.AvatarFormalType,
-                    Sp = new AmountInfo { CurAmount = 10000, MaxAmount = 10000 },
+                    SpBar = new SpBarInfo { CurSp = 10000, MaxSp = 10000 },
                     Hp = 10000,
                     Satiety = 100,
                     Id = id,

FreeSR.Gateserver/Manager/Handlers/MissionReqGroup.cs

@@ -122,19 +122,6 @@
                 }
             }
 
-            if (request.MainMissionIdLists != null)
-            {
-                foreach (uint id in request.MainMissionIdLists)
-                {
-                    response.MissionEventStatusLists.Add(new Mission()
-                    {
-                        Id = id,
-                        Progress = 0,
-                        Status = MissionStatus.MissionFinish
-                    });
-                }
-            }
-
             session.Send(CmdType.CmdGetMissionStatusScRsp, response);
         }
     }

FreeSR.Gateserver/Manager/Handlers/NPCReqGroup.cs

@@ -31,12 +31,12 @@
                 Retcode = 0
             };
 
-            foreach(uint id in npcPerformanceReq.FirstTalkIdLists)
+            foreach(uint id in npcPerformanceReq.NpcTalkLists)
             {
-                    response.NpcMeetStatusLists.Add(new NpcMeetStatusInfo
+                    response.NpcTalkInfoLists.Add(new NpcTalkInfo
                     {
-                        IsMeet = true,
+                        Iagodfdjaik = true,
-                        MeetId = id
+                        NpcTalkId = id
                     });
                 
             }

FreeSR.Gateserver/Manager/Handlers/PlayerReqGroup.cs

@@ -35,22 +35,13 @@
             });
         }
 
-        [Handler(CmdType.CmdGetHeroBasicTypeInfoCsReq)]
+        [Handler(CmdType.CmdGetMultiPathAvatarInfoCsReq)]
         public static void OnGetHeroBasicTypeInfoCsReq(NetSession session, int cmdId, object _)
         {
-            session.Send(CmdType.CmdGetHeroBasicTypeInfoScRsp, new GetHeroBasicTypeInfoScRsp
+            session.Send(CmdType.CmdGetMultiPathAvatarInfoScRsp, new GetMultiPathAvatarInfoScRsp()
             {
                 Retcode = 0,
-                Gender = Gender.GenderMan,
+                CurrentMultiPathAvatarIds = {  }
-                BasicTypeInfoLists ={
-                    new PlayerHeroBasicTypeInfo
-                    {
-                        BasicType = HeroBasicType.BoyWarrior,
-                        Rank = 1,
-                        Knhaecbafbas = {}
-                    }
-                },
-                CurBasicType = HeroBasicType.BoyWarrior,
             });
         }
 

FreeSR.Gateserver/Manager/Handlers/SceneReqGroup.cs

@@ -47,22 +47,22 @@
 
             uint[] back = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 0 };
 
-            var mapinfo = new SceneMapInfo
+            var mapinfo = new MazeMapData()
             {
                 Retcode = 0,
                 LightenSectionLists = back,
-                ChestLists = {
+                UnlockedChestLists = { 
-                    new ChestInfo
+                    new MazeChest
                     {
-                        ChestType = ChestType.MapInfoChestTypeNormal
+                        MapInfoChestType = MapInfoChestType.MapInfoChestTypeNormal
                     },
-                    new ChestInfo
+                    new MazeChest
                     {
-                        ChestType = ChestType.MapInfoChestTypePuzzle
+                        MapInfoChestType = MapInfoChestType.MapInfoChestTypePuzzle
                     },
-                    new ChestInfo
+                    new MazeChest
                     {
-                        ChestType = ChestType.MapInfoChestTypeChallenge
+                        MapInfoChestType = MapInfoChestType.MapInfoChestTypeChallenge
                     }
                 },
             };
@@ -70,10 +70,8 @@
             var response = new GetSceneMapInfoScRsp
             {
                 Retcode = 0,
-                EntryId = request.EntryIdLists[0],
+                CurMapEntryId = request.CurMapEntryId,
-                CurMapEntryId = request.EntryId,
+                MapLists = { mapinfo },
-                SceneMapInfoes = { mapinfo },
-                LightenSectionLists = back,
             };
 
             session.Send(CmdType.CmdGetSceneMapInfoScRsp, response);

FreeSR.Gateserver/Network/Factory/ProtoFactory.cs

@@ -28,7 +28,7 @@
                 {CmdType.CmdGetSceneMapInfoCsReq, typeof(GetSceneMapInfoCsReq)},
 
                 {CmdType.CmdGetBasicInfoCsReq, typeof(GetBasicInfoCsReq)},
-                {CmdType.CmdGetHeroBasicTypeInfoCsReq, typeof(GetHeroBasicTypeInfoCsReq)},
+                {CmdType.CmdGetMultiPathAvatarInfoCsReq, typeof(GetMultiPathAvatarInfoCsReq)},
                 {CmdType.CmdPlayerHeartBeatCsReq, typeof(PlayerHeartBeatCsReq)},
 
                 //{CmdType.CmdGetGachaInfoCsReq, typeof(GetGachaInfoCsReq)},

FreeSR.Gateserver/Network/Handlers/Manager/PacketHandler.cs

@@ -63,19 +63,17 @@
             {CmdType.CmdGetTreasureDungeonActivityDataCsReq, CmdType.CmdGetTreasureDungeonActivityDataScRsp},
             {CmdType.CmdPlayerReturnInfoQueryCsReq, CmdType.CmdPlayerReturnInfoQueryScRsp},
             {CmdType.CmdGetBasicInfoCsReq, CmdType.CmdGetBasicInfoScRsp},
-            {CmdType.CmdGetHeroBasicTypeInfoCsReq, CmdType.CmdGetHeroBasicTypeInfoScRsp},
+            {CmdType.CmdGetMultiPathAvatarInfoCsReq, CmdType.CmdGetMultiPathAvatarInfoScRsp},
             {CmdType.CmdGetBagCsReq, CmdType.CmdGetBagScRsp},
             {CmdType.CmdGetPlayerBoardDataCsReq, CmdType.CmdGetPlayerBoardDataScRsp},
             {CmdType.CmdGetAvatarDataCsReq, CmdType.CmdGetAvatarDataScRsp},
             {CmdType.CmdGetAllLineupDataCsReq, CmdType.CmdGetAllLineupDataScRsp},
             {CmdType.CmdGetActivityScheduleConfigCsReq, CmdType.CmdGetActivityScheduleConfigScRsp},
             {CmdType.CmdGetMissionDataCsReq, CmdType.CmdGetMissionDataScRsp},
-            {CmdType.CmdGetMissionEventDataCsReq, CmdType.CmdGetMissionEventDataScRsp},
             {CmdType.CmdGetChallengeCsReq, CmdType.CmdGetChallengeScRsp},
             {CmdType.CmdGetCurChallengeCsReq, CmdType.CmdGetCurChallengeScRsp},
             {CmdType.CmdGetRogueInfoCsReq, CmdType.CmdGetRogueInfoScRsp},
             {CmdType.CmdGetExpeditionDataCsReq, CmdType.CmdGetExpeditionDataScRsp},
-            {CmdType.CmdGetRogueDialogueEventDataCsReq, CmdType.CmdGetRogueDialogueEventDataScRsp},
             {CmdType.CmdGetJukeboxDataCsReq, CmdType.CmdGetJukeboxDataScRsp},
             {CmdType.CmdSyncClientResVersionCsReq, CmdType.CmdSyncClientResVersionScRsp},
             {CmdType.CmdDailyFirstMeetPamCsReq, CmdType.CmdDailyFirstMeetPamScRsp},
@@ -86,7 +84,6 @@
             {CmdType.CmdGetBoxingClubInfoCsReq, CmdType.CmdGetBoxingClubInfoScRsp},
             {CmdType.CmdGetNpcStatusCsReq, CmdType.CmdGetNpcStatusScRsp},
             {CmdType.CmdTextJoinQueryCsReq, CmdType.CmdTextJoinQueryScRsp},
-            {CmdType.CmdGetSpringRecoverDataCsReq, CmdType.CmdGetSpringRecoverDataScRsp},
             {CmdType.CmdGetChatFriendHistoryCsReq, CmdType.CmdGetChatFriendHistoryScRsp},
             {CmdType.CmdGetSecretKeyInfoCsReq, CmdType.CmdGetSecretKeyInfoScRsp},
             {CmdType.CmdGetVideoVersionKeyCsReq, CmdType.CmdGetVideoVersionKeyScRsp},
@@ -94,7 +91,8 @@
             {CmdType.CmdGetCurBattleInfoCsReq, CmdType.CmdGetCurBattleInfoScRsp},
             {CmdType.CmdGetCurSceneInfoCsReq, CmdType.CmdGetCurSceneInfoScRsp},
             {CmdType.CmdGetPhoneDataCsReq, CmdType.CmdGetPhoneDataScRsp},
-            {CmdType.CmdPlayerLoginFinishCsReq, CmdType.CmdPlayerLoginFinishScRsp}
+            {CmdType.CmdPlayerLoginFinishCsReq, CmdType.CmdPlayerLoginFinishScRsp},
+            {CmdType.CmdGetRechargeGiftInfoCsReq, CmdType.CmdGetRechargeGiftInfoScRsp}
         };
 
         [ProtoContract]