Merge branch 'develop' into sk

.gitlab-ci.yml

@@ -1,7 +1,5 @@
 stages:
-  - lock
   - build
-  - unlock
 
 variables:
   GOPROXY: "https://goproxy.cn,direct"
@@ -20,19 +18,6 @@ cache:
     - ${GOPATH}/pkg/mod
     - ${GOPATH}/bin
 
-# 锁定作业，防止并发流水线执行
-lock_job:
-  stage: lock
-  script:
-    - |
-      if [ -f /tmp/ci_lock_$CI_COMMIT_REF_NAME ]; then
-        echo "流水线($CI_COMMIT_REF_NAME)已在运行，等待..."
-        exit 1
-      else
-        touch /tmp/ci_lock_$CI_COMMIT_REF_NAME
-        echo "获得锁定，开始流水线($CI_COMMIT_REF_NAME)。"
-      fi
-
 build-job:
   stage: build
   only:
@@ -124,12 +109,4 @@ build-job:
 
     # 触发部署
     - echo "触发部署"
-    - "curl -X POST --fail -F token=$SERVER_CI_TOKEN -F ref=release -F variables[ServerName]=$ServerName https://git.pogorockgames.com/api/v4/projects/31/trigger/pipeline"
-
-# 解锁作业，释放锁定
-unlock_job:
-  stage: unlock
-  script:
-    - rm -f /tmp/ci_lock_$CI_COMMIT_REF_NAME
-    - echo "释放锁定，流水线结束(/$CI_COMMIT_REF_NAME)。"
-  when: always
+    - "curl -X POST --fail -F token=$SERVER_CI_TOKEN -F ref=release -F variables[ServerName]=$ServerName https://git.pogorockgames.com/api/v4/projects/31/trigger/pipeline"

gamerule/thirteen/constants.go

@@ -41,7 +41,7 @@ const (
 	ThirteenWaterSceneWaitTimeout = time.Second * 2  //等待倒计时
 	ThirteenWaterStartTimeout     = time.Second * 3  //开始倒计时
 	ThirteenWaterSendCardsTimeout = time.Second * 3  //开始发牌
-	ThirteenWaterOptCardTimeout   = time.Second * 45 //45选牌换牌
+	ThirteenWaterOptCardTimeout   = time.Second * 47 //47选牌换牌
 	ThirteenWaterShowCardsTimeout = time.Second * 1  //轮流看牌时间
 	ThirteenWaterHitTimeout       = time.Second * 2  //打枪
 	ThirteenWaterBilledTimeout    = time.Second * 5  //结算

worldsrv/tournament.go

@@ -1803,6 +1803,9 @@ func (this *Tournament) GetSCTMInfosPack(platform, channelName string) *tourname
 					}
 					tMInfo.SignupCostItem = signupCost
 				}
+				if info.MatchTimeType == 0 {
+					tMInfo.MatchTimeStamp = []int64{}
+				}
 				pack.TMInfo = append(pack.TMInfo, tMInfo)
 			}
 		}