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

modules/pagoda/model_rank.go

@@ -252,7 +252,7 @@ func (this *ModelRank) seasonSettlement() {
 		if conn, err := db.Cross(); err == nil {
 			var (
 				pipe *pipe.RedisPipe = conn.Redis.RedisPipe(context.TODO())
-				Items []*pb.UserAssets
+				//Items []*pb.UserAssets
 			)
 
 			rd := pipe.ZRange("pagodaSeasonRank0", 0, 50)
@@ -264,7 +264,7 @@ func (this *ModelRank) seasonSettlement() {
 			uids := rd.Val()
 
 			if len(uids) > 0 {
-				Items = make([]*pb.UserAssets, 0) //TO 排名配置
+				//Items = make([]*pb.UserAssets, 0) //TO 排名配置
 				// for i, v := range v.RankReward {
 				// 	Items[i] = &pb.UserAssets{
 				// 		A: v.A,
@@ -273,10 +273,10 @@ func (this *ModelRank) seasonSettlement() {
 				// 	}
 				// }
 				//发邮件
-				this.modulePagoda.mail.SendNewMail(&pb.DBMailData{
-					CreateTime: uint64(configure.Now().Unix()),
-					Items:      Items,
-				}, uids...)
+				// this.modulePagoda.mail.SendNewMail(&pb.DBMailData{
+				// 	CreateTime: uint64(configure.Now().Unix()),
+				// 	Items:      Items,
+				// }, uids...)
 			}
 		}
 	}

modules/pagoda/module.go

@@ -24,7 +24,7 @@ type Pagoda struct {
 	configure         *configureComp
 	battle            comm.IBattle
 	service           base.IRPCXService
-	mail              comm.Imail
+	//mail              comm.Imail
 }
 
 func NewModule() core.IModule {
@@ -73,10 +73,10 @@ func (this *Pagoda) Start() (err error) {
 	if module, err = this.service.GetModule(comm.ModuleBattle); err != nil {
 		return
 	}
-	if module, err = this.service.GetModule(comm.ModuleMail); err != nil {
-		return
-	}
-	this.mail = module.(comm.Imail)
+	// if module, err = this.service.GetModule(comm.ModuleMail); err != nil {
+	// 	return
+	// }
+	//this.mail = module.(comm.Imail)
 	this.battle = module.(comm.IBattle)
 	this.service.RegisterFunctionName(string(comm.Rpc_ModuleSeasonPagodaReward), this.Rpc_ModuleSeasonPagodaReward)
 	return