liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
meixiongfeng 2023-03-15 15:08:23 +08:00
commit e7d3d0ca7a
3 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
modules/hero/module.go
View File

@ -841,9 +841,24 @@ func (this *Hero) InRange(heroRecord *pb.DBHeroRecord, strPool []string, update
} }
func (this *Hero) RegisterInstructor(session comm.IUserSession, heroOid string, fulllvenr int32) (code pb.ErrorCode) { func (this *Hero) RegisterInstructor(session comm.IUserSession, heroOid string, fulllvenr int32) (code pb.ErrorCode) {
_hero, code := this.GetHeroByObjID(session.GetUserId(), heroOid) var (
if code != pb.ErrorCode_Success { _hero *pb.DBHero
return model *db.DBModel
err error
)
if this.IsCross() {
_hero = &pb.DBHero{}
if model, err = this.GetDBModuleByUid(session.GetUserId(), this.modelHero.TableName, this.modelHero.Expired); err == nil {
if err := model.GetListObj(session.GetUserId(), heroOid, _hero); err != nil {
this.Errorf("err:%v", err)
return
}
}
} else {
_hero, code = this.GetHeroByObjID(session.GetUserId(), heroOid)
if code != pb.ErrorCode_Success {
return
}
} }
if _hero.Fulllvenr == 0 { if _hero.Fulllvenr == 0 {
@ -856,9 +871,21 @@ func (this *Hero) RegisterInstructor(session comm.IUserSession, heroOid string,
_heroMap := map[string]interface{}{ _heroMap := map[string]interface{}{
"fulllvenr": _hero.Fulllvenr, "fulllvenr": _hero.Fulllvenr,
} }
if err := this.modelHero.ChangeList(session.GetUserId(), _hero.Id, _heroMap); err != nil {
code = pb.ErrorCode_DBError if this.IsCross() {
return if model != nil {
if err := model.ChangeList(session.GetUserId(), heroOid, _heroMap); err != nil {
this.Errorf("err:%v", err)
code = pb.ErrorCode_DBError
return
}
}
} else {
if err := this.modelHero.ChangeList(session.GetUserId(), heroOid, _heroMap); err != nil { // 修改英雄信息
this.Errorf("err:%v", err)
code = pb.ErrorCode_DBError
return
}
} }
} else { } else {

1
modules/pagoda/api_ranklist.go
View File

@ -46,7 +46,6 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.PagodaRankListR
_dataList := rd.Val() _dataList := rd.Val()
for _, v := range _dataList { for _, v := range _dataList {
//conn_, err := db.Cross() //conn_, err := db.Cross()
dbModel := db.NewDBModel(comm.TableSeasonRecord, 0, conn) dbModel := db.NewDBModel(comm.TableSeasonRecord, 0, conn)
result := &pb.DBPagodaRecord{} result := &pb.DBPagodaRecord{}
if err = dbModel.GetListObj(session.GetUserId(), v, result); err == nil { if err = dbModel.GetListObj(session.GetUserId(), v, result); err == nil {

3
modules/smithy/comp_configure.go
View File

@ -92,7 +92,7 @@ func (this *configureComp) CheckSmithyFirstReelConfigData(etype int32, id int32)
if v, err := this.GetConfigure(game_smithyreel); err == nil { if v, err := this.GetConfigure(game_smithyreel); err == nil {
if configure, ok := v.(*cfg.GameNewSmithy); ok { if configure, ok := v.(*cfg.GameNewSmithy); ok {
for _, v := range configure.GetDataList() { for _, v := range configure.GetDataList() {
if v.Type == etype { if v.Type == etype{
if v.Id == id { if v.Id == id {
return true return true
} else { } else {
@ -100,7 +100,6 @@ func (this *configureComp) CheckSmithyFirstReelConfigData(etype int32, id int32)
} }
} }
} }
return true
} }
} }
return false return false