From ed981184d344db448f0f50e164095e2701e80378 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Fri, 6 Mar 2026 10:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=8E=E7=BC=93=E5=86=B2?=
 =?UTF-8?q?=E5=8C=BA=E7=94=9F=E6=88=90=E7=9A=84=E5=9B=9E=E6=94=B6=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8D=8F=E8=AE=AE=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/mod/order/Order.go       | 8 ++++----
 src/server/game/register_network_func.go | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go
index 0b313c94..fe368138 100644
--- a/src/server/game/mod/order/Order.go
+++ b/src/server/game/mod/order/Order.go
@@ -563,20 +563,20 @@ func (o *OrderMod) CreateExtraOrder(AddChess, AddNewEmit, ChessList []int, Energ
 		}
 	}
 	b3 := false
-	//额外订单补充2；当玩家的棋盘中出现三个相同的满级产物时，立刻生成一个对应的收购订单；
+	//额外订单补充2；当玩家的棋盘中出现2个相同的满级产物时，立刻生成一个对应的收购订单；
 	for k := range MaxLvChess {
 		ChessNum := GoUtil.GetElemNum(ChessList, k)
-		if ChessNum >= 3 && Level >= 12 {
+		if ChessNum >= 2 && Level >= 12 {
 			b2 := true
 			for _, v := range o.OrderList {
-				if GoUtil.SliceEqual(v.MergeId, []int{k, k, k}) {
+				if GoUtil.SliceEqual(v.MergeId, []int{k, k}) {
 					b2 = false
 					break
 				}
 			}
 			if b2 {
 				b3 = true
-				o.addOrder([]int{k, k, k}, DIFF_LOW, Extra_type)
+				o.addOrder([]int{k, k}, DIFF_LOW, Extra_type)
 			}
 		}
 	}
diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go
index 6e523695..3d5fcef4 100644
--- a/src/server/game/register_network_func.go
+++ b/src/server/game/register_network_func.go
@@ -728,13 +728,13 @@ func ReqGetChessFromBuff(player *Player, buf []byte) error {
 		"chess_id": ChessId,
 	})
 	Update = OrderMod.CreateExtraOrder([]int{ChessId}, AddNewEmit, ChessMod.GetUnlockChessList(), BaseMod.GetEnergyMul(), BaseMod.GetLevel())
-	if Update {
-		player.PushClientRes(OrderMod.BackData())
-	}
 	triggerComposeChess(player, ChessId, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
 	player.EmitRetireTrigger1()
-	player.InitOrderItem()
 	player.PlayMod.save()
+	if Update {
+		player.InitOrderItem()
+		player.PushClientRes(OrderMod.BackData())
+	}
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResGetChessFromBuff{
 		Code: msg.RES_CODE_SUCCESS,