From 774a44d561dcea4a61df75f7c24d62b2a1abbc58 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Mon, 24 Mar 2025 15:20:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/Gm.go                    | 2 ++
 src/server/game/RegisterNetworkFunc.go   | 1 -
 src/server/game/mod/activity/activity.go | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/server/game/Gm.go b/src/server/game/Gm.go
index aa0ea55b..577353b4 100644
--- a/src/server/game/Gm.go
+++ b/src/server/game/Gm.go
@@ -88,6 +88,8 @@ func ReqGmCommand_(player *Player, Command string) error {
 		ActivityMod.Var = nil
 		ActivityMod.InitData()
 		player.PlayMod.save()
+		player.initAcitivity()
+		player.BackDataActivity()
 	case "weekUpdate":
 		VarMod := player.PlayMod.getVarMod()
 		VarMod.WeeklyResetTime = 0
diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go
index 35e6a0eb..0810bbfd 100644
--- a/src/server/game/RegisterNetworkFunc.go
+++ b/src/server/game/RegisterNetworkFunc.go
@@ -3846,7 +3846,6 @@ func ReqActivityReward(player *Player, buf []byte) error {
 	proto.Unmarshal(buf, req)
 	ActivityInfo := GetActivityInfo(player, int(req.Id))
 	if ActivityInfo == nil {
-
 		player.SendErrClienRes(&msg.ResActivityReward{
 			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not exist",
diff --git a/src/server/game/mod/activity/activity.go b/src/server/game/mod/activity/activity.go
index 9e924379..d4036445 100644
--- a/src/server/game/mod/activity/activity.go
+++ b/src/server/game/mod/activity/activity.go
@@ -73,12 +73,12 @@ func (a *Activity) GetActivityStatus(data *gamedata.ActivityData) int {
 		switch data.Type {
 		case ACT_TYPE_ADD_GIFT:
 			Var := a.getGIftVar(data.Id)
+			if Var.Reward {
+				return ACT_STATUS_NOT_START
+			}
 			if Var.Buy {
 				return ACT_STATUS_END
 			}
-			if Var.Buy && Var.Reward {
-				return ACT_STATUS_NOT_START
-			}
 		default:
 			Var := a.getGIftVar(data.Id)
 			if Var.Buy {
@@ -93,7 +93,7 @@ func (a *Activity) GetActivityStatus(data *gamedata.ActivityData) int {
 func (a *Activity) GetReward(ActId int) ([]*item.Item, error) {
 	Var := a.getGIftVar(ActId)
 	if !Var.Buy {
-		return nil, nil
+		return nil, fmt.Errorf("not buy")
 	}
 	if Var.Reward {
 		return nil, fmt.Errorf("reward already get")