refactor(common/data/xmlres): 注释掉未使用的MonsterMap配置变量 - 将MonsterMap配置变量注释掉,因为当前不再使用该配置 - 相应地注释掉了初始化代码中的MonsterMap赋值逻辑 feat(logic/controller): 统一CanFight方法返回值为ErrorCode - 修改PlayerFightBoss等战斗控制器中的Can
This commit is contained in:
@@ -25,23 +25,24 @@ func NewBossService() *BossService {
|
||||
}
|
||||
}
|
||||
|
||||
func (s *BossService) Get(id uint32) *model.BossConfig {
|
||||
func (s *BossService) Get(id uint32) []model.BossConfig {
|
||||
if id == 0 {
|
||||
return nil
|
||||
}
|
||||
var item *model.BossConfig
|
||||
dbm_notenable(s.Model).Where("id", id).Scan(&item)
|
||||
var item []model.BossConfig
|
||||
dbm_notenable(s.Model).Where("id", id).WhereOr("parentId", id).OrderAsc("ordernum").Scan(&item)
|
||||
|
||||
return item
|
||||
|
||||
}
|
||||
func (s *BossService) GetList(id uint32) []model.BossConfig {
|
||||
|
||||
var ret []model.BossConfig
|
||||
// func (s *BossService) GetList(id uint32) []model.BossConfig {
|
||||
|
||||
// 执行 Raw SQL 并扫描返回值
|
||||
dbm_nocache_noenable(s.Model).
|
||||
Wheref(`map_id @> ARRAY[?]::integer[]`, id).WhereOrf(`map_id @> ARRAY[?]::integer[]`, 0).Scan(&ret)
|
||||
// var ret []model.BossConfig
|
||||
|
||||
return ret
|
||||
}
|
||||
// // 执行 Raw SQL 并扫描返回值
|
||||
// dbm_nocache_noenable(s.Model).
|
||||
// Wheref(`map_id @> ARRAY[?]::integer[]`, id).WhereOrf(`map_id @> ARRAY[?]::integer[]`, 0).Scan(&ret)
|
||||
|
||||
// return ret
|
||||
// }
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"blazing/cool"
|
||||
"blazing/modules/config/model"
|
||||
)
|
||||
|
||||
type MapBossService struct {
|
||||
*cool.Service
|
||||
}
|
||||
|
||||
func NewMapBossService() *MapBossService {
|
||||
return &MapBossService{
|
||||
&cool.Service{
|
||||
Model: model.NewMapNode(),
|
||||
PageQueryOp: &cool.QueryOp{
|
||||
KeyWordField: []string{"remake"},
|
||||
FieldEQ: []string{"map_id"},
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
30
modules/config/service/map_node.go
Normal file
30
modules/config/service/map_node.go
Normal file
@@ -0,0 +1,30 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"blazing/cool"
|
||||
"blazing/modules/config/model"
|
||||
)
|
||||
|
||||
type MapNodeService struct {
|
||||
*cool.Service
|
||||
}
|
||||
|
||||
func NewMapNodeService() *MapNodeService {
|
||||
return &MapNodeService{
|
||||
&cool.Service{
|
||||
Model: model.NewMapNode(),
|
||||
PageQueryOp: &cool.QueryOp{
|
||||
KeyWordField: []string{"remake"},
|
||||
FieldEQ: []string{"map_id"},
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
func (s *MapNodeService) GetData(mapid, pos uint32) []model.MapNode {
|
||||
|
||||
var pet []model.MapNode //一个特性应该是唯一的,但是我们要获取默认随机特性
|
||||
dbm_enable(s.Model).Where("map_id", mapid).Wheref(`pos @> ARRAY[?]::integer[]`, pos).Scan(&pet)
|
||||
|
||||
return pet
|
||||
|
||||
}
|
||||
@@ -20,3 +20,11 @@ func NewMapPitService() *MapPitService {
|
||||
},
|
||||
}
|
||||
}
|
||||
func (s *MapPitService) GetData(mapid, pos uint32) []model.MapPit {
|
||||
|
||||
var pet []model.MapPit //一个特性应该是唯一的,但是我们要获取默认随机特性
|
||||
dbm_enable(s.Model).Where("map_id", mapid).Wheref(`pos @> ARRAY[?]::integer[]`, pos).Scan(&pet)
|
||||
|
||||
return pet
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user