diff --git a/Common/Data/Excel/MatchThreeBirdExcel.cs b/Common/Data/Excel/MatchThreeBirdExcel.cs new file mode 100644 index 00000000..35ddfd50 --- /dev/null +++ b/Common/Data/Excel/MatchThreeBirdExcel.cs @@ -0,0 +1,20 @@ +namespace EggLink.DanhengServer.Data.Excel; + +[ResourceEntity("MatchThreeBird.json")] +public class MatchThreeBirdExcel : ExcelResource +{ + public int UnlockLevel { get; set; } + public int BirdID { get; set; } + public int GuideID { get; set; } + public int SkillID { get; set; } + + public override int GetId() + { + return BirdID; + } + + public override void Loaded() + { + GameData.MatchThreeBirdData.TryAdd(BirdID, this); + } +} \ No newline at end of file diff --git a/Common/Data/Excel/MatchThreeLevelExcel.cs b/Common/Data/Excel/MatchThreeLevelExcel.cs new file mode 100644 index 00000000..a94fc1cf --- /dev/null +++ b/Common/Data/Excel/MatchThreeLevelExcel.cs @@ -0,0 +1,27 @@ +namespace EggLink.DanhengServer.Data.Excel; + +[ResourceEntity("MatchThreeLevel.json")] +public class MatchThreeLevelExcel : ExcelResource +{ + public int Mode { get; set; } + public int OpponentBirdID { get; set; } + public int GoMissionCondition { get; set; } + public int LevelID { get; set; } + public int PlayerID { get; set; } + public int LevelMission { get; set; } + public int UnlockID { get; set; } + public int TurnStep { get; set; } + public int OpponentID { get; set; } + public int PlayerBirdID { get; set; } + public int RewardID { get; set; } + + public override int GetId() + { + return LevelID * 10 + Mode; + } + + public override void Loaded() + { + GameData.MatchThreeLevelData.TryAdd(LevelID * 10 + Mode, this); + } +} \ No newline at end of file diff --git a/Common/Data/GameData.cs b/Common/Data/GameData.cs index e04f6b74..f5fcd309 100644 --- a/Common/Data/GameData.cs +++ b/Common/Data/GameData.cs @@ -311,6 +311,13 @@ public static class GameData #endregion + #region MatchThree + + public static Dictionary MatchThreeLevelData { get; private set; } = []; + public static Dictionary MatchThreeBirdData { get; private set; } = []; + + #endregion + #region Tutorial public static Dictionary TutorialDataData { get; private set; } = []; diff --git a/DanhengKcpSharp/DanhengListener.cs b/DanhengKcpSharp/DanhengListener.cs index 69293cd4..97b80dbe 100644 --- a/DanhengKcpSharp/DanhengListener.cs +++ b/DanhengKcpSharp/DanhengListener.cs @@ -96,6 +96,15 @@ public class DanhengListener await SendDisconnectPacket(con, 5); break; + case -934149376: + if (con != null) + { + Logger.Info($"Duplicate handshake from {con.RemoteEndPoint}"); + return; + } + + await AcceptConnection(rcv, enet); + break; default: Logger.Error($"Invalid handshake code received {code}"); return; diff --git a/GameServer/Game/MatchThree/MatchThreeGameInstance.cs b/GameServer/Game/MatchThree/MatchThreeGameInstance.cs new file mode 100644 index 00000000..4b09d132 --- /dev/null +++ b/GameServer/Game/MatchThree/MatchThreeGameInstance.cs @@ -0,0 +1,49 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree.Member; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.FightMatch3; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Multiplayer; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Game.MatchThree; + +public class MatchThreeGameInstance(FightGameMode mode) +{ + public List Members { get; set; } = []; + public FightGameMode GameMode { get; set; } = mode; + public Match3State State { get; set; } = Match3State.Game; + + public async ValueTask SyncMatchedResult() + { + foreach (var member in Members) + { + await member.Player.SendPacket(new PacketMultiplayerFightGameStartScNotify(this)); + } + } + + public async ValueTask TurnStart() + { + foreach (var member in Members) + { + member.Opponent = member; + await member.Player.SendPacket(new PacketFightMatch3TurnStartScNotify(this, member.Player.Uid)); + } + } + + public MultiplayerFightGameInfo ToBasicInfo() + { + return new MultiplayerFightGameInfo + { + GameMode = FightGameMode.Match3 + }; + } + + public FightMatch3Data ToProto(int uid) + { + return new FightMatch3Data + { + Match3State = State, + PPJLNEDNDAH = 1, + PlayerInfoList = { Members.Select(x => x.ToPlayerInfo()) }, + Match3CurInfo = Members.Find(x => x.Player.Uid == uid)!.ToCurPlayerInfo() + }; + } +} \ No newline at end of file diff --git a/GameServer/Game/MatchThree/MatchThreeManager.cs b/GameServer/Game/MatchThree/MatchThreeManager.cs new file mode 100644 index 00000000..631edea9 --- /dev/null +++ b/GameServer/Game/MatchThree/MatchThreeManager.cs @@ -0,0 +1,34 @@ +using EggLink.DanhengServer.Data; +using EggLink.DanhengServer.GameServer.Game.Player; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Game.MatchThree; + +public class MatchThreeManager(PlayerInstance player) : BasePlayerManager(player) +{ + public MatchThreeRoomInstance? RoomInstance { get; set; } + + public MatchThreeData ToProto() + { + var proto = new MatchThreeData + { + FinishedLevels = + { + GameData.MatchThreeLevelData.Values.Where(x => x.LevelID <= 1500).Select(x => new MatchThreeFinishedLevelInfos + { + LevelId = (uint)x.LevelID, + ModeId = (uint)x.Mode + }) + }, + BirdRecordInfos = + { + GameData.MatchThreeBirdData.Values.Where(x => x.BirdID != 310).Select(x => new MatchThreeBirdInfo + { + BirdId = (uint)x.BirdID + }) + } + }; + + return proto; + } +} \ No newline at end of file diff --git a/GameServer/Game/MatchThree/MatchThreeRoomInstance.cs b/GameServer/Game/MatchThree/MatchThreeRoomInstance.cs new file mode 100644 index 00000000..b8246c69 --- /dev/null +++ b/GameServer/Game/MatchThree/MatchThreeRoomInstance.cs @@ -0,0 +1,110 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree.Member; +using EggLink.DanhengServer.GameServer.Game.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Lobby; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Game.MatchThree; + +public class MatchThreeRoomInstance(int roomId, FightGameMode mode) +{ + public List Members { get; set; } = []; + public int RoomId { get; set; } = roomId; + public FightGameMode GameMode { get; set; } = mode; + public bool InMatch { get; set; } + + public async ValueTask AddMember(MatchThreeMemberInstance member) + { + Members.Add(member); + + if (Members.Count == 1) // reroll a leader + { + Members.First().CharacterType = LobbyCharacterType.LobbyCharacterLeader; + } + + await SyncInfo(LobbyModifyType.JoinLobby); + } + + public async ValueTask RemoveMember(MatchThreeMemberInstance member) + { + Members.Remove(member); + + if (member.CharacterType == LobbyCharacterType.LobbyCharacterLeader) // reroll a leader + { + if (Members.Count != 0) + { + Members.First().CharacterType = LobbyCharacterType.LobbyCharacterLeader; + } + } + + await SyncInfo(LobbyModifyType.QuitLobby); + } + + public async ValueTask AddMember(PlayerInstance player, int birdId, LobbyCharacterType characterType) + { + await AddMember(new MatchThreeMemberInstance(player, birdId, characterType, this)); + } + + public MatchThreeMemberInstance? GetMemberByUid(int uid) + { + return Members.Find(member => member.Player.Uid == uid); + } + + public async ValueTask ModifyPlayerInfo(PlayerInstance player, PlayerExtraInfo extraInfo, LobbyModifyType modifyType) + { + var member = GetMemberByUid(player.Uid); + if (member == null) return; + + member.Bird.BirdId = (int)extraInfo.GameBirdInfo.BirdId; + + member.Status = modifyType == LobbyModifyType.Operating ? LobbyCharacterStatus.Operating : LobbyCharacterStatus.Idle; + + await SyncInfo(modifyType); + } + + public async ValueTask StartMatch() + { + InMatch = true; + + foreach (var member in Members) + { + member.Status = LobbyCharacterStatus.Matching; + } + + await SyncInfo(LobbyModifyType.Match); + + if (!MatchThreeService.MatchingThread.IsAlive) + MatchThreeService.MatchingThread.Start(); + } + + public async ValueTask CancelMatch() + { + InMatch = false; + + foreach (var member in Members) + { + member.Status = LobbyCharacterStatus.Idle; + } + + await SyncInfo(LobbyModifyType.CancelMatch); + } + + public async ValueTask DestroyRoom(LobbyModifyType type) + { + InMatch = false; + + foreach (var member in Members) + { + member.Status = LobbyCharacterStatus.Fighting; + } + + await SyncInfo(type); + } + + public async ValueTask SyncInfo(LobbyModifyType modifyType = LobbyModifyType.None) + { + foreach (var member in Members) + { + await member.Player.SendPacket(new PacketLobbySyncInfoScNotify(this, member.Player.Uid, modifyType)); + } + } +} \ No newline at end of file diff --git a/GameServer/Game/MatchThree/MatchThreeService.cs b/GameServer/Game/MatchThree/MatchThreeService.cs new file mode 100644 index 00000000..59de48f3 --- /dev/null +++ b/GameServer/Game/MatchThree/MatchThreeService.cs @@ -0,0 +1,82 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree.Member; +using EggLink.DanhengServer.GameServer.Game.Player; +using EggLink.DanhengServer.Proto; +using System.Collections.Concurrent; + +namespace EggLink.DanhengServer.GameServer.Game.MatchThree; + +public static class MatchThreeService +{ + public static ConcurrentDictionary Rooms { get; } = []; + public static List GameInstances { get; } = []; + public static int CurRoomId; + public static Thread MatchingThread { get; set; } = new(MatchTask); + + /// + /// Find a room and join it, or create a new room and join it. + /// + public static async ValueTask CreateRoom(PlayerInstance player, int birdId) + { + var room = new MatchThreeRoomInstance(++CurRoomId, FightGameMode.Match3); + Rooms[room.RoomId] = room; + + await room.AddMember(player, birdId, LobbyCharacterType.LobbyCharacterLeader); + + player.MatchThreeManager!.RoomInstance = room; + return room; + } + + public static async ValueTask QuitRoom(PlayerInstance player) + { + var room = player.MatchThreeManager!.RoomInstance; + if (room == null) return; + + var member = room.GetMemberByUid(player.Uid); + if (member == null) return; + + await room.RemoveMember(member); + + if (room.Members.Count == 0) + { + Rooms.Remove(room.RoomId, out _); + } + } + + public static async void MatchTask() + { + // WARNING: DO NOT PERFORM IT IN MAIN THREAD! + while (true) + { + List members = []; + List rooms = []; + + foreach (var room in Rooms.Values.Where(x => x.InMatch)) + { + if (room.Members.Count + members.Count <= 6) + { + members.AddRange(room.Members); + + rooms.Add(room); + } + + if (members.Count == 6) + break; // finish match + } + + if (members.Count != 1) continue; + // matched + var inst = new MatchThreeGameInstance(FightGameMode.Match3) + { + Members = members + }; + GameInstances.Add(inst); + + foreach (var room in rooms) + { + await room.DestroyRoom(LobbyModifyType.FightStart); + } + + await inst.SyncMatchedResult(); + } + } +} \ No newline at end of file diff --git a/GameServer/Game/MatchThree/Member/MatchThreeBirdInstance.cs b/GameServer/Game/MatchThree/Member/MatchThreeBirdInstance.cs new file mode 100644 index 00000000..bd4ca91a --- /dev/null +++ b/GameServer/Game/MatchThree/Member/MatchThreeBirdInstance.cs @@ -0,0 +1,17 @@ +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Game.MatchThree.Member; + +public class MatchThreeBirdInstance +{ + public int BirdId { get; set; } + public int Hp { get; set; } = 20; + + public GameBirdInfo ToProto() + { + return new GameBirdInfo + { + BirdId = (uint)BirdId + }; + } +} \ No newline at end of file diff --git a/GameServer/Game/MatchThree/Member/MatchThreeMemberInstance.cs b/GameServer/Game/MatchThree/Member/MatchThreeMemberInstance.cs new file mode 100644 index 00000000..84eb5f8e --- /dev/null +++ b/GameServer/Game/MatchThree/Member/MatchThreeMemberInstance.cs @@ -0,0 +1,85 @@ +using EggLink.DanhengServer.GameServer.Game.Player; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Game.MatchThree.Member; + +public class MatchThreeMemberInstance(PlayerInstance player, int birdId, LobbyCharacterType type, MatchThreeRoomInstance room) +{ + public MatchThreeBirdInstance Bird { get; set; } = new() + { + BirdId = birdId + }; + + public LobbyCharacterType CharacterType { get; set; } = type; + public LobbyCharacterStatus Status { get; set; } = LobbyCharacterStatus.Idle; + public PlayerInstance Player { get; set; } = player; + public MatchThreeRoomInstance RoomInstance { get; set; } = room; + + public int Score { get; set; } + public Match3PlayerState State { get; set; } = Match3PlayerState.Alive; + public MatchThreeMemberInstance? Opponent { get; set; } + + public MemberInfo ToProto() + { + return new MemberInfo + { + BasicInfo = ToMemberInfo(), + StageInfo = ToExtraInfo(), + StatusInfo = ToStatusInfo() + }; + } + + public FightMatch3PlayerInfo ToPlayerInfo() + { + return new FightMatch3PlayerInfo + { + ScoreId = (uint)Score, + State = State, + Hp = (uint)Bird.Hp, + GCCIOHEJPNE = (uint)Bird.BirdId, + OOGAPOKFKAI = (uint)Player.Uid, + Rank = 2, + OpponentUid = (uint)(Opponent?.Player.Uid ?? 0) + }; + } + + public FightMatch3CurInfo ToCurPlayerInfo() + { + return new FightMatch3CurInfo + { + ScoreId = (uint)Score, + CurHp = (uint)Bird.Hp, + IMKELKMHOIK = new DHPIFKICOPP(), + CurPlayerState = State + }; + } + + public MemberData ToMemberInfo() + { + return new MemberData + { + Nickname = Player.Data.Name, + Uid = (uint)Player.Uid, + Level = (uint)Player.Data.Level, + HeadiconId = (uint)Player.Data.HeadIcon, + }; + } + + public PlayerExtraInfo ToExtraInfo() + { + return new PlayerExtraInfo + { + GameBirdInfo = Bird.ToProto(), + IsInMatch = RoomInstance.InMatch + }; + } + + public PlayerStatusInfo ToStatusInfo() + { + return new PlayerStatusInfo + { + Status = Status, + CharacterType = CharacterType + }; + } +} \ No newline at end of file diff --git a/GameServer/Game/Player/PlayerInstance.cs b/GameServer/Game/Player/PlayerInstance.cs index a67712fe..d0767f41 100644 --- a/GameServer/Game/Player/PlayerInstance.cs +++ b/GameServer/Game/Player/PlayerInstance.cs @@ -18,6 +18,7 @@ using EggLink.DanhengServer.GameServer.Game.Gacha; using EggLink.DanhengServer.GameServer.Game.Inventory; using EggLink.DanhengServer.GameServer.Game.Lineup; using EggLink.DanhengServer.GameServer.Game.Mail; +using EggLink.DanhengServer.GameServer.Game.MatchThree; using EggLink.DanhengServer.GameServer.Game.Message; using EggLink.DanhengServer.GameServer.Game.Mission; using EggLink.DanhengServer.GameServer.Game.Quest; @@ -46,32 +47,59 @@ public class PlayerInstance(PlayerData data) { #region Managers - public ActivityManager? ActivityManager { get; private set; } + #region Basic Managers + public AvatarManager? AvatarManager { get; private set; } public LineupManager? LineupManager { get; private set; } public InventoryManager? InventoryManager { get; private set; } public BattleManager? BattleManager { get; private set; } public BattleInstance? BattleInstance { get; set; } + + #endregion + + #region Shopping Managers + + public GachaManager? GachaManager { get; private set; } + public ShopService? ShopService { get; private set; } + + #endregion + + + #region Quest & Mission Managers + public MissionManager? MissionManager { get; private set; } public QuestManager? QuestManager { get; private set; } - public GachaManager? GachaManager { get; private set; } - public MessageManager? MessageManager { get; private set; } - public MailManager? MailManager { get; private set; } - public RaidManager? RaidManager { get; private set; } public StoryLineManager? StoryLineManager { get; private set; } + public MessageManager? MessageManager { get; private set; } + public TaskManager? TaskManager { get; private set; } - public TrainPartyManager? TrainPartyManager { get; private set; } + #endregion + + #region Rogue Managers - public FriendManager? FriendManager { get; private set; } public RogueManager? RogueManager { get; private set; } public ChessRogueManager? ChessRogueManager { get; private set; } public RogueTournManager? RogueTournManager { get; private set; } public RogueMagicManager? RogueMagicManager { get; internal set; } - public ShopService? ShopService { get; private set; } + + #endregion + + #region Activity Managers + + public ActivityManager? ActivityManager { get; private set; } + public MatchThreeManager? MatchThreeManager { get; private set; } + public TrainPartyManager? TrainPartyManager { get; private set; } + + #endregion + + #region Others + + public MailManager? MailManager { get; private set; } + public FriendManager? FriendManager { get; private set; } public ChallengeManager? ChallengeManager { get; private set; } - public TaskManager? TaskManager { get; private set; } + #endregion #endregion @@ -154,6 +182,7 @@ public class PlayerInstance(PlayerData data) StoryLineManager = new StoryLineManager(this); QuestManager = new QuestManager(this); TrainPartyManager = new TrainPartyManager(this); + MatchThreeManager = new MatchThreeManager(this); PlayerUnlockData = InitializeDatabase(); SceneData = InitializeDatabase(); diff --git a/GameServer/Game/Scene/SceneInstance.cs b/GameServer/Game/Scene/SceneInstance.cs index f097ca2e..5d748f6b 100644 --- a/GameServer/Game/Scene/SceneInstance.cs +++ b/GameServer/Game/Scene/SceneInstance.cs @@ -121,6 +121,9 @@ public class SceneInstance else sceneInfo.FloorSavedData[value.Name] = value.DefaultValue; + foreach (var value in floorData ?? []) + sceneInfo.FloorSavedData[value.Key] = value.Value; + foreach (var value in FloorInfo?.CustomValues ?? []) if (floorData != null && floorData.TryGetValue(value.Name, out var v)) { diff --git a/GameServer/Server/Connection.cs b/GameServer/Server/Connection.cs index ecd24d18..72f798b0 100644 --- a/GameServer/Server/Connection.cs +++ b/GameServer/Server/Connection.cs @@ -1,6 +1,7 @@ using System.Buffers; using System.Net; using System.Reflection; +using EggLink.DanhengServer.GameServer.Game.MatchThree; using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.GameServer.Server.Packet; using EggLink.DanhengServer.Kcp; @@ -17,6 +18,8 @@ public class Connection(KcpConversation conversation, IPEndPoint remote) : Danhe private static readonly Logger Logger = new("GameServer"); public PlayerInstance? Player { get; set; } + public MatchThreeGameInstance? GameInstance { get; set; } + public int Uid { get; set; } public override async void Start() { diff --git a/GameServer/Server/Packet/Recv/Fight/HandlerFightEnterCsReq.cs b/GameServer/Server/Packet/Recv/Fight/HandlerFightEnterCsReq.cs new file mode 100644 index 00000000..d31aea7a --- /dev/null +++ b/GameServer/Server/Packet/Recv/Fight/HandlerFightEnterCsReq.cs @@ -0,0 +1,30 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Fight; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; +using EggLink.DanhengServer.Util; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Fight; + +[Opcode(CmdIds.FightEnterCsReq)] +public class HandlerFightEnterCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + var req = FightEnterCsReq.Parser.ParseFrom(data); + var room = MatchThreeService.GameInstances.Find(x => x.Members.FindIndex(j => j.Player.Uid == req.Uid) != -1); // find room by player uid + if (room == null) return; + + var member = room.Members.Find(x => x.Player.Uid == req.Uid)!; + connection.GameInstance = room; + connection.Uid = member.Player.Uid; + + await connection.SendPacket(new PacketFightEnterScRsp(connection)); + connection.State = SessionStateEnum.ACTIVE; + + if (ConfigManager.Config.GameServer.UsePacketEncryption) + { + connection.XorKey = Crypto.GenerateXorKey(connection.ClientSecretKeySeed); + } + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Fight/HandlerFightHeartBeatCsReq.cs b/GameServer/Server/Packet/Recv/Fight/HandlerFightHeartBeatCsReq.cs new file mode 100644 index 00000000..3db0b294 --- /dev/null +++ b/GameServer/Server/Packet/Recv/Fight/HandlerFightHeartBeatCsReq.cs @@ -0,0 +1,16 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Fight; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Fight; + +[Opcode(CmdIds.FightHeartBeatCsReq)] +public class HandlerFightHeartBeatCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + var req = FightHeartBeatCsReq.Parser.ParseFrom(data); + + await connection.SendPacket(new PacketFightHeartBeatScRsp(req.ClientTimeMs)); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/FightMatch3/HandlerFightMatch3DataCsReq.cs b/GameServer/Server/Packet/Recv/FightMatch3/HandlerFightMatch3DataCsReq.cs new file mode 100644 index 00000000..bf55c941 --- /dev/null +++ b/GameServer/Server/Packet/Recv/FightMatch3/HandlerFightMatch3DataCsReq.cs @@ -0,0 +1,15 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.FightMatch3; +using EggLink.DanhengServer.Kcp; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.FightMatch3; + +[Opcode(CmdIds.FightMatch3DataCsReq)] +public class HandlerFightMatch3DataCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + await connection.SendPacket(new PacketFightMatch3DataScRsp(connection.GameInstance!, connection.Uid)); + + connection.GameInstance!.TurnStart(); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Lobby/HandlerLobbyCreateCsReq.cs b/GameServer/Server/Packet/Recv/Lobby/HandlerLobbyCreateCsReq.cs new file mode 100644 index 00000000..97f1ab90 --- /dev/null +++ b/GameServer/Server/Packet/Recv/Lobby/HandlerLobbyCreateCsReq.cs @@ -0,0 +1,20 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Lobby; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Lobby; + +[Opcode(CmdIds.LobbyCreateCsReq)] +public class HandlerLobbyCreateCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + var req = LobbyCreateCsReq.Parser.ParseFrom(data); + + var player = connection.Player!; + var room = await MatchThreeService.CreateRoom(player, (int)req.LobbyExtraInfo.GameBirdInfo.BirdId); + + await connection.SendPacket(new PacketLobbyCreateScRsp(room)); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Lobby/HandlerLobbyModifyPlayerInfoCsReq.cs b/GameServer/Server/Packet/Recv/Lobby/HandlerLobbyModifyPlayerInfoCsReq.cs new file mode 100644 index 00000000..d1320ae7 --- /dev/null +++ b/GameServer/Server/Packet/Recv/Lobby/HandlerLobbyModifyPlayerInfoCsReq.cs @@ -0,0 +1,23 @@ +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Lobby; + +[Opcode(CmdIds.LobbyModifyPlayerInfoCsReq)] +public class HandlerLobbyModifyPlayerInfoCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + var req = LobbyModifyPlayerInfoCsReq.Parser.ParseFrom(data); + var room = connection.Player!.MatchThreeManager!.RoomInstance; + + if (room == null) + { + await connection.SendPacket(CmdIds.LobbyModifyPlayerInfoScRsp); + return; + } + + await room.ModifyPlayerInfo(connection.Player!, req.LobbyExtraInfo, req.Type); + await connection.SendPacket(CmdIds.LobbyModifyPlayerInfoScRsp); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Lobby/HandlerLobbyQuitCsReq.cs b/GameServer/Server/Packet/Recv/Lobby/HandlerLobbyQuitCsReq.cs new file mode 100644 index 00000000..457c96ea --- /dev/null +++ b/GameServer/Server/Packet/Recv/Lobby/HandlerLobbyQuitCsReq.cs @@ -0,0 +1,14 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree; +using EggLink.DanhengServer.Kcp; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Lobby; + +[Opcode(CmdIds.LobbyQuitCsReq)] +public class HandlerLobbyQuitCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + await MatchThreeService.QuitRoom(connection.Player!); + await connection.SendPacket(CmdIds.LobbyQuitScRsp); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Match/HandlerCancelMatchCsReq.cs b/GameServer/Server/Packet/Recv/Match/HandlerCancelMatchCsReq.cs new file mode 100644 index 00000000..e6488014 --- /dev/null +++ b/GameServer/Server/Packet/Recv/Match/HandlerCancelMatchCsReq.cs @@ -0,0 +1,18 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Match; +using EggLink.DanhengServer.Kcp; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Match; + +[Opcode(CmdIds.CancelMatchCsReq)] +public class HandlerCancelMatchCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + var player = connection.Player!; + var room = player.MatchThreeManager!.RoomInstance; + if (room == null) return; + + await room.CancelMatch(); + await connection.SendPacket(CmdIds.CancelMatchScRsp); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Match/HandlerGetCrossInfoCsReq.cs b/GameServer/Server/Packet/Recv/Match/HandlerGetCrossInfoCsReq.cs new file mode 100644 index 00000000..19c92532 --- /dev/null +++ b/GameServer/Server/Packet/Recv/Match/HandlerGetCrossInfoCsReq.cs @@ -0,0 +1,13 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Match; +using EggLink.DanhengServer.Kcp; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Match; + +[Opcode(CmdIds.GetCrossInfoCsReq)] +public class HandlerGetCrossInfoCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + await connection.SendPacket(new PacketGetCrossInfoScRsp()); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Match/HandlerStartMatchCsReq.cs b/GameServer/Server/Packet/Recv/Match/HandlerStartMatchCsReq.cs new file mode 100644 index 00000000..7b8ad5b7 --- /dev/null +++ b/GameServer/Server/Packet/Recv/Match/HandlerStartMatchCsReq.cs @@ -0,0 +1,23 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Match; +using EggLink.DanhengServer.Kcp; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Match; + +[Opcode(CmdIds.StartMatchCsReq)] +public class HandlerStartMatchCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + var player = connection.Player!; + var room = player.MatchThreeManager!.RoomInstance; + if (room == null) return; + + await room.StartMatch(); + // get member instance + var member = room.GetMemberByUid(player.Uid); + + // send packet + if (member == null) return; + await connection.SendPacket(new PacketStartMatchScRsp(member)); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/MatchThreeModule/HandlerMatchThreeGetDataCsReq.cs b/GameServer/Server/Packet/Recv/MatchThreeModule/HandlerMatchThreeGetDataCsReq.cs new file mode 100644 index 00000000..0e7fdfc2 --- /dev/null +++ b/GameServer/Server/Packet/Recv/MatchThreeModule/HandlerMatchThreeGetDataCsReq.cs @@ -0,0 +1,13 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.MatchThreeModule; +using EggLink.DanhengServer.Kcp; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.MatchThreeModule; + +[Opcode(CmdIds.MatchThreeGetDataCsReq)] +public class HandlerMatchThreeGetDataCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + await connection.SendPacket(new PacketMatchThreeGetDataScRsp(connection.Player!)); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/MatchThreeModule/HandlerMatchThreeLevelEndCsReq.cs b/GameServer/Server/Packet/Recv/MatchThreeModule/HandlerMatchThreeLevelEndCsReq.cs new file mode 100644 index 00000000..3e80b515 --- /dev/null +++ b/GameServer/Server/Packet/Recv/MatchThreeModule/HandlerMatchThreeLevelEndCsReq.cs @@ -0,0 +1,16 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.MatchThreeModule; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.MatchThreeModule; + +[Opcode(CmdIds.MatchThreeLevelEndCsReq)] +public class HandlerMatchThreeLevelEndCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + var req = MatchThreeLevelEndCsReq.Parser.ParseFrom(data); + + await connection.SendPacket(new PacketMatchThreeLevelEndScRsp(req.LevelId, req.ModeId)); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Multiplayer/HandlerMultiplayerGetFightGateCsReq.cs b/GameServer/Server/Packet/Recv/Multiplayer/HandlerMultiplayerGetFightGateCsReq.cs new file mode 100644 index 00000000..6c665364 --- /dev/null +++ b/GameServer/Server/Packet/Recv/Multiplayer/HandlerMultiplayerGetFightGateCsReq.cs @@ -0,0 +1,13 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Multiplayer; +using EggLink.DanhengServer.Kcp; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Multiplayer; + +[Opcode(CmdIds.MultiplayerGetFightGateCsReq)] +public class HandlerMultiplayerGetFightGateCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + await connection.SendPacket(new PacketMultiplayerGetFightGateScRsp()); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Fight/PacketFightEnterScRsp.cs b/GameServer/Server/Packet/Send/Fight/PacketFightEnterScRsp.cs new file mode 100644 index 00000000..70a09fc7 --- /dev/null +++ b/GameServer/Server/Packet/Send/Fight/PacketFightEnterScRsp.cs @@ -0,0 +1,27 @@ +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; +using EggLink.DanhengServer.Util.Security; +using EggLink.DanhengServer.Util; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Fight; + +public class PacketFightEnterScRsp : BasePacket +{ + public PacketFightEnterScRsp(Connection connection) : base(CmdIds.FightEnterScRsp) + { + var proto = new FightEnterScRsp + { + ServerTimestampMs = (ulong)DateTimeOffset.Now.ToUnixTimeMilliseconds(), + LJMFOHLOBCI = true, + KMANPJCMAOB = 1 + }; + + if (ConfigManager.Config.GameServer.UsePacketEncryption) + { + var tempRandom = new MT19937((ulong)DateTimeOffset.Now.ToUnixTimeSeconds()); + proto.SecretKeySeed = connection.ClientSecretKeySeed = tempRandom.NextUInt64(); + } + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Fight/PacketFightHeartBeatScRsp.cs b/GameServer/Server/Packet/Send/Fight/PacketFightHeartBeatScRsp.cs new file mode 100644 index 00000000..9a7fb3f9 --- /dev/null +++ b/GameServer/Server/Packet/Send/Fight/PacketFightHeartBeatScRsp.cs @@ -0,0 +1,18 @@ +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Fight; + +public class PacketFightHeartBeatScRsp : BasePacket +{ + public PacketFightHeartBeatScRsp(ulong clientTimeMs) : base(CmdIds.FightHeartBeatScRsp) + { + var proto = new FightHeartBeatScRsp + { + ClientTimeMs = clientTimeMs, + ServerTimeMs = (ulong)System.DateTimeOffset.Now.ToUnixTimeMilliseconds() + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/FightMatch3/PacketFightMatch3DataScRsp.cs b/GameServer/Server/Packet/Send/FightMatch3/PacketFightMatch3DataScRsp.cs new file mode 100644 index 00000000..765d217a --- /dev/null +++ b/GameServer/Server/Packet/Send/FightMatch3/PacketFightMatch3DataScRsp.cs @@ -0,0 +1,18 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.FightMatch3; + +public class PacketFightMatch3DataScRsp : BasePacket +{ + public PacketFightMatch3DataScRsp(MatchThreeGameInstance inst, int uid) : base(CmdIds.FightMatch3DataScRsp) + { + var proto = new FightMatch3DataScRsp + { + Data = inst.ToProto(uid), + MemberInfo = { inst.Members.Select(x => x.ToProto()) } + }; + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/FightMatch3/PacketFightMatch3TurnStartScNotify.cs b/GameServer/Server/Packet/Send/FightMatch3/PacketFightMatch3TurnStartScNotify.cs new file mode 100644 index 00000000..a0f2fbb8 --- /dev/null +++ b/GameServer/Server/Packet/Send/FightMatch3/PacketFightMatch3TurnStartScNotify.cs @@ -0,0 +1,17 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.FightMatch3; + +public class PacketFightMatch3TurnStartScNotify : BasePacket +{ + public PacketFightMatch3TurnStartScNotify(MatchThreeGameInstance inst, int uid) : base(CmdIds.FightMatch3TurnStartScNotify) + { + var proto = new FightMatch3TurnStartScNotify + { + LAOHPKGKKGO = inst.ToProto(uid), + }; + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Lobby/PacketLobbyCreateScRsp.cs b/GameServer/Server/Packet/Send/Lobby/PacketLobbyCreateScRsp.cs new file mode 100644 index 00000000..c4e279ca --- /dev/null +++ b/GameServer/Server/Packet/Send/Lobby/PacketLobbyCreateScRsp.cs @@ -0,0 +1,20 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Lobby; + +public class PacketLobbyCreateScRsp : BasePacket +{ + public PacketLobbyCreateScRsp(MatchThreeRoomInstance instance) : base(CmdIds.LobbyCreateScRsp) + { + var proto = new LobbyCreateScRsp + { + RoomId = (uint)instance.RoomId, + MemberInfo = { instance.Members.Select(x => x.ToProto()) }, + FightGameMode = instance.GameMode + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Lobby/PacketLobbySyncInfoScNotify.cs b/GameServer/Server/Packet/Send/Lobby/PacketLobbySyncInfoScNotify.cs new file mode 100644 index 00000000..4a6bb918 --- /dev/null +++ b/GameServer/Server/Packet/Send/Lobby/PacketLobbySyncInfoScNotify.cs @@ -0,0 +1,20 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Lobby; + +public class PacketLobbySyncInfoScNotify : BasePacket +{ + public PacketLobbySyncInfoScNotify(MatchThreeRoomInstance room, int uid, LobbyModifyType modifyType) : base(CmdIds.LobbySyncInfoScNotify) + { + var proto = new LobbySyncInfoScNotify + { + MemberInfo = { room.Members.Select(x => x.ToProto()) }, + Type = modifyType, + Uid = (uint)uid + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Match/PacketGetCrossInfoScRsp.cs b/GameServer/Server/Packet/Send/Match/PacketGetCrossInfoScRsp.cs new file mode 100644 index 00000000..c81a6a57 --- /dev/null +++ b/GameServer/Server/Packet/Send/Match/PacketGetCrossInfoScRsp.cs @@ -0,0 +1,18 @@ +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Match; + +public class PacketGetCrossInfoScRsp : BasePacket +{ + public PacketGetCrossInfoScRsp() : base(CmdIds.GetCrossInfoScRsp) + { + var proto = new GetCrossInfoScRsp + { + FightGameMode = FightGameMode.Match3, + RoomId = 0 + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Match/PacketMatchResultScNotify.cs b/GameServer/Server/Packet/Send/Match/PacketMatchResultScNotify.cs new file mode 100644 index 00000000..86202409 --- /dev/null +++ b/GameServer/Server/Packet/Send/Match/PacketMatchResultScNotify.cs @@ -0,0 +1,18 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Match; + +public class PacketMatchResultScNotify : BasePacket +{ + public PacketMatchResultScNotify(MatchThreeGameInstance instance) : base(CmdIds.MatchResultScNotify) + { + var proto = new MatchResultScNotify + { + MemberInfo = { instance.Members.Select(x => x.ToProto()) } + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Match/PacketStartMatchScRsp.cs b/GameServer/Server/Packet/Send/Match/PacketStartMatchScRsp.cs new file mode 100644 index 00000000..896f48dc --- /dev/null +++ b/GameServer/Server/Packet/Send/Match/PacketStartMatchScRsp.cs @@ -0,0 +1,18 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree.Member; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Match; + +public class PacketStartMatchScRsp : BasePacket +{ + public PacketStartMatchScRsp(MatchThreeMemberInstance instance) : base(CmdIds.StartMatchScRsp) + { + var proto = new StartMatchScRsp + { + LobbyExtraInfo = instance.ToExtraInfo() + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/MatchThreeModule/PacketMatchThreeGetDataScRsp.cs b/GameServer/Server/Packet/Send/MatchThreeModule/PacketMatchThreeGetDataScRsp.cs new file mode 100644 index 00000000..22f78b3f --- /dev/null +++ b/GameServer/Server/Packet/Send/MatchThreeModule/PacketMatchThreeGetDataScRsp.cs @@ -0,0 +1,18 @@ +using EggLink.DanhengServer.GameServer.Game.Player; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.MatchThreeModule; + +public class PacketMatchThreeGetDataScRsp : BasePacket +{ + public PacketMatchThreeGetDataScRsp(PlayerInstance player) : base(CmdIds.MatchThreeGetDataScRsp) + { + var proto = new MatchThreeGetDataScRsp + { + MatchThreeData = player.MatchThreeManager!.ToProto() + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/MatchThreeModule/PacketMatchThreeLevelEndScRsp.cs b/GameServer/Server/Packet/Send/MatchThreeModule/PacketMatchThreeLevelEndScRsp.cs new file mode 100644 index 00000000..682bf381 --- /dev/null +++ b/GameServer/Server/Packet/Send/MatchThreeModule/PacketMatchThreeLevelEndScRsp.cs @@ -0,0 +1,18 @@ +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.MatchThreeModule; + +public class PacketMatchThreeLevelEndScRsp : BasePacket +{ + public PacketMatchThreeLevelEndScRsp(uint levelId, uint mode) : base(CmdIds.MatchThreeLevelEndScRsp) + { + var proto = new MatchThreeLevelEndScRsp + { + LevelId = levelId, + ModeId = mode + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Multiplayer/PacketMultiplayerFightGameStartScNotify.cs b/GameServer/Server/Packet/Send/Multiplayer/PacketMultiplayerFightGameStartScNotify.cs new file mode 100644 index 00000000..09bdf53a --- /dev/null +++ b/GameServer/Server/Packet/Send/Multiplayer/PacketMultiplayerFightGameStartScNotify.cs @@ -0,0 +1,19 @@ +using EggLink.DanhengServer.GameServer.Game.MatchThree; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Multiplayer; + +public class PacketMultiplayerFightGameStartScNotify : BasePacket +{ + public PacketMultiplayerFightGameStartScNotify(MatchThreeGameInstance game) : base(CmdIds.MultiplayerFightGameStartScNotify) + { + var proto = new MultiplayerFightGameStartScNotify + { + MemberInfo = { game.Members.Select(x => x.ToProto()) }, + FightGameInfo = game.ToBasicInfo() + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Multiplayer/PacketMultiplayerGetFightGateScRsp.cs b/GameServer/Server/Packet/Send/Multiplayer/PacketMultiplayerGetFightGateScRsp.cs new file mode 100644 index 00000000..768aa9f0 --- /dev/null +++ b/GameServer/Server/Packet/Send/Multiplayer/PacketMultiplayerGetFightGateScRsp.cs @@ -0,0 +1,19 @@ +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; +using EggLink.DanhengServer.Util; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Multiplayer; + +public class PacketMultiplayerGetFightGateScRsp : BasePacket +{ + public PacketMultiplayerGetFightGateScRsp() : base(CmdIds.MultiplayerGetFightGateScRsp) + { + var proto = new MultiplayerGetFightGateScRsp + { + Ip = ConfigManager.Config.GameServer.PublicAddress, + Port = ConfigManager.Config.GameServer.Port + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/Proto/ANBDAIBNOAI.cs b/Proto/ANBDAIBNOAI.cs index cd28d845..3b723108 100644 --- a/Proto/ANBDAIBNOAI.cs +++ b/Proto/ANBDAIBNOAI.cs @@ -1,6 +1,10 @@ // // Generated by the protocol buffer compiler. DO NOT EDIT! +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs // source: ANBDAIBNOAI.proto +======== +// source: PlayerExtraInfo.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs // #pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code @@ -11,16 +15,25 @@ using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; namespace EggLink.DanhengServer.Proto { +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs /// Holder for reflection information generated from ANBDAIBNOAI.proto public static partial class ANBDAIBNOAIReflection { #region Descriptor /// File descriptor for ANBDAIBNOAI.proto +======== + /// Holder for reflection information generated from PlayerExtraInfo.proto + public static partial class PlayerExtraInfoReflection { + + #region Descriptor + /// File descriptor for PlayerExtraInfo.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs public static pbr::FileDescriptor Descriptor { get { return descriptor; } } private static pbr::FileDescriptor descriptor; +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs static ANBDAIBNOAIReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( @@ -32,6 +45,20 @@ namespace EggLink.DanhengServer.Proto { new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.FMNOMCJDCIIReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ANBDAIBNOAI), global::EggLink.DanhengServer.Proto.ANBDAIBNOAI.Parser, new[]{ "PPMHFDBEFCN", "PAGMFIDOLPD", "FCDGJFMEKJL" }, null, null, null, null) +======== + static PlayerExtraInfoReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChVQbGF5ZXJFeHRyYUluZm8ucHJvdG8aEkdhbWVCaXJkSW5mby5wcm90byJj", + "Cg9QbGF5ZXJFeHRyYUluZm8SEwoLREJLRUZMSUxPRUsYASADKAkSEwoLaXNf", + "aW5fbWF0Y2gYAiABKAgSJgoOZ2FtZV9iaXJkX2luZm8Y6QcgASgLMg0uR2Ft", + "ZUJpcmRJbmZvQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnBy", + "b3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.GameBirdInfoReflection.Descriptor, }, + new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PlayerExtraInfo), global::EggLink.DanhengServer.Proto.PlayerExtraInfo.Parser, new[]{ "DBKEFLILOEK", "IsInMatch", "GameBirdInfo" }, null, null, null, null) +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs })); } #endregion @@ -39,21 +66,37 @@ namespace EggLink.DanhengServer.Proto { } #region Messages [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs public sealed partial class ANBDAIBNOAI : pb::IMessage +======== + public sealed partial class PlayerExtraInfo : pb::IMessage +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage #endif { +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new ANBDAIBNOAI()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } +======== + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PlayerExtraInfo()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs get { return global::EggLink.DanhengServer.Proto.ANBDAIBNOAIReflection.Descriptor.MessageTypes[0]; } +======== + get { return global::EggLink.DanhengServer.Proto.PlayerExtraInfoReflection.Descriptor.MessageTypes[0]; } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -64,7 +107,11 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs public ANBDAIBNOAI() { +======== + public PlayerExtraInfo() { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs OnConstruction(); } @@ -72,17 +119,29 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs public ANBDAIBNOAI(ANBDAIBNOAI other) : this() { pPMHFDBEFCN_ = other.pPMHFDBEFCN_; pAGMFIDOLPD_ = other.pAGMFIDOLPD_; fCDGJFMEKJL_ = other.fCDGJFMEKJL_ != null ? other.fCDGJFMEKJL_.Clone() : null; +======== + public PlayerExtraInfo(PlayerExtraInfo other) : this() { + dBKEFLILOEK_ = other.dBKEFLILOEK_.Clone(); + isInMatch_ = other.isInMatch_; + gameBirdInfo_ = other.gameBirdInfo_ != null ? other.gameBirdInfo_.Clone() : null; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs public ANBDAIBNOAI Clone() { return new ANBDAIBNOAI(this); +======== + public PlayerExtraInfo Clone() { + return new PlayerExtraInfo(this); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs } /// Field number for the "PPMHFDBEFCN" field. @@ -90,6 +149,7 @@ namespace EggLink.DanhengServer.Proto { private uint pPMHFDBEFCN_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs public uint PPMHFDBEFCN { get { return pPMHFDBEFCN_; } set { @@ -118,27 +178,68 @@ namespace EggLink.DanhengServer.Proto { get { return fCDGJFMEKJL_; } set { fCDGJFMEKJL_ = value; +======== + public pbc::RepeatedField DBKEFLILOEK { + get { return dBKEFLILOEK_; } + } + + /// Field number for the "is_in_match" field. + public const int IsInMatchFieldNumber = 2; + private bool isInMatch_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool IsInMatch { + get { return isInMatch_; } + set { + isInMatch_ = value; + } + } + + /// Field number for the "game_bird_info" field. + public const int GameBirdInfoFieldNumber = 1001; + private global::EggLink.DanhengServer.Proto.GameBirdInfo gameBirdInfo_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public global::EggLink.DanhengServer.Proto.GameBirdInfo GameBirdInfo { + get { return gameBirdInfo_; } + set { + gameBirdInfo_ = value; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs return Equals(other as ANBDAIBNOAI); +======== + return Equals(other as PlayerExtraInfo); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs public bool Equals(ANBDAIBNOAI other) { +======== + public bool Equals(PlayerExtraInfo other) { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs if (ReferenceEquals(other, null)) { return false; } if (ReferenceEquals(other, this)) { return true; } +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs if (PPMHFDBEFCN != other.PPMHFDBEFCN) return false; if (PAGMFIDOLPD != other.PAGMFIDOLPD) return false; if (!object.Equals(FCDGJFMEKJL, other.FCDGJFMEKJL)) return false; +======== + if(!dBKEFLILOEK_.Equals(other.dBKEFLILOEK_)) return false; + if (IsInMatch != other.IsInMatch) return false; + if (!object.Equals(GameBirdInfo, other.GameBirdInfo)) return false; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs return Equals(_unknownFields, other._unknownFields); } @@ -146,9 +247,15 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs if (PPMHFDBEFCN != 0) hash ^= PPMHFDBEFCN.GetHashCode(); if (PAGMFIDOLPD != false) hash ^= PAGMFIDOLPD.GetHashCode(); if (fCDGJFMEKJL_ != null) hash ^= FCDGJFMEKJL.GetHashCode(); +======== + hash ^= dBKEFLILOEK_.GetHashCode(); + if (IsInMatch != false) hash ^= IsInMatch.GetHashCode(); + if (gameBirdInfo_ != null) hash ^= GameBirdInfo.GetHashCode(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -167,6 +274,7 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs if (PPMHFDBEFCN != 0) { output.WriteRawTag(8); output.WriteUInt32(PPMHFDBEFCN); @@ -178,6 +286,16 @@ namespace EggLink.DanhengServer.Proto { if (fCDGJFMEKJL_ != null) { output.WriteRawTag(26); output.WriteMessage(FCDGJFMEKJL); +======== + dBKEFLILOEK_.WriteTo(output, _repeated_dBKEFLILOEK_codec); + if (IsInMatch != false) { + output.WriteRawTag(16); + output.WriteBool(IsInMatch); + } + if (gameBirdInfo_ != null) { + output.WriteRawTag(202, 62); + output.WriteMessage(GameBirdInfo); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -189,6 +307,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs if (PPMHFDBEFCN != 0) { output.WriteRawTag(8); output.WriteUInt32(PPMHFDBEFCN); @@ -200,6 +319,16 @@ namespace EggLink.DanhengServer.Proto { if (fCDGJFMEKJL_ != null) { output.WriteRawTag(26); output.WriteMessage(FCDGJFMEKJL); +======== + dBKEFLILOEK_.WriteTo(ref output, _repeated_dBKEFLILOEK_codec); + if (IsInMatch != false) { + output.WriteRawTag(16); + output.WriteBool(IsInMatch); + } + if (gameBirdInfo_ != null) { + output.WriteRawTag(202, 62); + output.WriteMessage(GameBirdInfo); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -211,6 +340,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs if (PPMHFDBEFCN != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PPMHFDBEFCN); } @@ -219,6 +349,14 @@ namespace EggLink.DanhengServer.Proto { } if (fCDGJFMEKJL_ != null) { size += 1 + pb::CodedOutputStream.ComputeMessageSize(FCDGJFMEKJL); +======== + size += dBKEFLILOEK_.CalculateSize(_repeated_dBKEFLILOEK_codec); + if (IsInMatch != false) { + size += 1 + 1; + } + if (gameBirdInfo_ != null) { + size += 2 + pb::CodedOutputStream.ComputeMessageSize(GameBirdInfo); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -228,6 +366,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs public void MergeFrom(ANBDAIBNOAI other) { if (other == null) { return; @@ -243,6 +382,21 @@ namespace EggLink.DanhengServer.Proto { FCDGJFMEKJL = new global::EggLink.DanhengServer.Proto.FMNOMCJDCII(); } FCDGJFMEKJL.MergeFrom(other.FCDGJFMEKJL); +======== + public void MergeFrom(PlayerExtraInfo other) { + if (other == null) { + return; + } + dBKEFLILOEK_.Add(other.dBKEFLILOEK_); + if (other.IsInMatch != false) { + IsInMatch = other.IsInMatch; + } + if (other.gameBirdInfo_ != null) { + if (gameBirdInfo_ == null) { + GameBirdInfo = new global::EggLink.DanhengServer.Proto.GameBirdInfo(); + } + GameBirdInfo.MergeFrom(other.GameBirdInfo); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -264,6 +418,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 16: { +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs PAGMFIDOLPD = input.ReadBool(); break; } @@ -272,6 +427,16 @@ namespace EggLink.DanhengServer.Proto { FCDGJFMEKJL = new global::EggLink.DanhengServer.Proto.FMNOMCJDCII(); } input.ReadMessage(FCDGJFMEKJL); +======== + IsInMatch = input.ReadBool(); + break; + } + case 8010: { + if (gameBirdInfo_ == null) { + GameBirdInfo = new global::EggLink.DanhengServer.Proto.GameBirdInfo(); + } + input.ReadMessage(GameBirdInfo); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs break; } } @@ -294,6 +459,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 16: { +<<<<<<<< HEAD:Proto/ANBDAIBNOAI.cs PAGMFIDOLPD = input.ReadBool(); break; } @@ -302,6 +468,16 @@ namespace EggLink.DanhengServer.Proto { FCDGJFMEKJL = new global::EggLink.DanhengServer.Proto.FMNOMCJDCII(); } input.ReadMessage(FCDGJFMEKJL); +======== + IsInMatch = input.ReadBool(); + break; + } + case 8010: { + if (gameBirdInfo_ == null) { + GameBirdInfo = new global::EggLink.DanhengServer.Proto.GameBirdInfo(); + } + input.ReadMessage(GameBirdInfo); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/PlayerExtraInfo.cs break; } } diff --git a/Proto/BattleRogueMagicInfo.cs b/Proto/BattleRogueMagicInfo.cs index fc910c4f..7f54ae5e 100644 --- a/Proto/BattleRogueMagicInfo.cs +++ b/Proto/BattleRogueMagicInfo.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static BattleRogueMagicInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChpCYXR0bGVSb2d1ZU1hZ2ljSW5mby5wcm90bxogQmF0dGxlUm9ndWVNYWdp", - "Y0RldGFpbEluZm8ucHJvdG8aIkJhdHRsZVJvZ3VlTWFnaWNNb2RpZmllcklu", + "ChpCYXR0bGVSb2d1ZU1hZ2ljSW5mby5wcm90bxoiQmF0dGxlUm9ndWVNYWdp", + "Y01vZGlmaWVySW5mby5wcm90bxogQmF0dGxlUm9ndWVNYWdpY0RldGFpbElu", "Zm8ucHJvdG8igQEKFEJhdHRsZVJvZ3VlTWFnaWNJbmZvEjcKEG1vZGlmaWVy", "X2NvbnRlbnQYASABKAsyHS5CYXR0bGVSb2d1ZU1hZ2ljTW9kaWZpZXJJbmZv", "EjAKC2RldGFpbF9pbmZvGAIgASgLMhsuQmF0dGxlUm9ndWVNYWdpY0RldGFp", "bEluZm9CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.BattleRogueMagicDetailInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleRogueMagicModifierInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.BattleRogueMagicModifierInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleRogueMagicDetailInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.BattleRogueMagicInfo), global::EggLink.DanhengServer.Proto.BattleRogueMagicInfo.Parser, new[]{ "ModifierContent", "DetailInfo" }, null, null, null, null) })); diff --git a/Proto/BattleRogueMagicItemInfo.cs b/Proto/BattleRogueMagicItemInfo.cs index 0cb34e41..e99afd67 100644 --- a/Proto/BattleRogueMagicItemInfo.cs +++ b/Proto/BattleRogueMagicItemInfo.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static BattleRogueMagicItemInfoReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch5CYXR0bGVSb2d1ZU1hZ2ljSXRlbUluZm8ucHJvdG8aIEJhdHRsZVJvZ3Vl", - "TWFnaWNSb3VuZENvdW50LnByb3RvGh1CYXR0bGVSb2d1ZU1hZ2ljU2NlcHRl", - "ci5wcm90byKKAQoYQmF0dGxlUm9ndWVNYWdpY0l0ZW1JbmZvEjcKEmJhdHRs", + "Ch5CYXR0bGVSb2d1ZU1hZ2ljSXRlbUluZm8ucHJvdG8aHUJhdHRsZVJvZ3Vl", + "TWFnaWNTY2VwdGVyLnByb3RvGiBCYXR0bGVSb2d1ZU1hZ2ljUm91bmRDb3Vu", + "dC5wcm90byKKAQoYQmF0dGxlUm9ndWVNYWdpY0l0ZW1JbmZvEjcKEmJhdHRs", "ZV9yb3VuZF9jb3VudBgBIAEoCzIbLkJhdHRsZVJvZ3VlTWFnaWNSb3VuZENv", "dW50EjUKE2JhdHRsZV9zY2VwdGVyX2xpc3QYAiADKAsyGC5CYXR0bGVSb2d1", "ZU1hZ2ljU2NlcHRlckIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3Rv", "YgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.BattleRogueMagicRoundCountReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleRogueMagicScepterReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.BattleRogueMagicScepterReflection.Descriptor, global::EggLink.DanhengServer.Proto.BattleRogueMagicRoundCountReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.BattleRogueMagicItemInfo), global::EggLink.DanhengServer.Proto.BattleRogueMagicItemInfo.Parser, new[]{ "BattleRoundCount", "BattleScepterList" }, null, null, null, null) })); diff --git a/Proto/ChessRogueLayerAccountInfoNotify.cs b/Proto/ChessRogueLayerAccountInfoNotify.cs index 7b226246..54b3d3b3 100644 --- a/Proto/ChessRogueLayerAccountInfoNotify.cs +++ b/Proto/ChessRogueLayerAccountInfoNotify.cs @@ -24,8 +24,8 @@ namespace EggLink.DanhengServer.Proto { static ChessRogueLayerAccountInfoNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiZDaGVzc1JvZ3VlTGF5ZXJBY2NvdW50SW5mb05vdGlmeS5wcm90bxoZQ2hl", - "c3NSb2d1ZUxldmVsSW5mby5wcm90bxoaQ2hlc3NSb2d1ZUZpbmlzaEluZm8u", + "CiZDaGVzc1JvZ3VlTGF5ZXJBY2NvdW50SW5mb05vdGlmeS5wcm90bxoaQ2hl", + "c3NSb2d1ZUZpbmlzaEluZm8ucHJvdG8aGUNoZXNzUm9ndWVMZXZlbEluZm8u", "cHJvdG8iuQEKIENoZXNzUm9ndWVMYXllckFjY291bnRJbmZvTm90aWZ5EhAK", "CGxheWVyX2lkGAIgASgNEhgKEGRpZmZpY3VsdHlfbGV2ZWwYCCABKA0SEwoL", "TEhQREJBTUhCS0IYDSADKA0SKAoKbGV2ZWxfaW5mbxgEIAEoCzIULkNoZXNz", @@ -33,7 +33,7 @@ namespace EggLink.DanhengServer.Proto { "Z3VlRmluaXNoSW5mb0IeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3Rv", "YgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessRogueLevelInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueFinishInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChessRogueFinishInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChessRogueLevelInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ChessRogueLayerAccountInfoNotify), global::EggLink.DanhengServer.Proto.ChessRogueLayerAccountInfoNotify.Parser, new[]{ "LayerId", "DifficultyLevel", "LHPDBAMHBKB", "LevelInfo", "FinishInfo" }, null, null, null, null) })); diff --git a/Proto/ELAMGBPKDFA.cs b/Proto/ELAMGBPKDFA.cs deleted file mode 100644 index 4a465280..00000000 --- a/Proto/ELAMGBPKDFA.cs +++ /dev/null @@ -1,610 +0,0 @@ -// -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: ELAMGBPKDFA.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 ELAMGBPKDFA.proto - public static partial class ELAMGBPKDFAReflection { - - #region Descriptor - /// File descriptor for ELAMGBPKDFA.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static ELAMGBPKDFAReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChFFTEFNR0JQS0RGQS5wcm90bxoRRU9GT0hBQ01LRVAucHJvdG8aEU1MQktB", - "REpFQk5BLnByb3RvIogCCgtFTEFNR0JQS0RGQRITCgtOTVBCTElCTUlBTxgC", - "IAEoDRITCgtBSUlISEZKQk1IRBgFIAEoDRIOCgZjdXJfaHAYCCABKA0SEwoL", - "UEhDQklDR0VQTEUYAyABKA0SEwoLZW5lcmd5X2luZm8YCyABKA0SIQoLR0RH", - "TkVBSENMQkUYDCABKA4yDC5FT0ZPSEFDTUtFUBIhCgtKT0tFSUdGQ0RPSRgO", - "IAEoCzIMLk1MQktBREpFQk5BEhMKC0VDUEJNQUNKSUNPGAYgASgNEhMKC0FO", - "T0NGQUtBTExQGAQgAygNEhAKCHNjb3JlX2lkGA0gASgNEhMKC0JCQk9BSUFQ", - "T0NHGAkgASgNQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnBy", - "b3RvMw==")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.EOFOHACMKEPReflection.Descriptor, global::EggLink.DanhengServer.Proto.MLBKADJEBNAReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.ELAMGBPKDFA), global::EggLink.DanhengServer.Proto.ELAMGBPKDFA.Parser, new[]{ "NMPBLIBMIAO", "AIIHHFJBMHD", "CurHp", "PHCBICGEPLE", "EnergyInfo", "GDGNEAHCLBE", "JOKEIGFCDOI", "ECPBMACJICO", "ANOCFAKALLP", "ScoreId", "BBBOAIAPOCG" }, null, null, null, null) - })); - } - #endregion - - } - #region Messages - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] - public sealed partial class ELAMGBPKDFA : pb::IMessage - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - , pb::IBufferMessage - #endif - { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new ELAMGBPKDFA()); - 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.ELAMGBPKDFAReflection.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 ELAMGBPKDFA() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public ELAMGBPKDFA(ELAMGBPKDFA other) : this() { - nMPBLIBMIAO_ = other.nMPBLIBMIAO_; - aIIHHFJBMHD_ = other.aIIHHFJBMHD_; - curHp_ = other.curHp_; - pHCBICGEPLE_ = other.pHCBICGEPLE_; - energyInfo_ = other.energyInfo_; - gDGNEAHCLBE_ = other.gDGNEAHCLBE_; - jOKEIGFCDOI_ = other.jOKEIGFCDOI_ != null ? other.jOKEIGFCDOI_.Clone() : null; - eCPBMACJICO_ = other.eCPBMACJICO_; - aNOCFAKALLP_ = other.aNOCFAKALLP_.Clone(); - scoreId_ = other.scoreId_; - bBBOAIAPOCG_ = other.bBBOAIAPOCG_; - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public ELAMGBPKDFA Clone() { - return new ELAMGBPKDFA(this); - } - - /// Field number for the "NMPBLIBMIAO" field. - public const int NMPBLIBMIAOFieldNumber = 2; - private uint nMPBLIBMIAO_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint NMPBLIBMIAO { - get { return nMPBLIBMIAO_; } - set { - nMPBLIBMIAO_ = value; - } - } - - /// Field number for the "AIIHHFJBMHD" field. - public const int AIIHHFJBMHDFieldNumber = 5; - private uint aIIHHFJBMHD_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint AIIHHFJBMHD { - get { return aIIHHFJBMHD_; } - set { - aIIHHFJBMHD_ = value; - } - } - - /// Field number for the "cur_hp" field. - public const int CurHpFieldNumber = 8; - private uint curHp_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint CurHp { - get { return curHp_; } - set { - curHp_ = value; - } - } - - /// Field number for the "PHCBICGEPLE" field. - public const int PHCBICGEPLEFieldNumber = 3; - private uint pHCBICGEPLE_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint PHCBICGEPLE { - get { return pHCBICGEPLE_; } - set { - pHCBICGEPLE_ = value; - } - } - - /// Field number for the "energy_info" field. - public const int EnergyInfoFieldNumber = 11; - private uint energyInfo_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint EnergyInfo { - get { return energyInfo_; } - set { - energyInfo_ = value; - } - } - - /// Field number for the "GDGNEAHCLBE" field. - public const int GDGNEAHCLBEFieldNumber = 12; - private global::EggLink.DanhengServer.Proto.EOFOHACMKEP gDGNEAHCLBE_ = global::EggLink.DanhengServer.Proto.EOFOHACMKEP.Match3PlayerStateAlive; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::EggLink.DanhengServer.Proto.EOFOHACMKEP GDGNEAHCLBE { - get { return gDGNEAHCLBE_; } - set { - gDGNEAHCLBE_ = value; - } - } - - /// Field number for the "JOKEIGFCDOI" field. - public const int JOKEIGFCDOIFieldNumber = 14; - private global::EggLink.DanhengServer.Proto.MLBKADJEBNA jOKEIGFCDOI_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::EggLink.DanhengServer.Proto.MLBKADJEBNA JOKEIGFCDOI { - get { return jOKEIGFCDOI_; } - set { - jOKEIGFCDOI_ = value; - } - } - - /// Field number for the "ECPBMACJICO" field. - public const int ECPBMACJICOFieldNumber = 6; - private uint eCPBMACJICO_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint ECPBMACJICO { - get { return eCPBMACJICO_; } - set { - eCPBMACJICO_ = value; - } - } - - /// Field number for the "ANOCFAKALLP" field. - public const int ANOCFAKALLPFieldNumber = 4; - private static readonly pb::FieldCodec _repeated_aNOCFAKALLP_codec - = pb::FieldCodec.ForUInt32(34); - private readonly pbc::RepeatedField aNOCFAKALLP_ = new pbc::RepeatedField(); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField ANOCFAKALLP { - get { return aNOCFAKALLP_; } - } - - /// Field number for the "score_id" field. - public const int ScoreIdFieldNumber = 13; - private uint scoreId_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint ScoreId { - get { return scoreId_; } - set { - scoreId_ = value; - } - } - - /// Field number for the "BBBOAIAPOCG" field. - public const int BBBOAIAPOCGFieldNumber = 9; - private uint bBBOAIAPOCG_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint BBBOAIAPOCG { - get { return bBBOAIAPOCG_; } - set { - bBBOAIAPOCG_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override bool Equals(object other) { - return Equals(other as ELAMGBPKDFA); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(ELAMGBPKDFA other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (NMPBLIBMIAO != other.NMPBLIBMIAO) return false; - if (AIIHHFJBMHD != other.AIIHHFJBMHD) return false; - if (CurHp != other.CurHp) return false; - if (PHCBICGEPLE != other.PHCBICGEPLE) return false; - if (EnergyInfo != other.EnergyInfo) return false; - if (GDGNEAHCLBE != other.GDGNEAHCLBE) return false; - if (!object.Equals(JOKEIGFCDOI, other.JOKEIGFCDOI)) return false; - if (ECPBMACJICO != other.ECPBMACJICO) return false; - if(!aNOCFAKALLP_.Equals(other.aNOCFAKALLP_)) return false; - if (ScoreId != other.ScoreId) return false; - if (BBBOAIAPOCG != other.BBBOAIAPOCG) 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 (NMPBLIBMIAO != 0) hash ^= NMPBLIBMIAO.GetHashCode(); - if (AIIHHFJBMHD != 0) hash ^= AIIHHFJBMHD.GetHashCode(); - if (CurHp != 0) hash ^= CurHp.GetHashCode(); - if (PHCBICGEPLE != 0) hash ^= PHCBICGEPLE.GetHashCode(); - if (EnergyInfo != 0) hash ^= EnergyInfo.GetHashCode(); - if (GDGNEAHCLBE != global::EggLink.DanhengServer.Proto.EOFOHACMKEP.Match3PlayerStateAlive) hash ^= GDGNEAHCLBE.GetHashCode(); - if (jOKEIGFCDOI_ != null) hash ^= JOKEIGFCDOI.GetHashCode(); - if (ECPBMACJICO != 0) hash ^= ECPBMACJICO.GetHashCode(); - hash ^= aNOCFAKALLP_.GetHashCode(); - if (ScoreId != 0) hash ^= ScoreId.GetHashCode(); - if (BBBOAIAPOCG != 0) hash ^= BBBOAIAPOCG.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 (NMPBLIBMIAO != 0) { - output.WriteRawTag(16); - output.WriteUInt32(NMPBLIBMIAO); - } - if (PHCBICGEPLE != 0) { - output.WriteRawTag(24); - output.WriteUInt32(PHCBICGEPLE); - } - aNOCFAKALLP_.WriteTo(output, _repeated_aNOCFAKALLP_codec); - if (AIIHHFJBMHD != 0) { - output.WriteRawTag(40); - output.WriteUInt32(AIIHHFJBMHD); - } - if (ECPBMACJICO != 0) { - output.WriteRawTag(48); - output.WriteUInt32(ECPBMACJICO); - } - if (CurHp != 0) { - output.WriteRawTag(64); - output.WriteUInt32(CurHp); - } - if (BBBOAIAPOCG != 0) { - output.WriteRawTag(72); - output.WriteUInt32(BBBOAIAPOCG); - } - if (EnergyInfo != 0) { - output.WriteRawTag(88); - output.WriteUInt32(EnergyInfo); - } - if (GDGNEAHCLBE != global::EggLink.DanhengServer.Proto.EOFOHACMKEP.Match3PlayerStateAlive) { - output.WriteRawTag(96); - output.WriteEnum((int) GDGNEAHCLBE); - } - if (ScoreId != 0) { - output.WriteRawTag(104); - output.WriteUInt32(ScoreId); - } - if (jOKEIGFCDOI_ != null) { - output.WriteRawTag(114); - output.WriteMessage(JOKEIGFCDOI); - } - 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 (NMPBLIBMIAO != 0) { - output.WriteRawTag(16); - output.WriteUInt32(NMPBLIBMIAO); - } - if (PHCBICGEPLE != 0) { - output.WriteRawTag(24); - output.WriteUInt32(PHCBICGEPLE); - } - aNOCFAKALLP_.WriteTo(ref output, _repeated_aNOCFAKALLP_codec); - if (AIIHHFJBMHD != 0) { - output.WriteRawTag(40); - output.WriteUInt32(AIIHHFJBMHD); - } - if (ECPBMACJICO != 0) { - output.WriteRawTag(48); - output.WriteUInt32(ECPBMACJICO); - } - if (CurHp != 0) { - output.WriteRawTag(64); - output.WriteUInt32(CurHp); - } - if (BBBOAIAPOCG != 0) { - output.WriteRawTag(72); - output.WriteUInt32(BBBOAIAPOCG); - } - if (EnergyInfo != 0) { - output.WriteRawTag(88); - output.WriteUInt32(EnergyInfo); - } - if (GDGNEAHCLBE != global::EggLink.DanhengServer.Proto.EOFOHACMKEP.Match3PlayerStateAlive) { - output.WriteRawTag(96); - output.WriteEnum((int) GDGNEAHCLBE); - } - if (ScoreId != 0) { - output.WriteRawTag(104); - output.WriteUInt32(ScoreId); - } - if (jOKEIGFCDOI_ != null) { - output.WriteRawTag(114); - output.WriteMessage(JOKEIGFCDOI); - } - 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 (NMPBLIBMIAO != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(NMPBLIBMIAO); - } - if (AIIHHFJBMHD != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(AIIHHFJBMHD); - } - if (CurHp != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurHp); - } - if (PHCBICGEPLE != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PHCBICGEPLE); - } - if (EnergyInfo != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(EnergyInfo); - } - if (GDGNEAHCLBE != global::EggLink.DanhengServer.Proto.EOFOHACMKEP.Match3PlayerStateAlive) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) GDGNEAHCLBE); - } - if (jOKEIGFCDOI_ != null) { - size += 1 + pb::CodedOutputStream.ComputeMessageSize(JOKEIGFCDOI); - } - if (ECPBMACJICO != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ECPBMACJICO); - } - size += aNOCFAKALLP_.CalculateSize(_repeated_aNOCFAKALLP_codec); - if (ScoreId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ScoreId); - } - if (BBBOAIAPOCG != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(BBBOAIAPOCG); - } - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(ELAMGBPKDFA other) { - if (other == null) { - return; - } - if (other.NMPBLIBMIAO != 0) { - NMPBLIBMIAO = other.NMPBLIBMIAO; - } - if (other.AIIHHFJBMHD != 0) { - AIIHHFJBMHD = other.AIIHHFJBMHD; - } - if (other.CurHp != 0) { - CurHp = other.CurHp; - } - if (other.PHCBICGEPLE != 0) { - PHCBICGEPLE = other.PHCBICGEPLE; - } - if (other.EnergyInfo != 0) { - EnergyInfo = other.EnergyInfo; - } - if (other.GDGNEAHCLBE != global::EggLink.DanhengServer.Proto.EOFOHACMKEP.Match3PlayerStateAlive) { - GDGNEAHCLBE = other.GDGNEAHCLBE; - } - if (other.jOKEIGFCDOI_ != null) { - if (jOKEIGFCDOI_ == null) { - JOKEIGFCDOI = new global::EggLink.DanhengServer.Proto.MLBKADJEBNA(); - } - JOKEIGFCDOI.MergeFrom(other.JOKEIGFCDOI); - } - if (other.ECPBMACJICO != 0) { - ECPBMACJICO = other.ECPBMACJICO; - } - aNOCFAKALLP_.Add(other.aNOCFAKALLP_); - if (other.ScoreId != 0) { - ScoreId = other.ScoreId; - } - if (other.BBBOAIAPOCG != 0) { - BBBOAIAPOCG = other.BBBOAIAPOCG; - } - _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 16: { - NMPBLIBMIAO = input.ReadUInt32(); - break; - } - case 24: { - PHCBICGEPLE = input.ReadUInt32(); - break; - } - case 34: - case 32: { - aNOCFAKALLP_.AddEntriesFrom(input, _repeated_aNOCFAKALLP_codec); - break; - } - case 40: { - AIIHHFJBMHD = input.ReadUInt32(); - break; - } - case 48: { - ECPBMACJICO = input.ReadUInt32(); - break; - } - case 64: { - CurHp = input.ReadUInt32(); - break; - } - case 72: { - BBBOAIAPOCG = input.ReadUInt32(); - break; - } - case 88: { - EnergyInfo = input.ReadUInt32(); - break; - } - case 96: { - GDGNEAHCLBE = (global::EggLink.DanhengServer.Proto.EOFOHACMKEP) input.ReadEnum(); - break; - } - case 104: { - ScoreId = input.ReadUInt32(); - break; - } - case 114: { - if (jOKEIGFCDOI_ == null) { - JOKEIGFCDOI = new global::EggLink.DanhengServer.Proto.MLBKADJEBNA(); - } - input.ReadMessage(JOKEIGFCDOI); - 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 16: { - NMPBLIBMIAO = input.ReadUInt32(); - break; - } - case 24: { - PHCBICGEPLE = input.ReadUInt32(); - break; - } - case 34: - case 32: { - aNOCFAKALLP_.AddEntriesFrom(ref input, _repeated_aNOCFAKALLP_codec); - break; - } - case 40: { - AIIHHFJBMHD = input.ReadUInt32(); - break; - } - case 48: { - ECPBMACJICO = input.ReadUInt32(); - break; - } - case 64: { - CurHp = input.ReadUInt32(); - break; - } - case 72: { - BBBOAIAPOCG = input.ReadUInt32(); - break; - } - case 88: { - EnergyInfo = input.ReadUInt32(); - break; - } - case 96: { - GDGNEAHCLBE = (global::EggLink.DanhengServer.Proto.EOFOHACMKEP) input.ReadEnum(); - break; - } - case 104: { - ScoreId = input.ReadUInt32(); - break; - } - case 114: { - if (jOKEIGFCDOI_ == null) { - JOKEIGFCDOI = new global::EggLink.DanhengServer.Proto.MLBKADJEBNA(); - } - input.ReadMessage(JOKEIGFCDOI); - break; - } - } - } - } - #endif - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Proto/EOFOHACMKEP.cs b/Proto/EOFOHACMKEP.cs deleted file mode 100644 index b52e4e5c..00000000 --- a/Proto/EOFOHACMKEP.cs +++ /dev/null @@ -1,51 +0,0 @@ -// -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: EOFOHACMKEP.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 EOFOHACMKEP.proto - public static partial class EOFOHACMKEPReflection { - - #region Descriptor - /// File descriptor for EOFOHACMKEP.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static EOFOHACMKEPReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChFFT0ZPSEFDTUtFUC5wcm90byqIAQoLRU9GT0hBQ01LRVASHQoZTUFUQ0gz", - "X1BMQVlFUl9TVEFURV9BTElWRRAAEh0KGU1BVENIM19QTEFZRVJfU1RBVEVf", - "RFlJTkcQARIcChhNQVRDSDNfUExBWUVSX1NUQVRFX0RFQUQQAhIdChlNQVRD", - "SDNfUExBWUVSX1NUQVRFX0xFQVZFEANCHqoCG0VnZ0xpbmsuRGFuaGVuZ1Nl", - "cnZlci5Qcm90b2IGcHJvdG8z")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(new[] {typeof(global::EggLink.DanhengServer.Proto.EOFOHACMKEP), }, null, null)); - } - #endregion - - } - #region Enums - public enum EOFOHACMKEP { - [pbr::OriginalName("MATCH3_PLAYER_STATE_ALIVE")] Match3PlayerStateAlive = 0, - [pbr::OriginalName("MATCH3_PLAYER_STATE_DYING")] Match3PlayerStateDying = 1, - [pbr::OriginalName("MATCH3_PLAYER_STATE_DEAD")] Match3PlayerStateDead = 2, - [pbr::OriginalName("MATCH3_PLAYER_STATE_LEAVE")] Match3PlayerStateLeave = 3, - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Proto/EnterRogueEndlessActivityStageScRsp.cs b/Proto/EnterRogueEndlessActivityStageScRsp.cs index 83e5ba28..c74a253e 100644 --- a/Proto/EnterRogueEndlessActivityStageScRsp.cs +++ b/Proto/EnterRogueEndlessActivityStageScRsp.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static EnterRogueEndlessActivityStageScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CilFbnRlclJvZ3VlRW5kbGVzc0FjdGl2aXR5U3RhZ2VTY1JzcC5wcm90bxob", - "Um9ndWVFbmRsZXNzTGF5ZXJJbmZvLnByb3RvGhVTY2VuZUJhdHRsZUluZm8u", + "CilFbnRlclJvZ3VlRW5kbGVzc0FjdGl2aXR5U3RhZ2VTY1JzcC5wcm90bxoV", + "U2NlbmVCYXR0bGVJbmZvLnByb3RvGhtSb2d1ZUVuZGxlc3NMYXllckluZm8u", "cHJvdG8iigEKI0VudGVyUm9ndWVFbmRsZXNzQWN0aXZpdHlTdGFnZVNjUnNw", "EisKC0tGSU1MSEhQTUxJGA4gASgLMhYuUm9ndWVFbmRsZXNzTGF5ZXJJbmZv", "EiUKC2JhdHRsZV9pbmZvGAIgASgLMhAuU2NlbmVCYXR0bGVJbmZvEg8KB3Jl", "dGNvZGUYDCABKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IG", "cHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueEndlessLayerInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.SceneBattleInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.SceneBattleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueEndlessLayerInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.EnterRogueEndlessActivityStageScRsp), global::EggLink.DanhengServer.Proto.EnterRogueEndlessActivityStageScRsp.Parser, new[]{ "KFIMLHHPMLI", "BattleInfo", "Retcode" }, null, null, null, null) })); diff --git a/Proto/FMBMHHBPODJ.cs b/Proto/FMBMHHBPODJ.cs index 6365a1d4..7bba6bfc 100644 --- a/Proto/FMBMHHBPODJ.cs +++ b/Proto/FMBMHHBPODJ.cs @@ -1,6 +1,10 @@ // // Generated by the protocol buffer compiler. DO NOT EDIT! +<<<<<<<< HEAD:Proto/FMBMHHBPODJ.cs // source: FMBMHHBPODJ.proto +======== +// source: Match3State.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/Match3State.cs // #pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code @@ -11,32 +15,52 @@ using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; namespace EggLink.DanhengServer.Proto { +<<<<<<<< HEAD:Proto/FMBMHHBPODJ.cs /// Holder for reflection information generated from FMBMHHBPODJ.proto public static partial class FMBMHHBPODJReflection { #region Descriptor /// File descriptor for FMBMHHBPODJ.proto +======== + /// Holder for reflection information generated from Match3State.proto + public static partial class Match3StateReflection { + + #region Descriptor + /// File descriptor for Match3State.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/Match3State.cs public static pbr::FileDescriptor Descriptor { get { return descriptor; } } private static pbr::FileDescriptor descriptor; +<<<<<<<< HEAD:Proto/FMBMHHBPODJ.cs static FMBMHHBPODJReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChFGTUJNSEhCUE9ESi5wcm90byqdAQoLRk1CTUhIQlBPREoSFQoRTUFUQ0gz", +======== + static Match3StateReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChFNYXRjaDNTdGF0ZS5wcm90byqdAQoLTWF0Y2gzU3RhdGUSFQoRTUFUQ0gz", +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/Match3State.cs "X1NUQVRFX0lETEUQABIWChJNQVRDSDNfU1RBVEVfU1RBUlQQARIWChJNQVRD", "SDNfU1RBVEVfTUFUQ0gQAhIVChFNQVRDSDNfU1RBVEVfR0FNRRADEhkKFU1B", "VENIM19TVEFURV9IQUxGVElNRRAEEhUKEU1BVENIM19TVEFURV9PVkVSEAVC", "HqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, +<<<<<<<< HEAD:Proto/FMBMHHBPODJ.cs new pbr::GeneratedClrTypeInfo(new[] {typeof(global::EggLink.DanhengServer.Proto.FMBMHHBPODJ), }, null, null)); +======== + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::EggLink.DanhengServer.Proto.Match3State), }, null, null)); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/Match3State.cs } #endregion } #region Enums +<<<<<<<< HEAD:Proto/FMBMHHBPODJ.cs public enum FMBMHHBPODJ { [pbr::OriginalName("MATCH3_STATE_IDLE")] Match3StateIdle = 0, [pbr::OriginalName("MATCH3_STATE_START")] Match3StateStart = 1, @@ -44,6 +68,15 @@ namespace EggLink.DanhengServer.Proto { [pbr::OriginalName("MATCH3_STATE_GAME")] Match3StateGame = 3, [pbr::OriginalName("MATCH3_STATE_HALFTIME")] Match3StateHalftime = 4, [pbr::OriginalName("MATCH3_STATE_OVER")] Match3StateOver = 5, +======== + public enum Match3State { + [pbr::OriginalName("MATCH3_STATE_IDLE")] Idle = 0, + [pbr::OriginalName("MATCH3_STATE_START")] Start = 1, + [pbr::OriginalName("MATCH3_STATE_MATCH")] Match = 2, + [pbr::OriginalName("MATCH3_STATE_GAME")] Game = 3, + [pbr::OriginalName("MATCH3_STATE_HALFTIME")] Halftime = 4, + [pbr::OriginalName("MATCH3_STATE_OVER")] Over = 5, +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/Match3State.cs } #endregion diff --git a/Proto/GetMultiPathAvatarInfoScRsp.cs b/Proto/GetMultiPathAvatarInfoScRsp.cs index ebf7cfad..5cad9678 100644 --- a/Proto/GetMultiPathAvatarInfoScRsp.cs +++ b/Proto/GetMultiPathAvatarInfoScRsp.cs @@ -25,7 +25,7 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CiFHZXRNdWx0aVBhdGhBdmF0YXJJbmZvU2NSc3AucHJvdG8aGU11bHRpUGF0", - "aEF2YXRhckluZm8ucHJvdG8aGU11bHRpUGF0aEF2YXRhclR5cGUucHJvdG8i", + "aEF2YXRhclR5cGUucHJvdG8aGU11bHRpUGF0aEF2YXRhckluZm8ucHJvdG8i", "mwIKG0dldE11bHRpUGF0aEF2YXRhckluZm9TY1JzcBIaChJiYXNpY190eXBl", "X2lkX2xpc3QYASADKA0SOQobbXVsdGlfcGF0aF9hdmF0YXJfaW5mb19saXN0", "GAQgAygLMhQuTXVsdGlQYXRoQXZhdGFySW5mbxIPCgdyZXRjb2RlGAggASgN", @@ -35,7 +35,7 @@ namespace EggLink.DanhengServer.Proto { "aEF2YXRhclR5cGU6AjgBQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJv", "dG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MultiPathAvatarInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.MultiPathAvatarTypeReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MultiPathAvatarTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.MultiPathAvatarInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetMultiPathAvatarInfoScRsp), global::EggLink.DanhengServer.Proto.GetMultiPathAvatarInfoScRsp.Parser, new[]{ "BasicTypeIdList", "MultiPathAvatarInfoList", "Retcode", "CurAvatarPath" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, }) })); diff --git a/Proto/HMBOAEFMEMP.cs b/Proto/HMBOAEFMEMP.cs index 176a5f98..847f39a9 100644 --- a/Proto/HMBOAEFMEMP.cs +++ b/Proto/HMBOAEFMEMP.cs @@ -1,6 +1,10 @@ // // Generated by the protocol buffer compiler. DO NOT EDIT! +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs // source: HMBOAEFMEMP.proto +======== +// source: FightMatch3PlayerInfo.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs // #pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code @@ -11,16 +15,25 @@ using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; namespace EggLink.DanhengServer.Proto { +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs /// Holder for reflection information generated from HMBOAEFMEMP.proto public static partial class HMBOAEFMEMPReflection { #region Descriptor /// File descriptor for HMBOAEFMEMP.proto +======== + /// Holder for reflection information generated from FightMatch3PlayerInfo.proto + public static partial class FightMatch3PlayerInfoReflection { + + #region Descriptor + /// File descriptor for FightMatch3PlayerInfo.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs public static pbr::FileDescriptor Descriptor { get { return descriptor; } } private static pbr::FileDescriptor descriptor; +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs static HMBOAEFMEMPReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( @@ -34,6 +47,22 @@ namespace EggLink.DanhengServer.Proto { new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.EOFOHACMKEPReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.HMBOAEFMEMP), global::EggLink.DanhengServer.Proto.HMBOAEFMEMP.Parser, new[]{ "ScoreId", "FOEHLABGICC", "Rank", "GBKIEEKEJKD", "Hp", "KBNIFCHMAOB", "LHFPBNAIABI", "State" }, null, null, null, null) +======== + static FightMatch3PlayerInfoReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChtGaWdodE1hdGNoM1BsYXllckluZm8ucHJvdG8aF01hdGNoM1BsYXllclN0", + "YXRlLnByb3RvIrsBChVGaWdodE1hdGNoM1BsYXllckluZm8SIQoFc3RhdGUY", + "DiABKA4yEi5NYXRjaDNQbGF5ZXJTdGF0ZRITCgtPT0dBUE9LRktBSRgMIAEo", + "DRIMCgRyYW5rGAEgASgNEhMKC0dDQ0lPSEVKUE5FGAggASgNEhAKCHNjb3Jl", + "X2lkGA8gASgNEgoKAmhwGA0gASgNEhQKDG9wcG9uZW50X3VpZBgLIAEoDRIT", + "CgtFS0ZQS0ZFQ01HQxgFIAEoCEIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVy", + "LlByb3RvYgZwcm90bzM=")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.Match3PlayerStateReflection.Descriptor, }, + new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.FightMatch3PlayerInfo), global::EggLink.DanhengServer.Proto.FightMatch3PlayerInfo.Parser, new[]{ "State", "OOGAPOKFKAI", "Rank", "GCCIOHEJPNE", "ScoreId", "Hp", "OpponentUid", "EKFPKFECMGC" }, null, null, null, null) +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs })); } #endregion @@ -41,21 +70,37 @@ namespace EggLink.DanhengServer.Proto { } #region Messages [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs public sealed partial class HMBOAEFMEMP : pb::IMessage +======== + public sealed partial class FightMatch3PlayerInfo : pb::IMessage +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage #endif { +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new HMBOAEFMEMP()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } +======== + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new FightMatch3PlayerInfo()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs get { return global::EggLink.DanhengServer.Proto.HMBOAEFMEMPReflection.Descriptor.MessageTypes[0]; } +======== + get { return global::EggLink.DanhengServer.Proto.FightMatch3PlayerInfoReflection.Descriptor.MessageTypes[0]; } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -66,7 +111,11 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs public HMBOAEFMEMP() { +======== + public FightMatch3PlayerInfo() { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs OnConstruction(); } @@ -74,22 +123,88 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs public HMBOAEFMEMP(HMBOAEFMEMP other) : this() { +======== + public FightMatch3PlayerInfo(FightMatch3PlayerInfo other) : this() { + state_ = other.state_; + oOGAPOKFKAI_ = other.oOGAPOKFKAI_; + rank_ = other.rank_; + gCCIOHEJPNE_ = other.gCCIOHEJPNE_; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs scoreId_ = other.scoreId_; fOEHLABGICC_ = other.fOEHLABGICC_; rank_ = other.rank_; gBKIEEKEJKD_ = other.gBKIEEKEJKD_; hp_ = other.hp_; +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs kBNIFCHMAOB_ = other.kBNIFCHMAOB_; lHFPBNAIABI_ = other.lHFPBNAIABI_; state_ = other.state_; +======== + opponentUid_ = other.opponentUid_; + eKFPKFECMGC_ = other.eKFPKFECMGC_; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs public HMBOAEFMEMP Clone() { return new HMBOAEFMEMP(this); +======== + public FightMatch3PlayerInfo Clone() { + return new FightMatch3PlayerInfo(this); + } + + /// Field number for the "state" field. + public const int StateFieldNumber = 14; + private global::EggLink.DanhengServer.Proto.Match3PlayerState state_ = global::EggLink.DanhengServer.Proto.Match3PlayerState.Alive; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public global::EggLink.DanhengServer.Proto.Match3PlayerState State { + get { return state_; } + set { + state_ = value; + } + } + + /// Field number for the "OOGAPOKFKAI" field. + public const int OOGAPOKFKAIFieldNumber = 12; + private uint oOGAPOKFKAI_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint OOGAPOKFKAI { + get { return oOGAPOKFKAI_; } + set { + oOGAPOKFKAI_ = value; + } + } + + /// Field number for the "rank" field. + public const int RankFieldNumber = 1; + private uint rank_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint Rank { + get { return rank_; } + set { + rank_ = value; + } + } + + /// Field number for the "GCCIOHEJPNE" field. + public const int GCCIOHEJPNEFieldNumber = 8; + private uint gCCIOHEJPNE_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint GCCIOHEJPNE { + get { return gCCIOHEJPNE_; } + set { + gCCIOHEJPNE_ = value; + } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs } /// Field number for the "score_id" field. @@ -152,6 +267,7 @@ namespace EggLink.DanhengServer.Proto { } } +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs /// Field number for the "KBNIFCHMAOB" field. public const int KBNIFCHMAOBFieldNumber = 12; private uint kBNIFCHMAOB_; @@ -161,6 +277,17 @@ namespace EggLink.DanhengServer.Proto { get { return kBNIFCHMAOB_; } set { kBNIFCHMAOB_ = value; +======== + /// Field number for the "opponent_uid" field. + public const int OpponentUidFieldNumber = 11; + private uint opponentUid_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint OpponentUid { + get { return opponentUid_; } + set { + opponentUid_ = value; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs } } @@ -191,12 +318,20 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs return Equals(other as HMBOAEFMEMP); +======== + return Equals(other as FightMatch3PlayerInfo); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs public bool Equals(HMBOAEFMEMP other) { +======== + public bool Equals(FightMatch3PlayerInfo other) { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs if (ReferenceEquals(other, null)) { return false; } @@ -208,9 +343,14 @@ namespace EggLink.DanhengServer.Proto { if (Rank != other.Rank) return false; if (GBKIEEKEJKD != other.GBKIEEKEJKD) return false; if (Hp != other.Hp) return false; +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs if (KBNIFCHMAOB != other.KBNIFCHMAOB) return false; if (LHFPBNAIABI != other.LHFPBNAIABI) return false; if (State != other.State) return false; +======== + if (OpponentUid != other.OpponentUid) return false; + if (EKFPKFECMGC != other.EKFPKFECMGC) return false; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs return Equals(_unknownFields, other._unknownFields); } @@ -218,14 +358,26 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs +======== + if (State != global::EggLink.DanhengServer.Proto.Match3PlayerState.Alive) hash ^= State.GetHashCode(); + if (OOGAPOKFKAI != 0) hash ^= OOGAPOKFKAI.GetHashCode(); + if (Rank != 0) hash ^= Rank.GetHashCode(); + if (GCCIOHEJPNE != 0) hash ^= GCCIOHEJPNE.GetHashCode(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs if (ScoreId != 0) hash ^= ScoreId.GetHashCode(); if (FOEHLABGICC != 0) hash ^= FOEHLABGICC.GetHashCode(); if (Rank != 0) hash ^= Rank.GetHashCode(); if (GBKIEEKEJKD != 0) hash ^= GBKIEEKEJKD.GetHashCode(); if (Hp != 0) hash ^= Hp.GetHashCode(); +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs if (KBNIFCHMAOB != 0) hash ^= KBNIFCHMAOB.GetHashCode(); if (LHFPBNAIABI != false) hash ^= LHFPBNAIABI.GetHashCode(); if (State != global::EggLink.DanhengServer.Proto.EOFOHACMKEP.Match3PlayerStateAlive) hash ^= State.GetHashCode(); +======== + if (OpponentUid != 0) hash ^= OpponentUid.GetHashCode(); + if (EKFPKFECMGC != false) hash ^= EKFPKFECMGC.GetHashCode(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -248,16 +400,39 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(8); output.WriteUInt32(GBKIEEKEJKD); } +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs if (FOEHLABGICC != 0) { output.WriteRawTag(32); output.WriteUInt32(FOEHLABGICC); +======== + if (EKFPKFECMGC != false) { + output.WriteRawTag(40); + output.WriteBool(EKFPKFECMGC); + } + if (GCCIOHEJPNE != 0) { + output.WriteRawTag(64); + output.WriteUInt32(GCCIOHEJPNE); + } + if (OpponentUid != 0) { + output.WriteRawTag(88); + output.WriteUInt32(OpponentUid); + } + if (OOGAPOKFKAI != 0) { + output.WriteRawTag(96); + output.WriteUInt32(OOGAPOKFKAI); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs } if (Hp != 0) { output.WriteRawTag(48); output.WriteUInt32(Hp); } +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs if (State != global::EggLink.DanhengServer.Proto.EOFOHACMKEP.Match3PlayerStateAlive) { output.WriteRawTag(80); +======== + if (State != global::EggLink.DanhengServer.Proto.Match3PlayerState.Alive) { + output.WriteRawTag(112); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs output.WriteEnum((int) State); } if (KBNIFCHMAOB != 0) { @@ -290,16 +465,39 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(8); output.WriteUInt32(GBKIEEKEJKD); } +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs if (FOEHLABGICC != 0) { output.WriteRawTag(32); output.WriteUInt32(FOEHLABGICC); +======== + if (EKFPKFECMGC != false) { + output.WriteRawTag(40); + output.WriteBool(EKFPKFECMGC); + } + if (GCCIOHEJPNE != 0) { + output.WriteRawTag(64); + output.WriteUInt32(GCCIOHEJPNE); + } + if (OpponentUid != 0) { + output.WriteRawTag(88); + output.WriteUInt32(OpponentUid); + } + if (OOGAPOKFKAI != 0) { + output.WriteRawTag(96); + output.WriteUInt32(OOGAPOKFKAI); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs } if (Hp != 0) { output.WriteRawTag(48); output.WriteUInt32(Hp); } +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs if (State != global::EggLink.DanhengServer.Proto.EOFOHACMKEP.Match3PlayerStateAlive) { output.WriteRawTag(80); +======== + if (State != global::EggLink.DanhengServer.Proto.Match3PlayerState.Alive) { + output.WriteRawTag(112); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs output.WriteEnum((int) State); } if (KBNIFCHMAOB != 0) { @@ -328,8 +526,13 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs if (ScoreId != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ScoreId); +======== + if (State != global::EggLink.DanhengServer.Proto.Match3PlayerState.Alive) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) State); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs } if (FOEHLABGICC != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(FOEHLABGICC); @@ -343,8 +546,13 @@ namespace EggLink.DanhengServer.Proto { if (Hp != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Hp); } +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs if (KBNIFCHMAOB != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(KBNIFCHMAOB); +======== + if (OpponentUid != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(OpponentUid); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs } if (LHFPBNAIABI != false) { size += 1 + 1; @@ -360,10 +568,29 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs public void MergeFrom(HMBOAEFMEMP other) { if (other == null) { return; } +======== + public void MergeFrom(FightMatch3PlayerInfo other) { + if (other == null) { + return; + } + if (other.State != global::EggLink.DanhengServer.Proto.Match3PlayerState.Alive) { + State = other.State; + } + if (other.OOGAPOKFKAI != 0) { + OOGAPOKFKAI = other.OOGAPOKFKAI; + } + if (other.Rank != 0) { + Rank = other.Rank; + } + if (other.GCCIOHEJPNE != 0) { + GCCIOHEJPNE = other.GCCIOHEJPNE; + } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs if (other.ScoreId != 0) { ScoreId = other.ScoreId; } @@ -379,8 +606,13 @@ namespace EggLink.DanhengServer.Proto { if (other.Hp != 0) { Hp = other.Hp; } +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs if (other.KBNIFCHMAOB != 0) { KBNIFCHMAOB = other.KBNIFCHMAOB; +======== + if (other.OpponentUid != 0) { + OpponentUid = other.OpponentUid; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs } if (other.LHFPBNAIABI != false) { LHFPBNAIABI = other.LHFPBNAIABI; @@ -411,7 +643,23 @@ namespace EggLink.DanhengServer.Proto { FOEHLABGICC = input.ReadUInt32(); break; } +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs case 48: { +======== + case 64: { + GCCIOHEJPNE = input.ReadUInt32(); + break; + } + case 88: { + OpponentUid = input.ReadUInt32(); + break; + } + case 96: { + OOGAPOKFKAI = input.ReadUInt32(); + break; + } + case 104: { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs Hp = input.ReadUInt32(); break; } @@ -428,7 +676,11 @@ namespace EggLink.DanhengServer.Proto { break; } case 112: { +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs LHFPBNAIABI = input.ReadBool(); +======== + State = (global::EggLink.DanhengServer.Proto.Match3PlayerState) input.ReadEnum(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs break; } case 120: { @@ -458,7 +710,23 @@ namespace EggLink.DanhengServer.Proto { FOEHLABGICC = input.ReadUInt32(); break; } +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs case 48: { +======== + case 64: { + GCCIOHEJPNE = input.ReadUInt32(); + break; + } + case 88: { + OpponentUid = input.ReadUInt32(); + break; + } + case 96: { + OOGAPOKFKAI = input.ReadUInt32(); + break; + } + case 104: { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs Hp = input.ReadUInt32(); break; } @@ -475,7 +743,11 @@ namespace EggLink.DanhengServer.Proto { break; } case 112: { +<<<<<<<< HEAD:Proto/HMBOAEFMEMP.cs LHFPBNAIABI = input.ReadBool(); +======== + State = (global::EggLink.DanhengServer.Proto.Match3PlayerState) input.ReadEnum(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/FightMatch3PlayerInfo.cs break; } case 120: { diff --git a/Proto/JDIONHBOIDB.cs b/Proto/JDIONHBOIDB.cs index a90ef723..59d696ec 100644 --- a/Proto/JDIONHBOIDB.cs +++ b/Proto/JDIONHBOIDB.cs @@ -1,6 +1,10 @@ // // Generated by the protocol buffer compiler. DO NOT EDIT! +<<<<<<<< HEAD:Proto/JDIONHBOIDB.cs // source: JDIONHBOIDB.proto +======== +// source: Match3Event.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/Match3Event.cs // #pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code @@ -11,33 +15,56 @@ using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; namespace EggLink.DanhengServer.Proto { +<<<<<<<< HEAD:Proto/JDIONHBOIDB.cs /// Holder for reflection information generated from JDIONHBOIDB.proto public static partial class JDIONHBOIDBReflection { #region Descriptor /// File descriptor for JDIONHBOIDB.proto +======== + /// Holder for reflection information generated from Match3Event.proto + public static partial class Match3EventReflection { + + #region Descriptor + /// File descriptor for Match3Event.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/Match3Event.cs public static pbr::FileDescriptor Descriptor { get { return descriptor; } } private static pbr::FileDescriptor descriptor; +<<<<<<<< HEAD:Proto/JDIONHBOIDB.cs static JDIONHBOIDBReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChFKRElPTkhCT0lEQi5wcm90byqgAQoLSkRJT05IQk9JREISDwoLRVZFTlRf", +======== + static Match3EventReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChFNYXRjaDNFdmVudC5wcm90byqgAQoLTWF0Y2gzRXZlbnQSDwoLRVZFTlRf", +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/Match3Event.cs "QkVHSU4QABIPCgtFVkVOVF9CUkVBSxABEg4KCkVWRU5UX0ZBTEwQAhIRCg1F", "VkVOVF9SRUZSRVNIEAMSFAoQRVZFTlRfQklSRF9TS0lMTBAEEg0KCUVWRU5U", "X0VOVhAFEhEKDUVWRU5UX1NIVUZGTEUQBhIUChBFVkVOVF9TRVRUTEVfVEFH", "EAdCHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, +<<<<<<<< HEAD:Proto/JDIONHBOIDB.cs new pbr::GeneratedClrTypeInfo(new[] {typeof(global::EggLink.DanhengServer.Proto.JDIONHBOIDB), }, null, null)); +======== + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::EggLink.DanhengServer.Proto.Match3Event), }, null, null)); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/Match3Event.cs } #endregion } #region Enums +<<<<<<<< HEAD:Proto/JDIONHBOIDB.cs public enum JDIONHBOIDB { +======== + public enum Match3Event { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/Match3Event.cs [pbr::OriginalName("EVENT_BEGIN")] EventBegin = 0, [pbr::OriginalName("EVENT_BREAK")] EventBreak = 1, [pbr::OriginalName("EVENT_FALL")] EventFall = 2, diff --git a/Proto/KOKOLGODIMF.cs b/Proto/KOKOLGODIMF.cs index 4011acce..1452df00 100644 --- a/Proto/KOKOLGODIMF.cs +++ b/Proto/KOKOLGODIMF.cs @@ -1,6 +1,10 @@ // // Generated by the protocol buffer compiler. DO NOT EDIT! +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs // source: KOKOLGODIMF.proto +======== +// source: MatchThreeData.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs // #pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code @@ -11,16 +15,25 @@ using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; namespace EggLink.DanhengServer.Proto { +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs /// Holder for reflection information generated from KOKOLGODIMF.proto public static partial class KOKOLGODIMFReflection { #region Descriptor /// File descriptor for KOKOLGODIMF.proto +======== + /// Holder for reflection information generated from MatchThreeData.proto + public static partial class MatchThreeDataReflection { + + #region Descriptor + /// File descriptor for MatchThreeData.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs public static pbr::FileDescriptor Descriptor { get { return descriptor; } } private static pbr::FileDescriptor descriptor; +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs static KOKOLGODIMFReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( @@ -34,6 +47,26 @@ namespace EggLink.DanhengServer.Proto { new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueMagicGameUnitReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueMagicScepterReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.KOKOLGODIMF), global::EggLink.DanhengServer.Proto.KOKOLGODIMF.Parser, new[]{ "ICGOAMADMPH", "GPKMFEMIDEM", "NAJPHNPMAIN", "HJLFMIGNEMA" }, null, null, null, null) +======== + static MatchThreeDataReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChRNYXRjaFRocmVlRGF0YS5wcm90bxoYTWF0Y2hUaHJlZUJpcmRJbmZvLnBy", + "b3RvGiJNYXRjaFRocmVlRmluaXNoZWRMZXZlbEluZm9zLnByb3RvIs4CCg5N", + "YXRjaFRocmVlRGF0YRI1CgtBTkdHQ0hER01CSBgMIAMoCzIgLk1hdGNoVGhy", + "ZWVEYXRhLkFOR0dDSERHTUJIRW50cnkSNQoLQUNCTUJBQ0ZDQ04YBiADKAsy", + "IC5NYXRjaFRocmVlRGF0YS5BQ0JNQkFDRkNDTkVudHJ5EjYKD2ZpbmlzaGVk", + "X2xldmVscxgFIAMoCzIdLk1hdGNoVGhyZWVGaW5pc2hlZExldmVsSW5mb3MS", + "LgoRYmlyZF9yZWNvcmRfaW5mb3MYDyADKAsyEy5NYXRjaFRocmVlQmlyZElu", + "Zm8aMgoQQU5HR0NIREdNQkhFbnRyeRILCgNrZXkYASABKA0SDQoFdmFsdWUY", + "AiABKA06AjgBGjIKEEFDQk1CQUNGQ0NORW50cnkSCwoDa2V5GAEgASgNEg0K", + "BXZhbHVlGAIgASgNOgI4AUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlBy", + "b3RvYgZwcm90bzM=")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MatchThreeBirdInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.MatchThreeFinishedLevelInfosReflection.Descriptor, }, + new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MatchThreeData), global::EggLink.DanhengServer.Proto.MatchThreeData.Parser, new[]{ "ANGGCHDGMBH", "ACBMBACFCCN", "FinishedLevels", "BirdRecordInfos" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, null, }) +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs })); } #endregion @@ -41,21 +74,37 @@ namespace EggLink.DanhengServer.Proto { } #region Messages [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs public sealed partial class KOKOLGODIMF : pb::IMessage +======== + public sealed partial class MatchThreeData : pb::IMessage +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage #endif { +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new KOKOLGODIMF()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } +======== + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MatchThreeData()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs get { return global::EggLink.DanhengServer.Proto.KOKOLGODIMFReflection.Descriptor.MessageTypes[0]; } +======== + get { return global::EggLink.DanhengServer.Proto.MatchThreeDataReflection.Descriptor.MessageTypes[0]; } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -66,7 +115,11 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs public KOKOLGODIMF() { +======== + public MatchThreeData() { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs OnConstruction(); } @@ -74,18 +127,31 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs public KOKOLGODIMF(KOKOLGODIMF other) : this() { iCGOAMADMPH_ = other.iCGOAMADMPH_.Clone(); gPKMFEMIDEM_ = other.gPKMFEMIDEM_.Clone(); nAJPHNPMAIN_ = other.nAJPHNPMAIN_.Clone(); hJLFMIGNEMA_ = other.hJLFMIGNEMA_.Clone(); +======== + public MatchThreeData(MatchThreeData other) : this() { + aNGGCHDGMBH_ = other.aNGGCHDGMBH_.Clone(); + aCBMBACFCCN_ = other.aCBMBACFCCN_.Clone(); + finishedLevels_ = other.finishedLevels_.Clone(); + birdRecordInfos_ = other.birdRecordInfos_.Clone(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs public KOKOLGODIMF Clone() { return new KOKOLGODIMF(this); +======== + public MatchThreeData Clone() { + return new MatchThreeData(this); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs } /// Field number for the "ICGOAMADMPH" field. @@ -110,6 +176,7 @@ namespace EggLink.DanhengServer.Proto { get { return gPKMFEMIDEM_; } } +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs /// Field number for the "NAJPHNPMAIN" field. public const int NAJPHNPMAINFieldNumber = 13; private static readonly pb::FieldCodec _repeated_nAJPHNPMAIN_codec @@ -130,27 +197,64 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public pbc::RepeatedField HJLFMIGNEMA { get { return hJLFMIGNEMA_; } +======== + /// Field number for the "finished_levels" field. + public const int FinishedLevelsFieldNumber = 5; + private static readonly pb::FieldCodec _repeated_finishedLevels_codec + = pb::FieldCodec.ForMessage(42, global::EggLink.DanhengServer.Proto.MatchThreeFinishedLevelInfos.Parser); + private readonly pbc::RepeatedField finishedLevels_ = new pbc::RepeatedField(); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField FinishedLevels { + get { return finishedLevels_; } + } + + /// Field number for the "bird_record_infos" field. + public const int BirdRecordInfosFieldNumber = 15; + private static readonly pb::FieldCodec _repeated_birdRecordInfos_codec + = pb::FieldCodec.ForMessage(122, global::EggLink.DanhengServer.Proto.MatchThreeBirdInfo.Parser); + private readonly pbc::RepeatedField birdRecordInfos_ = new pbc::RepeatedField(); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField BirdRecordInfos { + get { return birdRecordInfos_; } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs return Equals(other as KOKOLGODIMF); +======== + return Equals(other as MatchThreeData); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs public bool Equals(KOKOLGODIMF other) { +======== + public bool Equals(MatchThreeData other) { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs if (ReferenceEquals(other, null)) { return false; } if (ReferenceEquals(other, this)) { return true; } +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs if(!iCGOAMADMPH_.Equals(other.iCGOAMADMPH_)) return false; if(!gPKMFEMIDEM_.Equals(other.gPKMFEMIDEM_)) return false; if(!nAJPHNPMAIN_.Equals(other.nAJPHNPMAIN_)) return false; if(!hJLFMIGNEMA_.Equals(other.hJLFMIGNEMA_)) return false; +======== + if (!ANGGCHDGMBH.Equals(other.ANGGCHDGMBH)) return false; + if (!ACBMBACFCCN.Equals(other.ACBMBACFCCN)) return false; + if(!finishedLevels_.Equals(other.finishedLevels_)) return false; + if(!birdRecordInfos_.Equals(other.birdRecordInfos_)) return false; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs return Equals(_unknownFields, other._unknownFields); } @@ -158,10 +262,17 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs hash ^= iCGOAMADMPH_.GetHashCode(); hash ^= gPKMFEMIDEM_.GetHashCode(); hash ^= nAJPHNPMAIN_.GetHashCode(); hash ^= hJLFMIGNEMA_.GetHashCode(); +======== + hash ^= ANGGCHDGMBH.GetHashCode(); + hash ^= ACBMBACFCCN.GetHashCode(); + hash ^= finishedLevels_.GetHashCode(); + hash ^= birdRecordInfos_.GetHashCode(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -180,10 +291,17 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs iCGOAMADMPH_.WriteTo(output, _repeated_iCGOAMADMPH_codec); gPKMFEMIDEM_.WriteTo(output, _repeated_gPKMFEMIDEM_codec); nAJPHNPMAIN_.WriteTo(output, _repeated_nAJPHNPMAIN_codec); hJLFMIGNEMA_.WriteTo(output, _repeated_hJLFMIGNEMA_codec); +======== + finishedLevels_.WriteTo(output, _repeated_finishedLevels_codec); + aCBMBACFCCN_.WriteTo(output, _map_aCBMBACFCCN_codec); + aNGGCHDGMBH_.WriteTo(output, _map_aNGGCHDGMBH_codec); + birdRecordInfos_.WriteTo(output, _repeated_birdRecordInfos_codec); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -194,10 +312,17 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs iCGOAMADMPH_.WriteTo(ref output, _repeated_iCGOAMADMPH_codec); gPKMFEMIDEM_.WriteTo(ref output, _repeated_gPKMFEMIDEM_codec); nAJPHNPMAIN_.WriteTo(ref output, _repeated_nAJPHNPMAIN_codec); hJLFMIGNEMA_.WriteTo(ref output, _repeated_hJLFMIGNEMA_codec); +======== + finishedLevels_.WriteTo(ref output, _repeated_finishedLevels_codec); + aCBMBACFCCN_.WriteTo(ref output, _map_aCBMBACFCCN_codec); + aNGGCHDGMBH_.WriteTo(ref output, _map_aNGGCHDGMBH_codec); + birdRecordInfos_.WriteTo(ref output, _repeated_birdRecordInfos_codec); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -208,10 +333,17 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs size += iCGOAMADMPH_.CalculateSize(_repeated_iCGOAMADMPH_codec); size += gPKMFEMIDEM_.CalculateSize(_repeated_gPKMFEMIDEM_codec); size += nAJPHNPMAIN_.CalculateSize(_repeated_nAJPHNPMAIN_codec); size += hJLFMIGNEMA_.CalculateSize(_repeated_hJLFMIGNEMA_codec); +======== + size += aNGGCHDGMBH_.CalculateSize(_map_aNGGCHDGMBH_codec); + size += aCBMBACFCCN_.CalculateSize(_map_aCBMBACFCCN_codec); + size += finishedLevels_.CalculateSize(_repeated_finishedLevels_codec); + size += birdRecordInfos_.CalculateSize(_repeated_birdRecordInfos_codec); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -220,6 +352,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs public void MergeFrom(KOKOLGODIMF other) { if (other == null) { return; @@ -228,6 +361,16 @@ namespace EggLink.DanhengServer.Proto { gPKMFEMIDEM_.Add(other.gPKMFEMIDEM_); nAJPHNPMAIN_.Add(other.nAJPHNPMAIN_); hJLFMIGNEMA_.Add(other.hJLFMIGNEMA_); +======== + public void MergeFrom(MatchThreeData other) { + if (other == null) { + return; + } + aNGGCHDGMBH_.MergeFrom(other.aNGGCHDGMBH_); + aCBMBACFCCN_.MergeFrom(other.aCBMBACFCCN_); + finishedLevels_.Add(other.finishedLevels_); + birdRecordInfos_.Add(other.birdRecordInfos_); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -243,9 +386,14 @@ namespace EggLink.DanhengServer.Proto { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs case 50: case 48: { iCGOAMADMPH_.AddEntriesFrom(input, _repeated_iCGOAMADMPH_codec); +======== + case 42: { + finishedLevels_.AddEntriesFrom(input, _repeated_finishedLevels_codec); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs break; } case 58: @@ -258,7 +406,11 @@ namespace EggLink.DanhengServer.Proto { break; } case 122: { +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs hJLFMIGNEMA_.AddEntriesFrom(input, _repeated_hJLFMIGNEMA_codec); +======== + birdRecordInfos_.AddEntriesFrom(input, _repeated_birdRecordInfos_codec); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs break; } } @@ -276,9 +428,14 @@ namespace EggLink.DanhengServer.Proto { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs case 50: case 48: { iCGOAMADMPH_.AddEntriesFrom(ref input, _repeated_iCGOAMADMPH_codec); +======== + case 42: { + finishedLevels_.AddEntriesFrom(ref input, _repeated_finishedLevels_codec); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs break; } case 58: @@ -291,7 +448,11 @@ namespace EggLink.DanhengServer.Proto { break; } case 122: { +<<<<<<<< HEAD:Proto/KOKOLGODIMF.cs hJLFMIGNEMA_.AddEntriesFrom(ref input, _repeated_hJLFMIGNEMA_codec); +======== + birdRecordInfos_.AddEntriesFrom(ref input, _repeated_birdRecordInfos_codec); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MatchThreeData.cs break; } } diff --git a/Proto/MNFBAOKFOPM.cs b/Proto/MNFBAOKFOPM.cs index b231271c..20cd9464 100644 --- a/Proto/MNFBAOKFOPM.cs +++ b/Proto/MNFBAOKFOPM.cs @@ -1,6 +1,10 @@ // // Generated by the protocol buffer compiler. DO NOT EDIT! +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs // source: MNFBAOKFOPM.proto +======== +// source: MultiplayerFightGameInfo.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs // #pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code @@ -11,16 +15,25 @@ using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; namespace EggLink.DanhengServer.Proto { +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs /// Holder for reflection information generated from MNFBAOKFOPM.proto public static partial class MNFBAOKFOPMReflection { #region Descriptor /// File descriptor for MNFBAOKFOPM.proto +======== + /// Holder for reflection information generated from MultiplayerFightGameInfo.proto + public static partial class MultiplayerFightGameInfoReflection { + + #region Descriptor + /// File descriptor for MultiplayerFightGameInfo.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs public static pbr::FileDescriptor Descriptor { get { return descriptor; } } private static pbr::FileDescriptor descriptor; +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs static MNFBAOKFOPMReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( @@ -32,6 +45,19 @@ namespace EggLink.DanhengServer.Proto { new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.FightGameModeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MNFBAOKFOPM), global::EggLink.DanhengServer.Proto.MNFBAOKFOPM.Parser, new[]{ "AAHBPGBHCEM", "OOBAPPMOLMA" }, null, null, null, null) +======== + static MultiplayerFightGameInfoReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "Ch5NdWx0aXBsYXllckZpZ2h0R2FtZUluZm8ucHJvdG8aE0ZpZ2h0R2FtZU1v", + "ZGUucHJvdG8iUgoYTXVsdGlwbGF5ZXJGaWdodEdhbWVJbmZvEhMKC0JFT0hG", + "TURISEJJGAEgASgEEiEKCWdhbWVfbW9kZRgCIAEoDjIOLkZpZ2h0R2FtZU1v", + "ZGVCHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.FightGameModeReflection.Descriptor, }, + new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MultiplayerFightGameInfo), global::EggLink.DanhengServer.Proto.MultiplayerFightGameInfo.Parser, new[]{ "BEOHFMDHHBI", "GameMode" }, null, null, null, null) +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs })); } #endregion @@ -39,21 +65,37 @@ namespace EggLink.DanhengServer.Proto { } #region Messages [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs public sealed partial class MNFBAOKFOPM : pb::IMessage +======== + public sealed partial class MultiplayerFightGameInfo : pb::IMessage +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage #endif { +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MNFBAOKFOPM()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } +======== + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MultiplayerFightGameInfo()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs get { return global::EggLink.DanhengServer.Proto.MNFBAOKFOPMReflection.Descriptor.MessageTypes[0]; } +======== + get { return global::EggLink.DanhengServer.Proto.MultiplayerFightGameInfoReflection.Descriptor.MessageTypes[0]; } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -64,7 +106,11 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs public MNFBAOKFOPM() { +======== + public MultiplayerFightGameInfo() { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs OnConstruction(); } @@ -72,16 +118,27 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs public MNFBAOKFOPM(MNFBAOKFOPM other) : this() { aAHBPGBHCEM_ = other.aAHBPGBHCEM_; oOBAPPMOLMA_ = other.oOBAPPMOLMA_; +======== + public MultiplayerFightGameInfo(MultiplayerFightGameInfo other) : this() { + bEOHFMDHHBI_ = other.bEOHFMDHHBI_; + gameMode_ = other.gameMode_; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs public MNFBAOKFOPM Clone() { return new MNFBAOKFOPM(this); +======== + public MultiplayerFightGameInfo Clone() { + return new MultiplayerFightGameInfo(this); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs } /// Field number for the "AAHBPGBHCEM" field. @@ -96,6 +153,7 @@ namespace EggLink.DanhengServer.Proto { } } +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs /// Field number for the "OOBAPPMOLMA" field. public const int OOBAPPMOLMAFieldNumber = 2; private global::EggLink.DanhengServer.Proto.FightGameMode oOBAPPMOLMA_ = global::EggLink.DanhengServer.Proto.FightGameMode.None; @@ -105,26 +163,50 @@ namespace EggLink.DanhengServer.Proto { get { return oOBAPPMOLMA_; } set { oOBAPPMOLMA_ = value; +======== + /// Field number for the "game_mode" field. + public const int GameModeFieldNumber = 2; + private global::EggLink.DanhengServer.Proto.FightGameMode gameMode_ = global::EggLink.DanhengServer.Proto.FightGameMode.None; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public global::EggLink.DanhengServer.Proto.FightGameMode GameMode { + get { return gameMode_; } + set { + gameMode_ = value; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs return Equals(other as MNFBAOKFOPM); +======== + return Equals(other as MultiplayerFightGameInfo); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs public bool Equals(MNFBAOKFOPM other) { +======== + public bool Equals(MultiplayerFightGameInfo other) { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs if (ReferenceEquals(other, null)) { return false; } if (ReferenceEquals(other, this)) { return true; } +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs if (AAHBPGBHCEM != other.AAHBPGBHCEM) return false; if (OOBAPPMOLMA != other.OOBAPPMOLMA) return false; +======== + if (BEOHFMDHHBI != other.BEOHFMDHHBI) return false; + if (GameMode != other.GameMode) return false; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs return Equals(_unknownFields, other._unknownFields); } @@ -132,8 +214,13 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs if (AAHBPGBHCEM != 0UL) hash ^= AAHBPGBHCEM.GetHashCode(); if (OOBAPPMOLMA != global::EggLink.DanhengServer.Proto.FightGameMode.None) hash ^= OOBAPPMOLMA.GetHashCode(); +======== + if (BEOHFMDHHBI != 0UL) hash ^= BEOHFMDHHBI.GetHashCode(); + if (GameMode != global::EggLink.DanhengServer.Proto.FightGameMode.None) hash ^= GameMode.GetHashCode(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -156,9 +243,15 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(8); output.WriteUInt64(AAHBPGBHCEM); } +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs if (OOBAPPMOLMA != global::EggLink.DanhengServer.Proto.FightGameMode.None) { output.WriteRawTag(16); output.WriteEnum((int) OOBAPPMOLMA); +======== + if (GameMode != global::EggLink.DanhengServer.Proto.FightGameMode.None) { + output.WriteRawTag(16); + output.WriteEnum((int) GameMode); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -174,9 +267,15 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(8); output.WriteUInt64(AAHBPGBHCEM); } +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs if (OOBAPPMOLMA != global::EggLink.DanhengServer.Proto.FightGameMode.None) { output.WriteRawTag(16); output.WriteEnum((int) OOBAPPMOLMA); +======== + if (GameMode != global::EggLink.DanhengServer.Proto.FightGameMode.None) { + output.WriteRawTag(16); + output.WriteEnum((int) GameMode); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -191,8 +290,13 @@ namespace EggLink.DanhengServer.Proto { if (AAHBPGBHCEM != 0UL) { size += 1 + pb::CodedOutputStream.ComputeUInt64Size(AAHBPGBHCEM); } +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs if (OOBAPPMOLMA != global::EggLink.DanhengServer.Proto.FightGameMode.None) { size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) OOBAPPMOLMA); +======== + if (GameMode != global::EggLink.DanhengServer.Proto.FightGameMode.None) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) GameMode); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -202,15 +306,24 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs public void MergeFrom(MNFBAOKFOPM other) { +======== + public void MergeFrom(MultiplayerFightGameInfo other) { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs if (other == null) { return; } if (other.AAHBPGBHCEM != 0UL) { AAHBPGBHCEM = other.AAHBPGBHCEM; } +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs if (other.OOBAPPMOLMA != global::EggLink.DanhengServer.Proto.FightGameMode.None) { OOBAPPMOLMA = other.OOBAPPMOLMA; +======== + if (other.GameMode != global::EggLink.DanhengServer.Proto.FightGameMode.None) { + GameMode = other.GameMode; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -232,7 +345,11 @@ namespace EggLink.DanhengServer.Proto { break; } case 16: { +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs OOBAPPMOLMA = (global::EggLink.DanhengServer.Proto.FightGameMode) input.ReadEnum(); +======== + GameMode = (global::EggLink.DanhengServer.Proto.FightGameMode) input.ReadEnum(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs break; } } @@ -255,7 +372,11 @@ namespace EggLink.DanhengServer.Proto { break; } case 16: { +<<<<<<<< HEAD:Proto/MNFBAOKFOPM.cs OOBAPPMOLMA = (global::EggLink.DanhengServer.Proto.FightGameMode) input.ReadEnum(); +======== + GameMode = (global::EggLink.DanhengServer.Proto.FightGameMode) input.ReadEnum(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/MultiplayerFightGameInfo.cs break; } } diff --git a/Proto/PJMGILALBDC.cs b/Proto/PJMGILALBDC.cs index c44e7659..a6a9181e 100644 --- a/Proto/PJMGILALBDC.cs +++ b/Proto/PJMGILALBDC.cs @@ -1,6 +1,10 @@ // // Generated by the protocol buffer compiler. DO NOT EDIT! +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs // source: PJMGILALBDC.proto +======== +// source: GameBirdInfo.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs // #pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code @@ -11,16 +15,25 @@ using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; namespace EggLink.DanhengServer.Proto { +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs /// Holder for reflection information generated from PJMGILALBDC.proto public static partial class PJMGILALBDCReflection { #region Descriptor /// File descriptor for PJMGILALBDC.proto +======== + /// Holder for reflection information generated from GameBirdInfo.proto + public static partial class GameBirdInfoReflection { + + #region Descriptor + /// File descriptor for GameBirdInfo.proto +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs public static pbr::FileDescriptor Descriptor { get { return descriptor; } } private static pbr::FileDescriptor descriptor; +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs static PJMGILALBDCReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( @@ -32,6 +45,19 @@ namespace EggLink.DanhengServer.Proto { new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PJMGILALBDC), global::EggLink.DanhengServer.Proto.PJMGILALBDC.Parser, new[]{ "BirdId", "IEOAIOOBMDA", "OCCGCJEKJPO", "MIBPHJELEAI" }, null, null, null, null) +======== + static GameBirdInfoReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChJHYW1lQmlyZEluZm8ucHJvdG8iWgoMR2FtZUJpcmRJbmZvEg8KB2JpcmRf", + "aWQYASABKA0SDwoHaXNfZGVhZBgCIAEoCBITCgtNQ05ISENIQUJPQRgDIAEo", + "DRITCgtGSU5DTEFPQ09HSBgEIAEoDUIeqgIbRWdnTGluay5EYW5oZW5nU2Vy", + "dmVyLlByb3RvYgZwcm90bzM=")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GameBirdInfo), global::EggLink.DanhengServer.Proto.GameBirdInfo.Parser, new[]{ "BirdId", "IsDead", "MCNHHCHABOA", "FINCLAOCOGH" }, null, null, null, null) +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs })); } #endregion @@ -39,21 +65,37 @@ namespace EggLink.DanhengServer.Proto { } #region Messages [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs public sealed partial class PJMGILALBDC : pb::IMessage +======== + public sealed partial class GameBirdInfo : pb::IMessage +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage #endif { +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PJMGILALBDC()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } +======== + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new GameBirdInfo()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs get { return global::EggLink.DanhengServer.Proto.PJMGILALBDCReflection.Descriptor.MessageTypes[0]; } +======== + get { return global::EggLink.DanhengServer.Proto.GameBirdInfoReflection.Descriptor.MessageTypes[0]; } +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -64,7 +106,11 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs public PJMGILALBDC() { +======== + public GameBirdInfo() { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs OnConstruction(); } @@ -72,18 +118,31 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs public PJMGILALBDC(PJMGILALBDC other) : this() { birdId_ = other.birdId_; iEOAIOOBMDA_ = other.iEOAIOOBMDA_; oCCGCJEKJPO_ = other.oCCGCJEKJPO_; mIBPHJELEAI_ = other.mIBPHJELEAI_; +======== + public GameBirdInfo(GameBirdInfo other) : this() { + birdId_ = other.birdId_; + isDead_ = other.isDead_; + mCNHHCHABOA_ = other.mCNHHCHABOA_; + fINCLAOCOGH_ = other.fINCLAOCOGH_; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs public PJMGILALBDC Clone() { return new PJMGILALBDC(this); +======== + public GameBirdInfo Clone() { + return new GameBirdInfo(this); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs } /// Field number for the "bird_id" field. @@ -98,6 +157,7 @@ namespace EggLink.DanhengServer.Proto { } } +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs /// Field number for the "IEOAIOOBMDA" field. public const int IEOAIOOBMDAFieldNumber = 2; private bool iEOAIOOBMDA_; @@ -107,6 +167,17 @@ namespace EggLink.DanhengServer.Proto { get { return iEOAIOOBMDA_; } set { iEOAIOOBMDA_ = value; +======== + /// Field number for the "is_dead" field. + public const int IsDeadFieldNumber = 2; + private bool isDead_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool IsDead { + get { return isDead_; } + set { + isDead_ = value; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs } } @@ -137,12 +208,20 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs return Equals(other as PJMGILALBDC); +======== + return Equals(other as GameBirdInfo); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs public bool Equals(PJMGILALBDC other) { +======== + public bool Equals(GameBirdInfo other) { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs if (ReferenceEquals(other, null)) { return false; } @@ -150,9 +229,15 @@ namespace EggLink.DanhengServer.Proto { return true; } if (BirdId != other.BirdId) return false; +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs if (IEOAIOOBMDA != other.IEOAIOOBMDA) return false; if (OCCGCJEKJPO != other.OCCGCJEKJPO) return false; if (MIBPHJELEAI != other.MIBPHJELEAI) return false; +======== + if (IsDead != other.IsDead) return false; + if (MCNHHCHABOA != other.MCNHHCHABOA) return false; + if (FINCLAOCOGH != other.FINCLAOCOGH) return false; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs return Equals(_unknownFields, other._unknownFields); } @@ -161,9 +246,15 @@ namespace EggLink.DanhengServer.Proto { public override int GetHashCode() { int hash = 1; if (BirdId != 0) hash ^= BirdId.GetHashCode(); +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs if (IEOAIOOBMDA != false) hash ^= IEOAIOOBMDA.GetHashCode(); if (OCCGCJEKJPO != 0) hash ^= OCCGCJEKJPO.GetHashCode(); if (MIBPHJELEAI != 0) hash ^= MIBPHJELEAI.GetHashCode(); +======== + if (IsDead != false) hash ^= IsDead.GetHashCode(); + if (MCNHHCHABOA != 0) hash ^= MCNHHCHABOA.GetHashCode(); + if (FINCLAOCOGH != 0) hash ^= FINCLAOCOGH.GetHashCode(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -186,9 +277,15 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(8); output.WriteUInt32(BirdId); } +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs if (IEOAIOOBMDA != false) { output.WriteRawTag(16); output.WriteBool(IEOAIOOBMDA); +======== + if (IsDead != false) { + output.WriteRawTag(16); + output.WriteBool(IsDead); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs } if (OCCGCJEKJPO != 0) { output.WriteRawTag(24); @@ -212,9 +309,15 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(8); output.WriteUInt32(BirdId); } +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs if (IEOAIOOBMDA != false) { output.WriteRawTag(16); output.WriteBool(IEOAIOOBMDA); +======== + if (IsDead != false) { + output.WriteRawTag(16); + output.WriteBool(IsDead); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs } if (OCCGCJEKJPO != 0) { output.WriteRawTag(24); @@ -237,7 +340,11 @@ namespace EggLink.DanhengServer.Proto { if (BirdId != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(BirdId); } +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs if (IEOAIOOBMDA != false) { +======== + if (IsDead != false) { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs size += 1 + 1; } if (OCCGCJEKJPO != 0) { @@ -254,15 +361,24 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs public void MergeFrom(PJMGILALBDC other) { +======== + public void MergeFrom(GameBirdInfo other) { +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs if (other == null) { return; } if (other.BirdId != 0) { BirdId = other.BirdId; } +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs if (other.IEOAIOOBMDA != false) { IEOAIOOBMDA = other.IEOAIOOBMDA; +======== + if (other.IsDead != false) { + IsDead = other.IsDead; +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs } if (other.OCCGCJEKJPO != 0) { OCCGCJEKJPO = other.OCCGCJEKJPO; @@ -290,7 +406,11 @@ namespace EggLink.DanhengServer.Proto { break; } case 16: { +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs IEOAIOOBMDA = input.ReadBool(); +======== + IsDead = input.ReadBool(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs break; } case 24: { @@ -321,7 +441,11 @@ namespace EggLink.DanhengServer.Proto { break; } case 16: { +<<<<<<<< HEAD:Proto/PJMGILALBDC.cs IEOAIOOBMDA = input.ReadBool(); +======== + IsDead = input.ReadBool(); +>>>>>>>> b0b290083a3ddabd2bb16e2601e9bcb15fdc5739:Proto/GameBirdInfo.cs break; } case 24: { diff --git a/Proto/RogueTournSettleScRsp.cs b/Proto/RogueTournSettleScRsp.cs index feff745b..56a6040f 100644 --- a/Proto/RogueTournSettleScRsp.cs +++ b/Proto/RogueTournSettleScRsp.cs @@ -24,15 +24,15 @@ namespace EggLink.DanhengServer.Proto { static RogueTournSettleScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChtSb2d1ZVRvdXJuU2V0dGxlU2NSc3AucHJvdG8aGlJvZ3VlVG91cm5GaW5p", - "c2hJbmZvLnByb3RvGhxSb2d1ZVRvdXJuQ3VyU2NlbmVJbmZvLnByb3RvIpcB", + "ChtSb2d1ZVRvdXJuU2V0dGxlU2NSc3AucHJvdG8aHFJvZ3VlVG91cm5DdXJT", + "Y2VuZUluZm8ucHJvdG8aGlJvZ3VlVG91cm5GaW5pc2hJbmZvLnByb3RvIpcB", "ChVSb2d1ZVRvdXJuU2V0dGxlU2NSc3ASMAoRdG91cm5fZmluaXNoX2luZm8Y", "CiABKAsyFS5Sb2d1ZVRvdXJuRmluaXNoSW5mbxIPCgdyZXRjb2RlGAsgASgN", "EjsKGnJvZ3VlX3RvdXJuX2N1cl9zY2VuZV9pbmZvGA4gASgLMhcuUm9ndWVU", "b3VybkN1clNjZW5lSW5mb0IeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlBy", "b3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueTournFinishInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueTournCurSceneInfoReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RogueTournCurSceneInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RogueTournFinishInfoReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RogueTournSettleScRsp), global::EggLink.DanhengServer.Proto.RogueTournSettleScRsp.Parser, new[]{ "TournFinishInfo", "Retcode", "RogueTournCurSceneInfo" }, null, null, null, null) }));