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

上传装备确认洗练带错误提示

Browse Source
This commit is contained in:
liwei1dao 2024-02-02 18:22:56 +08:00
parent 484f68039d
commit 6893ece693
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/equipment/api_ench.go
View File

@ -43,6 +43,7 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (
} }
return return
} }
need = make([]*cfg.Gameatn, 0) need = make([]*cfg.Gameatn, 0)
need = append(need, conf.Need...) need = append(need, conf.Need...)
need = append(need, &cfg.Gameatn{ need = append(need, &cfg.Gameatn{

4
modules/equipment/api_wash.go
View File

@ -35,8 +35,7 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
if equip, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.Eid); err != nil { if equip, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.Eid); err != nil {
this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), req.Eid, err) this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), req.Eid, err)
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError, Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(), Message: err.Error(),
} }
return return
@ -45,7 +44,6 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
this.module.Errorf("Equip_Check err:%v", err) this.module.Errorf("Equip_Check err:%v", err)
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound, Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(), Message: err.Error(),
} }
return return

22
modules/equipment/api_washconfirm.go
View File

@ -42,13 +42,7 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
} }
return return
} }
if len(equip.AdverbEntry) != len(req.Pids) {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
if conf, err = this.module.configure.GetEquipmentConfigureById(equip.CId); err != nil { if conf, err = this.module.configure.GetEquipmentConfigureById(equip.CId); err != nil {
this.module.Errorf("Equip_Check err:%v", err) this.module.Errorf("Equip_Check err:%v", err)
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -59,6 +53,13 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
return return
} }
if conf.EquipId == 1 { if conf.EquipId == 1 {
if len(equip.AdverbEntry) != len(req.Pids) {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Message: "AdverbEntry.count != Pids.count",
}
return
}
for i, v := range equip.AdverbEntry { for i, v := range equip.AdverbEntry {
if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(req.Pids[i]); err != nil { if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(req.Pids[i]); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -90,6 +91,13 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
return return
} }
} else { } else {
if len(equip.Adverbskill) != len(req.Pids) {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Message: "Adverbskill.count != Pids.count",
}
return
}
for i, v := range equip.Adverbskill { for i, v := range equip.Adverbskill {
if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(req.Pids[i]); err != nil { if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(req.Pids[i]); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{

2
modules/mergegroup/module.go
View File

@ -56,5 +56,5 @@ func (this *MergeGroup) Start() (err error) {
//检查合并 //检查合并
func (this *MergeGroup) CheckMerge() { func (this *MergeGroup) CheckMerge() {
} }