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

modules/hero/api_awaken.go

@@ -30,6 +30,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e
 		_heroMap   map[string]interface{}
 		err        error
 		bManAwaken bool // 是否达到满级共鸣
+		atno       []*pb.UserAtno
 	)
 	_heroMap = make(map[string]interface{}, 0)
 	chanegCard = make([]*pb.DBHero, 0)
@@ -63,7 +64,9 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e
 	if errdata = this.module.ConsumeRes(session, awakenData.Phaseneed, true); errdata != nil {
 		return
 	}
-
+	if errdata, atno = this.module.DispenseAtno(session, awakenData.Awakenup, true); errdata != nil {
+		return
+	}
 	_hero.JuexingLv += 1
 
 	if len(awakenData.Phasebonus) > 0 {
@@ -94,7 +97,10 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e
 
 	chanegCard = append(chanegCard, _hero)
 	session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: chanegCard})
-	session.SendMsg(string(this.module.GetType()), Awaken, &pb.HeroAwakenResp{Hero: _hero})
+	session.SendMsg(string(this.module.GetType()), Awaken, &pb.HeroAwakenResp{
+		Hero:   _hero,
+		Reward: atno,
+	})
 
 	var tasks []*pb.BuriedParam
 

pb/hero_msg.pb.go

@@ -639,6 +639,7 @@ type HeroAwakenResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	Hero   *DBHero     `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"`     // 英雄对象
+	Reward []*UserAtno `protobuf:"bytes,2,rep,name=reward,proto3" json:"reward"` // 奖励
 }
 
 func (x *HeroAwakenResp) Reset() {
@@ -680,6 +681,13 @@ func (x *HeroAwakenResp) GetHero() *DBHero {
 	return nil
 }
 
+func (x *HeroAwakenResp) GetReward() []*UserAtno {
+	if x != nil {
+		return x.Reward
+	}
+	return nil
+}
+
 //英雄属性推送
 type HeroPropertyPush struct {
 	state         protoimpl.MessageState