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

feat(player): 重构任务状态管理逻辑

Browse Source 
将任务状态相关的 GetTask 和 SetTask 方法从 player 包迁移至 model.PlayerInfo 结构体中，
统一通过 c.Info 调
This commit is contained in:
昔念
2025-12-08 19:16:37 +08:00
parent 8983222dcb
commit ec0552b59a
13 changed files with 192 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
logic/controller/fight_boss.go
View File

@@ -121,9 +121,8 @@ func (h Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, c *pla
fight.NewFight(c, ai, func(foi *info.FightOverInfo) {
if taskid != 0 {
if foi.Reason == 0 && foi.WinnerId == c.Info.UserID {
if c.GetTask(taskid) == player.Unaccepted {
c.SetTask(taskid, player.Completed) //设置完成任务
c.Info.TaskList[taskid-1] = 3
if c.Info.GetTask(taskid) == model.Unaccepted {
c.Info.SetTask(taskid, model.Completed) //设置完成任务
moinfo.PetList[0].Downgrade(1)
PetID := moinfo.PetList[0].ID

1
logic/controller/login.go
View File

@@ -58,6 +58,7 @@ func (h *Controller) Login(data *user.MAIN_LOGIN_IN, c gnet.Conn) (result *user.
t.Service = blservice.NewUserService(data.Head.UserID)
t.User = service.NewBaseSysUserService()
t.Info = t.Service.Info.Personself()
if t.Info == nil {
defer c.Close()
return

12
logic/controller/task.go
View File

@@ -19,8 +19,8 @@ func (h Controller) AcceptTask(data *task.AcceptTaskInboundInfo, c *player.Playe
// //isdaliy = true
// }
if c.GetTask(int(data.TaskId)) == player.Unaccepted {
c.SetTask(int(data.TaskId), player.Accepted)
if c.Info.GetTask(int(data.TaskId)) == model.Unaccepted {
c.Info.SetTask(int(data.TaskId), model.Accepted)
}
c.Service.Task.Exec(uint32(data.TaskId), func(t *model.TaskEX) bool {
@@ -55,12 +55,12 @@ func (h Controller) AddTaskBuf(data *task.AddTaskBufInboundInfo, c *player.Playe
* 完成任务
*/
func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player.Player) (result *task.CompleteTaskOutboundInfo, err errorcode.ErrorCode) {
if c.GetTask(int(data.TaskId)) != player.Accepted { //如果任务没有接受或者已经完成Complete_Task
if c.Info.GetTask(int(data.TaskId)) != model.Accepted { //如果任务没有接受或者已经完成Complete_Task
return result, 0
}
c.SetTask(int(data.TaskId), player.Completed)
c.Info.SetTask(int(data.TaskId), model.Completed)
result = &task.CompleteTaskOutboundInfo{
TaskId: data.TaskId,
@@ -112,8 +112,8 @@ func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *player.Pla
*/
func (h Controller) Delete_Task(data *task.DeleteTaskInboundInfo, c *player.Player) (result *task.DeleteTaskOutboundInfo, err errorcode.ErrorCode) {
if c.GetTask(int(data.TaskId)) == player.Accepted {
c.SetTask(int(data.TaskId), player.Unaccepted)
if c.Info.GetTask(int(data.TaskId)) == model.Accepted {
c.Info.SetTask(int(data.TaskId), model.Unaccepted)
return &task.DeleteTaskOutboundInfo{TaskId: data.TaskId}, 0
}