diff --git a/logic/controller/task.go b/logic/controller/task.go index e8c8f089a..2a855d6cb 100644 --- a/logic/controller/task.go +++ b/logic/controller/task.go @@ -489,7 +489,7 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player. // 每日任务之毛毛 case 401: result.ItemList = append(result.ItemList, - task.ItemInfo{ItemId: 3, ItemCount: 2000}, // 积累经验x2000 + task.ItemInfo{ItemId: 3, ItemCount: 20000}, // 积累经验x2000 ) // 每日任务之小火猴 @@ -513,19 +513,19 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player. // 每日任务之比比鼠 case 405: result.ItemList = append(result.ItemList, - task.ItemInfo{ItemId: 3, ItemCount: 2000}, // 积累经验x2000 + task.ItemInfo{ItemId: 3, ItemCount: 20000}, // 积累经验x2000 ) // 每日任务之幽浮 case 406: result.ItemList = append(result.ItemList, - task.ItemInfo{ItemId: 3, ItemCount: 2000}, // 积累经验x2000 + task.ItemInfo{ItemId: 3, ItemCount: 20000}, // 积累经验x2000 ) // 每日任务之利牙鱼 case 407: result.ItemList = append(result.ItemList, - task.ItemInfo{ItemId: 3, ItemCount: 2000}, // 积累经验x2000 + task.ItemInfo{ItemId: 3, ItemCount: 20000}, // 积累经验x2000 ) // 每日任务之谱尼扭蛋牌 diff --git a/logic/logic1 b/logic/logic1 index 2467f3ee4..bc2593c67 100644 Binary files a/logic/logic1 and b/logic/logic1 differ diff --git a/logic/service/fight/info/info.go b/logic/service/fight/info/info.go index efed5b28d..295db9474 100644 --- a/logic/service/fight/info/info.go +++ b/logic/service/fight/info/info.go @@ -265,13 +265,13 @@ type FightOverInfo struct { // 3=isDraw 双方平手 // 4=isSysError 系统错误 // 5=isNpcEscape 精灵主动逃跑 - Reason uint32 // 固定值0 - WinnerId uint32 // 胜者的米米号 野怪为0 - TwoTimes uint32 // 双倍经验剩余次数 - ThreeTimes uint32 // 三倍经验剩余次数 - AutoFightTimes uint32 // 自动战斗剩余次数 - EnergyTimes uint32 // 能量吸收器剩余次数 - LearnTimes uint32 // 双倍学习器剩余次数 + Reason EnumBattleOverReason // 固定值0 + WinnerId uint32 // 胜者的米米号 野怪为0 + TwoTimes uint32 // 双倍经验剩余次数 + ThreeTimes uint32 // 三倍经验剩余次数 + AutoFightTimes uint32 // 自动战斗剩余次数 + EnergyTimes uint32 // 能量吸收器剩余次数 + LearnTimes uint32 // 双倍学习器剩余次数 } type CatchMonsterOutboundInfo struct { diff --git a/logic/service/fight/playeraction.go b/logic/service/fight/playeraction.go index 6385c5040..7e910e831 100644 --- a/logic/service/fight/playeraction.go +++ b/logic/service/fight/playeraction.go @@ -33,7 +33,7 @@ func (f *FightC) Over(c common.PlayerI, res info.EnumBattleOverReason) { BaseAction: action.NewBaseAction(c.GetInfo().UserID), Reason: info.FightOverInfo{ - Reason: uint32(info.BattleOverReason.PlayerEscape), + Reason: res, }, } if c.GetInfo().UserID == f.ownerID {