错误对象构建

This commit is contained in:
meixiongfeng 2023-05-30 18:32:34 +08:00
parent bd4d8504b9
commit a99388c5f8
24 changed files with 134 additions and 67 deletions

View File

@ -18,11 +18,14 @@ func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateRe
if code = this.ActivateCheck(session, req); code != pb.ErrorCode_Success {
return
}
data = &pb.ErrorData{}
atlasConf, err := this.module.configure.GetPandoAtlasConf(req.Id)
if err != nil {
code = pb.ErrorCode_ConfigNoFound // 返回错误码
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
list, _ := this.module.modelPandaAtlas.getPandaAtlasList(session.GetUserId())

View File

@ -23,7 +23,6 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
upperLimit int32 // 单个物品堆叠上限
)
data = &pb.ErrorData{}
update = make(map[string]interface{})
if code = this.BuyOrSellCheck(session, req); code != pb.ErrorCode_Success {
return // 参数校验失败直接返回
@ -39,7 +38,10 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
if err == nil {
upperLimit = c.Bagtagnum // 获取单个格子堆叠数
} else {
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
code = pb.ErrorCode_ConfigNoFound
return
}
@ -64,7 +66,10 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
price = cityConf.Specialnum * price / 1000
bFound = true
} else {
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
code = pb.ErrorCode_ConfigNoFound
return
}
@ -101,7 +106,10 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
update["lv"] = curLv
update["baglimit"] = c.Bagtop
} else {
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
code = pb.ErrorCode_ConfigNoFound
return
}
@ -151,7 +159,10 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
update["city"] = caravan.City
addScore -= price * v
} else {
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
code = pb.ErrorCode_ConfigNoFound
return
}

View File

@ -17,7 +17,6 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListRe
var (
resp *pb.CaravanGetListResp
)
data = &pb.ErrorData{}
resp = &pb.CaravanGetListResp{}
if code = this.GetListCheck(session, req); code != pb.ErrorCode_Success {
return // 参数校验失败直接返回
@ -28,7 +27,10 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListRe
if conf, err := this.module.configure.GetCaravanLv(list.Lv); err == nil {
this.module.ModuleItems.CleanItemById(session, conf.Tickettop.T) // 清理之前的门票数据
} else {
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
code = pb.ErrorCode_ConfigNoFound
return
}

View File

@ -20,7 +20,6 @@ func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStory
update map[string]interface{}
bAccept bool
)
data = &pb.ErrorData{}
resp = &pb.CaravanGetStoryResp{}
update = make(map[string]interface{})
if code = this.GetStoryCheck(session, req); code != pb.ErrorCode_Success {
@ -30,7 +29,10 @@ func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStory
conf, err := this.module.configure.GetCaravanEventById(req.Cid)
if err != nil {
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
code = pb.ErrorCode_ConfigNoFound
return
}

View File

@ -21,7 +21,6 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity
res *cfg.Gameatn
bNewTask bool
)
data = &pb.ErrorData{}
resp = &pb.CaravanGotoCityResp{}
bNewTask = false
if code = this.GotoCityCheck(session, req); code != pb.ErrorCode_Success {
@ -43,7 +42,10 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity
bNewTask = false
}
} else {
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
code = pb.ErrorCode_ConfigNoFound
return
}
@ -74,7 +76,10 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity
N: req.Ticket,
}
} else {
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
code = pb.ErrorCode_ConfigNoFound
return
}

View File

@ -22,7 +22,6 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallen
if code != pb.ErrorCode_Success {
return // 参数校验失败直接返回
}
data = &pb.ErrorData{}
enchant, err := this.module.modelEnchant.getEnchantList(session.GetUserId())
if err != nil {
code = pb.ErrorCode_PagodaNotFound
@ -32,7 +31,10 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallen
cfgData, err := this.module.configure.GetEnchantBossConfigData(req.BossType)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
if len(cfgData) <= 0 {

View File

@ -21,7 +21,6 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha
bWin bool // 战斗是否胜利
score int32 // 通关获得分数
)
data = &pb.ErrorData{}
mapData = make(map[string]interface{}, 0)
// reward = make([]*cfg.Gameatn, 0)
code = this.ChallengeOverCheck(session, req)
@ -38,7 +37,10 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha
cfgEnchant, err := this.module.configure.GetEnchantBossConfigData(req.BossType)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}

View File

@ -16,7 +16,7 @@ func (this *apiComp) ActivateAtlasCheck(session comm.IUserSession, req *pb.Gourm
}
func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (code pb.ErrorCode, data *pb.ErrorData) {
data = &pb.ErrorData{}
code = this.ActivateAtlasCheck(session, req)
if code != pb.ErrorCode_Success {
return // 参数校验失败直接返回
@ -24,7 +24,10 @@ func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetAct
conf, err := this.configure.GetGrormetCookBookConf(req.Cid)
if err != nil { // 配置校验
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
_gourmet, err := this.module.modelAtlas.getGourmetAtlasList(session.GetUserId())

View File

@ -21,7 +21,6 @@ func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreate
curFood string // 做出来的食物ID
bFirst bool // 是否首次获得
)
data = &pb.ErrorData{}
code = this.CreateFoodCheck(session, req)
if code != pb.ErrorCode_Success {
return // 参数校验失败直接返回
@ -29,7 +28,10 @@ func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreate
conf, err := this.configure.GetGrormetCookBookConf(req.Cid)
if err != nil { // 配置校验
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}

View File

@ -28,7 +28,6 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
err error
bManAwaken bool // 是否达到满级共鸣
)
data = &pb.ErrorData{}
_heroMap = make(map[string]interface{}, 0)
chanegCard = make([]*pb.DBHero, 0)
code = this.AwakenCheck(session, req) // check
@ -42,9 +41,11 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
awakenData, err = this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)
if err != nil {
data = &pb.ErrorData{}
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
if len(awakenData.Phasebonus) < 2 { // 配置校验
@ -142,7 +143,10 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
} else {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...)

View File

@ -31,7 +31,6 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb
udata *pb.DBUser
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
)
data = &pb.ErrorData{}
update = make(map[string]interface{})
if code = this.BuyCheck(session, req); code != pb.ErrorCode_Success {
return
@ -43,7 +42,10 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb
if conf, err = this.module.configure.GetShopItemsConfigureByGroups(req.BuyType, udata); err != nil { // 找配置
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}

View File

@ -33,7 +33,6 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
update map[string]interface{}
normalDraw bool // 是否是普通抽
)
data = &pb.ErrorData{}
update = make(map[string]interface{})
cfgDraw = this.module.ModuleTools.GetGlobalConf() // 读取抽卡配置文件
if cfgDraw == nil {
@ -270,7 +269,10 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
_data, err := this.module.configure.GetPollByType(strPool[index])
if err != nil {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
sz := make([]int32, 0)

View File

@ -22,7 +22,6 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (c
_costMaphero map[string]*pb.DBHero
ChangeList []*pb.DBHero // 变化的英雄数据
)
data = &pb.ErrorData{}
ChangeList = make([]*pb.DBHero, 0)
_costMaphero = make(map[string]*pb.DBHero, 0)
mapHero = make(map[string]int32)
@ -32,7 +31,10 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (c
conf, err := this.module.configure.GetHeroFucionConfig(req.HeroId)
if err != nil {
code = pb.ErrorCode_ConfigNoFound // 配置没找到
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
for _, v := range req.Heros {

View File

@ -25,7 +25,6 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
cost []*cfg.Gameatn // 技能升级消耗
lvUpCount int32 // 技能升级的次数
)
data = &pb.ErrorData{}
code = this.StrengthenUpSkillCheck(session, req) // check
if code != pb.ErrorCode_Success {
return
@ -38,7 +37,10 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
heroCfg, err := this.module.configure.GetHeroConfig(_hero.HeroID)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
for _, v1 := range req.Item {
@ -80,7 +82,10 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
skillData, err := this.module.configure.GetHeroSkillUpConfig(skill.SkillID)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
sz = append(sz, skillData.Probability[skill.SkillLv])

View File

@ -23,7 +23,6 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
_hero *pb.DBHero // 目标英雄
err error
)
data = &pb.ErrorData{}
code = this.StrengthenUpStarCheck(session, req) // check
if code != pb.ErrorCode_Success {
return
@ -37,13 +36,19 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
starConf, err = this.module.configure.GetHeroStarupConfig(_hero.HeroID, _hero.Star)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
heroConf, err := this.module.configure.GetHeroConfig(_hero.HeroID)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
nextHeroConfig, _ := this.module.configure.GetHeroStarupConfig(_hero.HeroID, _hero.Star+1)

View File

@ -25,7 +25,6 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
_hero *pb.DBHero // 目标英雄
cost []*cfg.Gameatn // 消耗的道具
)
data = &pb.ErrorData{}
code = this.StrengthenUplvCheck(session, req) // check
if code != pb.ErrorCode_Success {
return
@ -50,7 +49,10 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
costGold += expConf.Needgold * v
} else {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
}

View File

@ -23,7 +23,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
chanegCard []*pb.DBHero // 推送属性变化
res []*cfg.Gameatn // 学习天赋需要消耗的道具
)
data = &pb.ErrorData{}
chanegCard = make([]*pb.DBHero, 0)
if code = this.TalentLearnCheck(session, req); code != pb.ErrorCode_Success {
return
@ -62,7 +62,10 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
talentConf, err := this.module.configure.GetHeroTalent(req.TalentID)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
// 校验

View File

@ -20,7 +20,6 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe
chanegCard []*pb.DBHero // 推送属性变化
talentPoint int32 // 已经消耗的天赋点数
)
data = &pb.ErrorData{}
if code = this.TalentResetCheck(session, req); code != pb.ErrorCode_Success {
return
}
@ -47,7 +46,10 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe
talentPoint += conf.Point // 获取当前英雄的天赋点数
} else {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
}

View File

@ -22,7 +22,6 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe
var (
update map[string]interface{}
)
data = &pb.ErrorData{}
update = make(map[string]interface{}, 0)
resp := &pb.LibraryGetStoryRewardResp{}
code = this.GetStoryRewardCheck(session, req)
@ -37,7 +36,10 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe
favorConf, err := this.module.configure.GetFavorability(_heroFetter.Heroid, 1) // 取1级的就可以
if err != nil {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
// 领取传记往事id

View File

@ -19,7 +19,7 @@ func (this *apiComp) LvRewardCheck(session comm.IUserSession, req *pb.LibraryLvR
// 英雄回礼
func (this *apiComp) LvReward(session comm.IUserSession, req *pb.LibraryLvRewardReq) (code pb.ErrorCode, data *pb.ErrorData) {
data = &pb.ErrorData{}
resp := &pb.LibraryLvRewardResp{}
code = this.LvRewardCheck(session, req)
if code != pb.ErrorCode_Success {
@ -41,7 +41,10 @@ func (this *apiComp) LvReward(session comm.IUserSession, req *pb.LibraryLvReward
confData, err := this.module.configure.GetFavorability(_heroFetter.Heroid, req.Lv)
if err != nil {
code = pb.ErrorCode_ReqParameterError
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}

View File

@ -27,7 +27,6 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
addExp int32 // 获得的经验
sCount int32 // 赠送开始次数
)
data = &pb.ErrorData{}
attenuation = make(map[int32]int32, 0)
code = this.UseGiftCheck(session, req)
if code != pb.ErrorCode_Success {
@ -43,7 +42,10 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
_exp, err := this.module.configure.GetFavorabilityExp(_heroObj.Heroid)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
maxLv = int32(len(_exp)) // 获取当前星级羁绊最大等级
@ -75,7 +77,10 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
_c, err := this.module.configure.GetFavorability(_heroObj.Heroid, _heroObj.Favorlv)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
for _, v := range _c.LikesFood { // 喜欢的食物
@ -158,7 +163,10 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
})
} else {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
}

View File

@ -18,7 +18,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MlineGetLis
///获取主线关卡信息
func (this *apiComp) GetList(session comm.IUserSession, req *pb.MlineGetListReq) (code pb.ErrorCode, data *pb.ErrorData) {
rsp := &pb.MlineGetListResp{}
data = &pb.ErrorData{}
code = this.GetListCheck(session, req)
if code != pb.ErrorCode_Success {
return // 参数校验失败直接返回
@ -52,7 +52,10 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.MlineGetListReq)
}
} else {
code = pb.ErrorCode_ConfigNoFound
data.Message = err.Error()
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
}

View File

@ -61,24 +61,16 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.PracticeUpgradeR
}
switch pillar.Lv {
case 2:
if err := this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100002"); err != nil {
data.Message = err.Error()
}
this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100002")
break
case 3:
if this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100003"); err != nil {
data.Message = err.Error()
}
this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100003")
break
case 4:
if this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100004"); err != nil {
data.Message = err.Error()
}
this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100004")
break
case 5:
if this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100005"); err != nil {
data.Message = err.Error()
}
this.module.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), "100005")
break
}
this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{

View File

@ -172,7 +172,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
var szTask []*pb.BuriedParam
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype73, 1, req.BossId, req.Difficulty))
//szTask = append(szTask, comm.GetBuriedParam(comm.Rtype74, req.BossId, req.Difficulty))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype78, req.BossId, req.Difficulty, req.Report.Costtime))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype78, req.BossId, req.Report.Costtime/1000, req.Difficulty))
if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 {
for _, v := range req.Report.Info.Redflist[0].Team {