From f016a11cd4a306f8e5ec69d8c4febeee55598abd Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 1 Jul 2022 16:21:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_awaken.go | 2 +- modules/hero/api_chouka.go | 2 +- modules/hero/api_resonance.go | 2 +- modules/hero/api_resonanceReset.go | 2 +- modules/hero/api_resonanceSelect.go | 4 ++-- modules/hero/api_skillUp.go | 2 +- modules/hero/api_starUp.go | 2 +- modules/hero/api_strengthen.go | 2 +- modules/mail/api_delmail.go | 6 ++++-- modules/mail/api_getAttachment.go | 6 ++++-- modules/mail/api_getmail.go | 6 ++++-- modules/mail/api_readmail.go | 6 ++++-- 12 files changed, 25 insertions(+), 17 deletions(-) diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index c9f2a715c..31404ecff 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -21,7 +21,7 @@ func (this *apiComp) AwakenCheck(session comm.IUserSession, req *pb.HeroAwakenRe } /// 英雄觉醒 -func (this *apiComp) Awaken(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroAwakenReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (code pb.ErrorCode, data proto.Message) { var ( awakenData *cfg.Game_heroAwakenData bCheckOk bool diff --git a/modules/hero/api_chouka.go b/modules/hero/api_chouka.go index c4eb7e01c..14e97c1f6 100644 --- a/modules/hero/api_chouka.go +++ b/modules/hero/api_chouka.go @@ -13,7 +13,7 @@ func (this *apiComp) ChoukaCheck(session comm.IUserSession, req *pb.HeroChoukaRe } //抽卡 -func (this *apiComp) Chouka(session comm.IUserSession, result map[string]interface{}, req *pb.HeroChoukaReq) (code pb.ErrorCode) { +func (this *apiComp) Chouka(session comm.IUserSession, req *pb.HeroChoukaReq) (code pb.ErrorCode) { rsp := &pb.HeroChoukaResp{} defer func() { diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go index 8f9133a8d..ab7555fb4 100644 --- a/modules/hero/api_resonance.go +++ b/modules/hero/api_resonance.go @@ -19,7 +19,7 @@ func (this *apiComp) ResonanceCheck(session comm.IUserSession, req *pb.HeroReson } /// 英雄共鸣 -func (this *apiComp) Resonance(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroResonanceReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceReq) (code pb.ErrorCode, data proto.Message) { bCheckOk := true _hero, code := this.module.GetHero(session.GetUserId(), req.HeroObjID) // 查询目标卡是否存在 diff --git a/modules/hero/api_resonanceReset.go b/modules/hero/api_resonanceReset.go index 310a97a7b..25c40bb86 100644 --- a/modules/hero/api_resonanceReset.go +++ b/modules/hero/api_resonanceReset.go @@ -19,7 +19,7 @@ func (this *apiComp) ResonanceResetCheck(session comm.IUserSession, req *pb.Hero } /// 英雄共鸣 -func (this *apiComp) ResonanceReset(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroResonanceResetReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroResonanceResetReq) (code pb.ErrorCode, data proto.Message) { _hero, code := this.module.GetHero(session.GetUserId(), req.HeroObjID) // 查询目标卡是否存在 if code != pb.ErrorCode_Success { diff --git a/modules/hero/api_resonanceSelect.go b/modules/hero/api_resonanceSelect.go index e194d1c94..a386af7d6 100644 --- a/modules/hero/api_resonanceSelect.go +++ b/modules/hero/api_resonanceSelect.go @@ -10,13 +10,13 @@ import ( //参数校验 func (this *apiComp) ResonanceUseEnergyCheck(session comm.IUserSession, req *pb.HeroResonanceUseEnergyReq) (code pb.ErrorCode) { - if req.HeroObjID == "" || req.UseEnergy <= 0 || req.UseType < 0 { + if len(req.HeroObjID) == 0 || req.UseEnergy <= 0 || req.UseType < 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroResonanceUseEnergyReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, req *pb.HeroResonanceUseEnergyReq) (code pb.ErrorCode, data proto.Message) { _hero, code := this.module.GetHero(session.GetUserId(), req.HeroObjID) // 查询目标卡是否存在 defer func() { diff --git a/modules/hero/api_skillUp.go b/modules/hero/api_skillUp.go index 1cf2c656e..658af4b76 100644 --- a/modules/hero/api_skillUp.go +++ b/modules/hero/api_skillUp.go @@ -20,7 +20,7 @@ func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.H } /// 英雄技能升级 -func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode, data proto.Message) { var ( tmpUpSkillID map[int32]*pb.SkillData // 即将要升级的技能id probability map[int32]int32 // 即将升级技能的权重 diff --git a/modules/hero/api_starUp.go b/modules/hero/api_starUp.go index f7251ac5f..d17d77cb3 100644 --- a/modules/hero/api_starUp.go +++ b/modules/hero/api_starUp.go @@ -18,7 +18,7 @@ func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.He } /// 英雄升星 -func (this *apiComp) StrengthenUpStar(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode, data proto.Message) { var ( target *cfg.Game_heroStarupData // 配置表目标升星英雄信息 raceHero *pb.DBHero // 消耗的阵容英雄 diff --git a/modules/hero/api_strengthen.go b/modules/hero/api_strengthen.go index fa99e2386..72cb243d4 100644 --- a/modules/hero/api_strengthen.go +++ b/modules/hero/api_strengthen.go @@ -18,7 +18,7 @@ func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.Hero } /// 英雄升级 -func (this *apiComp) StrengthenUplv(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroStrengthenUplvReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (code pb.ErrorCode, data proto.Message) { var ( curLv int32 diff --git a/modules/mail/api_delmail.go b/modules/mail/api_delmail.go index fd1240473..4bf9a4c55 100644 --- a/modules/mail/api_delmail.go +++ b/modules/mail/api_delmail.go @@ -4,15 +4,17 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" ) //参数校验 -func (this *apiComp) DelMailCheck(session comm.IUserSession, req *pb.MailDelMailReq) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) DelMailCheck(session comm.IUserSession, req *pb.MailDelMailReq) (code pb.ErrorCode) { return } // 删除邮件 -func (this *apiComp) DelMail(session comm.IUserSession, agrs map[string]interface{}, req *pb.MailDelMailReq) (code pb.ErrorCode) { +func (this *apiComp) DelMail(session comm.IUserSession, req *pb.MailDelMailReq) (code pb.ErrorCode, data proto.Message) { var err error mailinfo := make([]*pb.DBMailData, 0) defer func() { diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go index 33388ce94..7be7db77f 100644 --- a/modules/mail/api_getAttachment.go +++ b/modules/mail/api_getAttachment.go @@ -3,14 +3,16 @@ package mail import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + + "github.com/golang/protobuf/proto" ) -func (this *apiComp) GetUserMailAttachmentCheck(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) GetUserMailAttachmentCheck(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (code pb.ErrorCode) { return } // 领取附件 -func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, agrs map[string]interface{}, req *pb.MailGetUserMailAttachmentReq) (code pb.ErrorCode) { +func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (code pb.ErrorCode, data proto.Message) { var ( mail *pb.DBMailData diff --git a/modules/mail/api_getmail.go b/modules/mail/api_getmail.go index 1bfc61978..dc452dd09 100644 --- a/modules/mail/api_getmail.go +++ b/modules/mail/api_getmail.go @@ -4,14 +4,16 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" + + "github.com/golang/protobuf/proto" ) -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MailGetListReq) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MailGetListReq) (code pb.ErrorCode) { return } // 查看所有邮件信息 -func (this *apiComp) GetList(session comm.IUserSession, agrs map[string]interface{}, req *pb.MailGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.MailGetListReq) (code pb.ErrorCode, data proto.Message) { var err error mailinfo := make([]*pb.DBMailData, 0) diff --git a/modules/mail/api_readmail.go b/modules/mail/api_readmail.go index 8a531cdda..f2b85790a 100644 --- a/modules/mail/api_readmail.go +++ b/modules/mail/api_readmail.go @@ -3,14 +3,16 @@ package mail import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + + "github.com/golang/protobuf/proto" ) -func (this *apiComp) ReadMailCheck(session comm.IUserSession, req *pb.MailReadMailReq) (result map[string]interface{}, code comm.ErrorCode) { +func (this *apiComp) ReadMailCheck(session comm.IUserSession, req *pb.MailReadMailReq) (code pb.ErrorCode) { return } // 查看某一封邮件 -func (this *apiComp) ReadMail(session comm.IUserSession, agrs map[string]interface{}, req *pb.MailReadMailReq) (code pb.ErrorCode) { +func (this *apiComp) ReadMail(session comm.IUserSession, req *pb.MailReadMailReq) (code pb.ErrorCode, data proto.Message) { var ( err error mail *pb.DBMailData