Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
43769fc6fe
@ -96,7 +96,9 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
|
||||
return
|
||||
}
|
||||
case itemuse_synthesis: //合成
|
||||
if prop = this.module.configure.GetDropData(itemcf.BoxId); prop == nil {
|
||||
user := this.module.ModuleUser.GetUser(session.GetUserId())
|
||||
reward := this.module.ModuleTools.GetGroupDataByLottery(itemcf.BoxId, user.Vip, user.Lv) // 走新的掉落
|
||||
if reward == nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
}
|
||||
@ -120,15 +122,13 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
|
||||
return
|
||||
}
|
||||
sale = make([]*cfg.Gameatn, 0, len(prop))
|
||||
for _, v := range prop {
|
||||
for _, v1 := range v.Prize {
|
||||
for _, v1 := range reward {
|
||||
sale = append(sale, &cfg.Gameatn{
|
||||
A: v1.A,
|
||||
T: v1.T,
|
||||
N: v1.N * int32(req.Amount),
|
||||
})
|
||||
}
|
||||
}
|
||||
if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user