pet_home/pet_home_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitea.bywaystudios.com:pet_home/pet_home_server into develop

Browse Source
This commit is contained in:
hahwu 2026-02-26 11:29:31 +08:00
commit abeabab66b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/game/game_type.go
View File

@ -120,6 +120,7 @@ func init() {
gob.Register(&limitedTimeEvent.LuckyCat{}) gob.Register(&limitedTimeEvent.LuckyCat{})
gob.Register(&msg.HandbookMsg{}) gob.Register(&msg.HandbookMsg{})
gob.Register(&limitedTimeEvent.CatTrick{}) gob.Register(&limitedTimeEvent.CatTrick{})
gob.Register(&limitedTimeEvent.PaybackDay{})
gob.Register(&VarOpration{}) gob.Register(&VarOpration{})
gob.Register(&VarUserData{}) gob.Register(&VarUserData{})
gob.Register(&ActivityInfo{}) gob.Register(&ActivityInfo{})

1
src/server/game/gm_handler.go
View File

@ -599,6 +599,7 @@ func ReqGmCommand_(player *Player, Command string) error {
case "debugMsg": case "debugMsg":
NotifyFriendApply(100001, 100002) NotifyFriendApply(100001, 100002)
NotifyPetroomGame(100002) NotifyPetroomGame(100002)
SetPetroomGameNotification(100002, 1)
default: default:
return fmt.Errorf("Player %d ReqGmCommand:%v not found", player.M_DwUin, arg) return fmt.Errorf("Player %d ReqGmCommand:%v not found", player.M_DwUin, arg)
} }

8
src/server/game/mod/limited_time_event/limited_time_event.go
View File

@ -82,7 +82,7 @@ type CatTrickInfo struct {
} }
type PaybackDay struct { type PaybackDay struct {
count int Count int
} }
func (l *LimitedTimeEventMod) InitData(Lv int) { func (l *LimitedTimeEventMod) InitData(Lv int) {
@ -452,7 +452,7 @@ func initEventInfo(E *LTEInfo, EventType int) {
} }
case EVENT_TYPE_PAYBACK_DAY: case EVENT_TYPE_PAYBACK_DAY:
E.D = &PaybackDay{ E.D = &PaybackDay{
count: limitedTimeEventCfg.GetPaybackDay(), Count: limitedTimeEventCfg.GetPaybackDay(),
} }
case EVENT_TYPE_CAT_TRICK: case EVENT_TYPE_CAT_TRICK:
Type := limitedTimeEventCfg.GetCatTrickType(int(E.Remian)) Type := limitedTimeEventCfg.GetCatTrickType(int(E.Remian))
@ -481,7 +481,7 @@ func addEventInfo(E *LTEInfo, EventType, Duration int) {
d.MaxEarings += MaxEarning d.MaxEarings += MaxEarning
case EVENT_TYPE_PAYBACK_DAY: case EVENT_TYPE_PAYBACK_DAY:
d := E.D.(*PaybackDay) 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: case EVENT_TYPE_PAYBACK_DAY:
d := e.D.(*PaybackDay) 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{ return &msg.LimitEvent{
EndTime: EndTime, EndTime: EndTime,