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

modules/smithy/api_atlasaward.go

@@ -15,8 +15,9 @@ 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
+		res  []*cfg.Gameatn
+		atno []*pb.UserAtno
+		Res  []*pb.UserAssets
 	)
 	if errdata = this.AtlasAwardCheck(session, req); errdata != nil {
 		return // 参数校验失败直接返回
@@ -48,25 +49,16 @@ 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
-			}
-
-		}
-		if !bFind {
-			respRes = append(respRes, &pb.UserAssets{
-				A: v.A,
-				T: v.T,
-				N: v.N,
-			})
-		}
+	for _, v := range atno {
+		Res = append(Res, &pb.UserAssets{
+			A: v.A,
+			T: v.T,
+			N: v.N,
+		})
 	}
 	//修改数据
 	update := make(map[string]interface{}, 0)
@@ -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
 }

modules/smithy/api_forgeequip.go

@@ -162,7 +162,13 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
 		_costRes = append(_costRes, lava)
 	}
 	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 {