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

feat(logic): 实现地图刷怪功能并优化数据库查询

Browse Source 
- 在玩家结构中添加 StopChan 通道，用于停止刷怪协程
- 优化 MapEnter 和 MapLeave 函数，支持刷怪功能
- 新增 spawnMonsters 函数实现具体刷怪逻辑
- 优化多个模块的数据库查询语句，提高查询效率
- 调整 PlayerService 中的 Reg 函数，优化数据插入操作
This commit is contained in:
昔念
2025-08-23 17:44:12 +08:00
parent bc4bd7eba6
commit b6164f3b9e
11 changed files with 131 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/data/entity/player.go
View File

@@ -18,6 +18,7 @@ type Player struct {
loginChan chan struct{} // 登录完成通知通道
Nick string //昵称
StopChan chan struct{} //停止刷怪协程
context.Context
}

66
logic/controller/map.go
View File

@@ -7,6 +7,7 @@ import (
"blazing/logic/service/maphot"
"blazing/logic/service/maps"
"blazing/logic/service/space"
mservice "blazing/modules/blazing/service"
"time"
)
@@ -19,24 +20,31 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *entity.Player) (result *maps
tt.Nick = c.Nick
tt.Pos = data.Point
data.Broadcast(c.MapId, *tt) //同步广播
go func() { //测试刷怪
// 如果是无怪地图，直接返回
if mservice.NewMonsterService().GetId(c.MapId) == 0 {
return nil, -1
}
// 创建新的停止通道
c.StopChan = make(chan struct{})
// 启动刷怪协程
go func(stopChan chan struct{}, currentMap int) {
ticker := time.NewTicker(5 * time.Second)
defer ticker.Stop()
for {
tt := handler.NewTomeeHeader()
tt.CMD = 2004
tt.Result = 0
tt.UserID = c.UserID
t1 := maps.OgreInfo{}
for i := 0; i < 9; i++ {
t1.Data[i] = 1
select {
case <-stopChan:
// 收到停止信号，退出协程
return
case <-ticker.C:
// 刷新当前地图的怪物
spawnMonsters(currentMap, c)
}
c.SendPack(tt.Pack(&t1))
<-time.After(10000 * time.Millisecond)
}
}()
}(c.StopChan, int(c.MapId))
return nil, -1
}
func (h Controller) MapHot(data *maphot.InInfo, c *entity.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {
@@ -52,6 +60,12 @@ func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *entity.Player)
//result = &maps.LeaveMapOutboundInfo{UserID: c.GetUserID()}
data.Broadcast(c.MapId, maps.LeaveMapOutboundInfo{UserID: c.GetUserID()}) //同步广播
space.GetSpace(c.MapId).Delete(c.UserID)
// 如果有正在运行的刷怪协程，发送停止信号
if c.StopChan != nil {
close(c.StopChan)
c.StopChan = nil
}
c.MapId = 0 // 重置当前地图
return nil, -1
}
func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *entity.Player) (result *maps.ListMapPlayerOutboundInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
@@ -66,3 +80,27 @@ func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *entity.Play
result.Player = append(result.Player, *result1)
return
}
// 刷怪具体实现
func spawnMonsters(mapID int, c *entity.Player) {
// 获取当前地图的怪物配置
if mservice.NewMonsterService().GetId(c.MapId) == 0 {
return
}
// 创建数据包
tt := handler.NewTomeeHeader()
tt.CMD = 2004
tt.Result = 0
tt.UserID = c.UserID
// 设置怪物信息
t1 := maps.OgreInfo{}
//copy(t1.Data[:], monsterConfig) // 使用地图对应的怪物配置
for i := 0; i < 9; i++ {
t1.Data[i] = mservice.NewMonsterService().GetId(c.MapId)
}
// 发送数据包
c.SendPack(tt.Pack(&t1))
}

1
modules/base/base.go
View File

@@ -32,6 +32,7 @@ func init() {
ctx = gctx.GetInitCtx()
)
cool.Loger.Debug(ctx, "module base init start ...")
var t bool
cool.FillInitData(ctx, "base", &model.BaseSysMenu{}, &t)

2
modules/base/model/base_sys_menu.go
View File

@@ -10,7 +10,7 @@ type BaseSysMenu struct {
ParentID uint `gorm:"column:parentId;type:bigint" json:"parentId"` // 父菜单ID
Name string `gorm:"column:name;type:varchar(255);not null" json:"name"` // 菜单名称
Router *string `gorm:"column:router;type:varchar(255)" json:"router"` // 菜单地址
Perms *string `gorm:"column:perms;type:varchar(255)" json:"perms"` // 权限标识
Perms *string `gorm:"column:perms;type:text" json:"perms"` // 权限标识
Type int32 `gorm:"column:type;not null" json:"type"` // 类型 0：目录 1：菜单 2：按钮
Icon *string `gorm:"column:icon;type:varchar(255)" json:"icon"` // 图标
OrderNum int32 `gorm:"column:orderNum;type:int;not null;default:0" json:"orderNum"` // 排序

2
modules/base/service/base_sys_department.go
View File

@@ -33,7 +33,7 @@ func (s *BaseSysDepartmentService) GetByRoleIds(roleIds []string, isAdmin bool)
}
} else {
// 如果不是超级管理员，则返回角色所在部门
result, _ = cool.DBM(BaseSysRoleDepartment).Where("roleId IN (?)", roleIds).Fields("departmentId").All()
result, _ = cool.DBM(BaseSysRoleDepartment).Where(`"roleId" IN (?)`, roleIds).Fields("departmentId").All()
for _, v := range result {
vmap := v.Map()
if vmap["departmentId"] != nil {

4
modules/base/service/base_sys_menu.go
View File

@@ -30,7 +30,7 @@ func (s *BaseSysMenuService) GetPerms(roleIds []string) []string {
if garray.NewIntArrayFrom(gconv.Ints(roleIds)).Contains(1) {
result, _ = m.Fields("a.perms").All()
} else {
result, _ = m.InnerJoin("base_sys_role_menu b", "a.id=b.menuId").InnerJoin("base_sys_role c", "b.roleId=c.id").Where("c.id IN (?)", roleIds).Fields("a.perms").All()
result, _ = m.InnerJoin("base_sys_role_menu b", `a.id=b."menuId"`).InnerJoin("base_sys_role c", `b."roleId"=c.id`).Where("c.id IN (?)", roleIds).Fields("a.perms").All()
}
for _, v := range result {
vmap := v.Map()
@@ -51,7 +51,7 @@ func (s *BaseSysMenuService) GetMenus(roleIds []string, isAdmin bool) (result gd
result, err = m.Group("a.id").Order("a.orderNum", "asc").All()
fmt.Println(err)
} else {
result, _ = m.InnerJoin("base_sys_role_menu b", "a.id=b.menuId").Where("b.roleId IN (?)", roleIds).Group("a.id").Order("a.orderNum asc").All()
result, _ = m.InnerJoin("base_sys_role_menu b", `a.id=b."menuId"`).Where(`b."roleId" IN (?)`, roleIds).Group("a.id").Order("a.orderNum asc").All()
}
return

2
modules/base/service/base_sys_user.go
View File

@@ -204,7 +204,7 @@ func (s *BaseSysUserService) Move(ctx g.Ctx) (err error) {
departmentId := request.Get("departmentId").Int()
userIds := request.Get("userIds").Slice()
_, err = cool.DBM(s.Model).Where("`id` IN(?)", userIds).Data(g.Map{"departmentId": departmentId}).Update()
_, err = cool.DBM(s.Model).Where("id IN(?)", userIds).Data(g.Map{"departmentId": departmentId}).Update()
return
}

22
modules/blazing/controller/admin/monster_refresh.go Normal file
View File

@@ -0,0 +1,22 @@
package admin
import (
"blazing/cool"
"blazing/modules/blazing/service"
)
type TaskInfoController struct {
*cool.Controller
}
func init() {
var task_info_controller = &TaskInfoController{
&cool.Controller{
Prefix: "/admin/monster/refresh",
Api: []string{"Add", "Delete", "Update", "Info", "List", "Page"},
Service: service.NewMonsterService(),
},
}
// 注册路由
cool.RegisterController(task_info_controller)
}

11
modules/blazing/model/monster_refresh.go
View File

@@ -15,11 +15,12 @@ type MonsterRefresh struct {
MapID int32 `gorm:"not null;index:idx_refresh_by_map_id;comment:'所属地图ID'" json:"map_id"`
MonsterID int32 `gorm:"not null;comment:'怪物唯一编号'" json:"monster_id"`
//Desc string `gorm:"type:varchar(100);not null;comment:'怪物名称（如皮皮）'" json:"desc"`
MinLevel int32 `gorm:"not null;comment:'最低等级'" json:"min_level"`
MaxLevel int32 `gorm:"not null;comment:'最高等级'" json:"max_level"`
Capturable bool `gorm:"not null;comment:'是否可捕捉'" json:"capturable"`
Rate float64 `gorm:"not null;comment:'刷新概率（百分比）'" json:"rate"` //未设置概率的就是默认刷新
Value string `gorm:"type:text;not null;comment:'限制值（如19:00-24:00）'" json:"value"` //这里是js文本，暂定传入时间
MinLevel int32 `gorm:"not null;comment:'最低等级'" json:"min_level"`
MaxLevel int32 `gorm:"not null;comment:'最高等级'" json:"max_level"`
Capturable bool `gorm:"not null;comment:'是否可捕捉'" json:"capturable"`
Rate float64 `gorm:"not null;comment:'刷新概率（百分比）'" json:"rate"` //未设置概率的就是默认刷新
Value string `gorm:"type:text;not null;comment:'限制值（如19:00-24:00）'" json:"value"` //这里是js文本，暂定传入时间
}
// TableName MonsterRefresh's table name

5
modules/blazing/service/isreg.go
View File

@@ -40,7 +40,7 @@ func (s *PlayerService) IsReg(accountID uint) bool {
// 实现注册,id+昵称+颜色
func (s *PlayerService) Reg(accountID uint, nick string, color uint32) {
nick = strings.TrimSpace(nick)
nick = strings.Trim(nick, "\x00")
t := model.NewPlayer()
t.PlayerID = uint64(accountID)
@@ -54,8 +54,9 @@ func (s *PlayerService) Reg(accountID uint, nick string, color uint32) {
if err != nil {
return
}
t.Data = string(t22)
_, err = cool.DBM(s.Model).Data(t).Insert()
_, err = cool.DBM(s.Model).Data(t).FieldsEx("id").Insert()
if err != nil {
glog.Error(context.Background(), err)
return

41
modules/blazing/service/monster_refresh.go Normal file
View File

@@ -0,0 +1,41 @@
package service
import (
"blazing/cool"
"blazing/modules/blazing/model"
)
type MonsterService struct {
*cool.Service
}
func NewMonsterService() *MonsterService {
return &MonsterService{
&cool.Service{
Model: model.NewMonsterRefresh(),
PageQueryOp: &cool.QueryOp{
FieldEQ: []string{"status", "type"},
},
UniqueKey: map[string]string{
"name": "任务名称不能重复",
},
},
}
}
func (s *MonsterService) GetId(mapid uint32) uint32 {
m := cool.DBM(s.Model).Where("map_id", mapid)
var tt []model.MonsterRefresh
m.Scan(&tt)
for _, v := range tt {
if v.MapID == int32(mapid) {
return uint32(v.MonsterID)
}
}
return 0
}