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

modules/hero/module.go

@@ -68,36 +68,36 @@ func (this *Hero) CreateRepeatHero(session comm.IUserSession, heroCfgId string,
 	var err error
 	hero, err = this.modelHero.createHeroOverlying(session.GetUserId(), heroCfgId, num)
 	if err == nil {
-		go func(uid string, heroCfgId string) { // 携程处理 图鉴数据
-			if db.IsCross() {
-				this.moduleFetter.SendRpcAddHero(session, heroCfgId)
-			} else {
-				this.moduleFetter.AddHeroFetterData(uid, heroCfgId)
-			}
-			heroConf := this.modelHero.moduleHero.configure.GetHeroConfig(heroCfgId)
-			if heroConf == nil {
-				return
+		//go func(uid string, heroCfgId string) { // 携程处理 图鉴数据
+		if db.IsCross() {
+			this.moduleFetter.SendRpcAddHero(session, heroCfgId)
+		} else {
+			this.moduleFetter.AddHeroFetterData(session.GetUserId(), heroCfgId)
+		}
+		heroConf := this.modelHero.moduleHero.configure.GetHeroConfig(heroCfgId)
+		if heroConf == nil {
+			return
+		}
+
+		if result, err1 := this.ModuleUser.GetUserExpand(session.GetUserId()); err1 == nil {
+			initUpdate := map[string]interface{}{}
+			sz := result.GetTujian()
+			if len(sz) == 0 {
+				sz = make(map[string]int32, 0)
 			}
 
-			if result, err1 := this.ModuleUser.GetUserExpand(uid); err1 == nil {
-				initUpdate := map[string]interface{}{}
-				sz := result.GetTujian()
-				if len(sz) == 0 {
-					sz = make(map[string]int32, 0)
+			if _, ok := result.GetTujian()[heroCfgId]; !ok {
+				if heroConf.Handbook == -1 {
+					sz[heroCfgId] = 0
+				} else {
+					sz[heroCfgId] = 1
 				}
 
-				if _, ok := result.GetTujian()[heroCfgId]; !ok {
-					if heroConf.Handbook == -1 {
-						sz[heroCfgId] = 0
-					} else {
-						sz[heroCfgId] = 1
-					}
-
-					initUpdate["tujian"] = sz
-					this.ModuleUser.ChangeUserExpand(uid, initUpdate)
-				}
+				initUpdate["tujian"] = sz
+				this.ModuleUser.ChangeUserExpand(session.GetUserId(), initUpdate)
 			}
-		}(session.GetUserId(), heroCfgId)
+		}
+		//}(session.GetUserId(), heroCfgId)
 		// 统计任务
 		this.ModuleRtask.SendToRtask(session, comm.Rtype1, utils.ToInt32(heroCfgId))
 		// 查品质

modules/pagoda/api_getlist.go

@@ -21,15 +21,14 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq
 	)
 	list, _ = this.module.modelPagoda.getPagodaList(session.GetUserId())
 	if list.Id == "" { // 普通塔
-		if list == nil { // redis没有数据
-			list = &pb.DBPagoda{}
-			list.Id = primitive.NewObjectID().Hex()
 
-			list.Uid = session.GetUserId()
-			list.PagodaId = 0 // 初始数据0层
-			list.Type = comm.PagodaType
-			this.module.modelPagoda.addNewPagoda(session.GetUserId(), list)
-		}
+		list.Id = primitive.NewObjectID().Hex()
+
+		list.Uid = session.GetUserId()
+		list.PagodaId = 0 // 初始数据0层
+		list.Type = comm.PagodaType
+		this.module.modelPagoda.addNewPagoda(session.GetUserId(), list)
+
 	} else if list.Complete {
 		list, _ = this.module.modelSeasonPagoda.getSeasonPagodaList(session.GetUserId())
 	}

modules/pagoda/model_pagoda.go

@@ -34,7 +34,7 @@ func (this *ModelPagoda) getPagodaList(uid string) (result *pb.DBPagoda, err err
 		err = nil
 		return
 	}
-	err = nil
+
 	return result, err
 }