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

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

Browse Source
This commit is contained in:
liwei1dao 2022-10-21 10:12:54 +08:00
commit b46952cebd
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/hero/api_awaken.go
View File

@ -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) nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)
if nextAwaken == nil { // 达到满级觉醒 if nextAwaken == nil { // 达到满级觉醒
resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, cfg.Star) 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 { if _hero.Lv == _hero.Star*comm.HeroStarLvRatio {
this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color)
this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1)

13
modules/hero/api_info.go
View File

@ -12,7 +12,7 @@ import (
//参数校验 //参数校验
func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HeroInfoReq) (code pb.ErrorCode) { 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 code = pb.ErrorCode_ReqParameterError
} }
return return
@ -22,7 +22,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code
var ( var (
uid string uid string
) )
hero := &pb.DBHero{}
if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success { if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success {
return return
} }
@ -38,14 +38,17 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code
if b { if b {
if conn, err := db.ServerDBConn(tag); err == nil { if conn, err := db.ServerDBConn(tag); err == nil {
dbModel := db.NewDBModel(comm.TableHero, time.Hour, conn) dbModel := db.NewDBModel(comm.TableHero, time.Hour, conn)
if err = dbModel.GetListObj(uid, req.HeroId, hero); err == nil { for _, v := range req.HeroId {
rsp.Base = hero hero := &pb.DBHero{}
if err = dbModel.GetListObj(uid, v, hero); err == nil {
rsp.Base = append(rsp.Base, hero)
} else { } else {
this.module.Errorf("err:%v", err) this.module.Errorf("err:%v", err)
} }
} }
} }
}
rsp.Uid = uid
session.SendMsg(string(this.module.GetType()), HeroSubTypeInfo, rsp) session.SendMsg(string(this.module.GetType()), HeroSubTypeInfo, rsp)
return return
} }

2
modules/hero/api_resonance.go
View File

@ -158,7 +158,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1) nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)
if nextAwaken == nil { // 达到满级觉醒 if nextAwaken == nil { // 达到满级觉醒
resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, cfg.Star) 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 { if _hero.Lv == _hero.Star*comm.HeroStarLvRatio {
this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color)
this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1)

2
modules/hero/api_strengthenUplv.go
View File

@ -49,7 +49,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
return return
} }
// 只有英雄卡才能升级 // 只有英雄卡才能升级
if _hero.CardType != comm.CardTypeHero { if _hero.CardType != comm.CardTypeHero && _hero.CardType != comm.CardTypeStar {
code = pb.ErrorCode_HeroTypeErr code = pb.ErrorCode_HeroTypeErr
return return
} }

2
modules/hero/model_hero.go
View File

@ -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) nextAwaken := this.moduleHero.configure.GetHeroAwakenConfig(hero.HeroID, hero.JuexingLv+1)
if nextAwaken == nil { // 达到满级觉醒 if nextAwaken == nil { // 达到满级觉醒
resonConfig := this.moduleHero.configure.GetHeroResonanceConfig(hero.HeroID, cfg.Star) 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 { if hero.Lv == hero.Star*comm.HeroStarLvRatio {
this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color)
this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype38, 1)