diff --git a/modules/items/modelitems.go b/modules/items/modelitems.go index 09fe5b084..2222624e6 100644 --- a/modules/items/modelitems.go +++ b/modules/items/modelitems.go @@ -17,13 +17,13 @@ import ( "go.mongodb.org/mongo-driver/x/bsonx" ) -///背包缓存数据管理组件 +// /背包缓存数据管理组件 type ModelItemsComp struct { modules.MCompModel module *Items } -//组件初始化接口 +// 组件初始化接口 func (this *ModelItemsComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { this.TableName = comm.TableItems this.MCompModel.Init(service, module, comp, opt) @@ -35,7 +35,7 @@ func (this *ModelItemsComp) Init(service core.IService, module core.IModule, com return } -///查询用户背包数据 +// /查询用户背包数据 func (this *ModelItemsComp) QueryUserPack(uId string) (itmes []*pb.DB_UserItemData, err error) { var ( model *db.DBModel @@ -58,7 +58,7 @@ func (this *ModelItemsComp) QueryUserPack(uId string) (itmes []*pb.DB_UserItemDa return } -///查询用户指定格子的物品数据 +// /查询用户指定格子的物品数据 func (this *ModelItemsComp) QueryUserPackByGridId(uId string, grid string) (itme *pb.DB_UserItemData, err error) { var ( model *db.DBModel @@ -82,7 +82,7 @@ func (this *ModelItemsComp) QueryUserPackByGridId(uId string, grid string) (itme return } -///查询用户指定格子的物品数据 +// /查询用户指定格子的物品数据 func (this *ModelItemsComp) QueryUserPackByGridIds(uId string, grids []string) (itme []*pb.DB_UserItemData, err error) { var ( model *db.DBModel @@ -106,7 +106,7 @@ func (this *ModelItemsComp) QueryUserPackByGridIds(uId string, grids []string) ( return } -//更新用户的背包信息 +// 更新用户的背包信息 func (this *ModelItemsComp) AddUserPack(uId string, itmes ...*pb.DB_UserItemData) (err error) { data := make(map[string]*pb.DB_UserItemData) for _, v := range itmes { @@ -132,7 +132,7 @@ func (this *ModelItemsComp) AddUserPack(uId string, itmes ...*pb.DB_UserItemData return } -//更新用户的背包信息 +// 更新用户的背包信息 func (this *ModelItemsComp) UpdateUserPack(uid string, itmes ...*pb.DB_UserItemData) (err error) { var ( model *db.DBModel @@ -162,7 +162,7 @@ func (this *ModelItemsComp) UpdateUserPack(uid string, itmes ...*pb.DB_UserItemD return } -//更新用户的背包信息 +// 更新用户的背包信息 func (this *ModelItemsComp) DeleteUserPack(uid string, itmes ...*pb.DB_UserItemData) (err error) { var ( model *db.DBModel @@ -191,7 +191,7 @@ func (this *ModelItemsComp) DeleteUserPack(uid string, itmes ...*pb.DB_UserItemD return } -//查询用户背包物品数量 +// 查询用户背包物品数量 func (this *ModelItemsComp) QueryUserPackItemsAmount(uId string, itemid ...string) (result map[string]uint32) { var ( itmes []*pb.DB_UserItemData @@ -213,7 +213,7 @@ func (this *ModelItemsComp) QueryUserPackItemsAmount(uId string, itemid ...strin return } -///添加或则减少物品到用户背包 +// /添加或则减少物品到用户背包 func (this *ModelItemsComp) AddItemToUserPack(uId string, itemId string, addnum int32) (change []*pb.DB_UserItemData, err error) { var ( itmes []*pb.DB_UserItemData @@ -264,7 +264,7 @@ func (this *ModelItemsComp) AddItemToUserPack(uId string, itemId string, addnum return } -///添加或则减少多个物品到用户背包 +// /添加或则减少多个物品到用户背包 func (this *ModelItemsComp) AddItemsToUserPack(uId string, items map[string]int32) (change []*pb.DB_UserItemData, err error) { var ( itmes []*pb.DB_UserItemData @@ -316,7 +316,7 @@ func (this *ModelItemsComp) AddItemsToUserPack(uId string, items map[string]int3 return } -///修改指定格子的物品数量 +// /修改指定格子的物品数量 func (this *ModelItemsComp) AddItemToUserPackByGrid(uId string, gridid string, addnum int32) (change []*pb.DB_UserItemData, err error) { var ( conf *cfg.GameItemData @@ -359,7 +359,7 @@ func (this *ModelItemsComp) AddItemToUserPackByGrid(uId string, gridid string, a return } -///添加移除物品到用户背包 +// /添加移除物品到用户背包 func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserItemData, itemId string, addnum int32) (add, update, del []*pb.DB_UserItemData, leftnum int64, err error) { var ( conf *cfg.GameItemData @@ -374,10 +374,10 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte err = NoFoundItemConfig return } - if conf.UpperLimit == 0 { - err = fmt.Errorf("item UpperLimit is 0") - return - } + // if conf.UpperLimit == 0 { + // err = fmt.Errorf("item UpperLimit is 0") + // return + // } isNew = true leftnum = int64(addnum) add = make([]*pb.DB_UserItemData, 0) @@ -429,7 +429,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte if leftnum > 0 { //还没有放完 寻找空的格子填充 index := int32(len(items)) for leftnum > 0 { //需要补充格子 - if conf.UpperLimit < 0 || (conf.UpperLimit > 0 && leftnum <= int64(conf.UpperLimit)) { + if conf.UpperLimit == 0 || (conf.UpperLimit > 0 && leftnum <= int64(conf.UpperLimit)) { grid := &pb.DB_UserItemData{ GridId: primitive.NewObjectID().Hex(), UId: uid, @@ -470,7 +470,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte return } -//购买门票 +// 购买门票 func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (info *pb.DBUserExpand, errdata *pb.ErrorData) { var ( need *cfg.Gameatn @@ -538,7 +538,7 @@ func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (inf return } -///回复门票 +// /回复门票 func (this *ModelItemsComp) recoverTicket(session comm.IUserSession) (errdata *pb.ErrorData) { var ( user *pb.DBUser @@ -599,7 +599,7 @@ func (this *ModelItemsComp) recoverTicket(session comm.IUserSession) (errdata *p return } -///使用道具 +// /使用道具 func (this *ModelItemsComp) useitem(session comm.IUserSession, gid string, amount int32, slt int32) (errdata *pb.ErrorData) { var ( item *pb.DB_UserItemData diff --git a/modules/practice/api_gymconfirm.go b/modules/practice/api_gymconfirm.go index e71f7da83..ca2e428fa 100644 --- a/modules/practice/api_gymconfirm.go +++ b/modules/practice/api_gymconfirm.go @@ -5,13 +5,13 @@ import ( "go_dreamfactory/pb" ) -//参数校验 +// 参数校验 func (this *apiComp) GymConfirmCheck(session comm.IUserSession, req *pb.PracticeGymConfirmReq) (errdata *pb.ErrorData) { return } -///练功请求 +// /每日一练确认 func (this *apiComp) GymConfirm(session comm.IUserSession, req *pb.PracticeGymConfirmReq) (errdata *pb.ErrorData) { this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{ diff --git a/modules/practice/api_gyminfo.go b/modules/practice/api_gyminfo.go index e186cd3dd..af7b11a79 100644 --- a/modules/practice/api_gyminfo.go +++ b/modules/practice/api_gyminfo.go @@ -7,13 +7,13 @@ import ( "time" ) -//参数校验 +// 参数校验 func (this *apiComp) GymInfoCheck(session comm.IUserSession, req *pb.PracticeGymInfoReq) (errdata *pb.ErrorData) { return } -///练功请求 +// /获取每日一练信息 func (this *apiComp) GymInfo(session comm.IUserSession, req *pb.PracticeGymInfoReq) (errdata *pb.ErrorData) { var ( err error @@ -33,6 +33,7 @@ func (this *apiComp) GymInfo(session comm.IUserSession, req *pb.PracticeGymInfoR "gymrefresh": room.Gymrefresh, }) } + go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype185, 1)) session.SendMsg(string(this.module.GetType()), "gyminfo", &pb.PracticeGymInfoResp{Lastaction: room.Gymaction, Refreshnum: room.Gymrefresh}) return } diff --git a/modules/practice/api_gymrefresh.go b/modules/practice/api_gymrefresh.go index 6fae8137d..cd26101af 100644 --- a/modules/practice/api_gymrefresh.go +++ b/modules/practice/api_gymrefresh.go @@ -8,13 +8,13 @@ import ( "math/rand" ) -//参数校验 +// 参数校验 func (this *apiComp) GymRefreshCheck(session comm.IUserSession, req *pb.PracticeGymRefreshReq) (errdata *pb.ErrorData) { return } -///练功请求 +// /刷新动作 func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRefreshReq) (errdata *pb.ErrorData) { var ( err error