From 90734285f2ad08bbd600297ed8f2ada995ec98e8 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Sat, 18 Jan 2025 17:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/LimitedTimeTrigger.go  | 2 +-
 src/server/game/Player.go              | 4 ++--
 src/server/game/PlayerChessMod.go      | 2 +-
 src/server/game/RegisterNetworkFunc.go | 4 ++--
 src/server/game/mod/chess/Chess.go     | 4 ++++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/server/game/LimitedTimeTrigger.go b/src/server/game/LimitedTimeTrigger.go
index 1ee3e8fa..cea0d9f8 100644
--- a/src/server/game/LimitedTimeTrigger.go
+++ b/src/server/game/LimitedTimeTrigger.go
@@ -45,7 +45,7 @@ func LimitedTimeEventTrigger(p *Player, AddEventId int) {
 			OrderMod := p.PlayMod.getOrderMod()
 			Lv := p.GetPlayerBaseMod().GetLevel()
 			Emit := p.PlayMod.getChessMod().GetOrderEmit()
-			ChessList := p.PlayMod.getChessMod().GetChessList()
+			ChessList := p.PlayMod.getChessMod().GetUnlockChessList()
 			OrderMod.ChangeEnergyMul(Lv, Emit, NewEnergyMul, ChessList)
 			p.PushClientRes(OrderMod.BackData())
 			p.TeLog("mutil_merge_change", map[string]interface{}{
diff --git a/src/server/game/Player.go b/src/server/game/Player.go
index e84da4ca..e86720d0 100644
--- a/src/server/game/Player.go
+++ b/src/server/game/Player.go
@@ -705,7 +705,7 @@ func (p *Player) GetSimpleData(Uid int, simple *PlayerSimpleData) error {
 	simple.FaceBook = Base.Data.FaceBookId
 	simple.FaceBookPic = p.PlayMod.getBaseMod().FacebookUrl
 	simple.Playroom = p.PlayMod.getPlayroomMod().Room
-	simple.Chess = p.PlayMod.getChessMod().GetChessList()
+	simple.Chess = p.PlayMod.getChessMod().GetUnlockChessList()
 	simple.WorkStart = p.PlayMod.getPlayroomMod().Starttime
 	simple.Chip = p.PlayMod.getPlayroomMod().Chip
 	simple.PetName = p.PlayMod.getBaseMod().PetName
@@ -727,7 +727,7 @@ func (p *Player) UpdateUserInfo() {
 	simple.FaceBook = Base.Data.FaceBookId
 	simple.FaceBookPic = p.PlayMod.getBaseMod().FacebookUrl
 	simple.Playroom = p.PlayMod.getPlayroomMod().Room
-	simple.Chess = p.PlayMod.getChessMod().GetChessList()
+	simple.Chess = p.PlayMod.getChessMod().GetUnlockChessList()
 	simple.WorkStart = p.PlayMod.getPlayroomMod().Starttime
 	simple.Chip = p.PlayMod.getPlayroomMod().Chip
 	simple.PetName = p.PlayMod.getBaseMod().PetName
diff --git a/src/server/game/PlayerChessMod.go b/src/server/game/PlayerChessMod.go
index 6841c520..4c9b2cf5 100644
--- a/src/server/game/PlayerChessMod.go
+++ b/src/server/game/PlayerChessMod.go
@@ -210,7 +210,7 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa
 		return err
 	}
 	OrderMod := player.PlayMod.getOrderMod()
-	Update := OrderMod.CreateExtraOrder(AddChessList, AddNewEmit, ChessMod.GetChessList(), EnergyPow)
+	Update := OrderMod.CreateExtraOrder(AddChessList, AddNewEmit, ChessMod.GetUnlockChessList(), EnergyPow)
 	if Update {
 		player.PushClientRes(OrderMod.BackData())
 	}
diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go
index e4a1221d..b747096b 100644
--- a/src/server/game/RegisterNetworkFunc.go
+++ b/src/server/game/RegisterNetworkFunc.go
@@ -136,7 +136,7 @@ func RegSetEneryFunc(args []interface{}) error {
 	OrderMod := player.PlayMod.getOrderMod()
 	Lv := player.GetPlayerBaseMod().GetLevel()
 	Emit := player.PlayMod.getChessMod().GetOrderEmit()
-	ChessList := player.PlayMod.getChessMod().GetChessList()
+	ChessList := player.PlayMod.getChessMod().GetUnlockChessList()
 	OrderMod.ChangeEnergyMul(Lv, Emit, int(req.EnergyMul), ChessList)
 	player.PushClientRes(OrderMod.BackData())
 	player.PushClientRes(player.PlayMod.getBaseMod().BackData())
@@ -525,7 +525,7 @@ func ReqGetChessFromBuff(args []interface{}) error {
 		})
 		return err
 	}
-	Update = OrderMod.CreateExtraOrder([]int{ChessId}, AddNewEmit, ChessMod.GetChessList(), BaseMod.GetEnergyMul())
+	Update = OrderMod.CreateExtraOrder([]int{ChessId}, AddNewEmit, ChessMod.GetUnlockChessList(), BaseMod.GetEnergyMul())
 	if Update {
 		player.PushClientRes(OrderMod.BackData())
 	}
diff --git a/src/server/game/mod/chess/Chess.go b/src/server/game/mod/chess/Chess.go
index ad300c0d..5853c77d 100644
--- a/src/server/game/mod/chess/Chess.go
+++ b/src/server/game/mod/chess/Chess.go
@@ -123,6 +123,10 @@ func (cb *ChessBorad) ComposeChess(id int) (int, error) {
 }
 
 func (cb *ChessBorad) GetChessList() []int {
+	return cb.ChessList
+}
+
+func (cb *ChessBorad) GetUnlockChessList() []int {
 	r := make([]int, 0, len(cb.ChessList))
 	for k, v := range cb.ChessMap {
 		arr := strings.Split(k, "@")