Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
f125c6d835
@ -57,9 +57,9 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (cod
|
||||
code = pb.ErrorCode_DBError
|
||||
return
|
||||
}
|
||||
user := this.module.ModuleUser.GetUser(session.GetUserId())
|
||||
reward := this.module.ModuleTools.GetGroupDataByLottery(box.Drop, user.Vip, user.Lv)
|
||||
//reward := this.module.configure.GetDropReward(box.Drop)
|
||||
// user := this.module.ModuleUser.GetUser(session.GetUserId())
|
||||
// reward := this.module.ModuleTools.GetGroupDataByLottery(box.Drop, user.Vip, user.Lv)
|
||||
reward := this.module.configure.GetDropReward(box.Drop)
|
||||
this.module.DispenseRes(session, reward, true)
|
||||
atns = make([]*pb.UserAssets, len(reward))
|
||||
for i, v := range reward {
|
||||
|
@ -418,7 +418,7 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
|
||||
code = pb.ErrorCode_GoldNoEnough
|
||||
return
|
||||
}
|
||||
go this.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype68, add))
|
||||
go this.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype68, -(add)))
|
||||
}
|
||||
change.Gold += int64(add)
|
||||
case comm.ResExp:
|
||||
|
Loading…
Reference in New Issue
Block a user