liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gm 跳过手动激活类型

Browse Source
This commit is contained in:
meixiongfeng 2023-12-29 21:34:46 +08:00
parent 2c000b99bd
commit 4dd7f0f4ee
3 changed files with 63 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/sys/module.go
View File

@ -171,8 +171,11 @@ func (this *ModuleSys) GMOpenAllCondition(uid string) {
return
}
for _, v := range opencfg.GetDataList() {
if v.ActivateType != 1 { // 跳过手动激活类型
list.Cond[v.Id] = 2
}
}
this.modelSys.ChangeOpenCondData(uid, map[string]interface{}{
"cond": list.Cond,
})

68
modules/timer/activity.go
View File

@ -53,7 +53,7 @@ func (this *Activity) Start() (err error) {
return
}
timer := time.NewTicker(time.Second * 1)
this.LoadActivityData("")
this.LoadActivityData()
go func() {
locp:
@ -70,43 +70,7 @@ func (this *Activity) Start() (err error) {
//cron.AddFunc("0 0 0 ? * MON", this.TimerSeason)
return
}
func (this *Activity) LoadActivityData(id string) {
if id == "" { // 查所有的
if c, err := this.DB.Find(core.SqlTable(this.TableName), bson.M{}); err == nil {
var (
szEnd []string // 活动结束
szStart []string // 有活动开启
)
this.hlock.Lock()
this.curActivity = make(map[pb.HdType]*pb.DBHuodong)
this.delActivity = make(map[pb.HdType]*pb.DBHuodong)
this.futureActivity = make(map[pb.HdType]*pb.DBHuodong)
defer this.hlock.Unlock()
for c.Next(context.Background()) {
hd := &pb.DBHuodong{}
if err = c.Decode(hd); err != nil {
this.module.Errorf("err:%v", err)
continue
}
if hd.Etime <= configure.Now().Unix() {
this.delActivity[hd.Itype] = hd
szEnd = append(szEnd, hd.Id)
} else if hd.Etime > configure.Now().Unix() && hd.Stime < configure.Now().Unix() {
this.curActivity[hd.Itype] = hd
szStart = append(szStart, hd.Id)
} else {
this.futureActivity[hd.Itype] = hd
}
}
if len(szEnd) > 0 {
this.NotifyActivityOver(szEnd)
}
if len(szStart) > 0 {
this.NotifyActivityStart(szStart)
}
}
} else {
func (this *Activity) ReLoadActivityData(id string) {
var hd *pb.DBHuodong
if err := this.DB.FindOne(core.SqlTable(this.TableName), bson.M{"_id": id}).Decode(&hd); err != nil {
return
@ -135,7 +99,34 @@ func (this *Activity) LoadActivityData(id string) {
this.futureActivity[hd.Itype] = hd
}
defer this.hlock.Unlock()
}
func (this *Activity) LoadActivityData() {
if c, err := this.DB.Find(core.SqlTable(this.TableName), bson.M{}); err == nil {
this.hlock.Lock()
this.curActivity = make(map[pb.HdType]*pb.DBHuodong)
this.delActivity = make(map[pb.HdType]*pb.DBHuodong)
this.futureActivity = make(map[pb.HdType]*pb.DBHuodong)
defer this.hlock.Unlock()
for c.Next(context.Background()) {
hd := &pb.DBHuodong{}
if err = c.Decode(hd); err != nil {
this.module.Errorf("err:%v", err)
continue
}
if hd.Etime <= configure.Now().Unix() {
this.delActivity[hd.Itype] = hd
} else if hd.Etime > configure.Now().Unix() && hd.Stime < configure.Now().Unix() {
this.curActivity[hd.Itype] = hd
} else {
this.futureActivity[hd.Itype] = hd
}
}
}
}
func (this *Activity) NotifyActivityOver(szEnd []string) {
@ -167,6 +158,7 @@ func (this *Activity) NotifyActivityStart(szStart []string) {
this.module.Errorln(err)
}
}
func (this *Activity) CheckActivityData() {
var (
szEnd []string // 活动结束

2
modules/timer/module.go
View File

@ -101,7 +101,7 @@ func (this *Timer) getDBModelByUid(uid, tableName string) (model *db.DBModel, er
// 重新加载活动数据
func (this *Timer) ReloadActivityData(id string) {
this.activity.LoadActivityData(id)
this.activity.ReLoadActivityData(id)
}
// 日志