解决冲突

.gitlab-ci.yml

@@ -1,7 +1,9 @@
 stages:
+  - lock
   - build
   - save
   - sync
+  - unlock
 
 variables:
   ProjectPath: "mongo.games.com/game"
@@ -10,10 +12,27 @@ default:
   tags:
     - gitlab
 
+# 锁定作业，防止并发流水线执行
+lock_job:
+  stage: lock
+  script:
+    - |
+      if [ -f /tmp/ci_lock ]; then
+        echo "流水线已在运行，等待..."
+        exit 1
+      else
+        touch /tmp/ci_lock
+        echo "获得锁定，开始流水线。"
+      fi
+
 build-job:
   stage: build
+  only:
+    - develop
+    - release
   script:
     - git checkout $CI_COMMIT_REF_NAME
+    - git pull origin $CI_COMMIT_REF_NAME
     # 拷贝到GOPATH
     - echo '拷贝到GOPATH'
     - cp -rfp ./* $GOPATH/src/$ProjectPath
@@ -31,14 +50,18 @@ build-job:
           cd ..
       done < shell/programs.txt
 
-deploy-job:
+save-job:
   stage: save
+  only:
+    - develop
+    - release
   script:
     - cd $GOPATH/src/$ProjectPath
     # 拷贝文件
     - echo '拷贝文件'
-    - mkdir -p ./temp
+    - rm -rf ./temp
-    - mkdir -p ./temp/data
+    - mkdir ./temp
+    - mkdir ./temp/data
     - cp -rfp ./data/* ./temp/data
     # 删除自定义配置
     - echo '删除自定义配置'
@@ -57,33 +80,49 @@ deploy-job:
       mv ./$line/$line ./temp/$line
       done < ./shell/programs.txt
 
-push_job:
+sync_job:
   stage: sync
+  only:
+    - develop
+    - release
   script:
     - cd $GOPATH/src/$ProjectPath
-    - |
+    - if [ "$CI_COMMIT_BRANCH" == "develop" ]; then
-      if [ "$CI_COMMIT_BRANCH" == "develop" ]; then
+      SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_DEVELOP";
-        SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_DEVELOP"
+      REMOTE_HOST="$REMOTE_HOST_DEVELOP";
-        REMOTE_HOST="$REMOTE_HOST_DEVELOP"
+      REMOTE_USER="$REMOTE_USER_DEVELOP";
-        REMOTE_USER="$REMOTE_USER_DEVELOP"
+      SERVER_CI_TOKEN="$REMOTE_CI_TOKEN_DEVELOP";
-        REMOTE_PATH="$REMOTE_PATH_DEVELOP"
+      ServerName="develop";
       elif [ "$CI_COMMIT_BRANCH" == "release" ]; then
-        SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_BETA"
+      SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_BETA";
-        REMOTE_HOST="$REMOTE_HOST_BETA"
+      REMOTE_HOST="$REMOTE_HOST_BETA";
-        REMOTE_USER="$REMOTE_USER_BETA"
+      REMOTE_USER="$REMOTE_USER_BETA";
-        REMOTE_PATH="$REMOTE_PATH_BETA"
+      SERVER_CI_TOKEN="$REMOTE_CI_TOKEN_BETA";
+      ServerName="beta";
       else
-        echo "不支持的分支";
+      echo "不支持的分支";
-        exit 1;
+      exit 1;
       fi
-      
+
-    - echo "Setting up SSH keys..."
     # 设置 .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..."
-    - rsync -avz --delete build/ $REMOTE_USER@$REMOTE_HOST:$REMOTE_PATH
+    - rsync -avz --delete ./temp/ $REMOTE_USER@$REMOTE_HOST:$REMOTE_DEPLOY_PATH
+    
+    # 触发部署
+    - "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
+    - echo "释放锁定，流水线结束。"
+  when: always

common/random.go

@@ -348,3 +348,7 @@ func GetBElementFromA(A []interface{}, B int) []interface{} {
 		}
 	}
 }
+
+func RandFloat(min, max float64) float64 {
+	return min + rand.Float64()*(max-min)
+}

data/DB_GameFree.json

@@ -6502,6 +6502,7 @@
 			"Desc": "0",
 			"ShowType": 2,
 			"ShowId": 30800,
+          "LimitCoin": 10000,
 			"BaseScore": 1000,
 			"Turn": 30800,
 			"BetDec": "1000",
@@ -6535,6 +6536,7 @@
 			"Desc": "0",
 			"ShowType": 2,
 			"ShowId": 30900,
+          "LimitCoin": 10000,
 			"BaseScore": 1000,
 			"Turn": 30900,
 			"BetDec": "1000",
@@ -6568,6 +6570,7 @@
 			"Desc": "0",
 			"ShowType": 2,
 			"ShowId": 31000,
+          "LimitCoin": 10000,
 			"BaseScore": 1000,
 			"Turn": 31000,
 			"BetDec": "1000",
@@ -6601,6 +6604,7 @@
 			"Desc": "0",
 			"ShowType": 2,
 			"ShowId": 31100,
+          "LimitCoin": 10000,
 			"BaseScore": 1000,
 			"Turn": 31100,
 			"BetDec": "1000",
@@ -6634,6 +6638,7 @@
 			"Desc": "0",
 			"ShowType": 2,
 			"ShowId": 31200,
+          "LimitCoin": 10000,
 			"BaseScore": 1000,
 			"Turn": 31200,
 			"BetDec": "1000",
@@ -6674,7 +6679,7 @@
 				0
 			],
 			"OtherIntParams": [
-				0
+              1
 			],
 			"RobotNumRng": [
 				0
@@ -6707,7 +6712,7 @@
 				0
 			],
 			"OtherIntParams": [
-				0
+              1
 			],
 			"RobotNumRng": [
 				0
@@ -6740,7 +6745,7 @@
 				0
 			],
 			"OtherIntParams": [
-				1
+              2
 			],
 			"RobotNumRng": [
 				0
@@ -6773,7 +6778,7 @@
 				0
 			],
 			"OtherIntParams": [
-				1
+              2
 			],
 			"RobotNumRng": [
 				0

dbproxy/svc/l_announcerlog.go

@@ -52,7 +52,11 @@ func InsertAnnouncerLog(logs ...*model.AnnouncerLog) (err error) {
 // 取最新100条数据
 func FetchAnnouncerLog(plt string) (recs []model.AnnouncerLog, err error) {
 	query := bson.M{}
-	err = AnnouncerLogCollection(plt).Find(query).Sort("-_id").Limit(100).All(&recs)
+	c := AnnouncerLogCollection(plt)
+	if c == nil {
+		return recs, AnnouncerLogDBErr
+	}
+	err = c.Find(query).Sort("-_id").Limit(100).All(&recs)
 	return
 }
 

dbproxy/svc/l_awardlog.go

@@ -26,7 +26,11 @@ func AwardLogCollection(plt string) *mongo.Collection {
 }
 
 func FetchAwardLog(plt string) (recs model.AwardLog, err error) {
-	err = AwardLogCollection(plt).Find(bson.M{}).One(&recs)
+	c := AwardLogCollection(plt)
+	if c == nil {
+		return recs, AwardLogDBErr
+	}
+	err = c.Find(bson.M{}).One(&recs)
 	return
 }
 

etcd/keyconf.go

@@ -30,20 +30,21 @@ const (
 	ETCDKEY_PLAYERPOOL          = "/game/plt/playerpool/"  // 个人水池调控配置
 	ETCDKEY_GAME_CONFIG         = "/game/plt/gameconfig/"  // 游戏管理/全局配置
 	ETCDKEY_ACT_PHONELOTTERY    = "/game/act_phoneLottery"
-	ETCDKEY_ChannelSwitch       = "/game/channel/switch"  // 渠道开关
+	ETCDKEY_ChannelSwitch    = "/game/channel/switch"    // 渠道开关
-	ETCDKEY_ACT_Invite          = "/game/act_invite"      // 邀请活动配置
+	ETCDKEY_ACT_Invite       = "/game/act_invite"        // 邀请活动配置
-	ETCDKEY_ACT_Permit          = "/game/act_permit"      // 赛季通行证配置
+	ETCDKEY_ACT_Permit       = "/game/act_permit"        // 赛季通行证配置
-	ETCDKEY_DIAMOND_LOTTERY     = "/game/diamond_lottery" // 钻石抽奖配置
+	ETCDKEY_DIAMOND_LOTTERY  = "/game/diamond_lottery"   // 钻石抽奖配置
-	ETCDKEY_Item                = "/game/item"            // 道具列表
+	ETCDKEY_Item             = "/game/item"              // 道具列表
-	ETCDKEY_SKin                = "/game/skin_config"     // 皮肤配置
+	ETCDKEY_SKin             = "/game/skin_config"       // 皮肤配置
-	ETCDKEY_RANK_TYPE           = "/game/RankType"        // 排行榜奖励配置
+	ETCDKEY_RANK_TYPE        = "/game/RankType"          // 排行榜奖励配置
-	ETCDKEY_AWARD_CONFIG        = "/game/awardlog_config" //获奖记录
+	ETCDKEY_AWARD_CONFIG     = "/game/awardlog_config"   //获奖记录
-	ETCDKEY_GUIDE               = "/game/guide_config"    //新手引导配置
+	ETCDKEY_GUIDE            = "/game/guide_config"      //新手引导配置
-	ETCDKEY_MACHINE             = "/game/machine_config"  //娃娃机配置
+	ETCDKEY_MACHINE          = "/game/machine_config"    //娃娃机配置
-	ETCDKEY_MatchAudience       = "/game/match_audience"  //比赛观众
+	ETCDKEY_MatchAudience    = "/game/match_audience"    //比赛观众
-	ETCDKEY_Spirit              = "/game/spirit"          // 小精灵配置
+	ETCDKEY_Spirit           = "/game/spirit"            // 小精灵配置
-	ETCDKEY_RoomType            = "/game/room_type"       // 房间类型配置
+	ETCDKEY_RoomType         = "/game/room_type"         // 房间类型配置
-	ETCDKEY_RoomConfig          = "/game/room_config"     // 房间配置
+	ETCDKEY_RoomConfig       = "/game/room_config"       // 房间配置
-	ETCDKEY_RoomConfigSystem    = "/game/room_system"     // 系统房间配置
+	ETCDKEY_RoomConfigSystem = "/game/room_system"       // 系统房间配置
-	ETCDKEY_ClientUpgrade = "/game/client_upgrade"        // 客户端升级奖励配置
+	ETCDKEY_ClientUpgrade    = "/game/client_upgrade"    // 客户端升级奖励配置
+	ETCDKEY_PopUpWindow      = "/game/PopUpWindowConfig" //弹窗配置
 )

gamerule/clawdoll/constants.go

@@ -32,6 +32,8 @@ const (
 
 	ClawDollSceneGrapTimeOut    = time.Second * 5 //下抓防卡死强制变状态倒计时
 	ClawDollScenePayCoinTimeOut = time.Second * 2 //投币防卡死强制变状态倒计时
+
+	ClawDollSceneExceptTimeOut = time.Second * 80 //
 )
 
 // 玩家操作
@@ -73,3 +75,5 @@ const (
 	Zego_ForbidRTCStream = iota + 1
 	Zego_ResumeRTCStream = iota + 1
 )
+
+var DebugSwitch bool = false

gamerule/tienlen/cardAi.go

@@ -631,7 +631,7 @@ func GetPressCards(cards, lastCards []int32, data *tienlenApi.PredictRequest, po
 	})
 	isWin := data.IsWin
 	//测试代码
-	//isWin = false
+	isWin = true
 	logger.Logger.Trace("压牌 调控输赢 isWin = ", isWin)
 	outCards := []int32{}
 	//压牌测试代码
@@ -1734,7 +1734,7 @@ func GetOutCards(cards []int32, data *tienlenApi.PredictRequest, pos int32) []in
 	})
 	isWin := data.IsWin
 	//测试代码
-	//isWin = false
+	isWin = true
 	logger.Logger.Trace("出牌 调控输赢 isWin = ", isWin)
 	//测试代码
 	//cards = []int32{51, 4, 5}

gamesrv/base/player.go

@@ -1267,6 +1267,7 @@ func (this *Player) GetSkillAdd(id int32) int32 {
 // 增加或减少道具
 // 同步到 worldsrv
 func (this *Player) AddItems(args *model.AddItemParam) {
+	args.IsGame = true
 	changeItem := map[int32]int64{}
 	for _, v := range args.Change {
 		item := srvdata.GameItemMgr.Get(this.Platform, v.ItemId)

gamesrv/clawdoll/player_clawdoll.go

@@ -117,6 +117,8 @@ func (this *PlayerEx) CostPlayCoin() bool {
 		GameFreeId: int64(sceneEx.GetGameFreeId()),
 	})
 
+	sceneEx.PayCoinCount++
+
 	logger.Logger.Tracef("Clawdoll (*PlayerEx) CostPlayCoin, items = %v", items)
 	return true
 }

gamesrv/clawdoll/scene_clawdoll.go

@@ -11,6 +11,7 @@ import (
 	"mongo.games.com/game/common"
 	rule "mongo.games.com/game/gamerule/clawdoll"
 	"mongo.games.com/game/gamesrv/base"
+	"mongo.games.com/game/model"
 	"mongo.games.com/game/proto"
 	"mongo.games.com/game/protocol/clawdoll"
 	"mongo.games.com/game/protocol/machine"
@@ -23,6 +24,7 @@ import (
 	"mongo.games.com/goserver/srvlib"
 	"net/http"
 	"net/url"
+	"strconv"
 	"time"
 )
 
@@ -66,6 +68,7 @@ type SceneEx struct {
 	machineId     int             //娃娃机ID
 	machineConn   *netlib.Session //娃娃机链接
 	machineStatus int32           //娃娃机链接状态 0:离线 1:在线
+	PayCoinCount int              //娃娃机总投币次数
 
 	payCoinTimeHandle timer.TimerHandle //上分投币托管handle
 	grabTimerHandle   timer.TimerHandle //下抓托管handle
@@ -152,7 +155,6 @@ func (this *SceneEx) OnPlayerLeave(p *base.Player, reason int) {
 		// 发送http Get请求	关闭直播间流
 		operateTask(this, 2, rule.Zego_ForbidRTCStream, p.Platform)
 	}
-
 }
 func (this *SceneEx) SceneDestroy(force bool) {
 	//销毁房间
@@ -237,6 +239,13 @@ func NewClawdollSceneData(s *base.Scene) *SceneEx {
 
 func (this *SceneEx) init() bool {
 	this.Clear()
+
+	this.PayCoinCount = this.LoadPayCoinCount()
+	return true
+}
+
+func (this *SceneEx) ShutDown() bool {
+	this.SavePayCoinCount(false)
 	return true
 }
 
@@ -332,7 +341,36 @@ func (this *SceneEx) GetPlayGrabType(player *PlayerEx) int32 {
 		return rule.ClawWeak
 	}
 
-	if this.RoundId/2 == 0 && this.RoundId != 0 {
+	if this.PayCoinCount == 0 {
+		this.PayCoinCount = 1
+	}
+
+	machineId := this.GetDBGameFree().GetId() % 6080000
+	machineInfo := this.GetMachineServerInfo(machineId, player.Platform)
+	if machineInfo == nil {
+		logger.Logger.Errorf("Clawdoll GetPlayGrabType machineId: %v, platform: %v", machineId, player.Platform)
+		return rule.ClawWeak
+	}
+
+	ProfitRate := common.RandFloat(machineInfo.ProfitMin, machineInfo.ProfitMax)
+	strongRate := (machineInfo.CatchPrice/(machineInfo.BuyPrice*ProfitRate))*float64(this.PayCoinCount) - 1
+
+	logger.Logger.Tracef("Clawdoll GetPlayGrabType: SnId: %v, PayCoinCount:%v, ProfitRate:%v, strongRate:%v", player.SnId, this.PayCoinCount, ProfitRate, strongRate)
+
+	if strongRate <= 0.00000 {
+		return rule.ClawWeak
+	} else if strongRate > 0.00000 && strongRate <= 0.99999 {
+		// 再次随机
+		newRate := common.RandFromRangeInt64(0, 100)
+		logger.Logger.Tracef("Clawdoll GetPlayGrabType: newRate:%v, SnId: %v, PayCoinCount:%v, ProfitRate:%v, strongRate:%v ", newRate, player.SnId, this.PayCoinCount, ProfitRate, strongRate)
+
+		if int64(strongRate*100) >= newRate {
+			logger.Logger.Tracef("Clawdoll GetPlayGrabType: SnId: %v gain ClawStrong, PayCoinCount:%v", player.SnId, this.PayCoinCount)
+			return rule.ClawStrong
+		} else {
+			return rule.ClawWeak
+		}
+	} else if strongRate >= 1.00000 {
 		return rule.ClawStrong
 	}
 
@@ -395,6 +433,12 @@ func (this *SceneEx) TimeOutPlayGrab() bool {
 	playerEx := this.players[this.playingSnid]
 	if playerEx != nil {
 		grapType := this.GetPlayGrabType(playerEx)
+		if grapType == rule.ClawStrong {
+			this.PayCoinCount = 0
+		}
+
+		logger.Logger.Trace("ClawDoll StatePlayGame OnPlayerOp Grab-----SnId:", playerEx.SnId, " grapType: ", grapType)
+
 		this.OnPlayerSMGrabOp(this.playingSnid, int32(this.machineId), grapType)
 
 	}
@@ -464,6 +508,35 @@ func (this *SceneEx) PayCoinTimeHandle() {
 	}), nil, rule.ClawDollScenePayCoinTimeOut, 1)
 }
 
+// 得到投币次数
+func (this *SceneEx) LoadPayCoinCount() int {
+	machineId := this.GetDBGameFree().GetId()
+	PayCoinCountDBKey := fmt.Sprintf("Clawdoll_PayCoinCount_%v", machineId)
+
+	data := model.GetStrKVGameData(PayCoinCountDBKey)
+
+	PayCoinCount, err := strconv.Atoi(data)
+	if err == nil {
+		return PayCoinCount
+	}
+	return 0
+}
+
+// 保存投币次数
+func (this *SceneEx) SavePayCoinCount(asyn bool) {
+	machineId := this.GetDBGameFree().GetId()
+	PayCoinCountDBKey := fmt.Sprintf("Clawdoll_PayCoinCount_%v", machineId)
+
+	saveBuff := strconv.Itoa(int(this.PayCoinCount))
+	if asyn {
+		task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
+			return model.UptStrKVGameData(PayCoinCountDBKey, string(saveBuff))
+		}), nil, "UptStrKVGameData").Start()
+	} else {
+		model.UptStrKVGameData(PayCoinCountDBKey, string(saveBuff))
+	}
+}
+
 // actionType : 1 禁止推流 ForbidRTCStream
 // actionType : 2 恢复推流 ResumeRTCStream
 func operateTask(sceneEx *SceneEx, times int, actionType int, platform string) {
@@ -512,7 +585,7 @@ func ZegoRTCStreamAction(Action string, machineInfo *webapi.MachineInfo) rule.Ze
 	timestamp := time.Now().Unix()
 	queryParams := url.Values{}
 
-	queryParams.Set("StreamId", "test")
+	queryParams.Set("StreamId", machineInfo.StreamId)
 	queryParams.Set("Sequence", fmt.Sprintf("%d", timestamp))
 
 	// 生成16进制随机字符串(16位)

gamesrv/clawdoll/scenepolicy_clawdoll.go

@@ -56,6 +56,10 @@ func (this *PolicyClawdoll) OnStart(s *base.Scene) {
 
 func (this *PolicyClawdoll) OnStop(s *base.Scene) {
 	logger.Logger.Trace("(this *PolicyClawdoll) OnStop , sceneId=", s.GetSceneId())
+	sceneEx, ok := s.ExtraData.(*SceneEx)
+	if ok {
+		sceneEx.ShutDown()
+	}
 }
 
 func (this *PolicyClawdoll) OnTick(s *base.Scene) {
@@ -667,6 +671,9 @@ func (this *PlayGame) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, para
 		}
 
 		grapType := sceneEx.GetPlayGrabType(playerEx)
+		if grapType == rule.ClawStrong {
+			sceneEx.PayCoinCount = 0
+		}
 
 		logger.Logger.Trace("ClawDoll StatePlayGame OnPlayerOp Grab-----SnId:", p.SnId, " grapType: ", grapType)
 		//1-弱力抓 2 -强力抓
@@ -805,6 +812,7 @@ func (this *StateBilled) OnEnter(s *base.Scene) {
 		}
 
 		playerEx.lastIsWin = playerEx.IsWin
+
 		playerEx.ReStartGame()
 	}
 }

gamesrv/tienlen/scenedata_tienlen.go

@@ -409,6 +409,9 @@ func (this *TienLenSceneData) BroadcastOpPos() {
 		if B < 0 {
 			isWin = false
 		}
+		if this.WGCreateScene.GetCloseCtrl() {
+			isWin = true
+		}
 		isTienLenYule := this.IsTienLenYule()
 		pack := &tienlen.SCTienLenAIData{
 			BombNum:           0, //炸弹数量
@@ -554,6 +557,7 @@ func (this *TienLenSceneData) GetFreeGameSceneType() int32 {
 	return this.GetSceneType()
 }
 
+// SendHandCard_Match 发牌
 // 比赛场发牌
 // 纯真人，随机发牌
 // 有机器人和真人，真人拿好牌

gamesrv/tienlen/scenepolicy_tienlen.go

@@ -991,7 +991,6 @@ func (this *SceneHandCardStateTienLen) OnEnter(s *base.Scene) {
 		if rule.TestOpen {
 			sceneEx.SendHandCardTest()
 		} else {
-
 			if len(sceneEx.testPokers) > 1 {
 				sceneEx.SendHandCardOdds()
 			} else {

machine/action/action_server.go

@@ -135,7 +135,7 @@ func SMDollMachinePerateHandler(session *netlib.Session, packetId int, data inte
 
 // 下抓
 func SMDollMachineGrabHandler(session *netlib.Session, packetId int, data interface{}) error {
-	logger.Logger.Tracef("SMDollMachineGrabHandler %v", data)
+	fmt.Println("下抓SMDollMachineGrabHandler %v", data)
 	msg, ok := data.(*machine.SMDollMachineGrab)
 	if !ok {
 		return nil

machine/machinedoll/command.go

@@ -382,8 +382,8 @@ var data = []byte{
 	0x65, //0 几币几玩
 	0x00, //1 几币几玩占用位
 	0x2D, //2 游戏时间
-	0x01, //3 出奖模式0 无概率 1 随机模式 2 固定模式 3 冠兴模式
+	0x00, //3 出奖模式0 无概率 1 随机模式 2 固定模式 3 冠兴模式
-	0x0A, //4 出奖概率
+	0x14, //4 出奖概率
 	0x00, //5 出奖概率占用位
 	0x00, //6 空中抓物 0关闭 1开启
 	0x00, //7 连续投币赠送 范围0~100

machine/machinedoll/machinemgr.go

@@ -151,7 +151,7 @@ func (this *MachineManager) UpdateToGameServer(conn *Conn, status int32) {
 }
 
 func SendToGameServer(pid int, msg interface{}) {
-	GameConn = srvlib.ServerSessionMgrSington.GetSession(1, 7, 777)
+	GameConn = srvlib.ServerSessionMgrSington.GetSession(1, 7, 706)
 	if GameConn != nil {
 		GameConn.Send(pid, msg)
 	} else {

model/baginfo.go

@@ -84,6 +84,7 @@ type AddItemParam struct {
 	GameId, GameFreeId int64   // 游戏id,场次id
 	LogId              string  // 撤销的id,道具兑换失败
 	RoomConfigId       int32   // 房间配置id
+	IsGame             bool    // 是否为gamesrv的操作
 }
 
 type ChangeItemParam struct {

model/config.go

@@ -155,6 +155,8 @@ type AllConfig struct {
 	RoomConfigSystem map[int32]*webapi.RoomConfigSystem
 	// 客户端升级奖励配置
 	*webapi.ClientUpgrade
+	//弹窗配置
+	*webapi.PopUpWindowConfig
 }
 
 type GlobalConfig struct {

model/player.go

@@ -2,7 +2,9 @@ package model
 
 import (
 	"bytes"
+	"crypto/md5"
 	"encoding/gob"
+	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -115,6 +117,20 @@ const (
 	SystemFreeGive_CoinType_Diamond              //钻石
 	SystemFreeGive_CoinType_Tiem                 // 道具
 )
+const (
+	ActivityLog_Sign           = iota + 1 // 签到
+	ActivityLog_PhoneLottery              //积分抽奖
+	ActivityLog_DiamondLottery            //钻石抽奖
+	ActivityLog_CollectBox                //开启礼盒集卡
+	ActivityLog_WeekCard                  //周卡
+	ActivityLog_Permit                    //通行证
+	ActivityLog_FirstPay                  // 超值首冲
+	ActivityLog_BlindBox                  // 开盲盒
+	ActivityLog_ContinuousPay             // 累计充值
+	ActivityLog_PigBank                   // 购买存钱罐
+	ActivityLog_Shop                      //商城购买
+	ActivityLog_Exchange                  //商城兑换
+)
 
 type PlayerGameCtrlData struct {
 	CtrlData             map[string]*PlayerGameStatics
@@ -909,7 +925,13 @@ func NewPlayerData(acc string, name, headUrl string, id int32, channel, platform
 		logger.Logger.Trace("New player name is empty.")
 		return nil
 	}
+	raw := fmt.Sprintf("%v%v", DEFAULT_PLAYER_SAFEBOX_PWD, common.GetAppId())
+	h := md5.New()
+	io.WriteString(h, raw)
+	pwd := hex.EncodeToString(h.Sum(nil))
 	tNow := time.Now()
+	isRobot := channel == common.Channel_Rob
+
 	pd := &PlayerData{
 		Id:                bson.NewObjectId(),
 		AccountId:         acc,
@@ -920,6 +942,7 @@ func NewPlayerData(acc string, name, headUrl string, id int32, channel, platform
 		SnId:              id,
 		Head:              rand.Int31n(common.HeadRange),
 		HeadUrl:           headUrl,
+		SafeBoxPassword:   pwd,
 		Ip:                ip,
 		RegIp:             ip,
 		Params:            params,
@@ -929,7 +952,7 @@ func NewPlayerData(acc string, name, headUrl string, id int32, channel, platform
 		CreateTime:        tNow.Local(),
 		Ver:               VER_PLAYER_MAX - 1,
 		HeadOutLine:       1,
-		IsRob:             false,
+		IsRob:             isRobot,
 		PackageID:         packTag,
 		YesterdayGameData: NewPlayerGameCtrlData(),
 		TodayGameData:     NewPlayerGameCtrlData(),

model/rabbit_mq.go

@@ -61,3 +61,15 @@ func GeneratePhoneLottery(snid int32, platform string, items string, lotteryType
 	params["Ts"] = strconv.Itoa(int(time.Now().Unix()))
 	return NewRabbitMQData(mq.BackPhoneLottery, params)
 }
+
+// GenerateActivityLog 活动参与log
+// childType 1-点击行为 2-兑换行为
+func GenerateActivityLog(snid int32, platform string, typeId, childType int32) *mq.RabbitMQData {
+	params := make(map[string]string)
+	params["Snid"] = strconv.Itoa(int(snid))
+	params["Platform"] = platform
+	params["TypeId"] = strconv.Itoa(int(typeId))
+	params["ChildType"] = strconv.Itoa(int(childType))
+	params["Ts"] = strconv.FormatInt(time.Now().Unix(), 10)
+	return NewRabbitMQData(mq.BackActivityLog, params)
+}

mq/keyconf.go

@@ -17,6 +17,7 @@ const (
 	BackSystemPermitJoin     = "back_permitjoin"
 	BackSystemPermitTask     = "back_permittask"
 	BackSystemJyb            = "back_jyblog"
+	BackActivityLog          = "back_activitylog"
 )
 
 // mgrsrv

protocol/player/player.proto

@@ -236,6 +236,8 @@ enum PlayerPacketID {
   PACKET_SCClawdollItemLog = 2845;//返回娃娃卡道具记录
   PACKET_CSDollConfig = 2846;	//获取娃娃机配置信息
   PACKET_SCDollConfig = 2847;	//返回娃娃机配置信息
+  PACKET_CSPopUpWindowConfig = 2848;  //获取弹窗配置
+  PACKET_SCPopUpWindowConfig = 2849;  //返回弹窗配置
 }
 
 // 账变记录
@@ -1407,4 +1409,20 @@ message MachineInfo{
   int32 ItemNum = 4;//获得道具数量
   int32 MachineId = 5;
   string Name = 6;
+}
+//获取活动弹窗配置
+//PACKET_CSPopUpWindowConfig
+message CSPopUpWindowConfig{
+}
+//返回活动弹窗配置
+//PACKET_SCPopUpWindowConfig
+message SCPopUpWindowConfig{
+  repeated PopUpWindowInfo Info = 1;
+}
+message PopUpWindowInfo{
+  int32 Id = 1;
+  string Name = 2;
+  string Key = 3;
+  int32 OpenStatus = 4;//1-开启 0-关闭
+  int32 Weight = 5;//弹窗权重
 }

protocol/server/server.proto

@@ -205,6 +205,7 @@ message WGCreateScene {
   MatchParam Match = 16; // 比赛场参数
   repeated int32 ChessRank = 26; // 象棋段位配置
   repeated int64 Params = 27; // 游戏参数,GameRule中定义,不要有其他用途，含义不明确
+  bool CloseCtrl = 28; // 是否关闭开启控制
 }
 
 //PACKET_WG_DESTROYSCENE

protocol/webapi/common.proto

@@ -109,6 +109,7 @@ message GameFree {
   int32 GroupId = 1;                  // 组ID
   bool Status = 2;                    // 开关
   server.DB_GameFree DbGameFree = 3;  // excel导出结构
+  bool CloseCtrl = 4;                // 是否关闭调控开关
 }
 
 // 平台级别游戏配置
@@ -920,6 +921,10 @@ message MachineInfo{
   int32 ItemNum = 7;    //获得道具数量
   string IconAddr = 8;//图片地址
   string Name = 9;//场次名字
+  double BuyPrice = 10; //进货价
+  double CatchPrice = 11; //一次抓取价格
+  double ProfitMin = 12; //盈利区间最小值
+  double ProfitMax = 13; //盈利区间最大值
 }
 // etcd /game/match_audience
 message MatchAudience {
@@ -988,4 +993,17 @@ message ClientUpgrade{
   int32 On = 2; // 开关 1开启 2关闭
   int32 OnForce = 3; // 强制升级开关 1开启 2关闭
   repeated ItemInfo Reward = 4; // 奖励
+}
+
+//etcd /game/PopUpWindowConfig
+message PopUpWindowConfig{
+  string Platform = 1; // 平台
+  repeated PopUpWindowInfo Info = 2;
+}
+message PopUpWindowInfo{
+  int32 Id = 1;
+  string Name = 2;
+  string Key = 3;
+  int32 OpenStatus = 4;//1-开启 2-关闭
+  int32 Weight = 5;//弹窗权重
 }

protocol/webapi/webapi.pb.go

@@ -7265,6 +7265,7 @@ type SACreateOrder struct {
 	ExchangeOrderId string      `protobuf:"bytes,14,opt,name=ExchangeOrderId,proto3" json:"ExchangeOrderId,omitempty"` //兑换订单号
 	Channel         string      `protobuf:"bytes,15,opt,name=Channel,proto3" json:"Channel,omitempty"`                 // 渠道
 	ChannelID       string      `protobuf:"bytes,16,opt,name=ChannelID,proto3" json:"ChannelID,omitempty"`             // 渠道ID
+	BuyType         int32       `protobuf:"varint,17,opt,name=BuyType,proto3" json:"BuyType,omitempty"`                // 购买类型
 }
 
 func (x *SACreateOrder) Reset() {
@@ -7411,6 +7412,13 @@ func (x *SACreateOrder) GetChannelID() string {
 	return ""
 }
 
+func (x *SACreateOrder) GetBuyType() int32 {
+	if x != nil {
+		return x.BuyType
+	}
+	return 0
+}
+
 type ASCreateOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -10294,7 +10302,7 @@ var file_webapi_proto_rawDesc = []byte{
 	0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61,
 	0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12,
 	0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73,
-	0x67, 0x22, 0xdb, 0x03, 0x0a, 0x0d, 0x53, 0x41, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72,
+	0x67, 0x22, 0xf5, 0x03, 0x0a, 0x0d, 0x53, 0x41, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72,
 	0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x68, 0x6f, 0x70, 0x49,
 	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x12,
@@ -10323,213 +10331,215 @@ var file_webapi_proto_rawDesc = []byte{
 	0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x68, 0x61, 0x6e, 0x6e,
 	0x65, 0x6c, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65,
 	0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, 0x44, 0x18, 0x10,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, 0x44, 0x22,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, 0x44, 0x12,
-	0x45, 0x0a, 0x0d, 0x41, 0x53, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72,
+	0x18, 0x0a, 0x07, 0x42, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05,
-	0x12, 0x10, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x54,
+	0x52, 0x07, 0x42, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x45, 0x0a, 0x0d, 0x41, 0x53, 0x43,
-	0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x61,
-	0x03, 0x4d, 0x73, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03,
-	0x09, 0x52, 0x03, 0x55, 0x72, 0x6c, 0x22, 0x54, 0x0a, 0x12, 0x53, 0x41, 0x57, 0x65, 0x62, 0x41,
+	0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x10,
-	0x50, 0x49, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x50, 0x61, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06,
+	0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x72, 0x6c,
-	0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x50, 0x61,
+	0x22, 0x54, 0x0a, 0x12, 0x53, 0x41, 0x57, 0x65, 0x62, 0x41, 0x50, 0x49, 0x53, 0x79, 0x73, 0x74,
-	0x72, 0x61, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x43, 0x42, 0x44, 0x61, 0x74, 0x61, 0x18, 0x02,
+	0x65, 0x6d, 0x50, 0x61, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x43, 0x42, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x16,
-	0x54, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x22, 0x66, 0x0a, 0x12,
+	0x0a, 0x06, 0x43, 0x42, 0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x41, 0x53, 0x57, 0x65, 0x62, 0x41, 0x50, 0x49, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x50, 0x61,
+	0x43, 0x42, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x73, 0x18, 0x03, 0x20, 0x01,
-	0x73, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18,
+	0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x22, 0x66, 0x0a, 0x12, 0x41, 0x53, 0x57, 0x65, 0x62, 0x41,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65,
+	0x50, 0x49, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x50, 0x61, 0x73, 0x73, 0x12, 0x1c, 0x0a, 0x09,
-	0x12, 0x16, 0x0a, 0x06, 0x45, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x52, 0x06, 0x45, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70,
+	0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x45, 0x72,
-	0x6f, 0x6e, 0x73, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x52, 0x65, 0x73, 0x70,
+	0x72, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x45, 0x72, 0x72, 0x4d,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x5f, 0x0a, 0x11, 0x41, 0x53, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61,
+	0x73, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x03,
-	0x63, 0x6b, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x4f, 0x72, 0x64,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x5f,
-	0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4f, 0x72, 0x64, 0x65,
+	0x0a, 0x11, 0x41, 0x53, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x61, 0x79, 0x6d,
-	0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18,
+	0x65, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a,
-	0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+	0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x48, 0x0a, 0x11, 0x53, 0x41, 0x43, 0x61, 0x6c, 0x6c, 0x62,
+	0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61,
-	0x61, 0x63, 0x6b, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61,
+	0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22,
-	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69,
+	0x48, 0x0a, 0x11, 0x53, 0x41, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x61, 0x79,
-	0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a,
+	0x6d, 0x65, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22,
+	0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f,
-	0x1e, 0x0a, 0x0a, 0x41, 0x53, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x10, 0x0a,
+	0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02,
-	0x03, 0x4d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x1e, 0x0a, 0x0a, 0x41, 0x53, 0x52,
-	0x41, 0x0a, 0x0a, 0x53, 0x41, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x21, 0x0a,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x01,
-	0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x41, 0x0a, 0x0a, 0x53, 0x41, 0x52,
-	0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01,
-	0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61,
-	0x73, 0x67, 0x22, 0x7d, 0x0a, 0x09, 0x41, 0x53, 0x53, 0x65, 0x6e, 0x64, 0x53, 0x6d, 0x73, 0x12,
+	0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73,
-	0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53,
+	0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x7d, 0x0a, 0x09,
-	0x6e, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x41, 0x53, 0x53, 0x65, 0x6e, 0x64, 0x53, 0x6d, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69,
-	0x28, 0x09, 0x52, 0x05, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, 0x64,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x14, 0x0a,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a,
+	0x05, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x50, 0x68,
-	0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x6f, 0x6e, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70,
+	0x09, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66,
-	0x65, 0x49, 0x44, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49,
+	0x6f, 0x72, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66,
-	0x44, 0x22, 0x40, 0x0a, 0x09, 0x53, 0x41, 0x53, 0x65, 0x6e, 0x64, 0x53, 0x6d, 0x73, 0x12, 0x21,
+	0x6f, 0x72, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x44, 0x18, 0x05, 0x20,
-	0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x44, 0x22, 0x40, 0x0a, 0x09, 0x53,
-	0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61,
+	0x41, 0x53, 0x65, 0x6e, 0x64, 0x53, 0x6d, 0x73, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18,
-	0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54,
-	0x4d, 0x73, 0x67, 0x22, 0xb9, 0x01, 0x0a, 0x13, 0x41, 0x53, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x74,
+	0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d,
-	0x63, 0x68, 0x41, 0x77, 0x61, 0x72, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70,
+	0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0xb9, 0x01,
-	0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70,
+	0x0a, 0x13, 0x41, 0x53, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x77, 0x61, 0x72,
-	0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18,
+	0x64, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49,
+	0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72,
-	0x74, 0x65, 0x6d, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65,
+	0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x6d, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x4d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01,
+	0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x44, 0x18,
-	0x28, 0x03, 0x52, 0x05, 0x4d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x65, 0x6c,
+	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x44, 0x12, 0x14, 0x0a,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x54, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x43,
+	0x05, 0x4d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x4d, 0x6f,
-	0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43,
+	0x6e, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
-	0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x61, 0x72,
+	0x52, 0x03, 0x54, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70,
-	0x6b, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x22,
+	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70,
-	0x74, 0x0a, 0x13, 0x53, 0x41, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x77, 0x61,
+	0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x72, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20,
+	0x09, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x22, 0x74, 0x0a, 0x13, 0x53, 0x41, 0x47,
-	0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67,
+	0x65, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x77, 0x61, 0x72, 0x64, 0x43, 0x6f, 0x64, 0x65,
-	0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, 0x64,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x14, 0x0a,
-	0x05, 0x4d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4d, 0x6f,
-	0x6e, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x4f, 0x0a, 0x0b, 0x41, 0x53, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x54, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
-	0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
-	0x53, 0x6e, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x54, 0x65, 0x6c, 0x22, 0x42, 0x0a, 0x0b, 0x53, 0x41, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x54, 0x65, 0x6c, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43,
-	0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x22, 0x0a, 0x0e, 0x41, 0x53,
-	0x47, 0x65, 0x74, 0x49, 0x6d, 0x67, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x54, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x54, 0x65, 0x6c, 0x22, 0x77,
-	0x0a, 0x0e, 0x53, 0x41, 0x47, 0x65, 0x74, 0x49, 0x6d, 0x67, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79,
 	0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e,
 	0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03,
-	0x54, 0x61, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61,
+	0x54, 0x61, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74,
+	0x09, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x4d, 0x6f, 0x6e, 0x65, 0x79,
-	0x61, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x10, 0x0a,
-	0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x04, 0x20, 0x01,
+	0x03, 0x4d, 0x73, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22,
-	0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x40, 0x0a, 0x0e, 0x41, 0x53, 0x50, 0x6c, 0x61,
+	0x4f, 0x0a, 0x0b, 0x41, 0x53, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x65, 0x6c, 0x12, 0x1a,
-	0x79, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61,
+	0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61,
+	0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e,
-	0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x02, 0x20,
+	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x10,
-	0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x22, 0x45, 0x0a, 0x0e, 0x53, 0x41, 0x50,
+	0x0a, 0x03, 0x54, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x54, 0x65, 0x6c,
-	0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x03, 0x54,
+	0x22, 0x42, 0x0a, 0x0b, 0x53, 0x41, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x65, 0x6c, 0x12,
-	0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70,
-	0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10,
-	0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67,
-	0x22, 0x44, 0x0a, 0x12, 0x41, 0x53, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x76, 0x69,
-	0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f,
-	0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f,
-	0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x22, 0x5d, 0x0a, 0x12, 0x53, 0x41, 0x50, 0x6c, 0x61, 0x79,
-	0x65, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x21, 0x0a, 0x03,
-	0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61,
-	0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12,
-	0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73,
-	0x67, 0x12, 0x12, 0x0a, 0x04, 0x4c, 0x69, 0x6e, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x9d, 0x01, 0x0a, 0x0d, 0x41, 0x53, 0x41, 0x64, 0x64, 0x49,
-	0x74, 0x65, 0x6d, 0x42, 0x79, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x50,
-	0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50,
-	0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x2c, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49,
-	0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x77, 0x65, 0x62, 0x61,
-	0x70, 0x69, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x49, 0x74, 0x65,
-	0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a,
-	0x06, 0x52, 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52,
-	0x65, 0x6d, 0x61, 0x72, 0x6b, 0x22, 0x44, 0x0a, 0x0d, 0x53, 0x41, 0x41, 0x64, 0x64, 0x49, 0x74,
-	0x65, 0x6d, 0x42, 0x79, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67,
-	0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x3d, 0x0a, 0x0b, 0x41,
-	0x53, 0x53, 0x4d, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c,
-	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c,
-	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x22, 0x97, 0x01, 0x0a, 0x0b, 0x53,
-	0x41, 0x53, 0x4d, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c,
-	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c,
-	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x04, 0x49, 0x6e,
-	0x66, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70,
-	0x69, 0x2e, 0x53, 0x4d, 0x53, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x12,
-	0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77,
-	0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54,
-	0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x4d, 0x73, 0x67, 0x22, 0x33, 0x0a, 0x07, 0x53, 0x4d, 0x53, 0x49, 0x6e, 0x66, 0x6f, 0x12,
-	0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12,
-	0x18, 0x0a, 0x07, 0x53, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x07, 0x53, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x3c, 0x0a, 0x0a, 0x41, 0x53, 0x41,
-	0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66,
-	0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66,
-	0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x14, 0x41, 0x53, 0x50, 0x6f, 0x70,
-	0x55, 0x70, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53,
-	0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x22,
-	0xa4, 0x01, 0x0a, 0x14, 0x53, 0x41, 0x50, 0x6f, 0x70, 0x55, 0x70, 0x57, 0x69, 0x6e, 0x64, 0x6f,
-	0x77, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74,
-	0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74,
-	0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x27, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e,
-	0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66,
-	0x6f, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f,
-	0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52,
-	0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x83, 0x01, 0x0a, 0x0b, 0x57, 0x69, 0x6e, 0x64, 0x6f,
-	0x77, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61,
-	0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x55, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x04, 0x53, 0x6f, 0x72, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74,
-	0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x50, 0x61, 0x72, 0x74, 0x4e,
-	0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x61, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x07, 0x47, 0x61, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x22, 0x24, 0x0a, 0x0a,
-	0x41, 0x53, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x6f,
-	0x6f, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x52, 0x6f, 0x6f, 0x6d,
-	0x49, 0x64, 0x22, 0x5d, 0x0a, 0x09, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12,
-	0x14, 0x0a, 0x05, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
-	0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x02, 0x54, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03,
-	0x20, 0x03, 0x28, 0x03, 0x52, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x4c,
-	0x6f, 0x67, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4c, 0x6f, 0x67, 0x49,
-	0x64, 0x22, 0x7c, 0x0a, 0x0a, 0x53, 0x41, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12,
 	0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77,
 	0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54,
 	0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x4d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x03, 0x20, 0x03,
+	0x03, 0x4d, 0x73, 0x67, 0x22, 0x22, 0x0a, 0x0e, 0x41, 0x53, 0x47, 0x65, 0x74, 0x49, 0x6d, 0x67,
-	0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74,
+	0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x65, 0x6c, 0x18, 0x01, 0x20,
-	0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x54, 0x65, 0x6c, 0x22, 0x77, 0x0a, 0x0e, 0x53, 0x41, 0x47, 0x65,
-	0x52, 0x6f, 0x75, 0x6e, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x22,
+	0x74, 0x49, 0x6d, 0x67, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61,
-	0x48, 0x0a, 0x16, 0x41, 0x53, 0x47, 0x65, 0x74, 0x44, 0x6f, 0x6c, 0x6c, 0x45, 0x78, 0x63, 0x68,
+	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69,
-	0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69,
+	0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x1c, 0x0a,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x1a, 0x0a,
+	0x09, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x52, 0x09, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x43,
-	0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x22, 0x74, 0x0a, 0x16, 0x53, 0x41, 0x47,
+	0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73,
+	0x67, 0x22, 0x40, 0x0a, 0x0e, 0x41, 0x53, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x65, 0x6c,
+	0x65, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12,
+	0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53,
+	0x6e, 0x69, 0x64, 0x22, 0x45, 0x0a, 0x0e, 0x53, 0x41, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43,
+	0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x44, 0x0a, 0x12, 0x41, 0x53,
+	0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b,
+	0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04,
+	0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64,
+	0x22, 0x5d, 0x0a, 0x12, 0x53, 0x41, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x76, 0x69,
+	0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67,
+	0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x4c,
+	0x69, 0x6e, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4c, 0x69, 0x6e, 0x6b, 0x22,
+	0x9d, 0x01, 0x0a, 0x0d, 0x41, 0x53, 0x41, 0x64, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x42, 0x79, 0x49,
+	0x64, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72,
+	0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72,
+	0x6d, 0x12, 0x2c, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x49, 0x74, 0x65,
+	0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+	0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x65, 0x6d, 0x61, 0x72,
+	0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52, 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x22,
+	0x44, 0x0a, 0x0d, 0x53, 0x41, 0x41, 0x64, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x42, 0x79, 0x49, 0x64,
+	0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e,
+	0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03,
+	0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x3d, 0x0a, 0x0b, 0x41, 0x53, 0x53, 0x4d, 0x53, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
+	0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
+	0x53, 0x6e, 0x49, 0x64, 0x22, 0x97, 0x01, 0x0a, 0x0b, 0x53, 0x41, 0x53, 0x4d, 0x53, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
+	0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
+	0x53, 0x6e, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x53, 0x4d, 0x53, 0x49,
+	0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e,
+	0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03,
+	0x4d, 0x73, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x33,
+	0x0a, 0x07, 0x53, 0x4d, 0x53, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x6d, 0x73,
+	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x6d, 0x73, 0x4e,
+	0x61, 0x6d, 0x65, 0x22, 0x3c, 0x0a, 0x0a, 0x41, 0x53, 0x41, 0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f,
+	0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a,
+	0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49,
+	0x64, 0x22, 0x46, 0x0a, 0x14, 0x41, 0x53, 0x50, 0x6f, 0x70, 0x55, 0x70, 0x57, 0x69, 0x6e, 0x64,
+	0x6f, 0x77, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61,
+	0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61,
+	0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x22, 0xa4, 0x01, 0x0a, 0x14, 0x53, 0x41,
+	0x50, 0x6f, 0x70, 0x55, 0x70, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12,
+	0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e,
+	0x49, 0x64, 0x12, 0x27, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x13, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77,
+	0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x21, 0x0a, 0x03, 0x54,
+	0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70,
+	0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10,
+	0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67,
+	0x22, 0x83, 0x01, 0x0a, 0x0b, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x49, 0x6e, 0x66, 0x6f,
+	0x12, 0x1a, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03,
+	0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x72, 0x6c, 0x12, 0x12,
+	0x0a, 0x04, 0x53, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6f,
+	0x72, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x50, 0x61, 0x72, 0x74, 0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07,
+	0x47, 0x61, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x47,
+	0x61, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x22, 0x24, 0x0a, 0x0a, 0x41, 0x53, 0x52, 0x6f, 0x6f, 0x6d,
+	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x22, 0x5d, 0x0a, 0x09,
+	0x52, 0x6f, 0x75, 0x6e, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x52, 0x6f, 0x75,
+	0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12,
+	0x0e, 0x0a, 0x02, 0x54, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x12,
+	0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x03, 0x52, 0x05,
+	0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x4c, 0x6f, 0x67, 0x49, 0x64, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4c, 0x6f, 0x67, 0x49, 0x64, 0x22, 0x7c, 0x0a, 0x0a, 0x53,
+	0x41, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e,
+	0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03,
+	0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x12,
+	0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e,
+	0x49, 0x64, 0x12, 0x25, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x11, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x49,
+	0x6e, 0x66, 0x6f, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x48, 0x0a, 0x16, 0x41, 0x53, 0x47,
 	0x65, 0x74, 0x44, 0x6f, 0x6c, 0x6c, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72,
-	0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
+	0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64,
+	0x05, 0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66,
-	0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x37, 0x0a, 0x09, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4c,
+	0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66,
-	0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x77, 0x65, 0x62, 0x61,
+	0x6f, 0x72, 0x6d, 0x22, 0x74, 0x0a, 0x16, 0x53, 0x41, 0x47, 0x65, 0x74, 0x44, 0x6f, 0x6c, 0x6c,
-	0x70, 0x69, 0x2e, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72,
+	0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a,
-	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2a,
+	0x03, 0x54, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62,
-	0xdc, 0x01, 0x0a, 0x07, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55,
+	0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67,
-	0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, 0x43,
+	0x12, 0x37, 0x0a, 0x09, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20,
-	0x45, 0x53, 0x53, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10,
+	0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x45, 0x78, 0x63,
-	0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x49, 0x47, 0x4e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10,
+	0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09,
-	0x03, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f,
+	0x4f, 0x72, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2a, 0xdc, 0x01, 0x0a, 0x07, 0x54, 0x61,
-	0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f, 0x44,
+	0x67, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e,
-	0x41, 0x54, 0x41, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x4a,
+	0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, 0x43, 0x45, 0x53, 0x53, 0x10, 0x01, 0x12,
-	0x59, 0x42, 0x5f, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x06, 0x12,
+	0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x53,
-	0x11, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x79, 0x5f, 0x4e, 0x6f, 0x74, 0x45, 0x58, 0x49, 0x53, 0x54,
+	0x49, 0x47, 0x4e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x03, 0x12, 0x14, 0x0a, 0x10, 0x50,
-	0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x08, 0x12, 0x0c, 0x0a,
+	0x52, 0x4f, 0x54, 0x4f, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10,
-	0x08, 0x54, 0x65, 0x6c, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x09, 0x12, 0x13, 0x0a, 0x0f, 0x41,
+	0x04, 0x12, 0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x45, 0x52,
-	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x0a,
+	0x52, 0x4f, 0x52, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f, 0x43, 0x4f, 0x44,
-	0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x65, 0x6c, 0x4e, 0x6f, 0x74, 0x42, 0x69, 0x6e, 0x64, 0x10, 0x0b,
+	0x45, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x06, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x6c, 0x61,
-	0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x0c, 0x42, 0x26,
+	0x79, 0x5f, 0x4e, 0x6f, 0x74, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x07, 0x12, 0x09, 0x0a, 0x05,
-	0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f,
+	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x08, 0x12, 0x0c, 0x0a, 0x08, 0x54, 0x65, 0x6c, 0x45, 0x78,
-	0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f,
+	0x69, 0x73, 0x74, 0x10, 0x09, 0x12, 0x13, 0x0a, 0x0f, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x0a, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x65,
+	0x6c, 0x4e, 0x6f, 0x74, 0x42, 0x69, 0x6e, 0x64, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f,
+	0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x0c, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67,
+	0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

protocol/webapi/webapi.proto

@@ -811,6 +811,7 @@ message SACreateOrder {
   string ExchangeOrderId = 14;  //兑换订单号
   string Channel = 15; // 渠道
   string ChannelID = 16; // 渠道ID
+  int32 BuyType = 17; // 购买类型
 }
 message ASCreateOrder {
   int32 Tag = 1; //0.成功 1.失败

shell/programs.txt

@@ -4,5 +4,4 @@ gatesrv
 worldsrv
 gamesrv
 robot
-ranksrv
+ranksrv
-machine

webapi/deprecated.go

@@ -2,10 +2,14 @@ package webapi
 
 import (
 	"errors"
+	"time"
+
+	"mongo.games.com/goserver/core/logger"
+
+	"mongo.games.com/game/model"
+	"mongo.games.com/game/mq"
 	"mongo.games.com/game/proto"
 	"mongo.games.com/game/protocol/webapi"
-	"mongo.games.com/goserver/core/logger"
-	"time"
 )
 
 type PlayerStatement struct {
@@ -109,7 +113,7 @@ func ApiPopupWindowsConfig(appId string, body proto.Message) ([]byte, error) {
 
 // 支付订单 商城
 func API_CreateOrder(appId, orderId string, configid, SnId, shopId int32, platform string, packageTag string, os, deviceId, shopname string,
-	amount [3]int32, consumptionamount int32, itemInfo []*webapi.ItemInfo, exchangeOrderId, channel, channelId string) *webapi.ASCreateOrder {
+	amount [3]int32, consumptionamount int32, itemInfo []*webapi.ItemInfo, exchangeOrderId, channel, channelId string, buyType int32) *webapi.ASCreateOrder {
 	body := &webapi.SACreateOrder{
 		OrderId:         orderId,
 		SnId:            SnId,
@@ -127,6 +131,7 @@ func API_CreateOrder(appId, orderId string, configid, SnId, shopId int32, platfo
 		ExchangeOrderId: exchangeOrderId,
 		Channel:         channel,
 		ChannelID:       channelId,
+		BuyType: buyType,
 	}
 	ret := &webapi.ASCreateOrder{}
 	buff, err := postRequest(appId, "/create_order", nil, body, "http", DEFAULT_TIMEOUT)
@@ -140,6 +145,7 @@ func API_CreateOrder(appId, orderId string, configid, SnId, shopId int32, platfo
 		logger.Logger.Error("API_CreateOrder Unmarshal err:", err)
 		return nil
 	}
+	mq.Write(model.GenerateActivityLog(SnId, platform, buyType, 0))
 	return ret
 }
 

worldsrv/action_bag.go

@@ -269,6 +269,7 @@ func CSUpBagInfo(s *netlib.Session, packetid int, data interface{}, sid int64) e
 				}
 			}
 			gainFunc(common.GainWay_Collect, "player", "集卡活动")
+			mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_CollectBox, 1))
 
 		default:
 			logger.Logger.Warnf("道具使用未定义", msg.ItemId)

worldsrv/action_phonelottery.go

@@ -210,6 +210,7 @@ func (this *CSPhoneLotteryHandler) Process(s *netlib.Session, packetid int, data
 				mq.Write(model.GenerateSystemFreeGive(p.SnId, p.Name, p.Platform, p.Channel, model.SystemFreeGive_PhoneLottery, tp1, v.ItemNum))
 			}
 		}
+		mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_PhoneLottery, 1))
 	}
 	return nil
 }
@@ -419,6 +420,7 @@ func (this *CSDiamondLotteryHandler) Process(s *netlib.Session, packetid int, da
 			p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_DiamondLottery), pack)
 			logger.Logger.Trace("返回钻石抽奖信息：", pack.String())
 		}
+		mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_DiamondLottery, 1))
 	}
 	return nil
 }

worldsrv/action_player.go

@@ -3273,6 +3273,32 @@ func CSCLAWDOLLConfig(s *netlib.Session, packetId int, data interface{}, sid int
 	}
 	return nil
 }
+
+// 客户端请求弹窗配置
+func CSPopUpWindowConfig(s *netlib.Session, packetId int, data interface{}, sid int64) error {
+	p := PlayerMgrSington.GetPlayer(sid)
+	if p == nil {
+		return nil
+	}
+	config := PlatformMgrSingleton.GetConfig(p.Platform).PopUpWindowConfig
+	if config == nil {
+		return nil
+	}
+	pack := &player_proto.SCPopUpWindowConfig{}
+	for _, value := range config.Info {
+		info := &player_proto.PopUpWindowInfo{
+			Id:         value.Id,
+			Name:       value.Name,
+			Key:        value.Key,
+			OpenStatus: value.OpenStatus,
+			Weight:     value.Weight,
+		}
+		pack.Info = append(pack.Info, info)
+	}
+	p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCPopUpWindowConfig), pack)
+	return nil
+}
+
 func init() {
 	// 用户信息
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CS_PLAYERDATA), player_proto.CSPlayerData{}, CSPlayerData)
@@ -3310,4 +3336,6 @@ func init() {
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CSClawdollItemLog), player_proto.CSClawdollItemLog{}, CSClawdollItemLog)
 	//客户端请求配置信息
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CSDollConfig), player_proto.CSCLAWDOLLConfig{}, CSCLAWDOLLConfig)
+	//客户端请求弹窗配置信息
+	common.Register(int(player_proto.PlayerPacketID_PACKET_CSPopUpWindowConfig), player_proto.CSPopUpWindowConfig{}, CSPopUpWindowConfig)
 }

worldsrv/action_task.go

@@ -141,6 +141,9 @@ func SendReward(p *Player, m map[int64]int64, tp int32) {
 			mq.Write(model.GenerateSystemFreeGive(p.SnId, p.Name, p.Platform, p.Channel, giveType, tp, v.ItemNum))
 		}
 	}
+	if giveType == model.SystemFreeGive_GiveType_TaskPermit {
+		mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_Permit, 1))
+	}
 }
 
 func CSTaskList(s *netlib.Session, packetId int, data interface{}, sid int64) error {

worldsrv/action_welfare.go

@@ -1132,6 +1132,7 @@ func CSPermitExchange(s *netlib.Session, packetid int, data interface{}, sid int
 				Gain:     gain,
 				Ts:       now.Unix(),
 			})
+			mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_Permit, 2))
 		}
 	}
 

worldsrv/bagmgr.go

@@ -729,7 +729,7 @@ func (this *BagMgr) AddItems(param *model.AddItemParam) (*BagInfo, bag.OpResultC
 	}
 
 	// 同步游戏服务器
-	if p.scene != nil {
+	if p.scene != nil && !param.IsGame {
 		b, err := netlib.Gob.Marshal(items)
 		if err != nil {
 			logger.Logger.Errorf("AddItems Marshal error(%v)", err)

worldsrv/etcd.go

@@ -102,6 +102,8 @@ func init() {
 	etcd.Register(etcd.ETCDKEY_MACHINE, webapi.MachineConfig{}, platformConfigEvent)
 	//客户端升级奖励配置
 	etcd.Register(etcd.ETCDKEY_ClientUpgrade, webapi.ClientUpgrade{}, platformConfigEvent)
+	//弹窗活动配置
+	etcd.Register(etcd.ETCDKEY_PopUpWindow, webapi.PopUpWindowConfig{}, platformConfigEvent)
 }
 
 func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) {
@@ -338,6 +340,8 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
 		}
 	case *webapi.ClientUpgrade:
 		PlatformMgrSingleton.GetConfig(config.Platform).ClientUpgrade = config
+	case *webapi.PopUpWindowConfig:
+		PlatformMgrSingleton.GetConfig(config.Platform).PopUpWindowConfig = config
 	default:
 		logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey)
 	}

worldsrv/gamesess.go

@@ -163,6 +163,7 @@ func (this *GameSession) AddScene(args *AddSceneParam) {
 		Custom:       args.S.CustomParam,
 		Match:        args.S.MatchParam,
 		Params:       args.S.params,
+		CloseCtrl:    args.S.CloseCtrl,
 	}
 	if args.S.CustomParam.GetRoomConfigId() != 0 {
 		cfg := PlatformMgrSingleton.GetConfig(args.S.platform.IdStr).RoomConfig[args.S.CustomParam.GetRoomConfigId()]

worldsrv/platform.go

@@ -127,6 +127,7 @@ func (cfg *GameList) GetGameConfig(gameFreeId int32) *webapiproto.GameFree {
 func CompareGameFreeConfigChanged(oldCfg, newCfg *webapiproto.GameFree) bool {
 	if oldCfg.Status != newCfg.Status ||
 		oldCfg.GroupId != newCfg.GroupId ||
+		oldCfg.GetCloseCtrl() != newCfg.GetCloseCtrl() ||
 		oldCfg.DbGameFree.GetBot() != newCfg.DbGameFree.GetBot() ||
 		oldCfg.DbGameFree.GetBaseScore() != newCfg.DbGameFree.GetBaseScore() ||
 		oldCfg.DbGameFree.GetLimitCoin() != newCfg.DbGameFree.GetLimitCoin() ||

worldsrv/player.go

@@ -4466,6 +4466,7 @@ func (this *Player) GetWeekCardAwary(id int32) {
 	}
 	ret.WeekCard = info
 	this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SCGetWeekCardAwary), ret)
+	mq.Write(model.GenerateActivityLog(this.SnId, this.Platform, model.ActivityLog_WeekCard, 1))
 	return
 }
 

worldsrv/scene.go

@@ -65,8 +65,10 @@ type Scene struct {
 	*serverproto.CustomParam                               // 房卡场参数
 	*serverproto.MatchParam                                // 比赛场参数
 	*webapiproto.RoomConfigSystem                          // 系统竞技馆房间
-	csp                           *CoinScenePool           // 所在场景池
+	CloseCtrl bool                                         // 调控开关
-	hp                            *HundredSceneMgr         // 百人场房间池
+
+	csp *CoinScenePool   // 所在场景池
+	hp  *HundredSceneMgr // 百人场房间池
 }
 
 // NewScene 创建房间
@@ -146,6 +148,10 @@ func NewScene(args *CreateSceneParam) *Scene {
 	if s.RoomConfigSystem == nil {
 		s.RoomConfigSystem = new(webapiproto.RoomConfigSystem)
 	}
+	gf := PlatformMgrSingleton.GetGameFree(args.Platform.IdStr, args.GF.GetId())
+	if gf != nil {
+		s.CloseCtrl = gf.GetCloseCtrl()
+	}
 	return s
 }
 

worldsrv/shopmgr.go

@@ -707,6 +707,7 @@ func (this *ShopMgr) GainShop(shopInfo *model.ShopInfo, p *Player, vipShopId, po
 			p.AddDiamond(-costNum, 0, gainWay, "sys", shopName)
 		case ShopConsumePhoneScore:
 			p.AddPhoneScore(-costNum, 0, gainWay, "sys", shopName)
+			mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_PhoneLottery, 2))
 		case ShopConsumeDiamondScore:
 			BagMgrSingleton.AddItems(&model.AddItemParam{
 				Platform: p.Platform,
@@ -721,6 +722,7 @@ func (this *ShopMgr) GainShop(shopInfo *model.ShopInfo, p *Player, vipShopId, po
 				Operator: "system",
 				Remark:   "商城购买消耗钻石积分",
 			})
+			mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_DiamondLottery, 2))
 		default:
 			logger.Logger.Errorf("GainShop ConstType[%v] err", shopInfo.ConstType)
 			return shop.OpResultCode_OPRC_Error
@@ -1327,8 +1329,18 @@ func (this *ShopMgr) SendAPICreateOrder(p *Player, ConfigPayId int32, data any,
 				logger.Logger.Errorf("model.InsertDbShopLog err:", err)
 				return nil
 			}
+			buyType := model.ActivityLog_Shop
+			if shopInfo.Page == ShopPagePermit {
+				buyType = model.ActivityLog_Permit
+			}
+			if shopInfo.Page == ShopPageDiamondBank {
+				buyType = model.ActivityLog_PigBank
+			}
+			if shopInfo.Page == ShopPageGift {
+				buyType = model.ActivityLog_WeekCard
+			}
 			return webapi.API_CreateOrder(common.GetAppId(), dbShop.LogId.Hex(), ConfigPayId, p.SnId, shopInfo.Id, p.Platform, p.PackageID, p.DeviceOS,
-				p.DeviceId, shopInfo.Name, amount, costNum, webItemInfo, "", p.Channel, p.ChannelId)
+				p.DeviceId, shopInfo.Name, amount, costNum, webItemInfo, "", p.Channel, p.ChannelId, int32(buyType))
 
 		} else if cdata, ok := data.(*ExchangeShopInfo); ok {
 			var info *shop.ExchangeType
@@ -1353,7 +1365,7 @@ func (this *ShopMgr) SendAPICreateOrder(p *Player, ConfigPayId int32, data any,
 			//兑换 充值订单
 			logger.Logger.Infof("客户端请求兑换 创建支付订单！AppId = %v,SnId = %v,Id = %v,dbShop.LogId.Hex() = %v,cash = %v", common.GetAppId(), p.SnId, cdata.Id, dbShop.LogId.Hex(), info.Cash*cdata.ExchangeNum)
 			return webapi.API_CreateOrder(common.GetAppId(), dbShop.LogId.Hex(), ConfigPayId, p.SnId, cdata.Id, p.Platform, p.PackageID, p.DeviceOS,
-				p.DeviceId, cdata.Name, amount, info.Cash*cdata.ExchangeNum, nil, orderId, p.Channel, p.ChannelId)
+				p.DeviceId, cdata.Name, amount, info.Cash*cdata.ExchangeNum, nil, orderId, p.Channel, p.ChannelId, model.ActivityLog_Exchange)
 		} else if bbd, ok := data.(*webapi_proto.BlindBoxData); ok {
 			if bbd.Type == ShopTypeCoin {
 				//金币
@@ -1370,7 +1382,7 @@ func (this *ShopMgr) SendAPICreateOrder(p *Player, ConfigPayId int32, data any,
 				return nil
 			}
 			return webapi.API_CreateOrder(common.GetAppId(), dbShop.LogId.Hex(), ConfigPayId, p.SnId, 0, p.Platform, p.PackageID, p.DeviceOS,
-				p.DeviceId, bbd.Name, amount, int32(bbd.Price2), nil, "", p.Channel, p.ChannelId)
+				p.DeviceId, bbd.Name, amount, int32(bbd.Price2), nil, "", p.Channel, p.ChannelId, model.ActivityLog_BlindBox)
 		} else if wfs, ok := data.(*webapi_proto.WelfareSpree); ok {
 			var items []model.ItemInfo
 			var webItemInfo []*webapi_proto.ItemInfo
@@ -1391,8 +1403,10 @@ func (this *ShopMgr) SendAPICreateOrder(p *Player, ConfigPayId int32, data any,
 				}
 			}
 			var gainWay int32 = common.GainWay_ActFirstPay
+			buyType := model.ActivityLog_FirstPay
 			if remark == "ContinuousPay" {
 				gainWay = common.GainWay_ActContinuousPay
+				buyType = model.ActivityLog_ContinuousPay
 			}
 			dbShop = this.NewDbShop(p, 0, amount[:], ShopConsumeMoney, int32(wfs.Price2), gainWay, items, 0, "", 0, remark, []int32{wfs.Day})
 			err := model.InsertDbShopLog(dbShop)
@@ -1401,7 +1415,7 @@ func (this *ShopMgr) SendAPICreateOrder(p *Player, ConfigPayId int32, data any,
 				return nil
 			}
 			return webapi.API_CreateOrder(common.GetAppId(), dbShop.LogId.Hex(), ConfigPayId, p.SnId, 0, p.Platform, p.PackageID, p.DeviceOS,
-				p.DeviceId, "FirstRecharge", amount, int32(wfs.Price2), webItemInfo, "", p.Channel, p.ChannelId)
+				p.DeviceId, "FirstRecharge", amount, int32(wfs.Price2), webItemInfo, "", p.Channel, p.ChannelId, int32(buyType))
 		}
 		return nil
 	}), task.CompleteNotifyWrapper(func(retdata interface{}, t task.Task) {

worldsrv/welfmgr.go

@@ -404,6 +404,7 @@ func (this *WelfareMgr) GetTurnplate(p *Player) {
 	}
 	logger.Logger.Tracef("GetTurnplate  snid: %v pack: %v", p.SnId, pack)
 	p.SendToClient(int(welfare.SPacketID_PACKET_SC_WELF_GETTURNPLATE), pack)
+	mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_Sign, 1))
 }
 
 // GetTurnplteVideo 转盘视频奖励