diff --git a/modules/arena/module.go b/modules/arena/module.go
index f0feb677d..b046245e2 100644
--- a/modules/arena/module.go
+++ b/modules/arena/module.go
@@ -157,7 +157,7 @@ func (this *Arena) GetMatcheBattleRoles(uid string) (captain int32, rules []*pb.
 		if ais, err = this.modelArena.matcheAI(info.Dan, 1); err != nil && err != mgo.MongodbNil {
 			return
 		}
-		if len(players) > 0 {
+		if len(ais) > 0 {
 			captain = ais[0].Defend.Leadpos
 			if rules, code = this.battle.CreateRolesByHeros(ais[0].Defend.Formt); code != pb.ErrorCode_Success {
 				err = fmt.Errorf("AI CreateRolesByHeros fail:%d", code)
diff --git a/modules/battle/module.go b/modules/battle/module.go
index 1aa348cb7..3f5568b90 100644
--- a/modules/battle/module.go
+++ b/modules/battle/module.go
@@ -268,8 +268,10 @@ func (this *Battle) CreateRolesByFormat(fid int32) (captain int32, roles []*pb.B
 func (this *Battle) CreateRolesByHeros(heros []*pb.DBHero) (roles []*pb.BattleRole, code pb.ErrorCode) {
 	roles = make([]*pb.BattleRole, len(heros))
 	for i, v := range heros {
-		if roles[i], code = this.modelBattle.createBattleRole(v, 100+i, i); code != pb.ErrorCode_Success {
-			return
+		if v != nil {
+			if roles[i], code = this.modelBattle.createBattleRole(v, 100+i, i); code != pb.ErrorCode_Success {
+				return
+			}
 		}
 	}
 	return
diff --git a/modules/items/modelitems.go b/modules/items/modelitems.go
index f54cb2c3b..b63b62892 100644
--- a/modules/items/modelitems.go
+++ b/modules/items/modelitems.go
@@ -541,7 +541,7 @@ func (this *ModelItemsComp) recoverTicket(session comm.IUserSession) (code pb.Er
 	}
 	global := this.module.configure.GetGlobalConf()
 	playerlv := this.module.configure.GetPlayerlvConf(user.Lv)
-	ticket = int32(this.module.ModuleItems.QueryItemAmount(info.Uid, comm.UnifiedTicket))
+	ticket = int32(this.module.ModuleItems.QueryItemAmount(session.GetUserId(), comm.UnifiedTicket))
 	if ticket < global.DreamlandFightnum && info.Recovertimeunifiedticket > 0 {
 		duration = configure.Now().Sub(time.Unix(info.Recovertimeunifiedticket, 0))
 		ticketNum = int32(math.Floor(duration.Seconds() / float64(global.CopsRecoveryTime)))
diff --git a/modules/practice/modelPandata.go b/modules/practice/modelPandata.go
index 5a7ad0300..45192627a 100644
--- a/modules/practice/modelPandata.go
+++ b/modules/practice/modelPandata.go
@@ -35,6 +35,7 @@ func (this *modelPandata) queryUserMartialhall(uid string) (result *pb.DBPractic
 	result = &pb.DBPracticeRoom{}
 	if err = this.Get(uid, result); err != nil && err != mgo.MongodbNil {
 		this.module.Errorln(err)
+		return
 	}
 	if err == mgo.MongodbNil {
 		result = &pb.DBPracticeRoom{
@@ -51,6 +52,7 @@ func (this *modelPandata) queryUserMartialhall(uid string) (result *pb.DBPractic
 			Statuers:   make([]*pb.DBPracticeStatuer, 0),
 		}
 		if err = this.refreshnpc(result); err != nil {
+			this.module.Errorln(err)
 			return
 		}
 		if err = this.Add(uid, result); err != nil {
diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go
index 155ade751..7fbee8928 100644
--- a/pb/battle_db.pb.go
+++ b/pb/battle_db.pb.go
@@ -279,7 +279,7 @@ type BattleRole struct {
 	MainSuitSkill int32            `protobuf:"varint,8,opt,name=mainSuitSkill,proto3" json:"mainSuitSkill" bson:"mainSuitSkill"`                                                           /// 主套装技能
 	SubSuitSkill  int32            `protobuf:"varint,9,opt,name=subSuitSkill,proto3" json:"subSuitSkill" bson:"subSuitSkill"`                                                              /// 副套装技能
 	NormalSkill   []*SkillData     `protobuf:"bytes,10,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"`                                                                 //普通技能
-	EquipSkill    []*SkillData     `protobuf:"bytes,11,rep,name=equipSkill,proto3" json:"equipSkill" bson:"normalSkill"`                                                                   //普通技能
+	EquipSkill    []*SkillData     `protobuf:"bytes,11,rep,name=equipSkill,proto3" json:"equipSkill" bson:"equipSkill"`                                                                    //普通技能
 	PandaBuff     int32            `protobuf:"varint,12,opt,name=PandaBuff,proto3" json:"PandaBuff"`                                                                                       //熊猫buff技能id
 	Property      map[string]int32 `protobuf:"bytes,13,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 属性相关
 	Ishelp        bool             `protobuf:"varint,14,opt,name=ishelp,proto3" json:"ishelp"`                                                                                             //是否是助战英雄
diff --git a/pb/practice_db.pb.go b/pb/practice_db.pb.go
index a8f3597b7..5c4e25323 100644
--- a/pb/practice_db.pb.go
+++ b/pb/practice_db.pb.go
@@ -287,7 +287,7 @@ type DBPracticeRoom struct {
 	Pillarf     *DBPracticePillar    `protobuf:"bytes,11,opt,name=pillarf,proto3" json:"pillarf"`                                                                                           //好友柱子
 	Statuers    []*DBPracticeStatuer `protobuf:"bytes,12,rep,name=statuers,proto3" json:"statuers"`                                                                                         //武馆雕像
 	Currnpc     int32                `protobuf:"varint,13,opt,name=currnpc,proto3" json:"currnpc"`                                                                                          //当前npc
-	Npcstate    int32                `protobuf:"varint,14,opt,name=npcstate,proto3" json:"npcstate"`                                                                                        //npc状态 0 未挑战 1 挑战失败 2挑战成功
+	Npcstate    int32                `protobuf:"varint,14,opt,name=npcstate,proto3" json:"npcstate"`                                                                                        //npc状态 0 未挑战 1 挑战失败 2挑战成功 3 CD中
 	Refresh     int64                `protobuf:"varint,15,opt,name=refresh,proto3" json:"refresh"`                                                                                          //刷新时间
 	Battlenum   int32                `protobuf:"varint,16,opt,name=battlenum,proto3" json:"battlenum"`                                                                                      //战斗次数
 	Captain     int32                `protobuf:"varint,17,opt,name=captain,proto3" json:"captain"`                                                                                          //战斗征信队长位