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 2022-12-12 19:48:21 +08:00
commit f829d113d8
4 changed files with 405 additions and 472 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gm/api_cmd.go
View File

@ -44,9 +44,13 @@ func (this *apiComp) Cmd(session comm.IUserSession, req *pb.GMCmdReq) (code pb.E
if code = this.CmdCheck(session, req); code != pb.ErrorCode_Success { if code = this.CmdCheck(session, req); code != pb.ErrorCode_Success {
return return
} }
this.module.CreateCmd(session, req.Cmod) var (
isOk bool
)
if code = this.module.CreateCmd(session, req.Cmod); code == pb.ErrorCode_Success {
isOk = true
}
//this.module.ModuleHero.GetSpecifiedHero(session.GetUserId(), heroid, star, lv) session.SendMsg(string(this.module.GetType()), "cmd", &pb.GMCmdResp{IsSucc: isOk})
session.SendMsg(string(this.module.GetType()), "cmd", &pb.GMCmdResp{IsSucc: true})
return return
} }

1
modules/hero/api_fusion.go
View File

@ -65,6 +65,7 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (c
} }
} }
for k, v := range req.Heros { for k, v := range req.Heros {
//mapHero[_costMaphero[k].HeroID]
code = this.module.DelCard(session.GetUserId(), _costMaphero[k], v) code = this.module.DelCard(session.GetUserId(), _costMaphero[k], v)
if code != pb.ErrorCode_Success { if code != pb.ErrorCode_Success {
return return

12
modules/hero/api_resonanceSelect.go
View File

@ -13,13 +13,13 @@ func (this *apiComp) ResonanceUseEnergyCheck(session comm.IUserSession, req *pb.
code = pb.ErrorCode_ReqParameterError code = pb.ErrorCode_ReqParameterError
return return
} }
for _, v := range req.Energy { // for _, v := range req.Energy {
if v.UseEnergy < 0 || (v.UseType != comm.ResonanceAtkPro && v.UseType != comm.ResonanceHpPro && v.UseType != comm.ResonanceDefPro) { // if v.UseEnergy < 0 || (v.UseType != comm.ResonanceAtkPro && v.UseType != comm.ResonanceHpPro && v.UseType != comm.ResonanceDefPro) {
code = pb.ErrorCode_ReqParameterError // code = pb.ErrorCode_ReqParameterError
return // return
} // }
} // }
return return
} }

854
pb/hero_msg.pb.go
View File

File diff suppressed because it is too large Load Diff