Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

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
 }

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) {

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

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
 	}