From b26297c864e0543a1b9b9b895d03c6c6c18824ea Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 11 Mar 2026 15:12:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8F=91=E5=B0=84=E5=99=A8?=
 =?UTF-8?q?=E5=9C=A8=E8=83=8C=E5=8C=85=E7=94=9F=E6=88=90=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=A5=96=E5=8A=B1=E7=9A=84bug;2.=E4=BF=AE=E5=A4=8D=E5=9B=9E?=
 =?UTF-8?q?=E6=94=B6=E8=AE=A2=E5=8D=95=E9=80=80=E5=BD=B9=E5=8F=91=E5=B0=84?=
 =?UTF-8?q?=E5=99=A8=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/mod/chess/Chess.go | 17 +++++++++++++++--
 src/server/test/order_test.go      | 14 ++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/server/game/mod/chess/Chess.go b/src/server/game/mod/chess/Chess.go
index 3c42a208..9a8e2958 100644
--- a/src/server/game/mod/chess/Chess.go
+++ b/src/server/game/mod/chess/Chess.go
@@ -300,6 +300,19 @@ func (cb *ChessBorad) emitListToSlice(retireFilter bool) []int {
 		}
 		EM[EmitID] = max(EM[EmitID], k)
 	}
+	for _, v := range cb.ChessBag.List {
+		EmitID := mergeDataCfg.GetEmitId(v.ChessId)
+		if EmitID == "" {
+			continue
+		}
+		if retireFilter && cb.Retire[EmitID] >= EMIT_RETIRE_START {
+			continue
+		}
+		if mergeDataCfg.GetEmitType(v.ChessId) == "sub" {
+			continue
+		}
+		EM[EmitID] = max(EM[EmitID], (v.ChessId))
+	}
 	result := make([]int, 0, len(EM))
 	for _, v := range EM {
 		result = append(result, v)
@@ -729,8 +742,8 @@ func (cb *ChessBorad) GetRetireReward(Id string) ([]*item.Item, error) {
 func (cb *ChessBorad) GetRetireProduceColor() []string {
 	color := make([]string, 0, len(cb.Retire))
 	for k, v := range cb.Retire {
-		if v == EMIT_RETIRE_ING {
-			color = append(color, mergeDataCfg.GetEmitTypeByColor(k))
+		if v >= EMIT_RETIRE_ING {
+			color = append(color, mergeDataCfg.GetEmitProduce(k)...)
 		}
 	}
 	return color
diff --git a/src/server/test/order_test.go b/src/server/test/order_test.go
index a6941e28..f55be88d 100644
--- a/src/server/test/order_test.go
+++ b/src/server/test/order_test.go
@@ -52,3 +52,17 @@ func TestInitOrderItem(t *testing.T) {
 	p1.InitOrderItem()
 	fmt.Printf("order item:%v", OrderMod.OrderList[1].Items)
 }
+
+func TestHighOrder(t *testing.T) {
+	p1 := new(game.Player)
+	p1.InitPlayer("3625212")
+	OrderMod := p1.GetOrderMod()
+	OrderMod.OrderList = make(map[int]order.Order)
+	OrderMod.OrderList[1] = order.Order{
+		MergeId: []int{1346},
+	}
+	p1.AddHighOrder()
+	p1.AddHighOrder2()
+	p1.InitOrderItem()
+	fmt.Printf("order item:%v", OrderMod.OrderList[1].Items)
+}