diff --git a/Common/Data/Config/GroupInfo.cs b/Common/Data/Config/GroupInfo.cs index f4eb489e..8358b983 100644 --- a/Common/Data/Config/GroupInfo.cs +++ b/Common/Data/Config/GroupInfo.cs @@ -71,7 +71,9 @@ namespace EggLink.DanhengServer.Data.Config } else { // sub mission - var mainMissionId = int.Parse(condition.ID.ToString()[..^2]); + GameData.SubMissionData.TryGetValue(condition.ID, out var subMission); + if (subMission == null) continue; + var mainMissionId = subMission.MainMissionID; mission.MissionInfo.TryGetValue(mainMissionId, out var info); info ??= new() { { mainMissionId, new() { diff --git a/Common/Data/Config/MissionInfo.cs b/Common/Data/Config/MissionInfo.cs index a75fe445..1ddb7256 100644 --- a/Common/Data/Config/MissionInfo.cs +++ b/Common/Data/Config/MissionInfo.cs @@ -22,6 +22,7 @@ namespace EggLink.DanhengServer.Data.Config public int ParamInt1 { get; set; } public int ParamInt2 { get; set; } public int ParamInt3 { get; set; } + public List ParamIntList { get; set; } = []; public List FinishActionList { get; set; } = []; } diff --git a/Common/Data/Config/PropInfo.cs b/Common/Data/Config/PropInfo.cs index defa9a90..c38186a9 100644 --- a/Common/Data/Config/PropInfo.cs +++ b/Common/Data/Config/PropInfo.cs @@ -38,7 +38,7 @@ namespace EggLink.DanhengServer.Data.Config { if (v["Value"] != null && v["Key"] != null) { - if (v["Key"]?.ToString().Contains("Door") == true) + if (v["Key"]?.ToString().Contains("Door") == true || v["Key"]?.ToString().Contains("Bridge") == true) { try { diff --git a/Common/Data/Excel/AvatarConfigExcel.cs b/Common/Data/Excel/AvatarConfigExcel.cs index 90f9bd8a..8695ebb1 100644 --- a/Common/Data/Excel/AvatarConfigExcel.cs +++ b/Common/Data/Excel/AvatarConfigExcel.cs @@ -1,4 +1,6 @@ -namespace EggLink.DanhengServer.Data.Excel +using Newtonsoft.Json; + +namespace EggLink.DanhengServer.Data.Excel { [ResourceEntity("AvatarConfig.json", true)] public class AvatarConfigExcel : ExcelResource @@ -6,6 +8,7 @@ public int AvatarID { get; set; } = 0; public HashName AvatarName { get; set; } = new(); + [JsonIgnore()] public List DefaultSkillTree = []; public override int GetId() { diff --git a/Common/Data/Excel/MainMissionExcel.cs b/Common/Data/Excel/MainMissionExcel.cs index 49c3096d..9ee2f2c5 100644 --- a/Common/Data/Excel/MainMissionExcel.cs +++ b/Common/Data/Excel/MainMissionExcel.cs @@ -20,7 +20,29 @@ namespace EggLink.DanhengServer.Data.Excel public int RewardID { get; set; } [JsonIgnore()] - public MissionInfo? MissionInfo { get; set; } + private MissionInfo? InnerMissionInfo { get; set; } + [JsonIgnore()] + public MissionInfo? MissionInfo { get => InnerMissionInfo; set + { + InnerMissionInfo = value; + if (value != null) + { + foreach (var sub in value.SubMissionList) + { + SubMissionIds.Add(sub.ID); + GameData.SubMissionData.TryGetValue(sub.ID, out var subMission); + if (subMission != null) + { + subMission.MainMissionID = MainMissionID; + subMission.MainMissionInfo = InnerMissionInfo; + subMission.SubMissionInfo = sub; + } + } + } + } + } + [JsonIgnore()] + public List SubMissionIds { get; set; } = []; public override int GetId() @@ -32,6 +54,29 @@ namespace EggLink.DanhengServer.Data.Excel { GameData.MainMissionData[GetId()] = this; } + + public bool IsEqual(Database.Mission.MissionData data) + { + var result = TakeOperation == OperationEnum.And; + foreach (var param in TakeParam) + { + if (param.IsEqual(data)) + { + if (TakeOperation != OperationEnum.And) + { + return true; + } + } + else + { + if (TakeOperation == OperationEnum.And) + { + return false; + } + } + } + return result; + } } public class MissionParam @@ -39,5 +84,18 @@ namespace EggLink.DanhengServer.Data.Excel [JsonConverter(typeof(StringEnumConverter))] public MissionTakeTypeEnum Type { get; set; } public int Value { get; set; } + + public bool IsEqual(Database.Mission.MissionData data) + { + switch (Type) + { + case MissionTakeTypeEnum.MultiSequence: + + data.MainMissionInfo.TryGetValue(Value, out var value); + return value == MissionPhaseEnum.Finish; + default: + return false; + } + } } } diff --git a/Common/Data/Excel/SpecialAvatarExcel.cs b/Common/Data/Excel/SpecialAvatarExcel.cs index 4b6154ae..7235adff 100644 --- a/Common/Data/Excel/SpecialAvatarExcel.cs +++ b/Common/Data/Excel/SpecialAvatarExcel.cs @@ -1,4 +1,6 @@ -using EggLink.DanhengServer.Database.Avatar; +using EggLink.DanhengServer.Database; +using EggLink.DanhengServer.Database.Avatar; +using EggLink.DanhengServer.Database.Player; using EggLink.DanhengServer.Enums; using EggLink.DanhengServer.Proto; using Newtonsoft.Json; @@ -35,6 +37,8 @@ namespace EggLink.DanhengServer.Data.Excel public Dictionary CurHp { get; set; } = []; [JsonIgnore()] public Dictionary CurSp { get; set; } = []; + [JsonIgnore()] + public Dictionary EntityId { get; set; } = []; public override int GetId() { @@ -55,10 +59,11 @@ namespace EggLink.DanhengServer.Data.Excel { CurHp.TryGetValue(uid, out var hp); CurSp.TryGetValue(uid, out var sp); + EntityId.TryGetValue(uid, out var Id); return new() { - AvatarId = SpecialAvatarID, - SpecialBaseAvatarId = AvatarID, + AvatarId = AvatarID, + SpecialBaseAvatarId = SpecialAvatarID, Level = Level, Promotion = Promotion, Rank = Rank, @@ -70,7 +75,9 @@ namespace EggLink.DanhengServer.Data.Excel Rank = EquipmentRank }, CurrentHp = hp == 0 ? 10000 : hp, - CurrentSp = sp + CurrentSp = sp, + InternalEntityId = Id, + PlayerData = DatabaseHelper.Instance!.GetInstance(uid), }; } } diff --git a/Common/Data/Excel/SubMissionExcel.cs b/Common/Data/Excel/SubMissionExcel.cs index 9d82acfc..ee82ffe4 100644 --- a/Common/Data/Excel/SubMissionExcel.cs +++ b/Common/Data/Excel/SubMissionExcel.cs @@ -1,10 +1,20 @@ -namespace EggLink.DanhengServer.Data.Excel +using EggLink.DanhengServer.Data.Config; +using Newtonsoft.Json; + +namespace EggLink.DanhengServer.Data.Excel { [ResourceEntity("SubMission.json")] public class SubMissionExcel : ExcelResource { public int SubMissionID { get; set; } + [JsonIgnore()] + public int MainMissionID { get; set; } + [JsonIgnore()] + public MissionInfo? MainMissionInfo { get; set; } + [JsonIgnore()] + public SubMissionInfo? SubMissionInfo { get; set; } + public override int GetId() { return SubMissionID; diff --git a/Common/Data/GameData.cs b/Common/Data/GameData.cs index 5e97d077..b93474bc 100644 --- a/Common/Data/GameData.cs +++ b/Common/Data/GameData.cs @@ -1,5 +1,6 @@ using EggLink.DanhengServer.Data.Config; using EggLink.DanhengServer.Data.Excel; +using EggLink.DanhengServer.Database.Mission; namespace EggLink.DanhengServer.Data { @@ -32,5 +33,46 @@ namespace EggLink.DanhengServer.Data { FloorInfoData.TryGetValue("P" + planeId + "_F" + floorId, out outer!); } + + public static MapEntranceExcel? GetMapEntrance(int floorId, MissionData mission) + { + var data = MapEntranceData.Values.ToList().FindAll(item => item.FloorID == floorId); + if (data.Count == 0) return null; + MapEntranceExcel? result = null; + foreach (var item in data) + { + if (item.FinishSubMissionList.Count > 0) + { + foreach (var subMissionId in item.FinishSubMissionList) + { + SubMissionData.TryGetValue(subMissionId, out var subMission); + if (subMission == null) return null; + var mainMissionId = subMission.MainMissionID; + if (mission.MissionInfo.TryGetValue(mainMissionId, out var mainMission)) + { + if (mainMission.Values.ToList().Find(i => i.Status == Enums.MissionPhaseEnum.Doing && i.MissionId == subMissionId) != null) + { + result = item; + } + } + } + } + else if (item.FinishMainMissionList.Count > 0) + { + foreach (var mainMissionId in item.FinishMainMissionList) + { + if (mission.MainMissionInfo.TryGetValue(mainMissionId, out var mainMission)) + { + if (mainMission == Enums.MissionPhaseEnum.Doing) + { + result = item; + } + } + } + } + } + + return result; + } } } diff --git a/Common/Data/ResourceManager.cs b/Common/Data/ResourceManager.cs index 967ec138..4d1ef36e 100644 --- a/Common/Data/ResourceManager.cs +++ b/Common/Data/ResourceManager.cs @@ -23,6 +23,7 @@ namespace EggLink.DanhengServer.Data public static void LoadExcel() { + var classes = Assembly.GetExecutingAssembly().GetTypes(); // Get all classes in the assembly foreach (var cls in classes) { @@ -34,66 +35,73 @@ namespace EggLink.DanhengServer.Data var count = 0; foreach (var fileName in attribute.FileName) { - var path = ConfigManager.Config.Path.ResourcePath + "/ExcelOutput/" + fileName; - var file = new FileInfo(path); - if (!file.Exists) + try { - if (attribute.IsCritical) + var path = ConfigManager.Config.Path.ResourcePath + "/ExcelOutput/" + fileName; + var file = new FileInfo(path); + if (!file.Exists) { - throw new FileNotFoundException($"File {path} not found"); - } - else - { - Logger.Warn($"File {path} not found"); - continue; - } - } - var json = file.OpenText().ReadToEnd(); - using (var reader = new JsonTextReader(new StringReader(json))) - { - reader.Read(); - if (reader.TokenType == JsonToken.StartArray) - { - // array - var jArray = JArray.Parse(json); - foreach (var item in jArray) + if (attribute.IsCritical) { - var res = JsonConvert.DeserializeObject(item.ToString(), cls); - ((ExcelResource?)res)?.Loaded(); - count++; + throw new FileNotFoundException($"File {path} not found"); + } + else + { + Logger.Warn($"File {path} not found"); + continue; } } - else if (reader.TokenType == JsonToken.StartObject) + var json = file.OpenText().ReadToEnd(); + using (var reader = new JsonTextReader(new StringReader(json))) { - // dictionary - var jObject = JObject.Parse(json); - foreach (var item in jObject) + reader.Read(); + if (reader.TokenType == JsonToken.StartArray) { - var id = int.Parse(item.Key); - var obj = item.Value; - var instance = JsonConvert.DeserializeObject(obj!.ToString(), cls); - - if (((ExcelResource?)instance)?.GetId() == 0 || ((ExcelResource?)instance) == null) + // array + var jArray = JArray.Parse(json); + foreach (var item in jArray) { - // Deserialize as JObject to handle nested dictionaries - var nestedObject = JsonConvert.DeserializeObject(obj.ToString()); + var res = JsonConvert.DeserializeObject(item.ToString(), cls); + ((ExcelResource?)res)?.Loaded(); + count++; + } + } + else if (reader.TokenType == JsonToken.StartObject) + { + // dictionary + var jObject = JObject.Parse(json); + foreach (var item in jObject) + { + var id = int.Parse(item.Key); + var obj = item.Value; + var instance = JsonConvert.DeserializeObject(obj!.ToString(), cls); - foreach (var nestedItem in nestedObject ?? []) + if (((ExcelResource?)instance)?.GetId() == 0 || ((ExcelResource?)instance) == null) { - var nestedInstance = JsonConvert.DeserializeObject(nestedItem.Value!.ToString(), cls); - ((ExcelResource?)nestedInstance)?.Loaded(); - count++; + // Deserialize as JObject to handle nested dictionaries + var nestedObject = JsonConvert.DeserializeObject(obj.ToString()); + + foreach (var nestedItem in nestedObject ?? []) + { + var nestedInstance = JsonConvert.DeserializeObject(nestedItem.Value!.ToString(), cls); + ((ExcelResource?)nestedInstance)?.Loaded(); + count++; + } } + else + { + ((ExcelResource)instance).Loaded(); + } + count++; } - else - { - ((ExcelResource)instance).Loaded(); - } - count++; } } + resource.Finalized(); + } + catch (Exception ex) + { + Logger.Error($"Error in reading {fileName}", ex); } - resource.Finalized(); } Logger.Info($"Loaded {count} {cls.Name}s."); } diff --git a/Common/Database/Account/AccountHelper.cs b/Common/Database/Account/AccountHelper.cs index 589b4da9..9357c021 100644 --- a/Common/Database/Account/AccountHelper.cs +++ b/Common/Database/Account/AccountHelper.cs @@ -4,7 +4,7 @@ namespace EggLink.DanhengServer.Database.Account { public static class AccountHelper { - public static void CreateAccount(string username, long uid) + public static void CreateAccount(string username, int uid) { if (AccountData.GetAccountByUserName(username) != null) { @@ -14,7 +14,7 @@ namespace EggLink.DanhengServer.Database.Account { } - long newUid = uid; + int newUid = uid; if (uid == 0) { newUid = 10001; // start from 10001 diff --git a/Common/Database/Avatar/AvatarData.cs b/Common/Database/Avatar/AvatarData.cs index 82496f52..8feb402c 100644 --- a/Common/Database/Avatar/AvatarData.cs +++ b/Common/Database/Avatar/AvatarData.cs @@ -44,7 +44,22 @@ namespace EggLink.DanhengServer.Database.Avatar [JsonIgnore()] public AvatarConfigExcel? Excel; [JsonIgnore()] - public int EntityId; + public int InternalEntityId { get; set; } + [JsonIgnore()] + public int EntityId { get => InternalEntityId; set { + if (SpecialBaseAvatarId > 0 && PlayerData != null) + { + // set in SpecialAvatarExcel + GameData.SpecialAvatarData.TryGetValue(SpecialBaseAvatarId * 10 + PlayerData.WorldLevel, out var specialAvatar); + if (specialAvatar != null) + { + specialAvatar.EntityId[PlayerData.Uid] = value; + InternalEntityId = value; + } + } + InternalEntityId = value; + } + } [JsonIgnore()] public PlayerData? PlayerData; @@ -83,6 +98,11 @@ namespace EggLink.DanhengServer.Database.Avatar return HeroId > 0 ? HeroId : AvatarId; } + public int GetSpecialAvatarId() + { + return SpecialBaseAvatarId > 0 ? SpecialBaseAvatarId : GetAvatarId(); + } + public void SetCurHp(int value, bool isExtraLineup) { if (isExtraLineup) @@ -111,7 +131,7 @@ namespace EggLink.DanhengServer.Database.Avatar { var proto = new Proto.Avatar() { - BaseAvatarId = (uint)GetAvatarId(), // 1005 will trigger npe + BaseAvatarId = (uint)GetSpecialAvatarId(), Level = (uint)Level, Exp = (uint)Exp, Promotion = (uint)Promotion, @@ -165,7 +185,7 @@ namespace EggLink.DanhengServer.Database.Avatar }, Actor = new() { - BaseAvatarId = (uint)(SpecialBaseAvatarId > 0 ? SpecialBaseAvatarId : GetAvatarId()), + BaseAvatarId = (uint)GetAvatarId(), AvatarType = avatarType } }; @@ -175,7 +195,7 @@ namespace EggLink.DanhengServer.Database.Avatar { return new() { - Id = (uint)GetAvatarId(), + Id = (uint)GetSpecialAvatarId(), Slot = (uint)slot, AvatarType = avatarType, Hp = info.IsExtraLineup() ? (uint)ExtraLineupHp : (uint)CurrentHp, @@ -191,7 +211,7 @@ namespace EggLink.DanhengServer.Database.Avatar { var proto = new BattleAvatar() { - Id = (uint)GetAvatarId(), + Id = (uint)GetSpecialAvatarId(), AvatarType = avatarType, Level = (uint)Level, Promotion = (uint)Promotion, diff --git a/Common/Database/BaseDatabaseData.cs b/Common/Database/BaseDatabaseData.cs index 43c093ae..fa0c301e 100644 --- a/Common/Database/BaseDatabaseData.cs +++ b/Common/Database/BaseDatabaseData.cs @@ -6,6 +6,6 @@ namespace EggLink.DanhengServer.Database public abstract class BaseDatabaseData { [SugarColumn(IsPrimaryKey = true)] - public long Uid { get; set; } + public int Uid { get; set; } } } diff --git a/Common/Proto/AddAvatarScNotify.cs b/Common/Proto/AddAvatarScNotify.cs index 5d597e4f..a966bbf9 100644 --- a/Common/Proto/AddAvatarScNotify.cs +++ b/Common/Proto/AddAvatarScNotify.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static AddAvatarScNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChdBZGRBdmF0YXJTY05vdGlmeS5wcm90bxoXQWRkQXZhdGFyU3JjU3RhdGUu", - "cHJvdG8aDkl0ZW1MaXN0LnByb3RvIncKEUFkZEF2YXRhclNjTm90aWZ5Eg4K", + "ChdBZGRBdmF0YXJTY05vdGlmeS5wcm90bxoOSXRlbUxpc3QucHJvdG8aF0Fk", + "ZEF2YXRhclNyY1N0YXRlLnByb3RvIncKEUFkZEF2YXRhclNjTm90aWZ5Eg4K", "BmlzX25ldxgOIAEoCBIZCgZyZXdhcmQYByABKAsyCS5JdGVtTGlzdBIWCg5i", "YXNlX2F2YXRhcl9pZBgPIAEoDRIfCgNzcmMYDCABKA4yEi5BZGRBdmF0YXJT", "cmNTdGF0ZUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90", "bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AddAvatarSrcStateReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.AddAvatarSrcStateReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.AddAvatarScNotify), global::EggLink.DanhengServer.Proto.AddAvatarScNotify.Parser, new[]{ "IsNew", "Reward", "BaseAvatarId", "Src" }, null, null, null, null) })); diff --git a/Common/Proto/AetherBattleAvatar.cs b/Common/Proto/AetherBattleAvatar.cs index 3653395c..e64886e2 100644 --- a/Common/Proto/AetherBattleAvatar.cs +++ b/Common/Proto/AetherBattleAvatar.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static AetherBattleAvatarReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChhBZXRoZXJCYXR0bGVBdmF0YXIucHJvdG8aD1NwQmFySW5mby5wcm90bxoR", - "TEFPQUtCRUlQS0YucHJvdG8isgEKEkFldGhlckJhdHRsZUF2YXRhchIKCgJp", + "ChhBZXRoZXJCYXR0bGVBdmF0YXIucHJvdG8aEUxBT0FLQkVJUEtGLnByb3Rv", + "Gg9TcEJhckluZm8ucHJvdG8isgEKEkFldGhlckJhdHRsZUF2YXRhchIKCgJp", "ZBgBIAEoDRINCgVpbmRleBgCIAEoDRIRCglwcm9tb3Rpb24YAyABKA0SHwoX", "cGFzc2l2ZV9za2lsbF9pdGVtX2xpc3QYBCADKA0SMQobYWV0aGVyX2Rpdmlk", "ZV9saW5ldXBfc3RhdHVzGAUgASgOMgwuTEFPQUtCRUlQS0YSGgoGc3BfYmFy", "GAYgASgLMgouU3BCYXJJbmZvQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIu", "UHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SpBarInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.LAOAKBEIPKFReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LAOAKBEIPKFReflection.Descriptor, global::EggLink.DanhengServer.Proto.SpBarInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.AetherBattleAvatar), global::EggLink.DanhengServer.Proto.AetherBattleAvatar.Parser, new[]{ "Id", "Index", "Promotion", "PassiveSkillItemList", "AetherDivideLineupStatus", "SpBar" }, null, null, null, null) })); diff --git a/Common/Proto/AetherDivideBattleInfo.cs b/Common/Proto/AetherDivideBattleInfo.cs index 8cec3a1f..60140a57 100644 --- a/Common/Proto/AetherDivideBattleInfo.cs +++ b/Common/Proto/AetherDivideBattleInfo.cs @@ -24,9 +24,9 @@ namespace EggLink.DanhengServer.Proto { static AetherDivideBattleInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChxBZXRoZXJEaXZpZGVCYXR0bGVJbmZvLnByb3RvGhhBZXRoZXJCYXR0bGVB", - "dmF0YXIucHJvdG8aEEJhdHRsZUJ1ZmYucHJvdG8aFlNjZW5lTW9uc3Rlcldh", - "dmUucHJvdG8i7AEKFkFldGhlckRpdmlkZUJhdHRsZUluZm8SEwoLQ01GSE1B", + "ChxBZXRoZXJEaXZpZGVCYXR0bGVJbmZvLnByb3RvGhBCYXR0bGVCdWZmLnBy", + "b3RvGhZTY2VuZU1vbnN0ZXJXYXZlLnByb3RvGhhBZXRoZXJCYXR0bGVBdmF0", + "YXIucHJvdG8i7AEKFkFldGhlckRpdmlkZUJhdHRsZUluZm8SEwoLQ01GSE1B", "TlBBUEwYDCABKAgSEAoIc3RhZ2VfaWQYAyABKA0SLAoRbW9uc3Rlcl93YXZl", "X2xpc3QYDyADKAsyES5TY2VuZU1vbnN0ZXJXYXZlEh4KCWJ1ZmZfbGlzdBgG", "IAMoCzILLkJhdHRsZUJ1ZmYSLwoSYmF0dGxlX2F2YXRhcl9saXN0GA4gAygL", @@ -34,7 +34,7 @@ namespace EggLink.DanhengServer.Proto { "b2dpY19yYW5kb21fc2VlZBgEIAEoDUIeqgIbRWdnTGluay5EYW5oZW5nU2Vy", "dmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AetherBattleAvatarReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleBuffReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneMonsterWaveReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.BattleBuffReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneMonsterWaveReflection.Descriptor, global::EggLink.DanhengServer.Proto.AetherBattleAvatarReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.AetherDivideBattleInfo), global::EggLink.DanhengServer.Proto.AetherDivideBattleInfo.Parser, new[]{ "CMFHMANPAPL", "StageId", "MonsterWaveList", "BuffList", "BattleAvatarList", "BattleId", "LogicRandomSeed" }, null, null, null, null) })); diff --git a/Common/Proto/AetherDivideSpiritInfo.cs b/Common/Proto/AetherDivideSpiritInfo.cs index f1db99a8..434afa91 100644 --- a/Common/Proto/AetherDivideSpiritInfo.cs +++ b/Common/Proto/AetherDivideSpiritInfo.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static AetherDivideSpiritInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChxBZXRoZXJEaXZpZGVTcGlyaXRJbmZvLnByb3RvGhZQYXNzaXZlU2tpbGxJ", - "dGVtLnByb3RvGg9TcEJhckluZm8ucHJvdG8isgEKFkFldGhlckRpdmlkZVNw", + "ChxBZXRoZXJEaXZpZGVTcGlyaXRJbmZvLnByb3RvGg9TcEJhckluZm8ucHJv", + "dG8aFlBhc3NpdmVTa2lsbEl0ZW0ucHJvdG8isgEKFkFldGhlckRpdmlkZVNw", "aXJpdEluZm8SMgoXcGFzc2l2ZV9za2lsbF9pdGVtX2xpc3QYCCADKAsyES5Q", "YXNzaXZlU2tpbGxJdGVtEhEKCXByb21vdGlvbhgJIAEoDRILCgNleHAYBCAB", "KA0SEwoLUExNRkFIQUhKSUkYDyABKA0SEwoLSEFPSUFOQ0lMQUkYBSABKA0S", "GgoGc3BfYmFyGA4gASgLMgouU3BCYXJJbmZvQh6qAhtFZ2dMaW5rLkRhbmhl", "bmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.PassiveSkillItemReflection.Descriptor, global::EggLink.DanhengServer.Proto.SpBarInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SpBarInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PassiveSkillItemReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.AetherDivideSpiritInfo), global::EggLink.DanhengServer.Proto.AetherDivideSpiritInfo.Parser, new[]{ "PassiveSkillItemList", "Promotion", "Exp", "PLMFAHAHJII", "HAOIANCILAI", "SpBar" }, null, null, null, null) })); diff --git a/Common/Proto/ArchiveData.cs b/Common/Proto/ArchiveData.cs index f31498fc..18718c97 100644 --- a/Common/Proto/ArchiveData.cs +++ b/Common/Proto/ArchiveData.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static ArchiveDataReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFBcmNoaXZlRGF0YS5wcm90bxoPUmVsaWNMaXN0LnByb3RvGhVLaWxsTW9u", - "c3Rlckxpc3QucHJvdG8imQEKC0FyY2hpdmVEYXRhEhMKC0NNRE1CT01PR0lC", + "ChFBcmNoaXZlRGF0YS5wcm90bxoVS2lsbE1vbnN0ZXJMaXN0LnByb3RvGg9S", + "ZWxpY0xpc3QucHJvdG8imQEKC0FyY2hpdmVEYXRhEhMKC0NNRE1CT01PR0lC", "GAcgAygNEhMKC0FMRkNCSEFDR0ZPGAsgAygNEisKEWtpbGxfbW9uc3Rlcl9s", "aXN0GA4gAygLMhAuS2lsbE1vbnN0ZXJMaXN0Eh4KCnJlbGljX2xpc3QYASAD", "KAsyCi5SZWxpY0xpc3QSEwoLT0pKQk5GUEJDS0sYBCADKA1CHqoCG0VnZ0xp", "bmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RelicListReflection.Descriptor, global::EggLink.DanhengServer.Proto.KillMonsterListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.KillMonsterListReflection.Descriptor, global::EggLink.DanhengServer.Proto.RelicListReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ArchiveData), global::EggLink.DanhengServer.Proto.ArchiveData.Parser, new[]{ "CMDMBOMOGIB", "ALFCBHACGFO", "KillMonsterList", "RelicList", "OJJBNFPBCKK" }, null, null, null, null) })); diff --git a/Common/Proto/AvatarBattleInfo.cs b/Common/Proto/AvatarBattleInfo.cs index 3ebafd3f..fc085fba 100644 --- a/Common/Proto/AvatarBattleInfo.cs +++ b/Common/Proto/AvatarBattleInfo.cs @@ -24,11 +24,11 @@ namespace EggLink.DanhengServer.Proto { static AvatarBattleInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChZBdmF0YXJCYXR0bGVJbmZvLnByb3RvGhpBdHRhY2tEYW1hZ2VQcm9wZXJ0", - "eS5wcm90bxoWU2tpbGxVc2VQcm9wZXJ0eS5wcm90bxoRQmF0dGxlUmVsaWMu", - "cHJvdG8aEEF2YXRhclR5cGUucHJvdG8aFUF2YXRhclNraWxsVHJlZS5wcm90", - "bxoUQXZhdGFyUHJvcGVydHkucHJvdG8aE0FiaWxpdHlVc2VTdHQucHJvdG8a", - "EVNwQWRkU291cmNlLnByb3RvGhdFcXVpcG1lbnRQcm9wZXJ0eS5wcm90byLS", + "ChZBdmF0YXJCYXR0bGVJbmZvLnByb3RvGhFTcEFkZFNvdXJjZS5wcm90bxoU", + "QXZhdGFyUHJvcGVydHkucHJvdG8aFUF2YXRhclNraWxsVHJlZS5wcm90bxoQ", + "QXZhdGFyVHlwZS5wcm90bxoWU2tpbGxVc2VQcm9wZXJ0eS5wcm90bxoaQXR0", + "YWNrRGFtYWdlUHJvcGVydHkucHJvdG8aEUJhdHRsZVJlbGljLnByb3RvGhdF", + "cXVpcG1lbnRQcm9wZXJ0eS5wcm90bxoTQWJpbGl0eVVzZVN0dC5wcm90byLS", "CQoQQXZhdGFyQmF0dGxlSW5mbxIgCgthdmF0YXJfdHlwZRgBIAEoDjILLkF2", "YXRhclR5cGUSCgoCaWQYAiABKA0SFAoMYXZhdGFyX2xldmVsGAMgASgNEhMK", "C2F2YXRhcl9yYW5rGAQgASgNEhgKEGF2YXRhcl9wcm9tb3Rpb24YBSABKA0S", @@ -59,7 +59,7 @@ namespace EggLink.DanhengServer.Proto { "EwoLUE5MQkZDRklLTE8YKyABKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZl", "ci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AttackDamagePropertyReflection.Descriptor, global::EggLink.DanhengServer.Proto.SkillUsePropertyReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleRelicReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarSkillTreeReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarPropertyReflection.Descriptor, global::EggLink.DanhengServer.Proto.AbilityUseSttReflection.Descriptor, global::EggLink.DanhengServer.Proto.SpAddSourceReflection.Descriptor, global::EggLink.DanhengServer.Proto.EquipmentPropertyReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SpAddSourceReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarPropertyReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarSkillTreeReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.SkillUsePropertyReflection.Descriptor, global::EggLink.DanhengServer.Proto.AttackDamagePropertyReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleRelicReflection.Descriptor, global::EggLink.DanhengServer.Proto.EquipmentPropertyReflection.Descriptor, global::EggLink.DanhengServer.Proto.AbilityUseSttReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.AvatarBattleInfo), global::EggLink.DanhengServer.Proto.AvatarBattleInfo.Parser, new[]{ "AvatarType", "Id", "AvatarLevel", "AvatarRank", "AvatarPromotion", "AvatarStatus", "AvatarSkill", "AvatarEquipment", "TotalTurns", "TotalDamage", "TotalHeal", "TotalDamageTaken", "TotalHpRecover", "TotalSpCost", "StageId", "StageType", "TotalBreakDamage", "AttackTypeDamage", "AttackTypeBreakDamage", "AttackTypeMaxDamage", "SkillTimes", "DelayCumulate", "TotalSpAdd", "SpAddSource", "TotalBpCost", "DieTimes", "ReviveTimes", "BreakTimes", "ExtraTurns", "TotalShield", "TotalShieldTaken", "TotalShieldDamage", "InitialStatus", "Relics", "AssistUid", "KBFLCGHMALP", "EAHBENAKFEL", "EGFKDHEFIBE", "FLNFAIIFCBI", "EHBKBPCIIGF", "AHIGMDLLJGH", "BCPIPAKGKBD", "PNLBFCFIKLO" }, null, null, null, null) })); diff --git a/Common/Proto/BattleAvatar.cs b/Common/Proto/BattleAvatar.cs index 9e562e46..25a2ac2f 100644 --- a/Common/Proto/BattleAvatar.cs +++ b/Common/Proto/BattleAvatar.cs @@ -24,9 +24,9 @@ namespace EggLink.DanhengServer.Proto { static BattleAvatarReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChJCYXR0bGVBdmF0YXIucHJvdG8aFUJhdHRsZUVxdWlwbWVudC5wcm90bxoR", - "TU1NR0xGTkJMRlAucHJvdG8aEEF2YXRhclR5cGUucHJvdG8aFUF2YXRhclNr", - "aWxsVHJlZS5wcm90bxoPU3BCYXJJbmZvLnByb3RvGhFCYXR0bGVSZWxpYy5w", + "ChJCYXR0bGVBdmF0YXIucHJvdG8aD1NwQmFySW5mby5wcm90bxoVQmF0dGxl", + "RXF1aXBtZW50LnByb3RvGhVBdmF0YXJTa2lsbFRyZWUucHJvdG8aEU1NTUdM", + "Rk5CTEZQLnByb3RvGhBBdmF0YXJUeXBlLnByb3RvGhFCYXR0bGVSZWxpYy5w", "cm90byL6AgoMQmF0dGxlQXZhdGFyEiAKC2F2YXRhcl90eXBlGAEgASgOMgsu", "QXZhdGFyVHlwZRIKCgJpZBgCIAEoDRINCgVsZXZlbBgDIAEoDRIMCgRyYW5r", "GAQgASgNEg0KBWluZGV4GAUgASgNEigKDnNraWxsdHJlZV9saXN0GAYgAygL", @@ -38,7 +38,7 @@ namespace EggLink.DanhengServer.Proto { "SW5mbxITCgtER1BCQVBPSEpQQRgRIAEoDUIeqgIbRWdnTGluay5EYW5oZW5n", "U2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.BattleEquipmentReflection.Descriptor, global::EggLink.DanhengServer.Proto.MMMGLFNBLFPReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarSkillTreeReflection.Descriptor, global::EggLink.DanhengServer.Proto.SpBarInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleRelicReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SpBarInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleEquipmentReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarSkillTreeReflection.Descriptor, global::EggLink.DanhengServer.Proto.MMMGLFNBLFPReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleRelicReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.BattleAvatar), global::EggLink.DanhengServer.Proto.BattleAvatar.Parser, new[]{ "AvatarType", "Id", "Level", "Rank", "Index", "SkilltreeList", "EquipmentList", "Hp", "Promotion", "RelicList", "WorldLevel", "AssistUid", "AOIBBEFPHOH", "SpBar", "DGPBAPOHJPA" }, null, null, null, null) })); diff --git a/Common/Proto/BattleStatistics.cs b/Common/Proto/BattleStatistics.cs index be15c10a..667433a3 100644 --- a/Common/Proto/BattleStatistics.cs +++ b/Common/Proto/BattleStatistics.cs @@ -24,12 +24,12 @@ namespace EggLink.DanhengServer.Proto { static BattleStatisticsReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChZCYXR0bGVTdGF0aXN0aWNzLnByb3RvGhFBRkVOTkFJSE5ITi5wcm90bxoX", - "TW9uc3RlckJhdHRsZUluZm8ucHJvdG8aEUROT0VLTEJBRlBILnByb3RvGhFH", - "TkJDSkpCQk5CUC5wcm90bxoRSk1FTUZFTElER04ucHJvdG8aG0JhdHRsZUV2", - "ZW50QmF0dGxlSW5mby5wcm90bxoYQmF0dGxlTWVjaGFuaXNtQmFyLnByb3Rv", - "GhFETkxORkRGUEpHSy5wcm90bxoWQmF0dGxlVGFyZ2V0TGlzdC5wcm90bxoR", - "SUlNQ0lDTE1GTEYucHJvdG8aFkF2YXRhckJhdHRsZUluZm8ucHJvdG8iyAcK", + "ChZCYXR0bGVTdGF0aXN0aWNzLnByb3RvGhdNb25zdGVyQmF0dGxlSW5mby5w", + "cm90bxoWQXZhdGFyQmF0dGxlSW5mby5wcm90bxoRR05CQ0pKQkJOQlAucHJv", + "dG8aEUFGRU5OQUlITkhOLnByb3RvGhZCYXR0bGVUYXJnZXRMaXN0LnByb3Rv", + "GhhCYXR0bGVNZWNoYW5pc21CYXIucHJvdG8aEUlJTUNJQ0xNRkxGLnByb3Rv", + "GhFETkxORkRGUEpHSy5wcm90bxobQmF0dGxlRXZlbnRCYXR0bGVJbmZvLnBy", + "b3RvGhFKTUVNRkVMSURHTi5wcm90bxoRRE5PRUtMQkFGUEgucHJvdG8iyAcK", "EEJhdHRsZVN0YXRpc3RpY3MSGgoSdG90YWxfYmF0dGxlX3R1cm5zGAEgASgN", "EhgKEHRvdGFsX2F1dG9fdHVybnMYAiABKA0SFgoOYXZhdGFyX2lkX2xpc3QY", "AyADKA0SEQoJdWx0cmFfY250GAQgASgNEhEKCWNvc3RfdGltZRgFIAEoARIc", @@ -54,7 +54,7 @@ namespace EggLink.DanhengServer.Proto { "ES5CYXR0bGVUYXJnZXRMaXN0OgI4AUIeqgIbRWdnTGluay5EYW5oZW5nU2Vy", "dmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AFENNAIHNHNReflection.Descriptor, global::EggLink.DanhengServer.Proto.MonsterBattleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.DNOEKLBAFPHReflection.Descriptor, global::EggLink.DanhengServer.Proto.GNBCJJBBNBPReflection.Descriptor, global::EggLink.DanhengServer.Proto.JMEMFELIDGNReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleEventBattleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleMechanismBarReflection.Descriptor, global::EggLink.DanhengServer.Proto.DNLNFDFPJGKReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleTargetListReflection.Descriptor, global::EggLink.DanhengServer.Proto.IIMCICLMFLFReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarBattleInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MonsterBattleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarBattleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.GNBCJJBBNBPReflection.Descriptor, global::EggLink.DanhengServer.Proto.AFENNAIHNHNReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleTargetListReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleMechanismBarReflection.Descriptor, global::EggLink.DanhengServer.Proto.IIMCICLMFLFReflection.Descriptor, global::EggLink.DanhengServer.Proto.DNLNFDFPJGKReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleEventBattleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.JMEMFELIDGNReflection.Descriptor, global::EggLink.DanhengServer.Proto.DNOEKLBAFPHReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.BattleStatistics), global::EggLink.DanhengServer.Proto.BattleStatistics.Parser, new[]{ "TotalBattleTurns", "TotalAutoTurns", "AvatarIdList", "UltraCnt", "CostTime", "TotalDelayCumulate", "AvatarBattleList", "MonsterBattleList", "RoundCnt", "CocoonDeadWave", "AvatarBattleTurns", "MonsterBattleTurns", "DEFOCBGFGAC", "ChallengeScore", "PNFLCFKJKHK", "MechanismBarInfo", "AOBKPKFHLGG", "LMHBONOKCPL", "HJIEPOIHCND", "PLNDNMEAMJA", "BOKDNMMJGCE", "LGKBEJMEHJO", "BattleTargetInfo", "GPECPOFLKJA" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, null, }) })); diff --git a/Common/Proto/BeforeCellData.cs b/Common/Proto/BeforeCellData.cs index a173965f..d0da572e 100644 --- a/Common/Proto/BeforeCellData.cs +++ b/Common/Proto/BeforeCellData.cs @@ -24,8 +24,8 @@ namespace EggLink.DanhengServer.Proto { static BeforeCellDataReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChRCZWZvcmVDZWxsRGF0YS5wcm90bxoQQ2VsbFN0YXR1cy5wcm90bxobQ2hl", - "c3NSb2d1ZUxldmVsU3RhdHVzLnByb3RvGhlDaGVzc1JvZ3VlRXh0cmFJbmZv", + "ChRCZWZvcmVDZWxsRGF0YS5wcm90bxoZQ2hlc3NSb2d1ZUV4dHJhSW5mby5w", + "cm90bxoQQ2VsbFN0YXR1cy5wcm90bxobQ2hlc3NSb2d1ZUxldmVsU3RhdHVz", "LnByb3RvIrgCCg5CZWZvcmVDZWxsRGF0YRITCgtKRE5FRUhDS09FTBgCIAEo", "CBITCgtKSk9ORk9BTU9DQRgJIAEoDRITCgtLSUROT0pNQUNOShgGIAEoCBIT", "CgtEQkJBTkFGSklDTRgLIAEoDRIPCgdyb29tX2lkGA4gASgNEhMKC0hMRVBM", @@ -36,7 +36,7 @@ namespace EggLink.DanhengServer.Proto { "U3RhdHVzQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3Rv", "Mw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.CellStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueLevelStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueExtraInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessRogueExtraInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.CellStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueLevelStatusReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.BeforeCellData), global::EggLink.DanhengServer.Proto.BeforeCellData.Parser, new[]{ "JDNEEHCKOEL", "JJONFOAMOCA", "KIDNOJMACNJ", "DBBANAFJICM", "RoomId", "HLEPLKAFIMI", "ACPKANMGAHC", "BBGOCBILAIC", "GGLJMCCAABL", "CellInfo", "Id", "NODEBJOEJGJ" }, null, null, null, null) })); diff --git a/Common/Proto/ChallengeSettleNotify.cs b/Common/Proto/ChallengeSettleNotify.cs index cb4f7184..be4cadad 100644 --- a/Common/Proto/ChallengeSettleNotify.cs +++ b/Common/Proto/ChallengeSettleNotify.cs @@ -24,8 +24,8 @@ namespace EggLink.DanhengServer.Proto { static ChallengeSettleNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChtDaGFsbGVuZ2VTZXR0bGVOb3RpZnkucHJvdG8aDkl0ZW1MaXN0LnByb3Rv", - "GhFHRU1EUE1HSEhPRi5wcm90byLjAQoVQ2hhbGxlbmdlU2V0dGxlTm90aWZ5", + "ChtDaGFsbGVuZ2VTZXR0bGVOb3RpZnkucHJvdG8aEUdFTURQTUdISE9GLnBy", + "b3RvGg5JdGVtTGlzdC5wcm90byLjAQoVQ2hhbGxlbmdlU2V0dGxlTm90aWZ5", "EhMKC0xJT0xJSE1LQkRKGAkgASgNEg0KBXN0YXJzGA0gASgNEiEKC0pLTkNH", "Q05LT0VMGAIgASgLMgwuR0VNRFBNR0hIT0YSEwoLR0pGQkpFRElJS0gYCCAB", "KA0SEwoLSkFDTUVFSkdGR0MYDyABKAgSEwoLSUZHSUtNSElOSEsYCiABKA0S", @@ -33,7 +33,7 @@ namespace EggLink.DanhengServer.Proto { "ASgNEhMKC0JESElMQ0JPUEZKGAcgAygNQh6qAhtFZ2dMaW5rLkRhbmhlbmdT", "ZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.GEMDPMGHHOFReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.GEMDPMGHHOFReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ChallengeSettleNotify), global::EggLink.DanhengServer.Proto.ChallengeSettleNotify.Parser, new[]{ "LIOLIHMKBDJ", "Stars", "JKNCGCNKOEL", "GJFBJEDIIKH", "JACMEEJGFGC", "IFGIKMHINHK", "Reward", "ChallengeId", "BDHILCBOPFJ" }, null, null, null, null) })); diff --git a/Common/Proto/Chapter.cs b/Common/Proto/Chapter.cs index e5c876ad..4ec094e9 100644 --- a/Common/Proto/Chapter.cs +++ b/Common/Proto/Chapter.cs @@ -24,12 +24,12 @@ namespace EggLink.DanhengServer.Proto { static ChapterReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cg1DaGFwdGVyLnByb3RvGhJDaGFwdGVyQnJpZWYucHJvdG8aDldheXBvaW50", + "Cg1DaGFwdGVyLnByb3RvGg5XYXlwb2ludC5wcm90bxoSQ2hhcHRlckJyaWVm", "LnByb3RvIk4KB0NoYXB0ZXISIAoNd2F5cG9pbnRfbGlzdBgBIAMoCzIJLldh", "eXBvaW50EiEKCmJyaWVmX2luZm8YAiABKAsyDS5DaGFwdGVyQnJpZWZCHqoC", "G0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChapterBriefReflection.Descriptor, global::EggLink.DanhengServer.Proto.WaypointReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.WaypointReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChapterBriefReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.Chapter), global::EggLink.DanhengServer.Proto.Chapter.Parser, new[]{ "WaypointList", "BriefInfo" }, null, null, null, null) })); diff --git a/Common/Proto/ChessRogueAeonData.cs b/Common/Proto/ChessRogueAeonData.cs index ac15f39c..48380a0d 100644 --- a/Common/Proto/ChessRogueAeonData.cs +++ b/Common/Proto/ChessRogueAeonData.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static ChessRogueAeonDataReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChhDaGVzc1JvZ3VlQWVvbkRhdGEucHJvdG8aFk1vZmlNb2RpZmllckxpc3Qu", - "cHJvdG8aE0NoZXNzQWVvbkluZm8ucHJvdG8irwEKEkNoZXNzUm9ndWVBZW9u", + "ChhDaGVzc1JvZ3VlQWVvbkRhdGEucHJvdG8aE0NoZXNzQWVvbkluZm8ucHJv", + "dG8aFk1vZmlNb2RpZmllckxpc3QucHJvdG8irwEKEkNoZXNzUm9ndWVBZW9u", "RGF0YRInCg9jaGVzc19hZW9uX2luZm8YDSABKAsyDi5DaGVzc0Flb25JbmZv", "Eh0KFXVubG9ja2VkX2Flb25faWRfbGlzdBgJIAMoDRInCgxhZGRfbW9kaWZp", "ZXIYByABKAsyES5Nb2ZpTW9kaWZpZXJMaXN0EhMKC2N1cl9hZW9uX2lkGAUg", "ASgNEhMKC0VOT0NLQUFEREJKGAsgASgFQh6qAhtFZ2dMaW5rLkRhbmhlbmdT", "ZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MofiModifierListReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessAeonInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessAeonInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.MofiModifierListReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ChessRogueAeonData), global::EggLink.DanhengServer.Proto.ChessRogueAeonData.Parser, new[]{ "ChessAeonInfo", "UnlockedAeonIdList", "AddModifier", "CurAeonId", "ENOCKAADDBJ" }, null, null, null, null) })); diff --git a/Common/Proto/ChessRogueCellInfo.cs b/Common/Proto/ChessRogueCellInfo.cs index b538ca1d..8ace9638 100644 --- a/Common/Proto/ChessRogueCellInfo.cs +++ b/Common/Proto/ChessRogueCellInfo.cs @@ -24,12 +24,12 @@ namespace EggLink.DanhengServer.Proto { static ChessRogueCellInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChhDaGVzc1JvZ3VlQ2VsbEluZm8ucHJvdG8aD1NjZW5lSW5mby5wcm90bxoQ", - "TGluZXVwSW5mby5wcm90byJMChJDaGVzc1JvZ3VlQ2VsbEluZm8SGwoGbGlu", + "ChhDaGVzc1JvZ3VlQ2VsbEluZm8ucHJvdG8aEExpbmV1cEluZm8ucHJvdG8a", + "D1NjZW5lSW5mby5wcm90byJMChJDaGVzc1JvZ3VlQ2VsbEluZm8SGwoGbGlu", "ZXVwGAYgASgLMgsuTGluZXVwSW5mbxIZCgVzY2VuZRgBIAEoCzIKLlNjZW5l", "SW5mb0IeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ChessRogueCellInfo), global::EggLink.DanhengServer.Proto.ChessRogueCellInfo.Parser, new[]{ "Lineup", "Scene" }, null, null, null, null) })); diff --git a/Common/Proto/ChessRogueCellUpdateNotify.cs b/Common/Proto/ChessRogueCellUpdateNotify.cs index ca5de486..6afc5a0d 100644 --- a/Common/Proto/ChessRogueCellUpdateNotify.cs +++ b/Common/Proto/ChessRogueCellUpdateNotify.cs @@ -25,15 +25,15 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CiBDaGVzc1JvZ3VlQ2VsbFVwZGF0ZU5vdGlmeS5wcm90bxokQ2hlc3NSb2d1", - "ZUNlbGxVcGRhdGVSZWFzb25UeXBlLnByb3RvGhRCZWZvcmVDZWxsRGF0YS5w", - "cm90bxodUm9ndWVNb2RpZmllclNvdXJjZVR5cGUucHJvdG8itQEKGkNoZXNz", + "ZUNlbGxVcGRhdGVSZWFzb25UeXBlLnByb3RvGh1Sb2d1ZU1vZGlmaWVyU291", + "cmNlVHlwZS5wcm90bxoUQmVmb3JlQ2VsbERhdGEucHJvdG8itQEKGkNoZXNz", "Um9ndWVDZWxsVXBkYXRlTm90aWZ5EhMKC0tERUdLSUFLRUpBGAYgASgNEi0K", "C3NvdXJjZV90eXBlGAcgASgOMhguUm9ndWVNb2RpZmllclNvdXJjZVR5cGUS", "IgoJY2VsbF9kYXRhGAogAygLMg8uQmVmb3JlQ2VsbERhdGESLwoGcmVhc29u", "GAwgASgOMh8uQ2hlc3NSb2d1ZUNlbGxVcGRhdGVSZWFzb25UeXBlQh6qAhtF", "Z2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessRogueCellUpdateReasonTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.BeforeCellDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueModifierSourceTypeReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessRogueCellUpdateReasonTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueModifierSourceTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.BeforeCellDataReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ChessRogueCellUpdateNotify), global::EggLink.DanhengServer.Proto.ChessRogueCellUpdateNotify.Parser, new[]{ "KDEGKIAKEJA", "SourceType", "CellData", "Reason" }, null, null, null, null) })); diff --git a/Common/Proto/ChessRogueDiceData.cs b/Common/Proto/ChessRogueDiceData.cs index 0c4afe66..13bfc290 100644 --- a/Common/Proto/ChessRogueDiceData.cs +++ b/Common/Proto/ChessRogueDiceData.cs @@ -24,9 +24,9 @@ namespace EggLink.DanhengServer.Proto { static ChessRogueDiceDataReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChhDaGVzc1JvZ3VlRGljZURhdGEucHJvdG8aFENoZXNzUm9ndWVEaWNlLnBy", - "b3RvGhpDaGVzc1JvZ3VlRGljZVN0YXR1cy5wcm90bxoWTW9maU1vZGlmaWVy", - "TGlzdC5wcm90bxoYQ2hlc3NSb2d1ZURpY2VUeXBlLnByb3RvIuQDChJDaGVz", + "ChhDaGVzc1JvZ3VlRGljZURhdGEucHJvdG8aGENoZXNzUm9ndWVEaWNlVHlw", + "ZS5wcm90bxoUQ2hlc3NSb2d1ZURpY2UucHJvdG8aFk1vZmlNb2RpZmllckxp", + "c3QucHJvdG8aGkNoZXNzUm9ndWVEaWNlU3RhdHVzLnByb3RvIuQDChJDaGVz", "c1JvZ3VlRGljZURhdGESEwoLY3VyX3N1cmZhY2UYCSABKA0SFAoLQkNITU5N", "QkVMTEYYugMgAygNEiIKCGN1cl9kaWNlGIkMIAEoCzIPLkNoZXNzUm9ndWVE", "aWNlEhMKC0dLQU9DUEJLTk1MGAIgASgNEhQKC0VOS0JPTENQS0ZCGK4NIAEo", @@ -40,7 +40,7 @@ namespace EggLink.DanhengServer.Proto { "ThgEIAEoDRITCgtPR0xKQ0VJRE5OQhgBIAEoDUIeqgIbRWdnTGluay5EYW5o", "ZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessRogueDiceReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueDiceStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.MofiModifierListReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueDiceTypeReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessRogueDiceTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueDiceReflection.Descriptor, global::EggLink.DanhengServer.Proto.MofiModifierListReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueDiceStatusReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ChessRogueDiceData), global::EggLink.DanhengServer.Proto.ChessRogueDiceData.Parser, new[]{ "CurSurface", "BCHMNMBELLF", "CurDice", "GKAOCPBKNML", "ENKBOLCPKFB", "LFAJDOAPDCE", "BranchId", "RerollCount", "PHPGNFGDPLC", "CheatCount", "FFLMNAJODPF", "AddDiceModifier", "DiceBranchId", "DiceType", "DiceStatus", "KNNJJCBONHN", "OGLJCEIDNNB" }, null, null, null, null) })); diff --git a/Common/Proto/ChessRogueExploreFinishInfo.cs b/Common/Proto/ChessRogueExploreFinishInfo.cs index 4f6b0491..70ceebe7 100644 --- a/Common/Proto/ChessRogueExploreFinishInfo.cs +++ b/Common/Proto/ChessRogueExploreFinishInfo.cs @@ -24,10 +24,10 @@ namespace EggLink.DanhengServer.Proto { static ChessRogueExploreFinishInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiFDaGVzc1JvZ3VlRXhwbG9yZUZpbmlzaEluZm8ucHJvdG8aH0NoZXNzUm9n", - "dWVBY2NvdW50QnlTdGF0dXMucHJvdG8aGFJvZ3VlTWlyYWNsZUVmZmVjdC5w", - "cm90bxoQTGluZXVwSW5mby5wcm90bxoTUm9ndWVCdWZmSW5mby5wcm90bxoO", - "SXRlbUxpc3QucHJvdG8aGUNoZXNzUm9ndWVTdG9yeUluZm8ucHJvdG8iqQQK", + "CiFDaGVzc1JvZ3VlRXhwbG9yZUZpbmlzaEluZm8ucHJvdG8aEExpbmV1cElu", + "Zm8ucHJvdG8aH0NoZXNzUm9ndWVBY2NvdW50QnlTdGF0dXMucHJvdG8aGUNo", + "ZXNzUm9ndWVTdG9yeUluZm8ucHJvdG8aGFJvZ3VlTWlyYWNsZUVmZmVjdC5w", + "cm90bxoTUm9ndWVCdWZmSW5mby5wcm90bxoOSXRlbUxpc3QucHJvdG8iqQQK", "G0NoZXNzUm9ndWVFeHBsb3JlRmluaXNoSW5mbxIRCglpc19maW5pc2gYCSAB", "KAgSKQoKc3RvcnlfaW5mbxjaBSABKAsyFC5DaGVzc1JvZ3VlU3RvcnlJbmZv", "Ei8KC0RGRkhPTkNEQUdCGAUgASgOMhouQ2hlc3NSb2d1ZUFjY291bnRCeVN0", @@ -43,7 +43,7 @@ namespace EggLink.DanhengServer.Proto { "TE9QTEYYpwIgASgNQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9i", "BnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessRogueAccountByStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleEffectReflection.Descriptor, global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueStoryInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueAccountByStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueStoryInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleEffectReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ChessRogueExploreFinishInfo), global::EggLink.DanhengServer.Proto.ChessRogueExploreFinishInfo.Parser, new[]{ "IsFinish", "StoryInfo", "DFFHONCDAGB", "MPAMLCADHFM", "IOFEJOECPKP", "ScoreId", "GameBuffInfo", "RogueVersionId", "GGKEKEAFOPK", "LKJMIEAKDGB", "MIDHHLKHCHF", "BAADIIGGNMF", "EAKHBEIMHPF", "EGNDNIKNIIP", "JMAFBLHFGPI", "HNDPHBCIPHP", "DLOGLNDBIGN", "GameMiracleInfo", "BFMPOPLOPLF" }, null, null, null, null) })); diff --git a/Common/Proto/ChessRogueInfo.cs b/Common/Proto/ChessRogueInfo.cs index 5616797c..a705a2f2 100644 --- a/Common/Proto/ChessRogueInfo.cs +++ b/Common/Proto/ChessRogueInfo.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static ChessRogueInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChRDaGVzc1JvZ3VlSW5mby5wcm90bxoWUm9ndWVBY3Rpb25RdWV1ZS5wcm90", - "bxoRR0ZNQ05NS0hHTlAucHJvdG8aGUdhbWVWaXJ0dWFsSXRlbUluZm8ucHJv", - "dG8aHUNoZXNzUm9ndWVOb3VzVmFsdWVJbmZvLnByb3RvGhhDaGVzc1JvZ3Vl", - "SXRlbUluZm8ucHJvdG8aGENoZXNzUm9ndWVBZW9uRGF0YS5wcm90bxoZQ2hl", - "c3NSb2d1ZVN0b3J5SW5mby5wcm90bxoRT0pMSE9CQkNDSVAucHJvdG8aGENo", - "ZXNzUm9ndWVEaWNlRGF0YS5wcm90bxoZQ2hlc3NSb2d1ZUxldmVsSW5mby5w", - "cm90bxobQ2hlc3NSb2d1ZU1pcmFjbGVJbmZvLnByb3RvGhFIR0VERURMTklD", - "Ty5wcm90bxoaQ2hlc3NSb2d1ZUF2YXRhckluZm8ucHJvdG8aGENoZXNzUm9n", - "dWVCdWZmSW5mby5wcm90byKCBQoOQ2hlc3NSb2d1ZUluZm8SIQoLQ0NCTUxP", + "ChRDaGVzc1JvZ3VlSW5mby5wcm90bxoZR2FtZVZpcnR1YWxJdGVtSW5mby5w", + "cm90bxoaQ2hlc3NSb2d1ZUF2YXRhckluZm8ucHJvdG8aFlJvZ3VlQWN0aW9u", + "UXVldWUucHJvdG8aGENoZXNzUm9ndWVJdGVtSW5mby5wcm90bxoZQ2hlc3NS", + "b2d1ZVN0b3J5SW5mby5wcm90bxoRT0pMSE9CQkNDSVAucHJvdG8aEUhHRURF", + "RExOSUNPLnByb3RvGhtDaGVzc1JvZ3VlTWlyYWNsZUluZm8ucHJvdG8aGUNo", + "ZXNzUm9ndWVMZXZlbEluZm8ucHJvdG8aHUNoZXNzUm9ndWVOb3VzVmFsdWVJ", + "bmZvLnByb3RvGhhDaGVzc1JvZ3VlQnVmZkluZm8ucHJvdG8aGENoZXNzUm9n", + "dWVEaWNlRGF0YS5wcm90bxoYQ2hlc3NSb2d1ZUFlb25EYXRhLnByb3RvGhFH", + "Rk1DTk1LSEdOUC5wcm90byKCBQoOQ2hlc3NSb2d1ZUluZm8SIQoLQ0NCTUxP", "TkpGTkIYDCABKAsyDC5HRk1DTk1LSEdOUBIoCgptb25leV9pbmZvGAQgASgL", "MhQuR2FtZVZpcnR1YWxJdGVtSW5mbxImCglpdGVtX2luZm8YBSADKAsyEy5D", "aGVzc1JvZ3VlSXRlbUluZm8SMQoRZ2FtZV9taXJhY2xlX2luZm8YDyABKAsy", @@ -49,7 +49,7 @@ namespace EggLink.DanhengServer.Proto { "bEluZm8SGAoQcm9ndWVfdmVyc2lvbl9pZBgHIAEoDUIeqgIbRWdnTGluay5E", "YW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueActionQueueReflection.Descriptor, global::EggLink.DanhengServer.Proto.GFMCNMKHGNPReflection.Descriptor, global::EggLink.DanhengServer.Proto.GameVirtualItemInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueNousValueInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueItemInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueAeonDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueStoryInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.OJLHOBBCCIPReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueDiceDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueLevelInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueMiracleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.HGEDEDLNICOReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueAvatarInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueBuffInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.GameVirtualItemInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueAvatarInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueActionQueueReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueItemInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueStoryInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.OJLHOBBCCIPReflection.Descriptor, global::EggLink.DanhengServer.Proto.HGEDEDLNICOReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueMiracleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueLevelInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueNousValueInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueBuffInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueDiceDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueAeonDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.GFMCNMKHGNPReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ChessRogueInfo), global::EggLink.DanhengServer.Proto.ChessRogueInfo.Parser, new[]{ "CCBMLONJFNB", "MoneyInfo", "ItemInfo", "GameMiracleInfo", "NousValue", "RogueVirtualItemInfo", "StoryInfo", "GameLineupInfo", "OKMJFEJJIGN", "GameBuffInfo", "RogueAeonInfo", "CurAction", "DiceData", "LevelInfo", "RogueVersionId" }, null, null, null, null) })); diff --git a/Common/Proto/ChessRogueItemInfo.cs b/Common/Proto/ChessRogueItemInfo.cs index ef4a6a7c..23d2ac3a 100644 --- a/Common/Proto/ChessRogueItemInfo.cs +++ b/Common/Proto/ChessRogueItemInfo.cs @@ -25,9 +25,9 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChhDaGVzc1JvZ3VlSXRlbUluZm8ucHJvdG8aF0NoZXNzR2FtZUFlb25JbmZv", - "LnByb3RvGh9DaGVzc1JvZ3VlVmlydHVhbEl0ZW1JbmZvLnByb3RvGhFFQ0JL", - "RExKSE9MTi5wcm90bxobQ2hlc3NSb2d1ZU1pcmFjbGVJbmZvLnByb3RvGhhD", - "aGVzc1JvZ3VlQnVmZkluZm8ucHJvdG8i+AEKEkNoZXNzUm9ndWVJdGVtSW5m", + "LnByb3RvGhtDaGVzc1JvZ3VlTWlyYWNsZUluZm8ucHJvdG8aGENoZXNzUm9n", + "dWVCdWZmSW5mby5wcm90bxofQ2hlc3NSb2d1ZVZpcnR1YWxJdGVtSW5mby5w", + "cm90bxoRRUNCS0RMSkhPTE4ucHJvdG8i+AEKEkNoZXNzUm9ndWVJdGVtSW5m", "bxIrCg5nYW1lX2J1ZmZfaW5mbxgIIAEoCzITLkNoZXNzUm9ndWVCdWZmSW5m", "bxIxChFnYW1lX21pcmFjbGVfaW5mbxgDIAEoCzIWLkNoZXNzUm9ndWVNaXJh", "Y2xlSW5mbxIyCg5nYW1lX2l0ZW1faW5mbxgLIAEoCzIaLkNoZXNzUm9ndWVW", @@ -35,7 +35,7 @@ namespace EggLink.DanhengServer.Proto { "c3NHYW1lQWVvbkluZm8SIQoLT0tNSkZFSkpJR04YBCABKAsyDC5FQ0JLRExK", "SE9MTkIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessGameAeonInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueVirtualItemInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ECBKDLJHOLNReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueMiracleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueBuffInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessGameAeonInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueMiracleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueBuffInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueVirtualItemInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ECBKDLJHOLNReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ChessRogueItemInfo), global::EggLink.DanhengServer.Proto.ChessRogueItemInfo.Parser, new[]{ "GameBuffInfo", "GameMiracleInfo", "GameItemInfo", "RogueAeonInfo", "OKMJFEJJIGN" }, null, null, null, null) })); diff --git a/Common/Proto/ChessRogueQueryScRsp.cs b/Common/Proto/ChessRogueQueryScRsp.cs index b9bf289a..ffd626e8 100644 --- a/Common/Proto/ChessRogueQueryScRsp.cs +++ b/Common/Proto/ChessRogueQueryScRsp.cs @@ -24,10 +24,10 @@ namespace EggLink.DanhengServer.Proto { static ChessRogueQueryScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChpDaGVzc1JvZ3VlUXVlcnlTY1JzcC5wcm90bxohQ2hlc3NSb2d1ZUV4cGxv", - "cmVGaW5pc2hJbmZvLnByb3RvGhRDaGVzc1JvZ3VlSW5mby5wcm90bxoSR2Ft", - "ZVBsYXlJbmZvLnByb3RvGhFKTUtGR0lOT0FISy5wcm90bxoYQ2hlc3NSb2d1", - "ZUdhbWVJbmZvLnByb3RvIvEBChRDaGVzc1JvZ3VlUXVlcnlTY1JzcBIPCgdy", + "ChpDaGVzc1JvZ3VlUXVlcnlTY1JzcC5wcm90bxoYQ2hlc3NSb2d1ZUdhbWVJ", + "bmZvLnByb3RvGiFDaGVzc1JvZ3VlRXhwbG9yZUZpbmlzaEluZm8ucHJvdG8a", + "FENoZXNzUm9ndWVJbmZvLnByb3RvGhJHYW1lUGxheUluZm8ucHJvdG8aEUpN", + "S0ZHSU5PQUhLLnByb3RvIvEBChRDaGVzc1JvZ3VlUXVlcnlTY1JzcBIPCgdy", "ZXRjb2RlGAwgASgNEiUKDnJvZ3VlX2dldF9pbmZvGAggASgLMg0uR2FtZVBs", "YXlJbmZvEh0KBGluZm8YCiABKAsyDy5DaGVzc1JvZ3VlSW5mbxIxCgtFTU5L", "SklESEhJRBgJIAEoCzIcLkNoZXNzUm9ndWVFeHBsb3JlRmluaXNoSW5mbxIh", @@ -35,7 +35,7 @@ namespace EggLink.DanhengServer.Proto { "bWVfaW5mbxgHIAEoCzITLkNoZXNzUm9ndWVHYW1lSW5mb0IeqgIbRWdnTGlu", "ay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessRogueExploreFinishInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.GamePlayInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.JMKFGINOAHKReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueGameInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessRogueGameInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueExploreFinishInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.GamePlayInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.JMKFGINOAHKReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ChessRogueQueryScRsp), global::EggLink.DanhengServer.Proto.ChessRogueQueryScRsp.Parser, new[]{ "Retcode", "RogueGetInfo", "Info", "EMNKJIDHHID", "EFMPFBCEMIG", "RogueGameInfo" }, null, null, null, null) })); diff --git a/Common/Proto/ChessRogueUpdateLevelBaseInfoScNotify.cs b/Common/Proto/ChessRogueUpdateLevelBaseInfoScNotify.cs index 845851bf..9e06a250 100644 --- a/Common/Proto/ChessRogueUpdateLevelBaseInfoScNotify.cs +++ b/Common/Proto/ChessRogueUpdateLevelBaseInfoScNotify.cs @@ -25,13 +25,13 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CitDaGVzc1JvZ3VlVXBkYXRlTGV2ZWxCYXNlSW5mb1NjTm90aWZ5LnByb3Rv", - "GhFQS05KT0NIQ0FQQS5wcm90bxohQ2hlc3NSb2d1ZVVwZGF0ZUxldmVsU3Rh", - "dHVzLnByb3RvIngKJUNoZXNzUm9ndWVVcGRhdGVMZXZlbEJhc2VJbmZvU2NO", + "GiFDaGVzc1JvZ3VlVXBkYXRlTGV2ZWxTdGF0dXMucHJvdG8aEVBLTkpPQ0hD", + "QVBBLnByb3RvIngKJUNoZXNzUm9ndWVVcGRhdGVMZXZlbEJhc2VJbmZvU2NO", "b3RpZnkSLAoGcmVhc29uGA0gASgOMhwuQ2hlc3NSb2d1ZVVwZGF0ZUxldmVs", "U3RhdHVzEiEKC0xJRElFUE5LRUdDGAEgASgOMgwuUEtOSk9DSENBUEFCHqoC", "G0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.PKNJOCHCAPAReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueUpdateLevelStatusReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessRogueUpdateLevelStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.PKNJOCHCAPAReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ChessRogueUpdateLevelBaseInfoScNotify), global::EggLink.DanhengServer.Proto.ChessRogueUpdateLevelBaseInfoScNotify.Parser, new[]{ "Reason", "LIDIEPNKEGC" }, null, null, null, null) })); diff --git a/Common/Proto/ClientMail.cs b/Common/Proto/ClientMail.cs index 434e7fde..be667d05 100644 --- a/Common/Proto/ClientMail.cs +++ b/Common/Proto/ClientMail.cs @@ -24,7 +24,7 @@ namespace EggLink.DanhengServer.Proto { static ClientMailReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChBDbGllbnRNYWlsLnByb3RvGg5NYWlsVHlwZS5wcm90bxoOSXRlbUxpc3Qu", + "ChBDbGllbnRNYWlsLnByb3RvGg5JdGVtTGlzdC5wcm90bxoOTWFpbFR5cGUu", "cHJvdG8i4QEKCkNsaWVudE1haWwSDwoHaXNfcmVhZBgCIAEoCBIRCglwYXJh", "X2xpc3QYBCADKAkSEwoLZXhwaXJlX3RpbWUYDiABKAMSDQoFdGl0bGUYByAB", "KAkSDAoEdGltZRgPIAEoAxIKCgJpZBgBIAEoDRITCgt0ZW1wbGF0ZV9pZBgJ", @@ -33,7 +33,7 @@ namespace EggLink.DanhengServer.Proto { "SXRlbUxpc3RCHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJv", "dG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MailTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.MailTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ClientMail), global::EggLink.DanhengServer.Proto.ClientMail.Parser, new[]{ "IsRead", "ParaList", "ExpireTime", "Title", "Time", "Id", "TemplateId", "MailType", "Content", "Sender", "Attachment" }, null, null, null, null) })); diff --git a/Common/Proto/CurChallenge.cs b/Common/Proto/CurChallenge.cs index dce8153d..6af343d5 100644 --- a/Common/Proto/CurChallenge.cs +++ b/Common/Proto/CurChallenge.cs @@ -24,9 +24,9 @@ namespace EggLink.DanhengServer.Proto { static CurChallengeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChJDdXJDaGFsbGVuZ2UucHJvdG8aFUV4dHJhTGluZXVwVHlwZS5wcm90bxoV", - "Q2hhbGxlbmdlU3RhdHVzLnByb3RvGhVLaWxsTW9uc3RlckluZm8ucHJvdG8a", - "EUdOQUZOTVBJSUNDLnByb3RvIpICCgxDdXJDaGFsbGVuZ2USKwoRZXh0cmFf", + "ChJDdXJDaGFsbGVuZ2UucHJvdG8aFUNoYWxsZW5nZVN0YXR1cy5wcm90bxoV", + "RXh0cmFMaW5ldXBUeXBlLnByb3RvGhFHTkFGTk1QSUlDQy5wcm90bxoVS2ls", + "bE1vbnN0ZXJJbmZvLnByb3RvIpICCgxDdXJDaGFsbGVuZ2USKwoRZXh0cmFf", "bGluZXVwX3R5cGUYBCABKA4yEC5FeHRyYUxpbmV1cFR5cGUSEwoLSUZHSUtN", "SElOSEsYAiABKA0SHwoJY2VsbF9pbmZvGAYgASgLMgwuR05BRk5NUElJQ0MS", "IAoGc3RhdHVzGAogASgOMhAuQ2hhbGxlbmdlU3RhdHVzEisKEWtpbGxfbW9u", @@ -35,7 +35,7 @@ namespace EggLink.DanhengServer.Proto { "ASgNEhQKDGNoYWxsZW5nZV9pZBgOIAEoDUIeqgIbRWdnTGluay5EYW5oZW5n", "U2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ExtraLineupTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChallengeStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.KillMonsterInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.GNAFNMPIICCReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChallengeStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.ExtraLineupTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.GNAFNMPIICCReflection.Descriptor, global::EggLink.DanhengServer.Proto.KillMonsterInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.CurChallenge), global::EggLink.DanhengServer.Proto.CurChallenge.Parser, new[]{ "ExtraLineupType", "IFGIKMHINHK", "CellInfo", "Status", "KillMonsterList", "EPIBHGGDLHC", "FIOOIEMCCGM", "ScoreId", "ChallengeId" }, null, null, null, null) })); diff --git a/Common/Proto/DialogueResultInfo.cs b/Common/Proto/DialogueResultInfo.cs index f11b81f5..84601044 100644 --- a/Common/Proto/DialogueResultInfo.cs +++ b/Common/Proto/DialogueResultInfo.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static DialogueResultInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChhEaWFsb2d1ZVJlc3VsdEluZm8ucHJvdG8aDkl0ZW1MaXN0LnByb3RvGhlS", - "b2d1ZURpYWxvZ3VlUmVzdWx0LnByb3RvIoUBChJEaWFsb2d1ZVJlc3VsdElu", + "ChhEaWFsb2d1ZVJlc3VsdEluZm8ucHJvdG8aGVJvZ3VlRGlhbG9ndWVSZXN1", + "bHQucHJvdG8aDkl0ZW1MaXN0LnByb3RvIoUBChJEaWFsb2d1ZVJlc3VsdElu", "Zm8SEwoLSVBOTkZLSkxHQU0YCiADKA0SOgoccm9ndWVfZGlhbG9ndWVfcmVz", "dWx0X3N0YXR1cxgBIAEoDjIULlJvZ3VlRGlhbG9ndWVSZXN1bHQSHgoLaXRl", "bV9yZXN1bHQYDyABKAsyCS5JdGVtTGlzdEIeqgIbRWdnTGluay5EYW5oZW5n", "U2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueDialogueResultReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueDialogueResultReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.DialogueResultInfo), global::EggLink.DanhengServer.Proto.DialogueResultInfo.Parser, new[]{ "IPNNFKJLGAM", "RogueDialogueResultStatus", "ItemResult" }, null, null, null, null) })); diff --git a/Common/Proto/DisplayAvatarDetailInfo.cs b/Common/Proto/DisplayAvatarDetailInfo.cs index 6bbf15de..f31194bf 100644 --- a/Common/Proto/DisplayAvatarDetailInfo.cs +++ b/Common/Proto/DisplayAvatarDetailInfo.cs @@ -24,9 +24,9 @@ namespace EggLink.DanhengServer.Proto { static DisplayAvatarDetailInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch1EaXNwbGF5QXZhdGFyRGV0YWlsSW5mby5wcm90bxoaRGlzcGxheUVxdWlw", - "bWVudEluZm8ucHJvdG8aFUF2YXRhclNraWxsVHJlZS5wcm90bxoWRGlzcGxh", - "eVJlbGljSW5mby5wcm90byKKAgoXRGlzcGxheUF2YXRhckRldGFpbEluZm8S", + "Ch1EaXNwbGF5QXZhdGFyRGV0YWlsSW5mby5wcm90bxoWRGlzcGxheVJlbGlj", + "SW5mby5wcm90bxoVQXZhdGFyU2tpbGxUcmVlLnByb3RvGhpEaXNwbGF5RXF1", + "aXBtZW50SW5mby5wcm90byKKAgoXRGlzcGxheUF2YXRhckRldGFpbEluZm8S", "JQoKcmVsaWNfbGlzdBgBIAMoCzIRLkRpc3BsYXlSZWxpY0luZm8SDQoFbGV2", "ZWwYCCABKA0SKAoJZXF1aXBtZW50GA4gASgLMhUuRGlzcGxheUVxdWlwbWVu", "dEluZm8SDAoEcmFuaxgHIAEoDRILCgNleHAYDyABKA0SFwoPZHJlc3NlZF9z", @@ -35,7 +35,7 @@ namespace EggLink.DanhengServer.Proto { "YXZhdGFyX2lkGAYgASgNQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJv", "dG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.DisplayEquipmentInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarSkillTreeReflection.Descriptor, global::EggLink.DanhengServer.Proto.DisplayRelicInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.DisplayRelicInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarSkillTreeReflection.Descriptor, global::EggLink.DanhengServer.Proto.DisplayEquipmentInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.DisplayAvatarDetailInfo), global::EggLink.DanhengServer.Proto.DisplayAvatarDetailInfo.Parser, new[]{ "RelicList", "Level", "Equipment", "Rank", "Exp", "DressedSkinId", "SkilltreeList", "Pos", "Promotion", "AvatarId" }, null, null, null, null) })); diff --git a/Common/Proto/EACGDHHGNOK.cs b/Common/Proto/EACGDHHGNOK.cs index 1298a338..6766109f 100644 --- a/Common/Proto/EACGDHHGNOK.cs +++ b/Common/Proto/EACGDHHGNOK.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static EACGDHHGNOKReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFFQUNHREhIR05PSy5wcm90bxoRSExBQURPUEVPSUUucHJvdG8aEUZDSUZN", - "TUpORkJOLnByb3RvGhFHREJERElPRkJOSi5wcm90byJ2CgtFQUNHREhIR05P", + "ChFFQUNHREhIR05PSy5wcm90bxoRR0RCRERJT0ZCTkoucHJvdG8aEUhMQUFE", + "T1BFT0lFLnByb3RvGhFGQ0lGTU1KTkZCTi5wcm90byJ2CgtFQUNHREhIR05P", "SxIhCgtDQkVLRUNDSk1FTBgLIAEoCzIMLkhMQUFET1BFT0lFEiEKC09IQkxO", "QkhMTUhGGAggASgLMgwuRkNJRk1NSk5GQk4SIQoLTENJSERMRUREQ04YBSAB", "KAsyDC5HREJERElPRkJOSkIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlBy", "b3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.HLAADOPEOIEReflection.Descriptor, global::EggLink.DanhengServer.Proto.FCIFMMJNFBNReflection.Descriptor, global::EggLink.DanhengServer.Proto.GDBDDIOFBNJReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.GDBDDIOFBNJReflection.Descriptor, global::EggLink.DanhengServer.Proto.HLAADOPEOIEReflection.Descriptor, global::EggLink.DanhengServer.Proto.FCIFMMJNFBNReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.EACGDHHGNOK), global::EggLink.DanhengServer.Proto.EACGDHHGNOK.Parser, new[]{ "CBEKECCJMEL", "OHBLNBHLMHF", "LCIHDLEDDCN" }, null, null, null, null) })); diff --git a/Common/Proto/EnterRogueMapRoomScRsp.cs b/Common/Proto/EnterRogueMapRoomScRsp.cs index a705203f..c9b44122 100644 --- a/Common/Proto/EnterRogueMapRoomScRsp.cs +++ b/Common/Proto/EnterRogueMapRoomScRsp.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static EnterRogueMapRoomScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChxFbnRlclJvZ3VlTWFwUm9vbVNjUnNwLnByb3RvGg9TY2VuZUluZm8ucHJv", - "dG8aEExpbmV1cEluZm8ucHJvdG8icwoWRW50ZXJSb2d1ZU1hcFJvb21TY1Jz", + "ChxFbnRlclJvZ3VlTWFwUm9vbVNjUnNwLnByb3RvGhBMaW5ldXBJbmZvLnBy", + "b3RvGg9TY2VuZUluZm8ucHJvdG8icwoWRW50ZXJSb2d1ZU1hcFJvb21TY1Jz", "cBIQCghsZXZlbF9pZBgJIAEoDRIPCgdyZXRjb2RlGAggASgNEhsKBmxpbmV1", "cBgOIAEoCzILLkxpbmV1cEluZm8SGQoFc2NlbmUYBCABKAsyCi5TY2VuZUlu", "Zm9CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.EnterRogueMapRoomScRsp), global::EggLink.DanhengServer.Proto.EnterRogueMapRoomScRsp.Parser, new[]{ "LevelId", "Retcode", "Lineup", "Scene" }, null, null, null, null) })); diff --git a/Common/Proto/EnterRogueScRsp.cs b/Common/Proto/EnterRogueScRsp.cs index e8e9a6a8..0e49e791 100644 --- a/Common/Proto/EnterRogueScRsp.cs +++ b/Common/Proto/EnterRogueScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static EnterRogueScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChVFbnRlclJvZ3VlU2NSc3AucHJvdG8aD1JvZ3VlSW5mby5wcm90bxoPU2Nl", - "bmVJbmZvLnByb3RvGhBMaW5ldXBJbmZvLnByb3RvInoKD0VudGVyUm9ndWVT", + "ChVFbnRlclJvZ3VlU2NSc3AucHJvdG8aEExpbmV1cEluZm8ucHJvdG8aD1Nj", + "ZW5lSW5mby5wcm90bxoPUm9ndWVJbmZvLnByb3RvInoKD0VudGVyUm9ndWVT", "Y1JzcBIeCgpyb2d1ZV9pbmZvGAIgASgLMgouUm9ndWVJbmZvEg8KB3JldGNv", "ZGUYCCABKA0SGwoGbGluZXVwGAEgASgLMgsuTGluZXVwSW5mbxIZCgVzY2Vu", "ZRgFIAEoCzIKLlNjZW5lSW5mb0IeqgIbRWdnTGluay5EYW5oZW5nU2VydmVy", "LlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.EnterRogueScRsp), global::EggLink.DanhengServer.Proto.EnterRogueScRsp.Parser, new[]{ "RogueInfo", "Retcode", "Lineup", "Scene" }, null, null, null, null) })); diff --git a/Common/Proto/EnterSceneByServerScNotify.cs b/Common/Proto/EnterSceneByServerScNotify.cs index a8b63e19..d996ad64 100644 --- a/Common/Proto/EnterSceneByServerScNotify.cs +++ b/Common/Proto/EnterSceneByServerScNotify.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static EnterSceneByServerScNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiBFbnRlclNjZW5lQnlTZXJ2ZXJTY05vdGlmeS5wcm90bxoPU2NlbmVJbmZv", - "LnByb3RvGhBMaW5ldXBJbmZvLnByb3RvGhxFbnRlclNjZW5lUmVhc29uU3Rh", - "dHVzLnByb3RvIn0KGkVudGVyU2NlbmVCeVNlcnZlclNjTm90aWZ5EhsKBmxp", + "CiBFbnRlclNjZW5lQnlTZXJ2ZXJTY05vdGlmeS5wcm90bxoQTGluZXVwSW5m", + "by5wcm90bxocRW50ZXJTY2VuZVJlYXNvblN0YXR1cy5wcm90bxoPU2NlbmVJ", + "bmZvLnByb3RvIn0KGkVudGVyU2NlbmVCeVNlcnZlclNjTm90aWZ5EhsKBmxp", "bmV1cBgGIAEoCzILLkxpbmV1cEluZm8SGQoFc2NlbmUYBSABKAsyCi5TY2Vu", "ZUluZm8SJwoGcmVhc29uGAogASgOMhcuRW50ZXJTY2VuZVJlYXNvblN0YXR1", "c0IeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.EnterSceneReasonStatusReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.EnterSceneReasonStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.EnterSceneByServerScNotify), global::EggLink.DanhengServer.Proto.EnterSceneByServerScNotify.Parser, new[]{ "Lineup", "Scene", "Reason" }, null, null, null, null) })); diff --git a/Common/Proto/ExchangeGachaCeilingScRsp.cs b/Common/Proto/ExchangeGachaCeilingScRsp.cs index 43768e52..23cef09a 100644 --- a/Common/Proto/ExchangeGachaCeilingScRsp.cs +++ b/Common/Proto/ExchangeGachaCeilingScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static ExchangeGachaCeilingScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch9FeGNoYW5nZUdhY2hhQ2VpbGluZ1NjUnNwLnByb3RvGhJHYWNoYUNlaWxp", - "bmcucHJvdG8aDkl0ZW1MaXN0LnByb3RvIpgBChlFeGNoYW5nZUdhY2hhQ2Vp", + "Ch9FeGNoYW5nZUdhY2hhQ2VpbGluZ1NjUnNwLnByb3RvGg5JdGVtTGlzdC5w", + "cm90bxoSR2FjaGFDZWlsaW5nLnByb3RvIpgBChlFeGNoYW5nZUdhY2hhQ2Vp", "bGluZ1NjUnNwEhEKCWF2YXRhcl9pZBgEIAEoDRIeCgtPUEtGSkVFRkxLQxgC", "IAEoCzIJLkl0ZW1MaXN0EhMKC0RGSkVHS0dLT0NPGAogASgNEg8KB3JldGNv", "ZGUYAyABKA0SIgoLQVBFRE5ITkxPS0QYBSABKAsyDS5HYWNoYUNlaWxpbmdC", "HqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.GachaCeilingReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.GachaCeilingReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ExchangeGachaCeilingScRsp), global::EggLink.DanhengServer.Proto.ExchangeGachaCeilingScRsp.Parser, new[]{ "AvatarId", "OPKFJEEFLKC", "DFJEGKGKOCO", "Retcode", "APEDNHNLOKD" }, null, null, null, null) })); diff --git a/Common/Proto/ExpeditionDataChangeScNotify.cs b/Common/Proto/ExpeditionDataChangeScNotify.cs index e51c763b..8d92281e 100644 --- a/Common/Proto/ExpeditionDataChangeScNotify.cs +++ b/Common/Proto/ExpeditionDataChangeScNotify.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static ExpeditionDataChangeScNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiJFeHBlZGl0aW9uRGF0YUNoYW5nZVNjTm90aWZ5LnByb3RvGhBFeHBlZGl0", - "aW9uLnByb3RvGhhBY3Rpdml0eUV4cGVkaXRpb24ucHJvdG8iqQEKHEV4cGVk", + "CiJFeHBlZGl0aW9uRGF0YUNoYW5nZVNjTm90aWZ5LnByb3RvGhhBY3Rpdml0", + "eUV4cGVkaXRpb24ucHJvdG8aEEV4cGVkaXRpb24ucHJvdG8iqQEKHEV4cGVk", "aXRpb25EYXRhQ2hhbmdlU2NOb3RpZnkSEwoLS1BQQU1ERUlQRUgYAiADKA0S", "EwoLREFNSkVPQktKSEwYCyABKA0SEwoLQ0ZPTExKSERMSEMYBiADKA0SIAoL", "SUVHSUNDTU1ES0YYDSADKAsyCy5FeHBlZGl0aW9uEigKC05DQUNHTE1OT0FL", "GAkgAygLMhMuQWN0aXZpdHlFeHBlZGl0aW9uQh6qAhtFZ2dMaW5rLkRhbmhl", "bmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ExpeditionReflection.Descriptor, global::EggLink.DanhengServer.Proto.ActivityExpeditionReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ActivityExpeditionReflection.Descriptor, global::EggLink.DanhengServer.Proto.ExpeditionReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ExpeditionDataChangeScNotify), global::EggLink.DanhengServer.Proto.ExpeditionDataChangeScNotify.Parser, new[]{ "KPPAMDEIPEH", "DAMJEOBKJHL", "CFOLLJHDLHC", "IEGICCMMDKF", "NCACGLMNOAK" }, null, null, null, null) })); diff --git a/Common/Proto/FNABDILJEHJ.cs b/Common/Proto/FNABDILJEHJ.cs index 0a249a12..d9b0f4a7 100644 --- a/Common/Proto/FNABDILJEHJ.cs +++ b/Common/Proto/FNABDILJEHJ.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static FNABDILJEHJReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFGTkFCRElMSkVISi5wcm90bxoRRENJRUJJQk1LUE0ucHJvdG8aFExvZ2lz", - "dGljc1Njb3JlLnByb3RvGhJMb2dpc3RpY3NNYXAucHJvdG8ijwEKC0ZOQUJE", + "ChFGTkFCRElMSkVISi5wcm90bxoUTG9naXN0aWNzU2NvcmUucHJvdG8aEURD", + "SUVCSUJNS1BNLnByb3RvGhJMb2dpc3RpY3NNYXAucHJvdG8ijwEKC0ZOQUJE", "SUxKRUhKEhMKC0JPRUxFT0JKQ05EGAcgAygNEiQKC05EQk5CUE1NUElIGAog", "AygLMg8uTG9naXN0aWNzU2NvcmUSIgoLRUJGT0JNQVBKT04YAyADKAsyDS5M", "b2dpc3RpY3NNYXASIQoLRUhPSkJLS1BFSkwYASADKAsyDC5EQ0lFQklCTUtQ", "TUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.DCIEBIBMKPMReflection.Descriptor, global::EggLink.DanhengServer.Proto.LogisticsScoreReflection.Descriptor, global::EggLink.DanhengServer.Proto.LogisticsMapReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LogisticsScoreReflection.Descriptor, global::EggLink.DanhengServer.Proto.DCIEBIBMKPMReflection.Descriptor, global::EggLink.DanhengServer.Proto.LogisticsMapReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.FNABDILJEHJ), global::EggLink.DanhengServer.Proto.FNABDILJEHJ.Parser, new[]{ "BOELEOBJCND", "NDBNBPMMPIH", "EBFOBMAPJON", "EHOJBKKPEJL" }, null, null, null, null) })); diff --git a/Common/Proto/FinishAeonDialogueGroupScRsp.cs b/Common/Proto/FinishAeonDialogueGroupScRsp.cs index c6df131d..df9cb75b 100644 --- a/Common/Proto/FinishAeonDialogueGroupScRsp.cs +++ b/Common/Proto/FinishAeonDialogueGroupScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static FinishAeonDialogueGroupScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiJGaW5pc2hBZW9uRGlhbG9ndWVHcm91cFNjUnNwLnByb3RvGhJHYW1lQWVv", - "bkluZm8ucHJvdG8aDkl0ZW1MaXN0LnByb3RvInIKHEZpbmlzaEFlb25EaWFs", + "CiJGaW5pc2hBZW9uRGlhbG9ndWVHcm91cFNjUnNwLnByb3RvGg5JdGVtTGlz", + "dC5wcm90bxoSR2FtZUFlb25JbmZvLnByb3RvInIKHEZpbmlzaEFlb25EaWFs", "b2d1ZUdyb3VwU2NSc3ASGQoGcmV3YXJkGAsgASgLMgkuSXRlbUxpc3QSDwoH", "cmV0Y29kZRgNIAEoDRImCg9yb2d1ZV9hZW9uX2luZm8YByABKAsyDS5HYW1l", "QWVvbkluZm9CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJv", "dG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.GameAeonInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.GameAeonInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.FinishAeonDialogueGroupScRsp), global::EggLink.DanhengServer.Proto.FinishAeonDialogueGroupScRsp.Parser, new[]{ "Reward", "Retcode", "RogueAeonInfo" }, null, null, null, null) })); diff --git a/Common/Proto/FinishPerformSectionIdScRsp.cs b/Common/Proto/FinishPerformSectionIdScRsp.cs index 15593fe4..5c65c97c 100644 --- a/Common/Proto/FinishPerformSectionIdScRsp.cs +++ b/Common/Proto/FinishPerformSectionIdScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static FinishPerformSectionIdScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiFGaW5pc2hQZXJmb3JtU2VjdGlvbklkU2NSc3AucHJvdG8aEU1lc3NhZ2VJ", - "dGVtLnByb3RvGg5JdGVtTGlzdC5wcm90byJ+ChtGaW5pc2hQZXJmb3JtU2Vj", + "CiFGaW5pc2hQZXJmb3JtU2VjdGlvbklkU2NSc3AucHJvdG8aDkl0ZW1MaXN0", + "LnByb3RvGhFNZXNzYWdlSXRlbS5wcm90byJ+ChtGaW5pc2hQZXJmb3JtU2Vj", "dGlvbklkU2NSc3ASHwoJaXRlbV9saXN0GAIgAygLMgwuTWVzc2FnZUl0ZW0S", "GQoGcmV3YXJkGA4gASgLMgkuSXRlbUxpc3QSDwoHcmV0Y29kZRgKIAEoDRIS", "CgpzZWN0aW9uX2lkGAwgASgNQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIu", "UHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MessageItemReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.MessageItemReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.FinishPerformSectionIdScRsp), global::EggLink.DanhengServer.Proto.FinishPerformSectionIdScRsp.Parser, new[]{ "ItemList", "Reward", "Retcode", "SectionId" }, null, null, null, null) })); diff --git a/Common/Proto/FinishTutorialGuideScRsp.cs b/Common/Proto/FinishTutorialGuideScRsp.cs index e35a6cc8..c7971f0f 100644 --- a/Common/Proto/FinishTutorialGuideScRsp.cs +++ b/Common/Proto/FinishTutorialGuideScRsp.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static FinishTutorialGuideScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch5GaW5pc2hUdXRvcmlhbEd1aWRlU2NSc3AucHJvdG8aE1R1dG9yaWFsR3Vp", - "ZGUucHJvdG8aDkl0ZW1MaXN0LnByb3RvIm4KGEZpbmlzaFR1dG9yaWFsR3Vp", + "Ch5GaW5pc2hUdXRvcmlhbEd1aWRlU2NSc3AucHJvdG8aDkl0ZW1MaXN0LnBy", + "b3RvGhNUdXRvcmlhbEd1aWRlLnByb3RvIm4KGEZpbmlzaFR1dG9yaWFsR3Vp", "ZGVTY1JzcBIZCgZyZXdhcmQYCCABKAsyCS5JdGVtTGlzdBIPCgdyZXRjb2Rl", "GAwgASgNEiYKDnR1dG9yaWFsX2d1aWRlGAYgASgLMg4uVHV0b3JpYWxHdWlk", "ZUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.TutorialGuideReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.TutorialGuideReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.FinishTutorialGuideScRsp), global::EggLink.DanhengServer.Proto.FinishTutorialGuideScRsp.Parser, new[]{ "Reward", "Retcode", "TutorialGuide" }, null, null, null, null) })); diff --git a/Common/Proto/GachaItem.cs b/Common/Proto/GachaItem.cs index 49970ded..148d2ea6 100644 --- a/Common/Proto/GachaItem.cs +++ b/Common/Proto/GachaItem.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static GachaItemReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cg9HYWNoYUl0ZW0ucHJvdG8aCkl0ZW0ucHJvdG8aDkl0ZW1MaXN0LnByb3Rv", + "Cg9HYWNoYUl0ZW0ucHJvdG8aDkl0ZW1MaXN0LnByb3RvGgpJdGVtLnByb3Rv", "InwKCUdhY2hhSXRlbRIZCgpnYWNoYV9pdGVtGAcgASgLMgUuSXRlbRIOCgZp", "c19uZXcYBCABKAgSHQoKdG9rZW5faXRlbRgGIAEoCzIJLkl0ZW1MaXN0EiUK", "EnRyYW5zZmVyX2l0ZW1fbGlzdBgKIAEoCzIJLkl0ZW1MaXN0Qh6qAhtFZ2dM", "aW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GachaItem), global::EggLink.DanhengServer.Proto.GachaItem.Parser, new[]{ "GachaItem_", "IsNew", "TokenItem", "TransferItemList" }, null, null, null, null) })); diff --git a/Common/Proto/GamePlayInfo.cs b/Common/Proto/GamePlayInfo.cs index cd780c38..892cc01a 100644 --- a/Common/Proto/GamePlayInfo.cs +++ b/Common/Proto/GamePlayInfo.cs @@ -25,8 +25,8 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChJHYW1lUGxheUluZm8ucHJvdG8aGVJvZ3VlTm91c1RhbGVudEluZm8ucHJv", - "dG8aEUxHREhOTUxKTENCLnByb3RvGhNDaGVzc0Flb25JbmZvLnByb3RvGhdS", - "b2d1ZU5vdXNEaWNlSW5mby5wcm90byLeAQoMR2FtZVBsYXlJbmZvEiEKC0tD", + "dG8aF1JvZ3VlTm91c0RpY2VJbmZvLnByb3RvGhNDaGVzc0Flb25JbmZvLnBy", + "b3RvGhFMR0RITk1MSkxDQi5wcm90byLeAQoMR2FtZVBsYXlJbmZvEiEKC0tD", "QkVJR0ZQQkxPGA4gASgLMgwuTEdESE5NTEpMQ0ISJwoLT0tNSkZFSkpJR04Y", "AyABKAsyEi5Sb2d1ZU5vdXNEaWNlSW5mbxIvChFyb2d1ZV90YWxlbnRfaW5m", "bxgJIAEoCzIULlJvZ3VlTm91c1RhbGVudEluZm8SJwoPY2hlc3NfYWVvbl9p", @@ -34,7 +34,7 @@ namespace EggLink.DanhengServer.Proto { "DRITCgtOQkdHSEZHRkdMTBgBIAMoDUIeqgIbRWdnTGluay5EYW5oZW5nU2Vy", "dmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueNousTalentInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.LGDHNMLJLCBReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessAeonInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueNousDiceInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueNousTalentInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueNousDiceInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessAeonInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.LGDHNMLJLCBReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GamePlayInfo), global::EggLink.DanhengServer.Proto.GamePlayInfo.Parser, new[]{ "KCBEIGFPBLO", "OKMJFEJJIGN", "RogueTalentInfo", "ChessAeonInfo", "CFFADBCJLHO", "NBGGHFGFGLL" }, null, null, null, null) })); diff --git a/Common/Proto/GetAetherDivideInfoScRsp.cs b/Common/Proto/GetAetherDivideInfoScRsp.cs index 43507cd9..cafed617 100644 --- a/Common/Proto/GetAetherDivideInfoScRsp.cs +++ b/Common/Proto/GetAetherDivideInfoScRsp.cs @@ -25,8 +25,8 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "Ch5HZXRBZXRoZXJEaXZpZGVJbmZvU2NSc3AucHJvdG8aHEFldGhlckRpdmlk", - "ZUxpbmV1cEluZm8ucHJvdG8aFUFldGhlclNraWxsSW5mby5wcm90bxocQWV0", - "aGVyRGl2aWRlU3Bpcml0SW5mby5wcm90byKpAgoYR2V0QWV0aGVyRGl2aWRl", + "ZVNwaXJpdEluZm8ucHJvdG8aHEFldGhlckRpdmlkZUxpbmV1cEluZm8ucHJv", + "dG8aFUFldGhlclNraWxsSW5mby5wcm90byKpAgoYR2V0QWV0aGVyRGl2aWRl", "SW5mb1NjUnNwEhMKC09IRENFRUJBSEJGGAIgASgNEiwKC0xMT0tBSEhLSU5F", "GAYgAygLMhcuQWV0aGVyRGl2aWRlU3Bpcml0SW5mbxIlCgtBTEJFRE5JQUhL", "ThgLIAMoCzIQLkFldGhlclNraWxsSW5mbxIPCgdyZXRjb2RlGAQgASgNEiUK", @@ -36,7 +36,7 @@ namespace EggLink.DanhengServer.Proto { "TGluZXVwSW5mb0IeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZw", "cm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AetherDivideLineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.AetherSkillInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.AetherDivideSpiritInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AetherDivideSpiritInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.AetherDivideLineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.AetherSkillInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetAetherDivideInfoScRsp), global::EggLink.DanhengServer.Proto.GetAetherDivideInfoScRsp.Parser, new[]{ "OHDCEEBAHBF", "LLOKAHHKINE", "ALBEDNIAHKN", "Retcode", "InfiniteChallengeMissionId", "HKIGMGNCIOL", "BKILELPELBH", "HCJKDPMLDPA", "LineupList" }, null, null, null, null) })); diff --git a/Common/Proto/GetAlleyInfoScRsp.cs b/Common/Proto/GetAlleyInfoScRsp.cs index 8b73e0c2..080cb9c8 100644 --- a/Common/Proto/GetAlleyInfoScRsp.cs +++ b/Common/Proto/GetAlleyInfoScRsp.cs @@ -24,9 +24,9 @@ namespace EggLink.DanhengServer.Proto { static GetAlleyInfoScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChdHZXRBbGxleUluZm9TY1JzcC5wcm90bxoRQ0xNR0VESE5GQ08ucHJvdG8a", - "EURQSk9PR0FOSk9CLnByb3RvGhFGTkFCRElMSkVISi5wcm90bxoUQWxsZXlP", - "cmRlckluZm8ucHJvdG8imAMKEUdldEFsbGV5SW5mb1NjUnNwEhMKC0VOUE1F", + "ChdHZXRBbGxleUluZm9TY1JzcC5wcm90bxoUQWxsZXlPcmRlckluZm8ucHJv", + "dG8aEURQSk9PR0FOSk9CLnByb3RvGhFDTE1HRURITkZDTy5wcm90bxoRRk5B", + "QkRJTEpFSEoucHJvdG8imAMKEUdldEFsbGV5SW5mb1NjUnNwEhMKC0VOUE1F", "Sk9CQkpGGAUgASgNEg8KB3JldGNvZGUYCCABKA0SOAoLSUdPREtQR0tGSUQY", "DSADKAsyIy5HZXRBbGxleUluZm9TY1JzcC5JR09ES1BHS0ZJREVudHJ5EiAK", "CmV2ZW50X2xpc3QYBCADKAsyDC5DTE1HRURITkZDTxIhCgtERkdOR0ZGS0JF", @@ -38,7 +38,7 @@ namespace EggLink.DanhengServer.Proto { "DRINCgV2YWx1ZRgCIAEoDToCOAFCHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZl", "ci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.CLMGEDHNFCOReflection.Descriptor, global::EggLink.DanhengServer.Proto.DPJOOGANJOBReflection.Descriptor, global::EggLink.DanhengServer.Proto.FNABDILJEHJReflection.Descriptor, global::EggLink.DanhengServer.Proto.AlleyOrderInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AlleyOrderInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.DPJOOGANJOBReflection.Descriptor, global::EggLink.DanhengServer.Proto.CLMGEDHNFCOReflection.Descriptor, global::EggLink.DanhengServer.Proto.FNABDILJEHJReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetAlleyInfoScRsp), global::EggLink.DanhengServer.Proto.GetAlleyInfoScRsp.Parser, new[]{ "ENPMEJOBBJF", "Retcode", "IGODKPGKFID", "EventList", "DFGNGFFKBEJ", "FDDIFOEOCKN", "IKOPBLNDDLB", "GCBPHLIMFEK", "KFDADFIFFHO", "LMLIEKNIHDH", "Level", "ANAKGIJGIPH" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, }) })); diff --git a/Common/Proto/GetBagScRsp.cs b/Common/Proto/GetBagScRsp.cs index 667bba4d..6b346c5a 100644 --- a/Common/Proto/GetBagScRsp.cs +++ b/Common/Proto/GetBagScRsp.cs @@ -24,10 +24,10 @@ namespace EggLink.DanhengServer.Proto { static GetBagScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFHZXRCYWdTY1JzcC5wcm90bxoPRXF1aXBtZW50LnByb3RvGg9NYXRlcmlh", - "bDAucHJvdG8aFFR1cm5Gb29kU3dpdGNoLnByb3RvGgtSZWxpYy5wcm90bxoO", - "TWF0ZXJpYWwucHJvdG8aFVdhaXREZWxSZXNvdXJjZS5wcm90bxoOUGlsZUl0", - "ZW0ucHJvdG8ioQMKC0dldEJhZ1NjUnNwEiEKDnBpbGVfaXRlbV9saXN0GAMg", + "ChFHZXRCYWdTY1JzcC5wcm90bxoOUGlsZUl0ZW0ucHJvdG8aD0VxdWlwbWVu", + "dC5wcm90bxoUVHVybkZvb2RTd2l0Y2gucHJvdG8aDk1hdGVyaWFsLnByb3Rv", + "GhVXYWl0RGVsUmVzb3VyY2UucHJvdG8aC1JlbGljLnByb3RvGg9NYXRlcmlh", + "bDAucHJvdG8ioQMKC0dldEJhZ1NjUnNwEiEKDnBpbGVfaXRlbV9saXN0GAMg", "AygLMgkuUGlsZUl0ZW0SKQoQdHVybl9mb29kX3N3aXRjaBgHIAMoDjIPLlR1", "cm5Gb29kU3dpdGNoEh8KC0VLUE1CSUtNTkZDGAggAygLMgouTWF0ZXJpYWww", "Eh4KC05KTUROUENKQ09FGA0gAygLMgkuTWF0ZXJpYWwSMAoWd2FpdF9kZWxf", @@ -39,7 +39,7 @@ namespace EggLink.DanhengServer.Proto { "bDASEwoLSU1QQ05LSkFDSEgYCSADKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1Nl", "cnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.EquipmentReflection.Descriptor, global::EggLink.DanhengServer.Proto.Material0Reflection.Descriptor, global::EggLink.DanhengServer.Proto.TurnFoodSwitchReflection.Descriptor, global::EggLink.DanhengServer.Proto.RelicReflection.Descriptor, global::EggLink.DanhengServer.Proto.MaterialReflection.Descriptor, global::EggLink.DanhengServer.Proto.WaitDelResourceReflection.Descriptor, global::EggLink.DanhengServer.Proto.PileItemReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.PileItemReflection.Descriptor, global::EggLink.DanhengServer.Proto.EquipmentReflection.Descriptor, global::EggLink.DanhengServer.Proto.TurnFoodSwitchReflection.Descriptor, global::EggLink.DanhengServer.Proto.MaterialReflection.Descriptor, global::EggLink.DanhengServer.Proto.WaitDelResourceReflection.Descriptor, global::EggLink.DanhengServer.Proto.RelicReflection.Descriptor, global::EggLink.DanhengServer.Proto.Material0Reflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetBagScRsp), global::EggLink.DanhengServer.Proto.GetBagScRsp.Parser, new[]{ "PileItemList", "TurnFoodSwitch", "EKPMBIKMNFC", "NJMDNPCJCOE", "WaitDelResourceList", "OLLJLDHCONP", "EquipmentList", "RelicList", "Retcode", "BGKEHEMMOIH", "MaterialList", "DMONGEDDFJA", "IMPCNKJACHH" }, null, null, null, null) })); diff --git a/Common/Proto/GetChallengeGroupStatisticsScRsp.cs b/Common/Proto/GetChallengeGroupStatisticsScRsp.cs index 7ab2072a..50fb0632 100644 --- a/Common/Proto/GetChallengeGroupStatisticsScRsp.cs +++ b/Common/Proto/GetChallengeGroupStatisticsScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static GetChallengeGroupStatisticsScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiZHZXRDaGFsbGVuZ2VHcm91cFN0YXRpc3RpY3NTY1JzcC5wcm90bxoRSExF", - "Q0xMSEJDQkQucHJvdG8aEUpCTkpIR0dETE1CLnByb3RvIosBCiBHZXRDaGFs", + "CiZHZXRDaGFsbGVuZ2VHcm91cFN0YXRpc3RpY3NTY1JzcC5wcm90bxoRSkJO", + "SkhHR0RMTUIucHJvdG8aEUhMRUNMTEhCQ0JELnByb3RvIosBCiBHZXRDaGFs", "bGVuZ2VHcm91cFN0YXRpc3RpY3NTY1JzcBIPCgdyZXRjb2RlGA4gASgNEhAK", "CGdyb3VwX2lkGAcgASgNEiEKC0VKS0xORUZHQ09EGAkgASgLMgwuSkJOSkhH", "R0RMTUISIQoLT0NBSkJKSkJQSUQYDSABKAsyDC5ITEVDTExIQkNCREIeqgIb", "RWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.HLECLLHBCBDReflection.Descriptor, global::EggLink.DanhengServer.Proto.JBNJHGGDLMBReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.JBNJHGGDLMBReflection.Descriptor, global::EggLink.DanhengServer.Proto.HLECLLHBCBDReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetChallengeGroupStatisticsScRsp), global::EggLink.DanhengServer.Proto.GetChallengeGroupStatisticsScRsp.Parser, new[]{ "Retcode", "GroupId", "EJKLNEFGCOD", "OCAJBJJBPID" }, null, null, null, null) })); diff --git a/Common/Proto/GetChallengeScRsp.cs b/Common/Proto/GetChallengeScRsp.cs index 5061b94c..0d28f37c 100644 --- a/Common/Proto/GetChallengeScRsp.cs +++ b/Common/Proto/GetChallengeScRsp.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static GetChallengeScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChdHZXRDaGFsbGVuZ2VTY1JzcC5wcm90bxoUQ2hhbGxlbmdlR3JvdXAucHJv", - "dG8aD0NoYWxsZW5nZS5wcm90bxoRR0VNRFBNR0hIT0YucHJvdG8irwEKEUdl", + "ChdHZXRDaGFsbGVuZ2VTY1JzcC5wcm90bxoRR0VNRFBNR0hIT0YucHJvdG8a", + "D0NoYWxsZW5nZS5wcm90bxoUQ2hhbGxlbmdlR3JvdXAucHJvdG8irwEKEUdl", "dENoYWxsZW5nZVNjUnNwEhMKC0dKRkJKRURJSUtIGAYgASgNEiIKDmNoYWxs", "ZW5nZV9saXN0GA0gAygLMgouQ2hhbGxlbmdlEiEKC0pORE9FT09FQ09MGAMg", "AygLMgwuR0VNRFBNR0hIT0YSDwoHcmV0Y29kZRgFIAEoDRItChRjaGFsbGVu", "Z2VfZ3JvdXBfbGlzdBgBIAMoCzIPLkNoYWxsZW5nZUdyb3VwQh6qAhtFZ2dM", "aW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChallengeGroupReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChallengeReflection.Descriptor, global::EggLink.DanhengServer.Proto.GEMDPMGHHOFReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.GEMDPMGHHOFReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChallengeReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChallengeGroupReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetChallengeScRsp), global::EggLink.DanhengServer.Proto.GetChallengeScRsp.Parser, new[]{ "GJFBJEDIIKH", "ChallengeList", "JNDOEOOECOL", "Retcode", "ChallengeGroupList" }, null, null, null, null) })); diff --git a/Common/Proto/GetCurBattleInfoScRsp.cs b/Common/Proto/GetCurBattleInfoScRsp.cs index 2a8c8ad3..9a276cf2 100644 --- a/Common/Proto/GetCurBattleInfoScRsp.cs +++ b/Common/Proto/GetCurBattleInfoScRsp.cs @@ -24,8 +24,8 @@ namespace EggLink.DanhengServer.Proto { static GetCurBattleInfoScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChtHZXRDdXJCYXR0bGVJbmZvU2NSc3AucHJvdG8aFUJhdHRsZUVuZFN0YXR1", - "cy5wcm90bxoVU2NlbmVCYXR0bGVJbmZvLnByb3RvGhxBZXRoZXJEaXZpZGVC", + "ChtHZXRDdXJCYXR0bGVJbmZvU2NSc3AucHJvdG8aHEFldGhlckRpdmlkZUJh", + "dHRsZUluZm8ucHJvdG8aFUJhdHRsZUVuZFN0YXR1cy5wcm90bxoVU2NlbmVC", "YXR0bGVJbmZvLnByb3RvIsEBChVHZXRDdXJCYXR0bGVJbmZvU2NSc3ASMwoS", "YWV0aGVyX2JhdHRsZV9pbmZvGAggASgLMhcuQWV0aGVyRGl2aWRlQmF0dGxl", "SW5mbxIlCgtiYXR0bGVfaW5mbxgPIAEoCzIQLlNjZW5lQmF0dGxlSW5mbxIP", @@ -33,7 +33,7 @@ namespace EggLink.DanhengServer.Proto { "dHRsZUVuZFN0YXR1cxIQCghzdGFnZV9pZBgMIAEoDUIeqgIbRWdnTGluay5E", "YW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.BattleEndStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneBattleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.AetherDivideBattleInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AetherDivideBattleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleEndStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneBattleInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetCurBattleInfoScRsp), global::EggLink.DanhengServer.Proto.GetCurBattleInfoScRsp.Parser, new[]{ "AetherBattleInfo", "BattleInfo", "Retcode", "LastEndStatus", "StageId" }, null, null, null, null) })); diff --git a/Common/Proto/GetExpeditionDataScRsp.cs b/Common/Proto/GetExpeditionDataScRsp.cs index 44fc93c4..222e93f2 100644 --- a/Common/Proto/GetExpeditionDataScRsp.cs +++ b/Common/Proto/GetExpeditionDataScRsp.cs @@ -24,8 +24,8 @@ namespace EggLink.DanhengServer.Proto { static GetExpeditionDataScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChxHZXRFeHBlZGl0aW9uRGF0YVNjUnNwLnByb3RvGhBFeHBlZGl0aW9uLnBy", - "b3RvGhhBY3Rpdml0eUV4cGVkaXRpb24ucHJvdG8iyQEKFkdldEV4cGVkaXRp", + "ChxHZXRFeHBlZGl0aW9uRGF0YVNjUnNwLnByb3RvGhhBY3Rpdml0eUV4cGVk", + "aXRpb24ucHJvdG8aEEV4cGVkaXRpb24ucHJvdG8iyQEKFkdldEV4cGVkaXRp", "b25EYXRhU2NSc3ASIAoLSUVHSUNDTU1ES0YYByADKAsyCy5FeHBlZGl0aW9u", "EhMKC0tQUEFNREVJUEVIGA0gAygNEg8KB3JldGNvZGUYBSABKA0SEwoLQ0ZP", "TExKSERMSEMYBCADKA0SEwoLREFNSkVPQktKSEwYCyABKA0SKAoLTkNBQ0dM", @@ -33,7 +33,7 @@ namespace EggLink.DanhengServer.Proto { "TkQYASADKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJv", "dG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ExpeditionReflection.Descriptor, global::EggLink.DanhengServer.Proto.ActivityExpeditionReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ActivityExpeditionReflection.Descriptor, global::EggLink.DanhengServer.Proto.ExpeditionReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetExpeditionDataScRsp), global::EggLink.DanhengServer.Proto.GetExpeditionDataScRsp.Parser, new[]{ "IEGICCMMDKF", "KPPAMDEIPEH", "Retcode", "CFOLLJHDLHC", "DAMJEOBKJHL", "NCACGLMNOAK", "HECEBKLKBND" }, null, null, null, null) })); diff --git a/Common/Proto/GetFriendListInfoScRsp.cs b/Common/Proto/GetFriendListInfoScRsp.cs index 609f4907..b484c5fa 100644 --- a/Common/Proto/GetFriendListInfoScRsp.cs +++ b/Common/Proto/GetFriendListInfoScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static GetFriendListInfoScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChxHZXRGcmllbmRMaXN0SW5mb1NjUnNwLnByb3RvGhZQbGF5ZXJTaW1wbGVJ", - "bmZvLnByb3RvGhZGcmllbmRTaW1wbGVJbmZvLnByb3RvIngKFkdldEZyaWVu", + "ChxHZXRGcmllbmRMaXN0SW5mb1NjUnNwLnByb3RvGhZGcmllbmRTaW1wbGVJ", + "bmZvLnByb3RvGhZQbGF5ZXJTaW1wbGVJbmZvLnByb3RvIngKFkdldEZyaWVu", "ZExpc3RJbmZvU2NSc3ASDwoHcmV0Y29kZRgGIAEoDRImCgtmcmllbmRfbGlz", "dBgCIAMoCzIRLkZyaWVuZFNpbXBsZUluZm8SJQoKYmxhY2tfbGlzdBgBIAMo", "CzIRLlBsYXllclNpbXBsZUluZm9CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZl", "ci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.PlayerSimpleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.FriendSimpleInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.FriendSimpleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlayerSimpleInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetFriendListInfoScRsp), global::EggLink.DanhengServer.Proto.GetFriendListInfoScRsp.Parser, new[]{ "Retcode", "FriendList", "BlackList" }, null, null, null, null) })); diff --git a/Common/Proto/GetRaidInfoScRsp.cs b/Common/Proto/GetRaidInfoScRsp.cs index ff49f132..6304407a 100644 --- a/Common/Proto/GetRaidInfoScRsp.cs +++ b/Common/Proto/GetRaidInfoScRsp.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static GetRaidInfoScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChZHZXRSYWlkSW5mb1NjUnNwLnByb3RvGhZGaW5pc2hlZFJhaWRJbmZvLnBy", - "b3RvGhNDaGFsbGVuZ2VSYWlkLnByb3RvIqwBChBHZXRSYWlkSW5mb1NjUnNw", + "ChZHZXRSYWlkSW5mb1NjUnNwLnByb3RvGhNDaGFsbGVuZ2VSYWlkLnByb3Rv", + "GhZGaW5pc2hlZFJhaWRJbmZvLnByb3RvIqwBChBHZXRSYWlkSW5mb1NjUnNw", "EjIKF2ZpbmlzaGVkX3JhaWRfaW5mb19saXN0GAIgAygLMhEuRmluaXNoZWRS", "YWlkSW5mbxImCh5jaGFsbGVuZ2VfdGFrZW5fcmV3YXJkX2lkX2xpc3QYASAD", "KA0SKwoTY2hhbGxlbmdlX3JhaWRfbGlzdBgIIAMoCzIOLkNoYWxsZW5nZVJh", "aWQSDwoHcmV0Y29kZRgOIAEoDUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVy", "LlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.FinishedRaidInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChallengeRaidReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChallengeRaidReflection.Descriptor, global::EggLink.DanhengServer.Proto.FinishedRaidInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetRaidInfoScRsp), global::EggLink.DanhengServer.Proto.GetRaidInfoScRsp.Parser, new[]{ "FinishedRaidInfoList", "ChallengeTakenRewardIdList", "ChallengeRaidList", "Retcode" }, null, null, null, null) })); diff --git a/Common/Proto/GetRogueShopBuffInfoScRsp.cs b/Common/Proto/GetRogueShopBuffInfoScRsp.cs index d4b4da96..51201148 100644 --- a/Common/Proto/GetRogueShopBuffInfoScRsp.cs +++ b/Common/Proto/GetRogueShopBuffInfoScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static GetRogueShopBuffInfoScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch9HZXRSb2d1ZVNob3BCdWZmSW5mb1NjUnNwLnByb3RvGhdSb2d1ZUJ1ZmZT", - "aG9wRGF0YS5wcm90bxoSSXRlbUNvc3REYXRhLnByb3RvIpEBChlHZXRSb2d1", + "Ch9HZXRSb2d1ZVNob3BCdWZmSW5mb1NjUnNwLnByb3RvGhJJdGVtQ29zdERh", + "dGEucHJvdG8aF1JvZ3VlQnVmZlNob3BEYXRhLnByb3RvIpEBChlHZXRSb2d1", "ZVNob3BCdWZmSW5mb1NjUnNwEg8KB3JldGNvZGUYCiABKA0SEwoLTE1FT0NK", "T0pGUEcYBCABKAgSKgoOZ2FtZV9idWZmX2luZm8YDiABKAsyEi5Sb2d1ZUJ1", "ZmZTaG9wRGF0YRIiCgtKSlBCR05JRkpDRBgNIAEoCzINLkl0ZW1Db3N0RGF0", "YUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueBuffShopDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemCostDataReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemCostDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffShopDataReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetRogueShopBuffInfoScRsp), global::EggLink.DanhengServer.Proto.GetRogueShopBuffInfoScRsp.Parser, new[]{ "Retcode", "LMEOCJOJFPG", "GameBuffInfo", "JJPBGNIFJCD" }, null, null, null, null) })); diff --git a/Common/Proto/GetRogueShopMiracleInfoScRsp.cs b/Common/Proto/GetRogueShopMiracleInfoScRsp.cs index b27d25f8..6eda39fa 100644 --- a/Common/Proto/GetRogueShopMiracleInfoScRsp.cs +++ b/Common/Proto/GetRogueShopMiracleInfoScRsp.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static GetRogueShopMiracleInfoScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiJHZXRSb2d1ZVNob3BNaXJhY2xlSW5mb1NjUnNwLnByb3RvGhpSb2d1ZU1p", - "cmFjbGVTaG9wRGF0YS5wcm90bxoSSXRlbUNvc3REYXRhLnByb3RvIpoBChxH", + "CiJHZXRSb2d1ZVNob3BNaXJhY2xlSW5mb1NjUnNwLnByb3RvGhJJdGVtQ29z", + "dERhdGEucHJvdG8aGlJvZ3VlTWlyYWNsZVNob3BEYXRhLnByb3RvIpoBChxH", "ZXRSb2d1ZVNob3BNaXJhY2xlSW5mb1NjUnNwEiIKC0pKUEJHTklGSkNEGAsg", "ASgLMg0uSXRlbUNvc3REYXRhEg8KB3JldGNvZGUYCiABKA0SMAoRZ2FtZV9t", "aXJhY2xlX2luZm8YBiABKAsyFS5Sb2d1ZU1pcmFjbGVTaG9wRGF0YRITCgtM", "TUVPQ0pPSkZQRxgPIAEoCEIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlBy", "b3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueMiracleShopDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemCostDataReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemCostDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleShopDataReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetRogueShopMiracleInfoScRsp), global::EggLink.DanhengServer.Proto.GetRogueShopMiracleInfoScRsp.Parser, new[]{ "JJPBGNIFJCD", "Retcode", "GameMiracleInfo", "LMEOCJOJFPG" }, null, null, null, null) })); diff --git a/Common/Proto/GetSceneMapInfoScRsp.cs b/Common/Proto/GetSceneMapInfoScRsp.cs index 6cd0f131..15fb7d66 100644 --- a/Common/Proto/GetSceneMapInfoScRsp.cs +++ b/Common/Proto/GetSceneMapInfoScRsp.cs @@ -24,9 +24,9 @@ namespace EggLink.DanhengServer.Proto { static GetSceneMapInfoScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChpHZXRTY2VuZU1hcEluZm9TY1JzcC5wcm90bxoPTWF6ZUdyb3VwLnByb3Rv", - "Gg5NYXplUHJvcC5wcm90bxoRTWF6ZU1hcERhdGEucHJvdG8aD01hemVDaGVz", - "dC5wcm90byLBAgoUR2V0U2NlbmVNYXBJbmZvU2NSc3ASIwoPbWF6ZV9ncm91", + "ChpHZXRTY2VuZU1hcEluZm9TY1JzcC5wcm90bxoRTWF6ZU1hcERhdGEucHJv", + "dG8aDk1hemVQcm9wLnByb3RvGg9NYXplQ2hlc3QucHJvdG8aD01hemVHcm91", + "cC5wcm90byLBAgoUR2V0U2NlbmVNYXBJbmZvU2NSc3ASIwoPbWF6ZV9ncm91", "cF9saXN0GA8gAygLMgouTWF6ZUdyb3VwEh4KCmNoZXN0X2xpc3QYDCADKAsy", "Ci5NYXplQ2hlc3QSEwoLTEpQTkpMRUhNSUoYBiABKA0SEAoIZW50cnlfaWQY", "CiABKA0SHAoUdW5sb2NrX3RlbGVwb3J0X2xpc3QYDSADKA0SEwoLS01FR1BB", @@ -36,7 +36,7 @@ namespace EggLink.DanhengServer.Proto { "cF9lbnRyeV9pZBgJIAEoDUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlBy", "b3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MazeGroupReflection.Descriptor, global::EggLink.DanhengServer.Proto.MazePropReflection.Descriptor, global::EggLink.DanhengServer.Proto.MazeMapDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.MazeChestReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MazeMapDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.MazePropReflection.Descriptor, global::EggLink.DanhengServer.Proto.MazeChestReflection.Descriptor, global::EggLink.DanhengServer.Proto.MazeGroupReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetSceneMapInfoScRsp), global::EggLink.DanhengServer.Proto.GetSceneMapInfoScRsp.Parser, new[]{ "MazeGroupList", "ChestList", "LJPNJLEHMIJ", "EntryId", "UnlockTeleportList", "KMEGPANKPMM", "MapList", "Retcode", "MazePropList", "LightenSectionList", "CurMapEntryId" }, null, null, null, null) })); diff --git a/Common/Proto/GetSpringRecoverDataScRsp.cs b/Common/Proto/GetSpringRecoverDataScRsp.cs index bf4932eb..34ae3b30 100644 --- a/Common/Proto/GetSpringRecoverDataScRsp.cs +++ b/Common/Proto/GetSpringRecoverDataScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static GetSpringRecoverDataScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch9HZXRTcHJpbmdSZWNvdmVyRGF0YVNjUnNwLnByb3RvGhJIZWFsUG9vbElu", - "Zm8ucHJvdG8aGVNwcmluZ1JlY292ZXJDb25maWcucHJvdG8iiAEKGUdldFNw", + "Ch9HZXRTcHJpbmdSZWNvdmVyRGF0YVNjUnNwLnByb3RvGhlTcHJpbmdSZWNv", + "dmVyQ29uZmlnLnByb3RvGhJIZWFsUG9vbEluZm8ucHJvdG8iiAEKGUdldFNw", "cmluZ1JlY292ZXJEYXRhU2NSc3ASMwoVc3ByaW5nX3JlY292ZXJfY29uZmln", "GAkgASgLMhQuU3ByaW5nUmVjb3ZlckNvbmZpZxIlCg5oZWFsX3Bvb2xfaW5m", "bxgOIAEoCzINLkhlYWxQb29sSW5mbxIPCgdyZXRjb2RlGAsgASgNQh6qAhtF", "Z2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.HealPoolInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SpringRecoverConfigReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SpringRecoverConfigReflection.Descriptor, global::EggLink.DanhengServer.Proto.HealPoolInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetSpringRecoverDataScRsp), global::EggLink.DanhengServer.Proto.GetSpringRecoverDataScRsp.Parser, new[]{ "SpringRecoverConfig", "HealPoolInfo", "Retcode" }, null, null, null, null) })); diff --git a/Common/Proto/GroupRefreshInfo.cs b/Common/Proto/GroupRefreshInfo.cs index fba72482..52294152 100644 --- a/Common/Proto/GroupRefreshInfo.cs +++ b/Common/Proto/GroupRefreshInfo.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static GroupRefreshInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChZHcm91cFJlZnJlc2hJbmZvLnByb3RvGhxTY2VuZUVudGl0eVJlZnJlc2hJ", - "bmZvLnByb3RvGhtTY2VuZUdyb3VwUmVmcmVzaFR5cGUucHJvdG8iigEKEEdy", + "ChZHcm91cFJlZnJlc2hJbmZvLnByb3RvGhtTY2VuZUdyb3VwUmVmcmVzaFR5", + "cGUucHJvdG8aHFNjZW5lRW50aXR5UmVmcmVzaEluZm8ucHJvdG8iigEKEEdy", "b3VwUmVmcmVzaEluZm8SEAoIZ3JvdXBfaWQYDCABKA0SJAoEdHlwZRgLIAEo", "DjIWLlNjZW5lR3JvdXBSZWZyZXNoVHlwZRINCgVzdGF0ZRgDIAEoDRIvCg5y", "ZWZyZXNoX2VudGl0eRgOIAMoCzIXLlNjZW5lRW50aXR5UmVmcmVzaEluZm9C", "HqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneEntityRefreshInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneGroupRefreshTypeReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneGroupRefreshTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneEntityRefreshInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GroupRefreshInfo), global::EggLink.DanhengServer.Proto.GroupRefreshInfo.Parser, new[]{ "GroupId", "Type", "State", "RefreshEntity" }, null, null, null, null) })); diff --git a/Common/Proto/HandleRogueCommonPendingActionCsReq.cs b/Common/Proto/HandleRogueCommonPendingActionCsReq.cs index 73574af4..ac761c9b 100644 --- a/Common/Proto/HandleRogueCommonPendingActionCsReq.cs +++ b/Common/Proto/HandleRogueCommonPendingActionCsReq.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static HandleRogueCommonPendingActionCsReqReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CilIYW5kbGVSb2d1ZUNvbW1vblBlbmRpbmdBY3Rpb25Dc1JlcS5wcm90bxoi", - "Um9ndWVCb251c1NlbGVjdEhhbmRsZUFjdGlvbi5wcm90bxoRRERBUEJHT09C", - "SE0ucHJvdG8aEUhMSVBHUExMTU5CLnByb3RvGhFMQ0dQUFBEQUdISi5wcm90", - "bxohUm9ndWVCdWZmU2VsZWN0SGFuZGxlQWN0aW9uLnByb3RvGiRSb2d1ZU1p", - "cmFjbGVTZWxlY3RIYW5kbGVBY3Rpb24ucHJvdG8aEUpLQkZNR0hCR0tBLnBy", - "b3RvGhFDTU5OT0NBQ1BKQy5wcm90bxoRTkhHTkpITkhFR08ucHJvdG8aIVJv", - "Z3VlQnVmZlJlcm9sbEhhbmRsZUFjdGlvbi5wcm90byKKBAojSGFuZGxlUm9n", + "CilIYW5kbGVSb2d1ZUNvbW1vblBlbmRpbmdBY3Rpb25Dc1JlcS5wcm90bxoh", + "Um9ndWVCdWZmU2VsZWN0SGFuZGxlQWN0aW9uLnByb3RvGiJSb2d1ZUJvbnVz", + "U2VsZWN0SGFuZGxlQWN0aW9uLnByb3RvGiRSb2d1ZU1pcmFjbGVTZWxlY3RI", + "YW5kbGVBY3Rpb24ucHJvdG8aEUNNTk5PQ0FDUEpDLnByb3RvGhFMQ0dQUFBE", + "QUdISi5wcm90bxoRTkhHTkpITkhFR08ucHJvdG8aEUhMSVBHUExMTU5CLnBy", + "b3RvGhFEREFQQkdPT0JITS5wcm90bxohUm9ndWVCdWZmUmVyb2xsSGFuZGxl", + "QWN0aW9uLnByb3RvGhFKS0JGTUdIQkdLQS5wcm90byKKBAojSGFuZGxlUm9n", "dWVDb21tb25QZW5kaW5nQWN0aW9uQ3NSZXESEwoLS0dPRE5BR0xIT0gYDyAB", "KA0SNAoLYnVmZl9hY3Rpb24Y7QkgASgLMhwuUm9ndWVCdWZmU2VsZWN0SGFu", "ZGxlQWN0aW9uSAASJAoLTUhLSUtLUE5DS0IYtgEgASgLMgwuSExJUEdQTExN", @@ -45,7 +45,7 @@ namespace EggLink.DanhengServer.Proto { "dGlvbkgAQggKBmFjdGlvbkIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlBy", "b3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueBonusSelectHandleActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.DDAPBGOOBHMReflection.Descriptor, global::EggLink.DanhengServer.Proto.HLIPGPLLMNBReflection.Descriptor, global::EggLink.DanhengServer.Proto.LCGPPPDAGHJReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffSelectHandleActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleSelectHandleActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.JKBFMGHBGKAReflection.Descriptor, global::EggLink.DanhengServer.Proto.CMNNOCACPJCReflection.Descriptor, global::EggLink.DanhengServer.Proto.NHGNJHNHEGOReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffRerollHandleActionReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueBuffSelectHandleActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBonusSelectHandleActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleSelectHandleActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.CMNNOCACPJCReflection.Descriptor, global::EggLink.DanhengServer.Proto.LCGPPPDAGHJReflection.Descriptor, global::EggLink.DanhengServer.Proto.NHGNJHNHEGOReflection.Descriptor, global::EggLink.DanhengServer.Proto.HLIPGPLLMNBReflection.Descriptor, global::EggLink.DanhengServer.Proto.DDAPBGOOBHMReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffRerollHandleActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.JKBFMGHBGKAReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.HandleRogueCommonPendingActionCsReq), global::EggLink.DanhengServer.Proto.HandleRogueCommonPendingActionCsReq.Parser, new[]{ "KGODNAGLHOH", "BuffAction", "MHKIKKPNCKB", "HGOIFMPCJEM", "RerollAction", "MiracleAction", "GEHEFKPANPD", "MLGOJADAGJO", "HAENNKMJBMN", "CJJGOBPLFDC", "BonusAction" }, new[]{ "Action" }, null, null, null) })); diff --git a/Common/Proto/HandleRogueCommonPendingActionScRsp.cs b/Common/Proto/HandleRogueCommonPendingActionScRsp.cs index af3494bf..e2f23257 100644 --- a/Common/Proto/HandleRogueCommonPendingActionScRsp.cs +++ b/Common/Proto/HandleRogueCommonPendingActionScRsp.cs @@ -25,12 +25,12 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CilIYW5kbGVSb2d1ZUNvbW1vblBlbmRpbmdBY3Rpb25TY1JzcC5wcm90bxoR", - "SkVLQ09PT09NR1AucHJvdG8aEVBFREZFQ0dCTEFQLnByb3RvGipSb2d1ZU1p", - "cmFjbGVTZWxlY3RIYW5kbGVBY3Rpb25SZXN1bHQucHJvdG8aEUhJRkVKRUZG", - "TURNLnByb3RvGhFHTk1OT09BSklKSi5wcm90bxonUm9ndWVCdWZmU2VsZWN0", + "UEtQSUJNSFBEREkucHJvdG8aEUhJRkVKRUZGTURNLnByb3RvGhFHTk1OT09B", + "SklKSi5wcm90bxoRS0dOSEhBR05KRUwucHJvdG8aJ1JvZ3VlQnVmZlNlbGVj", + "dEhhbmRsZUFjdGlvblJlc3VsdC5wcm90bxoqUm9ndWVNaXJhY2xlU2VsZWN0", "SGFuZGxlQWN0aW9uUmVzdWx0LnByb3RvGhFQRk5HT1BERk9QTy5wcm90bxoR", - "T0hJS09FQU5BT00ucHJvdG8aEVBLUElCTUhQRERJLnByb3RvGhFLR05ISEFH", - "TkpFTC5wcm90byKeBAojSGFuZGxlUm9ndWVDb21tb25QZW5kaW5nQWN0aW9u", + "T0hJS09FQU5BT00ucHJvdG8aEVBFREZFQ0dCTEFQLnByb3RvGhFKRUtDT09P", + "T01HUC5wcm90byKeBAojSGFuZGxlUm9ndWVDb21tb25QZW5kaW5nQWN0aW9u", "U2NSc3ASFgoOcXVldWVfcG9zaXRpb24YDCABKA0SDwoHcmV0Y29kZRgNIAEo", "DRIWCg5xdWV1ZV9sb2NhdGlvbhgKIAEoDRI6CgtidWZmX3NlbGVjdBizDyAB", "KAsyIi5Sb2d1ZUJ1ZmZTZWxlY3RIYW5kbGVBY3Rpb25SZXN1bHRIABIkCgtO", @@ -45,7 +45,7 @@ namespace EggLink.DanhengServer.Proto { "RERJSABCCAoGYWN0aW9uQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJv", "dG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.JEKCOOOOMGPReflection.Descriptor, global::EggLink.DanhengServer.Proto.PEDFECGBLAPReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleSelectHandleActionResultReflection.Descriptor, global::EggLink.DanhengServer.Proto.HIFEJEFFMDMReflection.Descriptor, global::EggLink.DanhengServer.Proto.GNMNOOAJIJJReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffSelectHandleActionResultReflection.Descriptor, global::EggLink.DanhengServer.Proto.PFNGOPDFOPOReflection.Descriptor, global::EggLink.DanhengServer.Proto.OHIKOEANAOMReflection.Descriptor, global::EggLink.DanhengServer.Proto.PKPIBMHPDDIReflection.Descriptor, global::EggLink.DanhengServer.Proto.KGNHHAGNJELReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.PKPIBMHPDDIReflection.Descriptor, global::EggLink.DanhengServer.Proto.HIFEJEFFMDMReflection.Descriptor, global::EggLink.DanhengServer.Proto.GNMNOOAJIJJReflection.Descriptor, global::EggLink.DanhengServer.Proto.KGNHHAGNJELReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffSelectHandleActionResultReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleSelectHandleActionResultReflection.Descriptor, global::EggLink.DanhengServer.Proto.PFNGOPDFOPOReflection.Descriptor, global::EggLink.DanhengServer.Proto.OHIKOEANAOMReflection.Descriptor, global::EggLink.DanhengServer.Proto.PEDFECGBLAPReflection.Descriptor, global::EggLink.DanhengServer.Proto.JEKCOOOOMGPReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.HandleRogueCommonPendingActionScRsp), global::EggLink.DanhengServer.Proto.HandleRogueCommonPendingActionScRsp.Parser, new[]{ "QueuePosition", "Retcode", "QueueLocation", "BuffSelect", "NOMDIPLOEAE", "OPCMLBCMDMO", "BNMBIBALAEF", "MiracleSelect", "LIHOCNEOLFC", "IJBKEODNKMI", "KHODBFHMMOO", "LABBLONMBDG", "DCDEEABBENF" }, new[]{ "Action" }, null, null, null) })); diff --git a/Common/Proto/HeliobusActivityDataScRsp.cs b/Common/Proto/HeliobusActivityDataScRsp.cs index 6b2eb8be..1d37090d 100644 --- a/Common/Proto/HeliobusActivityDataScRsp.cs +++ b/Common/Proto/HeliobusActivityDataScRsp.cs @@ -24,9 +24,9 @@ namespace EggLink.DanhengServer.Proto { static HeliobusActivityDataScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch9IZWxpb2J1c0FjdGl2aXR5RGF0YVNjUnNwLnByb3RvGhdIZWxpb2J1c0No", - "YWxsZW5nZS5wcm90bxoTSGVsaW9idXNTa2lsbC5wcm90bxoSSGVsaW9idXNQ", - "b3N0LnByb3RvGh1IZWxpb2J1c0NoYWxsZW5nZUxpbmV1cC5wcm90byKxAgoZ", + "Ch9IZWxpb2J1c0FjdGl2aXR5RGF0YVNjUnNwLnByb3RvGhNIZWxpb2J1c1Nr", + "aWxsLnByb3RvGhJIZWxpb2J1c1Bvc3QucHJvdG8aHUhlbGlvYnVzQ2hhbGxl", + "bmdlTGluZXVwLnByb3RvGhdIZWxpb2J1c0NoYWxsZW5nZS5wcm90byKxAgoZ", "SGVsaW9idXNBY3Rpdml0eURhdGFTY1JzcBIPCgdyZXRjb2RlGAkgASgNEg0K", "BXBoYXNlGAIgASgNEhMKC1BBRE5BS0lEQ0RKGAogASgNEg0KBWxldmVsGA8g", "ASgNEhMKC0xBRUdBTENQT1BEGAMgASgNEioKDmNoYWxsZW5nZV9saXN0GAcg", @@ -36,7 +36,7 @@ namespace EggLink.DanhengServer.Proto { "SGVsaW9idXNQb3N0EhMKC0pFQk9BR0VOSENNGAwgASgNQh6qAhtFZ2dMaW5r", "LkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.HeliobusChallengeReflection.Descriptor, global::EggLink.DanhengServer.Proto.HeliobusSkillReflection.Descriptor, global::EggLink.DanhengServer.Proto.HeliobusPostReflection.Descriptor, global::EggLink.DanhengServer.Proto.HeliobusChallengeLineupReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.HeliobusSkillReflection.Descriptor, global::EggLink.DanhengServer.Proto.HeliobusPostReflection.Descriptor, global::EggLink.DanhengServer.Proto.HeliobusChallengeLineupReflection.Descriptor, global::EggLink.DanhengServer.Proto.HeliobusChallengeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.HeliobusActivityDataScRsp), global::EggLink.DanhengServer.Proto.HeliobusActivityDataScRsp.Parser, new[]{ "Retcode", "Phase", "PADNAKIDCDJ", "Level", "LAEGALCPOPD", "ChallengeList", "SkillInfo", "HelibiousLineup", "EPOBHINFIAL", "JEBOAGENHCM" }, null, null, null, null) })); diff --git a/Common/Proto/JMEMFELIDGN.cs b/Common/Proto/JMEMFELIDGN.cs index 21a745db..af75c0bd 100644 --- a/Common/Proto/JMEMFELIDGN.cs +++ b/Common/Proto/JMEMFELIDGN.cs @@ -24,12 +24,12 @@ namespace EggLink.DanhengServer.Proto { static JMEMFELIDGNReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFKTUVNRkVMSURHTi5wcm90bxoPU3BCYXJJbmZvLnByb3RvGhFMQU9BS0JF", - "SVBLRi5wcm90byJRCgtKTUVNRkVMSURHThIaCgR0eXBlGAEgASgOMgwuTEFP", + "ChFKTUVNRkVMSURHTi5wcm90bxoRTEFPQUtCRUlQS0YucHJvdG8aD1NwQmFy", + "SW5mby5wcm90byJRCgtKTUVNRkVMSURHThIaCgR0eXBlGAEgASgOMgwuTEFP", "QUtCRUlQS0YSCgoCaWQYAiABKA0SGgoGc3BfYmFyGAMgASgLMgouU3BCYXJJ", "bmZvQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SpBarInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.LAOAKBEIPKFReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LAOAKBEIPKFReflection.Descriptor, global::EggLink.DanhengServer.Proto.SpBarInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.JMEMFELIDGN), global::EggLink.DanhengServer.Proto.JMEMFELIDGN.Parser, new[]{ "Type", "Id", "SpBar" }, null, null, null, null) })); diff --git a/Common/Proto/JMKFGINOAHK.cs b/Common/Proto/JMKFGINOAHK.cs index 89c46ef5..53996c61 100644 --- a/Common/Proto/JMKFGINOAHK.cs +++ b/Common/Proto/JMKFGINOAHK.cs @@ -24,9 +24,9 @@ namespace EggLink.DanhengServer.Proto { static JMKFGINOAHKReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFKTUtGR0lOT0FISy5wcm90bxoXUm9ndWVOb3VzRGljZUluZm8ucHJvdG8a", - "EUxHREhOTUxKTENCLnByb3RvGhNDaGVzc0Flb25JbmZvLnByb3RvGhFIR0VE", - "RURMTklDTy5wcm90bxoZUm9ndWVOb3VzVGFsZW50SW5mby5wcm90byKMAgoL", + "ChFKTUtGR0lOT0FISy5wcm90bxoRSEdFREVETE5JQ08ucHJvdG8aEUxHREhO", + "TUxKTENCLnByb3RvGhlSb2d1ZU5vdXNUYWxlbnRJbmZvLnByb3RvGhdSb2d1", + "ZU5vdXNEaWNlSW5mby5wcm90bxoTQ2hlc3NBZW9uSW5mby5wcm90byKMAgoL", "Sk1LRkdJTk9BSEsSJwoLT0tNSkZFSkpJR04YASABKAsyEi5Sb2d1ZU5vdXNE", "aWNlSW5mbxITCgtDRkZBREJDSkxITxgIIAMoDRIvChFyb2d1ZV90YWxlbnRf", "aW5mbxgKIAEoCzIULlJvZ3VlTm91c1RhbGVudEluZm8SLQoXcm9ndWVfdmly", @@ -35,7 +35,7 @@ namespace EggLink.DanhengServer.Proto { "b25JbmZvEiEKC0tDQkVJR0ZQQkxPGAMgASgLMgwuTEdESE5NTEpMQ0JCHqoC", "G0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueNousDiceInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.LGDHNMLJLCBReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessAeonInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.HGEDEDLNICOReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueNousTalentInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.HGEDEDLNICOReflection.Descriptor, global::EggLink.DanhengServer.Proto.LGDHNMLJLCBReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueNousTalentInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueNousDiceInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessAeonInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.JMKFGINOAHK), global::EggLink.DanhengServer.Proto.JMKFGINOAHK.Parser, new[]{ "OKMJFEJJIGN", "CFFADBCJLHO", "RogueTalentInfo", "RogueVirtualItemInfo", "NBGGHFGFGLL", "ChessAeonInfo", "KCBEIGFPBLO" }, null, null, null, null) })); diff --git a/Common/Proto/KickType.cs b/Common/Proto/KickType.cs new file mode 100644 index 00000000..c5bd858e --- /dev/null +++ b/Common/Proto/KickType.cs @@ -0,0 +1,53 @@ +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: KickType.proto +// +#pragma warning disable 1591, 0612, 3021, 8981 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace EggLink.DanhengServer.Proto { + + /// Holder for reflection information generated from KickType.proto + public static partial class KickTypeReflection { + + #region Descriptor + /// File descriptor for KickType.proto + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static KickTypeReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "Cg5LaWNrVHlwZS5wcm90byqLAQoIS2lja1R5cGUSEQoNS0lDS19TUVVFRVpF", + "RBAAEg4KCktJQ0tfQkxBQ0sQARITCg9LSUNLX0NIQU5HRV9QV0QQAhIcChhL", + "SUNLX0xPR0lOX1dISVRFX1RJTUVPVVQQAxIZChVLSUNLX0FDRV9BTlRJX0NI", + "RUFURVIQBBIOCgpLSUNLX0JZX0dNEAVCHqoCG0VnZ0xpbmsuRGFuaGVuZ1Nl", + "cnZlci5Qcm90b2IGcHJvdG8z")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::EggLink.DanhengServer.Proto.KickType), }, null, null)); + } + #endregion + + } + #region Enums + public enum KickType { + [pbr::OriginalName("KICK_SQUEEZED")] KickSqueezed = 0, + [pbr::OriginalName("KICK_BLACK")] KickBlack = 1, + [pbr::OriginalName("KICK_CHANGE_PWD")] KickChangePwd = 2, + [pbr::OriginalName("KICK_LOGIN_WHITE_TIMEOUT")] KickLoginWhiteTimeout = 3, + [pbr::OriginalName("KICK_ACE_ANTI_CHEATER")] KickAceAntiCheater = 4, + [pbr::OriginalName("KICK_BY_GM")] KickByGm = 5, + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Common/Proto/LGDHNMLJLCB.cs b/Common/Proto/LGDHNMLJLCB.cs index 4615457c..d2289fae 100644 --- a/Common/Proto/LGDHNMLJLCB.cs +++ b/Common/Proto/LGDHNMLJLCB.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static LGDHNMLJLCBReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFMR0RITk1MSkxDQi5wcm90bxoUQ2hlc3NSb2d1ZURpY2UucHJvdG8aEU5J", - "Rk5OS01KR0dDLnByb3RvItMBCgtMR0RITk1MSkxDQhITCgtKRkZMS0tLR09F", + "ChFMR0RITk1MSkxDQi5wcm90bxoRTklGTk5LTUpHR0MucHJvdG8aFENoZXNz", + "Um9ndWVEaWNlLnByb3RvItMBCgtMR0RITk1MSkxDQhITCgtKRkZMS0tLR09F", "RhgOIAMoDRIhCgtDSVBBRU5OTEZLTRgHIAEoDjIMLk5JRk5OS01KR0dDEiQK", "C0xMS0xJSENMTU5HGAQgAygLMg8uQ2hlc3NSb2d1ZURpY2USMgoLS0ZNR0dQ", "SUdCREQYCSADKAsyHS5MR0RITk1MSkxDQi5LRk1HR1BJR0JEREVudHJ5GjIK", "EEtGTUdHUElHQkRERW50cnkSCwoDa2V5GAEgASgNEg0KBXZhbHVlGAIgASgI", "OgI4AUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessRogueDiceReflection.Descriptor, global::EggLink.DanhengServer.Proto.NIFNNKMJGGCReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.NIFNNKMJGGCReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueDiceReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.LGDHNMLJLCB), global::EggLink.DanhengServer.Proto.LGDHNMLJLCB.Parser, new[]{ "JFFLKKKGOEF", "CIPAENNLFKM", "LLKLIHCLMNG", "KFMGGPIGBDD" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, }) })); diff --git a/Common/Proto/LHBLGBPKEAL.cs b/Common/Proto/LHBLGBPKEAL.cs index 3aa21859..32256d37 100644 --- a/Common/Proto/LHBLGBPKEAL.cs +++ b/Common/Proto/LHBLGBPKEAL.cs @@ -24,12 +24,12 @@ namespace EggLink.DanhengServer.Proto { static LHBLGBPKEALReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFMSEJMR0JQS0VBTC5wcm90bxoRSUNPRkJCQ01FTkYucHJvdG8aDFZlY3Rv", - "ci5wcm90byJOCgtMSEJMR0JQS0VBTBIcCgtJRU5MSkFGSUJPTBgPIAEoCzIH", + "ChFMSEJMR0JQS0VBTC5wcm90bxoMVmVjdG9yLnByb3RvGhFJQ09GQkJDTUVO", + "Ri5wcm90byJOCgtMSEJMR0JQS0VBTBIcCgtJRU5MSkFGSUJPTBgPIAEoCzIH", "LlZlY3RvchIhCgtKQkNBQk9BQklESRgJIAEoCzIMLklDT0ZCQkNNRU5GQh6q", "AhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ICOFBBCMENFReflection.Descriptor, global::EggLink.DanhengServer.Proto.VectorReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.VectorReflection.Descriptor, global::EggLink.DanhengServer.Proto.ICOFBBCMENFReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.LHBLGBPKEAL), global::EggLink.DanhengServer.Proto.LHBLGBPKEAL.Parser, new[]{ "IENLJAFIBOL", "JBCABOABIDI" }, null, null, null, null) })); diff --git a/Common/Proto/LeaveRogueScRsp.cs b/Common/Proto/LeaveRogueScRsp.cs index 0e88a98a..c7e0cb33 100644 --- a/Common/Proto/LeaveRogueScRsp.cs +++ b/Common/Proto/LeaveRogueScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static LeaveRogueScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChVMZWF2ZVJvZ3VlU2NSc3AucHJvdG8aD1JvZ3VlSW5mby5wcm90bxoPU2Nl", - "bmVJbmZvLnByb3RvGhBMaW5ldXBJbmZvLnByb3RvInoKD0xlYXZlUm9ndWVT", + "ChVMZWF2ZVJvZ3VlU2NSc3AucHJvdG8aEExpbmV1cEluZm8ucHJvdG8aD1Nj", + "ZW5lSW5mby5wcm90bxoPUm9ndWVJbmZvLnByb3RvInoKD0xlYXZlUm9ndWVT", "Y1JzcBIeCgpyb2d1ZV9pbmZvGA4gASgLMgouUm9ndWVJbmZvEhkKBXNjZW5l", "GAYgASgLMgouU2NlbmVJbmZvEg8KB3JldGNvZGUYAiABKA0SGwoGbGluZXVw", "GAQgASgLMgsuTGluZXVwSW5mb0IeqgIbRWdnTGluay5EYW5oZW5nU2VydmVy", "LlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.LeaveRogueScRsp), global::EggLink.DanhengServer.Proto.LeaveRogueScRsp.Parser, new[]{ "RogueInfo", "Scene", "Retcode", "Lineup" }, null, null, null, null) })); diff --git a/Common/Proto/LineupInfo.cs b/Common/Proto/LineupInfo.cs index 3532365a..07fd790d 100644 --- a/Common/Proto/LineupInfo.cs +++ b/Common/Proto/LineupInfo.cs @@ -24,8 +24,8 @@ namespace EggLink.DanhengServer.Proto { static LineupInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChBMaW5ldXBJbmZvLnByb3RvGhVFeHRyYUxpbmV1cFR5cGUucHJvdG8aEkxp", - "bmV1cEF2YXRhci5wcm90byKWAgoKTGluZXVwSW5mbxIXCg9kcmVzc2VkX3Nr", + "ChBMaW5ldXBJbmZvLnByb3RvGhJMaW5ldXBBdmF0YXIucHJvdG8aFUV4dHJh", + "TGluZXVwVHlwZS5wcm90byKWAgoKTGluZXVwSW5mbxIXCg9kcmVzc2VkX3Nr", "aW5faWQYDSABKA0SFQoNaWRraXNfdmlydHVhbBgLIAEoCBIMCgRuYW1lGAUg", "ASgJEhMKC2xlYWRlcl9zbG90GAMgASgNEhIKCmlzX3ZpcnR1YWwYAiABKAgS", "KwoRZXh0cmFfbGluZXVwX3R5cGUYBiABKA4yEC5FeHRyYUxpbmV1cFR5cGUS", @@ -34,7 +34,7 @@ namespace EggLink.DanhengServer.Proto { "ZGV4GAwgASgNEhAKCHBsYW5lX2lkGAogASgNQh6qAhtFZ2dMaW5rLkRhbmhl", "bmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ExtraLineupTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.LineupAvatarReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LineupAvatarReflection.Descriptor, global::EggLink.DanhengServer.Proto.ExtraLineupTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.LineupInfo), global::EggLink.DanhengServer.Proto.LineupInfo.Parser, new[]{ "DressedSkinId", "IdkisVirtual", "Name", "LeaderSlot", "IsVirtual", "ExtraLineupType", "BFMGDJMBLFH", "AvatarList", "MaxMp", "Mp", "Index", "PlaneId" }, null, null, null, null) })); diff --git a/Common/Proto/MazeMapData.cs b/Common/Proto/MazeMapData.cs index eccf26bc..a2b4ed58 100644 --- a/Common/Proto/MazeMapData.cs +++ b/Common/Proto/MazeMapData.cs @@ -24,8 +24,8 @@ namespace EggLink.DanhengServer.Proto { static MazeMapDataReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFNYXplTWFwRGF0YS5wcm90bxoPTWF6ZUdyb3VwLnByb3RvGg9NYXplQ2hl", - "c3QucHJvdG8aDk1hemVQcm9wLnByb3RvGhFGSk1OSEpDRk5HSy5wcm90byKv", + "ChFNYXplTWFwRGF0YS5wcm90bxoRRkpNTkhKQ0ZOR0sucHJvdG8aD01hemVH", + "cm91cC5wcm90bxoPTWF6ZUNoZXN0LnByb3RvGg5NYXplUHJvcC5wcm90byKv", "AgoLTWF6ZU1hcERhdGESJwoTdW5sb2NrZWRfY2hlc3RfbGlzdBgCIAMoCzIK", "Lk1hemVDaGVzdBIYChBjdXJfbWFwX2VudHJ5X2lkGAggASgNEhwKFHVubG9j", "a190ZWxlcG9ydF9saXN0GAUgAygNEhAKCGVudHJ5X2lkGAcgASgNEhMKC0pQ", @@ -35,7 +35,7 @@ namespace EggLink.DanhengServer.Proto { "D21hemVfZ3JvdXBfbGlzdBgMIAMoCzIKLk1hemVHcm91cEIeqgIbRWdnTGlu", "ay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MazeGroupReflection.Descriptor, global::EggLink.DanhengServer.Proto.MazeChestReflection.Descriptor, global::EggLink.DanhengServer.Proto.MazePropReflection.Descriptor, global::EggLink.DanhengServer.Proto.FJMNHJCFNGKReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.FJMNHJCFNGKReflection.Descriptor, global::EggLink.DanhengServer.Proto.MazeGroupReflection.Descriptor, global::EggLink.DanhengServer.Proto.MazeChestReflection.Descriptor, global::EggLink.DanhengServer.Proto.MazePropReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MazeMapData), global::EggLink.DanhengServer.Proto.MazeMapData.Parser, new[]{ "UnlockedChestList", "CurMapEntryId", "UnlockTeleportList", "EntryId", "JPNOLLCJDFE", "MazePropList", "LightenSectionList", "Retcode", "NJMDDKONOHN", "MazeGroupList" }, null, null, null, null) })); diff --git a/Common/Proto/MissionData.cs b/Common/Proto/MissionData.cs index 9f7542a2..57e7563b 100644 --- a/Common/Proto/MissionData.cs +++ b/Common/Proto/MissionData.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static MissionDataReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFNaXNzaW9uRGF0YS5wcm90bxoTTWlzc2lvblN0YXR1cy5wcm90bxocTWlz", - "c2lvbkN1c3RvbVZhbHVlRGF0YS5wcm90byJtCgtNaXNzaW9uRGF0YRIyChFj", + "ChFNaXNzaW9uRGF0YS5wcm90bxocTWlzc2lvbkN1c3RvbVZhbHVlRGF0YS5w", + "cm90bxoTTWlzc2lvblN0YXR1cy5wcm90byJtCgtNaXNzaW9uRGF0YRIyChFj", "dXN0b21fdmFsdWVfbGlzdBgJIAMoCzIXLk1pc3Npb25DdXN0b21WYWx1ZURh", "dGESCgoCaWQYDSABKA0SHgoGc3RhdHVzGAggASgOMg4uTWlzc2lvblN0YXR1", "c0IeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MissionStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.MissionCustomValueDataReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MissionCustomValueDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.MissionStatusReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MissionData), global::EggLink.DanhengServer.Proto.MissionData.Parser, new[]{ "CustomValueList", "Id", "Status" }, null, null, null, null) })); diff --git a/Common/Proto/MonsterBattleInfo.cs b/Common/Proto/MonsterBattleInfo.cs index f03aa3fd..e699a56b 100644 --- a/Common/Proto/MonsterBattleInfo.cs +++ b/Common/Proto/MonsterBattleInfo.cs @@ -24,10 +24,10 @@ namespace EggLink.DanhengServer.Proto { static MonsterBattleInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChdNb25zdGVyQmF0dGxlSW5mby5wcm90bxoaQXR0YWNrRGFtYWdlUHJvcGVy", - "dHkucHJvdG8aFlNraWxsVXNlUHJvcGVydHkucHJvdG8aEUVBSEFIRlBLSkxB", - "LnByb3RvGhFNQUVMTklLTURBSS5wcm90bxoVTW9uc3RlclBoYXNlU3R0LnBy", - "b3RvGhFHQU9BQ0ZMSkdMTC5wcm90bxoVTW9uc3RlclByb3BlcnR5LnByb3Rv", + "ChdNb25zdGVyQmF0dGxlSW5mby5wcm90bxoRRUFIQUhGUEtKTEEucHJvdG8a", + "FU1vbnN0ZXJQcm9wZXJ0eS5wcm90bxoRTUFFTE5JS01EQUkucHJvdG8aFlNr", + "aWxsVXNlUHJvcGVydHkucHJvdG8aGkF0dGFja0RhbWFnZVByb3BlcnR5LnBy", + "b3RvGhVNb25zdGVyUGhhc2VTdHQucHJvdG8aEUdBT0FDRkxKR0xMLnByb3Rv", "IqkGChFNb25zdGVyQmF0dGxlSW5mbxIRCgllbnRpdHlfaWQYASABKA0SEgoK", "bW9uc3Rlcl9pZBgCIAEoDRIbChNtb25zdGVyX3RlbXBsYXRlX2lkGAMgASgN", "EhUKDW1vbnN0ZXJfbGV2ZWwYBCABKA0SKAoObW9uc3Rlcl9zdGF0dXMYBSAB", @@ -48,7 +48,7 @@ namespace EggLink.DanhengServer.Proto { "c2VTdHQSEwoLSktQSkdMSFBKSkEYHSABKA0SEwoLQUxBR0dBS0JETksYHiAB", "KA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AttackDamagePropertyReflection.Descriptor, global::EggLink.DanhengServer.Proto.SkillUsePropertyReflection.Descriptor, global::EggLink.DanhengServer.Proto.EAHAHFPKJLAReflection.Descriptor, global::EggLink.DanhengServer.Proto.MAELNIKMDAIReflection.Descriptor, global::EggLink.DanhengServer.Proto.MonsterPhaseSttReflection.Descriptor, global::EggLink.DanhengServer.Proto.GAOACFLJGLLReflection.Descriptor, global::EggLink.DanhengServer.Proto.MonsterPropertyReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.EAHAHFPKJLAReflection.Descriptor, global::EggLink.DanhengServer.Proto.MonsterPropertyReflection.Descriptor, global::EggLink.DanhengServer.Proto.MAELNIKMDAIReflection.Descriptor, global::EggLink.DanhengServer.Proto.SkillUsePropertyReflection.Descriptor, global::EggLink.DanhengServer.Proto.AttackDamagePropertyReflection.Descriptor, global::EggLink.DanhengServer.Proto.MonsterPhaseSttReflection.Descriptor, global::EggLink.DanhengServer.Proto.GAOACFLJGLLReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MonsterBattleInfo), global::EggLink.DanhengServer.Proto.MonsterBattleInfo.Parser, new[]{ "EntityId", "MonsterId", "MonsterTemplateId", "MonsterLevel", "MonsterStatus", "TotalTurns", "TotalDamage", "TotalHeal", "TotalDamageTaken", "TotalStanceDamageTaken", "TotalHpRecover", "StageId", "BattleId", "MonsterType", "AttackTypeDamage", "SkillTimes", "StageType", "TotalBreakDamageTaken", "DelayCumulate", "DeathSource", "Wave", "IndexInWave", "Phase", "MaxPhase", "BattleTag", "SkillInfo", "CCJCKMFHGJJ", "FECCAPEDFKH", "JKPJGLHPJJA", "ALAGGAKBDNK" }, null, null, null, null) })); diff --git a/Common/Proto/MultipleDropInfoNotify.cs b/Common/Proto/MultipleDropInfoNotify.cs index 952c15e9..fe10bf8c 100644 --- a/Common/Proto/MultipleDropInfoNotify.cs +++ b/Common/Proto/MultipleDropInfoNotify.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static MultipleDropInfoNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChxNdWx0aXBsZURyb3BJbmZvTm90aWZ5LnByb3RvGh9QbGF5ZXJSZXR1cm5N", - "dWx0aURyb3BEYXRhLnByb3RvGhZNdWx0aXBsZURyb3BJbmZvLnByb3RvInYK", + "ChxNdWx0aXBsZURyb3BJbmZvTm90aWZ5LnByb3RvGhZNdWx0aXBsZURyb3BJ", + "bmZvLnByb3RvGh9QbGF5ZXJSZXR1cm5NdWx0aURyb3BEYXRhLnByb3RvInYK", "Fk11bHRpcGxlRHJvcEluZm9Ob3RpZnkSLQoSbXVsdGlwbGVfZHJvcF9saXN0", "GAUgAygLMhEuTXVsdGlwbGVEcm9wSW5mbxItCglkcm9wX2xpc3QYDiADKAsy", "Gi5QbGF5ZXJSZXR1cm5NdWx0aURyb3BEYXRhQh6qAhtFZ2dMaW5rLkRhbmhl", "bmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.PlayerReturnMultiDropDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.MultipleDropInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MultipleDropInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlayerReturnMultiDropDataReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MultipleDropInfoNotify), global::EggLink.DanhengServer.Proto.MultipleDropInfoNotify.Parser, new[]{ "MultipleDropList", "DropList" }, null, null, null, null) })); diff --git a/Common/Proto/NpcExtraInfo.cs b/Common/Proto/NpcExtraInfo.cs index 35c994eb..84106d67 100644 --- a/Common/Proto/NpcExtraInfo.cs +++ b/Common/Proto/NpcExtraInfo.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static NpcExtraInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChJOcGNFeHRyYUluZm8ucHJvdG8aEk5wY1JvZ3VlSW5mby5wcm90bxoRQUdN", - "SUdKTExCTk8ucHJvdG8aEUtISUhFR01GTEJBLnByb3RvIncKDE5wY0V4dHJh", + "ChJOcGNFeHRyYUluZm8ucHJvdG8aEUFHTUlHSkxMQk5PLnByb3RvGhFLSElI", + "RUdNRkxCQS5wcm90bxoSTnBjUm9ndWVJbmZvLnByb3RvIncKDE5wY0V4dHJh", "SW5mbxIhCgpyb2d1ZV9pbmZvGAggASgLMg0uTnBjUm9ndWVJbmZvEiEKC0pG", "SU9LTkROREZOGA4gASgLMgwuQUdNSUdKTExCTk8SIQoLS0lEQ0RNTUZHT0sY", "CSABKAsyDC5LSElIRUdNRkxCQUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVy", "LlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.NpcRogueInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.AGMIGJLLBNOReflection.Descriptor, global::EggLink.DanhengServer.Proto.KHIHEGMFLBAReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AGMIGJLLBNOReflection.Descriptor, global::EggLink.DanhengServer.Proto.KHIHEGMFLBAReflection.Descriptor, global::EggLink.DanhengServer.Proto.NpcRogueInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.NpcExtraInfo), global::EggLink.DanhengServer.Proto.NpcExtraInfo.Parser, new[]{ "RogueInfo", "JFIOKNDNDFN", "KIDCDMMFGOK" }, null, null, null, null) })); diff --git a/Common/Proto/PVEBattleResultCsReq.cs b/Common/Proto/PVEBattleResultCsReq.cs index 2d77f17e..bba7f021 100644 --- a/Common/Proto/PVEBattleResultCsReq.cs +++ b/Common/Proto/PVEBattleResultCsReq.cs @@ -24,8 +24,8 @@ namespace EggLink.DanhengServer.Proto { static PVEBattleResultCsReqReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChpQVkVCYXR0bGVSZXN1bHRDc1JlcS5wcm90bxoVQmF0dGxlRW5kU3RhdHVz", - "LnByb3RvGhZCYXR0bGVTdGF0aXN0aWNzLnByb3RvGg5CYXR0bGVPcC5wcm90", + "ChpQVkVCYXR0bGVSZXN1bHRDc1JlcS5wcm90bxoWQmF0dGxlU3RhdGlzdGlj", + "cy5wcm90bxoVQmF0dGxlRW5kU3RhdHVzLnByb3RvGg5CYXR0bGVPcC5wcm90", "byLyAwoUUFZFQmF0dGxlUmVzdWx0Q3NSZXESHgoDc3R0GAggASgLMhEuQmF0", "dGxlU3RhdGlzdGljcxIRCgliYXR0bGVfaWQYAyABKA0SHAoUdG90YWxfZGVs", "YXlfY3VtdWxhdGUYDiABKA0SOgoLY2xpZW50X3RhZ3MYBiADKAsyJS5QVkVC", @@ -40,7 +40,7 @@ namespace EggLink.DanhengServer.Proto { "ASgNOgI4AUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90", "bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.BattleEndStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleStatisticsReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleOpReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.BattleStatisticsReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleEndStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleOpReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PVEBattleResultCsReq), global::EggLink.DanhengServer.Proto.PVEBattleResultCsReq.Parser, new[]{ "Stt", "BattleId", "TotalDelayCumulate", "ClientTags", "NNCECLGCIDF", "NCIPBHFEFGG", "ResVersion", "StageId", "TurnSnapshotHash", "ClientVersion", "EndStatus", "OpList", "DebugExtraInfo", "IsAutoFight", "IsAiConsiderUltraSkill" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, }) })); diff --git a/Common/Proto/PlayerDetailInfo.cs b/Common/Proto/PlayerDetailInfo.cs index 85446ed0..28ed5fcc 100644 --- a/Common/Proto/PlayerDetailInfo.cs +++ b/Common/Proto/PlayerDetailInfo.cs @@ -24,8 +24,8 @@ namespace EggLink.DanhengServer.Proto { static PlayerDetailInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChZQbGF5ZXJEZXRhaWxJbmZvLnByb3RvGhdEaXNwbGF5UmVjb3JkSW5mby5w", - "cm90bxoSUGxhdGZvcm1UeXBlLnByb3RvGh1EaXNwbGF5QXZhdGFyRGV0YWls", + "ChZQbGF5ZXJEZXRhaWxJbmZvLnByb3RvGhJQbGF0Zm9ybVR5cGUucHJvdG8a", + "F0Rpc3BsYXlSZWNvcmRJbmZvLnByb3RvGh1EaXNwbGF5QXZhdGFyRGV0YWls", "SW5mby5wcm90byKgAwoQUGxheWVyRGV0YWlsSW5mbxIQCghuaWNrbmFtZRgD", "IAEoCRINCgVsZXZlbBgJIAEoDRInCgtyZWNvcmRfaW5mbxgCIAEoCzISLkRp", "c3BsYXlSZWNvcmRJbmZvEhMKC0VKQVBFT09QQUlEGA0gASgNEhEKCWlzX2Jh", @@ -38,7 +38,7 @@ namespace EggLink.DanhengServer.Proto { "ASgJEhMKC3dvcmxkX2xldmVsGA8gASgNQh6qAhtFZ2dMaW5rLkRhbmhlbmdT", "ZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.DisplayRecordInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlatformTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.DisplayAvatarDetailInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.PlatformTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.DisplayRecordInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.DisplayAvatarDetailInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PlayerDetailInfo), global::EggLink.DanhengServer.Proto.PlayerDetailInfo.Parser, new[]{ "Nickname", "Level", "RecordInfo", "EJAPEOOPAID", "IsBanned", "DMAPJGEFOBN", "CDAPDBPLGNN", "HBCFFCODHNH", "Signature", "JEODFILIFBK", "OFPIOACOPIH", "Uid", "HeadIcon", "Platform", "FFLOJMPGIJD", "WorldLevel" }, null, null, null, null) })); diff --git a/Common/Proto/PlayerKickOutScNotify.cs b/Common/Proto/PlayerKickOutScNotify.cs new file mode 100644 index 00000000..08d2c49f --- /dev/null +++ b/Common/Proto/PlayerKickOutScNotify.cs @@ -0,0 +1,282 @@ +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: PlayerKickOutScNotify.proto +// +#pragma warning disable 1591, 0612, 3021, 8981 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace EggLink.DanhengServer.Proto { + + /// Holder for reflection information generated from PlayerKickOutScNotify.proto + public static partial class PlayerKickOutScNotifyReflection { + + #region Descriptor + /// File descriptor for PlayerKickOutScNotify.proto + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static PlayerKickOutScNotifyReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChtQbGF5ZXJLaWNrT3V0U2NOb3RpZnkucHJvdG8aDktpY2tUeXBlLnByb3Rv", + "Gg9CbGFja0luZm8ucHJvdG8iVQoVUGxheWVyS2lja091dFNjTm90aWZ5EhwK", + "CWtpY2tfdHlwZRgBIAEoDjIJLktpY2tUeXBlEh4KCmJsYWNrX2luZm8YAiAB", + "KAsyCi5CbGFja0luZm9CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90", + "b2IGcHJvdG8z")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.KickTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.BlackInfoReflection.Descriptor, }, + new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PlayerKickOutScNotify), global::EggLink.DanhengServer.Proto.PlayerKickOutScNotify.Parser, new[]{ "KickType", "BlackInfo" }, null, null, null, null) + })); + } + #endregion + + } + #region Messages + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] + public sealed partial class PlayerKickOutScNotify : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PlayerKickOutScNotify()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pbr::MessageDescriptor Descriptor { + get { return global::EggLink.DanhengServer.Proto.PlayerKickOutScNotifyReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public PlayerKickOutScNotify() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public PlayerKickOutScNotify(PlayerKickOutScNotify other) : this() { + kickType_ = other.kickType_; + blackInfo_ = other.blackInfo_ != null ? other.blackInfo_.Clone() : null; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public PlayerKickOutScNotify Clone() { + return new PlayerKickOutScNotify(this); + } + + /// Field number for the "kick_type" field. + public const int KickTypeFieldNumber = 1; + private global::EggLink.DanhengServer.Proto.KickType kickType_ = global::EggLink.DanhengServer.Proto.KickType.KickSqueezed; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public global::EggLink.DanhengServer.Proto.KickType KickType { + get { return kickType_; } + set { + kickType_ = value; + } + } + + /// Field number for the "black_info" field. + public const int BlackInfoFieldNumber = 2; + private global::EggLink.DanhengServer.Proto.BlackInfo blackInfo_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public global::EggLink.DanhengServer.Proto.BlackInfo BlackInfo { + get { return blackInfo_; } + set { + blackInfo_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as PlayerKickOutScNotify); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(PlayerKickOutScNotify other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (KickType != other.KickType) return false; + if (!object.Equals(BlackInfo, other.BlackInfo)) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + if (KickType != global::EggLink.DanhengServer.Proto.KickType.KickSqueezed) hash ^= KickType.GetHashCode(); + if (blackInfo_ != null) hash ^= BlackInfo.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (KickType != global::EggLink.DanhengServer.Proto.KickType.KickSqueezed) { + output.WriteRawTag(8); + output.WriteEnum((int) KickType); + } + if (blackInfo_ != null) { + output.WriteRawTag(18); + output.WriteMessage(BlackInfo); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (KickType != global::EggLink.DanhengServer.Proto.KickType.KickSqueezed) { + output.WriteRawTag(8); + output.WriteEnum((int) KickType); + } + if (blackInfo_ != null) { + output.WriteRawTag(18); + output.WriteMessage(BlackInfo); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + if (KickType != global::EggLink.DanhengServer.Proto.KickType.KickSqueezed) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) KickType); + } + if (blackInfo_ != null) { + size += 1 + pb::CodedOutputStream.ComputeMessageSize(BlackInfo); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(PlayerKickOutScNotify other) { + if (other == null) { + return; + } + if (other.KickType != global::EggLink.DanhengServer.Proto.KickType.KickSqueezed) { + KickType = other.KickType; + } + if (other.blackInfo_ != null) { + if (blackInfo_ == null) { + BlackInfo = new global::EggLink.DanhengServer.Proto.BlackInfo(); + } + BlackInfo.MergeFrom(other.BlackInfo); + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 8: { + KickType = (global::EggLink.DanhengServer.Proto.KickType) input.ReadEnum(); + break; + } + case 18: { + if (blackInfo_ == null) { + BlackInfo = new global::EggLink.DanhengServer.Proto.BlackInfo(); + } + input.ReadMessage(BlackInfo); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 8: { + KickType = (global::EggLink.DanhengServer.Proto.KickType) input.ReadEnum(); + break; + } + case 18: { + if (blackInfo_ == null) { + BlackInfo = new global::EggLink.DanhengServer.Proto.BlackInfo(); + } + input.ReadMessage(BlackInfo); + break; + } + } + } + } + #endif + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Common/Proto/PlayerLoginCsReq.cs b/Common/Proto/PlayerLoginCsReq.cs index a1ffaeae..ac9d0873 100644 --- a/Common/Proto/PlayerLoginCsReq.cs +++ b/Common/Proto/PlayerLoginCsReq.cs @@ -24,8 +24,8 @@ namespace EggLink.DanhengServer.Proto { static PlayerLoginCsReqReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChZQbGF5ZXJMb2dpbkNzUmVxLnByb3RvGhJQbGF0Zm9ybVR5cGUucHJvdG8a", - "Ekxhbmd1YWdlVHlwZS5wcm90bxoVRXh0cmFEZXZpY2VJbmZvLnByb3RvIsIE", + "ChZQbGF5ZXJMb2dpbkNzUmVxLnByb3RvGhVFeHRyYURldmljZUluZm8ucHJv", + "dG8aElBsYXRmb3JtVHlwZS5wcm90bxoSTGFuZ3VhZ2VUeXBlLnByb3RvIsIE", "ChBQbGF5ZXJMb2dpbkNzUmVxEhMKC0hGTlBFS1BDQU9HGAIgASgJEhMKC0hM", "TUVFTkFMTEpJGAwgASgJEhQKC0ZGTE9KTVBHSUpEGL4BIAEoCRITCgtPR0hB", "TVBGRE5EShgPIAEoCRIUCgtETUFQSkdFRk9CThjiCCABKAkSJgoLQUhHTUpB", @@ -41,7 +41,7 @@ namespace EggLink.DanhengServer.Proto { "SkZBRUNNUElEGKANIAEoDRIUCgtDR0xLQUJHTEtBTRjjBSABKAlCHqoCG0Vn", "Z0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.PlatformTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.LanguageTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.ExtraDeviceInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ExtraDeviceInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlatformTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.LanguageTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PlayerLoginCsReq), global::EggLink.DanhengServer.Proto.PlayerLoginCsReq.Parser, new[]{ "HFNPEKPCAOG", "HLMEENALLJI", "FFLOJMPGIJD", "OGHAMPFDNDJ", "DMAPJGEFOBN", "AHGMJAMNGBL", "Signature", "DANIKEAOGAG", "BANELDJCBKJ", "PCMIBKBBPDJ", "Language", "BGNGNFCMCGH", "MHOPBGOEIPP", "RogueGetInfo", "ResVersion", "MNOIANMPGII", "LoginRandom", "MIGBDLHEPCA", "ClientVersion", "AKBBLKPJGNB", "Platform", "MEMPFAAPNBJ", "KEJFAECMPID", "CGLKABGLKAM" }, null, null, null, null) })); diff --git a/Common/Proto/PlayerSimpleInfo.cs b/Common/Proto/PlayerSimpleInfo.cs index 92dcfcfb..19ae4a9e 100644 --- a/Common/Proto/PlayerSimpleInfo.cs +++ b/Common/Proto/PlayerSimpleInfo.cs @@ -24,8 +24,8 @@ namespace EggLink.DanhengServer.Proto { static PlayerSimpleInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChZQbGF5ZXJTaW1wbGVJbmZvLnByb3RvGhZBc3Npc3RTaW1wbGVJbmZvLnBy", - "b3RvGhhGcmllbmRPbmxpbmVTdGF0dXMucHJvdG8aElBsYXRmb3JtVHlwZS5w", + "ChZQbGF5ZXJTaW1wbGVJbmZvLnByb3RvGhhGcmllbmRPbmxpbmVTdGF0dXMu", + "cHJvdG8aFkFzc2lzdFNpbXBsZUluZm8ucHJvdG8aElBsYXRmb3JtVHlwZS5w", "cm90byLCAgoQUGxheWVyU2ltcGxlSW5mbxIRCglzaWduYXR1cmUYBiABKAkS", "EQoJaXNfYmFubmVkGAwgASgIEhMKC0RNQVBKR0VGT0JOGAogASgJEiYKC0tF", "SEpOR0pNT0xHGAsgAygLMhEuQXNzaXN0U2ltcGxlSW5mbxIfCghwbGF0Zm9y", @@ -36,7 +36,7 @@ namespace EggLink.DanhengServer.Proto { "DQoFbGV2ZWwYCCABKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90", "b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AssistSimpleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.FriendOnlineStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlatformTypeReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.FriendOnlineStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.AssistSimpleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlatformTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PlayerSimpleInfo), global::EggLink.DanhengServer.Proto.PlayerSimpleInfo.Parser, new[]{ "Signature", "IsBanned", "DMAPJGEFOBN", "KEHJNGJMOLG", "Platform", "LogoutTime", "OnlineStatus", "HeadIcon", "FFLOJMPGIJD", "Nickname", "PGGHKLCBNPJ", "Uid", "Level" }, null, null, null, null) })); diff --git a/Common/Proto/PlayerSyncScNotify.cs b/Common/Proto/PlayerSyncScNotify.cs index bb60423d..9429572e 100644 --- a/Common/Proto/PlayerSyncScNotify.cs +++ b/Common/Proto/PlayerSyncScNotify.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static PlayerSyncScNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChhQbGF5ZXJTeW5jU2NOb3RpZnkucHJvdG8aEUdyb3VwU3RhdHVzLnByb3Rv", - "GhNTZWN0aW9uU3RhdHVzLnByb3RvGhBBdmF0YXJTeW5jLnByb3RvGg9FcXVp", - "cG1lbnQucHJvdG8aG1BsYXllckJvYXJkTW9kdWxlU3luYy5wcm90bxoRTWlz", - "c2lvblN5bmMucHJvdG8aFk1pc3Npb25FdmVudFN5bmMucHJvdG8aFVBsYXll", - "ckJhc2ljSW5mby5wcm90bxoOSXRlbUxpc3QucHJvdG8aEUJhc2ljTW9kdWxl", - "LnByb3RvGgtSZWxpYy5wcm90bxoOTWF0ZXJpYWwucHJvdG8aFVdhaXREZWxS", - "ZXNvdXJjZS5wcm90bxoRTkpLUEVESUhPSkkucHJvdG8aHVBsYXllckhlcm9C", - "YXNpY1R5cGVJbmZvLnByb3RvGgtRdWVzdC5wcm90byKKBgoSUGxheWVyU3lu", + "ChhQbGF5ZXJTeW5jU2NOb3RpZnkucHJvdG8aEU1pc3Npb25TeW5jLnByb3Rv", + "GgtRdWVzdC5wcm90bxoPRXF1aXBtZW50LnByb3RvGh1QbGF5ZXJIZXJvQmFz", + "aWNUeXBlSW5mby5wcm90bxoOTWF0ZXJpYWwucHJvdG8aEEF2YXRhclN5bmMu", + "cHJvdG8aE1NlY3Rpb25TdGF0dXMucHJvdG8aG1BsYXllckJvYXJkTW9kdWxl", + "U3luYy5wcm90bxoRQmFzaWNNb2R1bGUucHJvdG8aEU5KS1BFRElIT0pJLnBy", + "b3RvGhZNaXNzaW9uRXZlbnRTeW5jLnByb3RvGhVXYWl0RGVsUmVzb3VyY2Uu", + "cHJvdG8aEUdyb3VwU3RhdHVzLnByb3RvGg5JdGVtTGlzdC5wcm90bxoLUmVs", + "aWMucHJvdG8aFVBsYXllckJhc2ljSW5mby5wcm90byKKBgoSUGxheWVyU3lu", "Y1NjTm90aWZ5Ei0KEm1pc3Npb25fZXZlbnRfc3luYxgFIAEoCzIRLk1pc3Np", "b25FdmVudFN5bmMSIQoLUE5PT0xEQUhMRVAYeyADKAsyDC5Hcm91cFN0YXR1", "cxIeChV0b3RhbF9hY2hpZXZlbWVudF9leHAY4wogASgNEiAKDW1hdGVyaWFs", @@ -51,7 +51,7 @@ namespace EggLink.DanhengServer.Proto { "X3R5cGVfaW5mb19saXN0GAsgAygLMhguUGxheWVySGVyb0Jhc2ljVHlwZUlu", "Zm9CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.GroupStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.SectionStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarSyncReflection.Descriptor, global::EggLink.DanhengServer.Proto.EquipmentReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlayerBoardModuleSyncReflection.Descriptor, global::EggLink.DanhengServer.Proto.MissionSyncReflection.Descriptor, global::EggLink.DanhengServer.Proto.MissionEventSyncReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlayerBasicInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.BasicModuleReflection.Descriptor, global::EggLink.DanhengServer.Proto.RelicReflection.Descriptor, global::EggLink.DanhengServer.Proto.MaterialReflection.Descriptor, global::EggLink.DanhengServer.Proto.WaitDelResourceReflection.Descriptor, global::EggLink.DanhengServer.Proto.NJKPEDIHOJIReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlayerHeroBasicTypeInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.QuestReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MissionSyncReflection.Descriptor, global::EggLink.DanhengServer.Proto.QuestReflection.Descriptor, global::EggLink.DanhengServer.Proto.EquipmentReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlayerHeroBasicTypeInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.MaterialReflection.Descriptor, global::EggLink.DanhengServer.Proto.AvatarSyncReflection.Descriptor, global::EggLink.DanhengServer.Proto.SectionStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlayerBoardModuleSyncReflection.Descriptor, global::EggLink.DanhengServer.Proto.BasicModuleReflection.Descriptor, global::EggLink.DanhengServer.Proto.NJKPEDIHOJIReflection.Descriptor, global::EggLink.DanhengServer.Proto.MissionEventSyncReflection.Descriptor, global::EggLink.DanhengServer.Proto.WaitDelResourceReflection.Descriptor, global::EggLink.DanhengServer.Proto.GroupStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.RelicReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlayerBasicInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PlayerSyncScNotify), global::EggLink.DanhengServer.Proto.PlayerSyncScNotify.Parser, new[]{ "MissionEventSync", "PNOOLDAHLEP", "TotalAchievementExp", "MaterialList", "RemoveRelicTidList", "HKFAFCFFGOI", "EquipmentList", "RemoveEquipmentTidList", "KNBLDOEHNKP", "EFEHKOHKEHL", "AvatarSync", "MCEJAIGKFFM", "HIJDODKNGMN", "BasicInfo", "QuestList", "RelicList", "FLEKHBFJHPB", "EKPMBIKMNFC", "BasicModuleSync", "MissionSync", "BasicTypeInfoList" }, null, null, null, null) })); diff --git a/Common/Proto/PropExtraInfo.cs b/Common/Proto/PropExtraInfo.cs index 115a2204..029fb839 100644 --- a/Common/Proto/PropExtraInfo.cs +++ b/Common/Proto/PropExtraInfo.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static PropExtraInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChNQcm9wRXh0cmFJbmZvLnByb3RvGhNQcm9wUm9ndWVJbmZvLnByb3RvGhJQ", - "cm9wQWVvbkluZm8ucHJvdG8aGFByb3BDaGVzc1JvZ3VlSW5mby5wcm90byKE", + "ChNQcm9wRXh0cmFJbmZvLnByb3RvGhJQcm9wQWVvbkluZm8ucHJvdG8aGFBy", + "b3BDaGVzc1JvZ3VlSW5mby5wcm90bxoTUHJvcFJvZ3VlSW5mby5wcm90byKE", "AQoNUHJvcEV4dHJhSW5mbxIiCgpyb2d1ZV9pbmZvGAIgASgLMg4uUHJvcFJv", "Z3VlSW5mbxIgCglhZW9uX2luZm8YDyABKAsyDS5Qcm9wQWVvbkluZm8SLQoQ", "Y2hlc3Nfcm9ndWVfaW5mbxgBIAEoCzITLlByb3BDaGVzc1JvZ3VlSW5mb0Ie", "qgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.PropRogueInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PropAeonInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PropChessRogueInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.PropAeonInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PropChessRogueInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PropRogueInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PropExtraInfo), global::EggLink.DanhengServer.Proto.PropExtraInfo.Parser, new[]{ "RogueInfo", "AeonInfo", "ChessRogueInfo" }, null, null, null, null) })); diff --git a/Common/Proto/QuitRogueScRsp.cs b/Common/Proto/QuitRogueScRsp.cs index 74b627d1..d7c96476 100644 --- a/Common/Proto/QuitRogueScRsp.cs +++ b/Common/Proto/QuitRogueScRsp.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static QuitRogueScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChRRdWl0Um9ndWVTY1JzcC5wcm90bxoPUm9ndWVJbmZvLnByb3RvGhVSb2d1", - "ZUZpbmlzaEluZm8ucHJvdG8iaAoOUXVpdFJvZ3VlU2NSc3ASHgoKcm9ndWVf", + "ChRRdWl0Um9ndWVTY1JzcC5wcm90bxoVUm9ndWVGaW5pc2hJbmZvLnByb3Rv", + "Gg9Sb2d1ZUluZm8ucHJvdG8iaAoOUXVpdFJvZ3VlU2NSc3ASHgoKcm9ndWVf", "aW5mbxgMIAEoCzIKLlJvZ3VlSW5mbxIPCgdyZXRjb2RlGAogASgNEiUKC2Zp", "bmlzaF9pbmZvGAcgASgLMhAuUm9ndWVGaW5pc2hJbmZvQh6qAhtFZ2dMaW5r", "LkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueFinishInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueFinishInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.QuitRogueScRsp), global::EggLink.DanhengServer.Proto.QuitRogueScRsp.Parser, new[]{ "RogueInfo", "Retcode", "FinishInfo" }, null, null, null, null) })); diff --git a/Common/Proto/RaidInfoNotify.cs b/Common/Proto/RaidInfoNotify.cs index 177ef72b..75c0e242 100644 --- a/Common/Proto/RaidInfoNotify.cs +++ b/Common/Proto/RaidInfoNotify.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static RaidInfoNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChRSYWlkSW5mb05vdGlmeS5wcm90bxoQUmFpZFN0YXR1cy5wcm90bxoKUmFp", - "ZC5wcm90bxoOSXRlbUxpc3QucHJvdG8iogEKDlJhaWRJbmZvTm90aWZ5EhsK", + "ChRSYWlkSW5mb05vdGlmeS5wcm90bxoOSXRlbUxpc3QucHJvdG8aEFJhaWRT", + "dGF0dXMucHJvdG8aClJhaWQucHJvdG8iogEKDlJhaWRJbmZvTm90aWZ5EhsK", "BnN0YXR1cxgLIAEoDjILLlJhaWRTdGF0dXMSGAoJcmFpZF9saXN0GAIgAygL", "MgUuUmFpZBIVCg1maW5pc2hlZF90aW1lGAogASgEEg8KB3JhaWRfaWQYByAB", "KA0SHAoJaXRlbV9saXN0GA8gASgLMgkuSXRlbUxpc3QSEwoLd29ybGRfbGV2", "ZWwYBCABKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJv", "dG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RaidStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.RaidReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.RaidStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.RaidReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RaidInfoNotify), global::EggLink.DanhengServer.Proto.RaidInfoNotify.Parser, new[]{ "Status", "RaidList", "FinishedTime", "RaidId", "ItemList", "WorldLevel" }, null, null, null, null) })); diff --git a/Common/Proto/RaidKickByServerScNotify.cs b/Common/Proto/RaidKickByServerScNotify.cs index 7bb7f5a3..de8c6202 100644 --- a/Common/Proto/RaidKickByServerScNotify.cs +++ b/Common/Proto/RaidKickByServerScNotify.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static RaidKickByServerScNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch5SYWlkS2lja0J5U2VydmVyU2NOb3RpZnkucHJvdG8aD1NjZW5lSW5mby5w", - "cm90bxoUUmFpZEtpY2tSZWFzb24ucHJvdG8aEExpbmV1cEluZm8ucHJvdG8i", + "Ch5SYWlkS2lja0J5U2VydmVyU2NOb3RpZnkucHJvdG8aEExpbmV1cEluZm8u", + "cHJvdG8aFFJhaWRLaWNrUmVhc29uLnByb3RvGg9TY2VuZUluZm8ucHJvdG8i", "mQEKGFJhaWRLaWNrQnlTZXJ2ZXJTY05vdGlmeRIbCgZsaW5ldXAYCiABKAsy", "Cy5MaW5ldXBJbmZvEhkKBXNjZW5lGAUgASgLMgouU2NlbmVJbmZvEh8KBnJl", "YXNvbhgJIAEoDjIPLlJhaWRLaWNrUmVhc29uEhMKC3dvcmxkX2xldmVsGAQg", "ASgNEg8KB3JhaWRfaWQYBiABKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZl", "ci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RaidKickReasonReflection.Descriptor, global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RaidKickReasonReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RaidKickByServerScNotify), global::EggLink.DanhengServer.Proto.RaidKickByServerScNotify.Parser, new[]{ "Lineup", "Scene", "Reason", "WorldLevel", "RaidId" }, null, null, null, null) })); diff --git a/Common/Proto/RevcMsgScNotify.cs b/Common/Proto/RevcMsgScNotify.cs index ddbc9cb1..ad6afc99 100644 --- a/Common/Proto/RevcMsgScNotify.cs +++ b/Common/Proto/RevcMsgScNotify.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static RevcMsgScNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChVSZXZjTXNnU2NOb3RpZnkucHJvdG8aDkNoYXRUeXBlLnByb3RvGg1Nc2dU", + "ChVSZXZjTXNnU2NOb3RpZnkucHJvdG8aDU1zZ1R5cGUucHJvdG8aDkNoYXRU", "eXBlLnByb3RvIqEBCg9SZXZjTXNnU2NOb3RpZnkSEwoLRE5FQk9PR0ZDS0UY", "CyABKA0SEAoIZXh0cmFfaWQYDiABKA0SFAoMbWVzc2FnZV90ZXh0GAggASgJ", "Eh4KDG1lc3NhZ2VfdHlwZRgPIAEoDjIILk1zZ1R5cGUSHAoJY2hhdF90eXBl", "GA0gASgOMgkuQ2hhdFR5cGUSEwoLTUlLQ0RGQk1NSUMYBCABKA1CHqoCG0Vn", "Z0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChatTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.MsgTypeReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MsgTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChatTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RevcMsgScNotify), global::EggLink.DanhengServer.Proto.RevcMsgScNotify.Parser, new[]{ "DNEBOOGFCKE", "ExtraId", "MessageText", "MessageType", "ChatType", "MIKCDFBMMIC" }, null, null, null, null) })); diff --git a/Common/Proto/RogueAction.cs b/Common/Proto/RogueAction.cs index 74b0ee1c..0e9a5b96 100644 --- a/Common/Proto/RogueAction.cs +++ b/Common/Proto/RogueAction.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static RogueActionReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFSb2d1ZUFjdGlvbi5wcm90bxoRQ0VMTERLT0NKSUEucHJvdG8aH1JvZ3Vl", - "TWlyYWNsZURlc3RvcnlBY3Rpb24ucHJvdG8aJ1JvZ3VlTWlyYWNsZVNlbGVj", - "dERlc3RvcnllZEFjdGlvbi5wcm90bxocUm9ndWVCb251c1NlbGVjdEFjdGlv", - "bi5wcm90bxoZUm9ndWVCdWZmRHJvcEFjdGlvbi5wcm90bxoiUm9ndWVCdWZm", - "RW5oYW5jZVNlbGVjdEFjdGlvbi5wcm90bxoeUm9ndWVNaXJhY2xlUmVwYWly", - "QWN0aW9uLnByb3RvGhtSb2d1ZUJ1ZmZTZWxlY3RBY3Rpb24ucHJvdG8aHFJv", - "Z3VlTWlyYWNsZURyb3BBY3Rpb24ucHJvdG8aHlJvZ3VlTWlyYWNsZVNlbGVj", + "ChFSb2d1ZUFjdGlvbi5wcm90bxocUm9ndWVNaXJhY2xlRHJvcEFjdGlvbi5w", + "cm90bxoeUm9ndWVNaXJhY2xlUmVwYWlyQWN0aW9uLnByb3RvGiJSb2d1ZUJ1", + "ZmZFbmhhbmNlU2VsZWN0QWN0aW9uLnByb3RvGh5Sb2d1ZU1pcmFjbGVTZWxl", + "Y3RBY3Rpb24ucHJvdG8aJ1JvZ3VlTWlyYWNsZVNlbGVjdERlc3RvcnllZEFj", + "dGlvbi5wcm90bxocUm9ndWVCb251c1NlbGVjdEFjdGlvbi5wcm90bxoZUm9n", + "dWVCdWZmRHJvcEFjdGlvbi5wcm90bxofUm9ndWVNaXJhY2xlRGVzdG9yeUFj", + "dGlvbi5wcm90bxoRQ0VMTERLT0NKSUEucHJvdG8aG1JvZ3VlQnVmZlNlbGVj", "dEFjdGlvbi5wcm90byKrBAoLUm9ndWVBY3Rpb24SMQoQYnVmZl9zZWxlY3Rf", "aW5mbxjsCiABKAsyFi5Sb2d1ZUJ1ZmZTZWxlY3RBY3Rpb24SLwoQZHJvcF9i", "dWZmX2FjdGlvbhjOBCABKAsyFC5Sb2d1ZUJ1ZmZEcm9wQWN0aW9uEjsKE2Vu", @@ -46,7 +46,7 @@ namespace EggLink.DanhengServer.Proto { "lAogASgLMhcuUm9ndWVCb251c1NlbGVjdEFjdGlvbkIeqgIbRWdnTGluay5E", "YW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.CELLDKOCJIAReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleDestoryActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleSelectDestoryedActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBonusSelectActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffDropActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffEnhanceSelectActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleRepairActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffSelectActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleDropActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleSelectActionReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueMiracleDropActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleRepairActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffEnhanceSelectActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleSelectActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleSelectDestoryedActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBonusSelectActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffDropActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMiracleDestoryActionReflection.Descriptor, global::EggLink.DanhengServer.Proto.CELLDKOCJIAReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueBuffSelectActionReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RogueAction), global::EggLink.DanhengServer.Proto.RogueAction.Parser, new[]{ "BuffSelectInfo", "DropBuffAction", "EnhanceSelectInfo", "MiracleSelectInfo", "DONMAOEJMEF", "RepairMiracleAction", "DestroyMiracleAction", "DropMiracleAction", "PKEFIKCMDOM", "BonusSelectAction" }, null, null, null, null) })); diff --git a/Common/Proto/RogueBoardEventInfo.cs b/Common/Proto/RogueBoardEventInfo.cs index a0d0556d..efc3f37d 100644 --- a/Common/Proto/RogueBoardEventInfo.cs +++ b/Common/Proto/RogueBoardEventInfo.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static RogueBoardEventInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChlSb2d1ZUJvYXJkRXZlbnRJbmZvLnByb3RvGhFKTUNQREZIS0VBQy5wcm90", - "bxogUm9ndWVTeW5jQ29udGV4dEJvYXJkRXZlbnQucHJvdG8ibAoTUm9ndWVC", + "ChlSb2d1ZUJvYXJkRXZlbnRJbmZvLnByb3RvGiBSb2d1ZVN5bmNDb250ZXh0", + "Qm9hcmRFdmVudC5wcm90bxoRSk1DUERGSEtFQUMucHJvdG8ibAoTUm9ndWVC", "b2FyZEV2ZW50SW5mbxIhCgtLTUlEUERNT0ZOQRgFIAEoCzIMLkpNQ1BERkhL", "RUFDEjIKDWV2ZW50X2NvbnRlbnQYDSABKAsyGy5Sb2d1ZVN5bmNDb250ZXh0", "Qm9hcmRFdmVudEIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZw", "cm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.JMCPDFHKEACReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueSyncContextBoardEventReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueSyncContextBoardEventReflection.Descriptor, global::EggLink.DanhengServer.Proto.JMCPDFHKEACReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RogueBoardEventInfo), global::EggLink.DanhengServer.Proto.RogueBoardEventInfo.Parser, new[]{ "KMIDPDMOFNA", "EventContent" }, null, null, null, null) })); diff --git a/Common/Proto/RogueCommonActionResult.cs b/Common/Proto/RogueCommonActionResult.cs index 604ccdcc..17a87ab4 100644 --- a/Common/Proto/RogueCommonActionResult.cs +++ b/Common/Proto/RogueCommonActionResult.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static RogueCommonActionResultReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch1Sb2d1ZUNvbW1vbkFjdGlvblJlc3VsdC5wcm90bxonUm9ndWVDb21tb25B", - "Y3Rpb25SZXN1bHRTb3VyY2VUeXBlLnByb3RvGiFSb2d1ZUNvbW1vbkFjdGlv", - "blJlc3VsdERhdGEucHJvdG8iewoXUm9ndWVDb21tb25BY3Rpb25SZXN1bHQS", + "Ch1Sb2d1ZUNvbW1vbkFjdGlvblJlc3VsdC5wcm90bxohUm9ndWVDb21tb25B", + "Y3Rpb25SZXN1bHREYXRhLnByb3RvGidSb2d1ZUNvbW1vbkFjdGlvblJlc3Vs", + "dFNvdXJjZVR5cGUucHJvdG8iewoXUm9ndWVDb21tb25BY3Rpb25SZXN1bHQS", "MgoGc291cmNlGAcgASgOMiIuUm9ndWVDb21tb25BY3Rpb25SZXN1bHRTb3Vy", "Y2VUeXBlEiwKBmFjdGlvbhgLIAEoCzIcLlJvZ3VlQ29tbW9uQWN0aW9uUmVz", "dWx0RGF0YUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90", "bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueCommonActionResultSourceTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueCommonActionResultDataReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueCommonActionResultDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueCommonActionResultSourceTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RogueCommonActionResult), global::EggLink.DanhengServer.Proto.RogueCommonActionResult.Parser, new[]{ "Source", "Action" }, null, null, null, null) })); diff --git a/Common/Proto/RogueCommonActionResultData.cs b/Common/Proto/RogueCommonActionResultData.cs index 5f8acde8..1e315075 100644 --- a/Common/Proto/RogueCommonActionResultData.cs +++ b/Common/Proto/RogueCommonActionResultData.cs @@ -24,11 +24,11 @@ namespace EggLink.DanhengServer.Proto { static RogueCommonActionResultDataReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiFSb2d1ZUNvbW1vbkFjdGlvblJlc3VsdERhdGEucHJvdG8aEUhIS0tJR0lG", - "S0FFLnByb3RvGhFEQkVCTVBESkJESS5wcm90bxoRTEdLUEJETUdCUEUucHJv", - "dG8aEUZIT1BKQkRDSlBOLnByb3RvGhFKUEhDRUFDTUVLSy5wcm90bxoTUm9n", - "dWVEcm9wQnVmZi5wcm90bxoWUm9ndWVEcm9wTWlyYWNsZS5wcm90bxoRUElJ", - "SUlKS0ZGR0oucHJvdG8aEUdCQUhHTElHQkNGLnByb3RvIroDChtSb2d1ZUNv", + "CiFSb2d1ZUNvbW1vbkFjdGlvblJlc3VsdERhdGEucHJvdG8aEURCRUJNUERK", + "QkRJLnByb3RvGhFISEtLSUdJRktBRS5wcm90bxoTUm9ndWVEcm9wQnVmZi5w", + "cm90bxoRR0JBSEdMSUdCQ0YucHJvdG8aEUZIT1BKQkRDSlBOLnByb3RvGhFM", + "R0tQQkRNR0JQRS5wcm90bxoWUm9ndWVEcm9wTWlyYWNsZS5wcm90bxoRUElJ", + "SUlKS0ZGR0oucHJvdG8aEUpQSENFQUNNRUtLLnByb3RvIroDChtSb2d1ZUNv", "bW1vbkFjdGlvblJlc3VsdERhdGESIQoLQUhOTExJR0dQS0YYDCABKAsyDC5K", "UEhDRUFDTUVLSxIhCgtQT05DR09CTEhQQRgLIAEoCzIMLkpQSENFQUNNRUtL", "EiYKDWdldF9idWZmX2xpc3QY+AQgASgLMg4uUm9ndWVEcm9wQnVmZhInCg5s", @@ -41,7 +41,7 @@ namespace EggLink.DanhengServer.Proto { "SUVQR01HRBiABSABKAsyDC5GSE9QSkJEQ0pQTkIeqgIbRWdnTGluay5EYW5o", "ZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.HHKKIGIFKAEReflection.Descriptor, global::EggLink.DanhengServer.Proto.DBEBMPDJBDIReflection.Descriptor, global::EggLink.DanhengServer.Proto.LGKPBDMGBPEReflection.Descriptor, global::EggLink.DanhengServer.Proto.FHOPJBDCJPNReflection.Descriptor, global::EggLink.DanhengServer.Proto.JPHCEACMEKKReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueDropBuffReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueDropMiracleReflection.Descriptor, global::EggLink.DanhengServer.Proto.PIIIIJKFFGJReflection.Descriptor, global::EggLink.DanhengServer.Proto.GBAHGLIGBCFReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.DBEBMPDJBDIReflection.Descriptor, global::EggLink.DanhengServer.Proto.HHKKIGIFKAEReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueDropBuffReflection.Descriptor, global::EggLink.DanhengServer.Proto.GBAHGLIGBCFReflection.Descriptor, global::EggLink.DanhengServer.Proto.FHOPJBDCJPNReflection.Descriptor, global::EggLink.DanhengServer.Proto.LGKPBDMGBPEReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueDropMiracleReflection.Descriptor, global::EggLink.DanhengServer.Proto.PIIIIJKFFGJReflection.Descriptor, global::EggLink.DanhengServer.Proto.JPHCEACMEKKReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RogueCommonActionResultData), global::EggLink.DanhengServer.Proto.RogueCommonActionResultData.Parser, new[]{ "AHNLLIGGPKF", "PONCGOBLHPA", "GetBuffList", "LostBuffList", "GetMiracleInfo", "CKDABJDIMBN", "LIAFCBIPEHF", "BIENKPBJGOF", "OAPLNBNEBEJ", "GGBAIKDFOIK", "MJLCIEPGMGD" }, null, null, null, null) })); diff --git a/Common/Proto/RogueEndlessAreaData.cs b/Common/Proto/RogueEndlessAreaData.cs index 3f5dde9a..f51163a5 100644 --- a/Common/Proto/RogueEndlessAreaData.cs +++ b/Common/Proto/RogueEndlessAreaData.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static RogueEndlessAreaDataReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChpSb2d1ZUVuZGxlc3NBcmVhRGF0YS5wcm90bxobUm9ndWVFbmRsZXNzTGF5", - "ZXJJbmZvLnByb3RvGhFJT0FIQk9BUEJESi5wcm90byKIAQoUUm9ndWVFbmRs", + "ChpSb2d1ZUVuZGxlc3NBcmVhRGF0YS5wcm90bxoRSU9BSEJPQVBCREoucHJv", + "dG8aG1JvZ3VlRW5kbGVzc0xheWVySW5mby5wcm90byKIAQoUUm9ndWVFbmRs", "ZXNzQXJlYURhdGESIQoLUElOTE5IT1BHSUcYCSABKAsyDC5JT0FIQk9BUEJE", "ShIqCgpsYXllcl9pbmZvGAggASgLMhYuUm9ndWVFbmRsZXNzTGF5ZXJJbmZv", "Eg8KB2FyZWFfaWQYCiABKA0SEAoIcGFuZWxfaWQYBiABKA1CHqoCG0VnZ0xp", "bmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueEndlessLayerInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.IOAHBOAPBDJReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.IOAHBOAPBDJReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueEndlessLayerInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RogueEndlessAreaData), global::EggLink.DanhengServer.Proto.RogueEndlessAreaData.Parser, new[]{ "PINLNHOPGIG", "LayerInfo", "AreaId", "PanelId" }, null, null, null, null) })); diff --git a/Common/Proto/RogueFinishInfo.cs b/Common/Proto/RogueFinishInfo.cs index 2beaba1b..bb4958c1 100644 --- a/Common/Proto/RogueFinishInfo.cs +++ b/Common/Proto/RogueFinishInfo.cs @@ -25,8 +25,8 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChVSb2d1ZUZpbmlzaEluZm8ucHJvdG8aGlJvZ3VlU2NvcmVSZXdhcmRJbmZv", - "LnByb3RvGg5JdGVtTGlzdC5wcm90bxoVUm9ndWVSZWNvcmRJbmZvLnByb3Rv", - "GhtSb2d1ZUV4cGxvcmVTY29yZUluZm8ucHJvdG8aEUFPSFBDTkdETEtELnBy", + "LnByb3RvGhtSb2d1ZUV4cGxvcmVTY29yZUluZm8ucHJvdG8aEUFPSFBDTkdE", + "TEtELnByb3RvGhVSb2d1ZVJlY29yZEluZm8ucHJvdG8aDkl0ZW1MaXN0LnBy", "b3RvIvcDCg9Sb2d1ZUZpbmlzaEluZm8SIQoLQkRCSUdISk9GTUwYCyABKAsy", "DC5BT0hQQ05HRExLRBITCgtETExFRkRQUENIUBgCIAEoCBIQCgdhcmVhX2lk", "GOIIIAEoDRITCgtHQUtGQkZOQ0pQRxgBIAEoDRIlCgtyZWNvcmRfaW5mbxgH", @@ -41,7 +41,7 @@ namespace EggLink.DanhengServer.Proto { "ASgLMgkuSXRlbUxpc3RCHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90", "b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueScoreRewardInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueRecordInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueExploreScoreInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.AOHPCNGDLKDReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueScoreRewardInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueExploreScoreInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.AOHPCNGDLKDReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueRecordInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RogueFinishInfo), global::EggLink.DanhengServer.Proto.RogueFinishInfo.Parser, new[]{ "BDBIGHJOFML", "DLLEFDPPCHP", "AreaId", "GAKFBFNCJPG", "RecordInfo", "RewardInfo", "JACMEEJGFGC", "FMIAODPPBAK", "EHKAAHNOMML", "MFEICGJIIPG", "OGHPDDOMBPJ", "PPFKLKHHAEO", "MFBJHBCCBKD", "LKBFHOPJGNN", "ScoreInfo", "ScoreId", "OHEAGDCBICL" }, null, null, null, null) })); diff --git a/Common/Proto/RogueGameInfo.cs b/Common/Proto/RogueGameInfo.cs index 143ed314..dd07012a 100644 --- a/Common/Proto/RogueGameInfo.cs +++ b/Common/Proto/RogueGameInfo.cs @@ -24,11 +24,11 @@ namespace EggLink.DanhengServer.Proto { static RogueGameInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChNSb2d1ZUdhbWVJbmZvLnByb3RvGhZSb2d1ZUFjdGlvblF1ZXVlLnByb3Rv", - "GhlHYW1lVmlydHVhbEl0ZW1JbmZvLnByb3RvGhRHYW1lTGluZXVwSW5mby5w", - "cm90bxoOR2FtZUFlb24ucHJvdG8aFUdhbWVNaXJhY2xlSW5mby5wcm90bxoS", - "R2FtZUJ1ZmZJbmZvLnByb3RvGhFJTktHRkZIR0tCQi5wcm90bxoQUm9ndWVM", - "ZXZlbC5wcm90bxoRUm9ndWVTdGF0dXMucHJvdG8i5AIKDVJvZ3VlR2FtZUlu", + "ChNSb2d1ZUdhbWVJbmZvLnByb3RvGhlHYW1lVmlydHVhbEl0ZW1JbmZvLnBy", + "b3RvGhZSb2d1ZUFjdGlvblF1ZXVlLnByb3RvGhJHYW1lQnVmZkluZm8ucHJv", + "dG8aFEdhbWVMaW5ldXBJbmZvLnByb3RvGhFSb2d1ZVN0YXR1cy5wcm90bxoQ", + "Um9ndWVMZXZlbC5wcm90bxoVR2FtZU1pcmFjbGVJbmZvLnByb3RvGg5HYW1l", + "QWVvbi5wcm90bxoRSU5LR0ZGSEdLQkIucHJvdG8i5AIKDVJvZ3VlR2FtZUlu", "Zm8SHgoJcm9ndWVfbWFwGAEgASgLMgsuUm9ndWVMZXZlbBIlCgpjdXJfYWN0", "aW9uGAUgASgLMhEuUm9ndWVBY3Rpb25RdWV1ZRIrChFnYW1lX21pcmFjbGVf", "aW5mbxgLIAEoCzIQLkdhbWVNaXJhY2xlSW5mbxIcCgZzdGF0dXMYDSABKA4y", @@ -39,7 +39,7 @@ namespace EggLink.DanhengServer.Proto { "TkpDUEdITEwYBiABKAsyDC5JTktHRkZIR0tCQkIeqgIbRWdnTGluay5EYW5o", "ZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueActionQueueReflection.Descriptor, global::EggLink.DanhengServer.Proto.GameVirtualItemInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.GameLineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.GameAeonReflection.Descriptor, global::EggLink.DanhengServer.Proto.GameMiracleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.GameBuffInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.INKGFFHGKBBReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueLevelReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueStatusReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.GameVirtualItemInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueActionQueueReflection.Descriptor, global::EggLink.DanhengServer.Proto.GameBuffInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.GameLineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueLevelReflection.Descriptor, global::EggLink.DanhengServer.Proto.GameMiracleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.GameAeonReflection.Descriptor, global::EggLink.DanhengServer.Proto.INKGFFHGKBBReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RogueGameInfo), global::EggLink.DanhengServer.Proto.RogueGameInfo.Parser, new[]{ "RogueMap", "CurAction", "GameMiracleInfo", "Status", "GameBuffInfo", "RogueAeonInfo", "MoneyInfo", "GameLineupInfo", "ENPNJCPGHLL" }, null, null, null, null) })); diff --git a/Common/Proto/RogueGetInfo.cs b/Common/Proto/RogueGetInfo.cs index 918e8a31..6914fb11 100644 --- a/Common/Proto/RogueGetInfo.cs +++ b/Common/Proto/RogueGetInfo.cs @@ -24,9 +24,9 @@ namespace EggLink.DanhengServer.Proto { static RogueGetInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChJSb2d1ZUdldEluZm8ucHJvdG8aFVJvZ3VlU2Vhc29uSW5mby5wcm90bxoT", - "Um9ndWVBcmVhTGlzdC5wcm90bxoaUm9ndWVTY29yZVJld2FyZEluZm8ucHJv", - "dG8aE1JvZ3VlSXRlbUluZm8ucHJvdG8aE1JvZ3VlQWVvbkluZm8ucHJvdG8i", + "ChJSb2d1ZUdldEluZm8ucHJvdG8aFVJvZ3VlU2Vhc29uSW5mby5wcm90bxoa", + "Um9ndWVTY29yZVJld2FyZEluZm8ucHJvdG8aE1JvZ3VlQWVvbkluZm8ucHJv", + "dG8aE1JvZ3VlQXJlYUxpc3QucHJvdG8aE1JvZ3VlSXRlbUluZm8ucHJvdG8i", "9gEKDFJvZ3VlR2V0SW5mbxI2Chdyb2d1ZV9zY29yZV9yZXdhcmRfaW5mbxgP", "IAEoCzIVLlJvZ3VlU2NvcmVSZXdhcmRJbmZvEicKD3JvZ3VlX2Flb25faW5m", "bxgBIAEoCzIOLlJvZ3VlQWVvbkluZm8SKwoRcm9ndWVfc2Vhc29uX2luZm8Y", @@ -35,7 +35,7 @@ namespace EggLink.DanhengServer.Proto { "bxgOIAEoCzIOLlJvZ3VlQXJlYUxpc3RCHqoCG0VnZ0xpbmsuRGFuaGVuZ1Nl", "cnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueSeasonInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueAreaListReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueScoreRewardInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueItemInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueAeonInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueSeasonInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueScoreRewardInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueAeonInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueAreaListReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueItemInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RogueGetInfo), global::EggLink.DanhengServer.Proto.RogueGetInfo.Parser, new[]{ "RogueScoreRewardInfo", "RogueAeonInfo", "RogueSeasonInfo", "RogueVirtualItemInfo", "RogueAreaInfo" }, null, null, null, null) })); diff --git a/Common/Proto/RogueHandbookInfo.cs b/Common/Proto/RogueHandbookInfo.cs index 573a20f3..c71f15a8 100644 --- a/Common/Proto/RogueHandbookInfo.cs +++ b/Common/Proto/RogueHandbookInfo.cs @@ -25,8 +25,8 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChdSb2d1ZUhhbmRib29rSW5mby5wcm90bxoXUm9ndWVIYW5kYm9va0J1ZmYu", - "cHJvdG8aGlJvZ3VlSGFuZEJvb2tNaXJhY2xlLnByb3RvGhhSb2d1ZUhhbmRC", - "b29rRXZlbnQucHJvdG8aF1JvZ3VlSGFuZGJvb2tBZW9uLnByb3RvIr0BChFS", + "cHJvdG8aF1JvZ3VlSGFuZGJvb2tBZW9uLnByb3RvGhhSb2d1ZUhhbmRCb29r", + "RXZlbnQucHJvdG8aGlJvZ3VlSGFuZEJvb2tNaXJhY2xlLnByb3RvIr0BChFS", "b2d1ZUhhbmRib29rSW5mbxIrCg9yb2d1ZV9hZW9uX2xpc3QYCSADKAsyEi5S", "b2d1ZUhhbmRib29rQWVvbhIlCglidWZmX2xpc3QYAyADKAsyEi5Sb2d1ZUhh", "bmRib29rQnVmZhIrCgxtaXJhY2xlX2xpc3QYBCADKAsyFS5Sb2d1ZUhhbmRC", @@ -34,7 +34,7 @@ namespace EggLink.DanhengServer.Proto { "a0V2ZW50Qh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3Rv", "Mw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueHandbookBuffReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueHandBookMiracleReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueHandBookEventReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueHandbookAeonReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueHandbookBuffReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueHandbookAeonReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueHandBookEventReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueHandBookMiracleReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RogueHandbookInfo), global::EggLink.DanhengServer.Proto.RogueHandbookInfo.Parser, new[]{ "RogueAeonList", "BuffList", "MiracleList", "EventList" }, null, null, null, null) })); diff --git a/Common/Proto/RogueInfo.cs b/Common/Proto/RogueInfo.cs index 2f5fcd80..40f51030 100644 --- a/Common/Proto/RogueInfo.cs +++ b/Common/Proto/RogueInfo.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static RogueInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cg9Sb2d1ZUluZm8ucHJvdG8aElJvZ3VlR2V0SW5mby5wcm90bxoTUm9ndWVH", - "YW1lSW5mby5wcm90byJdCglSb2d1ZUluZm8SKAoPcm9ndWVfZ2FtZV9pbmZv", + "Cg9Sb2d1ZUluZm8ucHJvdG8aE1JvZ3VlR2FtZUluZm8ucHJvdG8aElJvZ3Vl", + "R2V0SW5mby5wcm90byJdCglSb2d1ZUluZm8SKAoPcm9ndWVfZ2FtZV9pbmZv", "GMwMIAEoCzIOLlJvZ3VlR2FtZUluZm8SJgoOcm9ndWVfZ2V0X2luZm8YmAsg", "ASgLMg0uUm9ndWVHZXRJbmZvQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIu", "UHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueGetInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueGameInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueGameInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueGetInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RogueInfo), global::EggLink.DanhengServer.Proto.RogueInfo.Parser, new[]{ "RogueGameInfo", "RogueGetInfo" }, null, null, null, null) })); diff --git a/Common/Proto/RogueModifier.cs b/Common/Proto/RogueModifier.cs index 7638bf90..9b7f1785 100644 --- a/Common/Proto/RogueModifier.cs +++ b/Common/Proto/RogueModifier.cs @@ -24,16 +24,16 @@ namespace EggLink.DanhengServer.Proto { static RogueModifierReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChNSb2d1ZU1vZGlmaWVyLnByb3RvGhpSb2d1ZU1vZGlmaWVyQ29udGVudC5w", - "cm90bxoiQ2hlc3NSb2d1ZU1vZGlmaWVyU2VsZWN0SW5mby5wcm90bxodUm9n", - "dWVNb2RpZmllclNvdXJjZVR5cGUucHJvdG8iwAEKDVJvZ3VlTW9kaWZpZXIS", + "ChNSb2d1ZU1vZGlmaWVyLnByb3RvGh1Sb2d1ZU1vZGlmaWVyU291cmNlVHlw", + "ZS5wcm90bxoiQ2hlc3NSb2d1ZU1vZGlmaWVyU2VsZWN0SW5mby5wcm90bxoa", + "Um9ndWVNb2RpZmllckNvbnRlbnQucHJvdG8iwAEKDVJvZ3VlTW9kaWZpZXIS", "NgoUbW9kaWZpZXJfc291cmNlX3R5cGUYASABKA4yGC5Sb2d1ZU1vZGlmaWVy", "U291cmNlVHlwZRIaChJtb2RpZmllcl91bmlxdWVfaWQYByABKAQSJgoHY29u", "dGVudBgPIAEoCzIVLlJvZ3VlTW9kaWZpZXJDb250ZW50EjMKC3NlbGVjdF9p", "bmZvGPAJIAEoCzIdLkNoZXNzUm9ndWVNb2RpZmllclNlbGVjdEluZm9CHqoC", "G0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueModifierContentReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueModifierSelectInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueModifierSourceTypeReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueModifierSourceTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueModifierSelectInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueModifierContentReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RogueModifier), global::EggLink.DanhengServer.Proto.RogueModifier.Parser, new[]{ "ModifierSourceType", "ModifierUniqueId", "Content", "SelectInfo" }, null, null, null, null) })); diff --git a/Common/Proto/SceneBattleInfo.cs b/Common/Proto/SceneBattleInfo.cs index 165e8e78..fd1a0ef9 100644 --- a/Common/Proto/SceneBattleInfo.cs +++ b/Common/Proto/SceneBattleInfo.cs @@ -24,10 +24,10 @@ namespace EggLink.DanhengServer.Proto { static SceneBattleInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChVTY2VuZUJhdHRsZUluZm8ucHJvdG8aEkJhdHRsZUF2YXRhci5wcm90bxob", - "QmF0dGxlRXZlbnRCYXR0bGVJbmZvLnByb3RvGhBCYXR0bGVCdWZmLnByb3Rv", - "GhhCYXR0bGVNZWNoYW5pc21CYXIucHJvdG8aEUVQSU1DRkdDRUdHLnByb3Rv", - "GhZTY2VuZU1vbnN0ZXJXYXZlLnByb3RvGhZCYXR0bGVUYXJnZXRMaXN0LnBy", + "ChVTY2VuZUJhdHRsZUluZm8ucHJvdG8aEEJhdHRsZUJ1ZmYucHJvdG8aEUVQ", + "SU1DRkdDRUdHLnByb3RvGhJCYXR0bGVBdmF0YXIucHJvdG8aFkJhdHRsZVRh", + "cmdldExpc3QucHJvdG8aFlNjZW5lTW9uc3RlcldhdmUucHJvdG8aGEJhdHRs", + "ZU1lY2hhbmlzbUJhci5wcm90bxobQmF0dGxlRXZlbnRCYXR0bGVJbmZvLnBy", "b3RvIr4ECg9TY2VuZUJhdHRsZUluZm8SEwoLQ01GSE1BTlBBUEwYAiABKAgS", "EwoLd29ybGRfbGV2ZWwYCCABKA0SQwoSYmF0dGxlX3RhcmdldF9pbmZvGIgB", "IAMoCzImLlNjZW5lQmF0dGxlSW5mby5CYXR0bGVUYXJnZXRJbmZvRW50cnkS", @@ -43,7 +43,7 @@ namespace EggLink.DanhengServer.Proto { "KA0SIAoFdmFsdWUYAiABKAsyES5CYXR0bGVUYXJnZXRMaXN0OgI4AUIeqgIb", "RWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.BattleAvatarReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleEventBattleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleBuffReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleMechanismBarReflection.Descriptor, global::EggLink.DanhengServer.Proto.EPIMCFGCEGGReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneMonsterWaveReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleTargetListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.BattleBuffReflection.Descriptor, global::EggLink.DanhengServer.Proto.EPIMCFGCEGGReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleAvatarReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleTargetListReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneMonsterWaveReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleMechanismBarReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleEventBattleInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SceneBattleInfo), global::EggLink.DanhengServer.Proto.SceneBattleInfo.Parser, new[]{ "CMFHMANPAPL", "WorldLevel", "BattleTargetInfo", "LogicRandomSeed", "MechanismBarInfo", "BattleAvatarList", "RoundsLimit", "BattleId", "MonsterWaveList", "BuffList", "GJFEHHJHOBF", "StageId", "EventBattleInfoList", "BMODIKHNDDC" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, }) })); diff --git a/Common/Proto/SceneCastSkillScRsp.cs b/Common/Proto/SceneCastSkillScRsp.cs index c72658f8..16b2b535 100644 --- a/Common/Proto/SceneCastSkillScRsp.cs +++ b/Common/Proto/SceneCastSkillScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static SceneCastSkillScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChlTY2VuZUNhc3RTa2lsbFNjUnNwLnByb3RvGhFDTUlHR1BNRkRESS5wcm90", - "bxoVU2NlbmVCYXR0bGVJbmZvLnByb3RvIogBChNTY2VuZUNhc3RTa2lsbFNj", + "ChlTY2VuZUNhc3RTa2lsbFNjUnNwLnByb3RvGhVTY2VuZUJhdHRsZUluZm8u", + "cHJvdG8aEUNNSUdHUE1GRERJLnByb3RvIogBChNTY2VuZUNhc3RTa2lsbFNj", "UnNwEg8KB3JldGNvZGUYDCABKA0SJQoLYmF0dGxlX2luZm8YBSABKAsyEC5T", "Y2VuZUJhdHRsZUluZm8SFgoOY2FzdF9lbnRpdHlfaWQYBiABKA0SIQoLSE9F", "RU1LUENJQUMYASADKAsyDC5DTUlHR1BNRkRESUIeqgIbRWdnTGluay5EYW5o", "ZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.CMIGGPMFDDIReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneBattleInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneBattleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.CMIGGPMFDDIReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SceneCastSkillScRsp), global::EggLink.DanhengServer.Proto.SceneCastSkillScRsp.Parser, new[]{ "Retcode", "BattleInfo", "CastEntityId", "HOEEMKPCIAC" }, null, null, null, null) })); diff --git a/Common/Proto/SceneEntityInfo.cs b/Common/Proto/SceneEntityInfo.cs index 1091eb01..e956c605 100644 --- a/Common/Proto/SceneEntityInfo.cs +++ b/Common/Proto/SceneEntityInfo.cs @@ -24,10 +24,10 @@ namespace EggLink.DanhengServer.Proto { static SceneEntityInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChVTY2VuZUVudGl0eUluZm8ucHJvdG8aGVNjZW5lTnBjTW9uc3RlckluZm8u", - "cHJvdG8aEE1vdGlvbkluZm8ucHJvdG8aElNjZW5lTnBjSW5mby5wcm90bxoZ", - "U2NlbmVTdW1tb25Vbml0SW5mby5wcm90bxoTU2NlbmVQcm9wSW5mby5wcm90", - "bxoUU2NlbmVBY3RvckluZm8ucHJvdG8ilAIKD1NjZW5lRW50aXR5SW5mbxIP", + "ChVTY2VuZUVudGl0eUluZm8ucHJvdG8aE1NjZW5lUHJvcEluZm8ucHJvdG8a", + "EE1vdGlvbkluZm8ucHJvdG8aFFNjZW5lQWN0b3JJbmZvLnByb3RvGhJTY2Vu", + "ZU5wY0luZm8ucHJvdG8aGVNjZW5lTnBjTW9uc3RlckluZm8ucHJvdG8aGVNj", + "ZW5lU3VtbW9uVW5pdEluZm8ucHJvdG8ilAIKD1NjZW5lRW50aXR5SW5mbxIP", "CgdpbnN0X2lkGAQgASgNEhAKCGdyb3VwX2lkGAsgASgNEhsKBm1vdGlvbhgI", "IAEoCzILLk1vdGlvbkluZm8SEQoJZW50aXR5X2lkGAYgASgNEh4KBWFjdG9y", "GA0gASgLMg8uU2NlbmVBY3RvckluZm8SKQoLbnBjX21vbnN0ZXIYCSABKAsy", @@ -36,7 +36,7 @@ namespace EggLink.DanhengServer.Proto { "dW5pdBgMIAEoCzIULlNjZW5lU3VtbW9uVW5pdEluZm9CHqoCG0VnZ0xpbmsu", "RGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneNpcMonsterInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.MotionInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneNpcInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneSummonUnitInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ScenePropInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneActorInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ScenePropInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.MotionInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneActorInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneNpcInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneNpcMonsterInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneSummonUnitInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SceneEntityInfo), global::EggLink.DanhengServer.Proto.SceneEntityInfo.Parser, new[]{ "InstId", "GroupId", "Motion", "EntityId", "Actor", "NpcMonster", "Npc", "Prop", "SummonUnit" }, null, null, null, null) })); diff --git a/Common/Proto/SceneEntityMoveScRsp.cs b/Common/Proto/SceneEntityMoveScRsp.cs index 8a6c517c..d7e2a653 100644 --- a/Common/Proto/SceneEntityMoveScRsp.cs +++ b/Common/Proto/SceneEntityMoveScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static SceneEntityMoveScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChpTY2VuZUVudGl0eU1vdmVTY1JzcC5wcm90bxoYQ2xpZW50RG93bmxvYWRE", - "YXRhLnByb3RvGhJFbnRpdHlNb3Rpb24ucHJvdG8ifgoUU2NlbmVFbnRpdHlN", + "ChpTY2VuZUVudGl0eU1vdmVTY1JzcC5wcm90bxoSRW50aXR5TW90aW9uLnBy", + "b3RvGhhDbGllbnREb3dubG9hZERhdGEucHJvdG8ifgoUU2NlbmVFbnRpdHlN", "b3ZlU2NSc3ASDwoHcmV0Y29kZRgIIAEoDRIqCg1kb3dubG9hZF9kYXRhGAYg", "ASgLMhMuQ2xpZW50RG93bmxvYWREYXRhEikKEmVudGl0eV9tb3Rpb25fbGlz", "dBgHIAMoCzINLkVudGl0eU1vdGlvbkIeqgIbRWdnTGluay5EYW5oZW5nU2Vy", "dmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ClientDownloadDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.EntityMotionReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.EntityMotionReflection.Descriptor, global::EggLink.DanhengServer.Proto.ClientDownloadDataReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SceneEntityMoveScRsp), global::EggLink.DanhengServer.Proto.SceneEntityMoveScRsp.Parser, new[]{ "Retcode", "DownloadData", "EntityMotionList" }, null, null, null, null) })); diff --git a/Common/Proto/SceneInfo.cs b/Common/Proto/SceneInfo.cs index c6983a34..ffaf174e 100644 --- a/Common/Proto/SceneInfo.cs +++ b/Common/Proto/SceneInfo.cs @@ -24,11 +24,11 @@ namespace EggLink.DanhengServer.Proto { static SceneInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cg9TY2VuZUluZm8ucHJvdG8aFVNjZW5lRW50aXR5SW5mby5wcm90bxoaU2Nl", - "bmVFbnRpdHlHcm91cEluZm8ucHJvdG8aHk1pc3Npb25TdGF0dXNCeVNjZW5l", - "SW5mby5wcm90bxoVQ2xpZW50R3JvdXBJbmZvLnByb3RvGhZNZWNoYW5pc21C", - "YXJJbmZvLnByb3RvGhRDdXN0b21TYXZlRGF0YS5wcm90bxoURW50aXR5QnVm", - "ZkluZm8ucHJvdG8aEUNPQ0tLQ0tLTUZPLnByb3RvGg5CdWZmSW5mby5wcm90", + "Cg9TY2VuZUluZm8ucHJvdG8aGlNjZW5lRW50aXR5R3JvdXBJbmZvLnByb3Rv", + "Gh5NaXNzaW9uU3RhdHVzQnlTY2VuZUluZm8ucHJvdG8aEUNPQ0tLQ0tLTUZP", + "LnByb3RvGhVDbGllbnRHcm91cEluZm8ucHJvdG8aFk1lY2hhbmlzbUJhcklu", + "Zm8ucHJvdG8aFEN1c3RvbVNhdmVEYXRhLnByb3RvGhVTY2VuZUVudGl0eUlu", + "Zm8ucHJvdG8aFEVudGl0eUJ1ZmZJbmZvLnByb3RvGg5CdWZmSW5mby5wcm90", "byK1BgoJU2NlbmVJbmZvEjAKC0ZCSkJQR0NHSE9KGFEgAygLMhsuU2NlbmVJ", "bmZvLkZCSkJQR0NHSE9KRW50cnkSKQoQZW50aXR5X2J1ZmZfbGlzdBgKIAMo", "CzIPLkVudGl0eUJ1ZmZJbmZvEhQKC0pQTk9MTENKREZFGOQKIAEoDRIQCghm", @@ -50,7 +50,7 @@ namespace EggLink.DanhengServer.Proto { "Q09DS0tDS0tNRk86AjgBQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJv", "dG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneEntityInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneEntityGroupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.MissionStatusBySceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ClientGroupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.MechanismBarInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.CustomSaveDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.EntityBuffInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.COCKKCKKMFOReflection.Descriptor, global::EggLink.DanhengServer.Proto.BuffInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneEntityGroupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.MissionStatusBySceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.COCKKCKKMFOReflection.Descriptor, global::EggLink.DanhengServer.Proto.ClientGroupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.MechanismBarInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.CustomSaveDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneEntityInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.EntityBuffInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.BuffInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SceneInfo), global::EggLink.DanhengServer.Proto.SceneInfo.Parser, new[]{ "FBJBPGCGHOJ", "EntityBuffList", "JPNOLLCJDFE", "FloorId", "GameModeType", "MechanismBarInfo", "ClientGroupList", "BMKMNPDBIDE", "EntryId", "MissionStatusBySceneInfo", "LightenSectionList", "CustomSaveData", "EAGABAHJJFG", "EntityList", "ClientPosVersion", "EntityGroupList", "WorldId", "PlaneId", "LeaderEntityId", "SyncBuffInfo" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, null, }) })); diff --git a/Common/Proto/SceneMonsterWave.cs b/Common/Proto/SceneMonsterWave.cs index ffc19de2..05f4a78a 100644 --- a/Common/Proto/SceneMonsterWave.cs +++ b/Common/Proto/SceneMonsterWave.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static SceneMonsterWaveReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChZTY2VuZU1vbnN0ZXJXYXZlLnByb3RvGhJTY2VuZU1vbnN0ZXIucHJvdG8a", - "G1NjZW5lTW9uc3RlcldhdmVQYXJhbS5wcm90bxoOSXRlbUxpc3QucHJvdG8i", + "ChZTY2VuZU1vbnN0ZXJXYXZlLnByb3RvGg5JdGVtTGlzdC5wcm90bxoSU2Nl", + "bmVNb25zdGVyLnByb3RvGhtTY2VuZU1vbnN0ZXJXYXZlUGFyYW0ucHJvdG8i", "pwEKEFNjZW5lTW9uc3RlcldhdmUSIwoMbW9uc3Rlcl9saXN0GAYgAygLMg0u", "U2NlbmVNb25zdGVyEg8KB3dhdmVfaWQYBCABKA0SEAoIc3RhZ2VfaWQYDyAB", "KA0SHAoJZHJvcF9saXN0GAwgAygLMgkuSXRlbUxpc3QSLQoNbW9uc3Rlcl9w", "YXJhbRgLIAEoCzIWLlNjZW5lTW9uc3RlcldhdmVQYXJhbUIeqgIbRWdnTGlu", "ay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneMonsterReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneMonsterWaveParamReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneMonsterReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneMonsterWaveParamReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SceneMonsterWave), global::EggLink.DanhengServer.Proto.SceneMonsterWave.Parser, new[]{ "MonsterList", "WaveId", "StageId", "DropList", "MonsterParam" }, null, null, null, null) })); diff --git a/Common/Proto/SelectRogueDialogueEventScRsp.cs b/Common/Proto/SelectRogueDialogueEventScRsp.cs index 5ac87a4e..515b810f 100644 --- a/Common/Proto/SelectRogueDialogueEventScRsp.cs +++ b/Common/Proto/SelectRogueDialogueEventScRsp.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static SelectRogueDialogueEventScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiNTZWxlY3RSb2d1ZURpYWxvZ3VlRXZlbnRTY1JzcC5wcm90bxoYRGlhbG9n", - "dWVSZXN1bHRJbmZvLnByb3RvGhNEaWFsb2d1ZUV2ZW50LnByb3RvIpkBCh1T", + "CiNTZWxlY3RSb2d1ZURpYWxvZ3VlRXZlbnRTY1JzcC5wcm90bxoTRGlhbG9n", + "dWVFdmVudC5wcm90bxoYRGlhbG9ndWVSZXN1bHRJbmZvLnByb3RvIpkBCh1T", "ZWxlY3RSb2d1ZURpYWxvZ3VlRXZlbnRTY1JzcBIPCgdyZXRjb2RlGAQgASgN", "EigKC3Jlc3VsdF9pbmZvGAEgASgLMhMuRGlhbG9ndWVSZXN1bHRJbmZvEhkK", "EWRpYWxvZ3VlX2V2ZW50X2lkGAUgASgNEiIKCmV2ZW50X2luZm8YCCABKAsy", "Di5EaWFsb2d1ZUV2ZW50Qh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJv", "dG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.DialogueResultInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.DialogueEventReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.DialogueEventReflection.Descriptor, global::EggLink.DanhengServer.Proto.DialogueResultInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SelectRogueDialogueEventScRsp), global::EggLink.DanhengServer.Proto.SelectRogueDialogueEventScRsp.Parser, new[]{ "Retcode", "ResultInfo", "DialogueEventId", "EventInfo" }, null, null, null, null) })); diff --git a/Common/Proto/SendMsgCsReq.cs b/Common/Proto/SendMsgCsReq.cs index 054f9a74..6ac4f318 100644 --- a/Common/Proto/SendMsgCsReq.cs +++ b/Common/Proto/SendMsgCsReq.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static SendMsgCsReqReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChJTZW5kTXNnQ3NSZXEucHJvdG8aDkNoYXRUeXBlLnByb3RvGg1Nc2dUeXBl", + "ChJTZW5kTXNnQ3NSZXEucHJvdG8aDU1zZ1R5cGUucHJvdG8aDkNoYXRUeXBl", "LnByb3RvIokBCgxTZW5kTXNnQ3NSZXESEAoIZXh0cmFfaWQYDSABKA0SEwoL", "RUdDQ0pITUdCRE4YBCADKA0SHgoMbWVzc2FnZV90eXBlGAUgASgOMgguTXNn", "VHlwZRIUCgxtZXNzYWdlX3RleHQYDCABKAkSHAoJY2hhdF90eXBlGAYgASgO", "MgkuQ2hhdFR5cGVCHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IG", "cHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChatTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.MsgTypeReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MsgTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChatTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SendMsgCsReq), global::EggLink.DanhengServer.Proto.SendMsgCsReq.Parser, new[]{ "ExtraId", "EGCCJHMGBDN", "MessageType", "MessageText", "ChatType" }, null, null, null, null) })); diff --git a/Common/Proto/StartChallengeScRsp.cs b/Common/Proto/StartChallengeScRsp.cs index c375b1a8..0b991f00 100644 --- a/Common/Proto/StartChallengeScRsp.cs +++ b/Common/Proto/StartChallengeScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static StartChallengeScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChlTdGFydENoYWxsZW5nZVNjUnNwLnByb3RvGg9TY2VuZUluZm8ucHJvdG8a", - "EExpbmV1cEluZm8ucHJvdG8aEkN1ckNoYWxsZW5nZS5wcm90byKEAQoTU3Rh", + "ChlTdGFydENoYWxsZW5nZVNjUnNwLnByb3RvGhBMaW5ldXBJbmZvLnByb3Rv", + "GhJDdXJDaGFsbGVuZ2UucHJvdG8aD1NjZW5lSW5mby5wcm90byKEAQoTU3Rh", "cnRDaGFsbGVuZ2VTY1JzcBIPCgdyZXRjb2RlGAcgASgNEhkKBXNjZW5lGA8g", "ASgLMgouU2NlbmVJbmZvEhsKBmxpbmV1cBgNIAEoCzILLkxpbmV1cEluZm8S", "JAoNY3VyX2NoYWxsZW5nZRgGIAEoCzINLkN1ckNoYWxsZW5nZUIeqgIbRWdn", "TGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.CurChallengeReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.CurChallengeReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.StartChallengeScRsp), global::EggLink.DanhengServer.Proto.StartChallengeScRsp.Parser, new[]{ "Retcode", "Scene", "Lineup", "CurChallenge" }, null, null, null, null) })); diff --git a/Common/Proto/StartRogueScRsp.cs b/Common/Proto/StartRogueScRsp.cs index bbf7954d..35e560f5 100644 --- a/Common/Proto/StartRogueScRsp.cs +++ b/Common/Proto/StartRogueScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static StartRogueScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChVTdGFydFJvZ3VlU2NSc3AucHJvdG8aD1JvZ3VlSW5mby5wcm90bxoPU2Nl", - "bmVJbmZvLnByb3RvGhBMaW5ldXBJbmZvLnByb3RvInoKD1N0YXJ0Um9ndWVT", + "ChVTdGFydFJvZ3VlU2NSc3AucHJvdG8aEExpbmV1cEluZm8ucHJvdG8aD1Nj", + "ZW5lSW5mby5wcm90bxoPUm9ndWVJbmZvLnByb3RvInoKD1N0YXJ0Um9ndWVT", "Y1JzcBIbCgZsaW5ldXAYByABKAsyCy5MaW5ldXBJbmZvEh4KCnJvZ3VlX2lu", "Zm8YBSABKAsyCi5Sb2d1ZUluZm8SDwoHcmV0Y29kZRgLIAEoDRIZCgVzY2Vu", "ZRgJIAEoCzIKLlNjZW5lSW5mb0IeqgIbRWdnTGluay5EYW5oZW5nU2VydmVy", "LlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.StartRogueScRsp), global::EggLink.DanhengServer.Proto.StartRogueScRsp.Parser, new[]{ "Lineup", "RogueInfo", "Retcode", "Scene" }, null, null, null, null) })); diff --git a/Common/Proto/SyncLineupNotify.cs b/Common/Proto/SyncLineupNotify.cs index 8f73012e..1dd41e88 100644 --- a/Common/Proto/SyncLineupNotify.cs +++ b/Common/Proto/SyncLineupNotify.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static SyncLineupNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChZTeW5jTGluZXVwTm90aWZ5LnByb3RvGhZTeW5jTGluZXVwUmVhc29uLnBy", - "b3RvGhBMaW5ldXBJbmZvLnByb3RvIlcKEFN5bmNMaW5ldXBOb3RpZnkSGwoG", + "ChZTeW5jTGluZXVwTm90aWZ5LnByb3RvGhBMaW5ldXBJbmZvLnByb3RvGhZT", + "eW5jTGluZXVwUmVhc29uLnByb3RvIlcKEFN5bmNMaW5ldXBOb3RpZnkSGwoG", "bGluZXVwGAEgASgLMgsuTGluZXVwSW5mbxImCgtyZWFzb25fbGlzdBgLIAMo", "DjIRLlN5bmNMaW5ldXBSZWFzb25CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZl", "ci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SyncLineupReasonReflection.Descriptor, global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.LineupInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SyncLineupReasonReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SyncLineupNotify), global::EggLink.DanhengServer.Proto.SyncLineupNotify.Parser, new[]{ "Lineup", "ReasonList" }, null, null, null, null) })); diff --git a/Common/Proto/SyncRogueCommonActionResultScNotify.cs b/Common/Proto/SyncRogueCommonActionResultScNotify.cs index 40021720..9199b1fa 100644 --- a/Common/Proto/SyncRogueCommonActionResultScNotify.cs +++ b/Common/Proto/SyncRogueCommonActionResultScNotify.cs @@ -24,16 +24,16 @@ namespace EggLink.DanhengServer.Proto { static SyncRogueCommonActionResultScNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CilTeW5jUm9ndWVDb21tb25BY3Rpb25SZXN1bHRTY05vdGlmeS5wcm90bxod", - "Um9ndWVDb21tb25BY3Rpb25SZXN1bHQucHJvdG8aKFJvZ3VlQ29tbW9uQWN0", - "aW9uUmVzdWx0RGlzcGxheVR5cGUucHJvdG8iqwEKI1N5bmNSb2d1ZUNvbW1v", + "CilTeW5jUm9ndWVDb21tb25BY3Rpb25SZXN1bHRTY05vdGlmeS5wcm90bxoo", + "Um9ndWVDb21tb25BY3Rpb25SZXN1bHREaXNwbGF5VHlwZS5wcm90bxodUm9n", + "dWVDb21tb25BY3Rpb25SZXN1bHQucHJvdG8iqwEKI1N5bmNSb2d1ZUNvbW1v", "bkFjdGlvblJlc3VsdFNjTm90aWZ5EhgKEHJvZ3VlX3ZlcnNpb25faWQYCSAB", "KA0SLwoNcmVzdWx0X2FjdGlvbhgDIAMoCzIYLlJvZ3VlQ29tbW9uQWN0aW9u", "UmVzdWx0EjkKDGRpc3BsYXlfdHlwZRgIIAEoDjIjLlJvZ3VlQ29tbW9uQWN0", "aW9uUmVzdWx0RGlzcGxheVR5cGVCHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZl", "ci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueCommonActionResultReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueCommonActionResultDisplayTypeReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueCommonActionResultDisplayTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueCommonActionResultReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SyncRogueCommonActionResultScNotify), global::EggLink.DanhengServer.Proto.SyncRogueCommonActionResultScNotify.Parser, new[]{ "RogueVersionId", "ResultAction", "DisplayType" }, null, null, null, null) })); diff --git a/Common/Proto/TakeRogueScoreRewardScRsp.cs b/Common/Proto/TakeRogueScoreRewardScRsp.cs index b0cadb10..7455f482 100644 --- a/Common/Proto/TakeRogueScoreRewardScRsp.cs +++ b/Common/Proto/TakeRogueScoreRewardScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static TakeRogueScoreRewardScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch9UYWtlUm9ndWVTY29yZVJld2FyZFNjUnNwLnByb3RvGhpSb2d1ZVNjb3Jl", - "UmV3YXJkSW5mby5wcm90bxoOSXRlbUxpc3QucHJvdG8ikAEKGVRha2VSb2d1", + "Ch9UYWtlUm9ndWVTY29yZVJld2FyZFNjUnNwLnByb3RvGg5JdGVtTGlzdC5w", + "cm90bxoaUm9ndWVTY29yZVJld2FyZEluZm8ucHJvdG8ikAEKGVRha2VSb2d1", "ZVNjb3JlUmV3YXJkU2NSc3ASGQoGcmV3YXJkGA4gASgLMgkuSXRlbUxpc3QS", "NgoXcm9ndWVfc2NvcmVfcmV3YXJkX2luZm8YAyABKAsyFS5Sb2d1ZVNjb3Jl", "UmV3YXJkSW5mbxIPCgdyZXRjb2RlGA0gASgNEg8KB3Bvb2xfaWQYBSABKA1C", "HqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueScoreRewardInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueScoreRewardInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.TakeRogueScoreRewardScRsp), global::EggLink.DanhengServer.Proto.TakeRogueScoreRewardScRsp.Parser, new[]{ "Reward", "RogueScoreRewardInfo", "Retcode", "PoolId" }, null, null, null, null) })); diff --git a/Common/Proto/TrainVisitorRewardSendNotify.cs b/Common/Proto/TrainVisitorRewardSendNotify.cs index ab736c73..6f471742 100644 --- a/Common/Proto/TrainVisitorRewardSendNotify.cs +++ b/Common/Proto/TrainVisitorRewardSendNotify.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static TrainVisitorRewardSendNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiJUcmFpblZpc2l0b3JSZXdhcmRTZW5kTm90aWZ5LnByb3RvGh5UcmFpblZp", - "c2l0b3JSZXdhcmRTdGF0dXMucHJvdG8aDkl0ZW1MaXN0LnByb3RvIncKHFRy", + "CiJUcmFpblZpc2l0b3JSZXdhcmRTZW5kTm90aWZ5LnByb3RvGg5JdGVtTGlz", + "dC5wcm90bxoeVHJhaW5WaXNpdG9yUmV3YXJkU3RhdHVzLnByb3RvIncKHFRy", "YWluVmlzaXRvclJld2FyZFNlbmROb3RpZnkSGQoGcmV3YXJkGAMgASgLMgku", "SXRlbUxpc3QSJwoEdHlwZRgOIAEoDjIZLlRyYWluVmlzaXRvclJld2FyZFN0", "YXR1cxITCgtQTE9IQUJOTUNMSRgMIAEoDUIeqgIbRWdnTGluay5EYW5oZW5n", "U2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.TrainVisitorRewardStatusReflection.Descriptor, global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ItemListReflection.Descriptor, global::EggLink.DanhengServer.Proto.TrainVisitorRewardStatusReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.TrainVisitorRewardSendNotify), global::EggLink.DanhengServer.Proto.TrainVisitorRewardSendNotify.Parser, new[]{ "Reward", "Type", "PLOHABNMCLI" }, null, null, null, null) })); diff --git a/Common/Proto/TreasureDungeonLevel.cs b/Common/Proto/TreasureDungeonLevel.cs index 5576d679..e71ed1ee 100644 --- a/Common/Proto/TreasureDungeonLevel.cs +++ b/Common/Proto/TreasureDungeonLevel.cs @@ -24,10 +24,10 @@ namespace EggLink.DanhengServer.Proto { static TreasureDungeonLevelReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChpUcmVhc3VyZUR1bmdlb25MZXZlbC5wcm90bxoRTUxPRUxETEpGTE8ucHJv", - "dG8aEUZJTEtOREpGTE5ELnByb3RvGhFLQ09BQ0JCTERORi5wcm90bxofVHJl", - "YXN1cmVEdW5nZW9uUmVjb3JkRGF0YS5wcm90bxoRQUNDRUdQRk5KTkwucHJv", - "dG8aEUVGSEhJQURCSUVELnByb3RvIv8DChRUcmVhc3VyZUR1bmdlb25MZXZl", + "ChpUcmVhc3VyZUR1bmdlb25MZXZlbC5wcm90bxoRQUNDRUdQRk5KTkwucHJv", + "dG8aEU1MT0VMRExKRkxPLnByb3RvGhFLQ09BQ0JCTERORi5wcm90bxoRRklM", + "S05ESkZMTkQucHJvdG8aEUVGSEhJQURCSUVELnByb3RvGh9UcmVhc3VyZUR1", + "bmdlb25SZWNvcmREYXRhLnByb3RvIv8DChRUcmVhc3VyZUR1bmdlb25MZXZl", "bBIhCgtKQklKSUVHRkNKQhgIIAMoCzIMLk1MT0VMRExKRkxPEiIKC0hLTU5C", "RE1QTkFMGMsGIAMoCzIMLkVGSEhJQURCSUVEEhMKC0VKTkNESktKTEpNGAwg", "ASgNEhMKC0NLRkZMTkhPSEZFGAcgASgNEiAKCWl0ZW1fbGlzdBi9DyADKAsy", @@ -41,7 +41,7 @@ namespace EggLink.DanhengServer.Proto { "R0RCSU5GT0pNTUcY/QIgASgNEhQKC0ZPRkhFTk1KSVBCGKICIAEoCEIeqgIb", "RWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MLOELDLJFLOReflection.Descriptor, global::EggLink.DanhengServer.Proto.FILKNDJFLNDReflection.Descriptor, global::EggLink.DanhengServer.Proto.KCOACBBLDNFReflection.Descriptor, global::EggLink.DanhengServer.Proto.TreasureDungeonRecordDataReflection.Descriptor, global::EggLink.DanhengServer.Proto.ACCEGPFNJNLReflection.Descriptor, global::EggLink.DanhengServer.Proto.EFHHIADBIEDReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ACCEGPFNJNLReflection.Descriptor, global::EggLink.DanhengServer.Proto.MLOELDLJFLOReflection.Descriptor, global::EggLink.DanhengServer.Proto.KCOACBBLDNFReflection.Descriptor, global::EggLink.DanhengServer.Proto.FILKNDJFLNDReflection.Descriptor, global::EggLink.DanhengServer.Proto.EFHHIADBIEDReflection.Descriptor, global::EggLink.DanhengServer.Proto.TreasureDungeonRecordDataReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.TreasureDungeonLevel), global::EggLink.DanhengServer.Proto.TreasureDungeonLevel.Parser, new[]{ "JBIJIEGFCJB", "HKMNBDMPNAL", "EJNCDJKJLJM", "CKFFLNHOHFE", "ItemList", "DPGEFJIOBFI", "BCBJHGEENEN", "MCFIKPFHHIE", "KKOADIIBPPE", "BuffList", "JFPKNBHIOIP", "MapId", "EINPBNKBNKA", "AvatarList", "FDAOGIOMCPA", "KOANPEAEIED", "GDBINFOJMMG", "FOFHENMJIPB" }, null, null, null, null) })); diff --git a/GameServer/Command/Cmd/CommandHelp.cs b/GameServer/Command/Cmd/CommandHelp.cs new file mode 100644 index 00000000..5f4661f3 --- /dev/null +++ b/GameServer/Command/Cmd/CommandHelp.cs @@ -0,0 +1,24 @@ +using EggLink.DanhengServer.Program; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EggLink.DanhengServer.Command.Cmd +{ + [CommandInfo("help", "Show the help message", "/help")] + public class CommandHelp : ICommand + { + [CommandDefault] + public void Help(CommandArg arg) + { + var commands = EntryPoint.CommandManager.CommandInfo.Values; + arg.SendMsg("Commands:"); + foreach (var command in commands) + { + arg.SendMsg($"/{command.Name} - {command.Description}\nUsage: {command.Usage}"); + } + } + } +} diff --git a/GameServer/Command/Cmd/CommandKick.cs b/GameServer/Command/Cmd/CommandKick.cs new file mode 100644 index 00000000..617758ef --- /dev/null +++ b/GameServer/Command/Cmd/CommandKick.cs @@ -0,0 +1,25 @@ +using EggLink.DanhengServer.Server.Packet.Send.Player; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EggLink.DanhengServer.Command.Cmd +{ + [CommandInfo("kick", "Kick the player from server", "/kick")] + public class CommandKick : ICommand + { + [CommandDefault] + public void Kick(CommandArg arg) + { + if (arg.Target == null) + { + arg.SendMsg("Player not found"); + return; + } + arg.Target.SendPacket(new PacketPlayerKickOutScNotify()); + arg.SendMsg($"Player {arg.Target.Player!.Data.Name} has been kicked"); + } + } +} diff --git a/GameServer/Command/Cmd/CommandMission.cs b/GameServer/Command/Cmd/CommandMission.cs new file mode 100644 index 00000000..89365333 --- /dev/null +++ b/GameServer/Command/Cmd/CommandMission.cs @@ -0,0 +1,19 @@ +namespace EggLink.DanhengServer.Command.Cmd +{ + [CommandInfo("mission", "Manage the missions", "/mission ")] + public class CommandMission : ICommand + { + [CommandMethod("0 pass")] + public void PassRunningMission(CommandArg arg) + { + if (arg.Target == null) + { + arg.SendMsg("Player not found."); + return; + } + var mission = arg.Target!.Player!.MissionManager!; + mission.GetRunningSubMissionIdList().ForEach(mission.FinishSubMission); + arg.SendMsg("Pass all running missions."); + } + } +} diff --git a/GameServer/Command/Cmd/CommandScene.cs b/GameServer/Command/Cmd/CommandScene.cs index bca9b03d..37821d22 100644 --- a/GameServer/Command/Cmd/CommandScene.cs +++ b/GameServer/Command/Cmd/CommandScene.cs @@ -1,4 +1,5 @@ -using System; +using EggLink.DanhengServer.Game.Scene.Entity; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -24,11 +25,26 @@ namespace EggLink.DanhengServer.Command.Cmd arg.SendMsg($"Loaded groups: {string.Join(", ", loadedGroup)}"); } - [CommandMethod("0 pass")] // temp should be moved to mission - public void PassRunningMission(CommandArg arg) + [CommandMethod("0 prop")] + public void GetProp(CommandArg arg) { - var mission = arg.Target!.Player!.MissionManager!; - mission.GetRunningSubMissionIdList().ForEach(mission.AcceptSubMission); + var scene = arg.Target!.Player!.SceneInstance!; + EntityProp? prop = null; + foreach (var entity in scene.GetEntitiesInGroup(arg.GetInt(1))) + { + if (entity.PropInfo.ID == arg.GetInt(1)) + { + prop = entity; + break; + } + } + if (prop == null) + { + arg.SendMsg("Prop not found"); + return; + } + prop.SetState((Enums.PropStateEnum)arg.GetInt(2)); + arg.SendMsg($"Prop: {prop.EntityID} has been set to {(Enums.PropStateEnum)arg.GetInt(2)}"); } } } diff --git a/GameServer/Command/Cmd/CommandUnlockAll.cs b/GameServer/Command/Cmd/CommandUnlockAll.cs new file mode 100644 index 00000000..4f5850f3 --- /dev/null +++ b/GameServer/Command/Cmd/CommandUnlockAll.cs @@ -0,0 +1,58 @@ +using EggLink.DanhengServer.Data; +using EggLink.DanhengServer.Game.Scene.Entity; +using EggLink.DanhengServer.Server.Packet.Send.Player; + +namespace EggLink.DanhengServer.Command.Cmd +{ + [CommandInfo("unlockall", "unlock all the things in that category", "/unlockall ")] + public class CommandUnlockAll : ICommand + { + [CommandMethod("0 mission")] + public void UnlockAllMissions(CommandArg arg) + { + if (arg.Target == null) + { + arg.SendMsg("Player not found!"); + return; + } + var player = arg.Target!.Player!; + var missionManager = player.MissionManager!; + + foreach (var mission in GameData.SubMissionData.Values) + { + missionManager.AcceptMainMission(mission.MainMissionID); + missionManager.FinishSubMission(mission.SubMissionID); + } + + foreach (var mission in GameData.MainMissionData.Values) + { + missionManager.AcceptMainMission(mission.MainMissionID); + missionManager.FinishMainMission(mission.MainMissionID); + } + + arg.SendMsg("All missions unlocked!"); + arg.Target!.Player!.SendPacket(new PacketPlayerKickOutScNotify()); + arg.Target!.Stop(); + } + + [CommandMethod("0 scene")] + public void UnlockAllScenes(CommandArg arg) + { + if (arg.Target == null) + { + arg.SendMsg("Player not found!"); + return; + } + var player = arg.Target!.Player!; + var scene = player.SceneInstance!; + foreach (var prop in scene.Entities) + { + if (prop.Value is EntityProp propInstance) + { + player.InteractProp(propInstance.EntityID, 1010); + } + } + arg.SendMsg("The props in current scene are unlocked!"); + } + } +} diff --git a/GameServer/Command/CommandArg.cs b/GameServer/Command/CommandArg.cs index 5de7dbbe..340433c3 100644 --- a/GameServer/Command/CommandArg.cs +++ b/GameServer/Command/CommandArg.cs @@ -58,6 +58,15 @@ namespace EggLink.DanhengServer.Command } } } + public int GetInt(int index) + { + if (BasicArgs.Count <= index) + { + return 0; + } + _ = int.TryParse(BasicArgs[index], out int res); + return res; + } public void SendMsg(string msg) { diff --git a/GameServer/Command/CommandManager.cs b/GameServer/Command/CommandManager.cs index 74e1fcf5..c1af4148 100644 --- a/GameServer/Command/CommandManager.cs +++ b/GameServer/Command/CommandManager.cs @@ -63,6 +63,11 @@ namespace EggLink.DanhengServer.Command } continue; } + if (Target != null && !Target.IsOnline) + { + Logger.Warn($"Target {Target.Player!.Uid}({Target.Player!.Data.Name}) is offline."); + Target = null; + } if (Commands.TryGetValue(cmd, out var command)) { var split = input.Split(' ').ToList(); diff --git a/GameServer/Game/Avatar/AvatarManager.cs b/GameServer/Game/Avatar/AvatarManager.cs index 5be368e2..b3135cef 100644 --- a/GameServer/Game/Avatar/AvatarManager.cs +++ b/GameServer/Game/Avatar/AvatarManager.cs @@ -4,6 +4,7 @@ using EggLink.DanhengServer.Database; using EggLink.DanhengServer.Database.Avatar; using EggLink.DanhengServer.Game.Player; using EggLink.DanhengServer.Proto; +using EggLink.DanhengServer.Server.Packet.Send.Player; namespace EggLink.DanhengServer.Game.Avatar { @@ -44,7 +45,7 @@ namespace EggLink.DanhengServer.Game.Avatar var avatar = new AvatarInfo(avatarExcel) { - AvatarId = avatarId, + AvatarId = avatarId >= 8001 ? 8001 : avatarId, Level = 1, Timestamp = DateTime.Now.Ticks / TimeSpan.TicksPerSecond, CurrentHp = 10000, @@ -53,21 +54,23 @@ namespace EggLink.DanhengServer.Game.Avatar if (avatarId >= 8001) { - avatar.HeroId = 8001; + avatar.HeroId = avatarId; } if (AvatarData?.Avatars == null) { AvatarData!.Avatars = []; } - + avatar.PlayerData = Player.Data; AvatarData.Avatars.Add(avatar); DatabaseHelper.Instance?.UpdateInstance(AvatarData); + + Player.SendPacket(new PacketPlayerSyncScNotify(avatar)); } public AvatarInfo? GetAvatar(int baseAvatarId) { - if (baseAvatarId > 8000) baseAvatarId = 1005; + if (baseAvatarId > 8000) baseAvatarId = 8001; return AvatarData?.Avatars?.Find(avatar => avatar.AvatarId == baseAvatarId); } } diff --git a/GameServer/Game/Battle/BattleInstance.cs b/GameServer/Game/Battle/BattleInstance.cs index 9a02ecd3..8de3c13b 100644 --- a/GameServer/Game/Battle/BattleInstance.cs +++ b/GameServer/Game/Battle/BattleInstance.cs @@ -21,6 +21,7 @@ namespace EggLink.DanhengServer.Game.Battle public List Stages { get; set; } = stages; public Database.Lineup.LineupInfo Lineup { get; set; } = lineup; + public List EntityMonsters { get; set; } = new(); public BattleInstance(PlayerInstance player, Database.Lineup.LineupInfo lineup, List monsters) : this(player, lineup, new List()) { @@ -33,6 +34,7 @@ namespace EggLink.DanhengServer.Game.Battle Stages.Add(stage); } } + EntityMonsters = monsters; StageId = Stages[0].StageID; } diff --git a/GameServer/Game/Battle/BattleManager.cs b/GameServer/Game/Battle/BattleManager.cs index b5e77a64..72754d23 100644 --- a/GameServer/Game/Battle/BattleManager.cs +++ b/GameServer/Game/Battle/BattleManager.cs @@ -17,10 +17,8 @@ namespace EggLink.DanhengServer.Game.Battle if (Player.BattleInstance != null) return; var targetList = new List(); var propList = new List(); - var isPlayerCast = false; if (Player.SceneInstance!.AvatarInfo.ContainsKey((int)req.AttackedByEntityId)) { - isPlayerCast = true; foreach (var entity in req.HitTargetEntityIdList) { @@ -53,7 +51,7 @@ namespace EggLink.DanhengServer.Game.Battle break; } } - if (isAmbushed) + if (!isAmbushed) { Player.SendPacket(new PacketSceneCastSkillScRsp(req.CastEntityId)); return; @@ -76,13 +74,15 @@ namespace EggLink.DanhengServer.Game.Battle if (targetList.Count > 0) { // Skill handle - BattleInstance battleInstance = new(Player, Player.LineupManager!.GetCurLineup()!, targetList) { WorldLevel = Player.Data.WorldLevel, }; Player.BattleInstance = battleInstance; Player.SendPacket(new PacketSceneCastSkillScRsp(req.CastEntityId, battleInstance)); + } else + { + Player.SendPacket(new PacketSceneCastSkillScRsp(req.CastEntityId)); } } @@ -195,9 +195,6 @@ namespace EggLink.DanhengServer.Game.Battle minimumHp = 2000; teleportToAnchor = true; break; - case BattleEndStatus.BattleEndQuit: - updateStatus = false; - break; default: updateStatus = false; break; @@ -211,7 +208,7 @@ namespace EggLink.DanhengServer.Game.Battle { var avatarInstance = Player.AvatarManager!.GetAvatar((int)avatar.Id); var prop = avatar.AvatarStatus; - int curHp = (int)Math.Min(Math.Round(prop.LeftHp / prop.MaxHp * 10000), minimumHp); + int curHp = (int)Math.Max(Math.Round(prop.LeftHp / prop.MaxHp * 10000), minimumHp); int curSp = (int)prop.LeftSp * 100; if (avatarInstance == null) { @@ -227,7 +224,7 @@ namespace EggLink.DanhengServer.Game.Battle } DatabaseHelper.Instance?.UpdateInstance(Player.AvatarManager!.AvatarData!); - Player.SendPacket(new PacketSyncLineupNotify(battle.Lineup)); + Player.SendPacket(new PacketSyncLineupNotify(lineup)); } if (teleportToAnchor) { @@ -247,6 +244,12 @@ namespace EggLink.DanhengServer.Game.Battle // call battle end Player.MissionManager!.OnBattleFinish(req); + // remove monster from the scene + foreach (var monster in battle.EntityMonsters) + { + Player.SceneInstance!.RemoveEntity(monster); + } + Player.BattleInstance = null; Player.SendPacket(new PacketPVEBattleResultScRsp(req, Player, battle)); } diff --git a/GameServer/Game/Lineup/LineupManager.cs b/GameServer/Game/Lineup/LineupManager.cs index 7141d469..eef5e20c 100644 --- a/GameServer/Game/Lineup/LineupManager.cs +++ b/GameServer/Game/Lineup/LineupManager.cs @@ -2,6 +2,8 @@ using EggLink.DanhengServer.Database; using EggLink.DanhengServer.Database.Lineup; using EggLink.DanhengServer.Game.Player; +using EggLink.DanhengServer.Game.Scene; +using EggLink.DanhengServer.Server.Packet.Send.Lineup; namespace EggLink.DanhengServer.Game.Lineup { @@ -58,7 +60,7 @@ namespace EggLink.DanhengServer.Game.Lineup DatabaseHelper.Instance?.UpdateInstance(LineupData); } - public void AddAvatar(int lineupIndex, int avatarId) + public void AddAvatar(int lineupIndex, int avatarId, bool sendPacket = true) { if (lineupIndex < 0) { @@ -82,14 +84,22 @@ namespace EggLink.DanhengServer.Game.Lineup LineupInfo[lineupIndex] = lineup; } DatabaseHelper.Instance?.UpdateInstance(LineupData); + if (sendPacket) + { + Player.SendPacket(new PacketSyncLineupNotify(lineup)); + if (lineupIndex == LineupData.CurLineup) + { + Player.SceneInstance?.SyncLineup(); + } + } } - public void AddAvatarToCurTeam(int avatarId) + public void AddAvatarToCurTeam(int avatarId, bool sendPacket = true) { - AddAvatar(LineupData.CurLineup, avatarId); + AddAvatar(LineupData.CurLineup, avatarId, sendPacket); } - public void AddSpecialAvatarToCurTeam(int specialAvatarId) + public void AddSpecialAvatarToCurTeam(int specialAvatarId, bool sendPacket = true) { LineupInfo.TryGetValue(LineupData.CurLineup, out LineupInfo? lineup); GameData.SpecialAvatarData.TryGetValue(specialAvatarId, out var specialAvatar); @@ -114,6 +124,99 @@ namespace EggLink.DanhengServer.Game.Lineup LineupInfo[LineupData.CurLineup] = lineup; } DatabaseHelper.Instance?.UpdateInstance(LineupData); + if (sendPacket) + { + Player.SendPacket(new PacketSyncLineupNotify(lineup)); + Player.SceneInstance?.SyncLineup(); + } + } + + public void RemoveAvatar(int lineupIndex, int avatarId) + { + if (lineupIndex < 0) + { + return; + } + LineupInfo.TryGetValue(lineupIndex, out LineupInfo? lineup); + if (lineup == null) + { + return; + } + lineup.BaseAvatars?.RemoveAll(avatar => avatar.BaseAvatarId == avatarId); + LineupInfo[lineupIndex] = lineup; + DatabaseHelper.Instance?.UpdateInstance(LineupData); + Player.SendPacket(new PacketSyncLineupNotify(lineup)); + if (lineupIndex == LineupData.CurLineup) + { + Player.SceneInstance?.SyncLineup(); + } + } + + public void RemoveAvatarFromCurTeam(int avatarId) + { + RemoveAvatar(LineupData.CurLineup, avatarId); + } + + public void RemoveSpecialAvatarFromCurTeam(int specialAvatarId) + { + LineupInfo.TryGetValue(LineupData.CurLineup, out LineupInfo? lineup); + if (lineup == null) + { + return; + } + lineup.BaseAvatars?.RemoveAll(avatar => avatar.SpecialAvatarId == specialAvatarId); + LineupInfo[LineupData.CurLineup] = lineup; + DatabaseHelper.Instance?.UpdateInstance(LineupData); + Player.SendPacket(new PacketSyncLineupNotify(lineup)); + Player.SceneInstance?.SyncLineup(); + } + + public List GetAvatarsFromTeam(int index) + { + var lineup = GetLineup(index); + if (lineup == null) + { + return []; + } + + var avatarList = new List(); + foreach (var avatar in lineup.BaseAvatars!) + { + Proto.AvatarType avatarType = Proto.AvatarType.AvatarFormalType; + Database.Avatar.AvatarInfo? avatarInfo = null; + if (avatar.SpecialAvatarId > 0) + { + GameData.SpecialAvatarData.TryGetValue(avatar.SpecialAvatarId, out var specialAvatar); + if (specialAvatar == null) continue; + avatarType = Proto.AvatarType.AvatarTrialType; + avatarInfo = specialAvatar.ToAvatarData(Player.Uid); + } else if (avatar.AssistUid > 0) + { + var avatarStorage = DatabaseHelper.Instance?.GetInstance(avatar.AssistUid); + avatarType = Proto.AvatarType.AvatarAssistType; + if (avatarStorage == null) continue; + foreach (var avatarData in avatarStorage.Avatars!) + { + if (avatarData.AvatarId == avatar.BaseAvatarId) + { + avatarInfo = avatarData; + break; + } + } + } else + { + avatarInfo = Player.AvatarManager!.GetAvatar(avatar.BaseAvatarId); + } + if (avatarInfo == null) continue; + avatarList.Add(new AvatarSceneInfo(avatarInfo, avatarType)); + } + + return avatarList; + } + + public List GetAvatarsFromCurTeam() + { + return GetAvatarsFromTeam(LineupData.CurLineup); } } } diff --git a/GameServer/Game/Mission/FinishAction/Handler/MissionHandlerChangeLineup.cs b/GameServer/Game/Mission/FinishAction/Handler/MissionHandlerChangeLineup.cs index 401979be..b8aac493 100644 --- a/GameServer/Game/Mission/FinishAction/Handler/MissionHandlerChangeLineup.cs +++ b/GameServer/Game/Mission/FinishAction/Handler/MissionHandlerChangeLineup.cs @@ -12,9 +12,9 @@ namespace EggLink.DanhengServer.Game.Mission.FinishAction.Handler public override void OnHandle(List Params, PlayerInstance Player) { - var avatars = Player.LineupManager!.GetCurLineup()!.BaseAvatars!; - avatars.Clear(); + Player.LineupManager!.GetCurLineup()!.BaseAvatars!.Clear(); var count = 0; + var avatarCount = Params.Count(value => value != 0) - 1; foreach (var avatarId in Params) { if (count++ >= 4) break; @@ -23,18 +23,13 @@ namespace EggLink.DanhengServer.Game.Mission.FinishAction.Handler { GameData.AvatarConfigData.TryGetValue(avatarId, out var avatar); if (avatar == null) continue; - avatars.Add(new Database.Lineup.AvatarInfo() - { - BaseAvatarId = avatarId, - }); + var ava = Player.AvatarManager!.GetAvatar(avatarId); + if (ava == null) Player.AvatarManager!.AddAvatar(avatarId); + Player.LineupManager!.AddAvatarToCurTeam(avatarId, count == avatarCount); } else { - avatars.Add(new Database.Lineup.AvatarInfo() - { - BaseAvatarId = specialAvatar.AvatarID, - SpecialAvatarId = avatarId * 10 + Player.Data.WorldLevel, - }); + Player.LineupManager!.AddSpecialAvatarToCurTeam(avatarId * 10 + Player.Data.WorldLevel, count == avatarCount); } } GameData.SpecialAvatarData.TryGetValue(Params[4] * 10 + Player.Data.WorldLevel, out var leaderAvatar); diff --git a/GameServer/Game/Mission/FinishType/Handler/MissionHandlerDelTrialAvatar.cs b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerDelTrialAvatar.cs new file mode 100644 index 00000000..9057eb9d --- /dev/null +++ b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerDelTrialAvatar.cs @@ -0,0 +1,24 @@ +using EggLink.DanhengServer.Enums; +using EggLink.DanhengServer.Game.Player; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EggLink.DanhengServer.Game.Mission.FinishType.Handler +{ + [MissionFinishType(MissionFinishTypeEnum.DelTrialAvatar)] + public class MissionHandlerDelTrialAvatar : MissionFinishTypeHandler + { + public override void HandleFinishType(PlayerInstance player, int Param1, int Param2, int Param3, List ParamIntList, int subMissionId) + { + if (player.LineupManager!.GetCurLineup() == null) return; + var actualSpecialAvatarId = Param1 * 10 + player.Data.WorldLevel; + var item = player.LineupManager!.GetCurLineup()!.BaseAvatars!.Find(item => item.SpecialAvatarId == actualSpecialAvatarId); + if (item == null) return; // avatar not found + player.LineupManager!.RemoveSpecialAvatarFromCurTeam(actualSpecialAvatarId); + player.MissionManager!.FinishSubMission(subMissionId); + } + } +} diff --git a/GameServer/Game/Mission/FinishType/Handler/MissionHandlerEnterFloor.cs b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerEnterFloor.cs new file mode 100644 index 00000000..c3fc0b77 --- /dev/null +++ b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerEnterFloor.cs @@ -0,0 +1,20 @@ +using EggLink.DanhengServer.Enums; +using EggLink.DanhengServer.Game.Player; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EggLink.DanhengServer.Game.Mission.FinishType.Handler +{ + [MissionFinishType(MissionFinishTypeEnum.EnterFloor)] + public class MissionHandlerEnterFloor : MissionFinishTypeHandler + { + public override void HandleFinishType(PlayerInstance player, int Param1, int Param2, int Param3, List ParamIntList, int subMissionId) + { + player.EnterMissionScene(Param2, Param2, true); + player.MissionManager!.FinishSubMission(subMissionId); + } + } +} diff --git a/GameServer/Game/Mission/FinishType/Handler/MissionHandlerGetTrialAvatar.cs b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerGetTrialAvatar.cs index 3ec36867..726ff3c5 100644 --- a/GameServer/Game/Mission/FinishType/Handler/MissionHandlerGetTrialAvatar.cs +++ b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerGetTrialAvatar.cs @@ -6,14 +6,13 @@ namespace EggLink.DanhengServer.Game.Mission.FinishType.Handler [MissionFinishType(MissionFinishTypeEnum.GetTrialAvatar)] public class MissionHandlerGetTrialAvatar : MissionFinishTypeHandler { - public override void HandleFinishType(PlayerInstance player, int Param1, int Param2, int Param3, int subMissionId) + public override void HandleFinishType(PlayerInstance player, int Param1, int Param2, int Param3, List ParamIntList, int subMissionId) { if (player.LineupManager!.GetCurLineup() == null) return; var actualSpecialAvatarId = Param1 * 10 + player.Data.WorldLevel; var item = player.LineupManager!.GetCurLineup()!.BaseAvatars!.Find(item => item.SpecialAvatarId == actualSpecialAvatarId); if (item != null) return; // existing avatar player.LineupManager!.AddSpecialAvatarToCurTeam(actualSpecialAvatarId); - player.SceneInstance!.SyncLineup(false); // send packet player.MissionManager!.FinishSubMission(subMissionId); } diff --git a/GameServer/Game/Mission/FinishType/Handler/MissionHandlerPropState.cs b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerPropState.cs index fc68daa8..b3332d35 100644 --- a/GameServer/Game/Mission/FinishType/Handler/MissionHandlerPropState.cs +++ b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerPropState.cs @@ -7,7 +7,7 @@ namespace EggLink.DanhengServer.Game.Mission.FinishType.Handler [MissionFinishType(MissionFinishTypeEnum.PropState)] public class MissionHandlerPropState : MissionFinishTypeHandler { - public override void HandleFinishType(PlayerInstance player, int Param1, int Param2, int Param3, int subMissionId) + public override void HandleFinishType(PlayerInstance player, int Param1, int Param2, int Param3, List ParamIntList, int subMissionId) { var prop = player.SceneInstance!.GetEntitiesInGroup(Param1); if (prop == null) return; @@ -16,7 +16,11 @@ namespace EggLink.DanhengServer.Game.Mission.FinishType.Handler { if (p.PropInfo.ID == Param2 && p.State != PropStateEnum.Open) { - p.SetState(PropStateEnum.Closed); + if (Param3 != 0) + { + //player.MissionManager!.FinishSubMission(subMissionId); + p.SetState(PropStateEnum.Closed); + } } } } diff --git a/GameServer/Game/Mission/FinishType/Handler/MissionHandlerSubMissionFinishCnt.cs b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerSubMissionFinishCnt.cs new file mode 100644 index 00000000..58d959f3 --- /dev/null +++ b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerSubMissionFinishCnt.cs @@ -0,0 +1,25 @@ +using EggLink.DanhengServer.Enums; +using EggLink.DanhengServer.Game.Player; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EggLink.DanhengServer.Game.Mission.FinishType.Handler +{ + [MissionFinishType(MissionFinishTypeEnum.SubMissionFinishCnt)] + public class MissionHandlerSubMissionFinishCnt : MissionFinishTypeHandler + { + public override void HandleFinishType(PlayerInstance player, int Param1, int Param2, int Param3, List ParamIntList, int subMissionId) + { + foreach (var missionId in ParamIntList) + { + player.MissionManager!.AcceptSubMission(missionId); + player.MissionManager!.FinishSubMission(missionId); + } + + player.MissionManager!.FinishSubMission(subMissionId); + } + } +} diff --git a/GameServer/Game/Mission/FinishType/MissionFinishTypeHandler.cs b/GameServer/Game/Mission/FinishType/MissionFinishTypeHandler.cs index dda0a0a5..22a1cf63 100644 --- a/GameServer/Game/Mission/FinishType/MissionFinishTypeHandler.cs +++ b/GameServer/Game/Mission/FinishType/MissionFinishTypeHandler.cs @@ -4,6 +4,6 @@ namespace EggLink.DanhengServer.Game.Mission.FinishType { public abstract class MissionFinishTypeHandler { - public abstract void HandleFinishType(PlayerInstance player, int Param1, int Param2, int Param3, int subMissionId); + public abstract void HandleFinishType(PlayerInstance player, int Param1, int Param2, int Param3, List ParamIntList, int subMissionId); } } diff --git a/GameServer/Game/Mission/MissionManager.cs b/GameServer/Game/Mission/MissionManager.cs index 32bf3434..b2b7e355 100644 --- a/GameServer/Game/Mission/MissionManager.cs +++ b/GameServer/Game/Mission/MissionManager.cs @@ -18,6 +18,7 @@ namespace EggLink.DanhengServer.Game.Mission public MissionData Data; public Dictionary ActionHandlers = []; public Dictionary FinishTypeHandlers = []; + public MissionManager(PlayerInstance player) : base(player) { var mission = DatabaseHelper.Instance?.GetInstance(player.Uid); @@ -53,16 +54,19 @@ namespace EggLink.DanhengServer.Game.Mission #region Mission Actions - public void AcceptMainMission(int missionId) + public List AcceptMainMission(int missionId, bool sendPacket = true) { - if (Data.MissionInfo.ContainsKey(missionId)) return; + if (Data.MissionInfo.ContainsKey(missionId)) return []; // Get entry sub mission GameData.MainMissionData.TryGetValue(missionId, out var mission); - if (mission == null) return; + if (mission == null) return []; Data.MissionInfo.Add(missionId, []); Data.MainMissionInfo.Add(missionId, MissionPhaseEnum.Doing); - mission.MissionInfo?.StartSubMissionList.ForEach(AcceptSubMission); + + var list = new List(); + mission.MissionInfo?.StartSubMissionList.ForEach(i => list.Add(AcceptSubMission(i, sendPacket))); + return list; } public void AcceptSubMission(int missionId) @@ -70,9 +74,11 @@ namespace EggLink.DanhengServer.Game.Mission AcceptSubMission(missionId, true); } - public Proto.MissionSync? AcceptSubMission(int missionId, bool sendPacket) + public Proto.MissionSync? AcceptSubMission(int missionId, bool sendPacket, bool doFinishTypeAction = true) { - var mainMissionId = int.Parse(missionId.ToString()[..^2]); + GameData.SubMissionData.TryGetValue(missionId, out var subMission); + if (subMission == null) return null; + var mainMissionId = subMission.MainMissionID; if (!Data.MissionInfo.TryGetValue(mainMissionId, out Dictionary? value)) return null; if (value == null || value.ContainsKey(missionId)) return null; // Get entry sub mission @@ -92,15 +98,53 @@ namespace EggLink.DanhengServer.Game.Mission }); DatabaseHelper.Instance?.UpdateInstance(Data); - if (sendPacket) - Player.SendPacket(new PacketPlayerSyncScNotify(sync)); + if (sendPacket) Player.SendPacket(new PacketPlayerSyncScNotify(sync)); Player.SceneInstance!.SyncGroupInfo(); + if (doFinishTypeAction && mission.SubMissionInfo != null) + { + FinishTypeHandlers.TryGetValue(mission.SubMissionInfo.FinishType, out var handler); + handler?.HandleFinishType(Player, mission.SubMissionInfo.ParamInt1, mission.SubMissionInfo.ParamInt2, mission.SubMissionInfo.ParamInt3, mission.SubMissionInfo.ParamIntList, missionId); + } return sync; } + public void FinishMainMission(int missionId) + { + if (!Data.MainMissionInfo.TryGetValue(missionId, out var value)) return; + if (value != MissionPhaseEnum.Doing) return; + Data.MainMissionInfo[missionId] = MissionPhaseEnum.Finish; + var sync = new Proto.MissionSync(); + sync.NBGDFCJODOA.Add((uint)missionId); + // get next main mission + foreach (var nextMission in GameData.MainMissionData.Values) + { + if (!nextMission.IsEqual(Data)) continue; + var res = AcceptMainMission(nextMission.MainMissionID, false); + //sync.MissionList.Add(new Proto.Mission() + //{ + // Id = (uint)nextMission.MainMissionID, + // Status = Proto.MissionStatus.MissionDoing, + //}); + foreach (var subMission in res) + { + if (subMission != null) + { + sync.MissionList.AddRange(subMission.MissionList); + } + } + } + + Player.SendPacket(new PacketPlayerSyncScNotify(sync)); + Player.SendPacket(new PacketStartFinishMainMissionScNotify(missionId)); + + DatabaseHelper.Instance?.UpdateInstance(Data); + } + public void FinishSubMission(int missionId) { - var mainMissionId = int.Parse(missionId.ToString()[..^2]); + GameData.SubMissionData.TryGetValue(missionId, out var subMission); + if (subMission == null) return; + var mainMissionId = subMission.MainMissionID; if (!Data.MissionInfo.TryGetValue(mainMissionId, out var value)) return; GameData.MainMissionData.TryGetValue(mainMissionId, out var mainMission); if (mainMission == null) return; @@ -108,6 +152,7 @@ namespace EggLink.DanhengServer.Game.Mission if (mission.Status != MissionPhaseEnum.Doing) return; mission.Status = MissionPhaseEnum.Finish; var sync = new Proto.MissionSync(); + var triggerAction = new List(); sync.MissionList.Add(new Proto.Mission() { Id = (uint)missionId, @@ -127,7 +172,7 @@ namespace EggLink.DanhengServer.Game.Mission } if (canAccept) { - var s = AcceptSubMission(nextMission.ID, false); + var s = AcceptSubMission(nextMission.ID, false, false); if (s != null) { sync.MissionList.Add(new Proto.Mission() @@ -135,9 +180,8 @@ namespace EggLink.DanhengServer.Game.Mission Id = (uint)nextMission.ID, Status = Proto.MissionStatus.MissionDoing, }); + triggerAction.Add(nextMission); } - FinishTypeHandlers.TryGetValue(nextMission.FinishType, out var handler); - handler?.HandleFinishType(Player, nextMission.ParamInt1, nextMission.ParamInt2, nextMission.ParamInt3, nextMission.ID); } } if (mainMission.MissionInfo != null) @@ -145,6 +189,28 @@ namespace EggLink.DanhengServer.Game.Mission Player.SendPacket(new PacketPlayerSyncScNotify(sync)); Player.SendPacket(new PacketStartFinishSubMissionScNotify(missionId)); + // Get if it should finish main mission + // get current main mission + var shouldFinish = true; + mainMission.MissionInfo?.FinishSubMissionList.ForEach(id => + { + if (GetSubMissionStatus(id) != MissionPhaseEnum.Finish) + { + shouldFinish = false; + } + }); + + foreach (var nextMission in triggerAction) + { + FinishTypeHandlers.TryGetValue(nextMission.FinishType, out var handler); + handler?.HandleFinishType(Player, nextMission.ParamInt1, nextMission.ParamInt2, nextMission.ParamInt3, nextMission.ParamIntList, nextMission.ID); + } + + if (shouldFinish) + { + FinishMainMission(mainMissionId); + } + DatabaseHelper.Instance?.UpdateInstance(Data); } @@ -180,7 +246,9 @@ namespace EggLink.DanhengServer.Game.Mission public MissionPhaseEnum GetSubMissionStatus(int missionId) { - var mainMissionId = int.Parse(missionId.ToString()[..^2]); + GameData.SubMissionData.TryGetValue(missionId, out var subMission); + if (subMission == null) return MissionPhaseEnum.None; + var mainMissionId = subMission.MainMissionID; if (Data.MissionInfo.TryGetValue(mainMissionId, out var info)) { if (info.TryGetValue(missionId, out var mission)) @@ -193,12 +261,9 @@ namespace EggLink.DanhengServer.Game.Mission public Data.Config.SubMissionInfo? GetSubMissionInfo(int missionId) { - var mainMissionId = int.Parse(missionId.ToString()[..^2]); - if (GameData.MainMissionData.TryGetValue(mainMissionId, out var mainMission)) - { - return mainMission.MissionInfo?.SubMissionList.Find(x => x.ID == missionId); - } - return null; + GameData.SubMissionData.TryGetValue(missionId, out var subMission); + if (subMission == null) return null; + return subMission.SubMissionInfo; } public List GetRunningSubMissionIdList() @@ -226,7 +291,7 @@ namespace EggLink.DanhengServer.Game.Mission foreach (var mission in GetRunningSubMissionIdList()) { var subMission = GetSubMissionInfo(mission); - if (subMission != null && subMission.FinishType == MissionFinishTypeEnum.StageWin && req.EndStatus == Proto.BattleEndStatus.BattleEndWin) + if (subMission != null && (subMission.FinishType == MissionFinishTypeEnum.StageWin || subMission.FinishType == MissionFinishTypeEnum.KillMonster) && req.EndStatus == Proto.BattleEndStatus.BattleEndWin) { FinishSubMission(mission); } diff --git a/GameServer/Game/Player/PlayerInstance.cs b/GameServer/Game/Player/PlayerInstance.cs index 1090b52c..1ef3db75 100644 --- a/GameServer/Game/Player/PlayerInstance.cs +++ b/GameServer/Game/Player/PlayerInstance.cs @@ -166,6 +166,7 @@ namespace EggLink.DanhengServer.Game.Player DatabaseHelper.Instance?.UpdateInstance(Data); DatabaseHelper.Instance?.UpdateInstance(PlayerUnlockData!); DatabaseHelper.Instance?.UpdateInstance(SceneData!); + DatabaseHelper.Instance?.UpdateInstance(TutorialData!); return Task.CompletedTask; } @@ -256,6 +257,7 @@ namespace EggLink.DanhengServer.Game.Player { p.SetState(PropStateEnum.Open); } + MissionManager!.OnPlayerInteractWithProp(prop.PropInfo); } } break; @@ -270,7 +272,8 @@ namespace EggLink.DanhengServer.Game.Player { if (id == p.PropInfo.ID) { - p.SetState(PropStateEnum.Open); + p.SetState(newState); + MissionManager!.OnPlayerInteractWithProp(p.PropInfo); } } } @@ -314,12 +317,39 @@ namespace EggLink.DanhengServer.Game.Player LoadScene(entrance.PlaneID, entrance.FloorID, entryId, anchor!.ToPositionProto(), anchor.ToRotationProto(), sendPacket); } + public void EnterMissionScene(int floorId, int entryId, bool sendPacket) + { + var entrance = GameData.GetMapEntrance(floorId, MissionManager!.Data); + if (entrance == null) return; + + GameData.GetFloorInfo(entrance.PlaneID, entrance.FloorID, out var floorInfo); + if (floorInfo == null) return; + + int StartGroup = entrance.StartGroupID; + int StartAnchor = entrance.StartAnchorID; + + if (StartAnchor == 0) + { + StartGroup = floorInfo.StartGroupID; + StartAnchor = floorInfo.StartAnchorID; + } + AnchorInfo? anchor = floorInfo.GetAnchorInfo(StartGroup, StartAnchor); + + LoadScene(entrance.PlaneID, entrance.FloorID, entryId, anchor!.ToPositionProto(), anchor.ToRotationProto(), sendPacket); + } + public void MoveTo(Position position) { Data.Pos = position; SendPacket(new PacketSceneEntityMoveScNotify(this)); } + public void MoveTo(EntityMotion motion) + { + Data.Pos = motion.Motion.Pos.ToPosition(); + Data.Rot = motion.Motion.Rot.ToPosition(); + } + public void LoadScene(int planeId, int floorId, int entryId, Position pos, Position rot, bool sendPacket) { diff --git a/GameServer/Game/Scene/Entity/EntityProp.cs b/GameServer/Game/Scene/Entity/EntityProp.cs index 7d88d167..22cf3c37 100644 --- a/GameServer/Game/Scene/Entity/EntityProp.cs +++ b/GameServer/Game/Scene/Entity/EntityProp.cs @@ -28,7 +28,7 @@ namespace EggLink.DanhengServer.Game.Scene.Entity public void SetState(PropStateEnum state, bool sendPacket) { - if (State == PropStateEnum.Open) return; // already open DO NOT CLOSE AGAIN + //if (State == PropStateEnum.Open) return; // already open DO NOT CLOSE AGAIN State = state; if (sendPacket) { diff --git a/GameServer/Game/Scene/Entity/IGameEntity.cs b/GameServer/Game/Scene/Entity/IGameEntity.cs index 0202a55c..ddc86742 100644 --- a/GameServer/Game/Scene/Entity/IGameEntity.cs +++ b/GameServer/Game/Scene/Entity/IGameEntity.cs @@ -12,8 +12,6 @@ namespace EggLink.DanhengServer.Game.Scene.Entity { public int EntityID { get; set; } public int GroupID { get; set; } - public Position Position { get; set; } - public Position Rotation { get; set; } public SceneEntityInfo ToProto(); } diff --git a/GameServer/Game/Scene/SceneEntityLoader.cs b/GameServer/Game/Scene/SceneEntityLoader.cs index f8d6eb78..aac901d5 100644 --- a/GameServer/Game/Scene/SceneEntityLoader.cs +++ b/GameServer/Game/Scene/SceneEntityLoader.cs @@ -185,16 +185,16 @@ namespace EggLink.DanhengServer.Game.Scene scene.HealingSprings.Add(prop); prop.SetState(PropStateEnum.CheckPointEnable); } - else - { - prop.SetState(info.State); - } // load from database var propData = scene.Player.GetScenePropData(scene.FloorId, group.Id, info.ID); if (propData != null) { prop.SetState(propData.State); + } + else + { + prop.SetState(info.State); } return prop; } diff --git a/GameServer/Game/Scene/SceneInstance.cs b/GameServer/Game/Scene/SceneInstance.cs index e2416848..7ede94bf 100644 --- a/GameServer/Game/Scene/SceneInstance.cs +++ b/GameServer/Game/Scene/SceneInstance.cs @@ -9,6 +9,7 @@ using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Server.Packet; using EggLink.DanhengServer.Server.Packet.Send.Lineup; using EggLink.DanhengServer.Server.Packet.Send.Scene; +using EggLink.DanhengServer.Util; namespace EggLink.DanhengServer.Game.Scene { @@ -41,7 +42,7 @@ namespace EggLink.DanhengServer.Game.Scene FloorId = floorId; EntryId = entryId; - SyncLineup(); + SyncLineup(true, true); GameData.GetFloorInfo(PlaneId, FloorId, out FloorInfo); if (FloorInfo == null) return; @@ -60,88 +61,53 @@ namespace EggLink.DanhengServer.Game.Scene #region Scene Actions - public void SyncLineup(bool notSendPacket = true) + public void SyncLineup(bool notSendPacket = false, bool forceSetEntityId = false) { var oldAvatarInfo = AvatarInfo.Values.ToList(); AvatarInfo.Clear(); bool sendPacket = false; - List avatarEntities = []; - foreach (var avatar in Player.LineupManager?.GetCurLineup()?.BaseAvatars ?? []) + var AddAvatar = new List(); + var RemoveAvatar = new List(); + foreach (var avatar in Player.LineupManager?.GetAvatarsFromCurTeam() ?? []) { - if (avatar.AssistUid != 0) + if (avatar == null) continue; + if (forceSetEntityId) { - var assistPlayer = DatabaseHelper.Instance?.GetInstance(avatar.AssistUid); - if (assistPlayer != null) - { - var assistAvatar = assistPlayer.Avatars?.Find(x => x.GetAvatarId() == avatar.BaseAvatarId); - if (assistAvatar != null) - { - assistAvatar.EntityId = ++LastEntityId; - var oldAvatarId = assistAvatar.AvatarId; - var oldAvatar = oldAvatarInfo.Find(x => x.AvatarInfo.AvatarId == oldAvatarId); - if (oldAvatar == null) - { - sendPacket = true; - } - else - { - assistAvatar.EntityId = oldAvatar.AvatarInfo.EntityId; // keep old entity id - } - AvatarInfo.Add(assistAvatar.EntityId, new(assistAvatar, AvatarType.AvatarAssistType)); - avatarEntities.Add(assistAvatar.ToSceneEntityInfo()); - } - } - } else if (avatar.SpecialAvatarId != 0) + avatar.AvatarInfo.EntityId = ++LastEntityId; + } + var avatarInstance = oldAvatarInfo.Find(x => x.AvatarInfo.AvatarId == avatar.AvatarInfo.AvatarId); + if (avatarInstance == null) { - var specialAvatar = GameData.SpecialAvatarData[avatar.SpecialAvatarId]; - if (specialAvatar != null) + if (avatar.AvatarInfo.EntityId == 0) { - var avatarData = specialAvatar.ToAvatarData(Player.Uid); - avatarData.EntityId = ++LastEntityId; - var oldAvatarId = avatarData.AvatarId; - var oldAvatar = oldAvatarInfo.Find(x => x.AvatarInfo.AvatarId == oldAvatarId); - if (oldAvatar == null) - { - sendPacket = true; - } - else - { - avatarData.EntityId = oldAvatar.AvatarInfo.EntityId; // keep old entity id - } - AvatarInfo.Add(avatarData.EntityId, new(avatarData, AvatarType.AvatarTrialType)); - avatarEntities.Add(avatarData.ToSceneEntityInfo()); + avatar.AvatarInfo.EntityId = ++LastEntityId; } + AddAvatar.Add(avatar); + AvatarInfo.Add(avatar.AvatarInfo.EntityId, avatar); + sendPacket = true; } else { - var avatarData = Player.AvatarManager?.GetAvatar(avatar.BaseAvatarId); - if (avatarData?.GetAvatarId() == avatar.BaseAvatarId) - { - avatarData.EntityId = ++LastEntityId; - var oldAvatarId = avatarData.AvatarId; - var oldAvatar = oldAvatarInfo.Find(x => x.AvatarInfo.AvatarId == oldAvatarId); - if (oldAvatar == null) - { - sendPacket = true; - } - else - { - avatarData.EntityId = oldAvatar.AvatarInfo.EntityId; // keep old entity id - } - AvatarInfo.Add(avatarData.EntityId, new(avatarData, AvatarType.AvatarFormalType)); - avatarEntities.Add(avatarData.ToSceneEntityInfo()); - } + AvatarInfo.Add(avatarInstance.AvatarInfo.EntityId, avatarInstance); } }; + foreach (var avatar in oldAvatarInfo) + { + if (AvatarInfo.Values.ToList().FindIndex(x => x.AvatarInfo.AvatarId == avatar.AvatarInfo.AvatarId) == -1) + { + RemoveAvatar.Add(avatar); + sendPacket = true; + } + } var LeaderAvatarId = Player.LineupManager?.GetCurLineup()?.LeaderAvatarId; var LeaderAvatarSlot = Player.LineupManager?.GetCurLineup()?.BaseAvatars?.FindIndex(x => x.BaseAvatarId == LeaderAvatarId); if (LeaderAvatarSlot == -1) LeaderAvatarSlot = 0; + if (AvatarInfo.Count == 0) return; var info = AvatarInfo.Values.ToList()[LeaderAvatarSlot ?? 0]; LeaderEntityId = info.AvatarInfo.EntityId; - Player.SendPacket(new PacketSyncLineupNotify(Player.LineupManager!.GetCurLineup()!)); if (sendPacket && !notSendPacket) { - Player.SendPacket(new PacketSceneGroupRefreshScNotify(avatarEntities)); + Player.SendPacket(new PacketSceneGroupRefreshScNotify(AddAvatar, RemoveAvatar)); } } @@ -195,7 +161,12 @@ namespace EggLink.DanhengServer.Game.Scene } } - public void RemoveEntity(IGameEntity monster, bool SendPacket = false) + public void RemoveEntity(IGameEntity monster) + { + RemoveEntity(monster, IsLoaded); + } + + public void RemoveEntity(IGameEntity monster, bool SendPacket) { Entities.Remove(monster.EntityID); @@ -302,9 +273,17 @@ namespace EggLink.DanhengServer.Game.Scene #endregion } - public class AvatarSceneInfo(AvatarInfo avatarInfo, AvatarType avatarType) + public class AvatarSceneInfo(AvatarInfo avatarInfo, AvatarType avatarType) : IGameEntity { public AvatarInfo AvatarInfo = avatarInfo; public AvatarType AvatarType = avatarType; + + public int EntityID { get; set; } = avatarInfo.EntityId; + public int GroupID { get; set; } = 0; + + public SceneEntityInfo ToProto() + { + return AvatarInfo.ToSceneEntityInfo(AvatarType); + } } } diff --git a/GameServer/Program/EntryPoint.cs b/GameServer/Program/EntryPoint.cs index 6a43dfc1..3937235c 100644 --- a/GameServer/Program/EntryPoint.cs +++ b/GameServer/Program/EntryPoint.cs @@ -102,7 +102,7 @@ namespace EggLink.DanhengServer.Program private delegate bool ConsoleCtrlDelegate(int ctrlType); - [LibraryImport("Kernel32")] + [LibraryImport("Kernel32")] // Windows only try to find a way to do this on linux [return: MarshalAs(UnmanagedType.Bool)] private static partial bool SetConsoleCtrlHandler(ConsoleCtrlDelegate handler, [MarshalAs(UnmanagedType.Bool)] bool add); diff --git a/GameServer/Server/Connection.cs b/GameServer/Server/Connection.cs index 2c1a8d44..fef91e87 100644 --- a/GameServer/Server/Connection.cs +++ b/GameServer/Server/Connection.cs @@ -24,6 +24,7 @@ public partial class Connection public SessionState State { get; set; } = SessionState.INACTIVE; public PlayerInstance? Player { get; set; } public static readonly List BANNED_PACKETS = []; + public bool IsOnline = true; private static readonly Logger Logger = new("GameServer"); #if DEBUG public static readonly Dictionary LogMap = []; @@ -56,7 +57,7 @@ public partial class Connection CancelToken.Dispose(); } catch { } - + IsOnline = false; } #if DEBUG diff --git a/GameServer/Server/Packet/Recv/Battle/HandlerSceneCastSkillCsReq.cs b/GameServer/Server/Packet/Recv/Battle/HandlerSceneCastSkillCsReq.cs index 257f4b85..8297b842 100644 --- a/GameServer/Server/Packet/Recv/Battle/HandlerSceneCastSkillCsReq.cs +++ b/GameServer/Server/Packet/Recv/Battle/HandlerSceneCastSkillCsReq.cs @@ -16,7 +16,11 @@ namespace EggLink.DanhengServer.Server.Packet.Recv.Battle var req = SceneCastSkillCsReq.Parser.ParseFrom(data); if (req != null) { - connection.Player!.BattleManager!.StartBattle(req); + if (req.HitMonsterEntityIdList.Count == 0) + { + // didnt hit any target + connection.SendPacket(new PacketSceneCastSkillScRsp(req.CastEntityId)); + } else connection.Player!.BattleManager!.StartBattle(req); } } } diff --git a/GameServer/Server/Packet/Recv/Mission/HandlerFinishTalkMissionCsReq.cs b/GameServer/Server/Packet/Recv/Mission/HandlerFinishTalkMissionCsReq.cs index 098b5b0c..86862402 100644 --- a/GameServer/Server/Packet/Recv/Mission/HandlerFinishTalkMissionCsReq.cs +++ b/GameServer/Server/Packet/Recv/Mission/HandlerFinishTalkMissionCsReq.cs @@ -10,8 +10,13 @@ namespace EggLink.DanhengServer.Server.Packet.Recv.Mission { var req = FinishTalkMissionCsReq.Parser.ParseFrom(data); var player = connection.Player!; - var missionId = int.Parse(req.TalkStr.Split('_')[1]); - player.MissionManager!.FinishSubMission(missionId); + try + { + var missionId = int.Parse(req.TalkStr.Split('_')[1]); // may send 0 instead of missionId (in talking) + player.MissionManager!.FinishSubMission(missionId); + } catch + { + } connection.SendPacket(new PacketFinishTalkMissionScRsp(req.TalkStr)); } diff --git a/GameServer/Server/Packet/Recv/Player/HandlerPlayerGetTokenCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerPlayerGetTokenCsReq.cs index 67f56e0f..4c66eb9b 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerPlayerGetTokenCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerPlayerGetTokenCsReq.cs @@ -19,6 +19,7 @@ namespace EggLink.DanhengServer.Server.Packet.Recv.Player if (account == null) { connection.SendPacket(new PacketPlayerGetTokenScRsp()); + connection.SendPacket(new PacketPlayerKickOutScNotify()); return; } diff --git a/GameServer/Server/Packet/Recv/Player/HandlerSetHeadIconCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerSetHeadIconCsReq.cs new file mode 100644 index 00000000..2b3eb36f --- /dev/null +++ b/GameServer/Server/Packet/Recv/Player/HandlerSetHeadIconCsReq.cs @@ -0,0 +1,20 @@ +using EggLink.DanhengServer.Database; +using EggLink.DanhengServer.Proto; +using EggLink.DanhengServer.Server.Packet.Send.Player; + +namespace EggLink.DanhengServer.Server.Packet.Recv.Player +{ + [Opcode(CmdIds.SetHeadIconCsReq)] + public class HandlerSetHeadIconCsReq : Handler + { + public override void OnHandle(Connection connection, byte[] header, byte[] data) + { + var player = connection.Player!; + var req = SetHeadIconCsReq.Parser.ParseFrom(data); + if (req == null) return; + player.Data.HeadIcon = (int)req.Id; + DatabaseHelper.Instance?.UpdateInstance(player.Data); + connection.SendPacket(new PacketSetHeadIconScRsp(player)); + } + } +} diff --git a/GameServer/Server/Packet/Recv/Player/HandlerSetNicknameCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerSetNicknameCsReq.cs new file mode 100644 index 00000000..7242886d --- /dev/null +++ b/GameServer/Server/Packet/Recv/Player/HandlerSetNicknameCsReq.cs @@ -0,0 +1,21 @@ +using EggLink.DanhengServer.Database; +using EggLink.DanhengServer.Proto; +using EggLink.DanhengServer.Server.Packet.Send.Player; + +namespace EggLink.DanhengServer.Server.Packet.Recv.Player +{ + [Opcode(CmdIds.SetNicknameCsReq)] + public class HandlerSetNicknameCsReq : Handler + { + public override void OnHandle(Connection connection, byte[] header, byte[] data) + { + var player = connection.Player!; + var req = SetNicknameCsReq.Parser.ParseFrom(data); + if (req == null) return; + player.Data.Name = req.Nickname; + DatabaseHelper.Instance?.UpdateInstance(player.Data); + connection.SendPacket(CmdIds.SetNicknameScRsp); + connection.SendPacket(new PacketPlayerSyncScNotify(player.ToProto())); + } + } +} diff --git a/GameServer/Server/Packet/Recv/Player/HandlerSetPlayerInfoCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerSetPlayerInfoCsReq.cs new file mode 100644 index 00000000..bb75acd8 --- /dev/null +++ b/GameServer/Server/Packet/Recv/Player/HandlerSetPlayerInfoCsReq.cs @@ -0,0 +1,37 @@ +using EggLink.DanhengServer.Database; +using EggLink.DanhengServer.Proto; +using EggLink.DanhengServer.Server.Packet.Send.Player; + +namespace EggLink.DanhengServer.Server.Packet.Recv.Player +{ + [Opcode(CmdIds.SetPlayerInfoCsReq)] + public class HandlerSetPlayerInfoCsReq : Handler + { + public override void OnHandle(Connection connection, byte[] header, byte[] data) + { + var player = connection.Player!; + var req = SetPlayerInfoCsReq.Parser.ParseFrom(data); + if (req == null) return; + player.Data.CurrentGender = req.Gender; + player.Data.Name = req.Nickname; + if (req.Gender == Gender.Woman) + { + player.Data.CurBasicType = 8002; + player.AddAvatar(8002); + DatabaseHelper.Instance?.UpdateInstance(player.Data); + } else + { + player.Data.CurBasicType = 8001; + player.AddAvatar(8001); + DatabaseHelper.Instance?.UpdateInstance(player.Data); + } + player.AddAvatar(1001); + player.LineupManager!.AddAvatarToCurTeam(8001); + player.LineupManager!.AddAvatarToCurTeam(1001); + player.MissionManager!.GetRunningSubMissionIdList().ForEach(player.MissionManager.FinishSubMission); + + connection.SendPacket(new PacketSetPlayerInfoScRsp(player, req.IsModify)); + connection.SendPacket(new PacketPlayerSyncScNotify(player.ToProto())); + } + } +} diff --git a/GameServer/Server/Packet/Recv/Scene/HandlerSceneEntityTeleportCsReq.cs b/GameServer/Server/Packet/Recv/Scene/HandlerSceneEntityTeleportCsReq.cs index e6453e70..e3406cd7 100644 --- a/GameServer/Server/Packet/Recv/Scene/HandlerSceneEntityTeleportCsReq.cs +++ b/GameServer/Server/Packet/Recv/Scene/HandlerSceneEntityTeleportCsReq.cs @@ -1,9 +1,5 @@ using EggLink.DanhengServer.Proto; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using EggLink.DanhengServer.Server.Packet.Send.Scene; namespace EggLink.DanhengServer.Server.Packet.Recv.Scene { @@ -13,8 +9,14 @@ namespace EggLink.DanhengServer.Server.Packet.Recv.Scene public override void OnHandle(Connection connection, byte[] header, byte[] data) { var req = SceneEntityTeleportCsReq.Parser.ParseFrom(data); + var player = connection.Player!; + if (req.EntryId != player.Data.EntryId) + { + player.EnterScene((int)req.EntryId, 0, false); + } + player.MoveTo(req.EntityMotion); - + connection.SendPacket(new PacketSceneEntityTeleportScRsp(req.EntityMotion)); } } } diff --git a/GameServer/Server/Packet/Send/Player/PacketPlayerKickOutScNotify.cs b/GameServer/Server/Packet/Send/Player/PacketPlayerKickOutScNotify.cs new file mode 100644 index 00000000..79af4314 --- /dev/null +++ b/GameServer/Server/Packet/Send/Player/PacketPlayerKickOutScNotify.cs @@ -0,0 +1,16 @@ +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.Server.Packet.Send.Player +{ + public class PacketPlayerKickOutScNotify : BasePacket + { + public PacketPlayerKickOutScNotify() : base(CmdIds.PlayerKickOutScNotify) + { + var proto = new PlayerKickOutScNotify() + { + KickType = KickType.KickByGm, + }; + SetData(proto); + } + } +} diff --git a/GameServer/Server/Packet/Send/Player/PacketPlayerSyncScNotify.cs b/GameServer/Server/Packet/Send/Player/PacketPlayerSyncScNotify.cs index 4dc4f70c..19310a33 100644 --- a/GameServer/Server/Packet/Send/Player/PacketPlayerSyncScNotify.cs +++ b/GameServer/Server/Packet/Send/Player/PacketPlayerSyncScNotify.cs @@ -59,6 +59,16 @@ namespace EggLink.DanhengServer.Server.Packet.Send.Player SetData(proto); } + public PacketPlayerSyncScNotify(PlayerBasicInfo info) : base(CmdIds.PlayerSyncScNotify) + { + var proto = new PlayerSyncScNotify() + { + BasicInfo = info, + }; + + SetData(proto); + } + private void AddItemToProto(ItemData item, out PlayerSyncScNotify notify) { notify = new PlayerSyncScNotify(); diff --git a/GameServer/Server/Packet/Send/Player/PacketSetHeadIconScRsp.cs b/GameServer/Server/Packet/Send/Player/PacketSetHeadIconScRsp.cs new file mode 100644 index 00000000..52269df3 --- /dev/null +++ b/GameServer/Server/Packet/Send/Player/PacketSetHeadIconScRsp.cs @@ -0,0 +1,22 @@ +using EggLink.DanhengServer.Game.Player; +using EggLink.DanhengServer.Proto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EggLink.DanhengServer.Server.Packet.Send.Player +{ + public class PacketSetHeadIconScRsp : BasePacket + { + public PacketSetHeadIconScRsp(PlayerInstance player) : base(CmdIds.SetHeadIconScRsp) + { + var proto = new SetHeadIconScRsp() + { + CurrentHeadIconId = (uint)player.Data.HeadIcon + }; + SetData(proto); + } + } +} diff --git a/GameServer/Server/Packet/Send/Player/PacketSetPlayerInfoScRsp.cs b/GameServer/Server/Packet/Send/Player/PacketSetPlayerInfoScRsp.cs new file mode 100644 index 00000000..f95b65ee --- /dev/null +++ b/GameServer/Server/Packet/Send/Player/PacketSetPlayerInfoScRsp.cs @@ -0,0 +1,19 @@ +using EggLink.DanhengServer.Game.Player; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.Server.Packet.Send.Player +{ + public class PacketSetPlayerInfoScRsp : BasePacket + { + public PacketSetPlayerInfoScRsp(PlayerInstance player, bool IsModify) : base(CmdIds.SetPlayerInfoScRsp) + { + var proto = new SetPlayerInfoScRsp() + { + CurBasicType = (HeroBasicType)player.Data.CurBasicType, + IsModify = IsModify, + }; + + SetData(proto); + } + } +} diff --git a/GameServer/Server/Packet/Send/Scene/PacketSceneEntityTeleportScRsp.cs b/GameServer/Server/Packet/Send/Scene/PacketSceneEntityTeleportScRsp.cs new file mode 100644 index 00000000..70b6389e --- /dev/null +++ b/GameServer/Server/Packet/Send/Scene/PacketSceneEntityTeleportScRsp.cs @@ -0,0 +1,22 @@ +using EggLink.DanhengServer.Proto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EggLink.DanhengServer.Server.Packet.Send.Scene +{ + public class PacketSceneEntityTeleportScRsp : BasePacket + { + public PacketSceneEntityTeleportScRsp(EntityMotion motion) : base(CmdIds.SceneEntityTeleportScRsp) + { + var proto = new SceneEntityTeleportScRsp() + { + EntityMotion = motion, + }; + + SetData(proto); + } + } +} diff --git a/GameServer/Server/Packet/Send/Scene/PacketSceneGroupRefreshScNotify.cs b/GameServer/Server/Packet/Send/Scene/PacketSceneGroupRefreshScNotify.cs index d380cb59..df18631d 100644 --- a/GameServer/Server/Packet/Send/Scene/PacketSceneGroupRefreshScNotify.cs +++ b/GameServer/Server/Packet/Send/Scene/PacketSceneGroupRefreshScNotify.cs @@ -14,7 +14,6 @@ namespace EggLink.DanhengServer.Server.Packet.Send.Scene var group = new GroupRefreshInfo() { GroupId = (uint)e.GroupID, - Type = SceneGroupRefreshType.Loaded }; group.RefreshEntity.Add(new SceneEntityRefreshInfo() { @@ -36,7 +35,6 @@ namespace EggLink.DanhengServer.Server.Packet.Send.Scene var group = new GroupRefreshInfo() { GroupId = (uint)e.GroupID, - Type = SceneGroupRefreshType.Unload }; group.RefreshEntity.Add(new SceneEntityRefreshInfo() { @@ -62,22 +60,5 @@ namespace EggLink.DanhengServer.Server.Packet.Send.Scene this(addEntity == null ? [] : [addEntity], removeEntity == null ? [] : [removeEntity]) { } - - public PacketSceneGroupRefreshScNotify(List infos) : base(CmdIds.SceneGroupRefreshScNotify) - { - var proto = new SceneGroupRefreshScNotify(); - GroupRefreshInfo group = new(); - foreach (var info in infos) - { - group.RefreshEntity.Add(new SceneEntityRefreshInfo() - { - AddEntity = info, - }); - } - group.Type = SceneGroupRefreshType.Loaded; - proto.GroupRefreshList.Add(group); - - SetData(proto); - } } }