diff --git a/comm/const.go b/comm/const.go index 9488ad007..5ba030703 100644 --- a/comm/const.go +++ b/comm/const.go @@ -163,7 +163,7 @@ const ( TableCrossSession = "crosssession" - TableServerData = "serverdata" // 跨服服务器相关数据 + TableSeasonData = "seasondata" // 跨服服务器相关数据 ///竞技场 TableArena = "arena" diff --git a/modules/pagoda/api_activate.go b/modules/pagoda/api_activate.go index 8ea7d0eb6..b5782cb3e 100644 --- a/modules/pagoda/api_activate.go +++ b/modules/pagoda/api_activate.go @@ -41,7 +41,7 @@ func (this *apiComp) Activate(session comm.IUserSession, req *pb.PagodaActivateR season.Uid = session.GetUserId() season.PagodaId = 0 // 初始数据0层 if conn, err := db.Cross(); err == nil { - rst := conn.Mgo.FindOne(comm.TableServerData, bson.M{}) + rst := conn.Mgo.FindOne(comm.TableSeasonData, bson.M{}) server := &pb.DBServerData{} rst.Decode(server) season.Type = server.SeasonType diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go index 90d123717..d62c6914a 100644 --- a/modules/pagoda/module.go +++ b/modules/pagoda/module.go @@ -242,7 +242,7 @@ func (this *Pagoda) ModifySeasonPagodaFloor(session comm.IUserSession, level int list.Uid = session.GetUserId() list.PagodaId = level if conn, err := db.Cross(); err == nil { - rst := conn.Mgo.FindOne(comm.TableServerData, bson.M{}) + rst := conn.Mgo.FindOne(comm.TableSeasonData, bson.M{}) server := &pb.DBServerData{} rst.Decode(server) list.Type = server.SeasonType diff --git a/modules/timer/season.go b/modules/timer/season.go index 33e3238cb..8d38a1664 100644 --- a/modules/timer/season.go +++ b/modules/timer/season.go @@ -71,9 +71,9 @@ func (this *SeasonPagoda) Start() (err error) { conn, err := db.Cross() if err == nil { //this.DbTest() - model := db.NewDBModel(comm.TableServerData, 0, conn) + model := db.NewDBModel(comm.TableSeasonData, 0, conn) - _len, err1 := model.DB.CountDocuments(comm.TableServerData, bson.M{}) + _len, err1 := model.DB.CountDocuments(comm.TableSeasonData, bson.M{}) if err1 == nil && _len == 0 { fmt.Printf("%v,%v", _len, err1) server := &pb.DBServerData{ @@ -89,7 +89,7 @@ func (this *SeasonPagoda) Start() (err error) { server.SeasonType = conf.DisposableLoop[0] } - model.DB.InsertOne(comm.TableServerData, server) + model.DB.InsertOne(comm.TableSeasonData, server) } } return @@ -129,7 +129,7 @@ func (this *SeasonPagoda) TimerSeasonOver() { this.module.Debugf("TimerSeasonOver:%d", configure.Now().Unix()) if db.IsCross() { if conn, err := db.Cross(); err == nil { - if rst := conn.Mgo.FindOne(comm.TableServerData, bson.M{}); rst != nil { + if rst := conn.Mgo.FindOne(comm.TableSeasonData, bson.M{}); rst != nil { serverData := &pb.DBServerData{} rst.Decode(serverData) conf := this.GetSeasonLoop(comm.SeasonType) // 获取赛季塔重置配置 @@ -151,7 +151,7 @@ func (this *SeasonPagoda) TimerSeasonOver() { } serverData.SeasonType = conf.FixedLoop[int(serverData.FixedLoop)-1] } - this.DB.UpdateOne(comm.TableServerData, bson.M{}, serverData) + this.DB.UpdateOne(comm.TableSeasonData, bson.M{}, serverData) fmt.Printf("%v", serverData) } } @@ -174,7 +174,7 @@ func (this *SeasonPagoda) TimerSeasonStar() { if !db.IsCross() { // 删除本服的赛季塔数据 conn, err := db.Cross() // 获取跨服的链接对象 if err == nil { - model := db.NewDBModel(comm.TableServerData, 0, conn) + model := db.NewDBModel(comm.TableSeasonData, 0, conn) model.DB.DeleteMany(comm.TableSeasonPagoda, bson.M{}, options.Delete()) model.DB.DeleteMany(comm.TableSeasonRecord, bson.M{}, options.Delete()) for pos := 0; pos < comm.MaxRankNum; pos++ {