diff --git a/src/server/game/Gm.go b/src/server/game/Gm.go index 8209b31b..34c333a0 100644 --- a/src/server/game/Gm.go +++ b/src/server/game/Gm.go @@ -41,6 +41,9 @@ func ReqGmCommand_(player *Player, Command string) error { // log.Error("ReqGmCommand panic: %v", err) // } // }() + player.TeLog("gm", map[string]interface{}{ + "command": Command, + }) arg := strings.Split(Command, " ") switch arg[0] { case "additem": diff --git a/src/server/game/Type.go b/src/server/game/Type.go index 3c149874..61624d54 100644 --- a/src/server/game/Type.go +++ b/src/server/game/Type.go @@ -64,4 +64,5 @@ func init() { gob.Register(&limitedTimeEvent.MoneyCat{}) gob.Register(&limitedTimeEvent.LuckyCat{}) gob.Register(&msg.HandbookMsg{}) + gob.Register(&limitedTimeEvent.CatTrick{}) } diff --git a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go b/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go index c364e14d..b413651b 100644 --- a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go +++ b/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go @@ -155,7 +155,7 @@ func (l *LimitedTimeEventMod) Trigger(Lv int) (int, []int, []int) { func (l *LimitedTimeEventMod) AddEvent(EventId, Duration int) int64 { if v, ok := l.EventList[EventId]; ok { v.Remian += int64(Duration) - addEventInfo(v, EventId) + addEventInfo(v, EventId, Duration) } else { Event := <EInfo{ Remian: int64(Duration), @@ -455,13 +455,13 @@ func initEventInfo(E *LTEInfo, EventType int) { } } -func addEventInfo(E *LTEInfo, EventType int) { +func addEventInfo(E *LTEInfo, EventType, Duration int) { switch EventType { case EVENT_TYPE_CAT_TRICK: d := E.D.(*CatTrick) d.List = append(d.List, CatTrickInfo{ Id: len(d.List) + 1, - Type: limitedTimeEventCfg.GetCatTrickType(int(E.Remian)), + Type: limitedTimeEventCfg.GetCatTrickType(Duration), }) case EVENT_TYPE_PAYBACK_DAY: d := E.D.(*PaybackDay)