From 9e32a07bdabbb0d4ef6590f28a92641d28cb54cd Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Mon, 17 Mar 2025 12:19:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B0=84=E5=99=A8=E9=80=80=E5=BD=B9bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/UnitTest.go | 11 ++++++----- src/server/game/mod/chess/Chess.go | 14 ++++++++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/server/game/UnitTest.go b/src/server/game/UnitTest.go index 477e3cd2..7478f49d 100644 --- a/src/server/game/UnitTest.go +++ b/src/server/game/UnitTest.go @@ -196,15 +196,16 @@ func UnitOrder2(p *Player, Lv, EnergyMul int) float64 { return Energy / float64(5000) } -func UnitOrder3(player *Player) error { - triggerComposeChess(player, 15, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList()) +func UnitChess1(p *Player) error { + ChessMod := p.PlayMod.getChessMod() + p.PushClientRes(ChessMod.BackData()) + EmitRetireTrigger1(p) return nil } func UnitPlayroom(p *Player) error { PlayroomMod := p.PlayMod.getPlayroomMod() - PlayroomMod.Physiology[1].Num = 10 - PlayroomMod.Physiology[1].Time = 1738978968 - LimitedTimePlayroomTrigger(p) + PlayroomMod.UnLock(15) + PlayroomBackData(p) return nil } diff --git a/src/server/game/mod/chess/Chess.go b/src/server/game/mod/chess/Chess.go index 58c438f1..0d977e31 100644 --- a/src/server/game/mod/chess/Chess.go +++ b/src/server/game/mod/chess/Chess.go @@ -29,6 +29,12 @@ const ( CHESS_UPGRADE = 708 // 升级器 ) +const ( + EMIT_RETIRE_START = 1 + EMIT_RETIRE_ING = 2 + EMIT_RETIRE_END = 3 +) + type ChessBorad struct { ChessList []int EmitList map[int]int @@ -254,7 +260,7 @@ func (cb *ChessBorad) GetEmitList() []int { if EmitID == "" { continue } - if cb.Retire[EmitID] == 2 { + if cb.Retire[EmitID] == EMIT_RETIRE_END { continue } EmitType := mergeDataCfg.GetEmitType(k) @@ -473,7 +479,7 @@ func (cb *ChessBorad) BeginRetire(EmitType string) error { if ok { return errors.New("chess has been retired") } - cb.Retire[EmitType] = 1 + cb.Retire[EmitType] = EMIT_RETIRE_START return nil } @@ -493,7 +499,7 @@ func (cb *ChessBorad) RetireOrder(EmitType string) error { sort.Sort(sort.Reverse(sort.IntSlice(chess))) cb.RetireChessMap[EmitType] = chess - cb.Retire[EmitType] = 2 + cb.Retire[EmitType] = EMIT_RETIRE_ING return nil } @@ -502,7 +508,7 @@ func (cb *ChessBorad) FinishRetire(EmitType string) error { if !ok { return errors.New("chess has not been retired") } - cb.Retire[EmitType] = 3 + cb.Retire[EmitType] = EMIT_RETIRE_END return nil }