From b80b017d33f54bc70d21ea9b07eb2599890ee734 Mon Sep 17 00:00:00 2001 From: xinian Date: Thu, 5 Mar 2026 15:20:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E4=B8=8E=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logic/service/player/boss.go | 4 ++-- modules/player/service/info.go | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/logic/service/player/boss.go b/logic/service/player/boss.go index 58f90a6bb..e1cf898dd 100644 --- a/logic/service/player/boss.go +++ b/logic/service/player/boss.go @@ -25,7 +25,7 @@ func (p *Player) SptCompletedTask(taskID int, ot int) { return } // 1. 检查任务当前状态：未接受才处理 - if p.Info.GetTask(taskID) != model.Unaccepted { + if p.Info.GetTask(taskID) == model.Completed { return } @@ -47,7 +47,7 @@ func (p *Player) TawerCompletedTask(taskID int, ot int) { return } // 处理默认分支（ot=-1）：仅奖励存在时才完成主任务 - if p.Info.GetTask(taskID) == model.Unaccepted { + if p.Info.GetTask(taskID) != model.Completed { defaultGift := p.getTaskGift(taskID, -1) if defaultGift != nil { // 奖励存在才标记主任务完成 p.Info.SetTask(taskID, model.Completed) diff --git a/modules/player/service/info.go b/modules/player/service/info.go index f663311e9..9679d2083 100644 --- a/modules/player/service/info.go +++ b/modules/player/service/info.go @@ -104,8 +104,11 @@ func (s *InfoService) SetLogin() *model.PlayerInfo { //tt.Data.FightTime = 60 * 60 * 2 //重置战斗次数 for _, v := range service.NewTaskService().GetDaily() { - - tt.Data.SetTask(int(v.TaskId), model.Unaccepted) + if v.IsAcceptable == 0 { + tt.Data.SetTask(int(v.TaskId), model.Unaccepted) + } else { + tt.Data.SetTask(int(v.TaskId), model.Reserved) + } } @@ -124,7 +127,11 @@ func (s *InfoService) SetLogin() *model.PlayerInfo { tt.WeekLastResetTime = gtime.Now() for _, v := range service.NewTaskService().GetWeek() { - tt.Data.SetTask(int(v.TaskId), model.Unaccepted) + if v.IsAcceptable == 0 { + tt.Data.SetTask(int(v.TaskId), model.Unaccepted) + } else { + tt.Data.SetTask(int(v.TaskId), model.Reserved) + } } }