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

modules/hero/model_hero.go

@@ -953,6 +953,9 @@ func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, c
 			N: 1,
 			O: hero.Id,
 		})
+		go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
+			this.module.ModuleEntertain.AddXxlCard(session, map[string]int32{hero.HeroID: 1}, true)
+		})
 	}
 	res := make([]*cfg.Gameatn, 0)
 	rst, err := this.module.ModuleUser.GetUserExpand(session.GetUserId())
@@ -1137,7 +1140,11 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI
 
 		if bFirst { // 没有当前英雄
 			if bImitate {
-				hero = this.InitHero(uid, heroCfgId)
+				// 模拟英雄不用真实数据
+				hero = &pb.DBHero{
+					HeroID: heroCfgId,
+				}
+				//hero = this.InitHero(uid, heroCfgId)
 			} else {
 				hero, err = this.initHeroOverlying(uid, heroCfgId, 1)
 			}
@@ -1203,18 +1210,16 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI
 		}
 		addres = append(addres, res)
 	}
-	if !bImitate && bChange {
-		this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
-			"herofrag": rst.Herofrag,
-			"expitem":  rst.Expitem,
-		})
-	}
-	if !bImitate { // 获得三消卡片资源数据
+	if !bImitate {
 		go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
-
 			this.module.ModuleEntertain.AddXxlCard(session, szCard, true)
-
 		})
+		if bChange {
+			this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
+				"herofrag": rst.Herofrag,
+				"expitem":  rst.Expitem,
+			})
+		}
 	}
 	return
 }

modules/plunder/api_rankscore.go

@@ -34,7 +34,7 @@ func (this *apiComp) RankSocre(session comm.IUserSession, req *pb.PlunderRankSoc
 		}
 		return
 	}
-	session.SendMsg(string(this.module.GetType()), "refresh", &pb.PlunderRankSocreResp{
+	session.SendMsg(string(this.module.GetType()), "ranksocre", &pb.PlunderRankSocreResp{
 		Score: land.Score,
 	})