Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
cfbc02c43e
@ -1,60 +1,60 @@
|
||||
package mainline
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
// import (
|
||||
// "go_dreamfactory/comm"
|
||||
// "go_dreamfactory/pb"
|
||||
// cfg "go_dreamfactory/sys/configure/structs"
|
||||
// )
|
||||
|
||||
// 参数校验
|
||||
func (this *apiComp) ShopCheck(session comm.IUserSession, req *pb.MainlineShopReq) (errdata *pb.ErrorData) {
|
||||
return
|
||||
}
|
||||
// // 参数校验
|
||||
// func (this *apiComp) ShopCheck(session comm.IUserSession, req *pb.MainlineShopReq) (errdata *pb.ErrorData) {
|
||||
// return
|
||||
// }
|
||||
|
||||
// 查询商店信息
|
||||
func (this *apiComp) Shop(session comm.IUserSession, req *pb.MainlineShopReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
info *pb.DBMainlineShop
|
||||
err error
|
||||
shopinfo []*cfg.GameMainShopItemData
|
||||
condiIds []int32
|
||||
bchange bool
|
||||
)
|
||||
errdata = this.ShopCheck(session, req)
|
||||
if errdata != nil {
|
||||
return // 参数校验失败直接返回
|
||||
}
|
||||
// // 查询商店信息
|
||||
// func (this *apiComp) Shop(session comm.IUserSession, req *pb.MainlineShopReq) (errdata *pb.ErrorData) {
|
||||
// var (
|
||||
// info *pb.DBMainlineShop
|
||||
// err error
|
||||
// shopinfo []*cfg.GameMainShopItemData
|
||||
// condiIds []int32
|
||||
// bchange bool
|
||||
// )
|
||||
// errdata = this.ShopCheck(session, req)
|
||||
// if errdata != nil {
|
||||
// return // 参数校验失败直接返回
|
||||
// }
|
||||
|
||||
info, err = this.module.modelShop.getMainlineShopData(session.GetUserId())
|
||||
if err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
shopinfo = this.module.configure.GetAllShopConf()
|
||||
for _, v := range shopinfo {
|
||||
condiIds = append(condiIds, v.Unlock)
|
||||
}
|
||||
info.Unlock = make(map[int32]int32)
|
||||
if data, err := this.module.ModuleBuried.CheckCondition(session, condiIds...); err == nil {
|
||||
for pos, v := range data {
|
||||
if int32(v.State) == 1 { // 记录解锁的数据
|
||||
key := shopinfo[pos].Key
|
||||
if _, ok := info.Unlock[key]; !ok {
|
||||
info.Unlock[key] = 1
|
||||
bchange = true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if bchange {
|
||||
this.module.modelShop.updateMainlineShopData(session.GetUserId(), info)
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "shop", &pb.MainlineShopResp{
|
||||
Info: info,
|
||||
})
|
||||
return
|
||||
}
|
||||
// info, err = this.module.modelShop.getMainlineShopData(session.GetUserId())
|
||||
// if err != nil {
|
||||
// errdata = &pb.ErrorData{
|
||||
// Code: pb.ErrorCode_DBError,
|
||||
// Title: pb.ErrorCode_DBError.ToString(),
|
||||
// Message: err.Error(),
|
||||
// }
|
||||
// return
|
||||
// }
|
||||
// shopinfo = this.module.configure.GetAllShopConf()
|
||||
// for _, v := range shopinfo {
|
||||
// condiIds = append(condiIds, v.Unlock)
|
||||
// }
|
||||
// info.Unlock = make(map[int32]int32)
|
||||
// if data, err := this.module.ModuleBuried.CheckCondition(session, condiIds...); err == nil {
|
||||
// for pos, v := range data {
|
||||
// if int32(v.State) == 1 { // 记录解锁的数据
|
||||
// key := shopinfo[pos].Key
|
||||
// if _, ok := info.Unlock[key]; !ok {
|
||||
// info.Unlock[key] = 1
|
||||
// bchange = true
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// if bchange {
|
||||
// this.module.modelShop.updateMainlineShopData(session.GetUserId(), info)
|
||||
// }
|
||||
// session.SendMsg(string(this.module.GetType()), "shop", &pb.MainlineShopResp{
|
||||
// Info: info,
|
||||
// })
|
||||
// return
|
||||
// }
|
||||
|
||||
@ -1,99 +1,99 @@
|
||||
package mainline
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
// import (
|
||||
// "go_dreamfactory/comm"
|
||||
// "go_dreamfactory/pb"
|
||||
// cfg "go_dreamfactory/sys/configure/structs"
|
||||
// )
|
||||
|
||||
// 参数校验
|
||||
func (this *apiComp) ShopBuyCheck(session comm.IUserSession, req *pb.MainlineShopBuyReq) (errdata *pb.ErrorData) {
|
||||
if req.Cid <= 0 {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
}
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
// // 参数校验
|
||||
// func (this *apiComp) ShopBuyCheck(session comm.IUserSession, req *pb.MainlineShopBuyReq) (errdata *pb.ErrorData) {
|
||||
// if req.Cid <= 0 {
|
||||
// errdata = &pb.ErrorData{
|
||||
// Code: pb.ErrorCode_ReqParameterError,
|
||||
// Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
// }
|
||||
// return
|
||||
// }
|
||||
// return
|
||||
// }
|
||||
|
||||
// 商店购买
|
||||
func (this *apiComp) ShopBuy(session comm.IUserSession, req *pb.MainlineShopBuyReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
info *pb.DBMainlineShop
|
||||
err error
|
||||
shopConf *cfg.GameMainShopItemData
|
||||
bUnlock bool
|
||||
atno []*pb.UserAtno
|
||||
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
|
||||
)
|
||||
bUnlock = true
|
||||
errdata = this.ShopBuyCheck(session, req)
|
||||
if errdata != nil {
|
||||
return // 参数校验失败直接返回
|
||||
}
|
||||
// // 商店购买
|
||||
// func (this *apiComp) ShopBuy(session comm.IUserSession, req *pb.MainlineShopBuyReq) (errdata *pb.ErrorData) {
|
||||
// var (
|
||||
// info *pb.DBMainlineShop
|
||||
// err error
|
||||
// shopConf *cfg.GameMainShopItemData
|
||||
// bUnlock bool
|
||||
// atno []*pb.UserAtno
|
||||
// tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
|
||||
// )
|
||||
// bUnlock = true
|
||||
// errdata = this.ShopBuyCheck(session, req)
|
||||
// if errdata != nil {
|
||||
// return // 参数校验失败直接返回
|
||||
// }
|
||||
|
||||
info, err = this.module.modelShop.getMainlineShopData(session.GetUserId())
|
||||
if err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
// info, err = this.module.modelShop.getMainlineShopData(session.GetUserId())
|
||||
// if err != nil {
|
||||
// errdata = &pb.ErrorData{
|
||||
// Code: pb.ErrorCode_DBError,
|
||||
// Title: pb.ErrorCode_DBError.ToString(),
|
||||
// Message: err.Error(),
|
||||
// }
|
||||
// return
|
||||
// }
|
||||
|
||||
if shopConf, err = this.module.configure.GetMlineShopConfById(req.Cid); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
// 检查是否需要解锁
|
||||
if shopConf.Unlock != 0 {
|
||||
bUnlock = false
|
||||
if _, ok := info.Unlock[req.Cid]; ok {
|
||||
bUnlock = true
|
||||
}
|
||||
}
|
||||
if !bUnlock {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_MainlineShopUnlock,
|
||||
Title: pb.ErrorCode_MainlineShopUnlock.ToString(),
|
||||
}
|
||||
return
|
||||
}
|
||||
info.Buytime[req.Cid] += 1
|
||||
// if shopConf, err = this.module.configure.GetMlineShopConfById(req.Cid); err != nil {
|
||||
// errdata = &pb.ErrorData{
|
||||
// Code: pb.ErrorCode_ConfigNoFound,
|
||||
// Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
// Message: err.Error(),
|
||||
// }
|
||||
// return
|
||||
// }
|
||||
// // 检查是否需要解锁
|
||||
// if shopConf.Unlock != 0 {
|
||||
// bUnlock = false
|
||||
// if _, ok := info.Unlock[req.Cid]; ok {
|
||||
// bUnlock = true
|
||||
// }
|
||||
// }
|
||||
// if !bUnlock {
|
||||
// errdata = &pb.ErrorData{
|
||||
// Code: pb.ErrorCode_MainlineShopUnlock,
|
||||
// Title: pb.ErrorCode_MainlineShopUnlock.ToString(),
|
||||
// }
|
||||
// return
|
||||
// }
|
||||
// info.Buytime[req.Cid] += 1
|
||||
|
||||
if shopConf.Bugtime > info.Buytime[req.Cid] { // 限购了 买不了
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_MainlineBuyMaxCount,
|
||||
Title: pb.ErrorCode_MainlineBuyMaxCount.ToString(),
|
||||
}
|
||||
return
|
||||
}
|
||||
// if shopConf.Bugtime > info.Buytime[req.Cid] { // 限购了 买不了
|
||||
// errdata = &pb.ErrorData{
|
||||
// Code: pb.ErrorCode_MainlineBuyMaxCount,
|
||||
// Title: pb.ErrorCode_MainlineBuyMaxCount.ToString(),
|
||||
// }
|
||||
// return
|
||||
// }
|
||||
|
||||
if errdata = this.module.ConsumeRes(session, shopConf.Need, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
if errdata, atno = this.module.DispenseAtno(session, shopConf.Itemsell, true); errdata != nil {
|
||||
this.module.DispenseRes(session, shopConf.Need, true) // 资源回退
|
||||
return
|
||||
}
|
||||
this.module.modelShop.updateMainlineShopData(session.GetUserId(), info)
|
||||
session.SendMsg(string(this.module.GetType()), "shopbuy", &pb.MainlineShopBuyResp{
|
||||
Info: info,
|
||||
Item: atno,
|
||||
})
|
||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype236, shopConf.Shopid, 1))
|
||||
// if errdata = this.module.ConsumeRes(session, shopConf.Need, true); errdata != nil {
|
||||
// return
|
||||
// }
|
||||
// if errdata, atno = this.module.DispenseAtno(session, shopConf.Itemsell, true); errdata != nil {
|
||||
// this.module.DispenseRes(session, shopConf.Need, true) // 资源回退
|
||||
// return
|
||||
// }
|
||||
// this.module.modelShop.updateMainlineShopData(session.GetUserId(), info)
|
||||
// session.SendMsg(string(this.module.GetType()), "shopbuy", &pb.MainlineShopBuyResp{
|
||||
// Info: info,
|
||||
// Item: atno,
|
||||
// })
|
||||
// tasks = append(tasks, comm.GetBuriedParam(comm.Rtype236, shopConf.Shopid, 1))
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.ModuleBuried.TriggerBuried(session, tasks...)
|
||||
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MainlineShopBuyReq", atno)
|
||||
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "MainlineShopBuyReq", shopConf.Need)
|
||||
})
|
||||
return
|
||||
}
|
||||
// go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
// this.module.ModuleBuried.TriggerBuried(session, tasks...)
|
||||
// this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MainlineShopBuyReq", atno)
|
||||
// this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "MainlineShopBuyReq", shopConf.Need)
|
||||
// })
|
||||
// return
|
||||
// }
|
||||
|
||||
@ -13,7 +13,7 @@ func (this *apiComp) CompleteTaskCheck(session comm.IUserSession, req *pb.Warord
|
||||
return
|
||||
}
|
||||
|
||||
// /获取系统公告
|
||||
//获取系统公告
|
||||
func (this *apiComp) CompleteTask(session comm.IUserSession, req *pb.WarorderCompleteTaskReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
conf *cfg.GamePassCheckTaskData
|
||||
|
||||
Loading…
Reference in New Issue
Block a user