订单优化

src/server/game/PlayerFunc.go

@@ -888,7 +888,7 @@ func EmitRetireTrigger2(p *Player) {
 		}
 
 		NeedFinishOrder := false
-		Produce := mergeDataCfg.GetEmitProduce(k)
+		Produce := mergeDataCfg.GetEmitOrderProduce(k)
 		for _, v1 := range Produce {
 			if _, ok := AllChess[v1]; ok {
 				NeedFinishOrder = true

src/server/game/RegisterNetworkFunc.go

@@ -374,8 +374,18 @@ func ReqRewardOrder(player *Player, buf []byte) error {
 
 	// 锦标赛增加积分
 	if player.GetPlayerBaseMod().GetLevel() >= 17 {
+		ChessList := make([]int, 0)
+		for _, v := range mergeList {
+			color := mergeDataCfg.GetColorById(v)
+			Emit := order.GetEmitByColor(ChessMod.GetStarEmitList(), color)
+			EmitType := mergeDataCfg.GetEmitType(Emit)
+			if EmitType == "auto" {
+				continue
+			}
+			ChessList = append(ChessList, v)
+		}
 		ChampshipMod := player.PlayMod.getChampshipMod()
-		ChampshipMod.AddScore(mergeList)
+		ChampshipMod.AddScore(ChessList)
 		player.HandleInChampshipRank()
 	}
 	FriendTreasureMod := player.PlayMod.getFriendTreasureMod()

src/server/game/mod/chess/Chess.go

@@ -410,7 +410,7 @@ func (cb *ChessBorad) BackData() *msg.ResPlayerChessInfo {
 	}
 	Re := make([]string, 0)
 	for k, v := range cb.Retire {
-		if v == 3 {
+		if v == EMIT_RETIRE_END {
 			Re = append(Re, k)
 		}
 	}
@@ -578,7 +578,7 @@ func (cb *ChessBorad) RetireOrder(EmitType string) error {
 		return errors.New("chess has not been retired")
 	}
 	chess := make([]int, 0)
-	EmitProduct := mergeDataCfg.GetEmitProduce(EmitType)
+	EmitProduct := mergeDataCfg.GetEmitOrderProduce(EmitType)
 	for k, v := range cb.ChessMap {
 		arr := strings.Split(k, "@")
 		Color := mergeDataCfg.GetColorById(int(v))

src/server/game/mod/order/Order.go

@@ -694,7 +694,7 @@ func (o *OrderMod) ChangeEnergyMul(lv int, Emit []int, EnergyMul int, ChessList
 
 func (o *OrderMod) Retire(EmitId string) {
 	ChessPool := make([]int, 0)
-	Product := mergeDataCfg.GetEmitProduce(EmitId)
+	Product := mergeDataCfg.GetEmitOrderProduce(EmitId)
 	for _, v := range o.ChessPool {
 		Color := mergeDataCfg.GetColorById(v)
 		if GoUtil.InStringArray(Color, Product) {