From fa2a7d048930baa696123a92ad18fa66ca90803b Mon Sep 17 00:00:00 2001 From: zhaocy Date: Tue, 26 Jul 2022 18:20:00 +0800 Subject: [PATCH 1/3] update errcode --- modules/task/api_activelist.go | 2 +- modules/task/api_activereceive.go | 6 +- modules/task/api_list.go | 2 +- modules/task/api_receive.go | 6 +- modules/user/api_create.go | 5 +- modules/user/api_modifyname.go | 2 +- modules/user/api_vericode.go | 4 +- pb/errorcode.pb.go | 233 ++++++++++++++++-------------- pb/userrecord.pb.go | 108 +++++++------- 9 files changed, 194 insertions(+), 174 deletions(-) diff --git a/modules/task/api_activelist.go b/modules/task/api_activelist.go index 10932bfe2..09de6d024 100644 --- a/modules/task/api_activelist.go +++ b/modules/task/api_activelist.go @@ -10,7 +10,7 @@ import ( //活跃度 func (this *apiComp) ActiveListCheck(session comm.IUserSession, req *pb.TaskActiveListReq) (code pb.ErrorCode) { if req.TaskTag == 0 { - code = pb.ErrorCode_ReqParameterError + code = pb.ErrorCode_TaskTagEmpty } return } diff --git a/modules/task/api_activereceive.go b/modules/task/api_activereceive.go index 2efad197e..c5777e208 100644 --- a/modules/task/api_activereceive.go +++ b/modules/task/api_activereceive.go @@ -9,8 +9,10 @@ import ( //活跃度领取 func (this *apiComp) ActiveReceiveCheck(session comm.IUserSession, req *pb.TaskActiveReceiveReq) (code pb.ErrorCode) { - if req.Id == "" || req.TaskTag == 0 { - code = pb.ErrorCode_ReqParameterError + if req.Id == "" { + code = pb.ErrorCode_TaskIdEmpty + } else if req.TaskTag == 0 { + code = pb.ErrorCode_TaskTagEmpty } return } diff --git a/modules/task/api_list.go b/modules/task/api_list.go index 07201ac92..4d5f304eb 100644 --- a/modules/task/api_list.go +++ b/modules/task/api_list.go @@ -9,7 +9,7 @@ import ( func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.TaskListReq) (code pb.ErrorCode) { if req.TaskTag == 0 { - code = pb.ErrorCode_ReqParameterError + code = pb.ErrorCode_TaskTagEmpty } return } diff --git a/modules/task/api_receive.go b/modules/task/api_receive.go index 0085110f2..745a58948 100644 --- a/modules/task/api_receive.go +++ b/modules/task/api_receive.go @@ -9,8 +9,10 @@ import ( //任务奖励领取 func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.TaskReceiveReq) (code pb.ErrorCode) { - if req.TaskTag == 0 || req.Id == "" { - code = pb.ErrorCode_ReqParameterError + if req.Id == "" { + code = pb.ErrorCode_TaskIdEmpty + } else if req.TaskTag == 0 { + code = pb.ErrorCode_TaskTagEmpty } return } diff --git a/modules/user/api_create.go b/modules/user/api_create.go index ced27cea3..006000127 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -9,9 +9,8 @@ import ( ) func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.UserCreateReq) (code pb.ErrorCode) { - //暂时只处理昵称 if req.NickName == "" { - code = pb.ErrorCode_ReqParameterError + code = pb.ErrorCode_UserNickNameEmpty } return @@ -45,7 +44,7 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (c //查询昵称是否重复 if ok := this.module.modelUser.NickNameIsExist(req.NickName); !ok { - code = pb.ErrorCode_NameExist + code = pb.ErrorCode_UserNickNameExist return } diff --git a/modules/user/api_modifyname.go b/modules/user/api_modifyname.go index da44b6a92..e7332fe5b 100644 --- a/modules/user/api_modifyname.go +++ b/modules/user/api_modifyname.go @@ -24,7 +24,7 @@ func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynam name := strings.TrimSpace(req.Name) //验证名称 if !this.module.modelUser.NickNameIsExist(name) { - code = pb.ErrorCode_NameExist + code = pb.ErrorCode_UserNickNameExist return } diff --git a/modules/user/api_vericode.go b/modules/user/api_vericode.go index 6f9c4b415..dd9d5749e 100644 --- a/modules/user/api_vericode.go +++ b/modules/user/api_vericode.go @@ -7,6 +7,8 @@ import ( "google.golang.org/protobuf/proto" ) +// 验证码 + func (this *apiComp) VericodeCheck(session comm.IUserSession, req *pb.UserVeriCodeReq) (code pb.ErrorCode) { return } @@ -18,7 +20,7 @@ func (this *apiComp) Vericode(session comm.IUserSession, req *pb.UserVeriCodeReq rsp := &pb.UserVeriCodeResp{} rsp.Code = this.module.modelSetting.refresh(session.GetUserId()) - + err := session.SendMsg(string(this.module.GetType()), UserSubTypeVeriCode, rsp) if err != nil { code = pb.ErrorCode_SystemError diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index d10f11905..11dfa05e1 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -43,18 +43,18 @@ const ( ErrorCode_ConfigurationException ErrorCode = 103 //配置异常 ErrorCode_ConfigNoFound ErrorCode = 104 //配置未找到 // user - ErrorCode_SecKeyInvalid ErrorCode = 1000 //秘钥无效 - ErrorCode_SecKey ErrorCode = 1001 //秘钥格式错误 - ErrorCode_BindUser ErrorCode = 1002 //用户绑定错误 - ErrorCode_GoldNoEnough ErrorCode = 1003 // 金币不足 - ErrorCode_DiamondNoEnough ErrorCode = 1004 // 钻石不足 - ErrorCode_RoleCreated ErrorCode = 1005 //已创角 - ErrorCode_NameExist ErrorCode = 1006 //昵称已存在 - ErrorCode_VeriCodeNoValid ErrorCode = 1007 //验证码无效 - ErrorCode_VeriCodeExpired ErrorCode = 1008 //验证码过期 - ErrorCode_UserResetData ErrorCode = 1009 //初始化用户失败 - ErrorCode_ModifynameCount ErrorCode = 1010 //名称修改次数不足 - ErrorCode_MailErr ErrorCode = 1011 // 邮件不存在 + ErrorCode_SecKeyInvalid ErrorCode = 1000 //秘钥无效 + ErrorCode_SecKey ErrorCode = 1001 //秘钥格式错误 + ErrorCode_BindUser ErrorCode = 1002 //用户绑定错误 + ErrorCode_GoldNoEnough ErrorCode = 1003 // 金币不足 + ErrorCode_DiamondNoEnough ErrorCode = 1004 // 钻石不足 + ErrorCode_RoleCreated ErrorCode = 1005 //已创角 + ErrorCode_UserNickNameExist ErrorCode = 1006 //昵称已存在 + ErrorCode_VeriCodeNoValid ErrorCode = 1007 //验证码无效 + ErrorCode_VeriCodeExpired ErrorCode = 1008 //验证码过期 + ErrorCode_UserResetData ErrorCode = 1009 //初始化用户失败 + ErrorCode_UserModiNameCount ErrorCode = 1010 //名称修改次数不足 + ErrorCode_UserNickNameEmpty ErrorCode = 1011 //昵称空 // friend ErrorCode_FriendNotSelf ErrorCode = 1100 //不能是自己 ErrorCode_FriendSelfMax ErrorCode = 1101 //超出好友最大数量 @@ -118,9 +118,13 @@ const ( ErrorCode_TaskActiveNoenough ErrorCode = 1606 //活跃值未达标 ErrorCode_TaskNoFinished ErrorCode = 1607 //任务未完成 ErrorCode_TaskFinished ErrorCode = 1608 //已完成 + ErrorCode_TaskTagEmpty ErrorCode = 1609 //任务类型空 + ErrorCode_TaskIdEmpty ErrorCode = 1610 //任务ID空 // shop ErrorCode_ShopGoodsIsSoldOut ErrorCode = 1700 //商品已售罄 ErrorCode_ShopNoSurplusRefreshNum ErrorCode = 1701 //剩余刷新次数已用完 + // mail + ErrorCode_MailErr ErrorCode = 1800 // 邮件不存在 ) // Enum value maps for ErrorCode. @@ -151,12 +155,12 @@ var ( 1003: "GoldNoEnough", 1004: "DiamondNoEnough", 1005: "RoleCreated", - 1006: "NameExist", + 1006: "UserNickNameExist", 1007: "VeriCodeNoValid", 1008: "VeriCodeExpired", 1009: "UserResetData", - 1010: "ModifynameCount", - 1011: "MailErr", + 1010: "UserModiNameCount", + 1011: "UserNickNameEmpty", 1100: "FriendNotSelf", 1101: "FriendSelfMax", 1102: "FriendTargetMax", @@ -214,8 +218,11 @@ var ( 1606: "TaskActiveNoenough", 1607: "TaskNoFinished", 1608: "TaskFinished", + 1609: "TaskTagEmpty", + 1610: "TaskIdEmpty", 1700: "ShopGoodsIsSoldOut", 1701: "ShopNoSurplusRefreshNum", + 1800: "MailErr", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -243,12 +250,12 @@ var ( "GoldNoEnough": 1003, "DiamondNoEnough": 1004, "RoleCreated": 1005, - "NameExist": 1006, + "UserNickNameExist": 1006, "VeriCodeNoValid": 1007, "VeriCodeExpired": 1008, "UserResetData": 1009, - "ModifynameCount": 1010, - "MailErr": 1011, + "UserModiNameCount": 1010, + "UserNickNameEmpty": 1011, "FriendNotSelf": 1100, "FriendSelfMax": 1101, "FriendTargetMax": 1102, @@ -306,8 +313,11 @@ var ( "TaskActiveNoenough": 1606, "TaskNoFinished": 1607, "TaskFinished": 1608, + "TaskTagEmpty": 1609, + "TaskIdEmpty": 1610, "ShopGoodsIsSoldOut": 1700, "ShopNoSurplusRefreshNum": 1701, + "MailErr": 1800, } ) @@ -342,7 +352,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, 0xfa, 0x0e, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xc1, 0x0f, 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, @@ -373,96 +383,101 @@ var file_errorcode_proto_rawDesc = []byte{ 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x07, 0x12, 0x14, 0x0a, 0x0f, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xec, 0x07, 0x12, 0x10, 0x0a, 0x0b, 0x52, 0x6f, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x10, 0xed, - 0x07, 0x12, 0x0e, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xee, - 0x07, 0x12, 0x14, 0x0a, 0x0f, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x4e, 0x6f, 0x56, - 0x61, 0x6c, 0x69, 0x64, 0x10, 0xef, 0x07, 0x12, 0x14, 0x0a, 0x0f, 0x56, 0x65, 0x72, 0x69, 0x43, - 0x6f, 0x64, 0x65, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xf0, 0x07, 0x12, 0x12, 0x0a, - 0x0d, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf1, - 0x07, 0x12, 0x14, 0x0a, 0x0f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xf2, 0x07, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45, - 0x72, 0x72, 0x10, 0xf3, 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, - 0x6f, 0x74, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xcc, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4d, 0x61, 0x78, 0x10, 0xcd, 0x08, 0x12, 0x14, 0x0a, - 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4d, 0x61, 0x78, - 0x10, 0xce, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, - 0x66, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xcf, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, - 0x10, 0xd0, 0x08, 0x12, 0x0e, 0x0a, 0x09, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x59, 0x65, 0x74, - 0x10, 0xd1, 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, - 0x6c, 0x79, 0x59, 0x65, 0x74, 0x10, 0xd2, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd3, - 0x08, 0x12, 0x19, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, - 0x74, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd4, 0x08, 0x12, 0x15, 0x0a, 0x10, - 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, - 0x10, 0xd5, 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, - 0x63, 0x6b, 0x4d, 0x61, 0x78, 0x10, 0xd6, 0x08, 0x12, 0x1a, 0x0a, 0x15, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x10, 0xd7, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x45, - 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xb0, 0x09, 0x12, 0x15, 0x0a, 0x10, 0x49, 0x74, 0x65, 0x6d, - 0x73, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, - 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x72, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, - 0x70, 0x70, 0x65, 0x72, 0x10, 0xb2, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, - 0x47, 0x69, 0x72, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, - 0xb3, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, - 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x10, 0xb4, 0x09, 0x12, 0x10, 0x0a, - 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94, 0x0a, 0x12, - 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, - 0x95, 0x0a, 0x12, 0x0e, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, - 0x96, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x10, 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, - 0x6c, 0x6f, 0x72, 0x45, 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, - 0x6f, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, 0x99, 0x0a, 0x12, 0x14, - 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, - 0x65, 0x10, 0x9a, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, - 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x48, 0x65, 0x72, - 0x6f, 0x4e, 0x6f, 0x74, 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, - 0x10, 0x9c, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x65, - 0x72, 0x67, 0x79, 0x10, 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x45, - 0x71, 0x75, 0x69, 0x70, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, 0x0a, 0x12, 0x12, 0x0a, - 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x10, 0xa0, - 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x10, - 0xa1, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, - 0x6e, 0x74, 0x10, 0xa2, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x73, - 0x74, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, - 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12, 0x10, 0x0a, - 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5, 0x0a, 0x12, - 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, - 0x72, 0x10, 0xa6, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x64, 0x64, 0x4d, - 0x61, 0x78, 0x45, 0x78, 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, - 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12, 0x0a, 0x0d, - 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10, 0xa9, 0x0a, - 0x12, 0x19, 0x0a, 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, - 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, - 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, - 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, - 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, - 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, - 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70, - 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, - 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xdd, 0x0b, 0x12, 0x15, 0x0a, - 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, - 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, - 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xdf, 0x0b, 0x12, 0x19, - 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, - 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, - 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, - 0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, - 0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e, - 0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, - 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, 0x0c, 0x12, 0x16, - 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f, - 0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, - 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc6, 0x0c, 0x12, - 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, - 0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, - 0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, 0x47, - 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, 0x53, 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d, - 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, - 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x07, 0x12, 0x16, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, + 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xee, 0x07, 0x12, 0x14, 0x0a, 0x0f, 0x56, 0x65, 0x72, + 0x69, 0x43, 0x6f, 0x64, 0x65, 0x4e, 0x6f, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x10, 0xef, 0x07, 0x12, + 0x14, 0x0a, 0x0f, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x45, 0x78, 0x70, 0x69, 0x72, + 0x65, 0x64, 0x10, 0xf0, 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, + 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf1, 0x07, 0x12, 0x16, 0x0a, 0x11, 0x55, 0x73, 0x65, + 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xf2, + 0x07, 0x12, 0x16, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, + 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xf3, 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x74, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xcc, 0x08, 0x12, 0x12, 0x0a, + 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4d, 0x61, 0x78, 0x10, 0xcd, + 0x08, 0x12, 0x14, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, + 0x74, 0x4d, 0x61, 0x78, 0x10, 0xce, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xcf, 0x08, 0x12, 0x17, + 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4e, 0x6f, + 0x44, 0x61, 0x74, 0x61, 0x10, 0xd0, 0x08, 0x12, 0x0e, 0x0a, 0x09, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x59, 0x65, 0x74, 0x10, 0xd1, 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x59, 0x65, 0x74, 0x10, 0xd2, 0x08, 0x12, 0x17, 0x0a, 0x12, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, + 0x65, 0x74, 0x10, 0xd3, 0x08, 0x12, 0x19, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, + 0x61, 0x72, 0x67, 0x65, 0x74, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd4, 0x08, + 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x45, + 0x72, 0x72, 0x6f, 0x72, 0x10, 0xd5, 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4d, 0x61, 0x78, 0x10, 0xd6, 0x08, 0x12, 0x1a, 0x0a, 0x15, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, + 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xd7, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x49, 0x74, 0x65, 0x6d, + 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xb0, 0x09, 0x12, 0x15, 0x0a, 0x10, + 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, + 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x72, 0x69, 0x64, + 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb2, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, + 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, 0x72, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, + 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, + 0x73, 0x65, 0x4e, 0x6f, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x10, 0xb4, + 0x09, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, + 0x10, 0x94, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, + 0x75, 0x67, 0x68, 0x10, 0x95, 0x0a, 0x12, 0x0e, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, + 0x78, 0x4c, 0x76, 0x10, 0x96, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, + 0x69, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, 0x10, 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, + 0x72, 0x6f, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x45, 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, + 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, + 0x99, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, + 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9a, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, + 0x4e, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, + 0x13, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x74, 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, + 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9c, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, + 0x6f, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x10, 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, + 0x72, 0x6f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, + 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, + 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, + 0x65, 0x6e, 0x10, 0xa0, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, + 0x6f, 0x63, 0x6b, 0x10, 0xa1, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, + 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xa2, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, + 0x6f, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, + 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, + 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, + 0x10, 0xa5, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, + 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa6, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, + 0x41, 0x64, 0x64, 0x4d, 0x61, 0x78, 0x45, 0x78, 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, + 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, + 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, + 0x76, 0x10, 0xa9, 0x0a, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, + 0x54, 0x79, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, + 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, + 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, + 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x1b, 0x0a, + 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69, 0x6e, 0x64, + 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, + 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xdd, + 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, + 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, + 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, + 0xdf, 0x0b, 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, + 0x70, 0x65, 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12, 0x1b, 0x0a, + 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, + 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, + 0x73, 0x6b, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, + 0x6b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, + 0x6b, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, + 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, + 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, + 0xc4, 0x0c, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, + 0x4e, 0x6f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, + 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, + 0x10, 0xc6, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, + 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, + 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, + 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xc9, 0x0c, 0x12, 0x10, + 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xca, 0x0c, + 0x12, 0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, 0x53, + 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f, + 0x70, 0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, + 0x68, 0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45, + 0x72, 0x72, 0x10, 0x88, 0x0e, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/userrecord.pb.go b/pb/userrecord.pb.go index 286d69329..b82da2b37 100644 --- a/pb/userrecord.pb.go +++ b/pb/userrecord.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.28.0 // protoc v3.20.0 -// source: hero/userrecord.proto +// source: userrecord.proto package pb @@ -32,7 +32,7 @@ type Floor struct { func (x *Floor) Reset() { *x = Floor{} if protoimpl.UnsafeEnabled { - mi := &file_hero_userrecord_proto_msgTypes[0] + mi := &file_userrecord_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *Floor) String() string { func (*Floor) ProtoMessage() {} func (x *Floor) ProtoReflect() protoreflect.Message { - mi := &file_hero_userrecord_proto_msgTypes[0] + mi := &file_userrecord_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *Floor) ProtoReflect() protoreflect.Message { // Deprecated: Use Floor.ProtoReflect.Descriptor instead. func (*Floor) Descriptor() ([]byte, []int) { - return file_hero_userrecord_proto_rawDescGZIP(), []int{0} + return file_userrecord_proto_rawDescGZIP(), []int{0} } func (x *Floor) GetH4() int32 { @@ -96,7 +96,7 @@ type DBUserRecord struct { func (x *DBUserRecord) Reset() { *x = DBUserRecord{} if protoimpl.UnsafeEnabled { - mi := &file_hero_userrecord_proto_msgTypes[1] + mi := &file_userrecord_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -109,7 +109,7 @@ func (x *DBUserRecord) String() string { func (*DBUserRecord) ProtoMessage() {} func (x *DBUserRecord) ProtoReflect() protoreflect.Message { - mi := &file_hero_userrecord_proto_msgTypes[1] + mi := &file_userrecord_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -122,7 +122,7 @@ func (x *DBUserRecord) ProtoReflect() protoreflect.Message { // Deprecated: Use DBUserRecord.ProtoReflect.Descriptor instead. func (*DBUserRecord) Descriptor() ([]byte, []int) { - return file_hero_userrecord_proto_rawDescGZIP(), []int{1} + return file_userrecord_proto_rawDescGZIP(), []int{1} } func (x *DBUserRecord) GetId() string { @@ -195,52 +195,52 @@ func (x *DBUserRecord) GetMtime() int64 { return 0 } -var File_hero_userrecord_proto protoreflect.FileDescriptor +var File_userrecord_proto protoreflect.FileDescriptor -var file_hero_userrecord_proto_rawDesc = []byte{ - 0x0a, 0x15, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x72, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72, - 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34, - 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35, - 0x22, 0x9c, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, - 0x30, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x31, 0x12, - 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, - 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x32, 0x12, 0x1c, 0x0a, - 0x05, 0x72, 0x61, 0x63, 0x65, 0x33, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, - 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x33, 0x12, 0x1c, 0x0a, 0x05, 0x72, - 0x61, 0x63, 0x65, 0x34, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, - 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x69, - 0x67, 0x67, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, - 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x69, 0x74, 0x79, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, - 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, - 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_userrecord_proto_rawDesc = []byte{ + 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x68, + 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34, 0x12, 0x0e, 0x0a, 0x02, 0x68, + 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35, 0x22, 0x9c, 0x02, 0x0a, 0x0c, + 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, + 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, + 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, + 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x12, 0x1c, 0x0a, 0x05, + 0x72, 0x61, 0x63, 0x65, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, + 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x31, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, + 0x63, 0x65, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, + 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x32, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, + 0x33, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, + 0x05, 0x72, 0x61, 0x63, 0x65, 0x33, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x34, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, + 0x61, 0x63, 0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x6e, + 0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, + 0x72, 0x6e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, + 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, + 0x74, 0x79, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_hero_userrecord_proto_rawDescOnce sync.Once - file_hero_userrecord_proto_rawDescData = file_hero_userrecord_proto_rawDesc + file_userrecord_proto_rawDescOnce sync.Once + file_userrecord_proto_rawDescData = file_userrecord_proto_rawDesc ) -func file_hero_userrecord_proto_rawDescGZIP() []byte { - file_hero_userrecord_proto_rawDescOnce.Do(func() { - file_hero_userrecord_proto_rawDescData = protoimpl.X.CompressGZIP(file_hero_userrecord_proto_rawDescData) +func file_userrecord_proto_rawDescGZIP() []byte { + file_userrecord_proto_rawDescOnce.Do(func() { + file_userrecord_proto_rawDescData = protoimpl.X.CompressGZIP(file_userrecord_proto_rawDescData) }) - return file_hero_userrecord_proto_rawDescData + return file_userrecord_proto_rawDescData } -var file_hero_userrecord_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_hero_userrecord_proto_goTypes = []interface{}{ +var file_userrecord_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_userrecord_proto_goTypes = []interface{}{ (*Floor)(nil), // 0: Floor (*DBUserRecord)(nil), // 1: DBUserRecord } -var file_hero_userrecord_proto_depIdxs = []int32{ +var file_userrecord_proto_depIdxs = []int32{ 0, // 0: DBUserRecord.race0:type_name -> Floor 0, // 1: DBUserRecord.race1:type_name -> Floor 0, // 2: DBUserRecord.race2:type_name -> Floor @@ -253,13 +253,13 @@ var file_hero_userrecord_proto_depIdxs = []int32{ 0, // [0:5] is the sub-list for field type_name } -func init() { file_hero_userrecord_proto_init() } -func file_hero_userrecord_proto_init() { - if File_hero_userrecord_proto != nil { +func init() { file_userrecord_proto_init() } +func file_userrecord_proto_init() { + if File_userrecord_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_hero_userrecord_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_userrecord_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Floor); i { case 0: return &v.state @@ -271,7 +271,7 @@ func file_hero_userrecord_proto_init() { return nil } } - file_hero_userrecord_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_userrecord_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBUserRecord); i { case 0: return &v.state @@ -288,18 +288,18 @@ func file_hero_userrecord_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_hero_userrecord_proto_rawDesc, + RawDescriptor: file_userrecord_proto_rawDesc, NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_hero_userrecord_proto_goTypes, - DependencyIndexes: file_hero_userrecord_proto_depIdxs, - MessageInfos: file_hero_userrecord_proto_msgTypes, + GoTypes: file_userrecord_proto_goTypes, + DependencyIndexes: file_userrecord_proto_depIdxs, + MessageInfos: file_userrecord_proto_msgTypes, }.Build() - File_hero_userrecord_proto = out.File - file_hero_userrecord_proto_rawDesc = nil - file_hero_userrecord_proto_goTypes = nil - file_hero_userrecord_proto_depIdxs = nil + File_userrecord_proto = out.File + file_userrecord_proto_rawDesc = nil + file_userrecord_proto_goTypes = nil + file_userrecord_proto_depIdxs = nil } From 6473ad595b9b5e047326f0fb93441b02b9705a18 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 26 Jul 2022 19:29:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=B1=E9=B8=A3=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_resonanceReset.go | 8 +-- modules/hero/api_resonanceSelect.go | 23 +----- modules/hero/model_hero.go | 48 ++++++++++++- pb/userrecord.pb.go | 108 ++++++++++++++-------------- 4 files changed, 105 insertions(+), 82 deletions(-) diff --git a/modules/hero/api_resonanceReset.go b/modules/hero/api_resonanceReset.go index 9e52a30ce..735f173d2 100644 --- a/modules/hero/api_resonanceReset.go +++ b/modules/hero/api_resonanceReset.go @@ -81,11 +81,9 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroReson code = pb.ErrorCode_DBError return } - err1 = this.module.modelHero.ChangeHeroProperty(session, _hero) // 推送属性变化 - if err1 != nil { - this.module.Errorf("ChangeHeroProperty err!") - } - session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: []*pb.DBHero{_hero}}) + // 计算属性 + this.module.modelHero.setEnergyProperty(_hero) + //session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: []*pb.DBHero{_hero}}) session.SendMsg(string(this.module.GetType()), ResonanceReset, &pb.HeroResonanceResetResp{Hero: _hero, Energy: _hero.ResonateNum}) return } diff --git a/modules/hero/api_resonanceSelect.go b/modules/hero/api_resonanceSelect.go index 3825fc6b0..0bf468ec5 100644 --- a/modules/hero/api_resonanceSelect.go +++ b/modules/hero/api_resonanceSelect.go @@ -3,7 +3,6 @@ package hero import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - "math" "google.golang.org/protobuf/proto" ) @@ -50,27 +49,7 @@ func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, req *pb.HeroR return } // 计算属性 - resonConfig, errr := this.module.configure.GetHeroResonanceConfig(_hero.HeroID) - if errr != nil { - code = pb.ErrorCode_ConfigNoFound - return - } - // 修改玩家属性 - property := make(map[string]int32, 0) - switch req.UseType { - case 1: - property[comm.Hp] = int32(math.Floor((1.0 + float64(resonConfig.Hppro*req.UseEnergy)/1000) * float64(_hero.Property[comm.Hp]))) - case 2: - property[comm.Atk] = int32(math.Floor((1.0 + float64(resonConfig.Atkpro*req.UseEnergy)/1000) * float64(_hero.Property[comm.Atk]))) - case 3: - property[comm.Def] = int32(math.Floor((1.0 + float64(resonConfig.Defpro*req.UseEnergy)/1000) * float64(_hero.Property[comm.Def]))) - } - this.module.modelHero.mergeMainProperty(session.GetUserId(), _hero, property) - - err1 = this.module.modelHero.ChangeHeroProperty(session, _hero) // 推送属性变化 - if err1 != nil { - this.module.Errorf("ChangeHeroProperty err!") - } + this.module.modelHero.setEnergyProperty(_hero) session.SendMsg(string(this.module.GetType()), ResonanceUseEnergy, &pb.HeroResonanceUseEnergyResp{Hero: _hero}) return } diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 22101aebc..fcb5fbb4c 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -266,6 +266,25 @@ func (this *ModelHero) getHeroList(uid string) []*pb.DBHero { return heroes } +// 设置共鸣能量点数属性 +func (this *ModelHero) setEnergyProperty(hero *pb.DBHero) { + resonConfig, err := this.moduleHero.configure.GetHeroResonanceConfig(hero.HeroID) + if err != nil { + return + } + EnergyProperty := make(map[string]int32) //副属性 + for k, v := range hero.Energy { + if k == 1 { + EnergyProperty[comm.Hp] += int32(math.Floor((1.0 + float64(resonConfig.Hppro*v)/1000) * float64(hero.Property[comm.Hp]))) + } else if k == 2 { + EnergyProperty[comm.Atk] += int32(math.Floor((1.0 + float64(resonConfig.Atkpro*v)/1000) * float64(hero.Property[comm.Atk]))) + } else if k == 3 { + EnergyProperty[comm.Def] += int32(math.Floor((1.0 + float64(resonConfig.Defpro*v)/1000) * float64(hero.Property[comm.Def]))) + } + } + this.mergeEnegryProperty(hero.Uid, hero, EnergyProperty) +} + // 设置装备属性 func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipment) { @@ -357,6 +376,17 @@ func (this *ModelHero) mergeAddProperty(uid string, hero *pb.DBHero, data map[st } } +// 合并附加能量属性 +func (this *ModelHero) mergeEnegryProperty(uid string, hero *pb.DBHero, data map[string]int32) { + //hero.EnergyProperty = data + + if err := this.ChangeList(uid, hero.Id, map[string]interface{}{ + "enegryProperty": data, + }); err != nil { + this.moduleHero.Errorf("mergeAddProperty err %v", err) + } +} + //属性计算 - 暂时放在modelHero里实现 //英雄基础属性 + 英雄等级基础属性 * 英雄成长系数 + 英雄星级对应等级属性 * 英雄品质系数 func (this *ModelHero) PropertyCompute(uid string, hero *pb.DBHero) { @@ -390,10 +420,26 @@ func (this *ModelHero) PropertyCompute(uid string, hero *pb.DBHero) { if lvGrow == nil { return } + resonConfig, err := this.moduleHero.configure.GetHeroResonanceConfig(hero.HeroID) + if err != nil { + return + } + + // 计算玩家共鸣属性 + property := make(map[string]int32, 0) + for keyType, value := range hero.Energy { + if keyType == 1 { + property[comm.Hp] += int32(math.Floor((1.0 + float64(resonConfig.Hppro*value)/1000) * float64(hero.Property[comm.Hp]))) + } else if keyType == 2 { + property[comm.Atk] += int32(math.Floor((1.0 + float64(resonConfig.Atkpro*value)/1000) * float64(hero.Property[comm.Atk]))) + } else if keyType == 3 { + property[comm.Def] += int32(math.Floor((1.0 + float64(resonConfig.Defpro*value)/1000) * float64(hero.Property[comm.Def]))) + } + } curHp := hero.Property[comm.Hp] exprHp := fmt.Sprintf("%v + %v * %v/1000 + %v * %v/1000", - (curHp + lvGrow.Hp), heroLvCfg.Hp, lvGrow.Hpgrow, heroStarCfg.Hp, stargrowCfg.StarupHp) + (curHp + lvGrow.Hp), heroLvCfg.Hp, lvGrow.Hpgrow, heroStarCfg.Hp, stargrowCfg) hp, _ := mengine.ParseAndExec(exprHp) curAtk := hero.Property[comm.Atk] diff --git a/pb/userrecord.pb.go b/pb/userrecord.pb.go index b82da2b37..286d69329 100644 --- a/pb/userrecord.pb.go +++ b/pb/userrecord.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.28.0 // protoc v3.20.0 -// source: userrecord.proto +// source: hero/userrecord.proto package pb @@ -32,7 +32,7 @@ type Floor struct { func (x *Floor) Reset() { *x = Floor{} if protoimpl.UnsafeEnabled { - mi := &file_userrecord_proto_msgTypes[0] + mi := &file_hero_userrecord_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *Floor) String() string { func (*Floor) ProtoMessage() {} func (x *Floor) ProtoReflect() protoreflect.Message { - mi := &file_userrecord_proto_msgTypes[0] + mi := &file_hero_userrecord_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *Floor) ProtoReflect() protoreflect.Message { // Deprecated: Use Floor.ProtoReflect.Descriptor instead. func (*Floor) Descriptor() ([]byte, []int) { - return file_userrecord_proto_rawDescGZIP(), []int{0} + return file_hero_userrecord_proto_rawDescGZIP(), []int{0} } func (x *Floor) GetH4() int32 { @@ -96,7 +96,7 @@ type DBUserRecord struct { func (x *DBUserRecord) Reset() { *x = DBUserRecord{} if protoimpl.UnsafeEnabled { - mi := &file_userrecord_proto_msgTypes[1] + mi := &file_hero_userrecord_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -109,7 +109,7 @@ func (x *DBUserRecord) String() string { func (*DBUserRecord) ProtoMessage() {} func (x *DBUserRecord) ProtoReflect() protoreflect.Message { - mi := &file_userrecord_proto_msgTypes[1] + mi := &file_hero_userrecord_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -122,7 +122,7 @@ func (x *DBUserRecord) ProtoReflect() protoreflect.Message { // Deprecated: Use DBUserRecord.ProtoReflect.Descriptor instead. func (*DBUserRecord) Descriptor() ([]byte, []int) { - return file_userrecord_proto_rawDescGZIP(), []int{1} + return file_hero_userrecord_proto_rawDescGZIP(), []int{1} } func (x *DBUserRecord) GetId() string { @@ -195,52 +195,52 @@ func (x *DBUserRecord) GetMtime() int64 { return 0 } -var File_userrecord_proto protoreflect.FileDescriptor +var File_hero_userrecord_proto protoreflect.FileDescriptor -var file_userrecord_proto_rawDesc = []byte{ - 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x68, - 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34, 0x12, 0x0e, 0x0a, 0x02, 0x68, - 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35, 0x22, 0x9c, 0x02, 0x0a, 0x0c, - 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, - 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, - 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, - 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x12, 0x1c, 0x0a, 0x05, - 0x72, 0x61, 0x63, 0x65, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, - 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x31, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, - 0x63, 0x65, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, - 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x32, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, - 0x33, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, - 0x05, 0x72, 0x61, 0x63, 0x65, 0x33, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x34, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, - 0x61, 0x63, 0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x6e, - 0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, - 0x72, 0x6e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, - 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, - 0x74, 0x79, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_hero_userrecord_proto_rawDesc = []byte{ + 0x0a, 0x15, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x72, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72, + 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34, + 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35, + 0x22, 0x9c, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, + 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, + 0x30, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x31, 0x12, + 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, + 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x32, 0x12, 0x1c, 0x0a, + 0x05, 0x72, 0x61, 0x63, 0x65, 0x33, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, + 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x33, 0x12, 0x1c, 0x0a, 0x05, 0x72, + 0x61, 0x63, 0x65, 0x34, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, + 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x69, + 0x67, 0x67, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, + 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, + 0x69, 0x76, 0x69, 0x74, 0x79, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, + 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_userrecord_proto_rawDescOnce sync.Once - file_userrecord_proto_rawDescData = file_userrecord_proto_rawDesc + file_hero_userrecord_proto_rawDescOnce sync.Once + file_hero_userrecord_proto_rawDescData = file_hero_userrecord_proto_rawDesc ) -func file_userrecord_proto_rawDescGZIP() []byte { - file_userrecord_proto_rawDescOnce.Do(func() { - file_userrecord_proto_rawDescData = protoimpl.X.CompressGZIP(file_userrecord_proto_rawDescData) +func file_hero_userrecord_proto_rawDescGZIP() []byte { + file_hero_userrecord_proto_rawDescOnce.Do(func() { + file_hero_userrecord_proto_rawDescData = protoimpl.X.CompressGZIP(file_hero_userrecord_proto_rawDescData) }) - return file_userrecord_proto_rawDescData + return file_hero_userrecord_proto_rawDescData } -var file_userrecord_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_userrecord_proto_goTypes = []interface{}{ +var file_hero_userrecord_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_hero_userrecord_proto_goTypes = []interface{}{ (*Floor)(nil), // 0: Floor (*DBUserRecord)(nil), // 1: DBUserRecord } -var file_userrecord_proto_depIdxs = []int32{ +var file_hero_userrecord_proto_depIdxs = []int32{ 0, // 0: DBUserRecord.race0:type_name -> Floor 0, // 1: DBUserRecord.race1:type_name -> Floor 0, // 2: DBUserRecord.race2:type_name -> Floor @@ -253,13 +253,13 @@ var file_userrecord_proto_depIdxs = []int32{ 0, // [0:5] is the sub-list for field type_name } -func init() { file_userrecord_proto_init() } -func file_userrecord_proto_init() { - if File_userrecord_proto != nil { +func init() { file_hero_userrecord_proto_init() } +func file_hero_userrecord_proto_init() { + if File_hero_userrecord_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_userrecord_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_hero_userrecord_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Floor); i { case 0: return &v.state @@ -271,7 +271,7 @@ func file_userrecord_proto_init() { return nil } } - file_userrecord_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_hero_userrecord_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBUserRecord); i { case 0: return &v.state @@ -288,18 +288,18 @@ func file_userrecord_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_userrecord_proto_rawDesc, + RawDescriptor: file_hero_userrecord_proto_rawDesc, NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_userrecord_proto_goTypes, - DependencyIndexes: file_userrecord_proto_depIdxs, - MessageInfos: file_userrecord_proto_msgTypes, + GoTypes: file_hero_userrecord_proto_goTypes, + DependencyIndexes: file_hero_userrecord_proto_depIdxs, + MessageInfos: file_hero_userrecord_proto_msgTypes, }.Build() - File_userrecord_proto = out.File - file_userrecord_proto_rawDesc = nil - file_userrecord_proto_goTypes = nil - file_userrecord_proto_depIdxs = nil + File_hero_userrecord_proto = out.File + file_hero_userrecord_proto_rawDesc = nil + file_hero_userrecord_proto_goTypes = nil + file_hero_userrecord_proto_depIdxs = nil } From 35f451ee67c388e724142a763ccacd5530dda31c Mon Sep 17 00:00:00 2001 From: zhaocy Date: Tue, 26 Jul 2022 19:42:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A5=96=E5=8A=B1?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_taskactivereward.json | 88 ++++-- bin/json/game_taskround.json | 398 +++++++++++----------------- 2 files changed, 228 insertions(+), 258 deletions(-) diff --git a/bin/json/game_taskactivereward.json b/bin/json/game_taskactivereward.json index 6ba67596e..1deb56ed5 100644 --- a/bin/json/game_taskactivereward.json +++ b/bin/json/game_taskactivereward.json @@ -6,8 +6,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 100 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 } ] }, @@ -18,8 +23,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 150 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 } ] }, @@ -30,8 +40,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 200 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 } ] }, @@ -42,8 +57,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 250 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 } ] }, @@ -54,8 +74,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 300 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 } ] }, @@ -66,8 +91,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 350 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 } ] }, @@ -78,8 +108,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 400 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 } ] }, @@ -90,8 +125,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 450 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 } ] }, @@ -102,8 +142,13 @@ "reword": [ { "a": "attr", - "t": "exp", + "t": "gold", "n": 500 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 } ] }, @@ -114,8 +159,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 550 + }, + { + "a": "attr", + "t": "diamond", + "n": 50 } ] } diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json index 00ab0fc4f..467b01961 100644 --- a/bin/json/game_taskround.json +++ b/bin/json/game_taskround.json @@ -11,13 +11,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 10002, @@ -31,13 +25,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 10003, @@ -51,13 +39,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 10004, @@ -71,13 +53,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 10005, @@ -91,13 +67,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 10006, @@ -111,13 +81,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 10007, @@ -131,13 +95,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 10008, @@ -151,13 +109,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 10009, @@ -171,13 +123,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 10010, @@ -191,13 +137,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 20001, @@ -211,13 +151,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 20002, @@ -231,13 +165,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 20003, @@ -251,13 +179,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 20004, @@ -271,13 +193,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 20005, @@ -291,13 +207,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 20006, @@ -311,13 +221,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 20007, @@ -331,13 +235,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 20008, @@ -351,13 +249,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 20009, @@ -371,13 +263,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 20010, @@ -391,13 +277,7 @@ "id_after": 0, "jump_interface": "mainworld", "icon": "wp_icon_0001", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] + "reword": [] }, { "key": 30001, @@ -414,8 +294,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 150 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -434,8 +319,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 300 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -454,8 +344,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 450 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -474,8 +369,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 600 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -494,8 +394,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 750 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -514,8 +419,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 900 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -534,8 +444,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 1050 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -554,8 +469,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 1200 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -574,8 +494,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 1350 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -594,8 +519,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 1500 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -614,8 +544,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 1650 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -634,8 +569,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 1800 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -654,8 +594,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 1950 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -674,8 +619,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 2100 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -694,8 +644,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 2250 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -714,8 +669,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 2400 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -734,8 +694,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 2550 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -754,8 +719,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 2700 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -774,8 +744,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 + "t": "gold", + "n": 2850 + }, + { + "a": "item", + "t": "10006", + "n": 1 } ] }, @@ -794,68 +769,13 @@ "reword": [ { "a": "attr", - "t": "exp", - "n": 500 - } - ] - }, - { - "key": 40000, - "id_list": 41, - "id_tag": 4, - "task_display": "释放1技能", - "type_id": 401, - "condition_second": 1, - "restrictive_condition": 13001, - "active": 0, - "id_after": 0, - "jump_interface": "mainworld", - "icon": "rw_cj_icon15", - "reword": [ + "t": "gold", + "n": 3000 + }, { - "a": "attr", - "t": "exp", - "n": 500 - } - ] - }, - { - "key": 40001, - "id_list": 42, - "id_tag": 4, - "task_display": "释放2技能", - "type_id": 402, - "condition_second": 2, - "restrictive_condition": 13001, - "active": 0, - "id_after": 0, - "jump_interface": "mainworld", - "icon": "rw_cj_icon16", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 - } - ] - }, - { - "key": 40002, - "id_list": 43, - "id_tag": 4, - "task_display": "战斗胜利", - "type_id": 403, - "condition_second": 1, - "restrictive_condition": 13001, - "active": 0, - "id_after": 0, - "jump_interface": "mainworld", - "icon": "rw_cj_icon17", - "reword": [ - { - "a": "attr", - "t": "exp", - "n": 500 + "a": "item", + "t": "10006", + "n": 1 } ] }