From 9bd9ca7fd8a4fbea7b9a0ad477cfa409f0779e75 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 26 Aug 2025 17:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/PlayerBaseMod.go       |  3 ++
 src/server/game/RegisterNetworkFunc.go | 12 ++---
 src/server/game/mod/order/Order.go     | 62 ++++++--------------------
 3 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/src/server/game/PlayerBaseMod.go b/src/server/game/PlayerBaseMod.go
index 80235d45..68795e8c 100644
--- a/src/server/game/PlayerBaseMod.go
+++ b/src/server/game/PlayerBaseMod.go
@@ -11,6 +11,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/limitedTimeEvent"
 	Msg "server/game/mod/msg"
+	"server/game/mod/order"
 	"server/game/mod/quest"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
@@ -526,6 +527,8 @@ func (p *PlayerBaseData) AddExp(player *Player, exp int, pexp int) (int, error)
 		ChargeMod := player.PlayMod.getChargeMod()
 		ChargeMod.TriggerChargeUnlock(int(BaseMod.Level), ChessMod.GetEmitList())
 		player.PushClientRes(ChargeMod.BackData())
+		OrderMod := player.PlayMod.getOrderMod()
+		OrderMod.TriggerOrder(BaseMod.Level, order.TRIGGER_TYPE_LV, ChessMod.GetOrderEmit(), player.PlayMod.getBaseMod().GetEnergyMul())
 		// 重载活动
 		player.initAcitivity()
 		player.BackDataActivity()
diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go
index 711fd72f..94a90454 100644
--- a/src/server/game/RegisterNetworkFunc.go
+++ b/src/server/game/RegisterNetworkFunc.go
@@ -337,12 +337,12 @@ func ReqRewardOrder(player *Player, buf []byte) error {
 	EnergyMul := player.PlayMod.getBaseMod().GetEnergyMul()
 	Emit := ChessMod.GetOrderEmit()
 	TriggerSeedSource(player)
-	NewOrder := TriggerSeedOrder(player)
-	if NewOrder == nil || len(NewOrder.MergeId) == 0 {
-		OrderMod.CreateOrder(Lv, Emit, EnergyMul)
-	} else {
-		OrderMod.CreateOrderSeed(NewOrder)
-	}
+	//NewOrder := TriggerSeedOrder(player)
+	// if NewOrder == nil || len(NewOrder.MergeId) == 0 {
+	// 	OrderMod.CreateOrder(Lv, Emit, EnergyMul)
+	// } else {
+	// 	OrderMod.CreateOrderSeed(NewOrder)
+	// }
 	OrderMod.TriggerOrder(Lv, order.TRIGGER_TYPE_ORDER, Emit, EnergyMul)
 	player.FormatOrderReward()
 	// 存钱罐增加钻石
diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go
index 5724bc43..f6fcf740 100644
--- a/src/server/game/mod/order/Order.go
+++ b/src/server/game/mod/order/Order.go
@@ -256,55 +256,21 @@ func (o *OrderMod) CreateOrder(lv int, Emit []int, EnergyMul int) error {
 	if len(Emit) == 0 {
 		return nil
 	}
-	switch o.LastOrder.Type {
-	case Preheat_type:
-		ChessId := o.LastOrder.MergeId[0]
-		ChessColor := mergeDataCfg.GetColorById(ChessId)
-		PreheatStep := o.PreheatStep[ChessColor]
-		if PreheatStep < 4 {
-			NewChessId := mergeDataCfg.GetChessIdByLvAndColor(EnergyMul+PreheatStep+1, ChessColor)
-			if NewChessId == 0 {
-				return fmt.Errorf("CreateOrder: NewChessId is 0, EnergyMul: %d, PreheatStep: %d, ChessColor: %s", EnergyMul, PreheatStep, ChessColor)
-			}
-			o.addOrder([]int{NewChessId}, DIFF_LOW, Preheat_type)
-			o.PreheatStep[ChessColor]++
+	/// 生成优先订单
+	if o.CreatePriorityOrder(lv, Emit) {
+		return nil
+	}
+	MaxOrderNum := orderCfg.GetOrderNum(lv)
+	n := 0
+	for _, v := range o.OrderList {
+		if v.Type == Common_type || v.Type == Clean_type || v.Type == Pet_type {
+			n++
 		}
-	default:
-		MaxStep := orderCfg.GetMaxStep()
-		if o.Step < MaxStep {
-			n := 0
-			for _, v := range o.OrderList {
-				if v.Type == Common_type {
-					n++
-				}
-			}
-			if n != 0 {
-				return nil
-			}
-			Cfg := orderCfg.GetStartOrderByStep(o.Step + 1)
-			o.Step++
-			for _, v := range Cfg {
-				o.addOrder(v.MergeList, DIFF_LOW, Common_type)
-			}
-			return nil
-		} else {
-			/// 生成优先订单
-			if o.CreatePriorityOrder(lv, Emit) {
-				return nil
-			}
-			MaxOrderNum := orderCfg.GetOrderNum(lv)
-			n := 0
-			for _, v := range o.OrderList {
-				if v.Type == Common_type || v.Type == Clean_type || v.Type == Pet_type {
-					n++
-				}
-			}
-			for i := n; i < MaxOrderNum; i++ {
-				err := o.CreateNormalOrder(lv, Emit, EnergyMul)
-				if err != nil {
-					return err
-				}
-			}
+	}
+	for i := n; i < MaxOrderNum; i++ {
+		err := o.CreateNormalOrder(lv, Emit, EnergyMul)
+		if err != nil {
+			return err
 		}
 	}
 	return nil