From ad79b477e6249002c4cd0b8d9968f80ce743ca31 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 8 Aug 2023 12:51:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=86=E5=85=B8=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/activity/api_gethddata.go |  9 ++++++-
 modules/activity/api_getlist.go   |  1 +
 modules/activity/module.go        | 39 +++++++++++++------------------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/modules/activity/api_gethddata.go b/modules/activity/api_gethddata.go
index 0b3780dbc..40475cc5d 100644
--- a/modules/activity/api_gethddata.go
+++ b/modules/activity/api_gethddata.go
@@ -55,7 +55,7 @@ func (this *apiComp) GetHdData(session comm.IUserSession, req *pb.ActivityGetHdD
 		// 获取开服庆典活动
 		if activity.Itype == comm.HdCelebration {
 			//	key := fmt.Sprintf("%s-%s", session.GetUserId(), id)
-			if data, err := this.module.modelhdData.getHddataByOid(session.GetUserId(), id); err != nil {
+			if data, err := this.module.modelhdData.getHddataByOid(session.GetUserId(), id); err == nil {
 				// 注意 Gotarr:map[int32]int32 key  value 已经挑战的次数
 				if !utils.IsToday(data.Lasttime) { // 不是今天重置
 					data.Lasttime = configure.Now().Unix()
@@ -67,6 +67,13 @@ func (this *apiComp) GetHdData(session comm.IUserSession, req *pb.ActivityGetHdD
 					update["val"] = data.Val
 					update["gotarr"] = data.Gotarr
 					this.module.modelhdData.ModifyActivityList(session.GetUserId(), data.Id, update)
+					result = append(result, data)
+				} else { // 第一次进入
+					_sub := (configure.Now().Unix() - activity.Stime)
+					data.Val = int32(_sub/(24*3600)) + 1
+					update := make(map[string]interface{})
+					update["val"] = data.Val
+					this.module.modelhdData.ModifyActivityList(session.GetUserId(), data.Id, update)
 				}
 			}
 		}
diff --git a/modules/activity/api_getlist.go b/modules/activity/api_getlist.go
index b13ac9e9a..7119fe99d 100644
--- a/modules/activity/api_getlist.go
+++ b/modules/activity/api_getlist.go
@@ -23,6 +23,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ActivityGetListR
 			data = append(data, v)
 		}
 	}
+
 	session.SendMsg(string(this.module.GetType()), "getlist", &pb.ActivityGetListResp{
 		Data: data,
 	})
diff --git a/modules/activity/module.go b/modules/activity/module.go
index e7bb2e805..6adc684a8 100644
--- a/modules/activity/module.go
+++ b/modules/activity/module.go
@@ -227,35 +227,28 @@ func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32,
 						update["gotarr"] = data.Gotarr
 						bChange = true
 					}
-					var pos int32
 
-					for index, v := range this.configure.GetHDCelebrationData() {
-						for i := 0; i < int(v); i++ {
-							pos++
-							if data.Val == pos {
-								if conf, err := this.configure.GetHDCelebration(int32(index) + 1); err != nil {
+					if conf, err := this.configure.GetHDCelebration(data.Val); err != nil {
 
-									if conf.Systemtype == systemtype {
-										data.Gotarr[bosstype] += 1
-										// 天数
-										var idays int32
-										for i, v1 := range conf.Bosstype {
-											if v1 == systemtype || v1 == 0 { // bosstype 为0 表示所有的boss 类型都算
-												idays = conf.Num[i]
-												break
-											}
-										}
-										// 更新信息
-										update["gotarr"] = data.Gotarr
-										bChange = true
-										if data.Gotarr[bosstype] <= idays {
-											bDouble = true
-										}
-									}
+						if conf.Systemtype == systemtype {
+							data.Gotarr[bosstype] += 1
+							// 天数
+							var idays int32
+							for i, v1 := range conf.Bosstype {
+								if v1 == systemtype || v1 == 0 { // bosstype 为0 表示所有的boss 类型都算
+									idays = conf.Num[i]
+									break
 								}
 							}
+							// 更新信息
+							update["gotarr"] = data.Gotarr
+							bChange = true
+							if data.Gotarr[bosstype] <= idays {
+								bDouble = true
+							}
 						}
 					}
+
 					if bChange {
 						this.modelhdData.ModifyActivityList(session.GetUserId(), data.Id, update)
 						// 推送活动数据进度变化