tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release' of git.pogorockgames.com:mango-games/server/game into release

This commit is contained in:
sk 2024-11-27 07:08:50 +08:00
parent 616ee8369c 5f31432a2c
commit d28d1a2cde
2 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gamerule/thirteen/constants.go
View File

@ -53,9 +53,9 @@ const (
) )
func GetTimeout(param []int64, index int) time.Duration { func GetTimeout(param []int64, index int) time.Duration {
if index >= 0 && index < len(param) { //if index >= 0 && index < len(param) {
return time.Duration(param[index]) * time.Second // return time.Duration(param[index]) * time.Second
} //}
switch index { switch index {
case TimeoutStart: case TimeoutStart:
return ThirteenWaterStartTimeout return ThirteenWaterStartTimeout

41
gamesrv/thirteen/scenepolicy.go
View File

@ -1109,35 +1109,8 @@ func (this *StateShow) OnEnter(s *base.Scene) {
logger.Logger.Tracef("(this *StateShow) OnEnter, sceneid=%v currpos:%v", s.GetSceneId(), sceneEx.currOpPos) logger.Logger.Tracef("(this *StateShow) OnEnter, sceneid=%v currpos:%v", s.GetSceneId(), sceneEx.currOpPos)
sceneEx.ShowCards() sceneEx.ShowCards()
// 每人看牌5秒，特殊牌型不算; // 每人看牌5秒，特殊牌型不算;
//var n int var n int
//var has bool var has bool
//for _, v := range sceneEx.players {
// if v != nil && v.IsGameing() && v.cardsO != nil {
// n++
// if v.cardsO.PokerType == 1 { // 有青龙
// has = true
// }
// }
//}
//n -= sceneEx.specialTypeNum
//sceneEx.specialTime = time.Second * time.Duration(n*5)
//// pk动画 2秒
//sceneEx.specialTime += time.Second * 2
//// 特殊牌型 4.5秒；至尊青龙5.5秒
//if sceneEx.specialTypeNum > 0 {
// if has {
// sceneEx.specialTime += time.Millisecond * 5500
// } else {
// sceneEx.specialTime += time.Millisecond * 4500
// }
//}
sceneEx.specialTime = 0
// pk动画 2秒
sceneEx.specialTime += time.Second * 2
// 2人且有特殊牌型，直接播放特殊牌型动画'
var n int // 玩家数量
var has bool // 是否有青龙
for _, v := range sceneEx.players { for _, v := range sceneEx.players {
if v != nil && v.IsGameing() && v.cardsO != nil { if v != nil && v.IsGameing() && v.cardsO != nil {
n++ n++
@ -1146,16 +1119,18 @@ func (this *StateShow) OnEnter(s *base.Scene) {
} }
} }
} }
if n == 2 && sceneEx.specialTypeNum > 0 { n -= sceneEx.specialTypeNum
sceneEx.specialTime = time.Second * time.Duration(n*5)
// pk动画 2秒
sceneEx.specialTime += time.Second * 2
// 特殊牌型 4.5秒；至尊青龙5.5秒
if sceneEx.specialTypeNum > 0 {
if has { if has {
sceneEx.specialTime += time.Millisecond * 5500 sceneEx.specialTime += time.Millisecond * 5500
} else { } else {
sceneEx.specialTime += time.Millisecond * 4500 sceneEx.specialTime += time.Millisecond * 4500
} }
} else {
sceneEx.specialTime = time.Second * time.Duration(5)
} }
logger.Logger.Tracef("show cards: %v %v", n, sceneEx.specialTime) logger.Logger.Tracef("show cards: %v %v", n, sceneEx.specialTime)
if sceneEx.specialTime <= 0 { if sceneEx.specialTime <= 0 {
sceneEx.specialTime = time.Second sceneEx.specialTime = time.Second