From 74daf5509be4fc140fd1bdb6d4df5f1c1002e368 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Thu, 22 Oct 2020 17:28:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle
---
Assets/Scripts/Net/NetExtends/Opcode.cs | 98 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 46 deletions(-)
diff --git a/Assets/Scripts/Net/NetExtends/Opcode.cs b/Assets/Scripts/Net/NetExtends/Opcode.cs
index fb57285..1696104 100644
--- a/Assets/Scripts/Net/NetExtends/Opcode.cs
+++ b/Assets/Scripts/Net/NetExtends/Opcode.cs
@@ -22,7 +22,7 @@
static OpcodeReflection() {
byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat(
- "CgxvcGNvZGUucHJvdG8SCHByb3RvYnVmKokPCgZPcGNvZGUSCQoFQmVnaW4Q",
+ "CgxvcGNvZGUucHJvdG8SCHByb3RvYnVmKt8PCgZPcGNvZGUSCQoFQmVnaW4Q",
"ABIOCglMb2dpbl9DMlMQ0Q8SDgoJTG9naW5fUzJDENIPEhUKEFNldEdlbURl",
"Y2tJZF9DMlMQ0w8SFQoQU2V0R2VtRGVja0lkX1MyQxDUDxIUCg9Nb3ZlR2Vt",
"RGVja19DMlMQ1Q8SFAoPTW92ZUdlbURlY2tfUzJDENYPEhIKDUdNQ29tbWFu",
@@ -49,23 +49,25 @@
"dGxlUGFzc0xldmVsX0MyUxD8DxIbChZCdXlCYXR0bGVQYXNzTGV2ZWxfUzJD",
"EP0PEhcKElVuTG9ja0FyZW5hQm94X0MyUxD+DxIXChJVbkxvY2tBcmVuYUJv",
"eF9TMkMQ/w8SFQoQVGFrZUFyZW5hQm94X0MyUxCAEBIVChBUYWtlQXJlbmFC",
- "b3hfUzJDEIEQEhUKEEZhbWlseVNlYXJjaF9DMlMQghASFQoQRmFtaWx5U2Vh",
- "cmNoX1MyQxCDEBIbChZGYW1pbHlQbGF5ZXJPbmxpbmVfUzJDEIQQEhUKEEZh",
- "bWlseUNyZWF0ZV9DMlMQhRASEwoORmFtaWx5Sm9pbl9DMlMQhhASEwoORmFt",
- "aWx5Sm9pbl9TMkMQhxASFgoRRmFtaWx5R2V0Q2hhdF9DMlMQiBASFgoRRmFt",
- "aWx5R2V0Q2hhdF9TMkMQiRASGAoTRmFtaWx5U3RhcnRDaGF0X0MyUxCKEBIY",
- "ChNGYW1pbHlTdGFydENoYXRfUzJDEIsQEhoKFUZhbWlseVN0YXJ0RG9uYXRl",
- "X0MyUxCMEBIaChVGYW1pbHlTdGFydERvbmF0ZV9TMkMQjRASEwoORmFtaWx5",
- "UXVpdF9DMlMQjhASEwoORmFtaWx5UXVpdF9TMkMQjxASGAoTRmFtaWx5QWdy",
- "ZWVKb2luX0MyUxCQEBIYChNGYW1pbHlBZ3JlZUpvaW5fUzJDEJEQEhcKEkZh",
- "bWlseUtpY2tVc2VyX0MyUxCSEBIXChJGYW1pbHlLaWNrVXNlcl9TMkMQkxAS",
- "GgoVRmFtaWx5VHJhbnNMZWFkZXJfQzJTEJQQEhoKFUZhbWlseVRyYW5zTGVh",
- "ZGVyX1MyQxCVEBIcChdGYW1pbHlHZXREb25hdGVTaG9wX0MyUxCWEBIcChdG",
- "YW1pbHlHZXREb25hdGVTaG9wX1MyQxCXEBIcChdGYW1pbHlCdXlEb25hdGVT",
- "aG9wX0MyUxCYEBIcChdGYW1pbHlCdXlEb25hdGVTaG9wX1MyQxCZEBIbChZG",
- "YW1pbHlHZXRTY29yZVNob3BfQzJTEJoQEhsKFkZhbWlseUdldFNjb3JlU2hv",
- "cF9TMkMQmxASGwoWRmFtaWx5QnV5U2NvcmVTaG9wX0MyUxCcEBIbChZGYW1p",
- "bHlCdXlTY29yZVNob3BfUzJDEJ0QYgZwcm90bzM="));
+ "b3hfUzJDEIEQEhMKDkZhbWlseUluZm9fUzJDEIIQEhUKEEZhbWlseVNlYXJj",
+ "aF9DMlMQgxASFQoQRmFtaWx5U2VhcmNoX1MyQxCEEBIbChZGYW1pbHlQbGF5",
+ "ZXJPbmxpbmVfUzJDEIUQEhUKEEZhbWlseUNyZWF0ZV9DMlMQhhASFQoQRmFt",
+ "aWx5Q3JlYXRlX1MyQxCHEBITCg5GYW1pbHlGaW5kX0MyUxCIEBITCg5GYW1p",
+ "bHlGaW5kX1MyQxCJEBITCg5GYW1pbHlKb2luX0MyUxCKEBITCg5GYW1pbHlK",
+ "b2luX1MyQxCLEBIWChFGYW1pbHlHZXRDaGF0X0MyUxCMEBIWChFGYW1pbHlH",
+ "ZXRDaGF0X1MyQxCNEBIYChNGYW1pbHlTdGFydENoYXRfQzJTEI4QEhgKE0Zh",
+ "bWlseVN0YXJ0Q2hhdF9TMkMQjxASGgoVRmFtaWx5U3RhcnREb25hdGVfQzJT",
+ "EJAQEhoKFUZhbWlseVN0YXJ0RG9uYXRlX1MyQxCREBITCg5GYW1pbHlRdWl0",
+ "X0MyUxCSEBITCg5GYW1pbHlRdWl0X1MyQxCTEBIYChNGYW1pbHlBZ3JlZUpv",
+ "aW5fQzJTEJQQEhgKE0ZhbWlseUFncmVlSm9pbl9TMkMQlRASFwoSRmFtaWx5",
+ "S2lja1VzZXJfQzJTEJYQEhcKEkZhbWlseUtpY2tVc2VyX1MyQxCXEBIaChVG",
+ "YW1pbHlUcmFuc0xlYWRlcl9DMlMQmBASGgoVRmFtaWx5VHJhbnNMZWFkZXJf",
+ "UzJDEJkQEhwKF0ZhbWlseUdldERvbmF0ZVNob3BfQzJTEJoQEhwKF0ZhbWls",
+ "eUdldERvbmF0ZVNob3BfUzJDEJsQEhwKF0ZhbWlseUJ1eURvbmF0ZVNob3Bf",
+ "QzJTEJwQEhwKF0ZhbWlseUJ1eURvbmF0ZVNob3BfUzJDEJ0QEhsKFkZhbWls",
+ "eUdldFNjb3JlU2hvcF9DMlMQnhASGwoWRmFtaWx5R2V0U2NvcmVTaG9wX1My",
+ "QxCfEBIbChZGYW1pbHlCdXlTY29yZVNob3BfQzJTEKAQEhsKFkZhbWlseUJ1",
+ "eVNjb3JlU2hvcF9TMkMQoRBiBnByb3RvMw=="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Protobuf.Opcode), }, null));
@@ -125,34 +127,38 @@
[pbr::OriginalName("UnLockArenaBox_S2C")] UnLockArenaBoxS2C = 2047,
[pbr::OriginalName("TakeArenaBox_C2S")] TakeArenaBoxC2S = 2048,
[pbr::OriginalName("TakeArenaBox_S2C")] TakeArenaBoxS2C = 2049,
- [pbr::OriginalName("FamilySearch_C2S")] FamilySearchC2S = 2050,
- [pbr::OriginalName("FamilySearch_S2C")] FamilySearchS2C = 2051,
- [pbr::OriginalName("FamilyPlayerOnline_S2C")] FamilyPlayerOnlineS2C = 2052,
- [pbr::OriginalName("FamilyCreate_C2S")] FamilyCreateC2S = 2053,
- [pbr::OriginalName("FamilyJoin_C2S")] FamilyJoinC2S = 2054,
- [pbr::OriginalName("FamilyJoin_S2C")] FamilyJoinS2C = 2055,
- [pbr::OriginalName("FamilyGetChat_C2S")] FamilyGetChatC2S = 2056,
- [pbr::OriginalName("FamilyGetChat_S2C")] FamilyGetChatS2C = 2057,
- [pbr::OriginalName("FamilyStartChat_C2S")] FamilyStartChatC2S = 2058,
- [pbr::OriginalName("FamilyStartChat_S2C")] FamilyStartChatS2C = 2059,
- [pbr::OriginalName("FamilyStartDonate_C2S")] FamilyStartDonateC2S = 2060,
- [pbr::OriginalName("FamilyStartDonate_S2C")] FamilyStartDonateS2C = 2061,
- [pbr::OriginalName("FamilyQuit_C2S")] FamilyQuitC2S = 2062,
- [pbr::OriginalName("FamilyQuit_S2C")] FamilyQuitS2C = 2063,
- [pbr::OriginalName("FamilyAgreeJoin_C2S")] FamilyAgreeJoinC2S = 2064,
- [pbr::OriginalName("FamilyAgreeJoin_S2C")] FamilyAgreeJoinS2C = 2065,
- [pbr::OriginalName("FamilyKickUser_C2S")] FamilyKickUserC2S = 2066,
- [pbr::OriginalName("FamilyKickUser_S2C")] FamilyKickUserS2C = 2067,
- [pbr::OriginalName("FamilyTransLeader_C2S")] FamilyTransLeaderC2S = 2068,
- [pbr::OriginalName("FamilyTransLeader_S2C")] FamilyTransLeaderS2C = 2069,
- [pbr::OriginalName("FamilyGetDonateShop_C2S")] FamilyGetDonateShopC2S = 2070,
- [pbr::OriginalName("FamilyGetDonateShop_S2C")] FamilyGetDonateShopS2C = 2071,
- [pbr::OriginalName("FamilyBuyDonateShop_C2S")] FamilyBuyDonateShopC2S = 2072,
- [pbr::OriginalName("FamilyBuyDonateShop_S2C")] FamilyBuyDonateShopS2C = 2073,
- [pbr::OriginalName("FamilyGetScoreShop_C2S")] FamilyGetScoreShopC2S = 2074,
- [pbr::OriginalName("FamilyGetScoreShop_S2C")] FamilyGetScoreShopS2C = 2075,
- [pbr::OriginalName("FamilyBuyScoreShop_C2S")] FamilyBuyScoreShopC2S = 2076,
- [pbr::OriginalName("FamilyBuyScoreShop_S2C")] FamilyBuyScoreShopS2C = 2077,
+ [pbr::OriginalName("FamilyInfo_S2C")] FamilyInfoS2C = 2050,
+ [pbr::OriginalName("FamilySearch_C2S")] FamilySearchC2S = 2051,
+ [pbr::OriginalName("FamilySearch_S2C")] FamilySearchS2C = 2052,
+ [pbr::OriginalName("FamilyPlayerOnline_S2C")] FamilyPlayerOnlineS2C = 2053,
+ [pbr::OriginalName("FamilyCreate_C2S")] FamilyCreateC2S = 2054,
+ [pbr::OriginalName("FamilyCreate_S2C")] FamilyCreateS2C = 2055,
+ [pbr::OriginalName("FamilyFind_C2S")] FamilyFindC2S = 2056,
+ [pbr::OriginalName("FamilyFind_S2C")] FamilyFindS2C = 2057,
+ [pbr::OriginalName("FamilyJoin_C2S")] FamilyJoinC2S = 2058,
+ [pbr::OriginalName("FamilyJoin_S2C")] FamilyJoinS2C = 2059,
+ [pbr::OriginalName("FamilyGetChat_C2S")] FamilyGetChatC2S = 2060,
+ [pbr::OriginalName("FamilyGetChat_S2C")] FamilyGetChatS2C = 2061,
+ [pbr::OriginalName("FamilyStartChat_C2S")] FamilyStartChatC2S = 2062,
+ [pbr::OriginalName("FamilyStartChat_S2C")] FamilyStartChatS2C = 2063,
+ [pbr::OriginalName("FamilyStartDonate_C2S")] FamilyStartDonateC2S = 2064,
+ [pbr::OriginalName("FamilyStartDonate_S2C")] FamilyStartDonateS2C = 2065,
+ [pbr::OriginalName("FamilyQuit_C2S")] FamilyQuitC2S = 2066,
+ [pbr::OriginalName("FamilyQuit_S2C")] FamilyQuitS2C = 2067,
+ [pbr::OriginalName("FamilyAgreeJoin_C2S")] FamilyAgreeJoinC2S = 2068,
+ [pbr::OriginalName("FamilyAgreeJoin_S2C")] FamilyAgreeJoinS2C = 2069,
+ [pbr::OriginalName("FamilyKickUser_C2S")] FamilyKickUserC2S = 2070,
+ [pbr::OriginalName("FamilyKickUser_S2C")] FamilyKickUserS2C = 2071,
+ [pbr::OriginalName("FamilyTransLeader_C2S")] FamilyTransLeaderC2S = 2072,
+ [pbr::OriginalName("FamilyTransLeader_S2C")] FamilyTransLeaderS2C = 2073,
+ [pbr::OriginalName("FamilyGetDonateShop_C2S")] FamilyGetDonateShopC2S = 2074,
+ [pbr::OriginalName("FamilyGetDonateShop_S2C")] FamilyGetDonateShopS2C = 2075,
+ [pbr::OriginalName("FamilyBuyDonateShop_C2S")] FamilyBuyDonateShopC2S = 2076,
+ [pbr::OriginalName("FamilyBuyDonateShop_S2C")] FamilyBuyDonateShopS2C = 2077,
+ [pbr::OriginalName("FamilyGetScoreShop_C2S")] FamilyGetScoreShopC2S = 2078,
+ [pbr::OriginalName("FamilyGetScoreShop_S2C")] FamilyGetScoreShopS2C = 2079,
+ [pbr::OriginalName("FamilyBuyScoreShop_C2S")] FamilyBuyScoreShopC2S = 2080,
+ [pbr::OriginalName("FamilyBuyScoreShop_S2C")] FamilyBuyScoreShopS2C = 2081,
}
#endregion
--
Gitblit v1.9.1