feat(fight): 增加战斗模式枚举并重构战斗逻辑判断

- 引入完整的 BattleMode 枚举定义,替代原有的 BattleStatus,明确区分各类战斗场景
- 在多个控制器中替换对旧 Status 字段的依赖,统一使用 Mode 判断战斗状态
- 修复部分函数调用前未检查 FightC 是否为空的问题,增加 ErrBattleEnded 错误返回
- 调整
This commit is contained in:
2025-11-21 02:40:27 +08:00
parent 105c6f5a23
commit e54d4bacaa
18 changed files with 217 additions and 123 deletions

View File

@@ -3,6 +3,9 @@ package service
import (
"blazing/cool"
"blazing/modules/blazing/model"
"strings"
"github.com/gogf/gf/v2/util/gconv"
)
type DoneService struct {
@@ -10,15 +13,27 @@ type DoneService struct {
}
func (s *DoneService) Exec(data model.EnumMilestone, id []uint32, fn func(*model.MilestoneEX) bool) {
m := s.GModel(s.Model).Where("done_type", data).Where("args", id)
var tt model.MilestoneEX
arss := strings.Join(gconv.Strings(id), "-")
m := s.GModel(s.Model).Where("done_type", data).Where("args", arss)
var tt *model.MilestoneEX
m.Scan(&tt)
ook := fn(&tt)
if tt == nil {
tt = &model.MilestoneEX{
Milestone: model.Milestone{
DoneType: data,
Args: strings.Join(gconv.Strings(id), "-"),
Count: 1,
},
}
}
tt.Args = id
ook := fn(tt)
if !ook { //不需要保存
return
}
tt.PlayerID = uint64(s.userid)
tt.Milestone.Args = strings.Join(gconv.Strings(id), "-")
_, err := m.Save(tt)
if err != nil {