根据提供的code differences信息,由于没有具体的代码变更内容,我将生成一个通用的commit message模板:
``` docs(changelog): 更新版本更新日志 - 添加新功能说明 - 修复已知问题记录 - 更新相关文档内容 ```
This commit is contained in:
@@ -21,7 +21,7 @@ func (h Controller) EggGamePlay(data1 *egg.C2S_EGG_GAME_PLAY, c *player.Player)
|
||||
data1.EggNum = 10
|
||||
}
|
||||
r := c.Service.Item.CheakItem(400501)
|
||||
if r < data1.EggNum {
|
||||
if r < uint32(data1.EggNum) {
|
||||
return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrSystemError)
|
||||
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ func processMonID(bm string) string {
|
||||
// 返回: 战斗结果和错误码
|
||||
func (h Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, p *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
if !p.CanFight() {
|
||||
return nil, errorcode.ErrorCodes.ErrSystemError
|
||||
return nil, errorcode.ErrorCodes.ErrPokemonNoStamina
|
||||
}
|
||||
var monster *model.PetInfo
|
||||
monsterInfo := &model.PlayerInfo{}
|
||||
@@ -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, 100)
|
||||
p.BossCompletedTask(taskID, 1)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -188,7 +188,7 @@ 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.CurrentStage))
|
||||
c.BossCompletedTask(600, int(c.Info.CurrentFreshStage))
|
||||
c.Info.CurrentFreshStage++
|
||||
if c.Info.CurrentFreshStage >= c.Info.MaxFreshStage {
|
||||
c.Info.MaxFreshStage = c.Info.CurrentFreshStage
|
||||
@@ -201,7 +201,7 @@ func (h Controller) PetTawor(data *fight.StartTwarInboundInfo, c *player.Player)
|
||||
c.Info.MaxStage = c.Info.CurrentStage
|
||||
}
|
||||
case 2425:
|
||||
c.BossCompletedTask(110, int(c.Info.CurrentStage))
|
||||
c.BossCompletedTask(110, int(c.CurDark))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ func (h Controller) UsePetItemOutOfFight(data *item.C2S_USE_PET_ITEM_OUT_OF_FIGH
|
||||
return nil, errorcode.ErrorCodes.Err10401
|
||||
}
|
||||
|
||||
if c.Service.Item.CheakItem(data.ItemID) == 0 {
|
||||
if c.Service.Item.CheakItem(uint32(data.ItemID)) == 0 {
|
||||
return nil, errorcode.ErrorCodes.ErrSystemError
|
||||
}
|
||||
|
||||
@@ -57,13 +57,13 @@ func (h Controller) UsePetItemOutOfFight(data *item.C2S_USE_PET_ITEM_OUT_OF_FIGH
|
||||
if data.ItemID == ItemNeuronID {
|
||||
errcode = h.handleNeuronItem(currentPet, c)
|
||||
} else {
|
||||
errcode = h.handleRegularPetItem(data.ItemID, currentPet)
|
||||
errcode = h.handleRegularPetItem(uint32(data.ItemID), currentPet)
|
||||
}
|
||||
if errcode != 0 {
|
||||
return nil, errcode
|
||||
}
|
||||
|
||||
c.Service.Item.UPDATE(data.ItemID, -1)
|
||||
c.Service.Item.UPDATE(uint32(data.ItemID), -1)
|
||||
result = &item.S2C_USE_PET_ITEM_OUT_OF_FIGHT{}
|
||||
currentPet.CalculatePetPane(false)
|
||||
copier.Copy(&result, currentPet)
|
||||
|
||||
@@ -2,6 +2,7 @@ package controller
|
||||
|
||||
import (
|
||||
"blazing/common/socket/errorcode"
|
||||
"blazing/cool"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
@@ -19,7 +20,10 @@ func (h Controller) EnterMap(data *space.InInfo, c *player.Player) (result *info
|
||||
|
||||
c.Info.MapID = data.MapId //登录地图
|
||||
c.GetSpace().User.Store(c.Info.UserID, c) //添加玩家
|
||||
println("进入地图", c.Info.UserID, c.Info.MapID)
|
||||
|
||||
if cool.Config.ServerInfo.IsDebug != 0 {
|
||||
println("进入地图", c.Info.UserID, c.Info.MapID)
|
||||
}
|
||||
result = info.NewOutInfo()
|
||||
c.Info.Pos = data.Point
|
||||
copier.CopyWithOption(result, c.Info, copier.Option{DeepCopy: true})
|
||||
|
||||
@@ -109,10 +109,10 @@ 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 == 300043
|
||||
return item == 300044
|
||||
})
|
||||
|
||||
if c.Service.Item.CheakItem(300043) > 0 && ok2 {
|
||||
if c.Service.Item.CheakItem(300044) > 0 && ok2 {
|
||||
c.Service.Item.UPDATE(300044, -1)
|
||||
} else {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user