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-08-20 15:55:18 +08:00
parent d84266817f
commit 03d584c12c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3623,7 +3623,7 @@ func ReqPlayroomFlipReward(player *Player, buf []byte) error {
req := &msg.ReqPlayroomFlipReward{} req := &msg.ReqPlayroomFlipReward{}
proto.Unmarshal(buf, req) proto.Unmarshal(buf, req)
PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod := player.PlayMod.getPlayroomMod()
Items, Target, err := PlayroomMod.GetFlipReward() Items, Target, Result, err := PlayroomMod.GetFlipReward()
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResPlayroomFlipReward{ player.SendErrClienRes(&msg.ResPlayroomFlipReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -3633,7 +3633,7 @@ func ReqPlayroomFlipReward(player *Player, buf []byte) error {
} }
Items1 := Items Items1 := Items
LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_PET_THIEF) { if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_PET_THIEF) && Result == playroom.FLIP_TYPE_GOLD {
player.GetPetThiefReward(Target) player.GetPetThiefReward(Target)
} }
err = player.HandleItem(Items1, msg.ITEM_POP_LABEL_PlayroomFlip.String()) err = player.HandleItem(Items1, msg.ITEM_POP_LABEL_PlayroomFlip.String())

9
src/server/game/mod/playroom/playroom.go
View File

@ -852,10 +852,11 @@ func (p *PlayroomMod) FlipCard(Pos int) (int, error) {
return Prob, nil return Prob, nil
} }
func (p *PlayroomMod) GetFlipReward() ([]*item.Item, int, error) { func (p *PlayroomMod) GetFlipReward() ([]*item.Item, int, int, error) {
check := make(map[int]int) check := make(map[int]int)
Items := make([]*item.Item, 0) Items := make([]*item.Item, 0)
T := p.Target T := p.Target
Result := FLIP_TYPE_COPPER
for _, v := range p.Flip { for _, v := range p.Flip {
check[v]++ check[v]++
if check[v] == 3 { if check[v] == 3 {
@ -865,20 +866,22 @@ func (p *PlayroomMod) GetFlipReward() ([]*item.Item, int, error) {
Items = append(Items, p.GameReward[FLIP_TYPE_COPPER]) Items = append(Items, p.GameReward[FLIP_TYPE_COPPER])
case FLIP_TYPE_SILVER: case FLIP_TYPE_SILVER:
p.NoFlip++ p.NoFlip++
Result = FLIP_TYPE_SILVER
Items = append(Items, p.GameReward[FLIP_TYPE_SILVER]) Items = append(Items, p.GameReward[FLIP_TYPE_SILVER])
case FLIP_TYPE_GOLD: case FLIP_TYPE_GOLD:
p.NoFlip = 0 p.NoFlip = 0
p.TodayFlip = true p.TodayFlip = true
Result = FLIP_TYPE_GOLD
Items = append(Items, p.GameReward[FLIP_TYPE_GOLD]) Items = append(Items, p.GameReward[FLIP_TYPE_GOLD])
} }
p.LastFlip = v p.LastFlip = v
p.Flip = make(map[int]int) p.Flip = make(map[int]int)
p.ResetGame() p.ResetGame()
return Items, T, nil return Items, T, Result, nil
} }
} }
return Items, T, fmt.Errorf("GetFlipReward check is not 3") return Items, T, Result, fmt.Errorf("GetFlipReward check is not 3")
} }
func (p *PlayroomMod) BuyItem(Id int) ([]*item.Item, []*item.Item) { func (p *PlayroomMod) BuyItem(Id int) ([]*item.Item, []*item.Item) {