From 9317aea2e3114055169e8f116b5ab36b131b1211 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 10 Sep 2025 19:08:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/PlayerFunc.go | 41 ++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go
index e07269ed..be51738c 100644
--- a/src/server/game/PlayerFunc.go
+++ b/src/server/game/PlayerFunc.go
@@ -1007,27 +1007,28 @@ func (player *Player) FormatOrderReward() {
 			})
 			OrderMod.OrderList[k] = v
 		}
-		return
-	}
-	for k, v := range OrderMod.GetOrderList() {
-		if len(v.Items) != 0 {
-			continue
-		}
-		if v.Type != order.Common_type {
-			continue
-		}
-		Items := make([]*item.Item, 0)
-		Star := order.GetOrderStar(v.MergeId)
-		Star = int(float64(Star)*float64(OrderFactor)/10) * 10
-		Items = player.GetPetOrderReward(Star, Items)
-		if len(Items) == 1 && Items[0].Id == item.ITEM_STAR_ID {
-			v.Type = order.Common_type
-		} else {
-			v.Type = order.Pet_type
-		}
-		v.Items = Items
-		OrderMod.OrderList[k] = v
+	} else {
+		for k, v := range OrderMod.GetOrderList() {
+			if len(v.Items) != 0 {
+				continue
+			}
+			if v.Type != order.Common_type {
+				continue
+			}
+			Items := make([]*item.Item, 0)
+			Star := order.GetOrderStar(v.MergeId)
+			Star = int(float64(Star)*float64(OrderFactor)/10) * 10
+			Items = player.GetPetOrderReward(Star, Items)
+			if len(Items) == 1 && Items[0].Id == item.ITEM_STAR_ID {
+				v.Type = order.Common_type
+			} else {
+				v.Type = order.Pet_type
+			}
+			v.Items = Items
+			OrderMod.OrderList[k] = v
+		}
 	}
+
 	// 触发式订单 满足条件生成零件订单
 	PartCost := DecorateMod.GetPartCost()
 	PartBag := ChessMod.GetPartBag()