Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
204e37675c
@ -304,12 +304,10 @@ func (this *Activity) GetHdData(session comm.IUserSession, oids []string) (resul
|
||||
}
|
||||
if activity.Itype == pb.HdType_HdCelebration {
|
||||
list, _ = this.modelhdData.getHddataByOid(session.GetUserId(), id)
|
||||
|
||||
// 获取开服庆典活动
|
||||
if activity.Itype == pb.HdType_HdCelebration {
|
||||
// key := fmt.Sprintf("%s-%s", session.GetUserId(), id)
|
||||
if list, err = this.modelhdData.getHddataByOid(session.GetUserId(), id); err == nil {
|
||||
|
||||
if list.Lasttime < configure.Now().Unix() || list.Val == 0 { // 不是今天重置
|
||||
//list.Lasttime = configure.Now().Unix()
|
||||
list.Gotarr = make(map[int32]int32)
|
||||
@ -346,9 +344,7 @@ func (this *Activity) GetHdData(session comm.IUserSession, oids []string) (resul
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if list != nil {
|
||||
result = append(result, list)
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user