From ece4e287314b3302d14c17563fc27fd522c32268 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 1 Apr 2025 18:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/conf/order/orderCfg.go | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/server/conf/order/orderCfg.go b/src/server/conf/order/orderCfg.go
index f38d4a55..ea0e4b2b 100644
--- a/src/server/conf/order/orderCfg.go
+++ b/src/server/conf/order/orderCfg.go
@@ -67,18 +67,13 @@ func GetStartOrderByStep(id int) []*gamedata.StartOrderData {
 		return ret
 	}
 	for k, v := range data {
-		record := v.(map[string]interface{})
-		stepVal := gamedata.ParseInt(record["step"])
-		var MergeList []int
-		for _, vv := range record["merge_id_list"].([]interface{}) {
-			MergeList = append(MergeList, gamedata.ParseInt(vv))
-		}
+		stepVal := gamedata.GetIntValue(v, "step")
 		if int(stepVal) == id {
 			OrderId, _ := strconv.Atoi(k)
 			ret = append(ret, &gamedata.StartOrderData{
 				Id:        OrderId,
 				Step:      int(stepVal),
-				MergeList: MergeList,
+				MergeList: gamedata.GetIntSliceValue(v, "merge_id_list"),
 			})
 		}
 	}