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

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

Browse Source
This commit is contained in:
liwei 2023-07-13 17:12:50 +08:00
commit ae792300ad
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/smithy/api_atlasaward.go
View File

@ -16,7 +16,8 @@ func (this *apiComp) AtlasAwardCheck(session comm.IUserSession, req *pb.SmithyAt
func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (errdata *pb.ErrorData) { func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (errdata *pb.ErrorData) {
var ( var (
res []*cfg.Gameatn res []*cfg.Gameatn
respRes []*pb.UserAssets atno []*pb.UserAtno
Res []*pb.UserAssets
) )
if errdata = this.AtlasAwardCheck(session, req); errdata != nil { if errdata = this.AtlasAwardCheck(session, req); errdata != nil {
return // 参数校验失败直接返回 return // 参数校验失败直接返回
@ -48,26 +49,17 @@ func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAw
} }
return return
} }
this.module.DispenseRes(session, res, true) if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
return
for _, v := range res {
bFind := false
for _, v1 := range respRes {
if v1.A == v.A && v1.T == v.T {
v1.N += v.N
bFind = true
} }
} for _, v := range atno {
if !bFind { Res = append(Res, &pb.UserAssets{
respRes = append(respRes, &pb.UserAssets{
A: v.A, A: v.A,
T: v.T, T: v.T,
N: v.N, N: v.N,
}) })
} }
}
//修改数据 //修改数据
update := make(map[string]interface{}, 0) update := make(map[string]interface{}, 0)
update["award"] = atlas.Award update["award"] = atlas.Award
@ -75,7 +67,7 @@ func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAw
session.SendMsg(string(this.module.GetType()), "atlasaward", &pb.SmithyAtlasAwardResp{ session.SendMsg(string(this.module.GetType()), "atlasaward", &pb.SmithyAtlasAwardResp{
Data: atlas, Data: atlas,
Res: respRes, Res: Res,
}) })
return return
} }

8
modules/smithy/api_forgeequip.go
View File

@ -162,7 +162,13 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
_costRes = append(_costRes, lava) _costRes = append(_costRes, lava)
} }
if len(subAtn) > 0 { if len(subAtn) > 0 {
_costRes = append(_costRes, subAtn...) for _, v := range subAtn {
_costRes = append(_costRes, &cfg.Gameatn{
A: v.A,
T: v.T,
N: v.N * req.Count,
})
}
} }
if errdata = this.module.ConsumeRes(session, this.module.FormatRes(_costRes), true); errdata != nil { if errdata = this.module.ConsumeRes(session, this.module.FormatRes(_costRes), true); errdata != nil {