```
refactor(item): 优化物品添加逻辑并移除冗余代码 - 修改 ItemAdd 方法签名,从可变参数改为两个独立参数 itemId 和 itemCnt - 移除了对 model.ItemInfo 的依赖,简化调用方式 - 更新所有调用 ItemAdd 的地方以适配新接口 - 删除未使用的 imports 和注释掉的旧配置加载逻辑 - 修复购买物品时金币扣除与物品发放的一致性问题 - 增加玩家操作消耗塞尔豆的扣费逻辑(如宠物治疗、技能设置等) 此变更提升了代码简洁性和一致性,并增强了业务逻辑的准确性。 ```
This commit is contained in:
@@ -1,72 +1,54 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"blazing/common/data/xmlres"
|
||||
"blazing/common/socket/errorcode"
|
||||
"blazing/logic/service/item"
|
||||
"blazing/logic/service/player"
|
||||
"blazing/modules/blazing/model"
|
||||
"blazing/modules/blazing/service"
|
||||
|
||||
dict "blazing/modules/dict/service"
|
||||
|
||||
"github.com/gogf/gf/v2/util/gconv"
|
||||
"github.com/gogf/gf/v2/util/grand"
|
||||
)
|
||||
|
||||
func (h Controller) Talk(data *item.TalkCountInboundInfo, c *player.Player) (result *item.TalkCountOutboundInfo, err errorcode.ErrorCode) {
|
||||
result = &item.TalkCountOutboundInfo{}
|
||||
c.Service.Talk.Exec(func(t map[uint32]uint32) bool {
|
||||
|
||||
tt, ok := t[data.ID]
|
||||
if ok {
|
||||
result.GiftCount = tt
|
||||
}
|
||||
return false
|
||||
})
|
||||
cid, ok := c.Service.Talk.Cheak(c.Info.MapID, int(data.ID))
|
||||
if !ok {
|
||||
return result, errorcode.ErrorCodes.ErrResourceUnavailable
|
||||
}
|
||||
result.GiftCount = uint32(cid)
|
||||
|
||||
return result, 0
|
||||
}
|
||||
|
||||
var talkcacche = make(map[string]uint32)
|
||||
//var talkcacche = make(map[string]uint32)
|
||||
|
||||
func (h Controller) TalkCate(data *item.TalkCateInboundInfo, c *player.Player) (result *item.DayTalkInfo, err errorcode.ErrorCode) {
|
||||
result = &item.DayTalkInfo{}
|
||||
result.OutList = make([]item.CateInfo, 0)
|
||||
for _, te := range xmlres.TalkConfig.Energies {
|
||||
if te.MapID == uint64(c.Info.MapID) && te.Type == uint64(data.ID) { //
|
||||
|
||||
_, ok := talkcacche[te.Name]
|
||||
if !ok {
|
||||
for _, v := range xmlres.ItemsMAP {
|
||||
if v.Name == te.Name {
|
||||
talkcacche[te.Name] = uint32(v.ID)
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
randomNum := grand.Intn(10) + 1
|
||||
c.Service.Talk.Exec(func(t map[uint32]uint32) bool {
|
||||
if t == nil {
|
||||
t = make(map[uint32]uint32)
|
||||
|
||||
}
|
||||
_, ok := t[data.ID]
|
||||
if !ok {
|
||||
t[data.ID] = 0
|
||||
}
|
||||
|
||||
t[data.ID] += 1
|
||||
if t[data.ID] < uint32(te.CollectCnt) {
|
||||
result.OutList = append(result.OutList, item.CateInfo{ID: uint32(talkcacche[te.Name]), Count: uint32(randomNum)})
|
||||
c.ItemAdd(model.ItemInfo{ItemId: uint32(talkcacche[te.Name]), ItemCnt: uint32(randomNum)})
|
||||
}
|
||||
|
||||
return true
|
||||
})
|
||||
|
||||
break
|
||||
}
|
||||
|
||||
_, ok := c.Service.Talk.Cheak(c.Info.MapID, int(data.ID))
|
||||
if !ok {
|
||||
return result, errorcode.ErrorCodes.ErrResourceUnavailable
|
||||
}
|
||||
//更新次数
|
||||
config := service.TalkConfigServiceS.GetCache(int(data.ID))
|
||||
|
||||
for _, v := range config {
|
||||
count := grand.N(int(v.ItemMinCount), int(v.ItemMaxCount))
|
||||
|
||||
r := dict.DictInfoServiceS.DataID("fusion")
|
||||
trueitemid := gconv.Uint32(r[gconv.Uint32(v.ItemID)].Remark)
|
||||
ret := c.ItemAdd(trueitemid, uint32(count))
|
||||
if ret {
|
||||
result.OutList = append(result.OutList, item.CateInfo{ID: trueitemid, Count: uint32(count)})
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
c.Service.Talk.Update(int(data.ID))
|
||||
|
||||
return result, 0
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user