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

.gitlab-ci.yml

@@ -17,8 +17,7 @@ default:
 cache:
   key: "$CI_COMMIT_REF_NAME-$(md5sum go.mod go.sum)"
   paths:
-    - .cache/go-build/
-    - $GOPATH/pkg/mod/
+    - ~/.cache/go-build/
   policy: pull-push
 
 # 锁定作业，防止并发流水线执行
@@ -47,7 +46,7 @@ build-job:
       fi
     # 拷贝到GOPATH
     - echo '拷贝到GOPATH'
-    - rsync -rv --no-perms --delete ./* $GOPATH/src/$ProjectPath
+    - rsync -rvc --no-perms --delete ./* $GOPATH/src/$ProjectPath
     # 进入项目目录
     - cd $GOPATH/src/$ProjectPath
     # 编译
@@ -61,7 +60,7 @@ build-job:
       do
           cd $line
           echo "编译 $line"
-          go build
+          go build -v
           cd ..
       done < shell/programs.txt
 

model/player.go

@@ -131,6 +131,7 @@ const (
 	ActivityLog_PigBank                   // 购买存钱罐
 	ActivityLog_Shop                      //商城购买
 	ActivityLog_Exchange                  //商城兑换
+	ActivityLog_CoinPigBank               //金币存钱罐
 )
 
 type PlayerGameCtrlData struct {

worldsrv/welfmgr.go

@@ -1856,7 +1856,7 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
 		pack.Price = int64(infoData.CoinPrice)
 		logger.Logger.Tracef("PigbankTakeCoin  snid: %v pack: %v", p.SnId, pack)
 		p.SendToClient(int(welfare.SPacketID_PACKET_SCPigbankTakeCoin), pack)
-
+		mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_CoinPigBank, 1))
 	}
 }