Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
395cb5a44b
@ -63,7 +63,7 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
|
||||
Lv: v.Lv,
|
||||
AttrName: attrlibrary.Attrkey,
|
||||
BaseValue: attrlibrary.Attrvar,
|
||||
Value: attrlibrary.Attrvar + int32(float64(attrlibrary.Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrary.AttrvarCorrect)),
|
||||
Value: attrlibrary.Attrvar + int32(float64(attrlibrary.Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrary.Attrvar)),
|
||||
}
|
||||
}
|
||||
if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equip.Id, map[string]interface{}{
|
||||
|
@ -39,9 +39,9 @@ func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskList
|
||||
return
|
||||
}
|
||||
for _, v := range sociatyTask.TaskList {
|
||||
if v.Status == 0 {
|
||||
tasklist = append(tasklist, v.TaskId)
|
||||
}
|
||||
// if v.Status == 0 {
|
||||
tasklist = append(tasklist, v.TaskId)
|
||||
// }
|
||||
}
|
||||
condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasklist...)
|
||||
if err != nil {
|
||||
|
Loading…
Reference in New Issue
Block a user