update excel

.gitlab-ci.yml

@@ -2,6 +2,7 @@ stages:
   - lock
   - build
   - save
+  - sync
   - unlock
 
 variables:
@@ -93,6 +94,44 @@ save-job:
       mv ./$line/$line ./temp/$line
       done < ./programs.txt
 
+sync_job:
+  stage: sync
+  only:
+    - develop
+    - release
+  script:
+    - 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

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ξ`σ

srvdata/db_game_bankruptcy.go

@@ -1,77 +0,0 @@
-
-// Code generated by xlsx2proto.
-// DO NOT EDIT!
-
-package srvdata
-
-import (
-	"google.golang.org/protobuf/proto"
-
-    "mongo.games.com/game/protocol/server"
-)
-
-var PBDB_Game_bankruptcyMgr = &DB_Game_bankruptcyMgr{
-    Datas: &server.DB_Game_bankruptcyArray{},
-    pool: make(map[int32]*server.DB_Game_bankruptcy),
-    
-}
-
-type DB_Game_bankruptcyMgr struct {
-	Datas *server.DB_Game_bankruptcyArray
-	pool  map[int32]*server.DB_Game_bankruptcy
-	
-}
-
-func (this *DB_Game_bankruptcyMgr) unmarshal(data []byte) error {
-	err := proto.Unmarshal(data, this.Datas)
-	if err == nil {
-		this.arrangeData()
-	}
-	return err
-}
-
-func (this *DB_Game_bankruptcyMgr) reunmarshal(data []byte) error {
-	newDatas := &server.DB_Game_bankruptcyArray{}
-	err := proto.Unmarshal(data, newDatas)
-	if err == nil {
-		for _, item := range newDatas.Arr {
-			existItem := this.GetData(item.GetId())
-			if existItem == nil {
-				this.pool[item.GetId()] = item
-				this.Datas.Arr = append(this.Datas.Arr, item)
-				
-			} else {
-				*existItem = *item
-			}
-		}
-	}
-	return err
-}
-
-func (this *DB_Game_bankruptcyMgr) arrangeData() {
-	if this.Datas == nil {
-		return
-	}
-
-	dataArr := this.Datas.GetArr()
-	if dataArr == nil {
-		return
-	}
-
-	for _, data := range dataArr {
-		this.pool[data.GetId()] = data
-		
-	}
-}
-
-func (this *DB_Game_bankruptcyMgr) GetData(id int32) *server.DB_Game_bankruptcy {
-	if data, ok := this.pool[id]; ok {
-		return data
-	}
-	return nil
-}
-
-
-func init() {
-	DataMgr.register("DB_Game_bankruptcy.dat", &ProtobufDataLoader{dh: PBDB_Game_bankruptcyMgr})
-}

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