Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
This commit is contained in:
commit
2749862be9
|
@ -5,23 +5,23 @@ import (
|
|||
)
|
||||
|
||||
const (
|
||||
TransType_Login transact.TransType = 1000
|
||||
TransType_Logout = 1001
|
||||
TransType_WebTrascate = 1002
|
||||
TransType_AddCoin = 1003
|
||||
TransType_ViewData = 1004
|
||||
TransType_DayTimeChange = 1005
|
||||
TransType_CoinSceneChange = 1006
|
||||
TransType_WebApi = 1007
|
||||
TransType_WebApi_ForRank = 1101
|
||||
TransType_GameSrvWebApi = 1008
|
||||
TransType_QueryCoinPool = 1009
|
||||
TransType_StopServer = 1010
|
||||
TransType_QueryAllCoinPool = 1011
|
||||
TransType_ActThrSrvWebApi = 1012
|
||||
TransType_MatchSceneChange = 1013
|
||||
TransType_MiniGameAddCoin = 1014
|
||||
TransType_ServerCtrl = 1015
|
||||
TransTypeLogin transact.TransType = 1000
|
||||
TransTypeLogout = 1001
|
||||
TransTypeWebTransact = 1002
|
||||
TransTypeAddCoin = 1003
|
||||
TransTypeViewData = 1004
|
||||
TransTypeDayTimeChange = 1005
|
||||
TransTypeCoinSceneChange = 1006
|
||||
TransTypeWebApi = 1007
|
||||
TransTypeWebApiForRank = 1101
|
||||
TransTypeGameSrvWebApi = 1008
|
||||
TransTypeQueryCoinPool = 1009
|
||||
TransTypeStopServer = 1010
|
||||
TransTypeQueryAllCoinPool = 1011
|
||||
TransTypeActThrSrvWebApi = 1012
|
||||
TransTypeMatchSceneChange = 1013
|
||||
TransTypeMiniGameAddCoin = 1014
|
||||
TransTypeServerCtrl = 1015
|
||||
)
|
||||
|
||||
type M2GWebTrascate struct {
|
||||
|
|
|
@ -970,6 +970,10 @@ func (this *SceneHandCardStateTienLen) OnEnter(s *base.Scene) {
|
|||
playerEx.robotGameTimes--
|
||||
sceneEx.robotGamingNum++
|
||||
}
|
||||
if _, ok := sceneEx.BilledList[playerEx.SnId]; !ok {
|
||||
arr := make([]*BilledInfo, 0)
|
||||
sceneEx.BilledList[playerEx.SnId] = &arr
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -76,5 +76,5 @@ func (this *AddCoinTransactHandler) OnChildTransRep(tNode *transact.TransNode, h
|
|||
}
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_AddCoin, &AddCoinTransactHandler{})
|
||||
transact.RegisteHandler(common.TransTypeAddCoin, &AddCoinTransactHandler{})
|
||||
}
|
||||
|
|
|
@ -62,5 +62,5 @@ func (this *CoinSceneChangeTransactHandler) OnChildTransRep(tNode *transact.Tran
|
|||
}
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_CoinSceneChange, &CoinSceneChangeTransactHandler{})
|
||||
transact.RegisteHandler(common.TransTypeCoinSceneChange, &CoinSceneChangeTransactHandler{})
|
||||
}
|
||||
|
|
|
@ -104,7 +104,7 @@ func (this *DayTimeChangeTransactHandler) OnChildTransRep(tNode *transact.TransN
|
|||
}
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_DayTimeChange, &DayTimeChangeTransactHandler{})
|
||||
transact.RegisteHandler(common.TransTypeDayTimeChange, &DayTimeChangeTransactHandler{})
|
||||
RegisteDayTimeChangeListener(base.CoinPoolMgr)
|
||||
RegisteDayTimeChangeListener(base.SceneMgrSington)
|
||||
}
|
||||
|
|
|
@ -62,5 +62,5 @@ func (this *MatchSceneChangeTransactHandler) OnChildTransRep(tNode *transact.Tra
|
|||
}
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_MatchSceneChange, &MatchSceneChangeTransactHandler{})
|
||||
transact.RegisteHandler(common.TransTypeMatchSceneChange, &MatchSceneChangeTransactHandler{})
|
||||
}
|
||||
|
|
|
@ -54,5 +54,5 @@ func (this *QueryAllCoinPoolTransactHandler) OnChildTransRep(tNode *transact.Tra
|
|||
}
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_QueryAllCoinPool, &QueryAllCoinPoolTransactHandler{})
|
||||
transact.RegisteHandler(common.TransTypeQueryAllCoinPool, &QueryAllCoinPoolTransactHandler{})
|
||||
}
|
||||
|
|
|
@ -47,5 +47,5 @@ func (this *QueryCoinPoolTransactHandler) OnChildTransRep(tNode *transact.TransN
|
|||
}
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_QueryCoinPool, &QueryCoinPoolTransactHandler{})
|
||||
transact.RegisteHandler(common.TransTypeQueryCoinPool, &QueryCoinPoolTransactHandler{})
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ var (
|
|||
)
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_GameSrvWebApi, &WebAPITranscateHandler{})
|
||||
transact.RegisteHandler(common.TransTypeGameSrvWebApi, &WebAPITranscateHandler{})
|
||||
}
|
||||
|
||||
var WebAPIHandlerMgrSingleton = &WebAPIHandlerMgr{wshMap: make(map[string]WebAPIHandler)}
|
||||
|
|
|
@ -10,35 +10,35 @@ import (
|
|||
)
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_StopServer, &transact.TransHanderWrapper{
|
||||
transact.RegisteHandler(common.TransTypeStopServer, &transact.TransHanderWrapper{
|
||||
OnExecuteWrapper: transact.OnExecuteWrapper(func(tNode *transact.TransNode, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer OnExecuteWrapper %x", tNode.MyTnp.TId)
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer OnExecuteWrapper %x", tNode.MyTnp.TId)
|
||||
base.SceneMgrSington.DestoryAllScene()
|
||||
//通知机器人关闭
|
||||
npcSess := srvlib.ServerSessionMgrSington.GetSession(common.GetSelfAreaId(), common.RobotServerType, common.RobotServerId)
|
||||
if npcSess != nil {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_StopServer,
|
||||
Tt: common.TransTypeStopServer,
|
||||
Ot: transact.TransOwnerType(common.RobotServerType),
|
||||
Oid: common.RobotServerId,
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
Tct: transact.TransactCommitPolicy_TwoPhase,
|
||||
}
|
||||
tNode.StartChildTrans(tnp, nil, time.Second*5)
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer StartChildTrans srvid:%v srvtype:%v", common.RobotServerId, common.RobotServerType)
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer StartChildTrans srvid:%v srvtype:%v", common.RobotServerId, common.RobotServerType)
|
||||
}
|
||||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Info("StopApi start TransType_StopServer OnCommitWrapper")
|
||||
logger.Logger.Info("StopApi start TransTypeStopServer OnCommitWrapper")
|
||||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Info("StopApi start TransType_StopServer OnRollBackWrapper")
|
||||
logger.Logger.Info("StopApi start TransTypeStopServer OnRollBackWrapper")
|
||||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer OnChildRespWrapper ret:%v childid:%x", retCode, hChild)
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer OnChildRespWrapper ret:%v childid:%x", retCode, hChild)
|
||||
return transact.TransExeResult(retCode)
|
||||
}),
|
||||
})
|
||||
|
|
|
@ -7,21 +7,21 @@ import (
|
|||
)
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_StopServer, &transact.TransHanderWrapper{
|
||||
transact.RegisteHandler(common.TransTypeStopServer, &transact.TransHanderWrapper{
|
||||
OnExecuteWrapper: transact.OnExecuteWrapper(func(tNode *transact.TransNode, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer OnExecuteWrapper %x", tNode.MyTnp.TId)
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer OnExecuteWrapper %x", tNode.MyTnp.TId)
|
||||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Info("StopApi start TransType_StopServer OnCommitWrapper")
|
||||
logger.Logger.Info("StopApi start TransTypeStopServer OnCommitWrapper")
|
||||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Info("StopApi start TransType_StopServer OnRollBackWrapper")
|
||||
logger.Logger.Info("StopApi start TransTypeStopServer OnRollBackWrapper")
|
||||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer OnChildRespWrapper ret:%v childid:%x", retCode, hChild)
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer OnChildRespWrapper ret:%v childid:%x", retCode, hChild)
|
||||
return transact.TransExeResult(retCode)
|
||||
}),
|
||||
})
|
||||
|
|
|
@ -80,7 +80,7 @@ func GameSrvWebAPI(rw http.ResponseWriter, req *http.Request) {
|
|||
suc := core.CoreObject().SendCommand(&WebApiEvent{req: req, path: req.URL.Path, h: HandlerWrapper(func(event *WebApiEvent, data []byte) bool {
|
||||
logger.Logger.Trace("GameSrvApi start transcate")
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_GameSrvWebApi,
|
||||
Tt: common.TransTypeGameSrvWebApi,
|
||||
Ot: transact.TransOwnerType(common.GetSelfSrvType()),
|
||||
Oid: common.GetSelfSrvId(),
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -128,14 +128,14 @@ func GameSrvWebAPI(rw http.ResponseWriter, req *http.Request) {
|
|||
|
||||
// //--------------------------------------------------------------------------------------
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_GameSrvWebApi, &transact.TransHanderWrapper{
|
||||
transact.RegisteHandler(common.TransTypeGameSrvWebApi, &transact.TransHanderWrapper{
|
||||
OnExecuteWrapper: transact.OnExecuteWrapper(func(tNode *transact.TransNode, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Trace("GameSrvApi start TransType_GameSrvWebApi OnExecuteWrapper")
|
||||
logger.Logger.Trace("GameSrvApi start TransTypeGameSrvWebApi OnExecuteWrapper")
|
||||
gameSrvIds := common.GetGameSrvIds()
|
||||
logger.Logger.Trace("Current game id:", gameSrvIds)
|
||||
for _, value := range gameSrvIds {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_GameSrvWebApi,
|
||||
Tt: common.TransTypeGameSrvWebApi,
|
||||
Ot: transact.TransOwnerType(srvlib.GameServerType),
|
||||
Oid: value,
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -154,7 +154,7 @@ func init() {
|
|||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Trace("GameSrvApi start TransType_GameSrvWebApi OnCommitWrapper")
|
||||
logger.Logger.Trace("GameSrvApi start TransTypeGameSrvWebApi OnCommitWrapper")
|
||||
event := tNode.TransEnv.GetField(GAMESRVAPI_TRANSACTE_EVENT).(*WebApiEvent)
|
||||
resp := tNode.TransEnv.GetField(GAMESRVAPI_TRANSACTE_RESPONSE)
|
||||
if ud, ok := resp.([]byte); ok {
|
||||
|
@ -165,7 +165,7 @@ func init() {
|
|||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Trace("GameSrvApi start TransType_GameSrvWebApi OnRollBackWrapper")
|
||||
logger.Logger.Trace("GameSrvApi start TransTypeGameSrvWebApi OnRollBackWrapper")
|
||||
event := tNode.TransEnv.GetField(GAMESRVAPI_TRANSACTE_EVENT).(*WebApiEvent)
|
||||
resp := tNode.TransEnv.GetField(GAMESRVAPI_TRANSACTE_RESPONSE)
|
||||
if ud, ok := resp.([]byte); ok {
|
||||
|
|
|
@ -89,7 +89,7 @@ func WorldSrvApi(rw http.ResponseWriter, req *http.Request) {
|
|||
suc := core.CoreObject().SendCommand(&WebApiEvent{req: req, path: req.URL.Path, h: HandlerWrapper(func(event *WebApiEvent, data []byte) bool {
|
||||
logger.Logger.Trace("WorldSrvApi start transcate")
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_WebApi,
|
||||
Tt: common.TransTypeWebApi,
|
||||
Ot: transact.TransOwnerType(common.GetSelfSrvType()),
|
||||
Oid: common.GetSelfSrvId(),
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -140,11 +140,11 @@ func WorldSrvApi(rw http.ResponseWriter, req *http.Request) {
|
|||
|
||||
// --------------------------------------------------------------------------------------
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_WebApi, &transact.TransHanderWrapper{
|
||||
transact.RegisteHandler(common.TransTypeWebApi, &transact.TransHanderWrapper{
|
||||
OnExecuteWrapper: transact.OnExecuteWrapper(func(tNode *transact.TransNode, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Trace("WorldSrvApi start TransType_WebApi OnExecuteWrapper ")
|
||||
logger.Logger.Trace("WorldSrvApi start TransTypeWebApi OnExecuteWrapper ")
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_WebApi,
|
||||
Tt: common.TransTypeWebApi,
|
||||
Ot: transact.TransOwnerType(srvlib.WorldServerType),
|
||||
Oid: common.GetWorldSrvId(),
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -156,13 +156,13 @@ func init() {
|
|||
|
||||
pid := tNode.MyTnp.TId
|
||||
cid := tnp.TId
|
||||
logger.Logger.Tracef("WorldSrvApi start TransType_WebApi OnExecuteWrapper tid:%x childid:%x", pid, cid)
|
||||
logger.Logger.Tracef("WorldSrvApi start TransTypeWebApi OnExecuteWrapper tid:%x childid:%x", pid, cid)
|
||||
return transact.TransExeResult_Success
|
||||
}
|
||||
return transact.TransExeResult_Failed
|
||||
}),
|
||||
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Trace("WorldSrvApi start TransType_WebApi OnCommitWrapper")
|
||||
logger.Logger.Trace("WorldSrvApi start TransTypeWebApi OnCommitWrapper")
|
||||
event := tNode.TransEnv.GetField(WEBAPI_TRANSACTE_EVENT).(*WebApiEvent)
|
||||
resp := tNode.TransEnv.GetField(WEBAPI_TRANSACTE_RESPONSE)
|
||||
if ud, ok := resp.([]byte); ok {
|
||||
|
@ -173,7 +173,7 @@ func init() {
|
|||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Trace("WorldSrvApi start TransType_WebApi OnRollBackWrapper")
|
||||
logger.Logger.Trace("WorldSrvApi start TransTypeWebApi OnRollBackWrapper")
|
||||
event := tNode.TransEnv.GetField(WEBAPI_TRANSACTE_EVENT).(*WebApiEvent)
|
||||
resp := tNode.TransEnv.GetField(WEBAPI_TRANSACTE_RESPONSE)
|
||||
if ud, ok := resp.([]byte); ok {
|
||||
|
@ -184,7 +184,7 @@ func init() {
|
|||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Tracef("WorldSrvApi start TransType_WebApi OnChildRespWrapper ret:%v childid:%x", retCode, hChild)
|
||||
logger.Logger.Tracef("WorldSrvApi start TransTypeWebApi OnChildRespWrapper ret:%v childid:%x", retCode, hChild)
|
||||
tNode.TransEnv.SetField(WEBAPI_TRANSACTE_RESPONSE, ud)
|
||||
return transact.TransExeResult(retCode)
|
||||
}),
|
||||
|
|
|
@ -53,7 +53,7 @@ func StopServer(wait chan struct{}, srvtype int, timeout time.Duration) {
|
|||
core.CoreObject().SendCommand(basic.CommandWrapper(func(o *basic.Object) error {
|
||||
logger.Logger.Infof("StopApi start transcate srvtype(%v) timeout(%v)", srvtype, timeout)
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_StopServer,
|
||||
Tt: common.TransTypeStopServer,
|
||||
Ot: transact.TransOwnerType(common.GetSelfSrvType()),
|
||||
Oid: common.GetSelfSrvId(),
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -121,15 +121,15 @@ func init() {
|
|||
return nil
|
||||
})
|
||||
|
||||
transact.RegisteHandler(common.TransType_StopServer, &transact.TransHanderWrapper{
|
||||
transact.RegisteHandler(common.TransTypeStopServer, &transact.TransHanderWrapper{
|
||||
OnExecuteWrapper: transact.OnExecuteWrapper(func(tNode *transact.TransNode, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Info("StopApi start TransType_StopServer OnExecuteWrapper ")
|
||||
logger.Logger.Info("StopApi start TransTypeStopServer OnExecuteWrapper ")
|
||||
if stopUD, ok := ud.(*StopAPIUserData); ok {
|
||||
tNode.TransEnv.SetField(STOPAPI_TRANSACTE_UD, ud)
|
||||
ids := srvlib.ServerSessionMgrSington.GetServerIds(common.GetSelfAreaId(), stopUD.srvtype)
|
||||
for _, id := range ids {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_StopServer,
|
||||
Tt: common.TransTypeStopServer,
|
||||
Ot: transact.TransOwnerType(stopUD.srvtype),
|
||||
Oid: id,
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -142,7 +142,7 @@ func init() {
|
|||
return transact.TransExeResult_Failed
|
||||
}),
|
||||
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Info("StopApi start TransType_StopServer OnCommitWrapper")
|
||||
logger.Logger.Info("StopApi start TransTypeStopServer OnCommitWrapper")
|
||||
field := tNode.TransEnv.GetField(STOPAPI_TRANSACTE_UD)
|
||||
if field != nil {
|
||||
if ud, ok := field.(*StopAPIUserData); ok {
|
||||
|
@ -152,7 +152,7 @@ func init() {
|
|||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Info("StopApi start TransType_StopServer OnRollBackWrapper")
|
||||
logger.Logger.Info("StopApi start TransTypeStopServer OnRollBackWrapper")
|
||||
field := tNode.TransEnv.GetField(STOPAPI_TRANSACTE_UD)
|
||||
if field != nil {
|
||||
if ud, ok := field.(*StopAPIUserData); ok {
|
||||
|
@ -162,7 +162,7 @@ func init() {
|
|||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer OnChildRespWrapper ret:%v childid:%x", retCode, hChild)
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer OnChildRespWrapper ret:%v childid:%x", retCode, hChild)
|
||||
return transact.TransExeResult(retCode)
|
||||
}),
|
||||
})
|
||||
|
|
|
@ -1683,10 +1683,11 @@ type ShopWeight struct {
|
|||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
ShopType int32 `protobuf:"varint,1,opt,name=ShopType,proto3" json:"ShopType,omitempty"`
|
||||
Weight int32 `protobuf:"varint,2,opt,name=Weight,proto3" json:"Weight,omitempty"`
|
||||
Name string `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`
|
||||
IsShow int32 `protobuf:"varint,4,opt,name=IsShow,proto3" json:"IsShow,omitempty"`
|
||||
ShopType int32 `protobuf:"varint,1,opt,name=ShopType,proto3" json:"ShopType,omitempty"`
|
||||
Weight int32 `protobuf:"varint,2,opt,name=Weight,proto3" json:"Weight,omitempty"`
|
||||
Name string `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`
|
||||
IsShow int32 `protobuf:"varint,4,opt,name=IsShow,proto3" json:"IsShow,omitempty"`
|
||||
Location []int32 `protobuf:"varint,5,rep,packed,name=Location,proto3" json:"Location,omitempty"` // 显示位置
|
||||
}
|
||||
|
||||
func (x *ShopWeight) Reset() {
|
||||
|
@ -1749,6 +1750,13 @@ func (x *ShopWeight) GetIsShow() int32 {
|
|||
return 0
|
||||
}
|
||||
|
||||
func (x *ShopWeight) GetLocation() []int32 {
|
||||
if x != nil {
|
||||
return x.Location
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type SCShopExchangeList struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
|
@ -2669,146 +2677,148 @@ var file_shop_proto_rawDesc = []byte{
|
|||
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, 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, 0xae, 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, 0x12, 0x17, 0x0a,
|
||||
0x13, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x44, 0x43, 0x6f, 0x69, 0x6e, 0x4e, 0x6f, 0x74, 0x45, 0x6e,
|
||||
0x6f, 0x75, 0x67, 0x68, 0x10, 0x0b, 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,
|
||||
0x72, 0x6c, 0x22, 0x88, 0x01, 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, 0x12, 0x1a, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20,
|
||||
0x03, 0x28, 0x05, 0x52, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 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,
|
||||
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, 0xae, 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, 0x12, 0x17, 0x0a, 0x13, 0x4f, 0x50,
|
||||
0x52, 0x43, 0x5f, 0x44, 0x43, 0x6f, 0x69, 0x6e, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67,
|
||||
0x68, 0x10, 0x0b, 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 (
|
||||
|
|
|
@ -208,6 +208,7 @@ message ShopWeight{
|
|||
int32 Weight = 2;
|
||||
string Name = 3;
|
||||
int32 IsShow = 4;
|
||||
repeated int32 Location = 5; // 显示位置
|
||||
}
|
||||
|
||||
message SCShopExchangeList{
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -422,6 +422,7 @@ message ShopWeight{
|
|||
int32 Weight = 2;
|
||||
string Name = 3;
|
||||
int32 IsShow = 4;
|
||||
repeated int32 Location = 5; // 显示位置
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -10,9 +10,9 @@ import (
|
|||
)
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_StopServer, &transact.TransHanderWrapper{
|
||||
transact.RegisteHandler(common.TransTypeStopServer, &transact.TransHanderWrapper{
|
||||
OnExecuteWrapper: transact.OnExecuteWrapper(func(tNode *transact.TransNode, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer OnExecuteWrapper %x", tNode.MyTnp.TId)
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer OnExecuteWrapper %x", tNode.MyTnp.TId)
|
||||
ClientMgrSingleton.Running = false
|
||||
timer.StartTimer(timer.TimerActionWrapper(func(h timer.TimerHandle, ud interface{}) bool {
|
||||
module.Stop()
|
||||
|
@ -21,15 +21,15 @@ func init() {
|
|||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Info("StopApi start TransType_StopServer OnCommitWrapper")
|
||||
logger.Logger.Info("StopApi start TransTypeStopServer OnCommitWrapper")
|
||||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Info("StopApi start TransType_StopServer OnRollBackWrapper")
|
||||
logger.Logger.Info("StopApi start TransTypeStopServer OnRollBackWrapper")
|
||||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer OnChildRespWrapper ret:%v childid:%x", retCode, hChild)
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer OnChildRespWrapper ret:%v childid:%x", retCode, hChild)
|
||||
return transact.TransExeResult(retCode)
|
||||
}),
|
||||
})
|
||||
|
|
|
@ -2663,8 +2663,8 @@ func CSBindTel(s *netlib.Session, packetId int, data interface{}, sid int64) err
|
|||
SaveInviteScore(&model.InviteScore{
|
||||
Platform: p.Platform,
|
||||
SnId: p.SnId,
|
||||
InviteSnId: p.InviterId,
|
||||
Tp: common.InviteScoreTypeBind,
|
||||
InviteSnId: p.PSnId,
|
||||
Tp: common.InviteScoreTypeBindTel,
|
||||
Score: cfg.GetBindTelScore(),
|
||||
Ts: time.Now().Unix(),
|
||||
Money: 0,
|
||||
|
|
|
@ -192,7 +192,7 @@ func init() {
|
|||
netlib.RegisterHandler(int(serverproto.SSPacketID_PACKET_GW_AUDIENCELEAVE), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
|
||||
logger.Logger.Trace("receive PACKET_GW_AUDIENCELEAVE GWPlayerLeave:", pack)
|
||||
if msg, ok := pack.(*serverproto.GWPlayerLeave); ok {
|
||||
scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()))
|
||||
scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()), true)
|
||||
if scene != nil {
|
||||
p := PlayerMgrSington.GetPlayerBySnId(msg.GetPlayerId())
|
||||
if p != nil {
|
||||
|
|
|
@ -459,6 +459,17 @@ func CSBindInvite(s *netlib.Session, packetid int, data interface{}, sid int64)
|
|||
Ts: now.Unix(),
|
||||
Money: 0,
|
||||
})
|
||||
if len(p.Tel) > 0 {
|
||||
SaveInviteScore(&model.InviteScore{
|
||||
Platform: p.Platform,
|
||||
SnId: p.SnId,
|
||||
InviteSnId: inviteSnId,
|
||||
Tp: common.InviteScoreTypeBindTel,
|
||||
Score: cfg.GetBindTelScore(),
|
||||
Ts: time.Now().Unix(),
|
||||
Money: 0,
|
||||
})
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {
|
||||
|
|
|
@ -271,7 +271,7 @@ func (m *CoinSceneMgr) StartChangeCoinSceneTransact(p *Player, id int32, exclude
|
|||
}
|
||||
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_CoinSceneChange,
|
||||
Tt: common.TransTypeCoinSceneChange,
|
||||
Ot: transact.TransOwnerType(common.GetSelfSrvType()),
|
||||
Oid: common.GetSelfSrvId(),
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
|
|
@ -215,7 +215,7 @@ func (this *HundredSceneMgr) CreateNewScene(id, groupId int32, limitPlatform *Pl
|
|||
scene.hp = this
|
||||
return scene
|
||||
} else {
|
||||
logger.Logger.Errorf("Create hundred scene %v-%v failed.", gameId, sceneId)
|
||||
logger.Logger.Warnf("Create hundred scene %v-%v failed.", gameId, sceneId)
|
||||
}
|
||||
} else {
|
||||
logger.Logger.Errorf("Game rule data %v no found.", dbGameFree.GetGameRule())
|
||||
|
|
|
@ -84,7 +84,7 @@ func (p *PlayerNotify) SendToClient(tp common.NotifyType, packetId int, pack int
|
|||
if len(d.GetDatas()) == 0 {
|
||||
return
|
||||
}
|
||||
scene := SceneMgrSingleton.GetScene(int(d.GetDatas()[0].GetRoomId()))
|
||||
scene := SceneMgrSingleton.GetScene(int(d.GetDatas()[0].GetRoomId()), true)
|
||||
if scene == nil {
|
||||
return
|
||||
}
|
||||
|
|
|
@ -1052,6 +1052,7 @@ func (this *ShopMgr) ExchangeList(p *Player) (ret bool) {
|
|||
Weight: info.Weight,
|
||||
Name: info.Name,
|
||||
IsShow: info.IsShow,
|
||||
Location: info.Location,
|
||||
})
|
||||
}
|
||||
for _, v := range as.List {
|
||||
|
|
|
@ -3,17 +3,18 @@ package main
|
|||
import (
|
||||
"time"
|
||||
|
||||
"mongo.games.com/game/common"
|
||||
"mongo.games.com/goserver/core"
|
||||
"mongo.games.com/goserver/core/logger"
|
||||
"mongo.games.com/goserver/core/transact"
|
||||
"mongo.games.com/goserver/srvlib"
|
||||
|
||||
"mongo.games.com/game/common"
|
||||
)
|
||||
|
||||
var TransAddCoinTimeOut = time.Second * 30
|
||||
|
||||
const (
|
||||
TRANSACT_ADDCOIN_CTX = iota
|
||||
TransactAddCoinCTX = iota
|
||||
)
|
||||
|
||||
type AsyncAddCoinTransactContext struct {
|
||||
|
@ -43,14 +44,14 @@ func (this *AddCoinTransactHandler) OnExcute(tNode *transact.TransNode, ud inter
|
|||
WriteLog: ctx.writeLog,
|
||||
}
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_AddCoin,
|
||||
Tt: common.TransTypeAddCoin,
|
||||
Ot: transact.TransOwnerType(srvlib.GameServerType),
|
||||
Oid: int(ctx.p.scene.gameSess.GetSrvId()),
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
Tct: transact.TransactCommitPolicy_TwoPhase,
|
||||
}
|
||||
|
||||
tNode.TransEnv.SetField(TRANSACT_ADDCOIN_CTX, ud)
|
||||
tNode.TransEnv.SetField(TransactAddCoinCTX, ud)
|
||||
tNode.StartChildTrans(tnp, pack, TransAddCoinTimeOut)
|
||||
}
|
||||
}
|
||||
|
@ -60,7 +61,7 @@ func (this *AddCoinTransactHandler) OnExcute(tNode *transact.TransNode, ud inter
|
|||
|
||||
func (this *AddCoinTransactHandler) OnCommit(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Trace("AddCoinTransactHandler.OnCommit ")
|
||||
ud := tNode.TransEnv.GetField(TRANSACT_ADDCOIN_CTX)
|
||||
ud := tNode.TransEnv.GetField(TransactAddCoinCTX)
|
||||
if ctx, ok := ud.(*AsyncAddCoinTransactContext); ok {
|
||||
p := PlayerMgrSington.GetPlayerBySnId(ctx.p.SnId) //重新获得p
|
||||
if p != nil {
|
||||
|
@ -73,7 +74,7 @@ func (this *AddCoinTransactHandler) OnCommit(tNode *transact.TransNode) transact
|
|||
|
||||
func (this *AddCoinTransactHandler) OnRollBack(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Trace("AddCoinTransactHandler.OnRollBack ")
|
||||
ud := tNode.TransEnv.GetField(TRANSACT_ADDCOIN_CTX)
|
||||
ud := tNode.TransEnv.GetField(TransactAddCoinCTX)
|
||||
if ctx, ok := ud.(*AsyncAddCoinTransactContext); ok {
|
||||
p := PlayerMgrSington.GetPlayerBySnId(ctx.p.SnId) //重新获得p
|
||||
if p != nil {
|
||||
|
@ -93,7 +94,7 @@ func (this *AddCoinTransactHandler) OnChildTransRep(tNode *transact.TransNode, h
|
|||
|
||||
func StartAsyncAddCoinTransact(p *Player, num int64, gainWay int32, oper, remark string, broadcast bool, retryCnt int, writeLog bool) bool {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_AddCoin,
|
||||
Tt: common.TransTypeAddCoin,
|
||||
Ot: transact.TransOwnerType(common.GetSelfSrvType()),
|
||||
Oid: common.GetSelfSrvId(),
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -118,5 +119,5 @@ func StartAsyncAddCoinTransact(p *Player, num int64, gainWay int32, oper, remark
|
|||
}
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_AddCoin, &AddCoinTransactHandler{})
|
||||
transact.RegisteHandler(common.TransTypeAddCoin, &AddCoinTransactHandler{})
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ func (this *CoinSceneChangeTransactHandler) OnExcute(tNode *transact.TransNode,
|
|||
player := PlayerMgrSington.GetPlayerBySnId(ctx.snid)
|
||||
if player != nil && player.scene != nil {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_CoinSceneChange,
|
||||
Tt: common.TransTypeCoinSceneChange,
|
||||
Ot: transact.TransOwnerType(srvlib.GameServerType),
|
||||
Oid: int(player.scene.gameSess.GetSrvId()),
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -164,5 +164,5 @@ func (this *CoinSceneChangeTransactHandler) OnChildTransRep(tNode *transact.Tran
|
|||
}
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_CoinSceneChange, &CoinSceneChangeTransactHandler{})
|
||||
transact.RegisteHandler(common.TransTypeCoinSceneChange, &CoinSceneChangeTransactHandler{})
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@ func (this *DayTimeChangeTransactHandler) OnExcute(tNode *transact.TransNode, ud
|
|||
common.ClockMgrSingleton.Notifying = true
|
||||
for sid, _ := range GameSessMgrSington.servers {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_DayTimeChange,
|
||||
Tt: common.TransTypeDayTimeChange,
|
||||
Ot: transact.TransOwnerType(srvlib.GameServerType),
|
||||
Oid: sid,
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -58,7 +58,7 @@ type DayTimeChangeTransactSinker struct {
|
|||
|
||||
func (this *DayTimeChangeTransactSinker) OnMiniTimer() {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_DayTimeChange,
|
||||
Tt: common.TransTypeDayTimeChange,
|
||||
Ot: transact.TransOwnerType(common.GetSelfSrvType()),
|
||||
Oid: common.GetSelfSrvId(),
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -71,5 +71,5 @@ func (this *DayTimeChangeTransactSinker) OnMiniTimer() {
|
|||
|
||||
func init() {
|
||||
common.ClockMgrSingleton.RegisterSinker(&DayTimeChangeTransactSinker{})
|
||||
transact.RegisteHandler(common.TransType_DayTimeChange, &DayTimeChangeTransactHandler{})
|
||||
transact.RegisteHandler(common.TransTypeDayTimeChange, &DayTimeChangeTransactHandler{})
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@ func (this *MatchSceneChangeTransactHandler) OnExcute(tNode *transact.TransNode,
|
|||
player := PlayerMgrSington.GetPlayerBySnId(ctx.snid)
|
||||
if player != nil && player.scene != nil {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_MatchSceneChange,
|
||||
Tt: common.TransTypeMatchSceneChange,
|
||||
Ot: transact.TransOwnerType(srvlib.GameServerType),
|
||||
Oid: int(player.scene.gameSess.GetSrvId()),
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -87,5 +87,5 @@ func (this *MatchSceneChangeTransactHandler) OnChildTransRep(tNode *transact.Tra
|
|||
}
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_MatchSceneChange, &MatchSceneChangeTransactHandler{})
|
||||
transact.RegisteHandler(common.TransTypeMatchSceneChange, &MatchSceneChangeTransactHandler{})
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@ func (this *QueryAllCoinPoolTransactHandler) OnExcute(tNode *transact.TransNode,
|
|||
for sid, gs := range GameSessMgrSington.servers {
|
||||
if gs.srvType == srvlib.GameServerType {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_QueryAllCoinPool,
|
||||
Tt: common.TransTypeQueryAllCoinPool,
|
||||
Ot: transact.TransOwnerType(srvlib.GameServerType),
|
||||
Oid: sid,
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -124,7 +124,7 @@ func (this *QueryAllCoinPoolTransactHandler) OnChildTransRep(tNode *transact.Tra
|
|||
|
||||
func StartQueryCoinPoolStatesTransact(tParent *transact.TransNode, pageNo, pageSize int32) {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_QueryAllCoinPool,
|
||||
Tt: common.TransTypeQueryAllCoinPool,
|
||||
Ot: transact.TransOwnerType(common.GetSelfSrvType()),
|
||||
Oid: common.GetSelfSrvId(),
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -188,5 +188,5 @@ func StartQueryCoinPoolStatesTransact(tParent *transact.TransNode, pageNo, pageS
|
|||
}
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_QueryAllCoinPool, &QueryAllCoinPoolTransactHandler{})
|
||||
transact.RegisteHandler(common.TransTypeQueryAllCoinPool, &QueryAllCoinPoolTransactHandler{})
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ func (this *QueryCoinPoolTransactHandler) OnExcute(tNode *transact.TransNode, ud
|
|||
gs.DetectCoinPoolSetting(data.Platform, id, data.GroupId)
|
||||
}
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_QueryCoinPool,
|
||||
Tt: common.TransTypeQueryCoinPool,
|
||||
Ot: transact.TransOwnerType(srvlib.GameServerType),
|
||||
Oid: sid,
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -103,7 +103,7 @@ func (this *QueryCoinPoolTransactHandler) OnChildTransRep(tNode *transact.TransN
|
|||
|
||||
func StartQueryCoinPoolTransact(tParent *transact.TransNode, gameid, gamemode int32, platform string, groupId int32) {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_QueryCoinPool,
|
||||
Tt: common.TransTypeQueryCoinPool,
|
||||
Ot: transact.TransOwnerType(common.GetSelfSrvType()),
|
||||
Oid: common.GetSelfSrvId(),
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
|
@ -122,5 +122,5 @@ func StartQueryCoinPoolTransact(tParent *transact.TransNode, gameid, gamemode in
|
|||
}
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_QueryCoinPool, &QueryCoinPoolTransactHandler{})
|
||||
transact.RegisteHandler(common.TransTypeQueryCoinPool, &QueryCoinPoolTransactHandler{})
|
||||
}
|
||||
|
|
|
@ -9,43 +9,43 @@ import (
|
|||
)
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_StopServer, &transact.TransHanderWrapper{
|
||||
transact.RegisteHandler(common.TransTypeStopServer, &transact.TransHanderWrapper{
|
||||
OnExecuteWrapper: transact.OnExecuteWrapper(func(tNode *transact.TransNode, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer OnExecuteWrapper %x", tNode.MyTnp.TId)
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer OnExecuteWrapper %x", tNode.MyTnp.TId)
|
||||
for _, s := range GameSessMgrSington.gates {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_StopServer,
|
||||
Tt: common.TransTypeStopServer,
|
||||
Ot: transact.TransOwnerType(s.srvType),
|
||||
Oid: s.srvId,
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
Tct: transact.TransactCommitPolicy_TwoPhase,
|
||||
}
|
||||
tNode.StartChildTrans(tnp, nil, time.Minute*5)
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer StartChildTrans srvid:%v srvtype:%v", s.srvId, s.srvType)
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer StartChildTrans srvid:%v srvtype:%v", s.srvId, s.srvType)
|
||||
}
|
||||
for _, s := range GameSessMgrSington.servers {
|
||||
tnp := &transact.TransNodeParam{
|
||||
Tt: common.TransType_StopServer,
|
||||
Tt: common.TransTypeStopServer,
|
||||
Ot: transact.TransOwnerType(s.srvType),
|
||||
Oid: s.srvId,
|
||||
AreaID: common.GetSelfAreaId(),
|
||||
Tct: transact.TransactCommitPolicy_TwoPhase,
|
||||
}
|
||||
tNode.StartChildTrans(tnp, nil, time.Minute*5)
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer StartChildTrans srvid:%v srvtype:%v", s.srvId, s.srvType)
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer StartChildTrans srvid:%v srvtype:%v", s.srvId, s.srvType)
|
||||
}
|
||||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer OnCommitWrapper ")
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer OnCommitWrapper ")
|
||||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult {
|
||||
logger.Logger.Info("StopApi start TransType_StopServer OnRollBackWrapper")
|
||||
logger.Logger.Info("StopApi start TransTypeStopServer OnRollBackWrapper")
|
||||
return transact.TransExeResult_Success
|
||||
}),
|
||||
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult {
|
||||
logger.Logger.Infof("StopApi start TransType_StopServer OnChildRespWrapper ret:%v childid:%x", retCode, hChild)
|
||||
logger.Logger.Infof("StopApi start TransTypeStopServer OnChildRespWrapper ret:%v childid:%x", retCode, hChild)
|
||||
return transact.TransExeResult(retCode)
|
||||
}),
|
||||
})
|
||||
|
|
|
@ -42,7 +42,7 @@ const (
|
|||
)
|
||||
|
||||
func init() {
|
||||
transact.RegisteHandler(common.TransType_WebApi, &WebAPITranscateHandler{})
|
||||
transact.RegisteHandler(common.TransTypeWebApi, &WebAPITranscateHandler{})
|
||||
}
|
||||
|
||||
var WebAPIHandlerMgrSingleton = &WebAPIHandlerMgr{wshMap: make(map[string]WebAPIHandler)}
|
||||
|
|
Loading…
Reference in New Issue