diff --git a/modules/activity/module.go b/modules/activity/module.go index d253fc949..b23fcc2d5 100644 --- a/modules/activity/module.go +++ b/modules/activity/module.go @@ -290,23 +290,9 @@ func (this *Activity) GetHdData(session comm.IUserSession, oids []string) (resul continue } } - if activity.Itype == pb.HdType_HdLevel || activity.Itype == pb.HdType_HdCelebration { + if activity.Itype == pb.HdType_HdCelebration { list, _ = this.modelhdData.getHddataByOid(session.GetUserId(), id) - // 开服等级活动 - if activity.Itype == pb.HdType_HdLevel { - if user := this.ModuleUser.GetUser(session.GetUserId()); user != nil { - if list.Val != user.Lv { - list.Val = user.Lv - list.Lasttime = curTime - update := make(map[string]interface{}) - update["lasttime"] = list.Lasttime - update["val"] = list.Val - this.modelhdData.ModifyActivityList(session.GetUserId(), list.Id, update) - } - } - } - // 获取开服庆典活动 if activity.Itype == pb.HdType_HdCelebration { // key := fmt.Sprintf("%s-%s", session.GetUserId(), id) diff --git a/pb/activity_db.pb.go b/pb/activity_db.pb.go index 7a741fd34..d3c01d06a 100644 --- a/pb/activity_db.pb.go +++ b/pb/activity_db.pb.go @@ -30,8 +30,8 @@ const ( HdType_XSFundPhysical HdType = 4 //现时活动 体力基金 HdType_XSFundRecruit HdType = 5 //现时活动 招募基金 HdType_XSFundExp HdType = 6 //现时活动 经验基金 - HdType_HdLevel HdType = 7 //开服等级活动 - HdType_HdTypeSign HdType = 8 //七日签到 + //HdType_HdLevel HdType = 7 //开服等级活动 + //HdType_HdTypeSign HdType = 8 //七日签到 HdType_HdTypeDraw HdType = 9 //圣桃招募 HdType_AddUpRecharge HdType = 10 //累计充值 HdType_ShopCenterPayPakcge HdType = 11 //活动中心限时礼包 diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index ee4b4bd19..6fd367f13 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -443,6 +443,8 @@ const ( ErrorCode_ActivityNotIntime ErrorCode = 5004 // 不在活动时间范围 ErrorCode_ActivityInvalid ErrorCode = 5005 // 不存在的活动 ErrorCode_ActivityCantReward ErrorCode = 5006 // 还不能领奖 + //捕羊大赛的 + ErrorCode_CapturesheepRankCloseed ErrorCode = 5101 //排位比赛不在开启时间内 ) // Enum value maps for ErrorCode. @@ -825,6 +827,7 @@ var ( 5004: "ActivityNotIntime", 5005: "ActivityInvalid", 5006: "ActivityCantReward", + 5101: "CapturesheepRankCloseed", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -1204,6 +1207,7 @@ var ( "ActivityNotIntime": 5004, "ActivityInvalid": 5005, "ActivityCantReward": 5006, + "CapturesheepRankCloseed": 5101, } ) @@ -1238,7 +1242,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, 0xf3, 0x45, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0x91, 0x46, 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, 0x14, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, @@ -1797,8 +1801,10 @@ var file_errorcode_proto_rawDesc = []byte{ 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x10, 0x8c, 0x27, 0x12, 0x14, 0x0a, 0x0f, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x8d, 0x27, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x43, 0x61, 0x6e, 0x74, 0x52, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x10, 0x8e, 0x27, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x77, 0x61, 0x72, 0x64, 0x10, 0x8e, 0x27, 0x12, 0x1c, 0x0a, 0x17, 0x43, 0x61, 0x70, 0x74, 0x75, + 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6c, 0x6f, 0x73, 0x65, + 0x65, 0x64, 0x10, 0xed, 0x27, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var (