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

modules/hero/api_resonance.go

@@ -3,6 +3,7 @@ package hero
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -20,12 +21,13 @@ func (this *apiComp) ResonanceCheck(session comm.IUserSession, req *pb.HeroReson
 /// 英雄共鸣
 func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceReq) (code pb.ErrorCode, data proto.Message) {
 	var (
-		szCostHero    map[string]int32 // k 消耗卡牌对象 v 数量
+		szCostHero    map[string]int32 // k 卡牌配置id v 数量
 		totalCostCard int32            //消耗卡总数量
 		_hero         *pb.DBHero
-		_costHero     *pb.DBHero
+
 		ChangeList   []*pb.DBHero // 变化的英雄数据
 		_costMaphero map[string]*pb.DBHero
+		count        int32 // 共鸣升级次数
 	)
 	ChangeList = make([]*pb.DBHero, 0)
 	szCostHero = make(map[string]int32, 0)
@@ -39,47 +41,69 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
 	if code != pb.ErrorCode_Success {
 		return
 	}
-	for _, v := range req.CostObjID {
-		szCostHero[v] += 1
-	}
-
 	// 共鸣次数判断
 	resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, _hero.Star)
 	if resonConfig == nil {
 		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
-	if resonConfig.Maxnum <= _hero.ResonateNum {
-		code = pb.ErrorCode_HeroMaxResonate // 共鸣次数已满
-		return
-	}
 
-	for k, v := range szCostHero {
-		for _, v1 := range resonConfig.Heroneed {
-			if v1.A == comm.HeroType {
-				totalCostCard += v
-			}
-
-			_costHero, code = this.module.GetHeroByObjID(session.GetUserId(), k) // 查询消耗卡是否存在
-			if code != pb.ErrorCode_Success {                                    // 英雄被锁不能消耗
+	totalCostCard = resonConfig.Energy
+	for _, k := range req.CostObjID {
+		_costHero, c := this.module.GetHeroByObjID(session.GetUserId(), k) // 查询消耗卡是否存在
+		if c != pb.ErrorCode_Success {
+			code = c // 英雄被锁不能消耗
 			return
 		}
 		if _costHero.Block {
 			code = pb.ErrorCode_HeroIsLock
 		}
 		_costMaphero[k] = _costHero
+		szCostHero[_costHero.HeroID] += 1
+	}
+	// 一次升级多级
+	for _, v := range resonConfig.Heroneed {
+		for k, v1 := range szCostHero {
+			if k == v.T {
+				if v1%v.N == 0 {
+					if count == 0 {
+						count = v1 / v.N
+					}
+					if count != v1/v.N {
+						code = pb.ErrorCode_ReqParameterError
+						return
+					}
+				} else {
+					code = pb.ErrorCode_ReqParameterError
+					return
 				}
 			}
-
-	for k, v := range szCostHero {
-		code = this.module.DelCard(session.GetUserId(), _costMaphero[k], v)
+		}
+	}
+	if count == 0 {
+		code = pb.ErrorCode_ReqParameterError
+		return
+	}
+	if resonConfig.Maxnum < _hero.ResonateNum+count {
+		code = pb.ErrorCode_HeroMaxResonate // 共鸣次数已满
+		return
+	}
+	for k, v := range _costMaphero {
+		code = this.module.DelCard(session.GetUserId(), v, szCostHero[v.HeroID])
 		if code != pb.ErrorCode_Success {
 			return
 		}
 		ChangeList = append(ChangeList, _costMaphero[k])
 	}
-
-	code = this.module.ConsumeRes(session, resonConfig.Need, true)
+	sz := make([]*cfg.Gameatn, 0) // 计算升级多次的消耗
+	for _, v := range resonConfig.Need {
+		sz = append(sz, &cfg.Gameatn{
+			A: v.A,
+			T: v.T,
+			N: v.N * count,
+		})
+	}
+	code = this.module.ConsumeRes(session, sz, true)
 	if code != pb.ErrorCode_Success {
 		return
 	}
@@ -90,13 +114,17 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
 			break
 		}
 	}
+	if _hero.SameCount == 0 {
+		code = pb.ErrorCode_ReqParameterError
+		return
+	}
 	if _hero.SameCount > 1 {
 		_hero.SameCount -= 1
 		newHero := this.module.modelHero.CloneNewHero(_hero)
 		ChangeList = append(ChangeList, newHero)
 	}
 	_hero.SameCount = 1
-	_hero.ResonateNum += 1
+	_hero.ResonateNum += count
 	_hero.DistributionResonate += resonConfig.Energy * totalCostCard
 	_heroMap := map[string]interface{}{
 		"resonateNum":          _hero.ResonateNum,

modules/hero/model_hero.go

@@ -247,7 +247,7 @@ func (this *ModelHero) consumeHeroCard(uid string, hero *pb.DBHero, count int32)
 		}
 		err = this.ChangeList(uid, hero.Id, update)
 	}
-	this.moduleHero.Debugf("删除一张卡牌uid:%s,卡牌ID:%s", uid, hero.Id)
+	this.moduleHero.Debugf("删除%d张卡牌uid:%s,卡牌ID:%s", count, uid, hero.Id)
 	return
 }