From 3b9eba9a4874350396a39567fad85a1088bcd2e1 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 23 Sep 2025 10:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E8=A3=85=E9=A5=B0=E5=93=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=AE=8C=E6=88=90=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=91=E5=B0=84=E5=99=A8=E4=BA=A7=E7=89=A9?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BA=B3=E5=85=A5=E8=87=AA=E5=8A=A8=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/GoUtil/sliceUtil.go     | 11 +++++++++++
 src/server/game/mod/order/Order.go |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/src/server/GoUtil/sliceUtil.go b/src/server/GoUtil/sliceUtil.go
index a84132aa..194db286 100644
--- a/src/server/GoUtil/sliceUtil.go
+++ b/src/server/GoUtil/sliceUtil.go
@@ -160,6 +160,17 @@ func PopElemSlice(s []int, Id int) ([]int, bool) {
 	return s, false
 }
 
+func PopStringElemSlice(s0 []string, Id string) ([]string, bool) {
+	s := make([]string, len(s0))
+	copy(s, s0)
+	for k, v := range s {
+		if v == Id {
+			return append(s[0:k], s[k+1:]...), true
+		}
+	}
+	return s, false
+}
+
 func ElemInSlice(s []int, Id int) bool {
 	for _, v := range s {
 		if v == Id {
diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go
index 5581041a..67e274ec 100644
--- a/src/server/game/mod/order/Order.go
+++ b/src/server/game/mod/order/Order.go
@@ -124,6 +124,12 @@ func (o *OrderMod) RewardOrder(id int) ([]*item.Item, []int, int, int, error) {
 			return nil, v.MergeId, v.Type, 0, nil
 		}
 		if v.Type == Fixed_type || v.Type == Playroom_type {
+			if id == 78 {
+				o.AutoEmit, _ = GoUtil.PopStringElemSlice(o.AutoEmit, "D")
+			}
+			if id == 79 {
+				o.AutoEmit, _ = GoUtil.PopStringElemSlice(o.AutoEmit, "I")
+			}
 			o.FinishOrder = append(o.FinishOrder, id)
 		}
 		return ItemList, v.MergeId, v.Type, Star, nil