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

bin/json/game_global.json

@@ -231,7 +231,7 @@
     "friend_peize": [
       {
         "a": "attr",
-        "t": "friend",
+        "t": "friendPoint",
         "n": 100
       }
     ],

modules/friend/api_cross_assisthero.go

@@ -63,11 +63,8 @@ func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssisth
 		"assistHeroId": req.HeroObjId,
 		"hero":         hero,
 	}
-
-	received := self.Received
-	if received == 0 {
-		update["received"] = 1 //设置可领取状态
-	}
+	self.Received = 1
+	update["received"] = self.Received //设置可领取状态
 
 	if err := this.module.modelFriend.Change(self.Uid, update); err != nil {
 		errdata = &pb.ErrorData{
@@ -82,7 +79,7 @@ func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssisth
 		return
 	}
 
-	rsp := &pb.FriendAssistheroResp{HeroObjId: req.HeroObjId, Received: received}
+	rsp := &pb.FriendAssistheroResp{HeroObjId: req.HeroObjId, Received: self.Received}
 	if err := session.SendMsg(string(this.module.GetType()), FriendSubTypeAssistHero, rsp); err != nil {
 		return
 	}

modules/friend/api_cross_getreward.go

@@ -34,9 +34,9 @@ func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewar
 		return
 	}
 
-	received := 2 //已领
+	self.Received = 2 //已领
 	update := map[string]interface{}{
-		"received": received,
+		"received": self.Received,
 	}
 	if err := this.module.modelFriend.Change(self.Uid, update); err != nil {
 		errdata = &pb.ErrorData{
@@ -60,7 +60,7 @@ func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewar
 	}
 
 	session.SendMsg(string(this.module.GetType()), "getreward", &pb.FriendGetrewardResp{
-		Received: int32(received),
+		Received: int32(self.Received),
 		Atno:     atno,
 	})
 

modules/hero/api_drawCard.go

@@ -281,7 +281,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 		add    []*pb.DBHero
 		allres []*cfg.Gameatn
 	)
-	if res, add, err = this.module.modelHero.ImitateHeros(session, szCards); err == nil {
+	if res, add, err = this.module.modelHero.ImitateHeros(session, szCards, req.DrawType); err == nil {
 		for _, v := range res {
 			var atno []*pb.UserAtno
 			for _, v1 := range v {

modules/hero/api_selectcard.go

@@ -60,7 +60,7 @@ func (this *apiComp) SelectCard(session comm.IUserSession, req *pb.HeroSelectCar
 		add    []*pb.DBHero
 		allres []*cfg.Gameatn
 	)
-	if res, add, err = this.module.modelHero.ImitateHeros(session, curSzCard); err == nil {
+	if res, add, err = this.module.modelHero.ImitateHeros(session, curSzCard, 2); err == nil {
 		for _, v := range res {
 			var atno []*pb.UserAtno
 			for _, v1 := range v {

modules/hero/model_hero.go

@@ -1117,7 +1117,7 @@ func (this *ModelHero) drawcardcreateHero(session comm.IUserSession, ids []strin
 }
 
 // 模拟获得英雄
-func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string) (addres [][]*cfg.Gameatn, add []*pb.DBHero, err error) {
+func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, itype int32) (addres [][]*cfg.Gameatn, add []*pb.DBHero, err error) {
 
 	heros := make([]*pb.DBHero, 0)
 	uid := session.GetUserId()
@@ -1165,7 +1165,12 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string) (a
 		}
 
 		if bFirst { // 没有当前英雄
-			hero, err = this.initHeroOverlying(uid, heroCfgId, 1)
+			if itype == 1 {
+				hero = this.InitHero(uid, heroCfgId)
+			} else {
+				hero, err = this.initHeroOverlying(uid, heroCfgId, 1)
+			}
+
 			if err != nil {
 				return
 			}

modules/tools/comp_configure.go

@@ -175,7 +175,7 @@ func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32,
 	defer this.hlock.RUnlock()
 	if _, ok := this._lotteryType1[lotteryId]; !ok {
 		if _, ok := this._lotteryType2[lotteryId]; !ok {
-			this.module.Errorf("not found config lotterId:%d", lotteryId)
+			this.module.Debugf("not found config lotterId:%d", lotteryId)
 			return
 		}
 	}