tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

This commit is contained in:
sk 2024-09-20 08:28:01 +08:00
parent 3dab56c03a
commit 522b284dd6
23 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/transtype.go
View File

@ -5,23 +5,23 @@ import (
) )
const ( const (
TransType_Login transact.TransType = 1000 TransTypeLogin transact.TransType = 1000
TransType_Logout = 1001 TransTypeLogout = 1001
TransType_WebTrascate = 1002 TransTypeWebTransact = 1002
TransType_AddCoin = 1003 TransTypeAddCoin = 1003
TransType_ViewData = 1004 TransTypeViewData = 1004
TransType_DayTimeChange = 1005 TransTypeDayTimeChange = 1005
TransType_CoinSceneChange = 1006 TransTypeCoinSceneChange = 1006
TransType_WebApi = 1007 TransTypeWebApi = 1007
TransType_WebApi_ForRank = 1101 TransTypeWebApiForRank = 1101
TransType_GameSrvWebApi = 1008 TransTypeGameSrvWebApi = 1008
TransType_QueryCoinPool = 1009 TransTypeQueryCoinPool = 1009
TransType_StopServer = 1010 TransTypeStopServer = 1010
TransType_QueryAllCoinPool = 1011 TransTypeQueryAllCoinPool = 1011
TransType_ActThrSrvWebApi = 1012 TransTypeActThrSrvWebApi = 1012
TransType_MatchSceneChange = 1013 TransTypeMatchSceneChange = 1013
TransType_MiniGameAddCoin = 1014 TransTypeMiniGameAddCoin = 1014
TransType_ServerCtrl = 1015 TransTypeServerCtrl = 1015
) )
type M2GWebTrascate struct { type M2GWebTrascate struct {

2
gamesrv/transact/transact_addcoin.go
View File

@ -76,5 +76,5 @@ func (this *AddCoinTransactHandler) OnChildTransRep(tNode *transact.TransNode, h
} }
func init() { func init() {
transact.RegisteHandler(common.TransType_AddCoin, &AddCoinTransactHandler{}) transact.RegisteHandler(common.TransTypeAddCoin, &AddCoinTransactHandler{})
} }

2
gamesrv/transact/transact_coinscenechange.go
View File

@ -62,5 +62,5 @@ func (this *CoinSceneChangeTransactHandler) OnChildTransRep(tNode *transact.Tran
} }
func init() { func init() {
transact.RegisteHandler(common.TransType_CoinSceneChange, &CoinSceneChangeTransactHandler{}) transact.RegisteHandler(common.TransTypeCoinSceneChange, &CoinSceneChangeTransactHandler{})
} }

2
gamesrv/transact/transact_daytimechange.go
View File

@ -104,7 +104,7 @@ func (this *DayTimeChangeTransactHandler) OnChildTransRep(tNode *transact.TransN
} }
func init() { func init() {
transact.RegisteHandler(common.TransType_DayTimeChange, &DayTimeChangeTransactHandler{}) transact.RegisteHandler(common.TransTypeDayTimeChange, &DayTimeChangeTransactHandler{})
RegisteDayTimeChangeListener(base.CoinPoolMgr) RegisteDayTimeChangeListener(base.CoinPoolMgr)
RegisteDayTimeChangeListener(base.SceneMgrSington) RegisteDayTimeChangeListener(base.SceneMgrSington)
} }

2
gamesrv/transact/transact_matchscenechange.go
View File

@ -62,5 +62,5 @@ func (this *MatchSceneChangeTransactHandler) OnChildTransRep(tNode *transact.Tra
} }
func init() { func init() {
transact.RegisteHandler(common.TransType_MatchSceneChange, &MatchSceneChangeTransactHandler{}) transact.RegisteHandler(common.TransTypeMatchSceneChange, &MatchSceneChangeTransactHandler{})
} }

2
gamesrv/transact/transact_queryallcoinpoolstates.go
View File

@ -54,5 +54,5 @@ func (this *QueryAllCoinPoolTransactHandler) OnChildTransRep(tNode *transact.Tra
} }
func init() { func init() {
transact.RegisteHandler(common.TransType_QueryAllCoinPool, &QueryAllCoinPoolTransactHandler{}) transact.RegisteHandler(common.TransTypeQueryAllCoinPool, &QueryAllCoinPoolTransactHandler{})
} }

2
gamesrv/transact/transact_querycoinpool.go
View File

@ -47,5 +47,5 @@ func (this *QueryCoinPoolTransactHandler) OnChildTransRep(tNode *transact.TransN
} }
func init() { func init() {
transact.RegisteHandler(common.TransType_QueryCoinPool, &QueryCoinPoolTransactHandler{}) transact.RegisteHandler(common.TransTypeQueryCoinPool, &QueryCoinPoolTransactHandler{})
} }

2
gamesrv/transact/trascate_gamesrv.go
View File

@ -23,7 +23,7 @@ var (
) )
func init() { func init() {
transact.RegisteHandler(common.TransType_GameSrvWebApi, &WebAPITranscateHandler{}) transact.RegisteHandler(common.TransTypeGameSrvWebApi, &WebAPITranscateHandler{})
} }
var WebAPIHandlerMgrSingleton = &WebAPIHandlerMgr{wshMap: make(map[string]WebAPIHandler)} var WebAPIHandlerMgrSingleton = &WebAPIHandlerMgr{wshMap: make(map[string]WebAPIHandler)}

14
gamesrv/transact/trascate_stop.go
View File

@ -10,35 +10,35 @@ import (
) )
func init() { 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 { 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() base.SceneMgrSington.DestoryAllScene()
//通知机器人关闭 //通知机器人关闭
npcSess := srvlib.ServerSessionMgrSington.GetSession(common.GetSelfAreaId(), common.RobotServerType, common.RobotServerId) npcSess := srvlib.ServerSessionMgrSington.GetSession(common.GetSelfAreaId(), common.RobotServerType, common.RobotServerId)
if npcSess != nil { if npcSess != nil {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_StopServer, Tt: common.TransTypeStopServer,
Ot: transact.TransOwnerType(common.RobotServerType), Ot: transact.TransOwnerType(common.RobotServerType),
Oid: common.RobotServerId, Oid: common.RobotServerId,
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
Tct: transact.TransactCommitPolicy_TwoPhase, Tct: transact.TransactCommitPolicy_TwoPhase,
} }
tNode.StartChildTrans(tnp, nil, time.Second*5) 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 return transact.TransExeResult_Success
}), }),
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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 return transact.TransExeResult_Success
}), }),
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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 return transact.TransExeResult_Success
}), }),
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult { 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) return transact.TransExeResult(retCode)
}), }),
}) })

10
gatesrv/trascate_stop.go
View File

@ -7,21 +7,21 @@ import (
) )
func init() { 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 { 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 return transact.TransExeResult_Success
}), }),
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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 return transact.TransExeResult_Success
}), }),
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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 return transact.TransExeResult_Success
}), }),
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult { 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) return transact.TransExeResult(retCode)
}), }),
}) })

12
mgrsrv/api/webapi_gamesrv.go
View File

@ -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 { 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") logger.Logger.Trace("GameSrvApi start transcate")
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_GameSrvWebApi, Tt: common.TransTypeGameSrvWebApi,
Ot: transact.TransOwnerType(common.GetSelfSrvType()), Ot: transact.TransOwnerType(common.GetSelfSrvType()),
Oid: common.GetSelfSrvId(), Oid: common.GetSelfSrvId(),
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -128,14 +128,14 @@ func GameSrvWebAPI(rw http.ResponseWriter, req *http.Request) {
// //-------------------------------------------------------------------------------------- // //--------------------------------------------------------------------------------------
func init() { 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 { 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() gameSrvIds := common.GetGameSrvIds()
logger.Logger.Trace("Current game id:", gameSrvIds) logger.Logger.Trace("Current game id:", gameSrvIds)
for _, value := range gameSrvIds { for _, value := range gameSrvIds {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_GameSrvWebApi, Tt: common.TransTypeGameSrvWebApi,
Ot: transact.TransOwnerType(srvlib.GameServerType), Ot: transact.TransOwnerType(srvlib.GameServerType),
Oid: value, Oid: value,
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -154,7 +154,7 @@ func init() {
return transact.TransExeResult_Success return transact.TransExeResult_Success
}), }),
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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) event := tNode.TransEnv.GetField(GAMESRVAPI_TRANSACTE_EVENT).(*WebApiEvent)
resp := tNode.TransEnv.GetField(GAMESRVAPI_TRANSACTE_RESPONSE) resp := tNode.TransEnv.GetField(GAMESRVAPI_TRANSACTE_RESPONSE)
if ud, ok := resp.([]byte); ok { if ud, ok := resp.([]byte); ok {
@ -165,7 +165,7 @@ func init() {
return transact.TransExeResult_Success return transact.TransExeResult_Success
}), }),
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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) event := tNode.TransEnv.GetField(GAMESRVAPI_TRANSACTE_EVENT).(*WebApiEvent)
resp := tNode.TransEnv.GetField(GAMESRVAPI_TRANSACTE_RESPONSE) resp := tNode.TransEnv.GetField(GAMESRVAPI_TRANSACTE_RESPONSE)
if ud, ok := resp.([]byte); ok { if ud, ok := resp.([]byte); ok {

16
mgrsrv/api/webapi_worldsrv.go
View File

@ -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 { 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") logger.Logger.Trace("WorldSrvApi start transcate")
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_WebApi, Tt: common.TransTypeWebApi,
Ot: transact.TransOwnerType(common.GetSelfSrvType()), Ot: transact.TransOwnerType(common.GetSelfSrvType()),
Oid: common.GetSelfSrvId(), Oid: common.GetSelfSrvId(),
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -140,11 +140,11 @@ func WorldSrvApi(rw http.ResponseWriter, req *http.Request) {
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
func init() { 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 { 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{ tnp := &transact.TransNodeParam{
Tt: common.TransType_WebApi, Tt: common.TransTypeWebApi,
Ot: transact.TransOwnerType(srvlib.WorldServerType), Ot: transact.TransOwnerType(srvlib.WorldServerType),
Oid: common.GetWorldSrvId(), Oid: common.GetWorldSrvId(),
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -156,13 +156,13 @@ func init() {
pid := tNode.MyTnp.TId pid := tNode.MyTnp.TId
cid := tnp.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_Success
} }
return transact.TransExeResult_Failed return transact.TransExeResult_Failed
}), }),
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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) event := tNode.TransEnv.GetField(WEBAPI_TRANSACTE_EVENT).(*WebApiEvent)
resp := tNode.TransEnv.GetField(WEBAPI_TRANSACTE_RESPONSE) resp := tNode.TransEnv.GetField(WEBAPI_TRANSACTE_RESPONSE)
if ud, ok := resp.([]byte); ok { if ud, ok := resp.([]byte); ok {
@ -173,7 +173,7 @@ func init() {
return transact.TransExeResult_Success return transact.TransExeResult_Success
}), }),
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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) event := tNode.TransEnv.GetField(WEBAPI_TRANSACTE_EVENT).(*WebApiEvent)
resp := tNode.TransEnv.GetField(WEBAPI_TRANSACTE_RESPONSE) resp := tNode.TransEnv.GetField(WEBAPI_TRANSACTE_RESPONSE)
if ud, ok := resp.([]byte); ok { if ud, ok := resp.([]byte); ok {
@ -184,7 +184,7 @@ func init() {
return transact.TransExeResult_Success return transact.TransExeResult_Success
}), }),
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult { 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) tNode.TransEnv.SetField(WEBAPI_TRANSACTE_RESPONSE, ud)
return transact.TransExeResult(retCode) return transact.TransExeResult(retCode)
}), }),

14
mgrsrv/stop.go
View File

@ -53,7 +53,7 @@ func StopServer(wait chan struct{}, srvtype int, timeout time.Duration) {
core.CoreObject().SendCommand(basic.CommandWrapper(func(o *basic.Object) error { core.CoreObject().SendCommand(basic.CommandWrapper(func(o *basic.Object) error {
logger.Logger.Infof("StopApi start transcate srvtype(%v) timeout(%v)", srvtype, timeout) logger.Logger.Infof("StopApi start transcate srvtype(%v) timeout(%v)", srvtype, timeout)
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_StopServer, Tt: common.TransTypeStopServer,
Ot: transact.TransOwnerType(common.GetSelfSrvType()), Ot: transact.TransOwnerType(common.GetSelfSrvType()),
Oid: common.GetSelfSrvId(), Oid: common.GetSelfSrvId(),
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -121,15 +121,15 @@ func init() {
return nil 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 { 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 { if stopUD, ok := ud.(*StopAPIUserData); ok {
tNode.TransEnv.SetField(STOPAPI_TRANSACTE_UD, ud) tNode.TransEnv.SetField(STOPAPI_TRANSACTE_UD, ud)
ids := srvlib.ServerSessionMgrSington.GetServerIds(common.GetSelfAreaId(), stopUD.srvtype) ids := srvlib.ServerSessionMgrSington.GetServerIds(common.GetSelfAreaId(), stopUD.srvtype)
for _, id := range ids { for _, id := range ids {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_StopServer, Tt: common.TransTypeStopServer,
Ot: transact.TransOwnerType(stopUD.srvtype), Ot: transact.TransOwnerType(stopUD.srvtype),
Oid: id, Oid: id,
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -142,7 +142,7 @@ func init() {
return transact.TransExeResult_Failed return transact.TransExeResult_Failed
}), }),
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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) field := tNode.TransEnv.GetField(STOPAPI_TRANSACTE_UD)
if field != nil { if field != nil {
if ud, ok := field.(*StopAPIUserData); ok { if ud, ok := field.(*StopAPIUserData); ok {
@ -152,7 +152,7 @@ func init() {
return transact.TransExeResult_Success return transact.TransExeResult_Success
}), }),
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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) field := tNode.TransEnv.GetField(STOPAPI_TRANSACTE_UD)
if field != nil { if field != nil {
if ud, ok := field.(*StopAPIUserData); ok { if ud, ok := field.(*StopAPIUserData); ok {
@ -162,7 +162,7 @@ func init() {
return transact.TransExeResult_Success return transact.TransExeResult_Success
}), }),
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult { 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) return transact.TransExeResult(retCode)
}), }),
}) })

10
robot/base/trascate_stop.go
View File

@ -10,9 +10,9 @@ import (
) )
func init() { 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 { 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 ClientMgrSingleton.Running = false
timer.StartTimer(timer.TimerActionWrapper(func(h timer.TimerHandle, ud interface{}) bool { timer.StartTimer(timer.TimerActionWrapper(func(h timer.TimerHandle, ud interface{}) bool {
module.Stop() module.Stop()
@ -21,15 +21,15 @@ func init() {
return transact.TransExeResult_Success return transact.TransExeResult_Success
}), }),
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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 return transact.TransExeResult_Success
}), }),
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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 return transact.TransExeResult_Success
}), }),
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult { 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) return transact.TransExeResult(retCode)
}), }),
}) })

2
worldsrv/coinscenemgr.go
View File

@ -271,7 +271,7 @@ func (m *CoinSceneMgr) StartChangeCoinSceneTransact(p *Player, id int32, exclude
} }
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_CoinSceneChange, Tt: common.TransTypeCoinSceneChange,
Ot: transact.TransOwnerType(common.GetSelfSrvType()), Ot: transact.TransOwnerType(common.GetSelfSrvType()),
Oid: common.GetSelfSrvId(), Oid: common.GetSelfSrvId(),
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),

6
worldsrv/transact_addcoin.go
View File

@ -43,7 +43,7 @@ func (this *AddCoinTransactHandler) OnExcute(tNode *transact.TransNode, ud inter
WriteLog: ctx.writeLog, WriteLog: ctx.writeLog,
} }
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_AddCoin, Tt: common.TransTypeAddCoin,
Ot: transact.TransOwnerType(srvlib.GameServerType), Ot: transact.TransOwnerType(srvlib.GameServerType),
Oid: int(ctx.p.scene.gameSess.GetSrvId()), Oid: int(ctx.p.scene.gameSess.GetSrvId()),
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -93,7 +93,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 { func StartAsyncAddCoinTransact(p *Player, num int64, gainWay int32, oper, remark string, broadcast bool, retryCnt int, writeLog bool) bool {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_AddCoin, Tt: common.TransTypeAddCoin,
Ot: transact.TransOwnerType(common.GetSelfSrvType()), Ot: transact.TransOwnerType(common.GetSelfSrvType()),
Oid: common.GetSelfSrvId(), Oid: common.GetSelfSrvId(),
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -118,5 +118,5 @@ func StartAsyncAddCoinTransact(p *Player, num int64, gainWay int32, oper, remark
} }
func init() { func init() {
transact.RegisteHandler(common.TransType_AddCoin, &AddCoinTransactHandler{}) transact.RegisteHandler(common.TransTypeAddCoin, &AddCoinTransactHandler{})
} }

4
worldsrv/transact_coinscenechange.go
View File

@ -34,7 +34,7 @@ func (this *CoinSceneChangeTransactHandler) OnExcute(tNode *transact.TransNode,
player := PlayerMgrSington.GetPlayerBySnId(ctx.snid) player := PlayerMgrSington.GetPlayerBySnId(ctx.snid)
if player != nil && player.scene != nil { if player != nil && player.scene != nil {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_CoinSceneChange, Tt: common.TransTypeCoinSceneChange,
Ot: transact.TransOwnerType(srvlib.GameServerType), Ot: transact.TransOwnerType(srvlib.GameServerType),
Oid: int(player.scene.gameSess.GetSrvId()), Oid: int(player.scene.gameSess.GetSrvId()),
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -164,5 +164,5 @@ func (this *CoinSceneChangeTransactHandler) OnChildTransRep(tNode *transact.Tran
} }
func init() { func init() {
transact.RegisteHandler(common.TransType_CoinSceneChange, &CoinSceneChangeTransactHandler{}) transact.RegisteHandler(common.TransTypeCoinSceneChange, &CoinSceneChangeTransactHandler{})
} }

6
worldsrv/transact_daytimechange.go
View File

@ -20,7 +20,7 @@ func (this *DayTimeChangeTransactHandler) OnExcute(tNode *transact.TransNode, ud
common.ClockMgrSingleton.Notifying = true common.ClockMgrSingleton.Notifying = true
for sid, _ := range GameSessMgrSington.servers { for sid, _ := range GameSessMgrSington.servers {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_DayTimeChange, Tt: common.TransTypeDayTimeChange,
Ot: transact.TransOwnerType(srvlib.GameServerType), Ot: transact.TransOwnerType(srvlib.GameServerType),
Oid: sid, Oid: sid,
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -58,7 +58,7 @@ type DayTimeChangeTransactSinker struct {
func (this *DayTimeChangeTransactSinker) OnMiniTimer() { func (this *DayTimeChangeTransactSinker) OnMiniTimer() {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_DayTimeChange, Tt: common.TransTypeDayTimeChange,
Ot: transact.TransOwnerType(common.GetSelfSrvType()), Ot: transact.TransOwnerType(common.GetSelfSrvType()),
Oid: common.GetSelfSrvId(), Oid: common.GetSelfSrvId(),
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -71,5 +71,5 @@ func (this *DayTimeChangeTransactSinker) OnMiniTimer() {
func init() { func init() {
common.ClockMgrSingleton.RegisterSinker(&DayTimeChangeTransactSinker{}) common.ClockMgrSingleton.RegisterSinker(&DayTimeChangeTransactSinker{})
transact.RegisteHandler(common.TransType_DayTimeChange, &DayTimeChangeTransactHandler{}) transact.RegisteHandler(common.TransTypeDayTimeChange, &DayTimeChangeTransactHandler{})
} }

4
worldsrv/transact_matchscenechange.go
View File

@ -28,7 +28,7 @@ func (this *MatchSceneChangeTransactHandler) OnExcute(tNode *transact.TransNode,
player := PlayerMgrSington.GetPlayerBySnId(ctx.snid) player := PlayerMgrSington.GetPlayerBySnId(ctx.snid)
if player != nil && player.scene != nil { if player != nil && player.scene != nil {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_MatchSceneChange, Tt: common.TransTypeMatchSceneChange,
Ot: transact.TransOwnerType(srvlib.GameServerType), Ot: transact.TransOwnerType(srvlib.GameServerType),
Oid: int(player.scene.gameSess.GetSrvId()), Oid: int(player.scene.gameSess.GetSrvId()),
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -87,5 +87,5 @@ func (this *MatchSceneChangeTransactHandler) OnChildTransRep(tNode *transact.Tra
} }
func init() { func init() {
transact.RegisteHandler(common.TransType_MatchSceneChange, &MatchSceneChangeTransactHandler{}) transact.RegisteHandler(common.TransTypeMatchSceneChange, &MatchSceneChangeTransactHandler{})
} }

6
worldsrv/transact_queryallcoinpoolstates.go
View File

@ -28,7 +28,7 @@ func (this *QueryAllCoinPoolTransactHandler) OnExcute(tNode *transact.TransNode,
for sid, gs := range GameSessMgrSington.servers { for sid, gs := range GameSessMgrSington.servers {
if gs.srvType == srvlib.GameServerType { if gs.srvType == srvlib.GameServerType {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_QueryAllCoinPool, Tt: common.TransTypeQueryAllCoinPool,
Ot: transact.TransOwnerType(srvlib.GameServerType), Ot: transact.TransOwnerType(srvlib.GameServerType),
Oid: sid, Oid: sid,
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -124,7 +124,7 @@ func (this *QueryAllCoinPoolTransactHandler) OnChildTransRep(tNode *transact.Tra
func StartQueryCoinPoolStatesTransact(tParent *transact.TransNode, pageNo, pageSize int32) { func StartQueryCoinPoolStatesTransact(tParent *transact.TransNode, pageNo, pageSize int32) {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_QueryAllCoinPool, Tt: common.TransTypeQueryAllCoinPool,
Ot: transact.TransOwnerType(common.GetSelfSrvType()), Ot: transact.TransOwnerType(common.GetSelfSrvType()),
Oid: common.GetSelfSrvId(), Oid: common.GetSelfSrvId(),
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -188,5 +188,5 @@ func StartQueryCoinPoolStatesTransact(tParent *transact.TransNode, pageNo, pageS
} }
func init() { func init() {
transact.RegisteHandler(common.TransType_QueryAllCoinPool, &QueryAllCoinPoolTransactHandler{}) transact.RegisteHandler(common.TransTypeQueryAllCoinPool, &QueryAllCoinPoolTransactHandler{})
} }

6
worldsrv/transact_querycoinpool.go
View File

@ -44,7 +44,7 @@ func (this *QueryCoinPoolTransactHandler) OnExcute(tNode *transact.TransNode, ud
gs.DetectCoinPoolSetting(data.Platform, id, data.GroupId) gs.DetectCoinPoolSetting(data.Platform, id, data.GroupId)
} }
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_QueryCoinPool, Tt: common.TransTypeQueryCoinPool,
Ot: transact.TransOwnerType(srvlib.GameServerType), Ot: transact.TransOwnerType(srvlib.GameServerType),
Oid: sid, Oid: sid,
AreaID: common.GetSelfAreaId(), 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) { func StartQueryCoinPoolTransact(tParent *transact.TransNode, gameid, gamemode int32, platform string, groupId int32) {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_QueryCoinPool, Tt: common.TransTypeQueryCoinPool,
Ot: transact.TransOwnerType(common.GetSelfSrvType()), Ot: transact.TransOwnerType(common.GetSelfSrvType()),
Oid: common.GetSelfSrvId(), Oid: common.GetSelfSrvId(),
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
@ -122,5 +122,5 @@ func StartQueryCoinPoolTransact(tParent *transact.TransNode, gameid, gamemode in
} }
func init() { func init() {
transact.RegisteHandler(common.TransType_QueryCoinPool, &QueryCoinPoolTransactHandler{}) transact.RegisteHandler(common.TransTypeQueryCoinPool, &QueryCoinPoolTransactHandler{})
} }

18
worldsrv/trascate_stop.go
View File

@ -9,43 +9,43 @@ import (
) )
func init() { 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 { 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 { for _, s := range GameSessMgrSington.gates {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_StopServer, Tt: common.TransTypeStopServer,
Ot: transact.TransOwnerType(s.srvType), Ot: transact.TransOwnerType(s.srvType),
Oid: s.srvId, Oid: s.srvId,
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
Tct: transact.TransactCommitPolicy_TwoPhase, Tct: transact.TransactCommitPolicy_TwoPhase,
} }
tNode.StartChildTrans(tnp, nil, time.Minute*5) 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 { for _, s := range GameSessMgrSington.servers {
tnp := &transact.TransNodeParam{ tnp := &transact.TransNodeParam{
Tt: common.TransType_StopServer, Tt: common.TransTypeStopServer,
Ot: transact.TransOwnerType(s.srvType), Ot: transact.TransOwnerType(s.srvType),
Oid: s.srvId, Oid: s.srvId,
AreaID: common.GetSelfAreaId(), AreaID: common.GetSelfAreaId(),
Tct: transact.TransactCommitPolicy_TwoPhase, Tct: transact.TransactCommitPolicy_TwoPhase,
} }
tNode.StartChildTrans(tnp, nil, time.Minute*5) 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 return transact.TransExeResult_Success
}), }),
OnCommitWrapper: transact.OnCommitWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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 return transact.TransExeResult_Success
}), }),
OnRollBackWrapper: transact.OnRollBackWrapper(func(tNode *transact.TransNode) transact.TransExeResult { 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 return transact.TransExeResult_Success
}), }),
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult { 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) return transact.TransExeResult(retCode)
}), }),
}) })

2
worldsrv/trascate_webapi.go
View File

@ -42,7 +42,7 @@ const (
) )
func init() { func init() {
transact.RegisteHandler(common.TransType_WebApi, &WebAPITranscateHandler{}) transact.RegisteHandler(common.TransTypeWebApi, &WebAPITranscateHandler{})
} }
var WebAPIHandlerMgrSingleton = &WebAPIHandlerMgr{wshMap: make(map[string]WebAPIHandler)} var WebAPIHandlerMgrSingleton = &WebAPIHandlerMgr{wshMap: make(map[string]WebAPIHandler)}