diff --git a/common/transtype.go b/common/transtype.go index a9f849c..69a3c22 100644 --- a/common/transtype.go +++ b/common/transtype.go @@ -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 { diff --git a/gamesrv/transact/transact_addcoin.go b/gamesrv/transact/transact_addcoin.go index 461a704..a63361d 100644 --- a/gamesrv/transact/transact_addcoin.go +++ b/gamesrv/transact/transact_addcoin.go @@ -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{}) } diff --git a/gamesrv/transact/transact_coinscenechange.go b/gamesrv/transact/transact_coinscenechange.go index 4144e45..a9a5732 100644 --- a/gamesrv/transact/transact_coinscenechange.go +++ b/gamesrv/transact/transact_coinscenechange.go @@ -62,5 +62,5 @@ func (this *CoinSceneChangeTransactHandler) OnChildTransRep(tNode *transact.Tran } func init() { - transact.RegisteHandler(common.TransType_CoinSceneChange, &CoinSceneChangeTransactHandler{}) + transact.RegisteHandler(common.TransTypeCoinSceneChange, &CoinSceneChangeTransactHandler{}) } diff --git a/gamesrv/transact/transact_daytimechange.go b/gamesrv/transact/transact_daytimechange.go index 1dee438..e8ff8bc 100644 --- a/gamesrv/transact/transact_daytimechange.go +++ b/gamesrv/transact/transact_daytimechange.go @@ -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) } diff --git a/gamesrv/transact/transact_matchscenechange.go b/gamesrv/transact/transact_matchscenechange.go index b990452..3cd34b6 100644 --- a/gamesrv/transact/transact_matchscenechange.go +++ b/gamesrv/transact/transact_matchscenechange.go @@ -62,5 +62,5 @@ func (this *MatchSceneChangeTransactHandler) OnChildTransRep(tNode *transact.Tra } func init() { - transact.RegisteHandler(common.TransType_MatchSceneChange, &MatchSceneChangeTransactHandler{}) + transact.RegisteHandler(common.TransTypeMatchSceneChange, &MatchSceneChangeTransactHandler{}) } diff --git a/gamesrv/transact/transact_queryallcoinpoolstates.go b/gamesrv/transact/transact_queryallcoinpoolstates.go index a897838..6eda0c1 100644 --- a/gamesrv/transact/transact_queryallcoinpoolstates.go +++ b/gamesrv/transact/transact_queryallcoinpoolstates.go @@ -54,5 +54,5 @@ func (this *QueryAllCoinPoolTransactHandler) OnChildTransRep(tNode *transact.Tra } func init() { - transact.RegisteHandler(common.TransType_QueryAllCoinPool, &QueryAllCoinPoolTransactHandler{}) + transact.RegisteHandler(common.TransTypeQueryAllCoinPool, &QueryAllCoinPoolTransactHandler{}) } diff --git a/gamesrv/transact/transact_querycoinpool.go b/gamesrv/transact/transact_querycoinpool.go index 250ea3d..58e962b 100644 --- a/gamesrv/transact/transact_querycoinpool.go +++ b/gamesrv/transact/transact_querycoinpool.go @@ -47,5 +47,5 @@ func (this *QueryCoinPoolTransactHandler) OnChildTransRep(tNode *transact.TransN } func init() { - transact.RegisteHandler(common.TransType_QueryCoinPool, &QueryCoinPoolTransactHandler{}) + transact.RegisteHandler(common.TransTypeQueryCoinPool, &QueryCoinPoolTransactHandler{}) } diff --git a/gamesrv/transact/trascate_gamesrv.go b/gamesrv/transact/trascate_gamesrv.go index 9c239fc..6d9fb71 100644 --- a/gamesrv/transact/trascate_gamesrv.go +++ b/gamesrv/transact/trascate_gamesrv.go @@ -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)} diff --git a/gamesrv/transact/trascate_stop.go b/gamesrv/transact/trascate_stop.go index bf4aeb8..e1425d8 100644 --- a/gamesrv/transact/trascate_stop.go +++ b/gamesrv/transact/trascate_stop.go @@ -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) }), }) diff --git a/gatesrv/trascate_stop.go b/gatesrv/trascate_stop.go index cb1528a..0969438 100644 --- a/gatesrv/trascate_stop.go +++ b/gatesrv/trascate_stop.go @@ -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) }), }) diff --git a/mgrsrv/api/webapi_gamesrv.go b/mgrsrv/api/webapi_gamesrv.go index b2c5e78..4a00029 100644 --- a/mgrsrv/api/webapi_gamesrv.go +++ b/mgrsrv/api/webapi_gamesrv.go @@ -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 { diff --git a/mgrsrv/api/webapi_worldsrv.go b/mgrsrv/api/webapi_worldsrv.go index 1745f1e..dc9b02e 100644 --- a/mgrsrv/api/webapi_worldsrv.go +++ b/mgrsrv/api/webapi_worldsrv.go @@ -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) }), diff --git a/mgrsrv/stop.go b/mgrsrv/stop.go index bffe57f..50a4096 100644 --- a/mgrsrv/stop.go +++ b/mgrsrv/stop.go @@ -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) }), }) diff --git a/robot/base/trascate_stop.go b/robot/base/trascate_stop.go index 2d40333..f6afcf6 100644 --- a/robot/base/trascate_stop.go +++ b/robot/base/trascate_stop.go @@ -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) }), }) diff --git a/worldsrv/coinscenemgr.go b/worldsrv/coinscenemgr.go index 007922f..f0ad3fa 100644 --- a/worldsrv/coinscenemgr.go +++ b/worldsrv/coinscenemgr.go @@ -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(), diff --git a/worldsrv/transact_addcoin.go b/worldsrv/transact_addcoin.go index 2509420..c67f6d4 100644 --- a/worldsrv/transact_addcoin.go +++ b/worldsrv/transact_addcoin.go @@ -43,7 +43,7 @@ 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(), @@ -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 { tnp := &transact.TransNodeParam{ - Tt: common.TransType_AddCoin, + Tt: common.TransTypeAddCoin, Ot: transact.TransOwnerType(common.GetSelfSrvType()), Oid: common.GetSelfSrvId(), AreaID: common.GetSelfAreaId(), @@ -118,5 +118,5 @@ func StartAsyncAddCoinTransact(p *Player, num int64, gainWay int32, oper, remark } func init() { - transact.RegisteHandler(common.TransType_AddCoin, &AddCoinTransactHandler{}) + transact.RegisteHandler(common.TransTypeAddCoin, &AddCoinTransactHandler{}) } diff --git a/worldsrv/transact_coinscenechange.go b/worldsrv/transact_coinscenechange.go index f0b09af..30aa784 100644 --- a/worldsrv/transact_coinscenechange.go +++ b/worldsrv/transact_coinscenechange.go @@ -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{}) } diff --git a/worldsrv/transact_daytimechange.go b/worldsrv/transact_daytimechange.go index 92563a6..953d44f 100644 --- a/worldsrv/transact_daytimechange.go +++ b/worldsrv/transact_daytimechange.go @@ -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{}) } diff --git a/worldsrv/transact_matchscenechange.go b/worldsrv/transact_matchscenechange.go index e44d07e..b223896 100644 --- a/worldsrv/transact_matchscenechange.go +++ b/worldsrv/transact_matchscenechange.go @@ -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{}) } diff --git a/worldsrv/transact_queryallcoinpoolstates.go b/worldsrv/transact_queryallcoinpoolstates.go index 5c37477..4963410 100644 --- a/worldsrv/transact_queryallcoinpoolstates.go +++ b/worldsrv/transact_queryallcoinpoolstates.go @@ -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{}) } diff --git a/worldsrv/transact_querycoinpool.go b/worldsrv/transact_querycoinpool.go index d65b936..08e9fa6 100644 --- a/worldsrv/transact_querycoinpool.go +++ b/worldsrv/transact_querycoinpool.go @@ -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{}) } diff --git a/worldsrv/trascate_stop.go b/worldsrv/trascate_stop.go index 17b5769..afde46e 100644 --- a/worldsrv/trascate_stop.go +++ b/worldsrv/trascate_stop.go @@ -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) }), }) diff --git a/worldsrv/trascate_webapi.go b/worldsrv/trascate_webapi.go index d91995d..f4dbb2e 100644 --- a/worldsrv/trascate_webapi.go +++ b/worldsrv/trascate_webapi.go @@ -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)}