admin/bl
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fix: 修正任务状态判断与初始化逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
Details

Browse Source
This commit is contained in:
xinian
2026-03-05 15:20:19 +08:00
committed by cnb
parent 2259093790
commit b80b017d33
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logic/service/player/boss.go
View File

@@ -25,7 +25,7 @@ func (p *Player) SptCompletedTask(taskID int, ot int) {
return return
} }
// 1. 检查任务当前状态：未接受才处理 // 1. 检查任务当前状态：未接受才处理
if p.Info.GetTask(taskID) != model.Unaccepted { if p.Info.GetTask(taskID) == model.Completed {
return return
} }
@@ -47,7 +47,7 @@ func (p *Player) TawerCompletedTask(taskID int, ot int) {
return return
} }
// 处理默认分支（ot=-1）：仅奖励存在时才完成主任务 // 处理默认分支（ot=-1）：仅奖励存在时才完成主任务
if p.Info.GetTask(taskID) == model.Unaccepted { if p.Info.GetTask(taskID) != model.Completed {
defaultGift := p.getTaskGift(taskID, -1) defaultGift := p.getTaskGift(taskID, -1)
if defaultGift != nil { // 奖励存在才标记主任务完成 if defaultGift != nil { // 奖励存在才标记主任务完成
p.Info.SetTask(taskID, model.Completed) p.Info.SetTask(taskID, model.Completed)

13
modules/player/service/info.go
View File

@@ -104,8 +104,11 @@ func (s *InfoService) SetLogin() *model.PlayerInfo {
//tt.Data.FightTime = 60 * 60 * 2 //重置战斗次数 //tt.Data.FightTime = 60 * 60 * 2 //重置战斗次数
for _, v := range service.NewTaskService().GetDaily() { for _, v := range service.NewTaskService().GetDaily() {
if v.IsAcceptable == 0 {
tt.Data.SetTask(int(v.TaskId), model.Unaccepted) 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() tt.WeekLastResetTime = gtime.Now()
for _, v := range service.NewTaskService().GetWeek() { 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)
}
} }
} }