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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei1dao 2023-11-28 14:08:06 +08:00
commit 534220fae0
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/hero/api_selectcard.go
View File

@ -82,10 +82,14 @@ func (this *apiComp) SelectCard(session comm.IUserSession, req *pb.HeroSelectCar
} }
result.Complete = true result.Complete = true
//result.Cur = []string{} // 清空数据 result.Cur = []string{} // 清空数据
result.Rst1 = []string{} // 清空数据
result.Rst2 = []string{} // 清空数据
if err = this.module.modelSelect.ChangeHeroSelectData(session.GetUserId(), map[string]interface{}{ if err = this.module.modelSelect.ChangeHeroSelectData(session.GetUserId(), map[string]interface{}{
"complete": result.Complete, "complete": result.Complete,
//"cur": result.Cur, "cur": result.Cur,
"rst1": result.Rst1,
"rst2": result.Rst2,
}); err != nil { }); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, Code: pb.ErrorCode_DBError,

8
modules/hero/api_selectgetlist copy.go → modules/hero/api_selectgetlist.go
View File

@ -13,9 +13,9 @@ func (this *apiComp) SelectGetListCheck(session comm.IUserSession, req *pb.HeroS
func (this *apiComp) SelectGetList(session comm.IUserSession, req *pb.HeroSelectGetListReq) (errdata *pb.ErrorData) { func (this *apiComp) SelectGetList(session comm.IUserSession, req *pb.HeroSelectGetListReq) (errdata *pb.ErrorData) {
var ( var (
err error err error
list *pb.DBSelectDraw
) )
rsp := &pb.HeroSelectGetListResp{} if list, err = this.module.modelSelect.GetDrawSelectData(session.GetUserId()); err != nil {
if rsp.Data, err = this.module.modelSelect.GetDrawSelectData(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(), Title: pb.ErrorCode_DBError.ToString(),
@ -23,6 +23,8 @@ func (this *apiComp) SelectGetList(session comm.IUserSession, req *pb.HeroSelect
} }
return return
} }
session.SendMsg(string(this.module.GetType()), "selectgetlist", rsp) session.SendMsg(string(this.module.GetType()), "selectgetlist", &pb.HeroSelectGetListResp{
Data: list,
})
return return
} }

4
modules/hero/model_select.go
View File

@ -31,9 +31,7 @@ func (this *ModelSelect) GetDrawSelectData(uid string) (result *pb.DBSelectDraw,
if mongo.ErrNoDocuments == err { // 创建一条新的数据 if mongo.ErrNoDocuments == err { // 创建一条新的数据
result.Id = primitive.NewObjectID().Hex() result.Id = primitive.NewObjectID().Hex()
result.Uid = uid result.Uid = uid
err = this.Add(uid, result)
this.Add(uid, result)
err = nil
} }
return return
} }