diff --git a/modules/atlas/api_atlasactivate.go b/modules/atlas/api_atlasactivate.go index faf8a5bba..e654b289e 100644 --- a/modules/atlas/api_atlasactivate.go +++ b/modules/atlas/api_atlasactivate.go @@ -22,7 +22,10 @@ func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateRe 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()) diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go index 4c1f582a6..e893aca73 100644 --- a/modules/caravan/api_buyorsell.go +++ b/modules/caravan/api_buyorsell.go @@ -21,6 +21,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe cityInfo *pb.CityInfo ok bool upperLimit int32 // 单个物品堆叠上限 + ) update = make(map[string]interface{}) if code = this.BuyOrSellCheck(session, req); code != pb.ErrorCode_Success { @@ -37,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 } @@ -62,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 } @@ -99,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 } @@ -149,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 } diff --git a/modules/caravan/api_getlist.go b/modules/caravan/api_getlist.go index ebcd1b235..680328b61 100644 --- a/modules/caravan/api_getlist.go +++ b/modules/caravan/api_getlist.go @@ -27,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 } diff --git a/modules/caravan/api_getstory.go b/modules/caravan/api_getstory.go index 8e6fdd100..2ddd68a89 100644 --- a/modules/caravan/api_getstory.go +++ b/modules/caravan/api_getstory.go @@ -29,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 } diff --git a/modules/caravan/api_gotocity.go b/modules/caravan/api_gotocity.go index bc88ab269..a7f8f4165 100644 --- a/modules/caravan/api_gotocity.go +++ b/modules/caravan/api_gotocity.go @@ -42,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 } @@ -73,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 } diff --git a/modules/enchant/api_challenge.go b/modules/enchant/api_challenge.go index 313007850..d7a9d362d 100644 --- a/modules/enchant/api_challenge.go +++ b/modules/enchant/api_challenge.go @@ -22,7 +22,6 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallen if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } - 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 { diff --git a/modules/enchant/api_challengeover.go b/modules/enchant/api_challengeover.go index 3083dacd9..769c47ea4 100644 --- a/modules/enchant/api_challengeover.go +++ b/modules/enchant/api_challengeover.go @@ -37,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 } diff --git a/modules/gourmet/api_activateatlas.go b/modules/gourmet/api_activateatlas.go index 24f1657dc..35f8d19ad 100644 --- a/modules/gourmet/api_activateatlas.go +++ b/modules/gourmet/api_activateatlas.go @@ -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()) diff --git a/modules/gourmet/api_createfood.go b/modules/gourmet/api_createfood.go index cb5fa4920..55984ee4d 100644 --- a/modules/gourmet/api_createfood.go +++ b/modules/gourmet/api_createfood.go @@ -28,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 } diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index dc97a32bd..52d92669a 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -42,7 +42,10 @@ 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 { code = pb.ErrorCode_ConfigNoFound - data.Message = err.Error() + data = &pb.ErrorData{ + Title: pb.GetErrorCodeMsg(code), + Message: err.Error(), + } return } if len(awakenData.Phasebonus) < 2 { // 配置校验 @@ -140,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...) diff --git a/modules/hero/api_buy.go b/modules/hero/api_buy.go index d6683b2d6..149c1ab25 100644 --- a/modules/hero/api_buy.go +++ b/modules/hero/api_buy.go @@ -42,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 } diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index d40e9c611..59c461bba 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -269,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) diff --git a/modules/hero/api_fusion.go b/modules/hero/api_fusion.go index ce63d6807..a26febedc 100644 --- a/modules/hero/api_fusion.go +++ b/modules/hero/api_fusion.go @@ -31,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 { diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index 488ad1085..539eb863a 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -25,7 +25,6 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt cost []*cfg.Gameatn // 技能升级消耗 lvUpCount int32 // 技能升级的次数 ) - 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]) diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index f1d05126f..1299bcfef 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -23,7 +23,6 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr _hero *pb.DBHero // 目标英雄 err error ) - 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) diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go index 58ce429dc..04f024657 100644 --- a/modules/hero/api_strengthenUplv.go +++ b/modules/hero/api_strengthenUplv.go @@ -49,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 } } diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go index a720d4d6e..3e4c416a7 100644 --- a/modules/hero/api_talentlearn.go +++ b/modules/hero/api_talentlearn.go @@ -23,6 +23,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe chanegCard []*pb.DBHero // 推送属性变化 res []*cfg.Gameatn // 学习天赋需要消耗的道具 ) + chanegCard = make([]*pb.DBHero, 0) if code = this.TalentLearnCheck(session, req); code != pb.ErrorCode_Success { return @@ -61,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 } // 校验 diff --git a/modules/hero/api_talentreset.go b/modules/hero/api_talentreset.go index dcba69038..6a8a47032 100644 --- a/modules/hero/api_talentreset.go +++ b/modules/hero/api_talentreset.go @@ -46,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 } } diff --git a/modules/hunting/model_hunting.go b/modules/hunting/model_hunting.go index 04672c07f..699f76c9a 100644 --- a/modules/hunting/model_hunting.go +++ b/modules/hunting/model_hunting.go @@ -42,6 +42,7 @@ func (this *modelHunting) getHuntingList(uid string) (result *pb.DBHunting, err Uid: uid, Boss: make(map[int32]int32), BossTime: make(map[string]int32), + Ps: map[int32]int32{}, } this.Add(uid, result) diff --git a/modules/library/api_getstoryreward.go b/modules/library/api_getstoryreward.go index 1d4359fbc..c7f289d40 100644 --- a/modules/library/api_getstoryreward.go +++ b/modules/library/api_getstoryreward.go @@ -36,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 diff --git a/modules/library/api_lvreward.go b/modules/library/api_lvreward.go index 50732dbc3..3026d56c1 100644 --- a/modules/library/api_lvreward.go +++ b/modules/library/api_lvreward.go @@ -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 } diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index a00237f8e..0c23d5d93 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -42,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)) // 获取当前星级羁绊最大等级 @@ -74,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 { // 喜欢的食物 @@ -157,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 } } diff --git a/modules/mline/api_getlist.go b/modules/mline/api_getlist.go index 9b78c10d5..04d43886c 100644 --- a/modules/mline/api_getlist.go +++ b/modules/mline/api_getlist.go @@ -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 } } diff --git a/modules/practice/api_upgrade.go b/modules/practice/api_upgrade.go index d26a27c08..dbb58e636 100644 --- a/modules/practice/api_upgrade.go +++ b/modules/practice/api_upgrade.go @@ -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{}{ diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index db6b14ba2..dd22763fd 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -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 { diff --git a/modules/viking/model_viking.go b/modules/viking/model_viking.go index 792e46520..140dda568 100644 --- a/modules/viking/model_viking.go +++ b/modules/viking/model_viking.go @@ -37,6 +37,7 @@ func (this *modelViking) getVikingList(uid string) (result *pb.DBViking, err err Uid: uid, Boss: make(map[int32]int32), BossTime: make(map[string]int32), + Ps: make(map[int32]int32), } err = nil this.module.modelViking.Add(uid, result)