Merge branch 'develop' of gitea.bywaystudios.com:pet_home/pet_home_server into develop
This commit is contained in:
commit
abeabab66b
@ -120,6 +120,7 @@ func init() {
|
||||
gob.Register(&limitedTimeEvent.LuckyCat{})
|
||||
gob.Register(&msg.HandbookMsg{})
|
||||
gob.Register(&limitedTimeEvent.CatTrick{})
|
||||
gob.Register(&limitedTimeEvent.PaybackDay{})
|
||||
gob.Register(&VarOpration{})
|
||||
gob.Register(&VarUserData{})
|
||||
gob.Register(&ActivityInfo{})
|
||||
|
||||
@ -599,6 +599,7 @@ func ReqGmCommand_(player *Player, Command string) error {
|
||||
case "debugMsg":
|
||||
NotifyFriendApply(100001, 100002)
|
||||
NotifyPetroomGame(100002)
|
||||
SetPetroomGameNotification(100002, 1)
|
||||
default:
|
||||
return fmt.Errorf("Player %d ReqGmCommand:%v not found", player.M_DwUin, arg)
|
||||
}
|
||||
|
||||
@ -82,7 +82,7 @@ type CatTrickInfo struct {
|
||||
}
|
||||
|
||||
type PaybackDay struct {
|
||||
count int
|
||||
Count int
|
||||
}
|
||||
|
||||
func (l *LimitedTimeEventMod) InitData(Lv int) {
|
||||
@ -452,7 +452,7 @@ func initEventInfo(E *LTEInfo, EventType int) {
|
||||
}
|
||||
case EVENT_TYPE_PAYBACK_DAY:
|
||||
E.D = &PaybackDay{
|
||||
count: limitedTimeEventCfg.GetPaybackDay(),
|
||||
Count: limitedTimeEventCfg.GetPaybackDay(),
|
||||
}
|
||||
case EVENT_TYPE_CAT_TRICK:
|
||||
Type := limitedTimeEventCfg.GetCatTrickType(int(E.Remian))
|
||||
@ -481,7 +481,7 @@ func addEventInfo(E *LTEInfo, EventType, Duration int) {
|
||||
d.MaxEarings += MaxEarning
|
||||
case EVENT_TYPE_PAYBACK_DAY:
|
||||
d := E.D.(*PaybackDay)
|
||||
d.count += limitedTimeEventCfg.GetPaybackDay()
|
||||
d.Count += limitedTimeEventCfg.GetPaybackDay()
|
||||
}
|
||||
}
|
||||
|
||||
@ -515,7 +515,7 @@ func getLimitEventMsg(t int, e *LTEInfo) *msg.LimitEvent {
|
||||
}
|
||||
case EVENT_TYPE_PAYBACK_DAY:
|
||||
d := e.D.(*PaybackDay)
|
||||
Param[msg.LimitEventParam_PAYBACK_DAY_COUNT.String()] = int32(d.count)
|
||||
Param[msg.LimitEventParam_PAYBACK_DAY_COUNT.String()] = int32(d.Count)
|
||||
}
|
||||
return &msg.LimitEvent{
|
||||
EndTime: EndTime,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user