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

订单调整

Browse Source
This commit is contained in:
hahwu 2025-03-14 11:51:18 +08:00
parent c38f192aa9
commit 0ae51244ec
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -682,7 +682,7 @@ func ReqSeparateChess(player *Player, buf []byte) error {
req := &msg.ReqSeparateChess{}
proto.Unmarshal(buf, req)
ChessMod := player.PlayMod.getChessMod()
err := ChessMod.SeparateChess(int(req.ChessId))
NewChess, err := ChessMod.SeparateChess(int(req.ChessId))
if err != nil {
player.SendErrClienRes(&msg.ResSeparateChess{
Code: msg.RES_CODE_FAIL,
@ -707,7 +707,8 @@ func ReqSeparateChess(player *Player, buf []byte) error {
player.PushClientRes(&msg.ResSeparateChess{
Code: msg.RES_CODE_SUCCESS,
})
triggerComposeChess(player, int(req.ChessId), player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
triggerComposeChess(player, NewChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
triggerComposeChess(player, NewChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
player.TeLog("scissors_use", map[string]interface{}{
"scissors_item_id": int(req.ChessId),
})
@ -719,7 +720,7 @@ func ReqUpgradeChess(player *Player, buf []byte) error {
req := &msg.ReqUpgradeChess{}
proto.Unmarshal(buf, req)
ChessMod := player.PlayMod.getChessMod()
err := ChessMod.UpgradeChess(int(req.ChessId))
NewChess, err := ChessMod.UpgradeChess(int(req.ChessId))
if err != nil {
player.SendErrClienRes(&msg.ResUpgradeChess{
Code: msg.RES_CODE_FAIL,
@ -739,7 +740,7 @@ func ReqUpgradeChess(player *Player, buf []byte) error {
})
return err
}
triggerComposeChess(player, int(req.ChessId), player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
triggerComposeChess(player, NewChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
player.PlayMod.save()
player.PushClientRes(ChessMod.BackData())
player.PushClientRes(&msg.ResUpgradeChess{

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

@ -521,49 +521,49 @@ func (cb *ChessBorad) SourceChest(ChessId int) ([]*item.Item, error) {
return nil, nil
}
func (cb *ChessBorad) SeparateChess(ChessId int) error {
func (cb *ChessBorad) SeparateChess(ChessId int) (int, error) {
ChessLv := mergeDataCfg.GetLvById(ChessId)
if ChessLv == 1 {
return errors.New("chess lv is 1")
return 0, errors.New("chess lv is 1")
}
ChessType := mergeDataCfg.GetTypeById(ChessId)
if ChessType != "Product" {
return errors.New("chess type is not product")
return 0, errors.New("chess type is not product")
}
err := cb.RemoveChess(ChessId)
if err != nil {
return err
return 0, err
}
err = cb.RemoveChess(CHESS_SEPARATE)
if err != nil {
return err
return 0, err
}
ChessColor := mergeDataCfg.GetColorById(ChessId)
NewChess := mergeDataCfg.GetChessIdByLvAndColor(ChessLv-1, ChessColor)
cb.AddChess(NewChess)
cb.AddChess(NewChess)
return nil
return NewChess, nil
}
func (cb *ChessBorad) UpgradeChess(ChessId int) error {
func (cb *ChessBorad) UpgradeChess(ChessId int) (int, error) {
ChessLv := mergeDataCfg.GetLvById(ChessId)
ChessMaxLv := mergeDataCfg.GetMaxLvById(ChessId)
if ChessLv == ChessMaxLv {
return errors.New("chess lv is max")
return 0, errors.New("chess lv is max")
}
ChessType := mergeDataCfg.GetTypeById(ChessId)
if ChessType != "Product" {
return errors.New("chess type is not product")
return 0, errors.New("chess type is not product")
}
err := cb.RemoveChess(ChessId)
if err != nil {
return err
return 0, err
}
err = cb.RemoveChess(CHESS_UPGRADE)
if err != nil {
return err
return 0, err
}
NewChess := mergeDataCfg.GetChessIdByLvAndColor(ChessLv+1, mergeDataCfg.GetColorById(ChessId))
cb.AddChess(NewChess)
return nil
return NewChess, nil
}