```
refactor(controller): 替换BossCompletedTask为专用方法名 在战斗控制器中将p.BossCompletedTask替换为p.SptCompletedTask, 以及在塔沃控制器中将BossCompletedTask相关调用替换为TawerCompletedTask, 以更好地区分不同的任务完成逻辑。 --- fix(item_use): 添加nil检查防止程序崩溃 在处理神经元道具时,增加对oldPet对象的nil检查, 如果为空则返回系统错误码,避免程序出现
This commit is contained in:
@@ -137,7 +137,7 @@ func (h Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, p *pla
|
||||
fight.NewFight(p, ai, func(foi info.FightOverInfo) {
|
||||
if taskID != 0 {
|
||||
if foi.Reason == 0 && foi.WinnerId == p.Info.UserID {
|
||||
p.BossCompletedTask(taskID, 1)
|
||||
p.SptCompletedTask(taskID, 1)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -188,20 +188,20 @@ func (h Controller) PetTawor(data *fight.StartTwarInboundInfo, c *player.Player)
|
||||
if foi.Reason == 0 && foi.WinnerId == c.Info.UserID { //我放获胜
|
||||
switch data.Head.CMD {
|
||||
case 2429: //试炼之塔
|
||||
c.BossCompletedTask(600, int(c.Info.CurrentFreshStage))
|
||||
c.TawerCompletedTask(600, int(c.Info.CurrentFreshStage))
|
||||
c.Info.CurrentFreshStage++
|
||||
if c.Info.CurrentFreshStage >= c.Info.MaxFreshStage {
|
||||
c.Info.MaxFreshStage = c.Info.CurrentFreshStage
|
||||
}
|
||||
|
||||
case 2415: //勇者之塔
|
||||
c.BossCompletedTask(500, int(c.Info.CurrentStage))
|
||||
c.TawerCompletedTask(500, int(c.Info.CurrentStage))
|
||||
c.Info.CurrentStage++
|
||||
if c.Info.CurrentStage >= c.Info.MaxStage {
|
||||
c.Info.MaxStage = c.Info.CurrentStage
|
||||
}
|
||||
case 2425:
|
||||
c.BossCompletedTask(110, int(c.CurDark))
|
||||
c.TawerCompletedTask(110, int(c.CurDark))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -79,6 +79,9 @@ func (h Controller) handleNeuronItem(currentPet *model.PetInfo, c *player.Player
|
||||
|
||||
originalCatchTime := currentPet.CatchTime
|
||||
oldPet := c.Service.Pet.PetInfo_One_Unscoped(currentPet.OldCatchTime)
|
||||
if oldPet == nil {
|
||||
return errorcode.ErrorCodes.ErrSystemError
|
||||
}
|
||||
|
||||
copier.CopyWithOption(currentPet, oldPet.Data, copier.Option{DeepCopy: true})
|
||||
currentPet.CatchTime = originalCatchTime
|
||||
|
||||
@@ -13,6 +13,14 @@ func (ctl Controller) GetBreedInfo(
|
||||
data *pet.C2S_GET_BREED_INFO, playerObj *player.Player) (result *pet.S2C_GET_BREED_INFO, err errorcode.ErrorCode) { //这个时候player应该是空的
|
||||
|
||||
result = &pet.S2C_GET_BREED_INFO{}
|
||||
result.BreedLeftTime = 5000
|
||||
result.HatchLeftTime = 5000
|
||||
result.HatchState = 1
|
||||
result.BreedState = 1
|
||||
result.EggID = 1
|
||||
result.Intimacy = 1
|
||||
result.FeMalePetID = 1
|
||||
result.MalePetID = 3
|
||||
// TODO: 实现获取繁殖信息的具体逻辑
|
||||
return result, 0
|
||||
|
||||
@@ -53,7 +61,10 @@ func (ctl Controller) GetEggList(
|
||||
result = &pet.S2C_GET_EGG_LIST{}
|
||||
// TODO: 实现获取精灵蛋列表的逻辑
|
||||
// 示例数据,实际应从玩家数据中获取
|
||||
result.EggList = append(result.EggList, pet.EggInfo{EggID: 1, OwnerID: 10001, EggCatchTime: 122123})
|
||||
result.EggList = append(result.EggList, pet.EggInfo{EggID: 1, OwnerID: 10001, EggCatchTime: 122123,
|
||||
MalePetID: 1,
|
||||
FeMalePetID: 3,
|
||||
})
|
||||
return result, 0
|
||||
|
||||
}
|
||||
@@ -92,4 +103,4 @@ func (ctl Controller) GetHatchPet(
|
||||
result.CatchTime = 0
|
||||
return result, 0
|
||||
|
||||
}
|
||||
}
|
||||
@@ -109,11 +109,11 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result
|
||||
|
||||
c.PetDel(data.Mcatchtime)
|
||||
_, ok2 := lo.Find(data.GoldItem1[:], func(item uint32) bool {
|
||||
return item == 300044
|
||||
return item == 300043
|
||||
})
|
||||
|
||||
if c.Service.Item.CheakItem(300044) > 0 && ok2 {
|
||||
c.Service.Item.UPDATE(300044, -1)
|
||||
if c.Service.Item.CheakItem(300043) > 0 && ok2 {
|
||||
c.Service.Item.UPDATE(300043, -1)
|
||||
} else {
|
||||
|
||||
c.PetDel(data.Auxcatchtime)
|
||||
|
||||
@@ -3,6 +3,7 @@ package controller
|
||||
import (
|
||||
"blazing/common/data/xmlres"
|
||||
"blazing/common/socket/errorcode"
|
||||
"blazing/cool"
|
||||
"blazing/logic/service/fight"
|
||||
"blazing/logic/service/pet"
|
||||
"blazing/logic/service/player"
|
||||
@@ -119,7 +120,10 @@ func (h Controller) TogglePetBagWarehouse(
|
||||
|
||||
index, pet, ok := player.FindPet(data.CatchTime)
|
||||
if ok {
|
||||
player.Service.Pet.UPdate(*pet)
|
||||
if cool.Config.ServerInfo.IsVip == 0 { //正式服才会真正放会精灵
|
||||
player.Service.Pet.UPdate(*pet)
|
||||
}
|
||||
|
||||
player.Info.PetList = append(player.Info.PetList[:index], player.Info.PetList[index+1:]...)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user