liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

上传代码规范调整

Browse Source
This commit is contained in:
liwei1dao 2023-06-06 09:52:44 +08:00
parent 91b99e07ab
commit 1a2c3bed0b
339 changed files with 978 additions and 976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/v2/service/connService.go
View File

@ -24,7 +24,7 @@ type ConnService interface {
WsConnect(wsUrl string) error
HttpConnect(url string) ([]byte, error)
SendMsg(msg *pb.UserMessage, rsp proto.Message) (err error)
ReceiveMsg() (code pb.ErrorCode, msg *pb.UserMessage)
ReceiveMsg() (errdata *pb.ErrorData, msg *pb.UserMessage)
ListenerPush()
Close()
}
@ -140,7 +140,7 @@ func (c *ConnServiceImpl) SendMsg(msg *pb.UserMessage, rsp proto.Message) (err e
}
// ReceiveMsg ....
func (c *ConnServiceImpl) ReceiveMsg() (code pb.ErrorCode, msg *pb.UserMessage) {
func (c *ConnServiceImpl) ReceiveMsg() (errdata *pb.ErrorData, msg *pb.UserMessage) {
msg = &pb.UserMessage{}
_, data, err := c.ws.ReadMessage()
if err != nil {

36
comm/imodule.go
View File

@ -61,7 +61,7 @@ type (
///刷新恢复入场券
RecoverTicket(session IUserSession) (code pb.ErrorCode)
//出售道具
SellItem(session IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode, atno []*pb.UserAtno)
SellItem(session IUserSession, items map[string]int32, bPush bool) (errdata *pb.ErrorData, atno []*pb.UserAtno)
CleanItemById(session IUserSession, t string) (code pb.ErrorCode)
}
@ -178,17 +178,17 @@ type (
//添加所有装备
AddAllEquipments(session IUserSession) (code pb.ErrorCode)
//创建装备
NewEquipment(uid, cid string) (code pb.ErrorCode, equip *pb.DB_Equipment)
NewEquipment(uid, cid string) (errdata *pb.ErrorData, equip *pb.DB_Equipment)
//添加装备
AddEquipment(session IUserSession, equip *pb.DB_Equipment) (code pb.ErrorCode)
//出售装备
SellEquipments(session IUserSession, equs []string) (code pb.ErrorCode, atno []*pb.UserAtno)
SellEquipments(session IUserSession, equs []string) (errdata *pb.ErrorData, atno []*pb.UserAtno)
//回收装备接口
RecycleEquipments(session IUserSession, equs []string, discount int32) (code pb.ErrorCode, atno []*pb.UserAtno)
RecycleEquipments(session IUserSession, equs []string, discount int32) (errdata *pb.ErrorData, atno []*pb.UserAtno)
//获得可操作用户装备列表
GetActionableEquipments(uid string) (code pb.ErrorCode, eruips []*pb.DB_Equipment)
GetActionableEquipments(uid string) (errdata *pb.ErrorData, eruips []*pb.DB_Equipment)
//获取可用套装 （铁匠铺使用）
GetActionableSuit(uid string) (code pb.ErrorCode, Suit []int32)
GetActionableSuit(uid string) (errdata *pb.ErrorData, Suit []int32)
// 随机获得一件N级的装备装备
/*
suiteId: 套装id
@ -275,19 +275,19 @@ type (
//战斗系统
IBattle interface {
//创建eve战斗
CreateEveBattle(session IUserSession, req *pb.BattleEVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord)
CreateEveBattle(session IUserSession, req *pb.BattleEVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
///创建pve战斗
CreatePveBattle(session IUserSession, req *pb.BattlePVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord)
CreatePveBattle(session IUserSession, req *pb.BattlePVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
///创建pvb战斗
CreatePvbBattle(session IUserSession, req *pb.BattlePVBReq) (code pb.ErrorCode, record *pb.DBBattleRecord)
CreatePvbBattle(session IUserSession, req *pb.BattlePVBReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
///创建pvp战斗
CreatePvpBattle(session IUserSession, req *pb.BattlePVPReq) (code pb.ErrorCode, record *pb.DBBattleRecord)
CreatePvpBattle(session IUserSession, req *pb.BattlePVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
///同步pvp战斗
CreateRtPvpBattle(req *pb.BattleRTPVPReq) (code pb.ErrorCode, record *pb.DBBattleRecord)
CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
///连续pve战斗
CreateLPVEBattle(session IUserSession, req *pb.BattleLPVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord)
CreateLPVEBattle(session IUserSession, req *pb.BattleLPVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
///获取战斗详情
GetBattleInfo(req *pb.BattleGetInfoReq) (code pb.ErrorCode, resp *pb.BattleGetInfoResp)
GetBattleInfo(req *pb.BattleGetInfoReq) (errdata *pb.ErrorData, resp *pb.BattleGetInfoResp)
///创建战斗角色
CreateRolesByFormat(fid int32) (captain int32, roles []*pb.BattleRole, code pb.ErrorCode)
///创建战斗角色
@ -299,7 +299,7 @@ type (
///战斗认输请求
ConcedeBattle(req *pb.BattleConcedeReq) (code pb.ErrorCode)
//校验战报
CheckBattleReport(session IUserSession, report *pb.BattleReport) (code pb.ErrorCode, iswin bool)
CheckBattleReport(session IUserSession, report *pb.BattleReport) (errdata *pb.ErrorData, iswin bool)
}
IGm interface {
CreateCmd(session IUserSession, cmd string) (code pb.ErrorCode)
@ -338,8 +338,8 @@ type (
// 自动购买门票
AutoBuyTicket(session IUserSession, bossId, difficulty int32) (code pb.ErrorCode)
// 自动战斗 战斗信息
AutoBattleInfo(session IUserSession, battle *pb.BattleFormation, bossId, difficulty int32) (code pb.ErrorCode, battleInfo *pb.BattleInfo)
AutoBattleOver(session IUserSession, Report *pb.BattleReport, autoBattle *pb.DBAutoBattle) (code pb.ErrorCode, atno []*pb.UserAtno)
AutoBattleInfo(session IUserSession, battle *pb.BattleFormation, bossId, difficulty int32) (errdata *pb.ErrorData, battleInfo *pb.BattleInfo)
AutoBattleOver(session IUserSession, Report *pb.BattleReport, autoBattle *pb.DBAutoBattle) (errdata *pb.ErrorData, atno []*pb.UserAtno)
CheckBattelParameter(session IUserSession, battle *pb.BattleFormation, bossid, difficulty int32) (code pb.ErrorCode)
}
IHunting interface {
@ -374,7 +374,7 @@ type (
}
IPrivilege interface {
// 创建一个新的特权卡
Delivery(session IUserSession, pId string) (code pb.ErrorCode, items []*pb.UserAssets)
Delivery(session IUserSession, pId string) (errdata *pb.ErrorData, items []*pb.UserAssets)
// 续费特权卡
RenewPrivilegeCard(session IUserSession, cId string) (code pb.ErrorCode)
// 检查特权 参数 计费点 返回值 是否有特权
@ -442,7 +442,7 @@ type (
}
//支付发货
IPayDelivery interface {
Delivery(session IUserSession, pid string) (code pb.ErrorCode, items []*pb.UserAssets)
Delivery(session IUserSession, pid string) (errdata *pb.ErrorData, items []*pb.UserAssets)
}
//实时Pvp

18
modules/academy/api_challenge.go
View File

@ -7,22 +7,21 @@ import (
)
//参数校验
func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.AcademyChallengeReq) (code pb.ErrorCode) {
func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.AcademyChallengeReq) (errdata *pb.ErrorData) {
return
}
///挑战
func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallengeReq) (errdata *pb.ErrorData) {
var (
level *cfg.GameTeachingData
record *pb.DBBattleRecord
err error
cd pb.ErrorCode
)
defer func() {
if cd == pb.ErrorCode_Success {
session.SendMsg(string(this.module.GetType()), "challenge", &pb.AcademyChallengeResp{Code: cd, Level: req.Level, Info: &pb.BattleInfo{
if errdata == nil {
session.SendMsg(string(this.module.GetType()), "challenge", &pb.AcademyChallengeResp{Code: pb.ErrorCode_Success, Level: req.Level, Info: &pb.BattleInfo{
Id: record.Id,
Title: record.Title,
Rulesid: level.Battleready,
@ -35,15 +34,18 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallen
Tasks: level.Task,
}})
} else {
session.SendMsg(string(this.module.GetType()), "challenge", &pb.AcademyChallengeResp{Code: cd, Info: nil})
session.SendMsg(string(this.module.GetType()), "challenge", &pb.AcademyChallengeResp{Code: errdata.Code, Info: nil})
}
}()
if cd = this.ChallengeCheck(session, req); cd != pb.ErrorCode_Success {
if errdata = this.ChallengeCheck(session, req); errdata != nil {
return
}
if level, err = this.module.configure.getGameTeaching(req.Level); err != nil {
cd = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
}
return
}
cd, record = this.module.battle.CreateEveBattle(session, &pb.BattleEVEReq{

4
modules/academy/api_info.go
View File

@ -6,13 +6,13 @@ import (
)
//参数校验
func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.AcademyInfoReq) (code pb.ErrorCode) {
func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.AcademyInfoReq) (errdata *pb.ErrorData) {
return
}
///获取自己的排行榜信息
func (this *apiComp) Info(session comm.IUserSession, req *pb.AcademyInfoReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Info(session comm.IUserSession, req *pb.AcademyInfoReq) (errdata *pb.ErrorData) {
var (
info *pb.DBAcademy
err error

4
modules/academy/api_receive.go
View File

@ -7,13 +7,13 @@ import (
)
//参数校验
func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.AcademyReceiveReq) (code pb.ErrorCode) {
func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.AcademyReceiveReq) (errdata *pb.ErrorData) {
return
}
///奖励领取
func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveReq) (errdata *pb.ErrorData) {
var (
iswin bool
level *cfg.GameTeachingData

4
modules/academy/api_teaching.go
View File

@ -7,13 +7,13 @@ import (
)
//参数校验
func (this *apiComp) TeachingCheck(session comm.IUserSession, req *pb.AcademyTeachingReq) (code pb.ErrorCode) {
func (this *apiComp) TeachingCheck(session comm.IUserSession, req *pb.AcademyTeachingReq) (errdata *pb.ErrorData) {
return
}
///挑战
func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeachingReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeachingReq) (errdata *pb.ErrorData) {
var (
level *cfg.GameHeroStrategyData
record *pb.DBBattleRecord

4
modules/academy/api_teachingreceive.go
View File

@ -8,13 +8,13 @@ import (
)
//参数校验
func (this *apiComp) TeachingReceiveCheck(session comm.IUserSession, req *pb.AcademyTeachingReceiveReq) (code pb.ErrorCode) {
func (this *apiComp) TeachingReceiveCheck(session comm.IUserSession, req *pb.AcademyTeachingReceiveReq) (errdata *pb.ErrorData) {
return
}
///奖励领取
func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyTeachingReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyTeachingReceiveReq) (errdata *pb.ErrorData) {
var (
iswin bool
level *cfg.GameHeroStrategyData

4
modules/arena/api_buy.go
View File

@ -9,7 +9,7 @@ import (
)
//参数校验
func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ArenaBuyReq) (code pb.ErrorCode) {
func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ArenaBuyReq) (errdata *pb.ErrorData) {
if req.BuyNum == 0 {
code = pb.ErrorCode_ReqParameterError
}
@ -17,7 +17,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ArenaBuyReq) (c
}
///获取自己的排行榜信息
func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdata *pb.ErrorData) {
var (
// global *cfg.GameGlobalData
info *pb.DBArenaUser

4
modules/arena/api_challenge.go
View File

@ -7,7 +7,7 @@ import (
)
//参数校验
func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.ArenaChallengeReq) (code pb.ErrorCode) {
func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.ArenaChallengeReq) (errdata *pb.ErrorData) {
if (!req.Isai && req.Playerid == "") || (req.Isai && req.MformatId == 0) || req.Battle.Format == nil || len(req.Battle.Format) != 5 {
code = pb.ErrorCode_ReqParameterError
}
@ -15,7 +15,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.ArenaChal
}
///挑战
func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallengeReq) (errdata *pb.ErrorData) {
var (
red *pb.DBArenaUser
bule *pb.ArenaPlayer

4
modules/arena/api_challengereward.go
View File

@ -9,13 +9,13 @@ import (
)
//参数校验
func (this *apiComp) ChallengeRewardCheck(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (code pb.ErrorCode) {
func (this *apiComp) ChallengeRewardCheck(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (errdata *pb.ErrorData) {
return
}
///挑战奖励领取
func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (errdata *pb.ErrorData) {
var (
reward *cfg.GameArenaActiveRewardData
info *pb.DBArenaUser

4
modules/arena/api_delreward.go
View File

@ -7,7 +7,7 @@ import (
)
//参数校验
func (this *apiComp) DelRewardCheck(session comm.IUserSession, req *pb.ArenaDelRewardReq) (code pb.ErrorCode) {
func (this *apiComp) DelRewardCheck(session comm.IUserSession, req *pb.ArenaDelRewardReq) (errdata *pb.ErrorData) {
if req.Bid == "" {
code = pb.ErrorCode_ReqParameterError
}
@ -15,7 +15,7 @@ func (this *apiComp) DelRewardCheck(session comm.IUserSession, req *pb.ArenaDelR
}
///删除战斗记录
func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelRewardReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelRewardReq) (errdata *pb.ErrorData) {
var (
info *pb.DBArenaUser
err error

4
modules/arena/api_info.go
View File

@ -11,13 +11,13 @@ import (
)
//参数校验
func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.ArenaInfoReq) (code pb.ErrorCode) {
func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.ArenaInfoReq) (errdata *pb.ErrorData) {
return
}
///获取自己的排行榜信息
func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errdata *pb.ErrorData) {
var (
global *cfg.GameGlobalData
info *pb.DBArenaUser

4
modules/arena/api_matche.go
View File

@ -8,13 +8,13 @@ import (
)
//参数校验
func (this *apiComp) MatcheCheck(session comm.IUserSession, req *pb.ArenaMatcheReq) (code pb.ErrorCode) {
func (this *apiComp) MatcheCheck(session comm.IUserSession, req *pb.ArenaMatcheReq) (errdata *pb.ErrorData) {
return
}
///匹配
func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) (errdata *pb.ErrorData) {
var (
info *pb.DBArenaUser
active *cfg.GameArenaActiveRewardData

4
modules/arena/api_otherinfo.go
View File

@ -7,7 +7,7 @@ import (
)
//参数校验
func (this *apiComp) OtherInfoCheck(session comm.IUserSession, req *pb.ArenaOtherInfoReq) (code pb.ErrorCode) {
func (this *apiComp) OtherInfoCheck(session comm.IUserSession, req *pb.ArenaOtherInfoReq) (errdata *pb.ErrorData) {
if req.OtherId == "" {
code = pb.ErrorCode_ReqParameterError
}
@ -15,7 +15,7 @@ func (this *apiComp) OtherInfoCheck(session comm.IUserSession, req *pb.ArenaOthe
}
///获取自己的排行榜信息
func (this *apiComp) OtherInfo(session comm.IUserSession, req *pb.ArenaOtherInfoReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) OtherInfo(session comm.IUserSession, req *pb.ArenaOtherInfoReq) (errdata *pb.ErrorData) {
var (
info *pb.DBArenaUser
err error

8
modules/arena/api_plot.go
View File

@ -9,13 +9,13 @@ import (
)
//参数校验
func (this *apiComp) PlotCheck(session comm.IUserSession, req *pb.ArenaPlotReq) (code pb.ErrorCode) {
func (this *apiComp) PlotCheck(session comm.IUserSession, req *pb.ArenaPlotReq) (errdata *pb.ErrorData) {
return
}
///获取自己的排行榜信息
func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (errdata *pb.ErrorData) {
var (
npc *cfg.GameArenaChallengeNpcData
info *pb.DBArenaUser
@ -79,7 +79,7 @@ func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (code
if !configure.Now().After(time.Unix(ndata.Cd, 0)) { //已经过了cd时间
code = pb.ErrorCode_ArenaTicketNpcInCd
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Title: pb.GetErrorCodeMsg(code),
}
return
}
@ -93,7 +93,7 @@ func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (code
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
code = pb.ErrorCode_DBError
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Title: pb.GetErrorCodeMsg(code),
}
return
}

4
modules/arena/api_plotreward.go
View File

@ -9,7 +9,7 @@ import (
)
//参数校验
func (this *apiComp) PlotRewardCheck(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (code pb.ErrorCode) {
func (this *apiComp) PlotRewardCheck(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (errdata *pb.ErrorData) {
if req.Pid == 0 || req.Report == nil {
code = pb.ErrorCode_ReqParameterError
}
@ -17,7 +17,7 @@ func (this *apiComp) PlotRewardCheck(session comm.IUserSession, req *pb.ArenaPlo
}
///领取战斗奖励
func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (errdata *pb.ErrorData) {
var (
npc *cfg.GameArenaChallengeNpcData
info *pb.DBArenaUser

4
modules/arena/api_rank.go
View File

@ -6,13 +6,13 @@ import (
)
//参数校验
func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.ArenaRankReq) (code pb.ErrorCode) {
func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.ArenaRankReq) (errdata *pb.ErrorData) {
return
}
///排行榜获取
func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errdata *pb.ErrorData) {
var (
info *pb.DBArenaUser
uids []string

4
modules/arena/api_setdattformt.go
View File

@ -6,13 +6,13 @@ import (
)
//参数校验
func (this *apiComp) SetAttFormtCheck(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (code pb.ErrorCode) {
func (this *apiComp) SetAttFormtCheck(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (errdata *pb.ErrorData) {
return
}
///设置防守阵型
func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (errdata *pb.ErrorData) {
var (
info *pb.DBArenaUser
heros []*pb.DBHero

4
modules/arena/api_setdefformt.go
View File

@ -6,13 +6,13 @@ import (
)
//参数校验
func (this *apiComp) SetDefFormtCheck(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (code pb.ErrorCode) {
func (this *apiComp) SetDefFormtCheck(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (errdata *pb.ErrorData) {
return
}
///设置防守阵型
func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (errdata *pb.ErrorData) {
var (
info *pb.DBArenaUser
heros []*pb.DBHero

4
modules/atlas/api_atlasactivate.go
View File

@ -6,7 +6,7 @@ import (
)
//参数校验
func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.AtlasActivateReq) (code pb.ErrorCode) {
func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.AtlasActivateReq) (errdata *pb.ErrorData) {
if req.Id == "" {
code = pb.ErrorCode_ReqParameterError
}
@ -14,7 +14,7 @@ func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.AtlasActiv
}
// 激活图鉴信息
func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateReq) (errdata *pb.ErrorData) {
if code = this.ActivateCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/atlas/api_atlasaward.go
View File

@ -8,13 +8,13 @@ import (
)
//参数校验
func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.AtlasAwardReq) (code pb.ErrorCode) {
func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.AtlasAwardReq) (errdata *pb.ErrorData) {
return
}
// 一键领取所有可以领取的奖励
func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (errdata *pb.ErrorData) {
var (
res []*cfg.Gameatn
respRes []*pb.UserAssets

4
modules/atlas/api_getatlas.go
View File

@ -6,13 +6,13 @@ import (
)
//参数校验
func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.AtlasGetListReq) (code pb.ErrorCode) {
func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.AtlasGetListReq) (errdata *pb.ErrorData) {
return
}
// 获取铁匠铺图鉴信息
func (this *apiComp) GetList(session comm.IUserSession, req *pb.AtlasGetListReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) GetList(session comm.IUserSession, req *pb.AtlasGetListReq) (errdata *pb.ErrorData) {
list, err := this.module.modelPandaAtlas.getPandaAtlasList(session.GetUserId())
if err != nil {

24
modules/battle/module.go
View File

@ -81,7 +81,7 @@ func (this *Battle) OnInstallComp() {
}
//查询战斗记录
func (this *Battle) QueryBattleRecord(oid string) (code pb.ErrorCode, record *pb.DBBattleRecord) {
func (this *Battle) QueryBattleRecord(oid string) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
var err error
if record, err = this.modelBattle.queryrecord(oid); err != nil {
code = pb.ErrorCode_BattleNoFoundRecord
@ -91,7 +91,7 @@ func (this *Battle) QueryBattleRecord(oid string) (code pb.ErrorCode, record *pb
}
//创建pve战斗
func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) {
func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
var (
conn *db.DBConn
err error
@ -114,7 +114,7 @@ func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVE
}
//创建pve战斗
func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) {
func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
var (
conn *db.DBConn
err error
@ -154,7 +154,7 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE
}
//创建pve战斗
func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVBReq) (code pb.ErrorCode, record *pb.DBBattleRecord) {
func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVBReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
var (
conn *db.DBConn
err error
@ -180,7 +180,7 @@ func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVB
}
//创建pve战斗
func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVPReq) (code pb.ErrorCode, record *pb.DBBattleRecord) {
func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
var (
conn *db.DBConn
err error
@ -202,7 +202,7 @@ func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVP
}
//只有跨服环境下才可使用
func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (code pb.ErrorCode, record *pb.DBBattleRecord) {
func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
var (
redmodel *db.DBModel
bluemodel *db.DBModel
@ -227,7 +227,7 @@ func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (code pb.ErrorCode
}
//创建连续战斗
func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLPVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) {
func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLPVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
var (
conn *db.DBConn
err error
@ -286,7 +286,7 @@ func (this *Battle) CreateRolesByHeros(heros []*pb.DBHero) (roles []*pb.BattleRo
}
///获取战斗详情
func (this *Battle) GetBattleInfo(req *pb.BattleGetInfoReq) (code pb.ErrorCode, resp *pb.BattleGetInfoResp) {
func (this *Battle) GetBattleInfo(req *pb.BattleGetInfoReq) (errdata *pb.ErrorData, resp *pb.BattleGetInfoResp) {
this.Debug("GetBattleInfo", log.Field{Key: "req", Value: req})
var (
ctx context.Context
@ -301,7 +301,7 @@ func (this *Battle) GetBattleInfo(req *pb.BattleGetInfoReq) (code pb.ErrorCode,
}
//创建战斗服务
func (this *Battle) CreateBattleServer(req *pb.BattleInfo) (code pb.ErrorCode) {
func (this *Battle) CreateBattleServer(req *pb.BattleInfo) (errdata *pb.ErrorData) {
this.Debug("CreateBattleServer", log.Field{Key: "req", Value: req})
var (
resp *pb.BattleCreateServerResp
@ -319,7 +319,7 @@ func (this *Battle) CreateBattleServer(req *pb.BattleInfo) (code pb.ErrorCode) {
return
}
func (this *Battle) InCmdBattle(req *pb.BattleInCmdReq) (code pb.ErrorCode) {
func (this *Battle) InCmdBattle(req *pb.BattleInCmdReq) (errdata *pb.ErrorData) {
var (
resp *pb.BattleInCmdResp
ctx context.Context
@ -337,7 +337,7 @@ func (this *Battle) InCmdBattle(req *pb.BattleInCmdReq) (code pb.ErrorCode) {
}
//pvp认输
func (this *Battle) ConcedeBattle(req *pb.BattleConcedeReq) (code pb.ErrorCode) {
func (this *Battle) ConcedeBattle(req *pb.BattleConcedeReq) (errdata *pb.ErrorData) {
var (
resp *pb.BattleConcedeResp
err error
@ -353,7 +353,7 @@ func (this *Battle) ConcedeBattle(req *pb.BattleConcedeReq) (code pb.ErrorCode)
}
//校验战报是否成功
func (this *Battle) CheckBattleReport(session comm.IUserSession, report *pb.BattleReport) (code pb.ErrorCode, iswin bool) {
func (this *Battle) CheckBattleReport(session comm.IUserSession, report *pb.BattleReport) (errdata *pb.ErrorData, iswin bool) {
var (
reply *pb.BattleCheckResults
ctx context.Context

4
modules/buried/api_send.go
View File

@ -7,7 +7,7 @@ import (
)
//参数校验
func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.BuriedInquireProgressReq) (code pb.ErrorCode) {
func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.BuriedInquireProgressReq) (errdata *pb.ErrorData) {
if len(req.Conditions) == 0 {
code = pb.ErrorCode_ReqParameterError
}
@ -15,7 +15,7 @@ func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.BuriedInquireP
}
///查询任务进度接口
func (this *apiComp) InquireProgress(session comm.IUserSession, req *pb.BuriedInquireProgressReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) InquireProgress(session comm.IUserSession, req *pb.BuriedInquireProgressReq) (errdata *pb.ErrorData) {
var (
condis []*pb.ConIProgress
err error

4
modules/caravan/api_buyorsell.go
View File

@ -7,14 +7,14 @@ import (
)
//参数校验
func (this *apiComp) BuyOrSellCheck(session comm.IUserSession, req *pb.CaravanBuyOrSellReq) (code pb.ErrorCode) {
func (this *apiComp) BuyOrSellCheck(session comm.IUserSession, req *pb.CaravanBuyOrSellReq) (errdata *pb.ErrorData) {
if len(req.Items) == 0 || req.City == 0 {
code = pb.ErrorCode_ReqParameterError
}
return
}
func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSellReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSellReq) (errdata *pb.ErrorData) {
var (
update map[string]interface{}
addScore int32 // 收益

4
modules/caravan/api_getlist.go
View File

@ -8,12 +8,12 @@ import (
)
//参数校验
func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.CaravanGetListReq) (code pb.ErrorCode) {
func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.CaravanGetListReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListReq) (errdata *pb.ErrorData) {
var (
resp *pb.CaravanGetListResp
)

4
modules/caravan/api_getstory.go
View File

@ -7,14 +7,14 @@ import (
)
//参数校验
func (this *apiComp) GetStoryCheck(session comm.IUserSession, req *pb.CaravanGetStoryReq) (code pb.ErrorCode) {
func (this *apiComp) GetStoryCheck(session comm.IUserSession, req *pb.CaravanGetStoryReq) (errdata *pb.ErrorData) {
if req.Cid == 0 || req.Citystory == 0 {
code = pb.ErrorCode_ReqParameterError
}
return
}
func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStoryReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStoryReq) (errdata *pb.ErrorData) {
var (
resp *pb.CaravanGetStoryResp
update map[string]interface{}

4
modules/caravan/api_gotocity.go
View File

@ -8,14 +8,14 @@ import (
)
//参数校验
func (this *apiComp) GotoCityCheck(session comm.IUserSession, req *pb.CaravanGotoCityReq) (code pb.ErrorCode) {
func (this *apiComp) GotoCityCheck(session comm.IUserSession, req *pb.CaravanGotoCityReq) (errdata *pb.ErrorData) {
if req.City == 0 || req.Ticket <= 0 {
code = pb.ErrorCode_ReqParameterError
}
return
}
func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCityReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCityReq) (errdata *pb.ErrorData) {
var (
resp *pb.CaravanGotoCityResp
res *cfg.Gameatn

4
modules/caravan/api_ranklist.go
View File

@ -6,12 +6,12 @@ import (
)
//参数校验
func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.CaravanRankListReq) (code pb.ErrorCode) {
func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.CaravanRankListReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) RankList(session comm.IUserSession, req *pb.CaravanRankListReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) RankList(session comm.IUserSession, req *pb.CaravanRankListReq) (errdata *pb.ErrorData) {
var (
rankid int32

4
modules/caravan/api_refreshcity.go
View File

@ -6,13 +6,13 @@ import (
)
//参数校验
func (this *apiComp) RefreshCityCheck(session comm.IUserSession, req *pb.CaravanRefreshCityReq) (code pb.ErrorCode) {
func (this *apiComp) RefreshCityCheck(session comm.IUserSession, req *pb.CaravanRefreshCityReq) (errdata *pb.ErrorData) {
return
}
// 刷新城市信息
func (this *apiComp) RefreshCity(session comm.IUserSession, req *pb.CaravanRefreshCityReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) RefreshCity(session comm.IUserSession, req *pb.CaravanRefreshCityReq) (errdata *pb.ErrorData) {
var (
resp *pb.CaravanRefreshCityResp
)

4
modules/caravan/module.go
View File

@ -61,7 +61,7 @@ func (this *Caravan) OnInstallComp() {
}
// 接口信息 修改数据
func (this *Caravan) ModifyCaravanData(uid string, data map[string]interface{}) (code pb.ErrorCode) {
func (this *Caravan) ModifyCaravanData(uid string, data map[string]interface{}) (errdata *pb.ErrorData) {
err := this.modelCaravan.modifyCaravanDataByObjId(uid, data)
if err != nil {
code = pb.ErrorCode_DBError
@ -113,7 +113,7 @@ func (this *Caravan) InitCaravanItemData(uid string, data *pb.DBCaravan) {
}
// 初始化门票和虚拟币
func (this *Caravan) InitCaravanTicket(session comm.IUserSession, lv int32) (code pb.ErrorCode) {
func (this *Caravan) InitCaravanTicket(session comm.IUserSession, lv int32) (errdata *pb.ErrorData) {
code = pb.ErrorCode_ConfigNoFound
if conf, _ := this.modelCaravan.module.configure.GetCaravanLv(lv); conf != nil {
var res []*cfg.Gameatn

4
modules/chat/api_chanagechannel.go
View File

@ -6,7 +6,7 @@ import (
)
//参数校验
func (this *apiComp) ChanageChannelCheck(session comm.IUserSession, req *pb.ChatChanageChannelReq) (code pb.ErrorCode) {
func (this *apiComp) ChanageChannelCheck(session comm.IUserSession, req *pb.ChatChanageChannelReq) (errdata *pb.ErrorData) {
if req.ChannelId < 0 {
code = pb.ErrorCode_ReqParameterError
}
@ -14,7 +14,7 @@ func (this *apiComp) ChanageChannelCheck(session comm.IUserSession, req *pb.Chat
}
///改变跨服聊天频道
func (this *apiComp) ChanageChannel(session comm.IUserSession, req *pb.ChatChanageChannelReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) ChanageChannel(session comm.IUserSession, req *pb.ChatChanageChannelReq) (errdata *pb.ErrorData) {
var (
err error
ok bool

4
modules/chat/api_crosschannel.go
View File

@ -6,13 +6,13 @@ import (
)
//参数校验
func (this *apiComp) CrossChannelCheck(session comm.IUserSession, req *pb.ChatCrossChannelReq) (code pb.ErrorCode) {
func (this *apiComp) CrossChannelCheck(session comm.IUserSession, req *pb.ChatCrossChannelReq) (errdata *pb.ErrorData) {
return
}
///请求跨服聊天频道
func (this *apiComp) CrossChannel(session comm.IUserSession, req *pb.ChatCrossChannelReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) CrossChannel(session comm.IUserSession, req *pb.ChatCrossChannelReq) (errdata *pb.ErrorData) {
var (
channel int32
err error

4
modules/chat/api_getlist.go
View File

@ -7,7 +7,7 @@ import (
)
//参数校验
func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ChatGetListReq) (code pb.ErrorCode) {
func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ChatGetListReq) (errdata *pb.ErrorData) {
if req.Channel == pb.ChatChannel_CrossServer && req.ChannelId == 0 {
code = pb.ErrorCode_ReqParameterError
}
@ -15,7 +15,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ChatGetList
}
///获取本服聊天消息记录
func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) (errdata *pb.ErrorData) {
var (
err error
result *pb.DBUserExpand

4
modules/chat/api_send.go
View File

@ -12,7 +12,7 @@ import (
)
//参数校验
func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.ChatSendReq) (code pb.ErrorCode) {
func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.ChatSendReq) (errdata *pb.ErrorData) {
if (req.Channel == pb.ChatChannel_Union && req.TargetId == "") || (req.Channel == pb.ChatChannel_Private && req.TargetId == "") {
code = pb.ErrorCode_ReqParameterError
}
@ -20,7 +20,7 @@ func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.ChatSendReq) (
}
///消息发送请求
func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (errdata *pb.ErrorData) {
var (
err error
msg *pb.DBChat

4
modules/chat/modelChat.go
View File

@ -235,7 +235,7 @@ func (this *modelChatComp) saveUserMsg(msg *pb.DBChat) (err error) {
}
// //发送世界频道聊天
// func (this *modelChatComp) sendWorldChat(msg *pb.DBChat) (code pb.ErrorCode) {
// func (this *modelChatComp) sendWorldChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
// var (
// err error
// max int32
@ -261,7 +261,7 @@ func (this *modelChatComp) saveUserMsg(msg *pb.DBChat) (err error) {
// }
// //发送系统频道聊天
// func (this *modelChatComp) sendSystemChat(msg *pb.DBChat) (code pb.ErrorCode) {
// func (this *modelChatComp) sendSystemChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
// var (
// err error
// )

10
modules/chat/module.go
View File

@ -135,7 +135,7 @@ func (this *Chat) Rpc_ModuleChatPushChat(ctx context.Context, args *pb.DBChat, r
//对外接口----------------------------------------------------------------------------------------------------------
//向世界频道发送聊天消息
func (this *Chat) SendWorldChat(msg *pb.DBChat) (code pb.ErrorCode) {
func (this *Chat) SendWorldChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
var (
max_chat int32
err error
@ -166,7 +166,7 @@ func (this *Chat) SendWorldChat(msg *pb.DBChat) (code pb.ErrorCode) {
}
//向工会发送聊天消息
func (this *Chat) SendUnionChat(msg *pb.DBChat) (code pb.ErrorCode) {
func (this *Chat) SendUnionChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
var (
max_chat int32
err error
@ -197,7 +197,7 @@ func (this *Chat) SendUnionChat(msg *pb.DBChat) (code pb.ErrorCode) {
}
//向个人发送聊天消息
func (this *Chat) SendUserChat(msg *pb.DBChat) (code pb.ErrorCode) {
func (this *Chat) SendUserChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
var (
err error
session comm.IUserSession
@ -223,7 +223,7 @@ func (this *Chat) SendUserChat(msg *pb.DBChat) (code pb.ErrorCode) {
}
//广播系统消息
func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata interface{}, value0 int32, value1 int32, agrs ...string) (code pb.ErrorCode) {
func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata interface{}, value0 int32, value1 int32, agrs ...string) (errdata *pb.ErrorData) {
var (
jsonStr []byte
err error
@ -280,7 +280,7 @@ func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata inter
}
//广播系统消息
func (this *Chat) SendSysChatToUser(session comm.IUserSession, ctype comm.ChatSystemType, value0, value1 int32, agrs ...string) (code pb.ErrorCode) {
func (this *Chat) SendSysChatToUser(session comm.IUserSession, ctype comm.ChatSystemType, value0, value1 int32, agrs ...string) (errdata *pb.ErrorData) {
if st, ok := this.configure.GetCheckChatSystem(int32(ctype), value0, value1); ok {
msg := &pb.DBChat{
Channel: pb.ChatChannel_System,

4
modules/combat/api_ask.go
View File

@ -8,13 +8,13 @@ import (
)
//参数校验
func (this *apiComp) AskCheck(session comm.IUserSession, req *pb.CombatAskReq) (code pb.ErrorCode) {
func (this *apiComp) AskCheck(session comm.IUserSession, req *pb.CombatAskReq) (errdata *pb.ErrorData) {
return
}
///获取自己的排行榜信息
func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errdata *pb.ErrorData) {
var (
info *pb.DBCombatUser
level *pb.DBCombatLevel

4
modules/combat/api_challenge.go
View File

@ -7,13 +7,13 @@ import (
)
//参数校验
func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.CombatChallengeReq) (code pb.ErrorCode) {
func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.CombatChallengeReq) (errdata *pb.ErrorData) {
return
}
///挑战
func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChallengeReq) (errdata *pb.ErrorData) {
var (
manster *cfg.GameCombatMansterData
record *pb.DBBattleRecord

4
modules/combat/api_challengereceive.go
View File

@ -8,13 +8,13 @@ import (
)
//参数校验
func (this *apiComp) ChallengeReceiveCheck(session comm.IUserSession, req *pb.CombatChallengeReceiveReq) (code pb.ErrorCode) {
func (this *apiComp) ChallengeReceiveCheck(session comm.IUserSession, req *pb.CombatChallengeReceiveReq) (errdata *pb.ErrorData) {
return
}
///奖励领取
func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatChallengeReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatChallengeReceiveReq) (errdata *pb.ErrorData) {
var (
iswin bool
info *pb.DBCombatUser

4
modules/combat/api_drop.go
View File

@ -7,13 +7,13 @@ import (
)
//参数校验
func (this *apiComp) DropCheck(session comm.IUserSession, req *pb.CombatDropReq) (code pb.ErrorCode) {
func (this *apiComp) DropCheck(session comm.IUserSession, req *pb.CombatDropReq) (errdata *pb.ErrorData) {
return
}
///奖励领取
func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (errdata *pb.ErrorData) {
var (
info *pb.DBCombatUser
lv *pb.DBCombatLevel

4
modules/combat/api_in.go
View File

@ -6,13 +6,13 @@ import (
)
//参数校验
func (this *apiComp) InCheck(session comm.IUserSession, req *pb.CombatInReq) (code pb.ErrorCode) {
func (this *apiComp) InCheck(session comm.IUserSession, req *pb.CombatInReq) (errdata *pb.ErrorData) {
return
}
///获取自己的排行榜信息
func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (errdata *pb.ErrorData) {
var (
info *pb.DBCombatUser
level *pb.DBCombatLevel

4
modules/combat/api_updatelevel.go
View File

@ -6,13 +6,13 @@ import (
)
//参数校验
func (this *apiComp) UpdateLevelCheck(session comm.IUserSession, req *pb.CombatUpdateLevelReq) (code pb.ErrorCode) {
func (this *apiComp) UpdateLevelCheck(session comm.IUserSession, req *pb.CombatUpdateLevelReq) (errdata *pb.ErrorData) {
return
}
///获取自己的排行榜信息
func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdateLevelReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdateLevelReq) (errdata *pb.ErrorData) {
var (
info *pb.DBCombatUser
level *pb.DBCombatLevel

20
modules/comp_gate.go
View File

@ -101,16 +101,16 @@ func (this *MCompGate) reflectionRouteHandle(typ reflect.Type, method reflect.Me
log.Panicf("反射注册用户处理函数错误 [%s-%s] Api接口格式错误", this.module.GetType(), mname)
return
}
if mtype.NumOut() != 2 {
if mtype.NumOut() != 1 {
log.Panicf("反射注册用户处理函数错误 [%s-%s] Api接口格式错误", this.module.GetType(), mname)
return
}
returnCodeType := mtype.Out(0)
if returnCodeType != typeOfErrorCode {
log.Panicf("反射注册用户处理函数错误 [%s-%s] Api接口格式错误", this.module.GetType(), mname)
return
}
returnDataType := mtype.Out(1)
// returnCodeType := mtype.Out(0)
// if returnCodeType != typeOfErrorCode {
// log.Panicf("反射注册用户处理函数错误 [%s-%s] Api接口格式错误", this.module.GetType(), mname)
// return
// }
returnDataType := mtype.Out(0)
if returnDataType != typeOfErrorData {
log.Panicf("反射注册用户处理函数错误 [%s-%s] Api接口格式错误", this.module.GetType(), mname)
return
@ -151,9 +151,9 @@ func (this *MCompGate) reflectionRouteCheck(method reflect.Method, msgtype refle
if mtype.NumOut() != 1 {
return fmt.Errorf("mtype.NumOut():%d", mtype.NumOut())
}
returnCodeType := mtype.Out(0)
if returnCodeType != typeOfErrorCode {
return fmt.Errorf("returnCodeType:%T", returnCodeType)
returnDataType := mtype.Out(0)
if returnDataType != typeOfErrorData {
return fmt.Errorf("returnType:%T", returnDataType)
}
return nil
}

2
modules/core.go
View File

@ -23,6 +23,6 @@ type (
SendMsgToUsers(mainType, subType string, msg proto.Message, uids ...string) (err error)
SendMsgToCUsers(mainType, subType string, msg proto.Message, users ...*pb.CacheUser) (err error)
//校验消耗资源
CheckConsumeRes(uid string, res []*cfg.Gameatn) (code pb.ErrorCode)
CheckConsumeRes(uid string, res []*cfg.Gameatn) (errdata *pb.ErrorData)
}
)

4
modules/dispatch/api_autoreceive.go
View File

@ -6,11 +6,11 @@ import (
"go_dreamfactory/pb"
)
func (a *apiComp) AutoreceiveCheck(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (code pb.ErrorCode) {
func (a *apiComp) AutoreceiveCheck(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (errdata *pb.ErrorData) {
return
}
func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (errdata *pb.ErrorData) {
rsp := &pb.DispatchAutoReceiveResp{}
d := a.module.modelDispatch.getDBDispatch(session.GetUserId())
if d == nil {

4
modules/dispatch/api_do.go
View File

@ -10,7 +10,7 @@ import (
// 派遣
func (a *apiComp) DoCheck(session comm.IUserSession, req *pb.DispatchDoReq) (code pb.ErrorCode) {
func (a *apiComp) DoCheck(session comm.IUserSession, req *pb.DispatchDoReq) (errdata *pb.ErrorData) {
if len(req.HeroIds) == 0 || req.TaskId == 0 {
code = pb.ErrorCode_ReqParameterError
return
@ -25,7 +25,7 @@ func (a *apiComp) DoCheck(session comm.IUserSession, req *pb.DispatchDoReq) (cod
return
}
func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (errdata *pb.ErrorData) {
if code = this.DoCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/dispatch/api_notice.go
View File

@ -10,11 +10,11 @@ import (
// 公告板信息
func (a *apiComp) NoticeCheck(session comm.IUserSession, req *pb.DispatchNoticeReq) (code pb.ErrorCode) {
func (a *apiComp) NoticeCheck(session comm.IUserSession, req *pb.DispatchNoticeReq) (errdata *pb.ErrorData) {
return
}
func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (errdata *pb.ErrorData) {
d := a.module.modelDispatch.getDBDispatch(session.GetUserId())
if d == nil {
code = pb.ErrorCode_DataNotFound

4
modules/dispatch/api_receive.go
View File

@ -8,14 +8,14 @@ import (
// 领取派遣奖励
func (a *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.DispatchReceiveReq) (code pb.ErrorCode) {
func (a *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.DispatchReceiveReq) (errdata *pb.ErrorData) {
if req.TaskId == 0 {
code = pb.ErrorCode_ReqParameterError
}
return
}
func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) (errdata *pb.ErrorData) {
if code = a.ReceiveCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/dispatch/api_refresh.go
View File

@ -9,11 +9,11 @@ import (
)
// 刷新
func (a *apiComp) RefreshCheck(session comm.IUserSession, req *pb.DispatchRefreshReq) (code pb.ErrorCode) {
func (a *apiComp) RefreshCheck(session comm.IUserSession, req *pb.DispatchRefreshReq) (errdata *pb.ErrorData) {
return
}
func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq) (errdata *pb.ErrorData) {
d := a.module.modelDispatch.getDBDispatch(session.GetUserId())
if d == nil {

4
modules/dispatch/api_week.go
View File

@ -5,14 +5,14 @@ import (
"go_dreamfactory/pb"
)
func (a *apiComp) WeekreciveCheck(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (code pb.ErrorCode) {
func (a *apiComp) WeekreciveCheck(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (errdata *pb.ErrorData) {
if req.Idx == 0 {
code = pb.ErrorCode_ReqParameterError
}
return
}
func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (errdata *pb.ErrorData) {
if code = a.WeekreciveCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/enchant/api_buy.go
View File

@ -6,7 +6,7 @@ import (
)
//参数校验
func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.EnchantBuyReq) (code pb.ErrorCode) {
func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.EnchantBuyReq) (errdata *pb.ErrorData) {
if req.Count <= 0 {
code = pb.ErrorCode_ReqParameterError
return
@ -15,7 +15,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.EnchantBuyReq)
}
// 协议废除 走通用购买逻辑
func (this *apiComp) Buy(session comm.IUserSession, req *pb.EnchantBuyReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Buy(session comm.IUserSession, req *pb.EnchantBuyReq) (errdata *pb.ErrorData) {
session.SendMsg(string(this.module.GetType()), EnchantBuyResp, &pb.EnchantBuyResp{})
return

4
modules/enchant/api_challenge.go
View File

@ -7,7 +7,7 @@ import (
)
//参数校验
func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.EnchantChallengeReq) (code pb.ErrorCode) {
func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.EnchantChallengeReq) (errdata *pb.ErrorData) {
if req.BossType <= 0 || req.Battle == nil {
code = pb.ErrorCode_ReqParameterError
return
@ -16,7 +16,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.EnchantCh
}
///挑战主线关卡
func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallengeReq) (errdata *pb.ErrorData) {
code = this.ChallengeCheck(session, req)
if code != pb.ErrorCode_Success {

4
modules/enchant/api_challengeover.go
View File

@ -6,7 +6,7 @@ import (
)
//参数校验
func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.EnchantChallengeOverReq) (code pb.ErrorCode) {
func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.EnchantChallengeOverReq) (errdata *pb.ErrorData) {
if req.BossType <= 0 {
code = pb.ErrorCode_ReqParameterError
return
@ -15,7 +15,7 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Encha
}
///挑战主线关卡
func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantChallengeOverReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantChallengeOverReq) (errdata *pb.ErrorData) {
var (
mapData map[string]interface{}
bWin bool // 战斗是否胜利

4
modules/enchant/api_getlist.go
View File

@ -9,12 +9,12 @@ import (
)
//参数校验
func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.EnchantGetListReq) (code pb.ErrorCode) {
func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.EnchantGetListReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) GetList(session comm.IUserSession, req *pb.EnchantGetListReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) GetList(session comm.IUserSession, req *pb.EnchantGetListReq) (errdata *pb.ErrorData) {
// 刷新挑战卷
if code = this.module.ModuleItems.RecoverTicket(session); code != pb.ErrorCode_Success {

4
modules/enchant/api_ranklist.go
View File

@ -12,12 +12,12 @@ import (
)
//参数校验
func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.EnchantRankListReq) (code pb.ErrorCode) {
func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.EnchantRankListReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) RankList(session comm.IUserSession, req *pb.EnchantRankListReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) RankList(session comm.IUserSession, req *pb.EnchantRankListReq) (errdata *pb.ErrorData) {
var (
szRank []*pb.DBEnchantRank
rd *redis.StringSliceCmd

2
modules/enchant/module.go
View File

@ -58,7 +58,7 @@ func (this *Enchant) OnInstallComp() {
}
// 接口信息
func (this *Enchant) ModifyEnchantData(uid string, data map[string]interface{}) (code pb.ErrorCode) {
func (this *Enchant) ModifyEnchantData(uid string, data map[string]interface{}) (errdata *pb.ErrorData) {
err := this.modelEnchant.modifyEnchantDataByObjId(uid, data)
if err != nil {
code = pb.ErrorCode_DBError

4
modules/equipment/api_ench.go
View File

@ -10,7 +10,7 @@ import (
)
//参数校验
func (this *apiComp) EnchCheck(session comm.IUserSession, req *pb.EquipmentEnchReq) (code pb.ErrorCode) {
func (this *apiComp) EnchCheck(session comm.IUserSession, req *pb.EquipmentEnchReq) (errdata *pb.ErrorData) {
if req.Eid == "" {
code = pb.ErrorCode_ReqParameterError
}
@ -18,7 +18,7 @@ func (this *apiComp) EnchCheck(session comm.IUserSession, req *pb.EquipmentEnchR
}
//附魔
func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (errdata *pb.ErrorData) {
var (
equip *pb.DB_Equipment
conf *cfg.GameEquipEnchantingData

4
modules/equipment/api_equip.go
View File

@ -10,7 +10,7 @@ import (
)
//参数校验
func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEquipReq) (code pb.ErrorCode) {
func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEquipReq) (errdata *pb.ErrorData) {
if len(req.EquipmentId) != 8 || req.HeroCardId == "" {
code = pb.ErrorCode_ReqParameterError
}
@ -18,7 +18,7 @@ func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEqui
}
///英雄挂在装备 code 错误码信息 data 错误附加数据
func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) (errdata *pb.ErrorData) {
var (
err error
confs []*cfg.GameEquipData

4
modules/equipment/api_forg.go
View File

@ -7,7 +7,7 @@ import (
)
//参数校验
func (this *apiComp) ForgCheck(session comm.IUserSession, req *pb.EquipmentForgReq) (code pb.ErrorCode) {
func (this *apiComp) ForgCheck(session comm.IUserSession, req *pb.EquipmentForgReq) (errdata *pb.ErrorData) {
if req.Forgid == 0 {
code = pb.ErrorCode_ReqParameterError
}
@ -15,7 +15,7 @@ func (this *apiComp) ForgCheck(session comm.IUserSession, req *pb.EquipmentForgR
}
//锻造
func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (errdata *pb.ErrorData) {
var (
conf *cfg.GameEquipSComposeData
need []*cfg.Gameatn

4
modules/equipment/api_getlist.go
View File

@ -6,13 +6,13 @@ import (
)
//参数校验
func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.EquipmentGetListReq) (code pb.ErrorCode) {
func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.EquipmentGetListReq) (errdata *pb.ErrorData) {
return
}
///获取用户装备列表
func (this *apiComp) Getlist(session comm.IUserSession, req *pb.EquipmentGetListReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Getlist(session comm.IUserSession, req *pb.EquipmentGetListReq) (errdata *pb.ErrorData) {
var (
err error
items []*pb.DB_Equipment

4
modules/equipment/api_lock.go
View File

@ -6,7 +6,7 @@ import (
)
//参数校验
func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.EquipmentLockReq) (code pb.ErrorCode) {
func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.EquipmentLockReq) (errdata *pb.ErrorData) {
if req.EquipmentId == "" {
code = pb.ErrorCode_ReqParameterError
}
@ -14,7 +14,7 @@ func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.EquipmentLockR
}
///获取用户装备列表
func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) (errdata *pb.ErrorData) {
var (
err error
equipment *pb.DB_Equipment

4
modules/equipment/api_sellI.go
View File

@ -9,7 +9,7 @@ import (
)
//参数校验
func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.EquipmentSellReq) (code pb.ErrorCode) {
func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.EquipmentSellReq) (errdata *pb.ErrorData) {
if req.EquipIds == nil || len(req.EquipIds) == 0 {
code = pb.ErrorCode_ReqParameterError
}
@ -17,7 +17,7 @@ func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.EquipmentSellR
}
//出售
func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) (errdata *pb.ErrorData) {
var (
err error
equipments []*pb.DB_Equipment

4
modules/equipment/api_upgrade.go
View File

@ -13,7 +13,7 @@ import (
)
//参数校验
func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (code pb.ErrorCode) {
func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (errdata *pb.ErrorData) {
if req.EquipmentId == "" {
code = pb.ErrorCode_ReqParameterError
return
@ -22,7 +22,7 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUp
}
///英雄挂在装备
func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (errdata *pb.ErrorData) {
var (
err error
conf *cfg.GameEquipData

4
modules/equipment/api_wash.go
View File

@ -9,7 +9,7 @@ import (
)
//参数校验
func (this *apiComp) WashCheck(session comm.IUserSession, req *pb.EquipmentWashReq) (code pb.ErrorCode) {
func (this *apiComp) WashCheck(session comm.IUserSession, req *pb.EquipmentWashReq) (errdata *pb.ErrorData) {
if req.Eid == "" {
code = pb.ErrorCode_ReqParameterError
}
@ -17,7 +17,7 @@ func (this *apiComp) WashCheck(session comm.IUserSession, req *pb.EquipmentWashR
}
//锻造
func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (errdata *pb.ErrorData) {
var (
equip *pb.DB_Equipment
conf *cfg.GameEquipData

4
modules/equipment/api_washconfirm.go
View File

@ -8,7 +8,7 @@ import (
)
//参数校验
func (this *apiComp) WashConfirmCheck(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (code pb.ErrorCode) {
func (this *apiComp) WashConfirmCheck(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (errdata *pb.ErrorData) {
if req.Eid == "" || req.Pids == nil || len(req.Pids) == 0 {
code = pb.ErrorCode_ReqParameterError
}
@ -16,7 +16,7 @@ func (this *apiComp) WashConfirmCheck(session comm.IUserSession, req *pb.Equipme
}
//锻造
func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (errdata *pb.ErrorData) {
var (
equip *pb.DB_Equipment
attrlibrary *cfg.GameEquipAttrlibrarySData

16
modules/equipment/module.go
View File

@ -132,7 +132,7 @@ func (this *Equipment) AddNewEquipments(session comm.IUserSession, cIds map[stri
return
}
func (this *Equipment) AddAllEquipments(session comm.IUserSession) (code pb.ErrorCode) {
func (this *Equipment) AddAllEquipments(session comm.IUserSession) (errdata *pb.ErrorData) {
var (
configure *cfg.GameEquip
cIds map[string]uint32
@ -151,7 +151,7 @@ func (this *Equipment) AddAllEquipments(session comm.IUserSession) (code pb.Erro
}
//删除武器
func (this *Equipment) DelEquipments(session comm.IUserSession, equipIds []string, bPush bool) (code pb.ErrorCode) {
func (this *Equipment) DelEquipments(session comm.IUserSession, equipIds []string, bPush bool) (errdata *pb.ErrorData) {
var (
err error
change []*pb.DB_Equipment
@ -168,7 +168,7 @@ func (this *Equipment) DelEquipments(session comm.IUserSession, equipIds []strin
}
//创建新的装备
func (this *Equipment) NewEquipment(uid, cid string) (code pb.ErrorCode, equip *pb.DB_Equipment) {
func (this *Equipment) NewEquipment(uid, cid string) (errdata *pb.ErrorData, equip *pb.DB_Equipment) {
var (
conf *cfg.GameEquipData
err error
@ -185,7 +185,7 @@ func (this *Equipment) NewEquipment(uid, cid string) (code pb.ErrorCode, equip *
}
//创建新的装备
func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equipment) (code pb.ErrorCode) {
func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equipment) (errdata *pb.ErrorData) {
var (
err error
configure *cfg.GameEquipData
@ -221,7 +221,7 @@ func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equi
}
///出售装备
func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string) (code pb.ErrorCode, atno []*pb.UserAtno) {
func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string) (errdata *pb.ErrorData, atno []*pb.UserAtno) {
var (
err error
equipments []*pb.DB_Equipment
@ -274,7 +274,7 @@ func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string)
}
//回收装备接口
func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []string, discount int32) (code pb.ErrorCode, atno []*pb.UserAtno) {
func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []string, discount int32) (errdata *pb.ErrorData, atno []*pb.UserAtno) {
var (
err error
equipments []*pb.DB_Equipment
@ -333,7 +333,7 @@ func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []strin
}
//获得可操作用户装备列表
func (this *Equipment) GetActionableEquipments(uid string) (code pb.ErrorCode, eruips []*pb.DB_Equipment) {
func (this *Equipment) GetActionableEquipments(uid string) (errdata *pb.ErrorData, eruips []*pb.DB_Equipment) {
var (
err error
equipments []*pb.DB_Equipment
@ -351,7 +351,7 @@ func (this *Equipment) GetActionableEquipments(uid string) (code pb.ErrorCode, e
}
//获取可用套装 （铁匠铺使用）
func (this *Equipment) GetActionableSuit(uid string) (code pb.ErrorCode, Suit []int32) {
func (this *Equipment) GetActionableSuit(uid string) (errdata *pb.ErrorData, Suit []int32) {
var (
err error
equipments []*pb.DB_Equipment

4
modules/forum/api_getlist.go
View File

@ -6,7 +6,7 @@ import (
)
//参数校验
func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ForumGetListReq) (code pb.ErrorCode) {
func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ForumGetListReq) (errdata *pb.ErrorData) {
if req.Herocid == "" {
code = pb.ErrorCode_ReqParameterError
}
@ -14,7 +14,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ForumGetLis
}
///获取本服聊天消息记录
func (this *apiComp) GetList(session comm.IUserSession, req *pb.ForumGetListReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) GetList(session comm.IUserSession, req *pb.ForumGetListReq) (errdata *pb.ErrorData) {
var (
err error
list []*pb.DBComment

4
modules/forum/api_like.go
View File

@ -6,7 +6,7 @@ import (
)
//参数校验
func (this *apiComp) LikeCheck(session comm.IUserSession, req *pb.ForumLikeReq) (code pb.ErrorCode) {
func (this *apiComp) LikeCheck(session comm.IUserSession, req *pb.ForumLikeReq) (errdata *pb.ErrorData) {
if req.Herocid == "" || req.Cid == "" {
code = pb.ErrorCode_ReqParameterError
}
@ -14,7 +14,7 @@ func (this *apiComp) LikeCheck(session comm.IUserSession, req *pb.ForumLikeReq)
}
///获取本服聊天消息记录
func (this *apiComp) Like(session comm.IUserSession, req *pb.ForumLikeReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Like(session comm.IUserSession, req *pb.ForumLikeReq) (errdata *pb.ErrorData) {
var (
err error
)

4
modules/forum/api_releasecomment.go
View File

@ -9,7 +9,7 @@ import (
)
//参数校验
func (this *apiComp) ReleaseCommentCheck(session comm.IUserSession, req *pb.ForumReleaseCommentReq) (code pb.ErrorCode) {
func (this *apiComp) ReleaseCommentCheck(session comm.IUserSession, req *pb.ForumReleaseCommentReq) (errdata *pb.ErrorData) {
if req.Herocid == "" || req.Herooid == "" || req.Content == "" {
code = pb.ErrorCode_ReqParameterError
}
@ -17,7 +17,7 @@ func (this *apiComp) ReleaseCommentCheck(session comm.IUserSession, req *pb.Foru
}
///发布评论
func (this *apiComp) ReleaseComment(session comm.IUserSession, req *pb.ForumReleaseCommentReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) ReleaseComment(session comm.IUserSession, req *pb.ForumReleaseCommentReq) (errdata *pb.ErrorData) {
var (
err error
comment *pb.DBComment

4
modules/forum/api_watchhero.go
View File

@ -6,7 +6,7 @@ import (
)
//参数校验
func (this *apiComp) WatchHeroCheck(session comm.IUserSession, req *pb.ForumWatchHeroReq) (code pb.ErrorCode) {
func (this *apiComp) WatchHeroCheck(session comm.IUserSession, req *pb.ForumWatchHeroReq) (errdata *pb.ErrorData) {
if req.Uid == "" || req.HerocId == "" || req.HerooId == "" {
code = pb.ErrorCode_ReqParameterError
}
@ -14,7 +14,7 @@ func (this *apiComp) WatchHeroCheck(session comm.IUserSession, req *pb.ForumWatc
}
///获取本服聊天消息记录
func (this *apiComp) WatchHero(session comm.IUserSession, req *pb.ForumWatchHeroReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) WatchHero(session comm.IUserSession, req *pb.ForumWatchHeroReq) (errdata *pb.ErrorData) {
var (
hero *pb.DBHero
err error

4
modules/friend/api_cross_accept.go
View File

@ -9,14 +9,14 @@ import (
//接受切磋
func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.FriendAcceptReq) (code pb.ErrorCode) {
func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.FriendAcceptReq) (errdata *pb.ErrorData) {
if req.Uid == "" {
code = pb.ErrorCode_ReqParameterError
}
return
}
func (this *apiComp) Accept(session comm.IUserSession, req *pb.FriendAcceptReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Accept(session comm.IUserSession, req *pb.FriendAcceptReq) (errdata *pb.ErrorData) {
if code = this.AcceptCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_addblack.go
View File

@ -9,7 +9,7 @@ import (
//加入黑名单
func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendAddBlackReq) (code pb.ErrorCode) {
func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendAddBlackReq) (errdata *pb.ErrorData) {
if req.FriendId == "" {
code = pb.ErrorCode_ReqParameterError
this.module.Error("加入黑名单参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
@ -17,7 +17,7 @@ func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendAddB
return
}
func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackReq) (errdata *pb.ErrorData) {
if code = this.AddblackCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_agree.go
View File

@ -9,7 +9,7 @@ import (
//单个/批量同意
func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.FriendAgreeReq) (code pb.ErrorCode) {
func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.FriendAgreeReq) (errdata *pb.ErrorData) {
if len(req.FriendIds) == 0 {
code = pb.ErrorCode_ReqParameterError
this.module.Error("好友审批同意参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
@ -18,7 +18,7 @@ func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.FriendAgreeRe
return
}
func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (errdata *pb.ErrorData) {
if code = this.AgreeCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_apply.go
View File

@ -9,7 +9,7 @@ import (
//好友申请
func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyReq) (code pb.ErrorCode) {
func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyReq) (errdata *pb.ErrorData) {
if req.FriendId == "" {
code = pb.ErrorCode_ReqParameterError
this.module.Error("好友申请参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
@ -17,7 +17,7 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyRe
return
}
func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (errdata *pb.ErrorData) {
if code = this.ApplyCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_applylist.go
View File

@ -7,11 +7,11 @@ import (
//申请列表
func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.FriendApplyListReq) (code pb.ErrorCode) {
func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.FriendApplyListReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyListReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyListReq) (errdata *pb.ErrorData) {
var (
self *pb.DBFriend
list []*pb.FriendBase

4
modules/friend/api_cross_assisthero.go
View File

@ -9,7 +9,7 @@ import (
// 设置助战英雄
func (this *apiComp) AssistheroCheck(session comm.IUserSession, req *pb.FriendAssistheroReq) (code pb.ErrorCode) {
func (this *apiComp) AssistheroCheck(session comm.IUserSession, req *pb.FriendAssistheroReq) (errdata *pb.ErrorData) {
if req.HeroObjId == "" {
code = pb.ErrorCode_ReqParameterError
this.module.Error("设置助战英雄参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
@ -17,7 +17,7 @@ func (this *apiComp) AssistheroCheck(session comm.IUserSession, req *pb.FriendAs
return
}
func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssistheroReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssistheroReq) (errdata *pb.ErrorData) {
if code = this.AssistheroCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_assistherolist.go
View File

@ -7,11 +7,11 @@ import (
// 好友助战英雄列表
func (this *apiComp) AssistHeroListCheck(session comm.IUserSession, req *pb.FriendAssistHeroListReq) (code pb.ErrorCode) {
func (this *apiComp) AssistHeroListCheck(session comm.IUserSession, req *pb.FriendAssistHeroListReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) AssistHeroList(session comm.IUserSession, req *pb.FriendAssistHeroListReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) AssistHeroList(session comm.IUserSession, req *pb.FriendAssistHeroListReq) (errdata *pb.ErrorData) {
//获取玩家自己好友数据
self := this.module.modelFriend.GetFriend(session.GetUserId())

4
modules/friend/api_cross_assistlist.go
View File

@ -9,11 +9,11 @@ import (
// 助战列表
func (this *apiComp) AssistlistCheck(session comm.IUserSession, req *pb.FriendAssistlistReq) (code pb.ErrorCode) {
func (this *apiComp) AssistlistCheck(session comm.IUserSession, req *pb.FriendAssistlistReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) Assistlist(session comm.IUserSession, req *pb.FriendAssistlistReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Assistlist(session comm.IUserSession, req *pb.FriendAssistlistReq) (errdata *pb.ErrorData) {
var list []*pb.FriendBase
//获取玩家自己好友数据
self := this.module.modelFriend.GetFriend(session.GetUserId())

4
modules/friend/api_cross_blacklist.go
View File

@ -6,11 +6,11 @@ import (
)
// 黑名单列表
func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.FriendBlackListReq) (code pb.ErrorCode) {
func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.FriendBlackListReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackListReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackListReq) (errdata *pb.ErrorData) {
var (
self *pb.DBFriend
list []*pb.FriendBase

4
modules/friend/api_cross_del.go
View File

@ -8,7 +8,7 @@ import (
)
// 删除好友
func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) (code pb.ErrorCode) {
func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) (errdata *pb.ErrorData) {
if req.FriendId == "" {
code = pb.ErrorCode_ReqParameterError
this.module.Error("删除好友参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
@ -16,7 +16,7 @@ func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) (
return
}
func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (errdata *pb.ErrorData) {
if code = this.DelCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_delblack.go
View File

@ -8,7 +8,7 @@ import (
)
// 删除黑名单
func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelBlackReq) (code pb.ErrorCode) {
func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelBlackReq) (errdata *pb.ErrorData) {
if req.FriendId == "" {
code = pb.ErrorCode_ReqParameterError
this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
@ -16,7 +16,7 @@ func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelB
return
}
func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackReq) (errdata *pb.ErrorData) {
if code = this.DelblackCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_getrelation.go
View File

@ -8,7 +8,7 @@ import (
)
// 获取好友关系
func (this *apiComp) GetRelationCheck(session comm.IUserSession, req *pb.FriendGetRelationReq) (code pb.ErrorCode) {
func (this *apiComp) GetRelationCheck(session comm.IUserSession, req *pb.FriendGetRelationReq) (errdata *pb.ErrorData) {
if req.TargetUid == "" {
code = pb.ErrorCode_ReqParameterError
this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
@ -16,7 +16,7 @@ func (this *apiComp) GetRelationCheck(session comm.IUserSession, req *pb.FriendG
return
}
func (this *apiComp) GetRelation(session comm.IUserSession, req *pb.FriendGetRelationReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) GetRelation(session comm.IUserSession, req *pb.FriendGetRelationReq) (errdata *pb.ErrorData) {
if code = this.GetRelationCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_getreward.go
View File

@ -7,11 +7,11 @@ import (
)
// 领取奖励
func (this *apiComp) GetrewardCheck(session comm.IUserSession, req *pb.FriendGetrewardReq) (code pb.ErrorCode) {
func (this *apiComp) GetrewardCheck(session comm.IUserSession, req *pb.FriendGetrewardReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewardReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewardReq) (errdata *pb.ErrorData) {
uid := session.GetUserId()
//获取玩家自己好友数据
self := this.module.modelFriend.GetFriend(uid)

4
modules/friend/api_cross_list.go
View File

@ -8,11 +8,11 @@ import (
//好友列表
func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.FriendListReq) (code pb.ErrorCode) {
func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.FriendListReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (errdata *pb.ErrorData) {
var (
self *pb.DBFriend
list []*pb.FriendBase

4
modules/friend/api_cross_qiecuo.go
View File

@ -7,14 +7,14 @@ import (
)
// 踢馆(熊猫武馆)
func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.FriendQiecuoReq) (code pb.ErrorCode) {
func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.FriendQiecuoReq) (errdata *pb.ErrorData) {
if req.TargetUid == "" {
code = pb.ErrorCode_ReqParameterError
}
return
}
func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq) (errdata *pb.ErrorData) {
if code = this.QiecuoCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_randlist.go
View File

@ -9,11 +9,11 @@ import (
// 好友推荐
func (this *apiComp) RandlistCheck(session comm.IUserSession, req *pb.FriendRandlistReq) (code pb.ErrorCode) {
func (this *apiComp) RandlistCheck(session comm.IUserSession, req *pb.FriendRandlistReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistReq) (errdata *pb.ErrorData) {
// 当前玩家好友数据
self := this.module.modelFriend.GetFriend(session.GetUserId())

4
modules/friend/api_cross_refuse.go
View File

@ -8,7 +8,7 @@ import (
)
// 好友审核-拒绝
func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuseReq) (code pb.ErrorCode) {
func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuseReq) (errdata *pb.ErrorData) {
if len(req.FriendIds) == 0 {
code = pb.ErrorCode_ReqParameterError
this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
@ -18,7 +18,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuse
}
// 单个/批量拒绝
func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) (errdata *pb.ErrorData) {
if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_search.go
View File

@ -8,7 +8,7 @@ import (
)
// 搜索
func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode) {
func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearchReq) (errdata *pb.ErrorData) {
if req.NickName == "" {
code = pb.ErrorCode_FriendSearchNameEmpty
this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
@ -17,7 +17,7 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearch
return
}
func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (errdata *pb.ErrorData) {
if code = this.SearchCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_stop.go
View File

@ -6,11 +6,11 @@ import (
)
// 切磋终止
func (this *apiComp) StopCheck(session comm.IUserSession, req *pb.FriendStopReq) (code pb.ErrorCode) {
func (this *apiComp) StopCheck(session comm.IUserSession, req *pb.FriendStopReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (errdata *pb.ErrorData) {
if code = this.StopCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_zan.go
View File

@ -8,7 +8,7 @@ import (
)
// 点赞
func (this *apiComp) ZanCheck(session comm.IUserSession, req *pb.FriendZanReq) (code pb.ErrorCode) {
func (this *apiComp) ZanCheck(session comm.IUserSession, req *pb.FriendZanReq) (errdata *pb.ErrorData) {
if len(req.FriendIds) == 0 {
code = pb.ErrorCode_ReqParameterError
this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
@ -16,7 +16,7 @@ func (this *apiComp) ZanCheck(session comm.IUserSession, req *pb.FriendZanReq) (
return
}
func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errdata *pb.ErrorData) {
if code = this.ZanCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_zanlist.go
View File

@ -6,12 +6,12 @@ import (
)
// 点赞列表
func (this *apiComp) ZanlistCheck(session comm.IUserSession, req *pb.FriendZanlistReq) (code pb.ErrorCode) {
func (this *apiComp) ZanlistCheck(session comm.IUserSession, req *pb.FriendZanlistReq) (errdata *pb.ErrorData) {
return
}
// Deprecated:
func (this *apiComp) Zanlist(session comm.IUserSession, req *pb.FriendZanlistReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Zanlist(session comm.IUserSession, req *pb.FriendZanlistReq) (errdata *pb.ErrorData) {
if code = this.ZanlistCheck(session, req); code != pb.ErrorCode_Success {
return
}

4
modules/friend/api_cross_zanreceive.go
View File

@ -9,7 +9,7 @@ import (
// 领取点赞奖励
func (this *apiComp) ZanreceiveCheck(session comm.IUserSession, req *pb.FriendZanreceiveReq) (code pb.ErrorCode) {
func (this *apiComp) ZanreceiveCheck(session comm.IUserSession, req *pb.FriendZanreceiveReq) (errdata *pb.ErrorData) {
if len(req.FriendIds) == 0 {
code = pb.ErrorCode_ReqParameterError
this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
@ -17,7 +17,7 @@ func (this *apiComp) ZanreceiveCheck(session comm.IUserSession, req *pb.FriendZa
return
}
func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanreceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanreceiveReq) (errdata *pb.ErrorData) {
if code = this.ZanreceiveCheck(session, req); code != pb.ErrorCode_Success {
return
}

8
modules/gateway/agent.go
View File

@ -170,7 +170,7 @@ locp:
}
// 安全认证 所有协议
func (this *Agent) secAuth(msg *pb.UserMessage) (code pb.ErrorCode, err error) {
func (this *Agent) secAuth(msg *pb.UserMessage) (errdata *pb.ErrorData, err error) {
if !utils.ValidSecretKey(msg.Sec) { //验证失败
this.gateway.Errorf("%v", msg.Sec)
return pb.ErrorCode_SignError, fmt.Errorf("key invalid")
@ -179,7 +179,7 @@ func (this *Agent) secAuth(msg *pb.UserMessage) (code pb.ErrorCode, err error) {
}
// 解码
func (this *Agent) decodeUserData(msg *pb.UserMessage) (code pb.ErrorCode, err error) {
func (this *Agent) decodeUserData(msg *pb.UserMessage) (errdata *pb.ErrorData, err error) {
base64Str := msg.Sec
dec, err := base64.StdEncoding.DecodeString(base64Str[35:])
if err != nil {
@ -371,13 +371,13 @@ func (this *Agent) messageDistribution(msg *pb.UserMessage) (err error) {
// if v, ok := this.protoMsg[key]; ok && v != 0 { // 发送消息 协议解锁
// v = 0
// }
if reply.Code != pb.ErrorCode_Success {
if reply.ErrorData != nil {
data, _ := anypb.New(&pb.NotifyErrorNotifyPush{
MsgId: msg.MsgId,
ReqMainType: msg.MainType,
ReqSubType: msg.SubType,
Arg: msg.Data,
Code: pb.ErrorCode(reply.Code.Number()),
Code: reply.ErrorData.Code,
Err: reply.ErrorData})
err = this.WriteMsg(&pb.UserMessage{
MsgId: msg.MsgId,

28
modules/gateway/agentmgr_comp.go
View File

@ -104,8 +104,11 @@ func (this *AgentMgrComp) Bind(ctx context.Context, args *pb.AgentBuildReq, repl
}
// }
} else {
reply.Code = pb.ErrorCode_UserSessionNobeing
reply.ErrorMessage = pb.GetErrorCodeMsg(pb.ErrorCode_UserSessionNobeing)
reply.ErrorData = &pb.ErrorData{
Code: pb.ErrorCode_UserSessionNobeing,
Title: pb.ErrorCode_UserSessionNobeing.ToString(),
Message: fmt.Sprintf("绑定uid:%s失败!", args.WorkerId),
}
}
return nil
}
@ -115,8 +118,11 @@ func (this *AgentMgrComp) UnBind(ctx context.Context, args *pb.AgentUnBuildReq,
if a, ok := this.agents.Load(args.UserSessionId); ok {
a.(IAgent).UnBind()
} else {
reply.Code = pb.ErrorCode_UserSessionNobeing
reply.ErrorMessage = pb.GetErrorCodeMsg(pb.ErrorCode_UserSessionNobeing)
reply.ErrorData = &pb.ErrorData{
Code: pb.ErrorCode_UserSessionNobeing,
Title: pb.ErrorCode_UserSessionNobeing.ToString(),
Message: fmt.Sprintf("解绑SessionId:%s失败!", args.UserSessionId),
}
}
return nil
}
@ -129,8 +135,11 @@ func (this *AgentMgrComp) SendMsgToAgent(ctx context.Context, args *pb.AgentSend
a.(IAgent).WriteMsg(v)
}
} else {
reply.Code = pb.ErrorCode_UserSessionNobeing
reply.ErrorMessage = pb.GetErrorCodeMsg(pb.ErrorCode_UserSessionNobeing)
reply.ErrorData = &pb.ErrorData{
Code: pb.ErrorCode_UserSessionNobeing,
Title: pb.ErrorCode_UserSessionNobeing.ToString(),
Message: fmt.Sprintf("解绑SessionId:%s失败!", args.UserSessionId),
}
}
return nil
}
@ -191,8 +200,11 @@ func (this *AgentMgrComp) CloseAgent(ctx context.Context, args *pb.AgentCloseeRe
if a, ok := this.agents.Load(args.UserSessionId); ok {
a.(IAgent).Close()
} else {
reply.Code = pb.ErrorCode_UserSessionNobeing
reply.ErrorMessage = pb.GetErrorCodeMsg(pb.ErrorCode_UserSessionNobeing)
reply.ErrorData = &pb.ErrorData{
Code: pb.ErrorCode_UserSessionNobeing,
Title: pb.ErrorCode_UserSessionNobeing.ToString(),
Message: fmt.Sprintf("解绑SessionId:%s失败!", args.UserSessionId),
}
}
return nil
}

4
modules/gm/api_cmd.go
View File

@ -40,7 +40,7 @@ import (
24、bingo:cleannpc
*/
//参数校验
func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (code pb.ErrorCode) {
func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (errdata *pb.ErrorData) {
if len(req.Cmod) == 0 {
code = pb.ErrorCode_ReqParameterError
}
@ -48,7 +48,7 @@ func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (code
}
///解析GM 指令
func (this *apiComp) Cmd(session comm.IUserSession, req *pb.GMCmdReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Cmd(session comm.IUserSession, req *pb.GMCmdReq) (errdata *pb.ErrorData) {
if code = this.CmdCheck(session, req); code != pb.ErrorCode_Success {
return
}

2
modules/gm/module.go
View File

@ -60,7 +60,7 @@ func (this *GM) OnInstallComp() {
}
// bingo:Iamyoudad
func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (code pb.ErrorCode) {
func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.ErrorData) {
cmd = strings.Replace(cmd, " ", "", -1) // 去空格
keys := strings.Split(cmd, ":")

4
modules/gourmet/api_activateatlas.go
View File

@ -7,7 +7,7 @@ import (
)
//参数校验
func (this *apiComp) ActivateAtlasCheck(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (code pb.ErrorCode) {
func (this *apiComp) ActivateAtlasCheck(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (errdata *pb.ErrorData) {
if req.Cid == "" {
code = pb.ErrorCode_ReqParameterError
return
@ -15,7 +15,7 @@ func (this *apiComp) ActivateAtlasCheck(session comm.IUserSession, req *pb.Gourm
return
}
func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (errdata *pb.ErrorData) {
code = this.ActivateAtlasCheck(session, req)
if code != pb.ErrorCode_Success {

4
modules/gourmet/api_createfood.go
View File

@ -7,7 +7,7 @@ import (
)
//参数校验
func (this *apiComp) CreateFoodCheck(session comm.IUserSession, req *pb.GourmetCreateFoodReq) (code pb.ErrorCode) {
func (this *apiComp) CreateFoodCheck(session comm.IUserSession, req *pb.GourmetCreateFoodReq) (errdata *pb.ErrorData) {
if req.Cid == "" || len(req.Material) == 0 {
code = pb.ErrorCode_ReqParameterError
}
@ -15,7 +15,7 @@ func (this *apiComp) CreateFoodCheck(session comm.IUserSession, req *pb.GourmetC
}
///获取美食城基本信息
func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreateFoodReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreateFoodReq) (errdata *pb.ErrorData) {
var (
res []*cfg.Gameatn
curFood string // 做出来的食物ID

4
modules/gourmet/api_getatlas.go
View File

@ -6,13 +6,13 @@ import (
)
//参数校验
func (this *apiComp) AtlasCheck(session comm.IUserSession, req *pb.GourmetAtlasReq) (code pb.ErrorCode) {
func (this *apiComp) AtlasCheck(session comm.IUserSession, req *pb.GourmetAtlasReq) (errdata *pb.ErrorData) {
return
}
///获取美食城基本信息
func (this *apiComp) Atlas(session comm.IUserSession, req *pb.GourmetAtlasReq) (code pb.ErrorCode, data *pb.ErrorData) {
func (this *apiComp) Atlas(session comm.IUserSession, req *pb.GourmetAtlasReq) (errdata *pb.ErrorData) {
code = this.AtlasCheck(session, req)
if code != pb.ErrorCode_Success {

Some files were not shown because too many files have changed in this diff Show More