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

.gitlab-ci.yml

@@ -25,11 +25,11 @@ lock_job:
   stage: lock
   script:
     - |
-      if [ -f /tmp/ci_lock/$CI_COMMIT_REF_NAME ]; then
+      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
+        touch /tmp/ci_lock_$CI_COMMIT_REF_NAME
         echo "获得锁定，开始流水线($CI_COMMIT_REF_NAME)。"
       fi
 
@@ -92,49 +92,10 @@ save-job:
       mv ./$line/$line ./temp/$line
       done < ./programs.txt
 
-sync_job:
-  stage: sync
-  only:
-    - develop
-    - release
-  script:
-    - cd $GOPATH/src/$ProjectPath
-    - if [ "$CI_COMMIT_BRANCH" == "develop" ]; then
-      SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_DEVELOP";
-      REMOTE_HOST="$REMOTE_HOST_DEVELOP";
-      REMOTE_USER="$REMOTE_USER_DEVELOP";
-      ServerName="develop";
-      BinPath="$DevelopBinPath";
-      elif [ "$CI_COMMIT_BRANCH" == "release" ]; then
-      SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_BETA";
-      REMOTE_HOST="$REMOTE_HOST_BETA";
-      REMOTE_USER="$REMOTE_USER_BETA";
-      ServerName="beta";
-      BinPath="$BetaBinPath";
-      else
-      echo "不支持的分支";
-      exit 1;
-      fi
-
-    # 设置 .ssh 目录并写入 SSH 私钥
-    - echo "设置 SSH keys..."
-    - mkdir -p ~/.ssh
-    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
-    - chmod 600 ~/.ssh/id_rsa
-    - ssh-keyscan -H "$REMOTE_HOST" >> ~/.ssh/known_hosts
-
-    # 使用 rsync 将文件同步到远程服务器
-    - echo "同步到服务器"
-    - echo "Deploying to remote server using rsync... $BinPath"
-    - rsync -rvz --delete ./temp/ $REMOTE_USER@$REMOTE_HOST:$BinPath
-    
-    # 触发部署
-    - "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
+    - rm -f /tmp/ci_lock_$CI_COMMIT_REF_NAME
     - echo "释放锁定，流水线结束(/$CI_COMMIT_REF_NAME)。"
   when: always

data/DB_PigBank_Diamond.dat

@@ -1,4 +1,4 @@
 
 


 (Ђ­в8–
@Ўи;PdX–
`c
-< ((€­β2ΕΈ
2συ
8¬@Άθ;Jσυ
JΖΈ
PdX¬`Η

-?<18>ΑΧ/ 2(€­β2συ
2ΕΈ8ξ@£θ;JΖΈJσυ
PdXξ`σ
+< ((€­β2ΕΈ
2συ
8¬@Άθ;JΖΈ
Jσυ
PdX¬`Η

+?<18>ΑΧ/ 2(€­β2ΕΈ2συ
8ξ@£θ;JΖΈJσυ
PdXξ`σ

worldsrv/welfmgr.go

@@ -1118,7 +1118,7 @@ func (this *WelfareMgr) BlindBoxInfo(p *Player, bid int32) {
 			if cyc == 1 || blindBox.Cycle == model.WelfareOpen {
 				p.WelfData.BlindBoxId = 0
 			}
-		} // == 1代表当日循环
+		}                               // == 1代表当日循环
 		if p.WelfData.BlindBoxId == 0 { // 未领取过发随机Date
 
 			idx := bid
@@ -1700,10 +1700,6 @@ func (this *WelfareMgr) PigbankGetInfo(p *Player) {
 		return 0
 	}
 
-	if common.Config.IsDevMode {
-		p.AddCoin(70000, 0, common.GainWay_PigrankGainCoin, "sys", "存钱罐领取金币")
-		p.AddDiamond(4000, 0, common.GainWay_PigrankGainCoin, "sys", "存钱罐领取金币")
-	}
 	/*	fGetCostDiamond := func(taketimes int32) int64 {
 		pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr()
 		for _, data := range pool {