昔念
61ffa9c640
fix(pet_skill): 修复宠物技能设置中的变量引用错误 - 修复了 SetPetSkill 函数中使用错误变量名的问题 - 将 onpet 替换为正确的 currentPet 变量引用 - 确保技能学习范围和技能列表检查使用正确的宠物对象 ```
85 lines
2.2 KiB
Go
85 lines
2.2 KiB
Go
package controller
|
||
|
||
import (
|
||
"blazing/common/data/xmlres"
|
||
"blazing/common/socket/errorcode"
|
||
"blazing/common/utils"
|
||
"blazing/logic/service/fight"
|
||
"blazing/logic/service/pet"
|
||
"blazing/logic/service/player"
|
||
"blazing/modules/blazing/model"
|
||
|
||
"github.com/samber/lo"
|
||
)
|
||
|
||
// SetPetSkill 设置宠物技能，消耗50赛尔豆
|
||
func (h Controller) SetPetSkill(data *pet.ChangeSkillInfo, c *player.Player) (result *pet.ChangeSkillOutInfo, err errorcode.ErrorCode) {
|
||
const setSkillCost = 50
|
||
|
||
if !c.UseCoins(setSkillCost) {
|
||
return nil, errorcode.ErrorCodes.ErrSunDouInsufficient10016
|
||
}
|
||
|
||
c.Info.Coins -= setSkillCost
|
||
|
||
_, currentPet, ok := c.FindPet(data.CatchTime)
|
||
if !ok {
|
||
return nil, errorcode.ErrorCodes.ErrSystemBusy
|
||
}
|
||
canleaernskill := currentPet.GetLevelRangeCanLearningSkills(1, currentPet.Level)
|
||
|
||
_, ok = lo.Find(canleaernskill, func(item uint32) bool {
|
||
return item == data.ReplaceSkill
|
||
})
|
||
|
||
if !ok {
|
||
return result, errorcode.ErrorCodes.ErrSystemBusy
|
||
}
|
||
_, _, ok = utils.FindWithIndex(currentPet.SkillList, func(item model.SkillInfo) bool { //已经存在技能
|
||
return item.ID == data.ReplaceSkill
|
||
})
|
||
if ok {
|
||
return nil, errorcode.ErrorCodes.ErrSystemBusy
|
||
}
|
||
|
||
// 查找要学习的技能并替换
|
||
_, targetSkill, ok := utils.FindWithIndex(currentPet.SkillList, func(item model.SkillInfo) bool {
|
||
return item.ID == data.HasSkill
|
||
})
|
||
if ok {
|
||
targetSkill.ID = data.ReplaceSkill
|
||
targetSkill.PP = uint32(xmlres.SkillMap[int(targetSkill.ID)].MaxPP)
|
||
}
|
||
|
||
return &pet.ChangeSkillOutInfo{
|
||
CatchTime: data.CatchTime,
|
||
}, 0
|
||
}
|
||
|
||
// SortPetSkills 排序宠物技能，消耗50赛尔豆
|
||
func (h Controller) SortPetSkills(data *pet.C2S_Skill_Sort, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||
const skillSortCost = 50
|
||
|
||
if !c.UseCoins(skillSortCost) {
|
||
return nil, errorcode.ErrorCodes.ErrSunDouInsufficient10016
|
||
}
|
||
|
||
c.Info.Coins -= skillSortCost
|
||
|
||
_, currentPet, ok := c.FindPet(data.CapTm)
|
||
if ok {
|
||
var newSkillList []model.SkillInfo
|
||
for _, skillID := range data.Skill {
|
||
_, skill, found := utils.FindWithIndex(currentPet.SkillList, func(item model.SkillInfo) bool {
|
||
return item.ID == skillID
|
||
})
|
||
if found {
|
||
newSkillList = append(newSkillList, *skill)
|
||
}
|
||
}
|
||
currentPet.SkillList = newSkillList
|
||
}
|
||
|
||
return nil, 0
|
||
}
|