#28241 缺陷 【梦工场系统】 <-前端-> 【图鉴】收藏奖励 同步

modules/smithy/api_atlasaward.go

@@ -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) {
 	var (
 		res  []*cfg.Gameatn
-		respRes []*pb.UserAssets
+		atno []*pb.UserAtno
+		Res  []*pb.UserAssets
 	)
 	if errdata = this.AtlasAwardCheck(session, req); errdata != nil {
 		return // 参数校验失败直接返回
@@ -48,26 +49,17 @@ func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAw
 		}
 		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,
 			T: v.T,
 			N: v.N,
 		})
 	}
-	}
 	//修改数据
 	update := make(map[string]interface{}, 0)
 	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{
 		Data: atlas,
-		Res:  respRes,
+		Res:  Res,
 	})
 	return
 }