diff --git a/modules/hunting/model_rank.go b/modules/hunting/model_rank.go index 00613dbce..722694d82 100644 --- a/modules/hunting/model_rank.go +++ b/modules/hunting/model_rank.go @@ -48,13 +48,31 @@ func (this *ModelRank) getHuntingRankList(uid string) []*pb.DBHuntingRank { func (this *ModelRank) getHuntingRankListByBossType(uid string, bossType int32) *pb.DBHuntingRank { ranks := make([]*pb.DBHuntingRank, 0) - err := this.GetList(uid, &ranks) - if err != nil { - return nil - } - for _, v := range ranks { - if v.Bosstype == bossType { - return v + if db.IsCross() { + err := this.GetList(uid, &ranks) + if err != nil { + return nil + } + for _, v := range ranks { + if v.Bosstype == bossType { + return v + } + } + } else { + conn, err := db.Cross() + if err != nil { + return nil + } + model := db.NewDBModel(comm.TableHuntingRank, 0, conn) + + err = model.GetList(uid, &ranks) + if err != nil { + return nil + } + for _, v := range ranks { + if v.Bosstype == bossType { + return v + } } } return nil diff --git a/modules/hunting/module.go b/modules/hunting/module.go index 2bf432385..cbc3fecaf 100644 --- a/modules/hunting/module.go +++ b/modules/hunting/module.go @@ -74,7 +74,7 @@ func (this *Hunting) ModifyHuntingData(uid string, data map[string]interface{}) func (this *Hunting) CheckUserBaseHuntingInfo(uid string) (data []*pb.DBHuntingRank) { list, err := this.modelHunting.getHuntingList(uid) - if err != nil { + if err == nil { for k := range list.Boss { _d := this.modulerank.getHuntingRankListByBossType(uid, k) if _d != nil { diff --git a/modules/pagoda/model_rank.go b/modules/pagoda/model_rank.go index c78e89980..e5148d4d8 100644 --- a/modules/pagoda/model_rank.go +++ b/modules/pagoda/model_rank.go @@ -44,7 +44,7 @@ func (this *ModelRank) getPagodaRankListByFloorid(uid string, cid int32) *pb.DBP } else { if conn, err := db.Cross(); err == nil { dbModel := db.NewDBModel(comm.TablePagodaRecord, 0, conn) - if err = dbModel.GetList(uid, &pagodaRank); err == nil { + if err = dbModel.GetList(uid, &pagodaRank); err != nil { return nil } } diff --git a/modules/viking/model_rank.go b/modules/viking/model_rank.go index 681e9014f..a2f17f562 100644 --- a/modules/viking/model_rank.go +++ b/modules/viking/model_rank.go @@ -47,14 +47,32 @@ func (this *ModelRank) getVikingRankList(uid string) []*pb.DBVikingRank { } func (this *ModelRank) getVikingRankListByBossType(uid string, bossType int32) *pb.DBVikingRank { - ranks := make([]*pb.DBVikingRank, 0) - err := this.GetList(uid, &ranks) - if err != nil { - return nil - } - for _, v := range ranks { - if v.Bosstype == bossType { - return v + if db.IsCross() { + ranks := make([]*pb.DBVikingRank, 0) + err := this.GetList(uid, &ranks) + if err != nil { + return nil + } + for _, v := range ranks { + if v.Bosstype == bossType { + return v + } + } + } else { + conn, err := db.Cross() + if err != nil { + return nil + } + model := db.NewDBModel(comm.TableVikingRank, 0, conn) + ranks := make([]*pb.DBVikingRank, 0) + err = model.GetList(uid, &ranks) + if err != nil { + return nil + } + for _, v := range ranks { + if v.Bosstype == bossType { + return v + } } } return nil diff --git a/modules/viking/module.go b/modules/viking/module.go index 2541f2552..b144567f4 100644 --- a/modules/viking/module.go +++ b/modules/viking/module.go @@ -77,7 +77,7 @@ func (this *Viking) Start() (err error) { func (this *Viking) CheckUserBaseVikingInfo(uid string) (data []*pb.DBVikingRank) { list, err := this.modelViking.getVikingList(uid) - if err != nil { + if err == nil { for k := range list.Boss { _d := this.modulerank.getVikingRankListByBossType(uid, k) if _d != nil {