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-15 10:44:48 +08:00
commit 2f5825260a
2 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/moonlv/api_lvaward.go
View File

@ -52,7 +52,29 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.MoonlvAwardReq) (e
update["lv"] = list.Lv
// 升级了清空当前任务
list.Tasks = nil
update["task"] = list.Tasks
// 重置任务
var szTaskid []int32
if lvConf, err := this.module.configure.GetMoonLvConf(list.Lv); err != nil {
if conf, err := this.module.configure.GetMoonLvTaskConf(lvConf.TaskGroupId); err != nil {
for _, v := range conf {
szTaskid = append(szTaskid, v.TaskId) // 获取任务id
}
}
}
if data, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), szTaskid...); err == nil {
for _, v := range data {
tmp := &pb.MoonTask{
TaskId: v.Conid,
Received: 0,
Cond: v,
}
if v.State == pb.BuriedItemFinishState_buried_finish {
tmp.Received = 1
}
list.Tasks = append(list.Tasks, tmp)
}
}
update["tasks"] = list.Tasks
}
list.Reward[req.Lv] = true
update["reward"] = list.Reward

36
modules/moonlv/model_moonlv.go
View File

@ -35,6 +35,27 @@ func (this *modelMoonlv) getMoonlvList(uid string) (result *pb.DBMoonLv, err err
result.Uid = uid
result.Lv = 1 // 默认1级
result.Reward = make(map[int32]bool)
var szTaskid []int32
if lvConf, err := this.module.configure.GetMoonLvConf(1); err != nil {
if conf, err := this.module.configure.GetMoonLvTaskConf(lvConf.TaskGroupId); err != nil {
for _, v := range conf {
szTaskid = append(szTaskid, v.TaskId) // 获取任务id
}
}
}
if data, err := this.module.ModuleBuried.CheckCondition(uid, szTaskid...); err == nil {
for _, v := range data {
tmp := &pb.MoonTask{
TaskId: v.Conid,
Received: 0,
Cond: v,
}
if v.State == pb.BuriedItemFinishState_buried_finish {
tmp.Received = 1
}
result.Tasks = append(result.Tasks, tmp)
}
}
this.Add(uid, result)
err = nil
}
@ -46,13 +67,14 @@ func (this *modelMoonlv) getMoonlvList(uid string) (result *pb.DBMoonLv, err err
func (this *modelMoonlv) modifyMoonlvList(uid string, data map[string]interface{}) error {
return this.Change(uid, data)
}
func (this *modelMoonlv) getTaskRecord(uid string) (*pb.DBTujianTask, error) {
tt := &pb.DBTujianTask{Uid: uid}
if err := this.Get(uid, tt); err != nil {
return tt, err
}
return tt, nil
}
// func (this *modelMoonlv) getTaskRecord(uid string) (*pb.DBTujianTask, error) {
// tt := &pb.DBTujianTask{Uid: uid}
// if err := this.Get(uid, tt); err != nil {
// return tt, err
// }
// return tt, nil
// }
func (this *modelMoonlv) updateTaskRecord(uid string, taskId int32, dt *pb.DBMoonLv) error {