From a5866339b49e2e581981e51f9e55d9dff6cb89ce Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 8 May 2025 14:18:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0GM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/Gm.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/server/game/Gm.go b/src/server/game/Gm.go
index 684ab61d..4011f53e 100644
--- a/src/server/game/Gm.go
+++ b/src/server/game/Gm.go
@@ -416,6 +416,18 @@ func ReqGmCommand_(player *Player, Command string) error {
 		BaseMod.NickName = player.PlayMod.getBaseMod().NickName
 		BaseMod.LoginTime = GoUtil.Now()
 		player.PlayMod.mod_list = p1.PlayMod.mod_list
+	case "orderMerge": // 获取order订单的mergeId
+		OrderMod := player.PlayMod.getOrderMod()
+		items := make([]*item.Item, 0)
+		for _, v := range OrderMod.OrderList {
+			for _, j := range v.MergeId {
+				items = append(items, &item.Item{
+					Id:  j,
+					Num: 1,
+				})
+			}
+		}
+		player.HandleItem(items, msg.ITEM_POP_LABEL_GM.String())
 
 	default:
 		return fmt.Errorf("Player %d ReqGmCommand:%v not found", player.M_DwUin, arg)