pet_home/pet_home_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复订单调整bug

Browse Source
This commit is contained in:
hahwu 2025-01-18 17:23:01 +08:00
parent 01ca01eecf
commit 90734285f2
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/LimitedTimeTrigger.go
View File

@ -45,7 +45,7 @@ func LimitedTimeEventTrigger(p *Player, AddEventId int) {
OrderMod := p.PlayMod.getOrderMod() OrderMod := p.PlayMod.getOrderMod()
Lv := p.GetPlayerBaseMod().GetLevel() Lv := p.GetPlayerBaseMod().GetLevel()
Emit := p.PlayMod.getChessMod().GetOrderEmit() Emit := p.PlayMod.getChessMod().GetOrderEmit()
ChessList := p.PlayMod.getChessMod().GetChessList() ChessList := p.PlayMod.getChessMod().GetUnlockChessList()
OrderMod.ChangeEnergyMul(Lv, Emit, NewEnergyMul, ChessList) OrderMod.ChangeEnergyMul(Lv, Emit, NewEnergyMul, ChessList)
p.PushClientRes(OrderMod.BackData()) p.PushClientRes(OrderMod.BackData())
p.TeLog("mutil_merge_change", map[string]interface{}{ p.TeLog("mutil_merge_change", map[string]interface{}{

4
src/server/game/Player.go
View File

@ -705,7 +705,7 @@ func (p *Player) GetSimpleData(Uid int, simple *PlayerSimpleData) error {
simple.FaceBook = Base.Data.FaceBookId simple.FaceBook = Base.Data.FaceBookId
simple.FaceBookPic = p.PlayMod.getBaseMod().FacebookUrl simple.FaceBookPic = p.PlayMod.getBaseMod().FacebookUrl
simple.Playroom = p.PlayMod.getPlayroomMod().Room 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.WorkStart = p.PlayMod.getPlayroomMod().Starttime
simple.Chip = p.PlayMod.getPlayroomMod().Chip simple.Chip = p.PlayMod.getPlayroomMod().Chip
simple.PetName = p.PlayMod.getBaseMod().PetName simple.PetName = p.PlayMod.getBaseMod().PetName
@ -727,7 +727,7 @@ func (p *Player) UpdateUserInfo() {
simple.FaceBook = Base.Data.FaceBookId simple.FaceBook = Base.Data.FaceBookId
simple.FaceBookPic = p.PlayMod.getBaseMod().FacebookUrl simple.FaceBookPic = p.PlayMod.getBaseMod().FacebookUrl
simple.Playroom = p.PlayMod.getPlayroomMod().Room 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.WorkStart = p.PlayMod.getPlayroomMod().Starttime
simple.Chip = p.PlayMod.getPlayroomMod().Chip simple.Chip = p.PlayMod.getPlayroomMod().Chip
simple.PetName = p.PlayMod.getBaseMod().PetName simple.PetName = p.PlayMod.getBaseMod().PetName

2
src/server/game/PlayerChessMod.go
View File

@ -210,7 +210,7 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa
return err return err
} }
OrderMod := player.PlayMod.getOrderMod() OrderMod := player.PlayMod.getOrderMod()
Update := OrderMod.CreateExtraOrder(AddChessList, AddNewEmit, ChessMod.GetChessList(), EnergyPow) Update := OrderMod.CreateExtraOrder(AddChessList, AddNewEmit, ChessMod.GetUnlockChessList(), EnergyPow)
if Update { if Update {
player.PushClientRes(OrderMod.BackData()) player.PushClientRes(OrderMod.BackData())
} }

4
src/server/game/RegisterNetworkFunc.go
View File

@ -136,7 +136,7 @@ func RegSetEneryFunc(args []interface{}) error {
OrderMod := player.PlayMod.getOrderMod() OrderMod := player.PlayMod.getOrderMod()
Lv := player.GetPlayerBaseMod().GetLevel() Lv := player.GetPlayerBaseMod().GetLevel()
Emit := player.PlayMod.getChessMod().GetOrderEmit() Emit := player.PlayMod.getChessMod().GetOrderEmit()
ChessList := player.PlayMod.getChessMod().GetChessList() ChessList := player.PlayMod.getChessMod().GetUnlockChessList()
OrderMod.ChangeEnergyMul(Lv, Emit, int(req.EnergyMul), ChessList) OrderMod.ChangeEnergyMul(Lv, Emit, int(req.EnergyMul), ChessList)
player.PushClientRes(OrderMod.BackData()) player.PushClientRes(OrderMod.BackData())
player.PushClientRes(player.PlayMod.getBaseMod().BackData()) player.PushClientRes(player.PlayMod.getBaseMod().BackData())
@ -525,7 +525,7 @@ func ReqGetChessFromBuff(args []interface{}) error {
}) })
return err return err
} }
Update = OrderMod.CreateExtraOrder([]int{ChessId}, AddNewEmit, ChessMod.GetChessList(), BaseMod.GetEnergyMul()) Update = OrderMod.CreateExtraOrder([]int{ChessId}, AddNewEmit, ChessMod.GetUnlockChessList(), BaseMod.GetEnergyMul())
if Update { if Update {
player.PushClientRes(OrderMod.BackData()) player.PushClientRes(OrderMod.BackData())
} }

4
src/server/game/mod/chess/Chess.go
View File

@ -123,6 +123,10 @@ func (cb *ChessBorad) ComposeChess(id int) (int, error) {
} }
func (cb *ChessBorad) GetChessList() []int { func (cb *ChessBorad) GetChessList() []int {
return cb.ChessList
}
func (cb *ChessBorad) GetUnlockChessList() []int {
r := make([]int, 0, len(cb.ChessList)) r := make([]int, 0, len(cb.ChessList))
for k, v := range cb.ChessMap { for k, v := range cb.ChessMap {
arr := strings.Split(k, "@") arr := strings.Split(k, "@")