diff --git a/modules/mainline/module.go b/modules/mainline/module.go index 55564698a..e946fcbf6 100644 --- a/modules/mainline/module.go +++ b/modules/mainline/module.go @@ -122,18 +122,9 @@ func (this *Mainline) CheckPoint(uid string) bool { if conf == nil { continue } - bFind := false - for _, v1 := range conf.Episode { - for _, banch := range v.BranchID { - if banch == v1 { - bFind = true - break - } - } - } - if !bFind { // 没找到 显示红点 - return false + if len(conf.Episode) != len(v.BranchID) { + return true } } - return true + return false } diff --git a/modules/smithy/model_smithy.go b/modules/smithy/model_smithy.go index f0e21bad6..ff4abf96f 100644 --- a/modules/smithy/model_smithy.go +++ b/modules/smithy/model_smithy.go @@ -152,7 +152,6 @@ func (this *modelSmithy) CalculationSmithy(uid string, smithy *pb.DBSmithy) { mapData["clang"] = smithy.Clang // 正在做的 this.module.ModifySmithyData(uid, mapData) // 同步数据 - } func (this *modelSmithy) CalculationDeskSkillLv(uid string, Smithy *pb.DBSmithy) { diff --git a/modules/troll/api_afkset.go b/modules/troll/api_afkset.go index d37b43b8e..5b8c03d8b 100644 --- a/modules/troll/api_afkset.go +++ b/modules/troll/api_afkset.go @@ -25,8 +25,8 @@ func (this *apiComp) AfkSet(session comm.IUserSession, req *pb.TrollAfkSetReq) ( code = pb.ErrorCode_DBError return } - troll.Buy = req.Buy - troll.Sell = req.Sell + troll.Buy = this.configure.GetTrollRule(comm.TrollBuy) + troll.Sell = this.configure.GetTrollRule(comm.TrollSell) troll.AiCount = req.Count update["buy"] = troll.Buy update["sell"] = troll.Sell diff --git a/modules/troll/module.go b/modules/troll/module.go index c2ac4e591..85d119eb1 100644 --- a/modules/troll/module.go +++ b/modules/troll/module.go @@ -296,7 +296,7 @@ func (this *Troll) QueryRankList() (ranks []string, gold []int64, err error) { ) tableName := "trollRank" - if result, err = this.modelTroll.Redis.ZRevRange(tableName, 0, 50).Result(); err != nil { + if result, err = this.modelTroll.Redis.ZRevRange(tableName, 0, comm.MaxRankList).Result(); err != nil { this.Errorln(err) return }