添加娃娃机协议pb

common/constant.go

@@ -86,6 +86,7 @@ const (
 	GameId_CaoThap                        = 605 //CaoThap
 	GameId_AngerUncle                     = 606 // 愤怒大叔
 	GameId_SmallRoket                     = 607 // 小火箭
+	GameId_Clawdoll                       = 609 // 娃娃机
 	__GameId_ThrGame_Min__                = 700 //################三方类################
 	GameId_Thr_Dg                         = 701 //DG Game
 	GameId_Thr_XHJ                        = 901 //DG Game
@@ -104,6 +105,7 @@ const (
 	GameDifTamQuoc     = "305" // 百战成神
 	GameDifFruits      = "306" // 水果机
 	GameDifRichblessed = "307" // 多彩多福
+	GameDifClawdoll    = "609" // 娃娃机
 )
 
 // IsTienLenYuLe TienLen娱乐

data/DB_GameFree.json

@@ -6390,39 +6390,6 @@
 			],
 			"PlayerWaterRate": 100,
 			"BetWaterRate": 100
-		},
-		{
-			"Id": 6080001,
-			"Name": "娃娃机",
-			"Title": "1",
-			"GameId": 608,
-			"GameRule": 60800,
-			"GameType": 1,
-			"SceneType": 1,
-			"Desc": "0",
-			"ShowType": 3,
-			"ShowId": 60800,
-			"BaseScore": 1000,
-			"Turn": 60800,
-			"BetDec": "1000",
-			"Ai": [
-				0
-			],
-			"OtherIntParams": [
-				0
-			],
-			"RobotNumRng": [
-				0
-			],
-			"SameIpLimit": 1,
-			"GameDif": "608",
-			"GameClass": 2,
-			"PlatformName": "越南棋牌",
-			"MaxBetCoin": [
-				0
-			],
-			"PlayerWaterRate": 100,
-			"BetWaterRate": 100
 		}
 	]
 }

data/DB_GameRule.json

@@ -195,11 +195,6 @@
 			"Name": "多财多福",
 			"GameId": 307,
 			"GameDif": "307"
-		},
-		{
-			"Id": 60800,
-			"Name": "娃娃机",
-			"GameId": 608
 		}
 	]
 }

gamerule/clawdoll/constants.go

@@ -0,0 +1,25 @@
+package clawdoll
+
+import "time"
+
+// 场景状态
+const (
+	ClawDollSceneStateWait     int = iota //等待状态
+	ClawDollSceneStateStart               //开始倒计时
+	ClawDollSceneStatePlayGame            //游戏中
+	ClawDollSceneStateBilled              //结算
+	ClawDollSceneStateMax
+)
+
+const (
+	ClawDollSceneWaitTimeout   = time.Second * 2 //等待倒计时
+	ClawDollSceneStartTimeout  = time.Second * 6 //开始倒计时
+	ClawDollSceneBilledTimeout = time.Second * 2 //结算
+)
+
+// 玩家操作
+const (
+	ClawDollPlayerOpScore = iota + 1 // 上分
+	ClawDollPlayerOpGo               // 下抓
+	ClawDollPlayerOpMove             // 移动方向
+)

gamerule/clawdoll/logic.go

@@ -0,0 +1,4 @@
+package clawdoll
+
+type Logic struct {
+}

gamesrv/base/player.go

@@ -114,7 +114,7 @@ type Player struct {
 	sparams            map[int]string      //字符参数
 	IsLocal            bool                //是否本地player
 	Items              map[int32]int64     //背包数据
-	MatchParams        []int32             //比赛参数 排名、段位、假snid、假角色、假皮肤
+	MatchParams        []int32             //比赛参数 排名、段位、假snid、假角色
 	MatchRobotGrades   []MatchRobotGrade
 	TestLog            []string        // 调试日志
 	RankScore          map[int32]int64 // 段位积分

gamesrv/clawdoll/action_clawdoll.go

@@ -0,0 +1,55 @@
+package clawdoll
+
+import (
+	"mongo.games.com/game/common"
+	"mongo.games.com/game/gamesrv/base"
+	"mongo.games.com/game/protocol/clawdoll"
+	"mongo.games.com/goserver/core/logger"
+	"mongo.games.com/goserver/core/netlib"
+)
+
+type CSPlayerOpPacketFactory struct {
+}
+
+type CSPlayerOpHandler struct {
+}
+
+func (f *CSPlayerOpPacketFactory) CreatePacket() interface{} {
+	pack := &clawdoll.CSCLAWDOLLOp{}
+	return pack
+}
+
+func (h *CSPlayerOpHandler) Process(s *netlib.Session, packetid int, data interface{}, sid int64) error {
+	logger.Logger.Trace("CSPlayerOpHandler Process recv ", data)
+	if msg, ok := data.(*clawdoll.CSCLAWDOLLOp); ok {
+		p := base.PlayerMgrSington.GetPlayer(sid)
+		if p == nil {
+			logger.Logger.Warn("CSPlayerOpHandler p == nil")
+			return nil
+		}
+		scene := p.GetScene()
+		if scene == nil {
+			logger.Logger.Warn("CSPlayerOpHandler p.scene == nil")
+			return nil
+		}
+
+		if scene.KeyGameDif != common.GameDifClawdoll {
+			logger.Logger.Error("CSPlayerOpHandler gameId Error ", scene.GameId)
+			return nil
+		}
+		if !scene.HasPlayer(p) {
+			return nil
+		}
+		sp := scene.GetScenePolicy()
+		if sp != nil {
+			sp.OnPlayerOp(scene, p, int(msg.GetOpCode()), msg.GetParams())
+		}
+		return nil
+	}
+	return nil
+}
+
+func init() {
+	common.RegisterHandler(int(clawdoll.CLAWDOLLPacketID_PACKET_CS_CLAWDOLL_PLAYEROP), &CSPlayerOpHandler{})
+	netlib.RegisterFactory(int(clawdoll.CLAWDOLLPacketID_PACKET_CS_CLAWDOLL_PLAYEROP), &CSPlayerOpPacketFactory{})
+}

gamesrv/clawdoll/player_clawdoll.go

@@ -0,0 +1,71 @@
+package clawdoll
+
+import (
+	"mongo.games.com/game/gamesrv/base"
+	"mongo.games.com/goserver/core/logger"
+)
+
+type PlayerEx struct {
+	*base.Player //玩家信息
+
+	gainCoin int64 // 本局赢的金币
+	taxCoin  int64 // 本局税收
+	odds     int32
+}
+
+func (this *PlayerEx) Clear(baseScore int32) {
+	this.UnmarkFlag(base.PlayerState_WaitNext)
+	this.UnmarkFlag(base.PlayerState_GameBreak)
+	this.MarkFlag(base.PlayerState_Ready)
+
+	this.gainCoin = 0
+	this.taxCoin = 0
+	this.odds = 0
+}
+
+func (this *PlayerEx) CanOp(sceneEx *SceneEx) bool {
+	if !this.IsGameing() {
+		logger.Logger.Trace("(this *PlayerEx) CanOp return false ", this.SnId)
+		return false
+	}
+	return true
+}
+
+func (this *PlayerEx) CanPayCoinByPos() bool {
+
+	return false
+}
+
+// 游戏新一局 设置数据
+func (this *PlayerEx) ReStartGame() {
+	this.ReBetDataStartGame()
+	this.gainCoin = 0
+	this.taxCoin = 0
+	this.odds = 0
+}
+
+// 初始化
+func (this *PlayerEx) InitData(baseScore int32) {
+
+}
+
+// 重置下注数据
+func (this *PlayerEx) ResetBetData() {
+
+}
+
+// 游戏新一局 设置数据
+func (this *PlayerEx) ReBetDataStartGame() {
+
+}
+
+func (this *PlayerEx) CanPlayerOpInState(sceneState int) bool {
+
+	return false
+}
+
+// 能否退出游戏
+func (this *PlayerEx) CanLeaveScene(sceneState int) bool {
+
+	return true
+}

gamesrv/clawdoll/scene_clawdoll.go

@@ -0,0 +1,205 @@
+package clawdoll
+
+import (
+	"mongo.games.com/game/protocol/clawdoll"
+	"mongo.games.com/goserver/core/logger"
+
+	"mongo.games.com/game/common"
+	rule "mongo.games.com/game/gamerule/clawdoll"
+	"mongo.games.com/game/gamesrv/base"
+	"mongo.games.com/game/proto"
+)
+
+type PlayerData struct {
+	SnId  int32
+	Head  int32  //头像框
+	VIP   int32  //VIP帐号 等级
+	Name  string //名字
+	Sex   int32  //性别
+	IsRob bool
+
+	Coin     int64
+	gainCoin int64 //本局赢的金币
+	taxCoin  int64 //本局税收
+	isBilled bool  //是否结算
+	CurIsWin int64 //当局输赢   负数：输  正数：赢
+
+	InviterId        int32  //邀请人Id
+	BeUnderAgentCode string //隶属经销商（推广人）
+	IsPlayerFirst    bool
+
+	Platform  string //平台
+	Channel   string //渠道信息
+	PackageID string //推广包标识 对应客户端的packagetag
+	flag      int
+}
+
+type SceneEx struct {
+	*base.Scene                        // 场景
+	logic        *rule.Logic           //
+	players      map[int32]*PlayerEx   // 玩家信息
+	PlayerBackup map[int32]*PlayerData // 本局离场玩家数据备份
+	seats        []*PlayerEx           // 本局游戏中的玩家状态数据
+
+	RoundId  int // 局数，第几局
+	robotNum int // 参与游戏的机器人数量
+	logid    string
+}
+
+// 游戏是否能开始
+func (this *SceneEx) CanStart() bool {
+	//人数>=1自动开始
+	if len(this.players) >= 0 && (this.GetRealPlayerNum() >= 0 || this.IsPreCreateScene()) {
+		return true
+	}
+	return false
+}
+
+// 从房间删除玩家
+func (this *SceneEx) delPlayer(p *base.Player) {
+	if p, exist := this.players[p.SnId]; exist {
+		this.seats[p.GetPos()] = nil
+		delete(this.players, p.SnId)
+	}
+}
+
+// 广播玩家离开
+func (this *SceneEx) BroadcastPlayerLeave(p *base.Player, reason int) {
+	scLeavePack := &clawdoll.SCCLAWDOLLPlayerLeave{
+		Pos: proto.Int(p.GetPos()),
+	}
+	proto.SetDefaults(scLeavePack)
+
+	this.Broadcast(int(clawdoll.CLAWDOLLPacketID_PACKET_SC_CLAWDOLL_PlayerLeave), scLeavePack, p.GetSid())
+}
+
+// 玩家离开事件
+func (this *SceneEx) OnPlayerLeave(p *base.Player, reason int) {
+	this.delPlayer(p)
+	this.BroadcastPlayerLeave(p, reason)
+}
+func (this *SceneEx) SceneDestroy(force bool) {
+	//销毁房间
+	this.Scene.Destroy(force)
+}
+
+func (e *SceneEx) playerOpPack(snId int32, opcode int, opRetCode clawdoll.OpResultCode, params []int64) *clawdoll.SCCLAWDOLLOp {
+	pack := &clawdoll.SCCLAWDOLLOp{
+		SnId:      proto.Int32(snId),
+		OpCode:    proto.Int32(int32(opcode)),
+		Params:    params,
+		OpRetCode: clawdoll.OpResultCode_OPRC_Success,
+	}
+
+	proto.SetDefaults(pack)
+	return pack
+}
+
+// OnPlayerSCOp 发送玩家操作情况
+func (e *SceneEx) OnPlayerSCOp(p *base.Player, opcode int, opRetCode clawdoll.OpResultCode, params []int64) {
+	pack := e.playerOpPack(p.SnId, opcode, opRetCode, params)
+	p.SendToClient(int(clawdoll.CLAWDOLLPacketID_PACKET_SC_CLAWDOLL_PLAYEROP), pack)
+	logger.Logger.Tracef("OnPlayerSCOp %s", pack)
+}
+
+// 房间信息打包
+func (this *SceneEx) ClawdollCreateRoomInfoPacket(s *base.Scene, p *base.Player) interface{} {
+	pack := &clawdoll.SCCLAWDOLLRoomInfo{
+		RoomId:      proto.Int(s.GetSceneId()),
+		GameId:      proto.Int(s.GetGameId()),
+		RoomMode:    proto.Int(s.GetSceneMode()),
+		Params:      common.CopySliceInt64ToInt32(s.Params),
+		State:       proto.Int(s.GetSceneState().GetState()),
+		TimeOut:     proto.Int(s.GetSceneState().GetTimeout(s)),
+		TotalPlayer: proto.Int(len(this.players)),
+		RoundId:     proto.Int(this.RoundId),
+		ParamsEx:    nil,
+		GameFreeId:  0,
+		BaseScore:   proto.Int32(this.GetBaseScore()),
+	}
+
+	// 玩家信息
+	for _, playerEx := range this.players {
+
+		if p.SnId == playerEx.SnId {
+			pd := &clawdoll.CLAWDOLLPlayerData{
+				SnId:        proto.Int32(playerEx.SnId),
+				Name:        proto.String(playerEx.Name),
+				Head:        proto.Int32(playerEx.Head),
+				Sex:         proto.Int32(playerEx.Sex),
+				Coin:        proto.Int64(playerEx.Coin),
+				Flag:        proto.Int(playerEx.GetFlag()),
+				HeadOutLine: proto.Int32(playerEx.HeadOutLine),
+				VIP:         proto.Int32(playerEx.VIP),
+
+				WinCoin: proto.Int64(playerEx.gainCoin),
+			}
+
+			pack.Players = append(pack.Players, pd)
+		}
+	}
+
+	proto.SetDefaults(pack)
+	if p != nil {
+		p.SyncFlag()
+	}
+
+	return pack
+}
+
+func NewClawdollSceneData(s *base.Scene) *SceneEx {
+	sceneEx := &SceneEx{
+		Scene:        s,
+		logic:        new(rule.Logic),
+		players:      make(map[int32]*PlayerEx),
+		seats:        make([]*PlayerEx, s.GetPlayerNum()),
+		PlayerBackup: make(map[int32]*PlayerData),
+	}
+
+	return sceneEx
+}
+
+func (this *SceneEx) init() bool {
+	this.Clear()
+	return true
+}
+
+// 检查上分是否合法
+func (this *SceneEx) CheckPayOp(betVal int64, takeMul int64) bool { //游戏底分
+	return true
+}
+
+func (this *SceneEx) Clear() {
+	this.robotNum = 0
+	this.PlayerBackup = make(map[int32]*PlayerData)
+	this.RoundId = 0
+
+	for i := 0; i < this.GetPlayerNum(); i++ {
+		if this.seats[i] != nil {
+			this.seats[i].Clear(this.GetBaseScore())
+		}
+	}
+}
+
+func (this *SceneEx) BackupPlayer(p *PlayerEx, isBilled bool) {
+	this.PlayerBackup[p.SnId] = &PlayerData{
+		SnId:             p.SnId,
+		gainCoin:         p.gainCoin,
+		taxCoin:          p.taxCoin,
+		isBilled:         isBilled,
+		IsRob:            p.IsRob,
+		Coin:             p.Coin,
+		Head:             p.Head,
+		flag:             p.GetFlag(),
+		Platform:         p.Platform,
+		Channel:          p.Channel,
+		PackageID:        p.PackageID,
+		CurIsWin:         p.CurIsWin,
+		Name:             p.Name,
+		Sex:              p.Sex,
+		VIP:              p.VIP,
+		InviterId:        p.InviterId,
+		IsPlayerFirst:    this.IsPlayerFirst(p.Player),
+		BeUnderAgentCode: p.BeUnderAgentCode,
+	}
+}

gamesrv/clawdoll/scenepolicy_clawdoll.go

@@ -0,0 +1,582 @@
+package clawdoll
+
+import (
+	"mongo.games.com/game/protocol/clawdoll"
+	"time"
+
+	"mongo.games.com/goserver/core"
+	"mongo.games.com/goserver/core/logger"
+
+	"mongo.games.com/game/common"
+	rule "mongo.games.com/game/gamerule/clawdoll"
+	"mongo.games.com/game/gamesrv/base"
+	"mongo.games.com/game/proto"
+)
+
+var PolicyClawdollSingleton = &PolicyClawdoll{}
+
+type PolicyClawdoll struct {
+	base.BaseScenePolicy
+	states [rule.ClawDollSceneStateMax]base.SceneState
+}
+
+// SCDeviceAction 娃娃机操作信息
+type SCDeviceAction struct {
+	DeviceID string `json:"id"`     //设备ID
+	Action   int    `json:"action"` //操作信息
+}
+
+func (this *PolicyClawdoll) CreateSceneExData(s *base.Scene) interface{} {
+	sceneEx := NewClawdollSceneData(s)
+	if sceneEx != nil {
+		if sceneEx.init() {
+			s.ExtraData = sceneEx
+		}
+	}
+	return sceneEx
+}
+
+func (this *PolicyClawdoll) CreatePlayerExData(s *base.Scene, p *base.Player) interface{} {
+	playerEx := &PlayerEx{Player: p}
+	if playerEx != nil {
+		p.ExtraData = playerEx
+	}
+	return playerEx
+}
+
+func (this *PolicyClawdoll) OnStart(s *base.Scene) {
+	logger.Logger.Trace("(this *PolicyClawdoll) OnStart, sceneId=", s.GetSceneId())
+
+	sceneEx := NewClawdollSceneData(s)
+	if sceneEx != nil {
+		if sceneEx.init() {
+			s.ExtraData = sceneEx
+			s.ChangeSceneState(rule.ClawDollSceneStateWait)
+		}
+	}
+}
+
+func (this *PolicyClawdoll) OnStop(s *base.Scene) {
+	logger.Logger.Trace("(this *PolicyClawdoll) OnStop , sceneId=", s.GetSceneId())
+}
+
+func (this *PolicyClawdoll) OnTick(s *base.Scene) {
+	if s == nil {
+		return
+	}
+	if s.SceneState != nil {
+		s.SceneState.OnTick(s)
+	}
+}
+
+func (this *PolicyClawdoll) OnPlayerEnter(s *base.Scene, p *base.Player) {
+	if s == nil || p == nil {
+		return
+	}
+
+	logger.Logger.Trace("(this *PolicyClawdoll) OnPlayerEnter, sceneId=", s.GetSceneId(), " player=", p.SnId)
+
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		pos := -1
+		for i := 0; i < sceneEx.GetPlayerNum(); i++ {
+			if sceneEx.seats[i] == nil {
+				pos = i
+				break
+			}
+		}
+		if pos != -1 {
+			playerEx := &PlayerEx{Player: p}
+			sceneEx.seats[pos] = playerEx
+			sceneEx.players[p.SnId] = playerEx
+
+			baseScore := sceneEx.GetBaseScore()
+
+			p.Pos = pos
+			p.ExtraData = playerEx
+			playerEx.Clear(baseScore)
+
+			if sceneEx.Gaming {
+				p.MarkFlag(base.PlayerState_WaitNext)
+				p.UnmarkFlag(base.PlayerState_Ready)
+			}
+
+			//给自己发送房间信息
+			this.SendRoomInfo(s, p, sceneEx)
+			s.FirePlayerEvent(p, base.PlayerEventEnter, nil)
+		}
+	}
+}
+
+func (this *PolicyClawdoll) OnPlayerLeave(s *base.Scene, p *base.Player, reason int) {
+	logger.Logger.Trace("(this *PolicyClawdoll) OnPlayerLeave, sceneId=", s.GetSceneId(), " player=", p.SnId)
+	if s == nil || p == nil {
+		return
+	}
+	if !this.CanChangeCoinScene(s, p) {
+		return
+	}
+
+	sceneEx, ok := s.ExtraData.(*SceneEx)
+	if !ok {
+		return
+	}
+	playerEx, ok := p.ExtraData.(*PlayerEx)
+	if !ok {
+		return
+	}
+
+	isBilled := false
+
+	// 游戏已开始，玩家离开，备份玩家数据
+	if sceneEx.Gaming {
+		sceneEx.BackupPlayer(playerEx, isBilled)
+	}
+
+	// 清理玩家数据
+	sceneEx.OnPlayerLeave(p, reason)
+	s.FirePlayerEvent(p, base.PlayerEventLeave, nil)
+}
+
+func (this *PolicyClawdoll) OnPlayerDropLine(s *base.Scene, p *base.Player) {
+	if s == nil || p == nil {
+		return
+	}
+	logger.Logger.Trace("(this *PolicyClawdoll) OnPlayerDropLine, sceneId=", s.GetSceneId(), " player=", p.SnId)
+	s.FirePlayerEvent(p, base.PlayerEventDropLine, nil)
+}
+
+func (this *PolicyClawdoll) OnPlayerRehold(s *base.Scene, p *base.Player) {
+	if s == nil || p == nil {
+		return
+	}
+	logger.Logger.Trace("(this *PolicyClawdoll) OnPlayerRehold, sceneId=", s.GetSceneId(), " player=", p.SnId)
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		if _, ok := p.ExtraData.(*PlayerEx); ok {
+			//发送房间信息给自己
+			if p.IsGameing() {
+				p.MarkFlag(base.PlayerState_Ready)
+			}
+			this.SendRoomInfo(s, p, sceneEx)
+			s.FirePlayerEvent(p, base.PlayerEventRehold, nil)
+		}
+	}
+}
+
+func (this *PolicyClawdoll) OnPlayerReturn(s *base.Scene, p *base.Player) {
+	if s == nil || p == nil {
+		return
+	}
+	logger.Logger.Trace("(this *PolicyClawdoll) OnPlayerRehold, sceneId=", s.GetSceneId(), " player=", p.SnId)
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		if _, ok := p.ExtraData.(*PlayerEx); ok {
+			//发送房间信息给自己
+			if p.IsGameing() {
+				p.MarkFlag(base.PlayerState_Ready)
+			}
+			this.SendRoomInfo(s, p, sceneEx)
+			s.FirePlayerEvent(p, base.PlayerEventReturn, nil)
+		}
+	}
+}
+
+func (this *PolicyClawdoll) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, params []int64) bool {
+	if s == nil || p == nil {
+		return false
+	}
+	logger.Logger.Trace("(this *PolicyClawdoll) OnPlayerOp, sceneId=", s.GetSceneId(), " player=", p.SnId, " opcode=", opcode, " params=", params)
+	if s.SceneState != nil {
+		p.LastOPTimer = time.Now()
+		p.Trusteeship = 0
+		return s.SceneState.OnPlayerOp(s, p, opcode, params)
+	}
+	return true
+}
+
+func (this *PolicyClawdoll) OnPlayerEvent(s *base.Scene, p *base.Player, evtcode int, params []int64) {
+	if s == nil || p == nil {
+		return
+	}
+	logger.Logger.Trace("(this *PolicyClawdoll) OnPlayerEvent, sceneId=", s.GetSceneId(), " player=", p.SnId, " eventcode=", evtcode, " params=", params)
+	if s.SceneState != nil {
+		s.SceneState.OnPlayerEvent(s, p, evtcode, params)
+	}
+}
+
+func (this *PolicyClawdoll) IsCompleted(s *base.Scene) bool {
+	if s == nil {
+		return false
+	}
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		return !sceneEx.Gaming
+	}
+	return false
+}
+
+func (this *PolicyClawdoll) IsCanForceStart(s *base.Scene) bool {
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		return len(s.Players) >= 2 && !sceneEx.Gaming
+	}
+	return false
+}
+
+func (this *PolicyClawdoll) ForceStart(s *base.Scene) {
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		if sceneEx.SceneState.GetState() == rule.ClawDollSceneStateWait {
+			s.ChangeSceneState(rule.ClawDollSceneStateStart)
+		}
+	}
+}
+
+// 当前状态能否退出游戏
+func (this *PolicyClawdoll) CanChangeCoinScene(s *base.Scene, p *base.Player) bool {
+	if s == nil || p == nil {
+		return false
+	}
+	if s.GetSceneState() != nil {
+		return s.GetSceneState().CanChangeCoinScene(s, p)
+	}
+
+	return true
+}
+
+func (this *PolicyClawdoll) SendRoomInfo(s *base.Scene, p *base.Player, sceneEx *SceneEx) {
+	pack := sceneEx.ClawdollCreateRoomInfoPacket(s, p)
+	p.SendToClient(int(clawdoll.CLAWDOLLPacketID_PACKET_SC_CLAWDOLL_ROOMINFO), pack)
+}
+
+// 广播房间状态
+func ClawdollBroadcastRoomState(s *base.Scene, params ...float32) {
+	pack := &clawdoll.SCCLAWDOLLRoomState{
+		State:  proto.Int(s.SceneState.GetState()),
+		Params: params,
+	}
+	s.Broadcast(int(clawdoll.CLAWDOLLPacketID_PACKET_SC_CLAWDOLL_ROOMSTATE), pack, 0)
+}
+
+//=====================================
+// BaseState 状态基类
+//=====================================
+
+type BaseState struct {
+}
+
+func (this *BaseState) GetTimeout(s *base.Scene) int {
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		return int(time.Now().Sub(sceneEx.StateStartTime) / time.Second)
+	}
+	return 0
+}
+
+func (this *BaseState) CanChangeTo(s base.SceneState) bool {
+	return true
+}
+
+func (this *BaseState) CanChangeCoinScene(s *base.Scene, p *base.Player) bool {
+
+	//playerEx, ok := p.ExtraData.(*PlayerEx)
+	//if !ok {
+	//	return false
+	//}
+	//
+	//if !playerEx.CanLeaveScene(s.GetSceneState().GetState()) {
+	//	return false
+	//}
+
+	return true
+}
+
+func (this *BaseState) OnEnter(s *base.Scene) {
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		sceneEx.StateStartTime = time.Now()
+	}
+}
+
+func (this *BaseState) OnLeave(s *base.Scene) {}
+
+func (this *BaseState) OnTick(s *base.Scene) {
+}
+
+func (this *BaseState) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, params []int64) bool {
+
+	return false
+}
+
+func (this *BaseState) OnPlayerEvent(s *base.Scene, p *base.Player, evtcode int, params []int64) {
+}
+
+//=====================================
+// StateWait 等待中
+//=====================================
+
+type StateWait struct {
+	BaseState
+}
+
+func (this *StateWait) GetState() int {
+	return rule.ClawDollSceneStateWait
+}
+
+func (this *StateWait) CanChangeTo(s base.SceneState) bool {
+	if s.GetState() == rule.ClawDollSceneStateStart {
+		return true
+	}
+	return false
+}
+
+func (this *StateWait) GetTimeout(s *base.Scene) int {
+
+	return this.BaseState.GetTimeout(s)
+}
+
+func (this *StateWait) OnEnter(s *base.Scene) {
+	this.BaseState.OnEnter(s)
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		if s.Gaming {
+			s.NotifySceneRoundPause()
+		}
+		s.Gaming = false
+
+		ClawdollBroadcastRoomState(s, float32(0), float32(0))
+
+		if sceneEx.CanStart() {
+			s.ChangeSceneState(rule.ClawDollSceneStateStart)
+		}
+	}
+}
+
+// 玩家事件
+func (this *StateWait) OnPlayerEvent(s *base.Scene, p *base.Player, evtcode int, params []int64) {
+	logger.Logger.Trace("(this *StateWait) OnPlayerEvent, sceneId=", s.GetSceneId(), " player=", p.SnId, " evtcode=", evtcode)
+	this.BaseState.OnPlayerEvent(s, p, evtcode, params)
+	if _, ok := s.ExtraData.(*SceneEx); ok {
+		switch evtcode {
+		case base.PlayerEventLeave:
+		case base.PlayerEventEnter:
+			if !p.IsReady() {
+				p.MarkFlag(base.PlayerState_Ready)
+				p.SyncFlag()
+			}
+		}
+	}
+}
+
+func (this *StateWait) OnTick(s *base.Scene) {
+	this.BaseState.OnTick(s)
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		if s.CheckNeedDestroy() {
+			sceneEx.SceneDestroy(true)
+			return
+		}
+		if time.Now().Sub(sceneEx.StateStartTime) > rule.ClawDollSceneWaitTimeout {
+			//切换到准备开局状态
+			if sceneEx.CanStart() {
+				s.ChangeSceneState(rule.ClawDollSceneStateStart)
+			}
+		}
+	}
+}
+
+//=====================================
+// StateStart 开始倒计时
+//=====================================
+
+type StateStart struct {
+	BaseState
+}
+
+func (this *StateStart) GetState() int {
+	return rule.ClawDollSceneStateStart
+}
+
+func (this *StateStart) CanChangeTo(s base.SceneState) bool {
+	switch s.GetState() {
+	case rule.ClawDollSceneStatePlayGame:
+		return true
+	}
+	return false
+}
+
+func (this *StateStart) OnEnter(s *base.Scene) {
+	this.BaseState.OnEnter(s)
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		ClawdollBroadcastRoomState(s, float32(0), float32(0))
+		s.Gaming = false
+		sceneEx.GameNowTime = time.Now()
+		sceneEx.NumOfGames++
+
+	}
+}
+
+func (this *StateStart) OnTick(s *base.Scene) {
+	this.BaseState.OnTick(s)
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		if time.Now().Sub(sceneEx.StateStartTime) > rule.ClawDollSceneStartTimeout {
+			//切换到等待操作状态
+			if sceneEx.CanStart() {
+				s.ChangeSceneState(rule.ClawDollSceneStatePlayGame)
+			} else {
+				s.ChangeSceneState(rule.ClawDollSceneStateWait)
+			}
+		}
+	}
+}
+
+func (this *StateStart) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, params []int64) bool {
+	if this.BaseState.OnPlayerOp(s, p, opcode, params) {
+		return true
+	}
+
+	return false
+}
+
+func (this *StateStart) OnPlayerEvent(s *base.Scene, p *base.Player, evtcode int, params []int64) {
+	logger.Logger.Trace("(this *StateStart) OnPlayerEvent, sceneId=", s.GetSceneId(), " player=", p.SnId, " evtcode=", evtcode)
+	this.BaseState.OnPlayerEvent(s, p, evtcode, params)
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		switch evtcode {
+		case base.PlayerEventLeave:
+			if !sceneEx.CanStart() {
+				s.ChangeSceneState(rule.ClawDollSceneStateWait)
+			}
+		case base.PlayerEventEnter:
+			if !p.IsReady() {
+				p.MarkFlag(base.PlayerState_Ready)
+				p.SyncFlag()
+			}
+		}
+	}
+}
+
+// =====================================
+// PlayGame 游戏中
+// =====================================
+type PlayGame struct {
+	BaseState
+}
+
+func (this *PlayGame) GetState() int {
+	return rule.ClawDollSceneStatePlayGame
+}
+
+func (this *PlayGame) CanChangeTo(s base.SceneState) bool {
+	switch s.GetState() {
+	case rule.ClawDollSceneStateBilled:
+		return true
+	}
+	return false
+}
+
+func (this *PlayGame) OnEnter(s *base.Scene) {
+	logger.Logger.Trace("(this *PlayGame) OnEnter, sceneid=", s.GetSceneId())
+
+	this.BaseState.OnEnter(s)
+
+	s.Gaming = true
+
+	ClawdollBroadcastRoomState(s, float32(0), float32(0))
+
+}
+
+func (this *PlayGame) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, params []int64) bool {
+
+	logger.Logger.Trace("StatePlayGame OnPlayerOp-----SnId:", p.SnId, " opcode: ", opcode, " params:", params)
+
+	if this.BaseState.OnPlayerOp(s, p, opcode, params) {
+		return true
+	}
+
+	return false
+}
+
+func (this *PlayGame) OnTick(s *base.Scene) {
+	this.BaseState.OnTick(s)
+}
+
+//=====================================
+// StateBilled 结算
+//=====================================
+
+type StateBilled struct {
+	BaseState
+}
+
+func (this *StateBilled) GetState() int {
+	return rule.ClawDollSceneStateBilled
+}
+
+func (this *StateBilled) CanChangeTo(s base.SceneState) bool {
+	switch s.GetState() {
+	case rule.ClawDollSceneStateStart:
+		return true
+	}
+	return false
+}
+
+func (this *StateBilled) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, params []int64) bool {
+	return false
+}
+
+func (this *StateBilled) OnEnter(s *base.Scene) {
+	logger.Logger.Trace("(this *StateBilled) OnEnter, sceneid=", s.GetSceneId())
+	this.BaseState.OnEnter(s)
+}
+
+func (this *StateBilled) OnLeave(s *base.Scene) {
+	logger.Logger.Trace("(this *StateBilled) OnLeave, sceneid=", s.GetSceneId())
+	this.BaseState.OnLeave(s)
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+
+		sceneEx.PlayerBackup = make(map[int32]*PlayerData)
+
+		if s.CheckNeedDestroy() {
+			sceneEx.SceneDestroy(true)
+		}
+	}
+}
+
+func (this *StateBilled) OnTick(s *base.Scene) {
+	this.BaseState.OnTick(s)
+	if sceneEx, ok := s.ExtraData.(*SceneEx); ok {
+		if time.Now().Sub(sceneEx.StateStartTime) > rule.ClawDollSceneBilledTimeout {
+			if sceneEx.CanStart() {
+				s.ChangeSceneState(rule.ClawDollSceneStateStart)
+			} else {
+				s.ChangeSceneState(rule.ClawDollSceneStateWait)
+			}
+			return
+		}
+	}
+}
+
+// // //////////////////////////////////////////////////////////////////////////////
+func (this *PolicyClawdoll) RegisteSceneState(state base.SceneState) {
+	if state == nil {
+		return
+	}
+	stateid := state.GetState()
+
+	if stateid < 0 || stateid >= rule.ClawDollSceneStateMax {
+		return
+	}
+	this.states[stateid] = state
+}
+
+func (this *PolicyClawdoll) GetSceneState(s *base.Scene, stateid int) base.SceneState {
+	if stateid >= 0 && stateid < rule.ClawDollSceneStateMax {
+		return this.states[stateid]
+	}
+	return nil
+}
+
+func init() {
+	PolicyClawdollSingleton.RegisteSceneState(&StateWait{})
+	PolicyClawdollSingleton.RegisteSceneState(&StateStart{})
+	PolicyClawdollSingleton.RegisteSceneState(&PlayGame{})
+	PolicyClawdollSingleton.RegisteSceneState(&StateBilled{})
+
+	core.RegisteHook(core.HOOK_BEFORE_START, func() error {
+		base.RegisteScenePolicy(common.GameId_Clawdoll, 0, PolicyClawdollSingleton)
+
+		return nil
+	})
+}

gamesrv/tienlen/scenepolicy_tienlen.go

@@ -118,11 +118,6 @@ func (this *ScenePolicyTienLen) OnPlayerEnter(s *base.Scene, p *base.Player) {
 					playerData.CopyRoleId = p.MatchParams[3]
 				}
 			}
-			if len(p.MatchParams) > 4 {
-				if p.MatchParams[4] != 0 {
-					playerData.SkinId = p.MatchParams[4]
-				}
-			}
 		}
 		pack := &tienlen.SCTienLenPlayerEnter{
 			Data: playerData,
@@ -480,11 +475,6 @@ func TienLenCreateRoomInfoPacket(s *base.Scene, p *base.Player, sceneEx *TienLen
 					pd.CopyRoleId = p.MatchParams[3]
 				}
 			}
-			if len(p.MatchParams) > 4 {
-				if p.MatchParams[4] != 0 {
-					pd.SkinId = p.MatchParams[4]
-				}
-			}
 		}
 		pack.IsOutRecord = playerEx.CanUseRecordItem()
 		pack.ItemRecExpireTime = playerEx.ItemRecExpireTime
@@ -508,11 +498,6 @@ func TienLenCreateRoomInfoPacket(s *base.Scene, p *base.Player, sceneEx *TienLen
 							pd1.CopyRoleId = nowPlayer.MatchParams[3]
 						}
 					}
-					if len(nowPlayer.MatchParams) > 4 {
-						if nowPlayer.MatchParams[4] != 0 {
-							pd1.SkinId = nowPlayer.MatchParams[4]
-						}
-					}
 				}
 				//手牌
 				for j := int32(0); j < rule.HandCardNum; j++ {

protocol/clawdoll/clawdoll.proto

@@ -0,0 +1,103 @@
+syntax = "proto3";
+package clawdoll;
+option go_package = "mongo.games.com/game/protocol/clawdoll";
+
+//娃娃机
+enum CLAWDOLLPacketID {
+    PACKET_CLAWDOLL_ZERO = 0;              //弃用消息号
+    PACKET_SC_CLAWDOLL_ROOMINFO = 5601;    //房间信息
+    PACKET_CS_CLAWDOLL_PLAYEROP = 5602;    //玩家操作（客户->服务）
+    PACKET_SC_CLAWDOLL_PLAYEROP = 5603;    //玩家操作（服务->客户）
+    PACKET_SC_CLAWDOLL_ROOMSTATE = 5604;   //房间状态
+    PACKET_SC_CLAWDOLL_GAMEBILLED = 5605;  //游戏结算
+    PACKET_SC_CLAWDOLL_PlayerEnter = 5606; // 玩家进入
+    PACKET_SC_CLAWDOLL_PlayerLeave = 5607; // 玩家离开
+    PACKET_SC_CLAWDOLL_PLAYERINFO = 5608; // 玩家状态信息变化
+}
+
+//操作结果
+enum OpResultCode {
+    OPRC_Success = 0; //成功
+    OPRC_Error = 1; //失败
+    OPRC_CoinNotEnough = 2; //钱不够
+    OPRC_PosAlReadyPlaying = 3; //本局位置已存在玩家
+}
+
+message CLAWDOLLPlayerData {
+    string Name = 1;       //名字
+    int32 SnId = 2;        //账号
+    int32 Head = 3;        //头像
+    int32 Sex = 4;         //性别
+    int64 Coin = 5;        //金币
+    int32 HeadOutLine = 6; //头像框
+    int32 VIP = 7;
+    int32 Flag = 8;         //二进制标记 第一位:是否掉线(0:在线 1:掉线) 第二位:是否准备(0:未准备 1:已准备)
+
+    int64 WinCoin = 9;     // 本局赢分
+
+}
+
+//房间信息
+message SCCLAWDOLLRoomInfo {
+    int32 RoomId = 1;                 //房间id
+    int32 GameId = 2;                 //游戏id
+    int32 RoomMode = 3;               //游戏模式
+    repeated int32 Params = 4;        //规则参数
+    int32 State = 5;                  //房间当前状态
+    int32 TimeOut = 6;	              //该状态已经历时间 单位:秒
+    repeated CLAWDOLLPlayerData Players = 7;   //房间内的玩家信息
+    int32 TotalPlayer = 8;           //房间总人数
+	  int32 RoundId = 9;                //当前局数ID
+	  repeated int32 ParamsEx = 10;     //其他参数
+
+    int32 GameFreeId = 15;
+    int32 BaseScore = 16; //基础分
+}
+
+//玩家操作
+message CSCLAWDOLLOp {
+    int32 OpCode = 1;
+    repeated int64 Params = 2;
+}
+
+//玩家操作返回
+message SCCLAWDOLLOp {
+    int32 SnId = 1;                //玩家ID
+    int32 OpCode = 2;              //操作码
+    repeated int64 Params = 3;     //操作参数 同上 CSCLAWDOLLOp
+    OpResultCode OpRetCode = 4;    //操作结果
+}
+
+//发送给客户端的数据 单局结算
+message SCCLAWDOLLRoundGameBilled {
+	  int32 RoundId = 1;              //牌局ID
+    int32 ClowResult = 2;           //抓取结果
+    int64 Award = 3;                //获奖金额
+	  int64 Balance = 4;              //玩家余额
+}
+
+//房间状态
+message SCCLAWDOLLRoomState {
+    int32 State = 1; //房间当前状态
+    repeated float Params = 2;
+}
+
+//玩家信息
+message SCCLAWDOLLPlayerInfo {
+    int32 SnId = 1;                //玩家ID
+    int64 gainCoin = 2;             //本局赢取
+    int64 Coin = 3;                 // 玩家
+}
+
+
+//玩家进入
+//PACKET_SCCLAWDOLLPlayerEnter
+message SCCLAWDOLLPlayerEnter {
+    CLAWDOLLPlayerData Data = 1;
+}
+
+//玩家离开
+//PACKET_SCCLAWDOLLPlayerLeave
+message SCCLAWDOLLPlayerLeave {
+    int32 Pos = 1; //玩家位置
+}

protocol/shop/shop.pb.go

@@ -1378,7 +1378,6 @@ type ShopExchangeInfo struct {
 	NotVipShopLimit   int32            `protobuf:"varint,15,opt,name=NotVipShopLimit,proto3" json:"NotVipShopLimit,omitempty"`     //非VIP限购总数
 	ShopType          int32            `protobuf:"varint,16,opt,name=ShopType,proto3" json:"ShopType,omitempty"`                   //商品类型
 	TelData           []*TelChargeData `protobuf:"bytes,17,rep,name=TelData,proto3" json:"TelData,omitempty"`
-	Items             []*ItemInfo      `protobuf:"bytes,18,rep,name=Items,proto3" json:"Items,omitempty"` //道具
 }
 
 func (x *ShopExchangeInfo) Reset() {
@@ -1518,13 +1517,6 @@ func (x *ShopExchangeInfo) GetTelData() []*TelChargeData {
 	return nil
 }
 
-func (x *ShopExchangeInfo) GetItems() []*ItemInfo {
-	if x != nil {
-		return x.Items
-	}
-	return nil
-}
-
 type ExchangeType struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2602,7 +2594,7 @@ var file_shop_proto_rawDesc = []byte{
 	0x65, 0x61, 0x74, 0x65, 0x54, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49,
 	0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64,
 	0x22, 0x14, 0x0a, 0x12, 0x43, 0x53, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e,
-	0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x9d, 0x04, 0x0a, 0x10, 0x53, 0x68, 0x6f, 0x70, 0x45,
+	0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x22, 0xf7, 0x03, 0x0a, 0x10, 0x53, 0x68, 0x6f, 0x70, 0x45,
 	0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x54,
 	0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12,
 	0x18, 0x0a, 0x07, 0x50, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
@@ -2634,157 +2626,155 @@ var file_shop_proto_rawDesc = []byte{
 	0x65, 0x12, 0x2d, 0x0a, 0x07, 0x54, 0x65, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x18, 0x11, 0x20, 0x03,
 	0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x54, 0x65, 0x6c, 0x43, 0x68, 0x61,
 	0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x54, 0x65, 0x6c, 0x44, 0x61, 0x74, 0x61,
-	0x12, 0x24, 0x0a, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x0e, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x60, 0x0a, 0x0c, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e,
-	0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06,
-	0x4a, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x4a, 0x50,
-	0x72, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x04, 0x43, 0x61, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x22, 0x45, 0x0a, 0x0d, 0x54, 0x65, 0x6c, 0x43,
-	0x68, 0x61, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a,
-	0x03, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x72, 0x6c, 0x22,
-	0x6c, 0x0a, 0x0a, 0x53, 0x68, 0x6f, 0x70, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1a, 0x0a,
-	0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x57, 0x65, 0x69,
-	0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x57, 0x65, 0x69, 0x67, 0x68,
-	0x74, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x68, 0x6f, 0x77, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x73, 0x53, 0x68, 0x6f, 0x77, 0x22, 0x9a, 0x01,
-	0x0a, 0x12, 0x53, 0x43, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
-	0x4c, 0x69, 0x73, 0x74, 0x12, 0x2c, 0x0a, 0x07, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x4f, 0x70, 0x52,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x07, 0x52, 0x65, 0x74, 0x43, 0x6f,
-	0x64, 0x65, 0x12, 0x2c, 0x0a, 0x05, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x16, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x78, 0x63,
-	0x68, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x49, 0x6e, 0x66, 0x6f, 0x73,
-	0x12, 0x28, 0x0a, 0x06, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x10, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x57, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x52, 0x06, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0xc9, 0x01, 0x0a, 0x09, 0x43,
-	0x53, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x6f, 0x6f, 0x64,
-	0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73,
-	0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x61, 0x79, 0x49,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50,
-	0x61, 0x79, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x42, 0x75, 0x79, 0x49, 0x64, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x42, 0x75, 0x79, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x45, 0x78,
-	0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
-	0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x45, 0x78,
-	0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0f, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64,
-	0x65, 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
-	0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x45, 0x78, 0x63, 0x68, 0x61,
-	0x6e, 0x67, 0x65, 0x4e, 0x75, 0x6d, 0x22, 0x4b, 0x0a, 0x09, 0x53, 0x43, 0x50, 0x61, 0x79, 0x49,
-	0x6e, 0x66, 0x6f, 0x12, 0x2c, 0x0a, 0x07, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x4f, 0x70, 0x52, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x07, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64,
-	0x65, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x55, 0x72, 0x6c, 0x22, 0x2a, 0x0a, 0x10, 0x43, 0x53, 0x47, 0x65, 0x74, 0x50, 0x61, 0x79, 0x49,
-	0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x70, 0x54, 0x79, 0x70,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x4f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x22,
-	0x3c, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x49,
-	0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65,
-	0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x22, 0xd3, 0x01,
-	0x0a, 0x0b, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a,
-	0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6d, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f,
-	0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e,
-	0x74, 0x12, 0x2a, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49,
-	0x6e, 0x66, 0x6f, 0x52, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a,
-	0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x02, 0x54, 0x73, 0x22, 0x39, 0x0a, 0x10, 0x53, 0x43, 0x47, 0x65, 0x74, 0x50, 0x61, 0x79, 0x49,
-	0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x50, 0x61, 0x79,
-	0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x4a,
-	0x0a, 0x0c, 0x43, 0x53, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x12, 0x16,
-	0x0a, 0x06, 0x4f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x4f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x41, 0x64, 0x64, 0x72, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x41, 0x64, 0x64, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x22, 0x38, 0x0a, 0x10, 0x53, 0x43,
-	0x47, 0x65, 0x74, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x73, 0x12, 0x24,
-	0x0a, 0x05, 0x41, 0x64, 0x64, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
-	0x73, 0x68, 0x6f, 0x70, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x41,
-	0x64, 0x64, 0x72, 0x73, 0x22, 0x2e, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x72, 0x44, 0x61, 0x74, 0x61,
-	0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64,
+	0x22, 0x60, 0x0a, 0x0c, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x14, 0x0a, 0x05, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x05, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x4a, 0x50, 0x72, 0x69, 0x63, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x4a, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x12,
+	0x0a, 0x04, 0x43, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x43, 0x61,
+	0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
+	0x49, 0x64, 0x22, 0x45, 0x0a, 0x0d, 0x54, 0x65, 0x6c, 0x43, 0x68, 0x61, 0x72, 0x67, 0x65, 0x44,
+	0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x72, 0x6c, 0x22, 0x6c, 0x0a, 0x0a, 0x53, 0x68, 0x6f,
+	0x70, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54,
+	0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x4e,
+	0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x68, 0x6f, 0x77, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x06, 0x49, 0x73, 0x53, 0x68, 0x6f, 0x77, 0x22, 0x9a, 0x01, 0x0a, 0x12, 0x53, 0x43, 0x53, 0x68,
+	0x6f, 0x70, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2c,
+	0x0a, 0x07, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
+	0x12, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43,
+	0x6f, 0x64, 0x65, 0x52, 0x07, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x2c, 0x0a, 0x05,
+	0x49, 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x73, 0x68,
+	0x6f, 0x70, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x49,
+	0x6e, 0x66, 0x6f, 0x52, 0x05, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x12, 0x28, 0x0a, 0x06, 0x57, 0x65,
+	0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x68, 0x6f,
+	0x70, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x52, 0x06, 0x57, 0x65,
+	0x69, 0x67, 0x68, 0x74, 0x22, 0xc9, 0x01, 0x0a, 0x09, 0x43, 0x53, 0x50, 0x61, 0x79, 0x49, 0x6e,
+	0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x61, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x61, 0x79, 0x49, 0x64, 0x12, 0x14,
+	0x0a, 0x05, 0x42, 0x75, 0x79, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x42,
+	0x75, 0x79, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
+	0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e,
+	0x67, 0x65, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
+	0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x45,
+	0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x20,
+	0x0a, 0x0b, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x0b, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4e, 0x75, 0x6d,
+	0x22, 0x4b, 0x0a, 0x09, 0x53, 0x43, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2c, 0x0a,
+	0x07, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12,
+	0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f,
+	0x64, 0x65, 0x52, 0x07, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x55,
+	0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x72, 0x6c, 0x22, 0x2a, 0x0a,
+	0x10, 0x43, 0x53, 0x47, 0x65, 0x74, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73,
+	0x74, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x06, 0x4f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x22, 0x3c, 0x0a, 0x08, 0x49, 0x74, 0x65,
+	0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a,
+	0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07,
+	0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x22, 0xd3, 0x01, 0x0a, 0x0b, 0x50, 0x61, 0x79, 0x49,
+	0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49,
+	0x64, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x4e, 0x75,
+	0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65,
+	0x4e, 0x75, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20,
+	0x03, 0x28, 0x05, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2a, 0x0a, 0x08, 0x49,
+	0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
+	0x73, 0x68, 0x6f, 0x70, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x49,
+	0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a,
+	0x02, 0x54, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x22, 0x39, 0x0a,
+	0x10, 0x53, 0x43, 0x47, 0x65, 0x74, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73,
+	0x74, 0x12, 0x25, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x11, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69,
+	0x73, 0x74, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x4a, 0x0a, 0x0c, 0x43, 0x53, 0x50, 0x6c,
+	0x61, 0x79, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x70, 0x54, 0x79,
+	0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x4f, 0x70, 0x54, 0x79, 0x70, 0x65,
 	0x12, 0x12, 0x0a, 0x04, 0x41, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x41, 0x64, 0x64, 0x72, 0x22, 0x11, 0x0a, 0x0f, 0x43, 0x53, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x56, 0x69, 0x70, 0x53, 0x68, 0x6f, 0x70, 0x22, 0x59, 0x0a, 0x0f, 0x53, 0x43, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x56, 0x69, 0x70, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x69, 0x6e,
-	0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e,
-	0x53, 0x68, 0x6f, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x22,
-	0x0a, 0x0c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x75,
-	0x6e, 0x74, 0x2a, 0x95, 0x02, 0x0a, 0x0c, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43,
-	0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x53, 0x75, 0x63, 0x65,
-	0x73, 0x73, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x72, 0x72,
-	0x6f, 0x72, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x56, 0x43, 0x6f,
-	0x69, 0x6e, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x02, 0x12, 0x16, 0x0a,
-	0x12, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x69,
-	0x6d, 0x69, 0x74, 0x10, 0x03, 0x12, 0x1a, 0x0a, 0x16, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x78,
-	0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10,
-	0x04, 0x12, 0x18, 0x0a, 0x14, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e,
-	0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x74, 0x74, 0x10, 0x05, 0x12, 0x18, 0x0a, 0x14, 0x4f,
-	0x50, 0x52, 0x43, 0x5f, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x6f, 0x6c, 0x64,
-	0x4f, 0x75, 0x74, 0x10, 0x06, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x78,
-	0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x41, 0x63, 0x63, 0x10, 0x07,
-	0x12, 0x17, 0x0a, 0x13, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x4a, 0x43, 0x6f, 0x69, 0x6e, 0x4e, 0x6f,
-	0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x08, 0x12, 0x1a, 0x0a, 0x16, 0x4f, 0x50, 0x52,
-	0x43, 0x5f, 0x56, 0x69, 0x70, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f,
-	0x75, 0x67, 0x68, 0x10, 0x09, 0x12, 0x13, 0x0a, 0x0f, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x4e, 0x6f,
-	0x74, 0x53, 0x49, 0x4d, 0x43, 0x6f, 0x64, 0x65, 0x10, 0x0a, 0x2a, 0x91, 0x05, 0x0a, 0x09, 0x53,
-	0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b,
-	0x45, 0x54, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x18,
-	0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x53, 0x48, 0x4f, 0x50,
-	0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xc4, 0x13, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b,
-	0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x10,
-	0xc5, 0x13, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f,
-	0x53, 0x48, 0x4f, 0x50, 0x5f, 0x41, 0x44, 0x4c, 0x4f, 0x4f, 0x4b, 0x45, 0x44, 0x10, 0xc6, 0x13,
-	0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x53, 0x48,
-	0x4f, 0x50, 0x5f, 0x41, 0x44, 0x4c, 0x4f, 0x4f, 0x4b, 0x45, 0x44, 0x10, 0xc7, 0x13, 0x12, 0x1d,
-	0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x53, 0x48, 0x4f, 0x50,
-	0x5f, 0x56, 0x43, 0x50, 0x41, 0x59, 0x53, 0x48, 0x4f, 0x50, 0x10, 0xc8, 0x13, 0x12, 0x1d, 0x0a,
-	0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f,
-	0x56, 0x43, 0x50, 0x41, 0x59, 0x53, 0x48, 0x4f, 0x50, 0x10, 0xc9, 0x13, 0x12, 0x22, 0x0a, 0x1d,
-	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x45,
-	0x58, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x10, 0xca, 0x13,
-	0x12, 0x22, 0x0a, 0x1d, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x53, 0x48,
-	0x4f, 0x50, 0x5f, 0x45, 0x58, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x52, 0x45, 0x43, 0x4f, 0x52,
-	0x44, 0x10, 0xcb, 0x13, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43,
-	0x53, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x45, 0x58, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x10,
-	0xcc, 0x13, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f,
-	0x53, 0x48, 0x4f, 0x50, 0x5f, 0x45, 0x58, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x10, 0xcd, 0x13,
-	0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x53, 0x48,
-	0x4f, 0x50, 0x5f, 0x45, 0x58, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x4c, 0x49, 0x53, 0x54, 0x10,
-	0xce, 0x13, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f,
-	0x53, 0x48, 0x4f, 0x50, 0x5f, 0x45, 0x58, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x4c, 0x49, 0x53,
-	0x54, 0x10, 0xcf, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x53, 0x43, 0x5f,
-	0x47, 0x49, 0x56, 0x45, 0x43, 0x4f, 0x49, 0x4e, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xd2, 0x13,
-	0x12, 0x15, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x50, 0x41, 0x59,
-	0x49, 0x4e, 0x46, 0x4f, 0x10, 0xd3, 0x13, 0x12, 0x15, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b, 0x45,
-	0x54, 0x5f, 0x53, 0x43, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xd4, 0x13, 0x12, 0x1c,
-	0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x47, 0x45, 0x54, 0x50, 0x41,
-	0x59, 0x49, 0x4e, 0x46, 0x4f, 0x4c, 0x49, 0x53, 0x54, 0x10, 0xd5, 0x13, 0x12, 0x1c, 0x0a, 0x17,
-	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x47, 0x45, 0x54, 0x50, 0x41, 0x59, 0x49,
-	0x4e, 0x46, 0x4f, 0x4c, 0x49, 0x53, 0x54, 0x10, 0xd6, 0x13, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41,
-	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x50, 0x4c, 0x41, 0x59, 0x45, 0x52, 0x41, 0x44, 0x44,
-	0x52, 0x10, 0xd7, 0x13, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
-	0x43, 0x50, 0x4c, 0x41, 0x59, 0x45, 0x52, 0x41, 0x44, 0x44, 0x52, 0x10, 0xd8, 0x13, 0x12, 0x1e,
-	0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x55, 0x50, 0x44, 0x41,
-	0x54, 0x45, 0x5f, 0x56, 0x49, 0x50, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x10, 0xd9, 0x13, 0x12, 0x1e,
-	0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x55, 0x50, 0x44, 0x41,
-	0x54, 0x45, 0x5f, 0x56, 0x49, 0x50, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x10, 0xda, 0x13, 0x42, 0x24,
-	0x5a, 0x22, 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,
-	0x73, 0x68, 0x6f, 0x70, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x41, 0x64, 0x64, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x02, 0x49, 0x64, 0x22, 0x38, 0x0a, 0x10, 0x53, 0x43, 0x47, 0x65, 0x74, 0x50, 0x6c, 0x61,
+	0x79, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x73, 0x12, 0x24, 0x0a, 0x05, 0x41, 0x64, 0x64, 0x72,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x41,
+	0x64, 0x64, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x41, 0x64, 0x64, 0x72, 0x73, 0x22, 0x2e,
+	0x0a, 0x08, 0x41, 0x64, 0x64, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x41, 0x64,
+	0x64, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x41, 0x64, 0x64, 0x72, 0x22, 0x11,
+	0x0a, 0x0f, 0x43, 0x53, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x69, 0x70, 0x53, 0x68, 0x6f,
+	0x70, 0x22, 0x59, 0x0a, 0x0f, 0x53, 0x43, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x69, 0x70,
+	0x53, 0x68, 0x6f, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x73, 0x68, 0x6f, 0x70, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x6e,
+	0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x22, 0x0a, 0x0c, 0x52, 0x65, 0x66, 0x72,
+	0x65, 0x73, 0x68, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c,
+	0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x2a, 0x95, 0x02, 0x0a,
+	0x0c, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a,
+	0x0b, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x53, 0x75, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0e,
+	0x0a, 0x0a, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x12, 0x17,
+	0x0a, 0x13, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x56, 0x43, 0x6f, 0x69, 0x6e, 0x4e, 0x6f, 0x74, 0x45,
+	0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x4f, 0x50, 0x52, 0x43, 0x5f,
+	0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x03, 0x12,
+	0x1a, 0x0a, 0x16, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
+	0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x04, 0x12, 0x18, 0x0a, 0x14, 0x4f,
+	0x50, 0x52, 0x43, 0x5f, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61,
+	0x52, 0x74, 0x74, 0x10, 0x05, 0x12, 0x18, 0x0a, 0x14, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x78,
+	0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0x06, 0x12,
+	0x19, 0x0a, 0x15, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
+	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x41, 0x63, 0x63, 0x10, 0x07, 0x12, 0x17, 0x0a, 0x13, 0x4f, 0x50,
+	0x52, 0x43, 0x5f, 0x4a, 0x43, 0x6f, 0x69, 0x6e, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67,
+	0x68, 0x10, 0x08, 0x12, 0x1a, 0x0a, 0x16, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x56, 0x69, 0x70, 0x4c,
+	0x65, 0x76, 0x65, 0x6c, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x09, 0x12,
+	0x13, 0x0a, 0x0f, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x4e, 0x6f, 0x74, 0x53, 0x49, 0x4d, 0x43, 0x6f,
+	0x64, 0x65, 0x10, 0x0a, 0x2a, 0x91, 0x05, 0x0a, 0x09, 0x53, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74,
+	0x49, 0x44, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x48, 0x4f,
+	0x50, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x10,
+	0xc4, 0x13, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f,
+	0x53, 0x48, 0x4f, 0x50, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xc5, 0x13, 0x12, 0x1c, 0x0a, 0x17,
+	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x41,
+	0x44, 0x4c, 0x4f, 0x4f, 0x4b, 0x45, 0x44, 0x10, 0xc6, 0x13, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41,
+	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x41, 0x44, 0x4c,
+	0x4f, 0x4f, 0x4b, 0x45, 0x44, 0x10, 0xc7, 0x13, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x56, 0x43, 0x50, 0x41, 0x59,
+	0x53, 0x48, 0x4f, 0x50, 0x10, 0xc8, 0x13, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45,
+	0x54, 0x5f, 0x53, 0x43, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x56, 0x43, 0x50, 0x41, 0x59, 0x53,
+	0x48, 0x4f, 0x50, 0x10, 0xc9, 0x13, 0x12, 0x22, 0x0a, 0x1d, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
+	0x5f, 0x43, 0x53, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x45, 0x58, 0x43, 0x48, 0x41, 0x4e, 0x47,
+	0x45, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x10, 0xca, 0x13, 0x12, 0x22, 0x0a, 0x1d, 0x50, 0x41,
+	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x45, 0x58, 0x43,
+	0x48, 0x41, 0x4e, 0x47, 0x45, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x10, 0xcb, 0x13, 0x12, 0x1c,
+	0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x53, 0x48, 0x4f, 0x50,
+	0x5f, 0x45, 0x58, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x10, 0xcc, 0x13, 0x12, 0x1c, 0x0a, 0x17,
+	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x45,
+	0x58, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x10, 0xcd, 0x13, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41,
+	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x45, 0x58, 0x43,
+	0x48, 0x41, 0x4e, 0x47, 0x45, 0x4c, 0x49, 0x53, 0x54, 0x10, 0xce, 0x13, 0x12, 0x20, 0x0a, 0x1b,
+	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x45,
+	0x58, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x4c, 0x49, 0x53, 0x54, 0x10, 0xcf, 0x13, 0x12, 0x1a,
+	0x0a, 0x15, 0x53, 0x48, 0x4f, 0x50, 0x5f, 0x53, 0x43, 0x5f, 0x47, 0x49, 0x56, 0x45, 0x43, 0x4f,
+	0x49, 0x4e, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xd2, 0x13, 0x12, 0x15, 0x0a, 0x10, 0x50, 0x41,
+	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xd3,
+	0x13, 0x12, 0x15, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x50, 0x41,
+	0x59, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xd4, 0x13, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x54, 0x5f, 0x43, 0x53, 0x47, 0x45, 0x54, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x46, 0x4f, 0x4c,
+	0x49, 0x53, 0x54, 0x10, 0xd5, 0x13, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
+	0x5f, 0x53, 0x43, 0x47, 0x45, 0x54, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x46, 0x4f, 0x4c, 0x49, 0x53,
+	0x54, 0x10, 0xd6, 0x13, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43,
+	0x53, 0x50, 0x4c, 0x41, 0x59, 0x45, 0x52, 0x41, 0x44, 0x44, 0x52, 0x10, 0xd7, 0x13, 0x12, 0x18,
+	0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x50, 0x4c, 0x41, 0x59, 0x45,
+	0x52, 0x41, 0x44, 0x44, 0x52, 0x10, 0xd8, 0x13, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x54, 0x5f, 0x43, 0x53, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x56, 0x49, 0x50,
+	0x5f, 0x53, 0x48, 0x4f, 0x50, 0x10, 0xd9, 0x13, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x54, 0x5f, 0x53, 0x43, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x56, 0x49, 0x50,
+	0x5f, 0x53, 0x48, 0x4f, 0x50, 0x10, 0xda, 0x13, 0x42, 0x24, 0x5a, 0x22, 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, 0x73, 0x68, 0x6f, 0x70, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2846,20 +2836,19 @@ var file_shop_proto_depIdxs = []int32{
 	0,  // 7: shop.SCShopExchange.RetCode:type_name -> shop.OpResultCode
 	17, // 8: shop.ShopExchangeInfo.ExType:type_name -> shop.ExchangeType
 	18, // 9: shop.ShopExchangeInfo.TelData:type_name -> shop.TelChargeData
-	24, // 10: shop.ShopExchangeInfo.Items:type_name -> shop.ItemInfo
-	0,  // 11: shop.SCShopExchangeList.RetCode:type_name -> shop.OpResultCode
-	16, // 12: shop.SCShopExchangeList.Infos:type_name -> shop.ShopExchangeInfo
-	19, // 13: shop.SCShopExchangeList.Weight:type_name -> shop.ShopWeight
-	0,  // 14: shop.SCPayInfo.RetCode:type_name -> shop.OpResultCode
-	24, // 15: shop.PayInfoList.ItemInfo:type_name -> shop.ItemInfo
-	25, // 16: shop.SCGetPayInfoList.Info:type_name -> shop.PayInfoList
-	29, // 17: shop.SCGetPlayerAddrs.Addrs:type_name -> shop.AddrData
-	2,  // 18: shop.SCUpdateVipShop.info:type_name -> shop.ShopInfo
-	19, // [19:19] is the sub-list for method output_type
-	19, // [19:19] is the sub-list for method input_type
-	19, // [19:19] is the sub-list for extension type_name
-	19, // [19:19] is the sub-list for extension extendee
-	0,  // [0:19] is the sub-list for field type_name
+	0,  // 10: shop.SCShopExchangeList.RetCode:type_name -> shop.OpResultCode
+	16, // 11: shop.SCShopExchangeList.Infos:type_name -> shop.ShopExchangeInfo
+	19, // 12: shop.SCShopExchangeList.Weight:type_name -> shop.ShopWeight
+	0,  // 13: shop.SCPayInfo.RetCode:type_name -> shop.OpResultCode
+	24, // 14: shop.PayInfoList.ItemInfo:type_name -> shop.ItemInfo
+	25, // 15: shop.SCGetPayInfoList.Info:type_name -> shop.PayInfoList
+	29, // 16: shop.SCGetPlayerAddrs.Addrs:type_name -> shop.AddrData
+	2,  // 17: shop.SCUpdateVipShop.info:type_name -> shop.ShopInfo
+	18, // [18:18] is the sub-list for method output_type
+	18, // [18:18] is the sub-list for method input_type
+	18, // [18:18] is the sub-list for extension type_name
+	18, // [18:18] is the sub-list for extension extendee
+	0,  // [0:18] is the sub-list for field type_name
 }
 
 func init() { file_shop_proto_init() }

protocol/shop/shop.proto

@@ -183,7 +183,6 @@ message ShopExchangeInfo{
   int32 NotVipShopLimit = 15;//非VIP限购总数
   int32 ShopType = 16;	//商品类型
   repeated TelChargeData TelData = 17;
-  repeated ItemInfo Items = 18;	//道具
 }
 
 

protocol/webapi/common.proto

@@ -384,7 +384,6 @@ message ExchangeShop {
   int32 NotVipShopLimit = 15;//非VIP限购总数
   int32 ShopType = 16;	//商品类型
   repeated TelChargeData TelData = 17;
-  repeated ItemInfo Items = 18;
 }
 
 message TelChargeData{

public

@@ -1 +1 @@
-Subproject commit 3ed239e304c7e287233a284fe1e3813595d7910f
+Subproject commit 5fe34aa85258f2526bd1e28693bc74b38750d587

worldsrv/action_game.go

@@ -146,7 +146,6 @@ func (this *CSEnterRoomHandler) Process(s *netlib.Session, packetid int, data in
 		if p.Roles != nil {
 			roleId = p.Roles.ModId
 		}
-		skinId := int32(300001)
 		var tm *TmMatch
 		if len(scene.params) > 3 {
 			sortId := scene.params[0]
@@ -156,11 +155,10 @@ func (this *CSEnterRoomHandler) Process(s *netlib.Session, packetid int, data in
 				grade = tm.copyRobotGrades[randIndex].grade
 				snid = tm.copyRobotGrades[randIndex].copySnid
 				roleId = tm.copyRobotGrades[randIndex].copyRoleId
-				skinId = tm.copyRobotGrades[randIndex].CopySkinId
 				tm.copyRobotGrades = append(tm.copyRobotGrades[:randIndex], tm.copyRobotGrades[randIndex+1:]...)
 			}
 		}
-		mc := NewMatchContext(p, tm, grade, snid, 1, roleId, skinId, 0)
+		mc := NewMatchContext(p, tm, grade, snid, 1, roleId, 0)
 		if mc != nil {
 			mc.gaming = true
 			p.matchCtx = mc

worldsrv/matchcontext.go

@@ -15,7 +15,6 @@ type PlayerMatchContext struct {
 	copySnid   int32
 	copyLv     int32
 	copyRoleId int32
-	copySkinId int32
 }
 
 type MatchContextSlice []*PlayerMatchContext
@@ -40,22 +39,22 @@ func (p MatchContextSlice) Sort(isFinals bool) {
 	for i, mc := range p {
 		mc.rank = int32(i + 1)
 	}
-	//if isFinals {
-	//	// 积分相同名次相同
-	//	lastRank := int32(0)
-	//	lastGrade := int32(0)
-	//	for i := 0; i < len(p); i++ {
-	//		mc := p[i]
-	//		if i > 0 && mc.grade == lastGrade {
-	//			mc.rank = lastRank
-	//		}
-	//		lastRank = mc.rank
-	//		lastGrade = mc.grade
-	//	}
-	//}
+	if isFinals {
+		// 积分相同名次相同
+		lastRank := int32(0)
+		lastGrade := int32(0)
+		for i := 0; i < len(p); i++ {
+			mc := p[i]
+			if i > 0 && mc.grade == lastGrade {
+				mc.rank = lastRank
+			}
+			lastRank = mc.rank
+			lastGrade = mc.grade
+		}
+	}
 }
 
-func NewMatchContext(p *Player, tm *TmMatch, grade, snid, lv, roleId, skinId int32, seq int) *PlayerMatchContext {
+func NewMatchContext(p *Player, tm *TmMatch, grade, snid, lv, roleId int32, seq int) *PlayerMatchContext {
 	if !p.IsRob {
 		snid = p.SnId
 	}
@@ -68,6 +67,5 @@ func NewMatchContext(p *Player, tm *TmMatch, grade, snid, lv, roleId, skinId int
 		copySnid:   snid,
 		copyLv:     lv,
 		copyRoleId: roleId,
-		copySkinId: skinId,
 	}
 }

worldsrv/player.go

@@ -3925,7 +3925,6 @@ func (this *Player) VIPDraw(id, vip int32) {
 					ItemNum: v,
 				})
 				itemInfo = append(itemInfo, model.ItemInfo{ItemId: int32(k), ItemNum: v})
-				pack.Award[k] = v
 			}
 			BagMgrSingleton.AddItemsV2(&ItemParam{
 				P:        this,

worldsrv/scene.go

@@ -293,7 +293,7 @@ func (this *Scene) PlayerEnter(p *Player, pos int, ischangeroom bool) bool {
 	takeCoin := p.Coin
 	leaveCoin := int64(0)
 	gameTimes := rand.Int31n(100)
-	matchParams := []int32{} //排名、段位、假snid、假角色、假皮肤
+	matchParams := []int32{} //排名、段位、假snid、假角色
 
 	if this.IsMatchScene() && p.matchCtx != nil {
 		takeCoin = int64(p.matchCtx.grade)
@@ -304,8 +304,7 @@ func (this *Scene) PlayerEnter(p *Player, pos int, ischangeroom bool) bool {
 			matchParams = append(matchParams, 1) //段位默认值
 		}
 		matchParams = append(matchParams, p.matchCtx.copySnid)   //假snid
-		matchParams = append(matchParams, p.matchCtx.copyRoleId) //假RoleId
-		matchParams = append(matchParams, p.matchCtx.copySkinId) //假SkinId
+		matchParams = append(matchParams, p.matchCtx.copyRoleId) //假snid
 	} else {
 		if p.IsRob {
 			if len(this.paramsEx) > 0 { //机器人携带金币动态调整

worldsrv/shopmgr.go

@@ -108,7 +108,6 @@ type ExchangeShopInfo struct {
 	TelCharge      int32                 //话费
 	ShopType       int32                 //商品类型
 	TelData        []*shop.TelChargeData //运营商配置
-	Items          []*shop.ItemInfo      //道具
 }
 
 func (this *ShopMgr) ModuleName() string {
@@ -778,13 +777,6 @@ func (this *ShopMgr) GetExchangeData(platform string, id int32) *ExchangeShopInf
 						Url:  info.Url,
 					})
 				}
-				var items []*shop.ItemInfo
-				for _, v := range data.GetItems() {
-					items = append(items, &shop.ItemInfo{
-						ItemId:  v.GetItemId(),
-						ItemNum: v.GetItemNum(),
-					})
-				}
 				return &ExchangeShopInfo{
 					Id:        data.Id,
 					Picture:   data.Picture,
@@ -796,7 +788,6 @@ func (this *ShopMgr) GetExchangeData(platform string, id int32) *ExchangeShopInf
 					TelCharge: data.TelCharge,
 					ShopType:  data.ShopType,
 					TelData:   telData,
-					Items:     items,
 				}
 			}
 		}
@@ -1045,13 +1036,6 @@ func (this *ShopMgr) ExchangeList(p *Player) (ret bool) {
 							Url:  info.Url,
 						})
 					}
-					var items []*shop.ItemInfo
-					for _, v := range v.GetItems() {
-						items = append(items, &shop.ItemInfo{
-							ItemId:  v.GetItemId(),
-							ItemNum: v.GetItemNum(),
-						})
-					}
 					pack.Infos = append(pack.Infos, &shop.ShopExchangeInfo{
 						Type:              v.Type,
 						Picture:           v.Picture,
@@ -1068,7 +1052,6 @@ func (this *ShopMgr) ExchangeList(p *Player) (ret bool) {
 						NotVipShopLimit:   v.NotVipShopLimit,
 						ShopType:          v.ShopType,
 						TelData:           telData,
-						Items:             items,
 					})
 				}
 			}

worldsrv/tmmatch.go

@@ -29,7 +29,6 @@ type TmGradeInfo struct {
 	copySnid   int32
 	copyLv     int32
 	copyRoleId int32
-	CopySkinId int32
 }
 
 type TmMatch struct {
@@ -136,7 +135,7 @@ func (tm *TmMatch) CreateRobotGrades(round int) {
 			tm.robotGrades[round-1] = []*TmGradeInfo{}
 			var snids []int32
 			var lvs []int32
-			var roleIds, skinIds []int32
+			var roleIds []int32
 			for _, player := range PlayerMgrSington.snidMap {
 				if len(snids) > int(lastPromotionNum) {
 					break
@@ -149,9 +148,6 @@ func (tm *TmMatch) CreateRobotGrades(round int) {
 						roleId = player.Roles.ModId
 					}
 					roleIds = append(roleIds, roleId)
-					if player.Skin != nil && player.Skin.ModId != 0 {
-						skinIds = append(skinIds, player.Skin.ModId)
-					}
 				}
 			}
 			if len(snids) <= int(lastPromotionNum) {
@@ -168,7 +164,6 @@ func (tm *TmMatch) CreateRobotGrades(round int) {
 					snids = append(snids, tmpSnid)
 					lvs = append(lvs, 1)
 					roleIds = append(roleIds, int32(2000001))
-					skinIds = append(skinIds, 300001)
 				}
 			}
 			for i := 0; i < int(lastPromotionNum); i++ {
@@ -177,7 +172,6 @@ func (tm *TmMatch) CreateRobotGrades(round int) {
 					copySnid:   snids[i],
 					copyLv:     lvs[i],
 					copyRoleId: roleIds[i],
-					CopySkinId: skinIds[i],
 				}
 				tm.robotGrades[round-1] = append(tm.robotGrades[round-1], gradeInfo)
 			}
@@ -224,7 +218,6 @@ func (tm *TmMatch) CreateRobotGrades(round int) {
 				copySnid:   tm.robotGrades[round-1][index].copySnid,
 				copyLv:     tm.robotGrades[round-1][index].copyLv,
 				copyRoleId: tm.robotGrades[round-1][index].copyRoleId,
-				CopySkinId: tm.robotGrades[round-1][index].CopySkinId,
 			}
 			tm.robotGrades[round] = append(tm.robotGrades[round], gradeInfo)
 		}
@@ -251,7 +244,6 @@ func (tm *TmMatch) CreateRobotGrades(round int) {
 				copySnid:   tm.robotGrades[round-1][index].copySnid,
 				copyLv:     tm.robotGrades[round-1][index].copyLv,
 				copyRoleId: tm.robotGrades[round-1][index].copyRoleId,
-				CopySkinId: tm.robotGrades[round-1][index].CopySkinId,
 			}
 			tm.robotGrades[round] = append(tm.robotGrades[round], gradeInfo)
 		}
@@ -300,7 +292,6 @@ func (tm *TmMatch) RobotGradesDecline(round int) {
 				copySnid:   info.copySnid,
 				copyLv:     info.copyLv,
 				copyRoleId: info.copyRoleId,
-				CopySkinId: info.CopySkinId,
 			}
 			tm.robotGrades[lastRound][i] = gradeInfo
 			if info.copySnid != 0 {

worldsrv/tournament.go

@@ -784,7 +784,7 @@ func (this *Tournament) CreatePlayerMatchContext(p *Player, m *TmMatch, seq int)
 		roleId = p.Roles.ModId
 	}
 
-	mc := NewMatchContext(p, m, 1000, p.SnId, 1, roleId, p.Skin.ModId, seq)
+	mc := NewMatchContext(p, m, 1000, p.SnId, 1, roleId, seq)
 	if mc != nil {
 		if this.players[m.SortId] == nil {
 			this.players[m.SortId] = make(map[int32]*PlayerMatchContext)