From 5493ce8512d8ecbcf74ee200767640b0bf03baa0 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 26 Oct 2022 13:47:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_arenaactivereward.json | 60 ++++++++++++++++++---------- pb/errorcode.pb.go | 60 ++++++++++++++++++++++------ pb/hero_msg.pb.go | 6 +-- 3 files changed, 88 insertions(+), 38 deletions(-) diff --git a/bin/json/game_arenaactivereward.json b/bin/json/game_arenaactivereward.json index 941fda619..9904341c6 100644 --- a/bin/json/game_arenaactivereward.json +++ b/bin/json/game_arenaactivereward.json @@ -2,7 +2,7 @@ { "lv_id": 1, "score_low": 0, - "score_up": 199, + "score_up": 799, "human_num": 1, "name": { "key": "arena_rank_1", @@ -19,12 +19,14 @@ "t": "diamond", "n": 5 } - ] + ], + "png": "", + "k_value": 32 }, { "lv_id": 2, - "score_low": 200, - "score_up": 399, + "score_low": 800, + "score_up": 1199, "human_num": 1, "name": { "key": "arena_rank_2", @@ -41,12 +43,14 @@ "t": "diamond", "n": 7 } - ] + ], + "png": "", + "k_value": 64 }, { "lv_id": 3, - "score_low": 400, - "score_up": 599, + "score_low": 1200, + "score_up": 1599, "human_num": 2, "name": { "key": "arena_rank_3", @@ -63,12 +67,14 @@ "t": "diamond", "n": 9 } - ] + ], + "png": "", + "k_value": 32 }, { "lv_id": 4, - "score_low": 600, - "score_up": 799, + "score_low": 1600, + "score_up": 1999, "human_num": 2, "name": { "key": "arena_rank_4", @@ -85,12 +91,14 @@ "t": "diamond", "n": 11 } - ] + ], + "png": "", + "k_value": 16 }, { "lv_id": 5, - "score_low": 800, - "score_up": 999, + "score_low": 2000, + "score_up": 2399, "human_num": 3, "name": { "key": "arena_rank_5", @@ -107,12 +115,14 @@ "t": "diamond", "n": 13 } - ] + ], + "png": "", + "k_value": 8 }, { "lv_id": 6, - "score_low": 1000, - "score_up": 1499, + "score_low": 2400, + "score_up": 2799, "human_num": 3, "name": { "key": "arena_rank_6", @@ -129,12 +139,14 @@ "t": "diamond", "n": 15 } - ] + ], + "png": "", + "k_value": 8 }, { "lv_id": 7, - "score_low": 1500, - "score_up": 1999, + "score_low": 2800, + "score_up": 3199, "human_num": 4, "name": { "key": "arena_rank_7", @@ -151,11 +163,13 @@ "t": "diamond", "n": 17 } - ] + ], + "png": "", + "k_value": 8 }, { "lv_id": 8, - "score_low": 2000, + "score_low": 3200, "score_up": 99999999, "human_num": 4, "name": { @@ -173,6 +187,8 @@ "t": "diamond", "n": 19 } - ] + ], + "png": "", + "k_value": 8 } ] \ No newline at end of file diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index e795d196f..43a9b1ce3 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -198,15 +198,23 @@ const ( // Battle ErrorCode_BattleValidationFailed ErrorCode = 2901 //战斗校验失败 // sociaty + ErrorCode_SociatyNoFound ErrorCode = 3000 //公会不存在 ErrorCode_SociatyAdded ErrorCode = 3001 //已在公会里 ErrorCode_SociatyDiamondNoEnough ErrorCode = 3002 //钻石不足 ErrorCode_SociatyApply ErrorCode = 3003 //申请失败 + ErrorCode_SociatyNoRight ErrorCode = 3004 //无权限 + ErrorCode_SociatyNoAdded ErrorCode = 3005 //未加入公会 + ErrorCode_SociatyDismiss ErrorCode = 3006 //解散失败 + ErrorCode_SociatyQuit ErrorCode = 3007 //退会失败 + ErrorCode_SociatyAgree ErrorCode = 3008 //申请-同意失败 + ErrorCode_SociatyRefuse ErrorCode = 3009 //申请-拒绝失败 // arena ErrorCode_ArenaTicketBuyUp ErrorCode = 3101 //票据上限 // talent ErrorCode_TalentRepeatLearn ErrorCode = 3201 // 天赋已学习 ErrorCode_TalentErrData ErrorCode = 3202 /// 天赋不存在 ErrorCode_TalentUnLockerBefore ErrorCode = 3203 //先解锁前置天赋 + ErrorCode_TalentResetState ErrorCode = 3204 //当前天赋已经是重置状态 ) // Enum value maps for ErrorCode. @@ -368,13 +376,21 @@ var ( 2804: "LibraryReward", 2805: "LibraryLvReward", 2901: "BattleValidationFailed", + 3000: "SociatyNoFound", 3001: "SociatyAdded", 3002: "SociatyDiamondNoEnough", 3003: "SociatyApply", + 3004: "SociatyNoRight", + 3005: "SociatyNoAdded", + 3006: "SociatyDismiss", + 3007: "SociatyQuit", + 3008: "SociatyAgree", + 3009: "SociatyRefuse", 3101: "ArenaTicketBuyUp", 3201: "TalentRepeatLearn", 3202: "TalentErrData", 3203: "TalentUnLockerBefore", + 3204: "TalentResetState", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -533,13 +549,21 @@ var ( "LibraryReward": 2804, "LibraryLvReward": 2805, "BattleValidationFailed": 2901, + "SociatyNoFound": 3000, "SociatyAdded": 3001, "SociatyDiamondNoEnough": 3002, "SociatyApply": 3003, + "SociatyNoRight": 3004, + "SociatyNoAdded": 3005, + "SociatyDismiss": 3006, + "SociatyQuit": 3007, + "SociatyAgree": 3008, + "SociatyRefuse": 3009, "ArenaTicketBuyUp": 3101, "TalentRepeatLearn": 3201, "TalentErrData": 3202, "TalentUnLockerBefore": 3203, + "TalentResetState": 3204, } ) @@ -574,7 +598,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xb7, 0x1c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xdb, 0x1d, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -791,18 +815,28 @@ var file_errorcode_proto_rawDesc = []byte{ 0x77, 0x61, 0x72, 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a, - 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, - 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x10, 0xbb, 0x17, 0x12, 0x15, 0x0a, - 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, - 0x70, 0x10, 0x9d, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, - 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, - 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, - 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, - 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xb8, 0x17, 0x12, + 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, + 0xb9, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61, + 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12, + 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x10, + 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x52, + 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xbd, 0x17, 0x12, 0x13, 0x0a, 0x0e, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x10, 0xbe, + 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, + 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, + 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, + 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, + 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, + 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, + 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, + 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, + 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, + 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index edb804d7f..ab0af989c 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -2063,7 +2063,7 @@ type HeroTalentResetResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Telnet []*DBHeroTalent `protobuf:"bytes,1,rep,name=telnet,proto3" json:"telnet"` + Telnet *DBHeroTalent `protobuf:"bytes,1,opt,name=telnet,proto3" json:"telnet"` } func (x *HeroTalentResetResp) Reset() { @@ -2098,7 +2098,7 @@ func (*HeroTalentResetResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{39} } -func (x *HeroTalentResetResp) GetTelnet() []*DBHeroTalent { +func (x *HeroTalentResetResp) GetTelnet() *DBHeroTalent { if x != nil { return x.Telnet } @@ -2290,7 +2290,7 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x22, 0x3c, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, - 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, + 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }