diff --git a/src/server/game/ActivityFunc.go b/src/server/game/ActivityFunc.go index 09e83dff..dbec0da8 100644 --- a/src/server/game/ActivityFunc.go +++ b/src/server/game/ActivityFunc.go @@ -55,7 +55,7 @@ func ActivityLogin(p *Player) { } // 赛跑 - ActivityId = GetActivityId(p, ACT_TYPE_GUESS_COLOR) + ActivityId = GetActivityId(p, ACT_TYPE_RACE) RaceMod := p.PlayMod.getRaceMod() OldId = RaceMod.Login(ActivityId) if OldId != 0 { @@ -84,6 +84,11 @@ func ActivityZeroUpdate(p *Player) { GuessColorMod := p.PlayMod.getGuessColorMod() GuessColorMod.ZeroUpdate(ActivityInfo.Id) } + ActivityInfo = GetActivityInfo(p, ACT_TYPE_RACE) + if ActivityInfo != nil { + RaceMod := p.PlayMod.getRaceMod() + RaceMod.ZeroUpdate(ActivityInfo.Id) + } } func GetActivityInfo(p *Player, actType int) *ActivityInfo { diff --git a/src/server/game/Gm.go b/src/server/game/Gm.go index 2c4b5ba4..b709ecf6 100644 --- a/src/server/game/Gm.go +++ b/src/server/game/Gm.go @@ -227,6 +227,11 @@ func ReqGmCommand_(player *Player, Command string) error { RaceMod.ZeroUpdate(-1) ActivityInfo := GetActivityInfo(player, ACT_TYPE_RACE) RaceMod.ZeroUpdate(ActivityInfo.Id) + RaceBackData(player) + case "raceAdd": + RaceMod := player.PlayMod.getRaceMod() + RaceMod.AddCoin(100) + RaceBackData(player) case "playroomTrigger": PlayroomOrderTrigger(player) case "playroomReset": diff --git a/src/server/game/mod/race/race.go b/src/server/game/mod/race/race.go index 4eea17a4..6939b74c 100644 --- a/src/server/game/mod/race/race.go +++ b/src/server/game/mod/race/race.go @@ -90,7 +90,7 @@ func (r *RaceMod) GetReward() ([]*item.Item, error) { Items = append(Items, ExtraReward...) } r.Pass++ - r.Progress -= Need + r.Progress = 0 MaxPass := raceCfg.GetMaxPass(r.Id) if r.Pass > MaxPass { r.Pass = 1