Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

River Jiang

2020-10-27 24f59b89e9eabcfe948fc0ba304a8dbec2deda14

 Assets/Scripts/Net/NetExtends/Common.cs

@@ -23,85 +23,85 @@
      byte[] descriptorData = global::System.Convert.FromBase64String(
          string.Concat(
            "Cgxjb21tb24ucHJvdG8SCHByb3RvYnVmIjUKBkdlbU1zZxINCgVnZW1JZBgB",
            "IAEoBRINCgVsZXZlbBgCIAEoBRINCgVjb3VudBgDIAEoBSKtAwoLVXNlckRh",
            "IAEoBRINCgVsZXZlbBgCIAEoBRINCgVjb3VudBgDIAEoBSLrAgoLVXNlckRh",
            "dGFNc2cSEAoIdXNlcm5hbWUYASABKAkSEAoIbmlja25hbWUYAiABKAkSDwoH",
            "aGVhZGltZxgDIAEoBRIRCglzaW5nYXR1cmUYBCABKAkSDQoFbGV2ZWwYBSAB",
            "KAUSDAoEcmFuaxgGIAEoBRINCgVzY29yZRgHIAEoBRILCgNleHAYCCABKAUS",
            "DQoFbW9uZXkYCSABKAUSDAoEZ29sZBgKIAEoBRIeCgRnZW1zGAsgAygLMhAu",
            "cHJvdG9idWYuR2VtTXNnEhAKCGdlbWRlY2sxGAwgAygFEhAKCGdlbWRlY2sy",
            "GA0gAygFEhAKCGdlbWRlY2szGA4gAygFEg4KBmRlY2tpZBgPIAEoBRIUCgxh",
            "Y2NlcHRmcmllbmQYECABKAgSFAoMbmFtZWRjaGFuZ2VkGBEgASgIEg8KB2Fy",
            "ZWFleHAYEiABKAUSKAoJYXJlYWJveGVzGBMgAygLMhUucHJvdG9idWYuQXJl",
            "bmFCb3hNc2cSIwoGZmFtaWx5GBQgASgLMhMucHJvdG9idWYuRmFtaWx5TXNn",
            "Eg4KBmRvbmF0ZRgVIAEoBSKfAQoJRnJpZW5kTXNnEhAKCHVzZXJuYW1lGAEg",
            "ASgJEhAKCG5pY2tuYW1lGAIgASgJEg8KB2hlYWRpbWcYAyABKAUSDQoFbGV2",
            "ZWwYBSABKAUSDAoEcmFuaxgGIAEoBRINCgVzY29yZRgHIAEoBRIOCgZvbmxp",
            "bmUYCCABKAgSIQoHZ2VtZGVjaxgJIAMoCzIQLnByb3RvYnVmLkdlbU1zZyJW",
            "CgxTdG9yZUFyZWFNc2cSCgoCaWQYASABKAUSEwoLcmVmcmVzaFRpbWUYAiAB",
            "KAUSJQoFaXRlbXMYAyADKAsyFi5wcm90b2J1Zi5TdG9yZUl0ZW1Nc2ciLAoM",
            "U3RvcmVJdGVtTXNnEgoKAmlkGAEgASgFEhAKCGJ1eUNvdW50GAIgASgFIjgK",
            "DVJld2FyZEl0ZW1Nc2cSDAoEdHlwZRgBIAEoBRIKCgJpZBgCIAEoBRINCgVj",
            "b3VudBgDIAEoBSI9CgtBcmVuYUJveE1zZxILCgNwb3MYASABKAUSDQoFYm94",
            "aWQYAiABKAUSEgoKZXhwaXJlVGltZRgDIAEoBSKvAQoPRmFtaWx5TWVtYmVy",
            "TXNnEhAKCHVzZXJuYW1lGAEgASgJEhAKCG5pY2tuYW1lGAIgASgJEg8KB2hl",
            "YWRpbWcYAyABKAUSEAoIcG9zaXRpb24YBCABKAUSDgoGb25saW5lGAUgASgI",
            "Eg0KBXNjb3JlGAYgASgFEg0KBWxldmVsGAcgASgFEhIKCndlZWtEb25hdGUY",
            "CCABKAUSEwoLdG90YWxEb25hdGUYCSABKAUiPAoTRmFtaWx5RG9uYXRlSXRl",
            "bU1zZxIQCgh1c2VybmFtZRgBIAEoCRITCgtkb25hdGVDb3VudBgCIAEoBSKS",
            "AwoNRmFtaWx5Q2hhdE1zZxIRCgltZXNzYWdlSWQYASABKAUSEAoIdXNlcm5h",
            "bWUYAiABKAkSEAoIbmlja25hbWUYAyABKAkSDwoHaGVhZGltZxgEIAEoBRIS",
            "CgpjcmVhdGVUaW1lGAUgASgFEg8KB2NvbnRlbnQYBiABKAkSJAoIY2hhdFR5",
            "cGUYByABKA4yEi5wcm90b2J1Zi5DaGF0VHlwZRINCgVnZW1JZBgIIAEoBRIx",
            "Cgpkb25hdGVsaXN0GAkgAygLMh0ucHJvdG9idWYuRmFtaWx5RG9uYXRlSXRl",
            "bU1zZxIUCgxyZWNlaXZlQ291bnQYCiABKAUSEgoKVG90YWxDb3VudBgLIAEo",
            "BRIQCghub3RpY2VJZBgMIAEoBRIOCgZwYXJhbXMYDSADKAkSEwoLbmV3VXNl",
            "cm5hbWUYDiABKAkSEwoLbmV3Tmlja25hbWUYDyABKAkSEgoKbmV3SGVhZGlt",
            "ZxgQIAEoBRIQCghuZXdMZXZlbBgRIAEoBRIQCghuZXdTY29yZRgSIAEoBSLS",
            "AQoJRmFtaWx5TXNnEgsKA3VpZBgBIAEoCRIMCgRuYW1lGAIgASgJEgwKBGRl",
            "c2MYAyABKAkSDQoFaWNvbnMYBCADKAUSDQoFc2NvcmUYBSABKAUSEwoLc2Nv",
            "cmVzaG9wSWQYBiABKAUSGAoQc2NvcmVzaG9wRXhwaXJlZBgHIAEoBRIQCghm",
            "cmVlSm9pbhgIIAEoBRIRCgluZWVkU2NvcmUYCSABKAUSKgoHbWVtYmVycxgK",
            "IAMoCzIZLnByb3RvYnVmLkZhbWlseU1lbWJlck1zZyKoAQoTRmFtaWx5U2Vh",
            "cmNoSXRlbU1zZxILCgN1aWQYASABKAkSDAoEbmFtZRgCIAEoCRIMCgRkZXNj",
            "GAMgASgJEg0KBWljb25zGAQgAygFEhMKC21lbWJlckNvdW50GAUgASgFEhAK",
            "CGlzQWN0aXZlGAYgASgIEhIKCmlzRnJpZW5kSW4YByABKAgSDQoFaXNOZXcY",
            "CCABKAgSDwoHaXNBcHBseRgJIAEoCCpoCghDVVJSRU5DWRISCg5DVVJSRU5D",
            "WV9CRUdJThAAEgkKBU1PTkVZEAESCAoER09MRBACEgcKA1JNQhADEgcKA0dF",
            "TRAEEgcKA0JPWBAFEgwKCEFSRU5BRVhQEAYSCgoGRE9OQVRFEAcqJgoJQ2hh",
            "bm5lbElEEhEKDUNIQU5ORUxfQkVHSU4QABIGCgJHTRABKo0FCglFcnJvckNv",
            "ZGUSCwoHU3VjY2VzcxAAEhUKEUNoYW5uZWxJZF9Ob0V4aXN0EAESFAoQVXNl",
            "ck5hbWVfSW52YWxpZBACEhgKFFVzZXJQYXNzV29yZF9JbnZhbGlkEAMSEAoM",
            "VW5rbm93X0Vycm9yEAQSEQoNSW5wdXRfSW52YWxpZBAFEgsKB1RpbWVvdXQQ",
            "BhIWChJTZXNzaW9uS2V5X0ludmFsaWQQBxIQCgxMb2dpbl9Ob1VzZXIQCBIT",
            "Cg9Ob3RFbm91Z2hfTW9uZXkQCRISCg5Ob3RFbm91Z2hfR29sZBAKEhEKDU5v",
            "dEVub3VnaF9HZW0QCxITCg9Ob3RGb3VuZF9GcmllbmQQDBISCg5BbHJlYWR5",
            "X0ZyaWVuZBANEhIKDkluQmxvY2tfRnJpZW5kEA4SDgoKTWF4X0ZyaWVuZBAP",
            "EhAKDE1heF9OaWNrTmFtZRAQEhQKEEludmFsaWRfTmlja05hbWUQERISCg5N",
            "YXhfU3RvcmVMaW1pdBASEhYKEk5vdEVub3VnaF9TdG9yZUJ1eRATEhQKEE5v",
            "dE9wZW5fUGFzc1BvcnQQFBIUChBBbHJlYWR5X1Bhc3NQb3J0EBUSHAoYTmVl",
            "ZFZpcF9QYXNzUG9ydFRha2VJdGVtEBYSHgoaTmVlZExldmVsX1Bhc3NQb3J0",
            "VGFrZUl0ZW0QFxIcChhBbHJlYWR5X1Bhc3NQb3J0VGFrZUl0ZW0QGBIcChhJ",
            "bnZhbGlkX1Bhc3NQb3J0QnV5TGV2ZWwQGRIWChJIYXNVbmxvY2tfQXJlbmFC",
            "b3gQGhIbChdPdGhlclVubG9ja2luZ19BcmVuYUJveBAbEhgKFE5vdFRpbWVU",
            "YWtlX0FyZW5hQm94EBwqcQoIQ2hhdFR5cGUSEgoOQ2hhdFR5cGVfQmVnaW4Q",
            "ABIRCg1DaGF0VHlwZV9UZXh0EAESFgoSQ2hhdFR5cGVfRG9uYXRlR2VtEAIS",
            "EwoPQ2hhdFR5cGVfU3lzdGVtEAMSEQoNQ2hhdFR5cGVfSm9pbhAEYgZwcm90",
            "bzM="));
            "KAUSCwoDZXhwGAYgASgFEg0KBW1vbmV5GAcgASgFEgwKBGdvbGQYCCABKAUS",
            "HgoEZ2VtcxgJIAMoCzIQLnByb3RvYnVmLkdlbU1zZxIQCghnZW1kZWNrMRgK",
            "IAMoBRIQCghnZW1kZWNrMhgLIAMoBRIQCghnZW1kZWNrMxgMIAMoBRIOCgZk",
            "ZWNraWQYDSABKAUSFAoMYWNjZXB0ZnJpZW5kGA4gASgIEhQKDG5hbWVkY2hh",
            "bmdlZBgPIAEoCBIPCgdhcmVhZXhwGBAgASgFEigKCWFyZWFib3hlcxgRIAMo",
            "CzIVLnByb3RvYnVmLkFyZW5hQm94TXNnEg4KBmRvbmF0ZRgSIAEoBSKhAQoJ",
            "RnJpZW5kTXNnEhAKCHVzZXJuYW1lGAEgASgJEhAKCG5pY2tuYW1lGAIgASgJ",
            "Eg8KB2hlYWRpbWcYAyABKAUSDQoFbGV2ZWwYBSABKAUSDAoEcmFuaxgGIAEo",
            "BRIPCgdhcmVhZXhwGAcgASgFEg4KBm9ubGluZRgIIAEoCBIhCgdnZW1kZWNr",
            "GAkgAygLMhAucHJvdG9idWYuR2VtTXNnIlYKDFN0b3JlQXJlYU1zZxIKCgJp",
            "ZBgBIAEoBRITCgtyZWZyZXNoVGltZRgCIAEoBRIlCgVpdGVtcxgDIAMoCzIW",
            "LnByb3RvYnVmLlN0b3JlSXRlbU1zZyIsCgxTdG9yZUl0ZW1Nc2cSCgoCaWQY",
            "ASABKAUSEAoIYnV5Q291bnQYAiABKAUiOAoNUmV3YXJkSXRlbU1zZxIMCgR0",
            "eXBlGAEgASgFEgoKAmlkGAIgASgFEg0KBWNvdW50GAMgASgFIj0KC0FyZW5h",
            "Qm94TXNnEgsKA3BvcxgBIAEoBRINCgVib3hpZBgCIAEoBRISCgpleHBpcmVU",
            "aW1lGAMgASgFItQBCg9GYW1pbHlNZW1iZXJNc2cSEAoIdXNlcm5hbWUYASAB",
            "KAkSEAoIbmlja25hbWUYAiABKAkSDwoHaGVhZGltZxgDIAEoBRIQCghwb3Np",
            "dGlvbhgEIAEoBRIOCgZvbmxpbmUYBSABKAgSDwoHYXJlYWV4cBgGIAEoBRIN",
            "CgVsZXZlbBgIIAEoBRISCgp3ZWVrRG9uYXRlGAkgASgFEhMKC3RvdGFsRG9u",
            "YXRlGAogASgFEiEKB2dlbWRlY2sYCyADKAsyEC5wcm90b2J1Zi5HZW1Nc2ci",
            "PAoTRmFtaWx5RG9uYXRlSXRlbU1zZxIQCgh1c2VybmFtZRgBIAEoCRITCgtk",
            "b25hdGVDb3VudBgCIAEoBSKSAwoNRmFtaWx5Q2hhdE1zZxIRCgltZXNzYWdl",
            "SWQYASABKAUSEAoIdXNlcm5hbWUYAiABKAkSEAoIbmlja25hbWUYAyABKAkS",
            "DwoHaGVhZGltZxgEIAEoBRISCgpjcmVhdGVUaW1lGAUgASgFEg8KB2NvbnRl",
            "bnQYBiABKAkSJAoIY2hhdFR5cGUYByABKA4yEi5wcm90b2J1Zi5DaGF0VHlw",
            "ZRINCgVnZW1JZBgIIAEoBRIxCgpkb25hdGVsaXN0GAkgAygLMh0ucHJvdG9i",
            "dWYuRmFtaWx5RG9uYXRlSXRlbU1zZxIUCgxyZWNlaXZlQ291bnQYCiABKAUS",
            "EgoKVG90YWxDb3VudBgLIAEoBRIQCghub3RpY2VJZBgMIAEoBRIOCgZwYXJh",
            "bXMYDSADKAkSEwoLbmV3VXNlcm5hbWUYDiABKAkSEwoLbmV3Tmlja25hbWUY",
            "DyABKAkSEgoKbmV3SGVhZGltZxgQIAEoBRIQCghuZXdMZXZlbBgRIAEoBRIQ",
            "CghuZXdTY29yZRgSIAEoBSLSAQoJRmFtaWx5TXNnEgsKA3VpZBgBIAEoCRIM",
            "CgRuYW1lGAIgASgJEgwKBGRlc2MYAyABKAkSDQoFaWNvbnMYBCADKAUSDQoF",
            "c2NvcmUYBSABKAUSEwoLc2NvcmVzaG9wSWQYBiABKAUSGAoQc2NvcmVzaG9w",
            "RXhwaXJlZBgHIAEoBRIQCghmcmVlSm9pbhgIIAEoBRIRCgluZWVkU2NvcmUY",
            "CSABKAUSKgoHbWVtYmVycxgKIAMoCzIZLnByb3RvYnVmLkZhbWlseU1lbWJl",
            "ck1zZyKaAQoTRmFtaWx5U2VhcmNoSXRlbU1zZxILCgN1aWQYASABKAkSDAoE",
            "bmFtZRgCIAEoCRINCgVpY29ucxgDIAMoBRITCgttZW1iZXJDb3VudBgEIAEo",
            "BRIQCghpc0FjdGl2ZRgFIAEoCBISCgppc0ZyaWVuZEluGAYgASgIEg0KBWlz",
            "TmV3GAcgASgIEg8KB2lzQXBwbHkYCCABKAgqaAoIQ1VSUkVOQ1kSEgoOQ1VS",
            "UkVOQ1lfQkVHSU4QABIJCgVNT05FWRABEggKBEdPTEQQAhIHCgNSTUIQAxIH",
            "CgNHRU0QBBIHCgNCT1gQBRIMCghBUkVOQUVYUBAGEgoKBkRPTkFURRAHKiYK",
            "CUNoYW5uZWxJRBIRCg1DSEFOTkVMX0JFR0lOEAASBgoCR00QASrNBQoJRXJy",
            "b3JDb2RlEgsKB1N1Y2Nlc3MQABIVChFDaGFubmVsSWRfTm9FeGlzdBABEhQK",
            "EFVzZXJOYW1lX0ludmFsaWQQAhIYChRVc2VyUGFzc1dvcmRfSW52YWxpZBAD",
            "EhAKDFVua25vd19FcnJvchAEEhEKDUlucHV0X0ludmFsaWQQBRILCgdUaW1l",
            "b3V0EAYSFgoSU2Vzc2lvbktleV9JbnZhbGlkEAcSEAoMTG9naW5fTm9Vc2Vy",
            "EAgSEwoPTm90RW5vdWdoX01vbmV5EAkSEgoOTm90RW5vdWdoX0dvbGQQChIR",
            "Cg1Ob3RFbm91Z2hfR2VtEAsSEwoPTm90Rm91bmRfRnJpZW5kEAwSEgoOQWxy",
            "ZWFkeV9GcmllbmQQDRISCg5JbkJsb2NrX0ZyaWVuZBAOEg4KCk1heF9Gcmll",
            "bmQQDxIQCgxNYXhfTmlja05hbWUQEBIUChBJbnZhbGlkX05pY2tOYW1lEBES",
            "EgoOTWF4X1N0b3JlTGltaXQQEhIWChJOb3RFbm91Z2hfU3RvcmVCdXkQExIU",
            "ChBOb3RPcGVuX1Bhc3NQb3J0EBQSFAoQQWxyZWFkeV9QYXNzUG9ydBAVEhwK",
            "GE5lZWRWaXBfUGFzc1BvcnRUYWtlSXRlbRAWEh4KGk5lZWRMZXZlbF9QYXNz",
            "UG9ydFRha2VJdGVtEBcSHAoYQWxyZWFkeV9QYXNzUG9ydFRha2VJdGVtEBgS",
            "HAoYSW52YWxpZF9QYXNzUG9ydEJ1eUxldmVsEBkSFgoSSGFzVW5sb2NrX0Fy",
            "ZW5hQm94EBoSGwoXT3RoZXJVbmxvY2tpbmdfQXJlbmFCb3gQGxIYChROb3RU",
            "aW1lVGFrZV9BcmVuYUJveBAcEhMKD05vdEVub3VnaF9MZXZlbBAdEhQKEEFs",
            "cmVhZHlJbl9GYW1pbHkQHhITCg9Ob3RFeGlzdF9GYW1pbHkQHypxCghDaGF0",
            "VHlwZRISCg5DaGF0VHlwZV9CZWdpbhAAEhEKDUNoYXRUeXBlX1RleHQQARIW",
            "ChJDaGF0VHlwZV9Eb25hdGVHZW0QAhITCg9DaGF0VHlwZV9TeXN0ZW0QAxIR",
            "Cg1DaGF0VHlwZV9Kb2luEARiBnByb3RvMw=="));
      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
          new pbr::FileDescriptor[] { },
          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Protobuf.CURRENCY), typeof(global::Protobuf.ChannelID), typeof(global::Protobuf.ErrorCode), typeof(global::Protobuf.ChatType), }, new pbr::GeneratedClrTypeInfo[] {
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.GemMsg), global::Protobuf.GemMsg.Parser, new[]{ "GemId", "Level", "Count" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.UserDataMsg), global::Protobuf.UserDataMsg.Parser, new[]{ "Username", "Nickname", "Headimg", "Singature", "Level", "Rank", "Score", "Exp", "Money", "Gold", "Gems", "Gemdeck1", "Gemdeck2", "Gemdeck3", "Deckid", "Acceptfriend", "Namedchanged", "Areaexp", "Areaboxes", "Family", "Donate" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FriendMsg), global::Protobuf.FriendMsg.Parser, new[]{ "Username", "Nickname", "Headimg", "Level", "Rank", "Score", "Online", "Gemdeck" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.UserDataMsg), global::Protobuf.UserDataMsg.Parser, new[]{ "Username", "Nickname", "Headimg", "Singature", "Level", "Exp", "Money", "Gold", "Gems", "Gemdeck1", "Gemdeck2", "Gemdeck3", "Deckid", "Acceptfriend", "Namedchanged", "Areaexp", "Areaboxes", "Donate" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FriendMsg), global::Protobuf.FriendMsg.Parser, new[]{ "Username", "Nickname", "Headimg", "Level", "Rank", "Areaexp", "Online", "Gemdeck" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.StoreAreaMsg), global::Protobuf.StoreAreaMsg.Parser, new[]{ "Id", "RefreshTime", "Items" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.StoreItemMsg), global::Protobuf.StoreItemMsg.Parser, new[]{ "Id", "BuyCount" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.RewardItemMsg), global::Protobuf.RewardItemMsg.Parser, new[]{ "Type", "Id", "Count" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.ArenaBoxMsg), global::Protobuf.ArenaBoxMsg.Parser, new[]{ "Pos", "Boxid", "ExpireTime" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyMemberMsg), global::Protobuf.FamilyMemberMsg.Parser, new[]{ "Username", "Nickname", "Headimg", "Position", "Online", "Score", "Level", "WeekDonate", "TotalDonate" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyMemberMsg), global::Protobuf.FamilyMemberMsg.Parser, new[]{ "Username", "Nickname", "Headimg", "Position", "Online", "Areaexp", "Level", "WeekDonate", "TotalDonate", "Gemdeck" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyDonateItemMsg), global::Protobuf.FamilyDonateItemMsg.Parser, new[]{ "Username", "DonateCount" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyChatMsg), global::Protobuf.FamilyChatMsg.Parser, new[]{ "MessageId", "Username", "Nickname", "Headimg", "CreateTime", "Content", "ChatType", "GemId", "Donatelist", "ReceiveCount", "TotalCount", "NoticeId", "Params", "NewUsername", "NewNickname", "NewHeadimg", "NewLevel", "NewScore" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyMsg), global::Protobuf.FamilyMsg.Parser, new[]{ "Uid", "Name", "Desc", "Icons", "Score", "ScoreshopId", "ScoreshopExpired", "FreeJoin", "NeedScore", "Members" }, null, null, null),
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilySearchItemMsg), global::Protobuf.FamilySearchItemMsg.Parser, new[]{ "Uid", "Name", "Desc", "Icons", "MemberCount", "IsActive", "IsFriendIn", "IsNew", "IsApply" }, null, null, null)
            new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilySearchItemMsg), global::Protobuf.FamilySearchItemMsg.Parser, new[]{ "Uid", "Name", "Icons", "MemberCount", "IsActive", "IsFriendIn", "IsNew", "IsApply" }, null, null, null)
          }));
    }
    #endregion
@@ -275,6 +275,18 @@
    /// ! 开宝箱失败，时间没到
    /// </summary>
    [pbr::OriginalName("NotTimeTake_ArenaBox")] NotTimeTakeArenaBox = 28,
    /// <summary>
    /// 等级不足
    /// </summary>
    [pbr::OriginalName("NotEnough_Level")] NotEnoughLevel = 29,
    /// <summary>
    /// 已经在工会中
    /// </summary>
    [pbr::OriginalName("AlreadyIn_Family")] AlreadyInFamily = 30,
    /// <summary>
    /// !工会不存在
    /// </summary>
    [pbr::OriginalName("NotExist_Family")] NotExistFamily = 31,
  }

  public enum ChatType {
@@ -517,8 +529,6 @@
      headimg_ = other.headimg_;
      singature_ = other.singature_;
      level_ = other.level_;
      rank_ = other.rank_;
      score_ = other.score_;
      exp_ = other.exp_;
      money_ = other.money_;
      gold_ = other.gold_;
@@ -531,7 +541,6 @@
      namedchanged_ = other.namedchanged_;
      areaexp_ = other.areaexp_;
      areaboxes_ = other.areaboxes_.Clone();
      Family = other.family_ != null ? other.Family.Clone() : null;
      donate_ = other.donate_;
    }

@@ -604,38 +613,11 @@
      }
    }

    /// <summary>Field number for the "rank" field.</summary>
    public const int RankFieldNumber = 6;
    private int rank_;
    /// <summary>
    /// 段位
    /// </summary>
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
    public int Rank {
      get { return rank_; }
      set {
        rank_ = value;
      }
    }

    /// <summary>Field number for the "score" field.</summary>
    public const int ScoreFieldNumber = 7;
    private int score_;
    /// <summary>
    /// 分数
    /// </summary>
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
    public int Score {
      get { return score_; }
      set {
        score_ = value;
      }
    }

    /// <summary>Field number for the "exp" field.</summary>
    public const int ExpFieldNumber = 8;
    public const int ExpFieldNumber = 6;
    private int exp_;
    /// <summary>
    /// int32  score =7;
    /// !经验
    /// </summary>
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -647,7 +629,7 @@
    }

    /// <summary>Field number for the "money" field.</summary>
    public const int MoneyFieldNumber = 9;
    public const int MoneyFieldNumber = 7;
    private int money_;
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
    public int Money {
@@ -658,7 +640,7 @@
    }

    /// <summary>Field number for the "gold" field.</summary>
    public const int GoldFieldNumber = 10;
    public const int GoldFieldNumber = 8;
    private int gold_;
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
    public int Gold {
@@ -669,9 +651,9 @@
    }

    /// <summary>Field number for the "gems" field.</summary>
    public const int GemsFieldNumber = 11;
    public const int GemsFieldNumber = 9;
    private static readonly pb::FieldCodec<global::Protobuf.GemMsg> _repeated_gems_codec
        = pb::FieldCodec.ForMessage(90, global::Protobuf.GemMsg.Parser);
        = pb::FieldCodec.ForMessage(74, global::Protobuf.GemMsg.Parser);
    private readonly pbc::RepeatedField<global::Protobuf.GemMsg> gems_ = new pbc::RepeatedField<global::Protobuf.GemMsg>();
    /// <summary>
    /// *已有宝石列表
@@ -682,9 +664,9 @@
    }

    /// <summary>Field number for the "gemdeck1" field.</summary>
    public const int Gemdeck1FieldNumber = 12;
    public const int Gemdeck1FieldNumber = 10;
    private static readonly pb::FieldCodec<int> _repeated_gemdeck1_codec
        = pb::FieldCodec.ForInt32(98);
        = pb::FieldCodec.ForInt32(82);
    private readonly pbc::RepeatedField<int> gemdeck1_ = new pbc::RepeatedField<int>();
    /// <summary>
    /// 编队
@@ -695,9 +677,9 @@
    }

    /// <summary>Field number for the "gemdeck2" field.</summary>
    public const int Gemdeck2FieldNumber = 13;
    public const int Gemdeck2FieldNumber = 11;
    private static readonly pb::FieldCodec<int> _repeated_gemdeck2_codec
        = pb::FieldCodec.ForInt32(106);
        = pb::FieldCodec.ForInt32(90);
    private readonly pbc::RepeatedField<int> gemdeck2_ = new pbc::RepeatedField<int>();
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
    public pbc::RepeatedField<int> Gemdeck2 {
@@ -705,9 +687,9 @@
    }

    /// <summary>Field number for the "gemdeck3" field.</summary>
    public const int Gemdeck3FieldNumber = 14;
    public const int Gemdeck3FieldNumber = 12;
    private static readonly pb::FieldCodec<int> _repeated_gemdeck3_codec
        = pb::FieldCodec.ForInt32(114);
        = pb::FieldCodec.ForInt32(98);
    private readonly pbc::RepeatedField<int> gemdeck3_ = new pbc::RepeatedField<int>();
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
    public pbc::RepeatedField<int> Gemdeck3 {
@@ -715,7 +697,7 @@
    }

    /// <summary>Field number for the "deckid" field.</summary>
    public const int DeckidFieldNumber = 15;
    public const int DeckidFieldNumber = 13;
    private int deckid_;
    /// <summary>
    /// 默认编队索引0,1,2
@@ -729,7 +711,7 @@
    }

    /// <summary>Field number for the "acceptfriend" field.</summary>
    public const int AcceptfriendFieldNumber = 16;
    public const int AcceptfriendFieldNumber = 14;
    private bool acceptfriend_;
    /// <summary>
    ///  是否接受好友申请
@@ -743,7 +725,7 @@
    }

    /// <summary>Field number for the "namedchanged" field.</summary>
    public const int NamedchangedFieldNumber = 17;
    public const int NamedchangedFieldNumber = 15;
    private bool namedchanged_;
    /// <summary>
    ///  true 表示改过名字，false没有改过
@@ -757,7 +739,7 @@
    }

    /// <summary>Field number for the "areaexp" field.</summary>
    public const int AreaexpFieldNumber = 18;
    public const int AreaexpFieldNumber = 16;
    private int areaexp_;
    /// <summary>
    /// !竞技场经验
@@ -771,9 +753,9 @@
    }

    /// <summary>Field number for the "areaboxes" field.</summary>
    public const int AreaboxesFieldNumber = 19;
    public const int AreaboxesFieldNumber = 17;
    private static readonly pb::FieldCodec<global::Protobuf.ArenaBoxMsg> _repeated_areaboxes_codec
        = pb::FieldCodec.ForMessage(154, global::Protobuf.ArenaBoxMsg.Parser);
        = pb::FieldCodec.ForMessage(138, global::Protobuf.ArenaBoxMsg.Parser);
    private readonly pbc::RepeatedField<global::Protobuf.ArenaBoxMsg> areaboxes_ = new pbc::RepeatedField<global::Protobuf.ArenaBoxMsg>();
    /// <summary>
    /// !竞技宝箱列表
@@ -783,22 +765,8 @@
      get { return areaboxes_; }
    }

    /// <summary>Field number for the "family" field.</summary>
    public const int FamilyFieldNumber = 20;
    private global::Protobuf.FamilyMsg family_;
    /// <summary>
    ///  工会信息
    /// </summary>
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
    public global::Protobuf.FamilyMsg Family {
      get { return family_; }
      set {
        family_ = value;
      }
    }

    /// <summary>Field number for the "donate" field.</summary>
    public const int DonateFieldNumber = 21;
    public const int DonateFieldNumber = 18;
    private int donate_;
    /// <summary>
    /// 工会捐赠积分
@@ -829,8 +797,6 @@
      if (Headimg != other.Headimg) return false;
      if (Singature != other.Singature) return false;
      if (Level != other.Level) return false;
      if (Rank != other.Rank) return false;
      if (Score != other.Score) return false;
      if (Exp != other.Exp) return false;
      if (Money != other.Money) return false;
      if (Gold != other.Gold) return false;
@@ -843,7 +809,6 @@
      if (Namedchanged != other.Namedchanged) return false;
      if (Areaexp != other.Areaexp) return false;
      if(!areaboxes_.Equals(other.areaboxes_)) return false;
      if (!object.Equals(Family, other.Family)) return false;
      if (Donate != other.Donate) return false;
      return true;
    }
@@ -856,8 +821,6 @@
      if (Headimg != 0) hash ^= Headimg.GetHashCode();
      if (Singature.Length != 0) hash ^= Singature.GetHashCode();
      if (Level != 0) hash ^= Level.GetHashCode();
      if (Rank != 0) hash ^= Rank.GetHashCode();
      if (Score != 0) hash ^= Score.GetHashCode();
      if (Exp != 0) hash ^= Exp.GetHashCode();
      if (Money != 0) hash ^= Money.GetHashCode();
      if (Gold != 0) hash ^= Gold.GetHashCode();
@@ -870,7 +833,6 @@
      if (Namedchanged != false) hash ^= Namedchanged.GetHashCode();
      if (Areaexp != 0) hash ^= Areaexp.GetHashCode();
      hash ^= areaboxes_.GetHashCode();
      if (family_ != null) hash ^= Family.GetHashCode();
      if (Donate != 0) hash ^= Donate.GetHashCode();
      return hash;
    }
@@ -902,24 +864,16 @@
        output.WriteRawTag(40);
        output.WriteInt32(Level);
      }
      if (Rank != 0) {
        output.WriteRawTag(48);
        output.WriteInt32(Rank);
      }
      if (Score != 0) {
        output.WriteRawTag(56);
        output.WriteInt32(Score);
      }
      if (Exp != 0) {
        output.WriteRawTag(64);
        output.WriteRawTag(48);
        output.WriteInt32(Exp);
      }
      if (Money != 0) {
        output.WriteRawTag(72);
        output.WriteRawTag(56);
        output.WriteInt32(Money);
      }
      if (Gold != 0) {
        output.WriteRawTag(80);
        output.WriteRawTag(64);
        output.WriteInt32(Gold);
      }
      gems_.WriteTo(output, _repeated_gems_codec);
@@ -927,28 +881,24 @@
      gemdeck2_.WriteTo(output, _repeated_gemdeck2_codec);
      gemdeck3_.WriteTo(output, _repeated_gemdeck3_codec);
      if (Deckid != 0) {
        output.WriteRawTag(120);
        output.WriteRawTag(104);
        output.WriteInt32(Deckid);
      }
      if (Acceptfriend != false) {
        output.WriteRawTag(128, 1);
        output.WriteRawTag(112);
        output.WriteBool(Acceptfriend);
      }
      if (Namedchanged != false) {
        output.WriteRawTag(136, 1);
        output.WriteRawTag(120);
        output.WriteBool(Namedchanged);
      }
      if (Areaexp != 0) {
        output.WriteRawTag(144, 1);
        output.WriteRawTag(128, 1);
        output.WriteInt32(Areaexp);
      }
      areaboxes_.WriteTo(output, _repeated_areaboxes_codec);
      if (family_ != null) {
        output.WriteRawTag(162, 1);
        output.WriteMessage(Family);
      }
      if (Donate != 0) {
        output.WriteRawTag(168, 1);
        output.WriteRawTag(144, 1);
        output.WriteInt32(Donate);
      }
    }
@@ -971,12 +921,6 @@
      if (Level != 0) {
        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Level);
      }
      if (Rank != 0) {
        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Rank);
      }
      if (Score != 0) {
        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Score);
      }
      if (Exp != 0) {
        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Exp);
      }
@@ -994,18 +938,15 @@
        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Deckid);
      }
      if (Acceptfriend != false) {
        size += 2 + 1;
        size += 1 + 1;
      }
      if (Namedchanged != false) {
        size += 2 + 1;
        size += 1 + 1;
      }
      if (Areaexp != 0) {
        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Areaexp);
      }
      size += areaboxes_.CalculateSize(_repeated_areaboxes_codec);
      if (family_ != null) {
        size += 2 + pb::CodedOutputStream.ComputeMessageSize(Family);
      }
      if (Donate != 0) {
        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Donate);
      }
@@ -1031,12 +972,6 @@
      }
      if (other.Level != 0) {
        Level = other.Level;
      }
      if (other.Rank != 0) {
        Rank = other.Rank;
      }
      if (other.Score != 0) {
        Score = other.Score;
      }
      if (other.Exp != 0) {
        Exp = other.Exp;
@@ -1064,12 +999,6 @@
        Areaexp = other.Areaexp;
      }
      areaboxes_.Add(other.areaboxes_);
      if (other.family_ != null) {
        if (family_ == null) {
          family_ = new global::Protobuf.FamilyMsg();
        }
        Family.MergeFrom(other.Family);
      }
      if (other.Donate != 0) {
        Donate = other.Donate;
      }
@@ -1104,72 +1033,57 @@
            break;
          }
          case 48: {
            Rank = input.ReadInt32();
            break;
          }
          case 56: {
            Score = input.ReadInt32();
            break;
          }
          case 64: {
            Exp = input.ReadInt32();
            break;
          }
          case 72: {
          case 56: {
            Money = input.ReadInt32();
            break;
          }
          case 80: {
          case 64: {
            Gold = input.ReadInt32();
            break;
          }
          case 90: {
          case 74: {
            gems_.AddEntriesFrom(input, _repeated_gems_codec);
            break;
          }
          case 82:
          case 80: {
            gemdeck1_.AddEntriesFrom(input, _repeated_gemdeck1_codec);
            break;
          }
          case 90:
          case 88: {
            gemdeck2_.AddEntriesFrom(input, _repeated_gemdeck2_codec);
            break;
          }
          case 98:
          case 96: {
            gemdeck1_.AddEntriesFrom(input, _repeated_gemdeck1_codec);
            break;
          }
          case 106:
          case 104: {
            gemdeck2_.AddEntriesFrom(input, _repeated_gemdeck2_codec);
            break;
          }
          case 114:
          case 112: {
            gemdeck3_.AddEntriesFrom(input, _repeated_gemdeck3_codec);
            break;
          }
          case 120: {
          case 104: {
            Deckid = input.ReadInt32();
            break;
          }
          case 128: {
          case 112: {
            Acceptfriend = input.ReadBool();
            break;
          }
          case 136: {
          case 120: {
            Namedchanged = input.ReadBool();
            break;
          }
          case 144: {
          case 128: {
            Areaexp = input.ReadInt32();
            break;
          }
          case 154: {
          case 138: {
            areaboxes_.AddEntriesFrom(input, _repeated_areaboxes_codec);
            break;
          }
          case 162: {
            if (family_ == null) {
              family_ = new global::Protobuf.FamilyMsg();
            }
            input.ReadMessage(family_);
            break;
          }
          case 168: {
          case 144: {
            Donate = input.ReadInt32();
            break;
          }
@@ -1211,7 +1125,7 @@
      headimg_ = other.headimg_;
      level_ = other.level_;
      rank_ = other.rank_;
      score_ = other.score_;
      areaexp_ = other.areaexp_;
      online_ = other.online_;
      gemdeck_ = other.gemdeck_.Clone();
    }
@@ -1282,17 +1196,17 @@
      }
    }

    /// <summary>Field number for the "score" field.</summary>
    public const int ScoreFieldNumber = 7;
    private int score_;
    /// <summary>Field number for the "areaexp" field.</summary>
    public const int AreaexpFieldNumber = 7;
    private int areaexp_;
    /// <summary>
    /// 分数
    /// </summary>
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
    public int Score {
      get { return score_; }
    public int Areaexp {
      get { return areaexp_; }
      set {
        score_ = value;
        areaexp_ = value;
      }
    }

@@ -1338,7 +1252,7 @@
      if (Headimg != other.Headimg) return false;
      if (Level != other.Level) return false;
      if (Rank != other.Rank) return false;
      if (Score != other.Score) return false;
      if (Areaexp != other.Areaexp) return false;
      if (Online != other.Online) return false;
      if(!gemdeck_.Equals(other.gemdeck_)) return false;
      return true;
@@ -1352,7 +1266,7 @@
      if (Headimg != 0) hash ^= Headimg.GetHashCode();
      if (Level != 0) hash ^= Level.GetHashCode();
      if (Rank != 0) hash ^= Rank.GetHashCode();
      if (Score != 0) hash ^= Score.GetHashCode();
      if (Areaexp != 0) hash ^= Areaexp.GetHashCode();
      if (Online != false) hash ^= Online.GetHashCode();
      hash ^= gemdeck_.GetHashCode();
      return hash;
@@ -1385,9 +1299,9 @@
        output.WriteRawTag(48);
        output.WriteInt32(Rank);
      }
      if (Score != 0) {
      if (Areaexp != 0) {
        output.WriteRawTag(56);
        output.WriteInt32(Score);
        output.WriteInt32(Areaexp);
      }
      if (Online != false) {
        output.WriteRawTag(64);
@@ -1414,8 +1328,8 @@
      if (Rank != 0) {
        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Rank);
      }
      if (Score != 0) {
        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Score);
      if (Areaexp != 0) {
        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Areaexp);
      }
      if (Online != false) {
        size += 1 + 1;
@@ -1444,8 +1358,8 @@
      if (other.Rank != 0) {
        Rank = other.Rank;
      }
      if (other.Score != 0) {
        Score = other.Score;
      if (other.Areaexp != 0) {
        Areaexp = other.Areaexp;
      }
      if (other.Online != false) {
        Online = other.Online;
@@ -1482,7 +1396,7 @@
            break;
          }
          case 56: {
            Score = input.ReadInt32();
            Areaexp = input.ReadInt32();
            break;
          }
          case 64: {
@@ -2229,10 +2143,11 @@
      headimg_ = other.headimg_;
      position_ = other.position_;
      online_ = other.online_;
      score_ = other.score_;
      areaexp_ = other.areaexp_;
      level_ = other.level_;
      weekDonate_ = other.weekDonate_;
      totalDonate_ = other.totalDonate_;
      gemdeck_ = other.gemdeck_.Clone();
    }

    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -2298,22 +2213,22 @@
      }
    }

    /// <summary>Field number for the "score" field.</summary>
    public const int ScoreFieldNumber = 6;
    private int score_;
    /// <summary>Field number for the "areaexp" field.</summary>
    public const int AreaexpFieldNumber = 6;
    private int areaexp_;
    /// <summary>
    /// 分数
    /// </summary>
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
    public int Score {
      get { return score_; }
    public int Areaexp {
      get { return areaexp_; }
      set {
        score_ = value;
        areaexp_ = value;
      }
    }

    /// <summary>Field number for the "level" field.</summary>
    public const int LevelFieldNumber = 7;
    public const int LevelFieldNumber = 8;
    private int level_;
    /// <summary>
    /// 等级
@@ -2327,7 +2242,7 @@
    }

    /// <summary>Field number for the "weekDonate" field.</summary>
    public const int WeekDonateFieldNumber = 8;
    public const int WeekDonateFieldNumber = 9;
    private int weekDonate_;
    /// <summary>
    ///  本周和总捐献数
@@ -2341,7 +2256,7 @@
    }

    /// <summary>Field number for the "totalDonate" field.</summary>
    public const int TotalDonateFieldNumber = 9;
    public const int TotalDonateFieldNumber = 10;
    private int totalDonate_;
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
    public int TotalDonate {
@@ -2349,6 +2264,16 @@
      set {
        totalDonate_ = value;
      }
    }

    /// <summary>Field number for the "gemdeck" field.</summary>
    public const int GemdeckFieldNumber = 11;
    private static readonly pb::FieldCodec<global::Protobuf.GemMsg> _repeated_gemdeck_codec
        = pb::FieldCodec.ForMessage(90, global::Protobuf.GemMsg.Parser);
    private readonly pbc::RepeatedField<global::Protobuf.GemMsg> gemdeck_ = new pbc::RepeatedField<global::Protobuf.GemMsg>();
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
    public pbc::RepeatedField<global::Protobuf.GemMsg> Gemdeck {
      get { return gemdeck_; }
    }

    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -2369,10 +2294,11 @@
      if (Headimg != other.Headimg) return false;
      if (Position != other.Position) return false;
      if (Online != other.Online) return false;
      if (Score != other.Score) return false;
      if (Areaexp != other.Areaexp) return false;
      if (Level != other.Level) return false;
      if (WeekDonate != other.WeekDonate) return false;
      if (TotalDonate != other.TotalDonate) return false;
      if(!gemdeck_.Equals(other.gemdeck_)) return false;
      return true;
    }

@@ -2384,10 +2310,11 @@
      if (Headimg != 0) hash ^= Headimg.GetHashCode();
      if (Position != 0) hash ^= Position.GetHashCode();
      if (Online != false) hash ^= Online.GetHashCode();
      if (Score != 0) hash ^= Score.GetHashCode();
      if (Areaexp != 0) hash ^= Areaexp.GetHashCode();
      if (Level != 0) hash ^= Level.GetHashCode();
      if (WeekDonate != 0) hash ^= WeekDonate.GetHashCode();
      if (TotalDonate != 0) hash ^= TotalDonate.GetHashCode();
      hash ^= gemdeck_.GetHashCode();
      return hash;
    }

@@ -2418,22 +2345,23 @@
        output.WriteRawTag(40);
        output.WriteBool(Online);
      }
      if (Score != 0) {
      if (Areaexp != 0) {
        output.WriteRawTag(48);
        output.WriteInt32(Score);
        output.WriteInt32(Areaexp);
      }
      if (Level != 0) {
        output.WriteRawTag(56);
        output.WriteRawTag(64);
        output.WriteInt32(Level);
      }
      if (WeekDonate != 0) {
        output.WriteRawTag(64);
        output.WriteRawTag(72);
        output.WriteInt32(WeekDonate);
      }
      if (TotalDonate != 0) {
        output.WriteRawTag(72);
        output.WriteRawTag(80);
        output.WriteInt32(TotalDonate);
      }
      gemdeck_.WriteTo(output, _repeated_gemdeck_codec);
    }

    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -2454,8 +2382,8 @@
      if (Online != false) {
        size += 1 + 1;
      }
      if (Score != 0) {
        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Score);
      if (Areaexp != 0) {
        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Areaexp);
      }
      if (Level != 0) {
        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Level);
@@ -2466,6 +2394,7 @@
      if (TotalDonate != 0) {
        size += 1 + pb::CodedOutputStream.ComputeInt32Size(TotalDonate);
      }
      size += gemdeck_.CalculateSize(_repeated_gemdeck_codec);
      return size;
    }

@@ -2489,8 +2418,8 @@
      if (other.Online != false) {
        Online = other.Online;
      }
      if (other.Score != 0) {
        Score = other.Score;
      if (other.Areaexp != 0) {
        Areaexp = other.Areaexp;
      }
      if (other.Level != 0) {
        Level = other.Level;
@@ -2501,6 +2430,7 @@
      if (other.TotalDonate != 0) {
        TotalDonate = other.TotalDonate;
      }
      gemdeck_.Add(other.gemdeck_);
    }

    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -2532,19 +2462,23 @@
            break;
          }
          case 48: {
            Score = input.ReadInt32();
            break;
          }
          case 56: {
            Level = input.ReadInt32();
            Areaexp = input.ReadInt32();
            break;
          }
          case 64: {
            WeekDonate = input.ReadInt32();
            Level = input.ReadInt32();
            break;
          }
          case 72: {
            WeekDonate = input.ReadInt32();
            break;
          }
          case 80: {
            TotalDonate = input.ReadInt32();
            break;
          }
          case 90: {
            gemdeck_.AddEntriesFrom(input, _repeated_gemdeck_codec);
            break;
          }
        }
@@ -3737,7 +3671,6 @@
    public FamilySearchItemMsg(FamilySearchItemMsg other) : this() {
      uid_ = other.uid_;
      name_ = other.name_;
      desc_ = other.desc_;
      icons_ = other.icons_.Clone();
      memberCount_ = other.memberCount_;
      isActive_ = other.isActive_;
@@ -3779,24 +3712,10 @@
      }
    }

    /// <summary>Field number for the "desc" field.</summary>
    public const int DescFieldNumber = 3;
    private string desc_ = "";
    /// <summary>
    ///  描述
    /// </summary>
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
    public string Desc {
      get { return desc_; }
      set {
        desc_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
      }
    }

    /// <summary>Field number for the "icons" field.</summary>
    public const int IconsFieldNumber = 4;
    public const int IconsFieldNumber = 3;
    private static readonly pb::FieldCodec<int> _repeated_icons_codec
        = pb::FieldCodec.ForInt32(34);
        = pb::FieldCodec.ForInt32(26);
    private readonly pbc::RepeatedField<int> icons_ = new pbc::RepeatedField<int>();
    /// <summary>
    ///  徽章图标
@@ -3807,7 +3726,7 @@
    }

    /// <summary>Field number for the "memberCount" field.</summary>
    public const int MemberCountFieldNumber = 5;
    public const int MemberCountFieldNumber = 4;
    private int memberCount_;
    /// <summary>
    ///  当前人数
@@ -3821,7 +3740,7 @@
    }

    /// <summary>Field number for the "isActive" field.</summary>
    public const int IsActiveFieldNumber = 6;
    public const int IsActiveFieldNumber = 5;
    private bool isActive_;
    /// <summary>
    ///  是否活跃
@@ -3835,7 +3754,7 @@
    }

    /// <summary>Field number for the "isFriendIn" field.</summary>
    public const int IsFriendInFieldNumber = 7;
    public const int IsFriendInFieldNumber = 6;
    private bool isFriendIn_;
    /// <summary>
    ///  是否好友在此工会
@@ -3849,7 +3768,7 @@
    }

    /// <summary>Field number for the "isNew" field.</summary>
    public const int IsNewFieldNumber = 8;
    public const int IsNewFieldNumber = 7;
    private bool isNew_;
    /// <summary>
    ///  是否是新公会
@@ -3863,7 +3782,7 @@
    }

    /// <summary>Field number for the "isApply" field.</summary>
    public const int IsApplyFieldNumber = 9;
    public const int IsApplyFieldNumber = 8;
    private bool isApply_;
    /// <summary>
    ///  是否已申请
@@ -3891,7 +3810,6 @@
      }
      if (Uid != other.Uid) return false;
      if (Name != other.Name) return false;
      if (Desc != other.Desc) return false;
      if(!icons_.Equals(other.icons_)) return false;
      if (MemberCount != other.MemberCount) return false;
      if (IsActive != other.IsActive) return false;
@@ -3906,7 +3824,6 @@
      int hash = 1;
      if (Uid.Length != 0) hash ^= Uid.GetHashCode();
      if (Name.Length != 0) hash ^= Name.GetHashCode();
      if (Desc.Length != 0) hash ^= Desc.GetHashCode();
      hash ^= icons_.GetHashCode();
      if (MemberCount != 0) hash ^= MemberCount.GetHashCode();
      if (IsActive != false) hash ^= IsActive.GetHashCode();
@@ -3931,29 +3848,25 @@
        output.WriteRawTag(18);
        output.WriteString(Name);
      }
      if (Desc.Length != 0) {
        output.WriteRawTag(26);
        output.WriteString(Desc);
      }
      icons_.WriteTo(output, _repeated_icons_codec);
      if (MemberCount != 0) {
        output.WriteRawTag(40);
        output.WriteRawTag(32);
        output.WriteInt32(MemberCount);
      }
      if (IsActive != false) {
        output.WriteRawTag(48);
        output.WriteRawTag(40);
        output.WriteBool(IsActive);
      }
      if (IsFriendIn != false) {
        output.WriteRawTag(56);
        output.WriteRawTag(48);
        output.WriteBool(IsFriendIn);
      }
      if (IsNew != false) {
        output.WriteRawTag(64);
        output.WriteRawTag(56);
        output.WriteBool(IsNew);
      }
      if (IsApply != false) {
        output.WriteRawTag(72);
        output.WriteRawTag(64);
        output.WriteBool(IsApply);
      }
    }
@@ -3966,9 +3879,6 @@
      }
      if (Name.Length != 0) {
        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
      }
      if (Desc.Length != 0) {
        size += 1 + pb::CodedOutputStream.ComputeStringSize(Desc);
      }
      size += icons_.CalculateSize(_repeated_icons_codec);
      if (MemberCount != 0) {
@@ -3999,9 +3909,6 @@
      }
      if (other.Name.Length != 0) {
        Name = other.Name;
      }
      if (other.Desc.Length != 0) {
        Desc = other.Desc;
      }
      icons_.Add(other.icons_);
      if (other.MemberCount != 0) {
@@ -4037,32 +3944,28 @@
            Name = input.ReadString();
            break;
          }
          case 26: {
            Desc = input.ReadString();
            break;
          }
          case 34:
          case 32: {
          case 26:
          case 24: {
            icons_.AddEntriesFrom(input, _repeated_icons_codec);
            break;
          }
          case 40: {
          case 32: {
            MemberCount = input.ReadInt32();
            break;
          }
          case 48: {
          case 40: {
            IsActive = input.ReadBool();
            break;
          }
          case 56: {
          case 48: {
            IsFriendIn = input.ReadBool();
            break;
          }
          case 64: {
          case 56: {
            IsNew = input.ReadBool();
            break;
          }
          case 72: {
          case 64: {
            IsApply = input.ReadBool();
            break;
          }