修复playroom bug

src/server/GoUtil/GoUtil.go

@@ -186,6 +186,9 @@ func PlayroomTrigger(Time int64, Num int) (int64, int) {
 		return 0, 0
 	}
 	Now := Now()
+	if Time > Now {
+		return Time, Num
+	}
 	var Duration int64
 	for {
 		if Num > 50 {

src/server/game/FriendMgr.go

@@ -55,6 +55,7 @@ func (f *FriendMgr) Init() {
 	f.RegisterHandler(msg.HANDLE_TYPE_REFUSE_SELECT_CARD, f.sendToPlayer)
 	f.RegisterHandler(msg.HANDLE_TYPE_REFUSE_EX_CARD, f.sendToPlayer)
 	f.RegisterHandler(msg.HANDLE_TYPE_SEND_CARD, f.sendToPlayer)
+	f.RegisterHandler(msg.HANDLE_TYPE_PLAYROOM_LOSE, f.sendToPlayer)
 
 }
 

src/server/game/LimitedTimeTrigger.go

@@ -1,6 +1,7 @@
 package game
 
 import (
+	"fmt"
 	"math"
 	"server/GoUtil"
 	"server/game/mod/card"
@@ -145,14 +146,14 @@ func LimitedTimePlayroomTrigger(p *Player, Id int) {
 	MoodInfo.Num = Num
 	p.PlayMod.save()
 	PlayroomBackData(p)
-	NextSecond := NewTime + 1200 - Now
+	NextSecond := NewTime - Now
 	if NextSecond > 0 {
 		p.CallEvent(time.Duration(NextSecond)*time.Second, func() {
 			p.lock.Lock()
 			defer p.lock.Unlock()
 			LimitedTimePlayroomTrigger(p, Id)
 			p.SendClientRes()
-		}, "Playroom")
+		}, fmt.Sprintf("Playroom_%d", Id))
 	}
 }
 

src/server/game/PlayerFunc.go

@@ -210,9 +210,9 @@ func handle(p *Player, m *msg.Msg) error {
 		}
 	case msg.HANDLE_TYPE_PLAYROOM_LOSE: // #  玩家输了
 		PlayroomMod := p.PlayMod.getPlayroomMod()
-		Items := m.Extra.([]*item.Item)
+		Items := make([]*item.Item, 0)
-		if len(Items) == 0 {
+		if m.Extra != nil {
-			return nil
+			Items = m.Extra.([]*item.Item)
 		}
 		PlayroomMod.AddChip()
 		PlayroomMod.AddMood(playroom.MOOD_TYPE_FOOD, -50)

src/server/game/RegisterNetworkFunc.go

@@ -2883,7 +2883,7 @@ func ReqPlayroomSelectReward(args []interface{}) error {
 	G_GameLogicPtr.FriendMgrSend(&MsqMod.Msg{
 		From:  int(player.M_DwUin),
 		To:    Target,
-		Type:  MsqMod.HANDLE_TYPE_DEL,
+		Type:  MsqMod.HANDLE_TYPE_PLAYROOM_LOSE,
 		SendT: GoUtil.Now(),
 	})
 	PlayroomMod.ResetGame()