From a7ac6342970ead61149e589413721af76831899c Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 19 Mar 2025 14:16:31 +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/game/mod/order/Order.go     |  4 ++--
 src/server/game/mod/order/OrderFunc.go | 12 ++++++------
 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 a6a1737c..83189b84 100644
--- a/src/server/game/mod/order/Order.go
+++ b/src/server/game/mod/order/Order.go
@@ -78,7 +78,7 @@ func (o *OrderMod) InitData() {
 		}
 	}
 	for k, v := range o.OrderList {
-		if GoUtil.InArray(0, v.MergeId) {
+		if GoUtil.InArray(0, v.MergeId) || len(v.MergeId) == 0 {
 			delete(o.OrderList, k)
 		}
 	}
@@ -116,7 +116,7 @@ func (o *OrderMod) CreateOrderSeed(Order *Order) error {
 			break
 		}
 	}
-	o.addOrder(Order.MergeId, Order.Diff, Common_type)
+	o.addOrder(Order.MergeId, DIFF_LOW, Common_type)
 	return nil
 }
 
diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go
index 5da5f7a4..c028e1a2 100644
--- a/src/server/game/mod/order/OrderFunc.go
+++ b/src/server/game/mod/order/OrderFunc.go
@@ -22,12 +22,6 @@ func getChessNumRand(OrderN int) map[int]int {
 func getOrderDiffRand(Diff, OrderN int) map[int]int {
 	var d map[int]int
 	switch Diff {
-	case DIFF_LOW:
-		d = map[int]int{
-			DIFF_LOW:  int(10 - OrderN),
-			DIFF_MID:  int(30),
-			DIFF_HIGH: int(60 + OrderN),
-		}
 	case DIFF_MID:
 		d = map[int]int{
 			DIFF_LOW:  int(21 - 3*OrderN),
@@ -40,6 +34,12 @@ func getOrderDiffRand(Diff, OrderN int) map[int]int {
 			DIFF_MID:  int(30 + 3*float64(OrderN)),
 			DIFF_HIGH: int(10 + 2*float64(OrderN)),
 		}
+	default:
+		d = map[int]int{
+			DIFF_LOW:  int(10 - OrderN),
+			DIFF_MID:  int(30),
+			DIFF_HIGH: int(60 + OrderN),
+		}
 	}
 	return d
 }