diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go
index e7ad61e5d..ed33692d0 100644
--- a/modules/hero/api_awaken.go
+++ b/modules/hero/api_awaken.go
@@ -108,7 +108,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 		nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)
 		if nextAwaken == nil { // 达到满级觉醒
 			resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, cfg.Star)
-			if resonConfig.Maxnum == _hero.ResonateNum {
+			if resonConfig != nil && resonConfig.Maxnum == _hero.ResonateNum {
 				if _hero.Lv == _hero.Star*comm.HeroStarLvRatio {
 					this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color)
 					this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1)
diff --git a/modules/hero/api_info.go b/modules/hero/api_info.go
index f9d6fb93a..f9f6d58d4 100644
--- a/modules/hero/api_info.go
+++ b/modules/hero/api_info.go
@@ -12,7 +12,7 @@ import (
 
 //参数校验
 func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HeroInfoReq) (code pb.ErrorCode) {
-	if req.HeroId == "" {
+	if len(req.HeroId) == 0 {
 		code = pb.ErrorCode_ReqParameterError
 	}
 	return
@@ -22,7 +22,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code
 	var (
 		uid string
 	)
-	hero := &pb.DBHero{}
+
 	if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}
@@ -38,14 +38,17 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code
 	if b {
 		if conn, err := db.ServerDBConn(tag); err == nil {
 			dbModel := db.NewDBModel(comm.TableHero, time.Hour, conn)
-			if err = dbModel.GetListObj(uid, req.HeroId, hero); err == nil {
-				rsp.Base = hero
-			} else {
-				this.module.Errorf("err:%v", err)
+			for _, v := range req.HeroId {
+				hero := &pb.DBHero{}
+				if err = dbModel.GetListObj(uid, v, hero); err == nil {
+					rsp.Base = append(rsp.Base, hero)
+				} else {
+					this.module.Errorf("err:%v", err)
+				}
 			}
 		}
 	}
-
+	rsp.Uid = uid
 	session.SendMsg(string(this.module.GetType()), HeroSubTypeInfo, rsp)
 	return
 }
diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go
index fe1e7496b..0f3fd7865 100644
--- a/modules/hero/api_resonance.go
+++ b/modules/hero/api_resonance.go
@@ -158,7 +158,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
 		nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)
 		if nextAwaken == nil { // 达到满级觉醒
 			resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, cfg.Star)
-			if resonConfig.Maxnum == _hero.ResonateNum { // 共鸣满
+			if resonConfig != nil && resonConfig.Maxnum == _hero.ResonateNum { // 共鸣满
 				if _hero.Lv == _hero.Star*comm.HeroStarLvRatio {
 					this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color)
 					this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1)
diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go
index 235d177a4..d8122d5c3 100644
--- a/modules/hero/api_strengthenUplv.go
+++ b/modules/hero/api_strengthenUplv.go
@@ -49,7 +49,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
 		return
 	}
 	// 只有英雄卡才能升级
-	if _hero.CardType != comm.CardTypeHero {
+	if _hero.CardType != comm.CardTypeHero && _hero.CardType != comm.CardTypeStar {
 		code = pb.ErrorCode_HeroTypeErr
 		return
 	}
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index 94c9189bf..ac8408fbf 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -587,7 +587,7 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex
 				nextAwaken := this.moduleHero.configure.GetHeroAwakenConfig(hero.HeroID, hero.JuexingLv+1)
 				if nextAwaken == nil { // 达到满级觉醒
 					resonConfig := this.moduleHero.configure.GetHeroResonanceConfig(hero.HeroID, cfg.Star)
-					if resonConfig.Maxnum == hero.ResonateNum { // 共鸣满
+					if resonConfig != nil && resonConfig.Maxnum == hero.ResonateNum { // 共鸣满
 						if hero.Lv == hero.Star*comm.HeroStarLvRatio {
 							this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color)
 							this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype38, 1)