限时事件优化

src/server/game/GameLogic.go

@@ -757,6 +757,8 @@ func (ad *GameLogic) RegisterNetWorkFunc() {
 	RegisterMsgProcessFunc("ReqPlayroomWork", ReqPlayroomWork)                 // 宠物工作
 	RegisterMsgProcessFunc("ReqPlayroomRest", ReqPlayroomRest)                 // 宠物休息
 	RegisterMsgProcessFunc("ReqPlayroomDraw", ReqPlayroomDraw)                 // 转盘
+	RegisterMsgProcessFunc("ReqPlayroomFlip", ReqPlayroomFlip)                 // 翻牌
+	RegisterMsgProcessFunc("ReqPlayroomFlipReward", ReqPlayroomFlipReward)     // 翻牌奖励
 	RegisterMsgProcessFunc("ReqPlayroomChip", ReqPlayroomChip)                 // 消除碎片
 	RegisterMsgProcessFunc("ReqPlayroomOutline", ReqPlayroomOutline)           // 打工离线
 	RegisterMsgProcessFunc("ReqPlayroomWrokOutline", ReqPlayroomWrokOutline)   // 打工离线完成

src/server/game/LimitedTimeTrigger.go

@@ -192,11 +192,11 @@ func LimitedTimeEnergyAdd(p *Player) {
 	}
 	Energy := BaseMod.GetEnergy()
 	MaxEnergy := PlayerBaseMod.GetMaxEnergy()
-	if MaxEnergy > Energy {
 	Energy += Addsta
 	if Energy > MaxEnergy {
 		Energy = MaxEnergy
 	}
+	if MaxEnergy > Energy {
 		p.CallEvent(time.Duration(Recover)*time.Second, func() {
 			p.lock.Lock()
 			defer p.lock.Unlock()

src/server/game/RegisterNetworkFunc.go

@@ -2703,11 +2703,6 @@ func ReqPlayroomInfo(args []interface{}) error {
 	PlayroomMod.SetTarget(Targer)
 	if PlayerData.Loginout < GoUtil.Now()-100000000300 { // todo DEBUG
 		PlayroomMod.SetGameId(1)
-	} else {
-		PlayroomMod.SetGameId(2)
-		PlayroomMod.SetGameRewardFlip(int(float64(PlayerData.Star)*0.03), int(float64(PlayerData.Star)*0.05), int(float64(PlayerData.Star)*0.1))
-	}
-
 		Star := min(500, max(PlayerData.Star/10, 10))
 		ChessMod := player.PlayMod.getChessMod()
 		EmitList := ChessMod.GetOrderEmit()
@@ -2732,6 +2727,10 @@ func ReqPlayroomInfo(args []interface{}) error {
 			ChessList := GoUtil.RandSliceNum(RandList, 2)
 			PlayroomMod.SetGameReward(ChessList[0], ChessList[1], Star)
 		}
+	} else {
+		PlayroomMod.SetGameId(2)
+		PlayroomMod.SetGameRewardFlip(int(float64(PlayerData.Star)*0.03), int(float64(PlayerData.Star)*0.05), int(float64(PlayerData.Star)*0.1))
+	}
 
 	PlayroomVisit(player, Targer)
 	return nil