From 7836bd753195d968caf57efc9b703545c5013bd2 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 13 Jul 2023 15:20:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=81=E5=8C=A0=E9=93=BA=E5=9B=BE=E9=89=B4?=
 =?UTF-8?q?=E8=8E=B7=E5=BE=97=E9=87=8D=E5=A4=8D=E8=8B=B1=E9=9B=84=E5=A5=96?=
 =?UTF-8?q?=E5=8A=B1=E8=87=AA=E5=8A=A8=E8=BD=AC=E7=A2=8E=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/activity/module.go       | 12 ++++++++++-
 modules/smithy/api_atlasaward.go | 34 ++++++++++++--------------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/modules/activity/module.go b/modules/activity/module.go
index 1bf49b016..55277d199 100644
--- a/modules/activity/module.go
+++ b/modules/activity/module.go
@@ -18,6 +18,8 @@ type Activity struct {
 	service     core.IService
 	modelhdList *modelHdList
 	modelhdData *modelhdData
+
+	warorder comm.IWarorder // 战令
 }
 
 func NewModule() core.IModule {
@@ -46,7 +48,15 @@ func (this *Activity) Init(service core.IService, module core.IModule, options c
 }
 func (this *Activity) Start() (err error) {
 	err = this.ModuleBase.Start()
-	//this.modelhdList.getHdInfoByHdId(10002)
+	if rst, err := this.modelhdList.getHdInfoByHdId(10002); err == nil {
+		// 服务启动 获取活动信息
+		var module core.IModule
+		if module, err = this.service.GetModule(comm.ModuleWarorder); err == nil {
+			this.warorder = module.(comm.IWarorder)
+			this.warorder.OpenWarorder(2, rst.Stime)
+		}
+	}
+
 	return
 }
 func (this *Activity) OnInstallComp() {
diff --git a/modules/smithy/api_atlasaward.go b/modules/smithy/api_atlasaward.go
index d75d83dd2..df6f2288e 100644
--- a/modules/smithy/api_atlasaward.go
+++ b/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
 }