"refactor(service): 重构服务实例化方式,移除全局变量改用New方法"
This commit is contained in:
@@ -97,7 +97,7 @@ func (h Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, c *pla
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
EID, args := service.Effects.Args(uint32(idx))
|
EID, args := service.NewEffectService().Args(uint32(idx))
|
||||||
mo.EffectInfo = append(mo.EffectInfo, model.PetEffectInfo{
|
mo.EffectInfo = append(mo.EffectInfo, model.PetEffectInfo{
|
||||||
Idx: idx,
|
Idx: idx,
|
||||||
EID: gconv.Uint16(EID),
|
EID: gconv.Uint16(EID),
|
||||||
|
|||||||
@@ -45,14 +45,14 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result
|
|||||||
natureId = int32(Auxpetinfo.Nature)
|
natureId = int32(Auxpetinfo.Nature)
|
||||||
}
|
}
|
||||||
|
|
||||||
resid := int(service.PetFusionServiceS.Data(Mcatchpetinfo.ID, Auxpetinfo.ID, Mcatchpetinfo.Level+Auxpetinfo.Level))
|
resid := int(service.NewPetFusionService().Data(Mcatchpetinfo.ID, Auxpetinfo.ID, Mcatchpetinfo.Level+Auxpetinfo.Level))
|
||||||
|
|
||||||
if resid == 0 {
|
if resid == 0 {
|
||||||
//todo失败降低等级
|
//todo失败降低等级
|
||||||
|
|
||||||
return &pet.PetFusionInfo{}, 0
|
return &pet.PetFusionInfo{}, 0
|
||||||
}
|
}
|
||||||
effect := int(service.PetFusionMaterialServiceIns.Data(data.Item1))
|
effect := int(service.NewPetFusionMaterialService().Data(data.Item1))
|
||||||
if effect == 0 {
|
if effect == 0 {
|
||||||
return &pet.PetFusionInfo{}, 0
|
return &pet.PetFusionInfo{}, 0
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ func init() {
|
|||||||
&cool.Controller{
|
&cool.Controller{
|
||||||
Prefix: "/admin/pet/fusionmaterial", // 路由前缀(主表路由+子表名,层级清晰)
|
Prefix: "/admin/pet/fusionmaterial", // 路由前缀(主表路由+子表名,层级清晰)
|
||||||
Api: []string{"Add", "Delete", "Update", "Info", "List", "Page"}, // 支持的基础CRUD接口
|
Api: []string{"Add", "Delete", "Update", "Info", "List", "Page"}, // 支持的基础CRUD接口
|
||||||
Service: service.PetFusionMaterialServiceIns, // 绑定子表Service
|
Service: service.NewPetFusionMaterialService(), // 绑定子表Service
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
// 注册控制器到框架
|
// 注册控制器到框架
|
||||||
|
|||||||
@@ -32,4 +32,4 @@ func NewEffectService() *EffectService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var Effects = NewEffectService()
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import (
|
|||||||
"blazing/cool"
|
"blazing/cool"
|
||||||
"blazing/modules/config/model"
|
"blazing/modules/config/model"
|
||||||
|
|
||||||
|
"github.com/gogf/gf/v2/database/gdb"
|
||||||
"github.com/gogf/gf/v2/util/grand"
|
"github.com/gogf/gf/v2/util/grand"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -15,7 +16,11 @@ type ItemService struct {
|
|||||||
|
|
||||||
func (s *ItemService) GetItemCount(id uint32) uint32 {
|
func (s *ItemService) GetItemCount(id uint32) uint32 {
|
||||||
var item model.ItemGift
|
var item model.ItemGift
|
||||||
cool.DBM(s.Model).Where("id", id).Scan(&item)
|
cool.DBM(s.Model).Where("id", id).Cache(gdb.CacheOption{
|
||||||
|
// Duration: time.Hour,
|
||||||
|
|
||||||
|
Force: false,
|
||||||
|
}).Scan(&item)
|
||||||
|
|
||||||
if item.ItemID == 0 {
|
if item.ItemID == 0 {
|
||||||
return 0
|
return 0
|
||||||
@@ -35,5 +40,3 @@ func NewItemService() *ItemService {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var Items = NewItemService()
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ type PetFusionMaterialService struct {
|
|||||||
*cool.Service // 嵌入通用Service(继承基础CRUD方法)
|
*cool.Service // 嵌入通用Service(继承基础CRUD方法)
|
||||||
}
|
}
|
||||||
|
|
||||||
var PetFusionMaterialServiceIns = NewPetFusionMaterialService()
|
|
||||||
|
|
||||||
// NewPetFusionMaterialService 创建PetFusionMaterialService实例
|
// NewPetFusionMaterialService 创建PetFusionMaterialService实例
|
||||||
func NewPetFusionMaterialService() *PetFusionMaterialService {
|
func NewPetFusionMaterialService() *PetFusionMaterialService {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ type PetFusionService struct {
|
|||||||
*cool.Service // 嵌入通用Service(继承基础CRUD方法)
|
*cool.Service // 嵌入通用Service(继承基础CRUD方法)
|
||||||
}
|
}
|
||||||
|
|
||||||
var PetFusionServiceS = NewPetFusionService()
|
|
||||||
|
|
||||||
// NewPetFusionService 创建PetFusionService实例
|
// NewPetFusionService 创建PetFusionService实例
|
||||||
func NewPetFusionService() *PetFusionService {
|
func NewPetFusionService() *PetFusionService {
|
||||||
|
|||||||
Reference in New Issue
Block a user