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

modules/pagoda/api_getlist.go

@@ -61,10 +61,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq
 			Type:     season.Type,
 		}
 	}
-	this.RankList(session, &pb.PagodaRankListReq{
-		FloorId: 0,
-		Friend:  false,
-	})
+
 	session.SendMsg(string(this.module.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: list})
 	return
 }

modules/troll/module.go

@@ -90,6 +90,7 @@ func (this *Troll) TrollAI(session comm.IUserSession, troll *pb.DBTrollTrain, ai
 
 		index := int32(index) % trainNum
 		troll.RefreshTime += int64(sz[index])
+
 		if now >= troll.RefreshTime {
 			troll.RangeId = (troll.RangeId % maxCoefficient) + 1
 			troll.TarinPos = (troll.TarinPos % trainNum) + 1