diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index dcfd60377..3f13d224b 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -387,7 +387,7 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], - "disableAiCamera": 1, + "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -425,7 +425,7 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], - "disableAiCamera": 1, + "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 8c83d610a..506de1f09 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -52,7 +52,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq } // 准备数据 ///////////////////////////////////// - drawConf, err = this.module.configure.GetHeroDrawConfigByType(req.DrawType) // 获取新的抽卡配置 + drawConf, err = this.module.configure.GetHeroDrawConfigByType(req.DrawType + comm.DrawCardType0) // 获取新的抽卡配置 if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ReqParameterError, 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 e2b08bb1c..4fbc09e29 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 6487b53ec..698eb1c88 100644 --- a/modules/viking/model_rank.go +++ b/modules/viking/model_rank.go @@ -5,6 +5,7 @@ import ( "go_dreamfactory/lego/core" "go_dreamfactory/modules" "go_dreamfactory/pb" + "go_dreamfactory/sys/db" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/x/bsonx" @@ -43,15 +44,35 @@ 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 6cc725cd2..924e988b2 100644 --- a/modules/viking/module.go +++ b/modules/viking/module.go @@ -89,7 +89,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 {