昔念
35c89215f7
feat(player): 重构玩家金币系统，使用BaseSysUserService管理金币 将玩家金币逻辑从PlayerInfo中移除，改为通过BaseSysUserService进行统一管理。 新增了金币的获取与设置方法，支持以分为单位的精确计算。 调整了登录时用户服务的初始化逻辑，确保User字段正确赋值。 fix(pet): 修复宠物性格道具使用逻辑错误 更新了多个性格相关道具的处理方式，包括新增的性格转换道具范围。 修正了性格随机与指定逻辑，避免越界问题并增强可维护性。 feat(fight): 战斗初始化时恢复宠物状态 在战斗初始化阶段调用宠物治愈方法，确保战斗开始前宠物处于健康状态。 feat(admin): 调整管理员会话获取接口参数类型 修改GetPerson方法传入参数为uint32类型，提高数据一致性与安全性。 refactor(model): 移除PlayerInfo中的GoldBean字段 金币字段不再存储于PlayerInfo结构体中，转而由BaseSysUser模块统一管理。 ```
94 lines
2.6 KiB
Go
94 lines
2.6 KiB
Go
package controller
|
||
|
||
import (
|
||
"blazing/common/data/xmlres"
|
||
"blazing/common/socket/errorcode"
|
||
"blazing/logic/service/fight"
|
||
"blazing/logic/service/item"
|
||
"blazing/logic/service/player"
|
||
"blazing/modules/blazing/model"
|
||
"strings"
|
||
|
||
"github.com/gogf/gf/v2/util/gconv"
|
||
"github.com/gogf/gf/v2/util/grand"
|
||
"github.com/jinzhu/copier"
|
||
)
|
||
|
||
func (h Controller) UserItemList(data *item.ItemListInboundInfo, c *player.Player) (result *item.ItemListOutboundInfo, err errorcode.ErrorCode) {
|
||
result = &item.ItemListOutboundInfo{}
|
||
result.ItemList = make([]model.SingleItemInfo, 0)
|
||
|
||
item := c.Service.Item.Get(data.Param1, data.Param2)
|
||
for _, v := range item {
|
||
var vv model.SingleItemInfo
|
||
vv.ItemId = v.ItemId
|
||
vv.ItemCnt = v.ItemCnt
|
||
vv.LeftTime = 360000
|
||
result.ItemList = append(result.ItemList, vv)
|
||
}
|
||
|
||
return result, 0
|
||
}
|
||
func (h Controller) ItemUsePet(data *item.C2S_USE_PET_ITEM_OUT_OF_FIGHT, c *player.Player) (result *item.S2C_USE_PET_ITEM_OUT_OF_FIGHT, err errorcode.ErrorCode) {
|
||
|
||
_, onpet, ok := c.FindPet(data.CatchTime)
|
||
if !ok {
|
||
return nil, errorcode.ErrorCodes.Err10401
|
||
}
|
||
// 绑定变量到switch，显式匹配true
|
||
switch itemID := data.ItemID; true {
|
||
//这是学习力遗忘
|
||
case itemID >= 300037 && itemID <= 300041:
|
||
|
||
onpet.Ev[itemID-300037+1] = 0
|
||
// 体力遗忘
|
||
case itemID == 300042:
|
||
onpet.Ev[0] = 0
|
||
// 全能遗忘
|
||
case itemID == 300650:
|
||
onpet.Ev = [6]uint32{}
|
||
|
||
//性格随机
|
||
case itemID == 300025:
|
||
|
||
onpet.Nature = (onpet.Nature + uint32(grand.Intn(25))) % 25
|
||
|
||
//性格转换
|
||
case itemID >= 300081 && itemID <= 300086:
|
||
onpet.Nature = gconv.Uint32(*xmlres.ItemsMAP[int(itemID)].Nature)
|
||
|
||
//性格转换
|
||
case (itemID >= 300602 && itemID <= 300605) || itemID == 300119 || itemID == 300120:
|
||
rr := strings.Split(*xmlres.ItemsMAP[int(itemID)].NatureSet, " ")
|
||
onpet.Nature = gconv.Uint32(rr[grand.Intn(len(rr))-1])
|
||
default:
|
||
// 无效ID处理
|
||
return nil, errorcode.ErrorCodes.ErrSystemError
|
||
}
|
||
|
||
if c.Service.Item.CheakItem(data.ItemID) == 0 {
|
||
return nil, errorcode.ErrorCodes.ErrSystemError
|
||
}
|
||
c.Service.Item.SubItem(data.ItemID, 1)
|
||
result = &item.S2C_USE_PET_ITEM_OUT_OF_FIGHT{}
|
||
onpet.CalculatePetPane()
|
||
copier.Copy(&result, onpet)
|
||
|
||
return result, 0
|
||
}
|
||
|
||
func (h Controller) RESET_NATURE(data *item.C2S_PET_RESET_NATURE, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||
if c.Service.Item.CheakItem(data.ItemId) == 0 {
|
||
return nil, errorcode.ErrorCodes.ErrSystemError
|
||
}
|
||
_, onpet, ok := c.FindPet(data.CatchTime)
|
||
if !ok {
|
||
return nil, errorcode.ErrorCodes.Err10401
|
||
}
|
||
|
||
onpet.Nature = data.Nature
|
||
onpet.CalculatePetPane()
|
||
c.Service.Item.SubItem(data.ItemId, 1)
|
||
return result, 0
|
||
}
|