diff --git a/gamesrv/transact/trascate_gamesrv.go b/gamesrv/transact/trascate_gamesrv.go index 6d9fb71..21311b5 100644 --- a/gamesrv/transact/trascate_gamesrv.go +++ b/gamesrv/transact/trascate_gamesrv.go @@ -71,12 +71,12 @@ func (this *WebAPITranscateHandler) OnChildTransRep(tNode *transact.TransNode, h } type WebAPIHandler interface { - Handler(*transact.TransNode, []byte) (int, proto.Message) + Handler(*transact.TransNode, []byte) (int, interface{}) } -type WebAPIHandlerWrapper func(*transact.TransNode, []byte) (int, proto.Message) +type WebAPIHandlerWrapper func(*transact.TransNode, []byte) (int, interface{}) -func (wshw WebAPIHandlerWrapper) Handler(tNode *transact.TransNode, params []byte) (int, proto.Message) { +func (wshw WebAPIHandlerWrapper) Handler(tNode *transact.TransNode, params []byte) (int, interface{}) { return wshw(tNode, params) } @@ -99,7 +99,7 @@ func (this *WebAPIHandlerMgr) GetWebAPIHandler(name string) WebAPIHandler { func init() { // 对局详情 WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/game/room_info", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SARoomInfo{} msg := &webapiproto.ASRoomInfo{} err := proto.Unmarshal(params, msg) diff --git a/worldsrv/trascate_webapi.go b/worldsrv/trascate_webapi.go index d89bf4d..d6ad713 100644 --- a/worldsrv/trascate_webapi.go +++ b/worldsrv/trascate_webapi.go @@ -147,12 +147,12 @@ func (this *WebAPITranscateHandler) OnChildTransRep(tNode *transact.TransNode, h } type WebAPIHandler interface { - Handler(*transact.TransNode, []byte) (int, proto.Message) + Handler(*transact.TransNode, []byte) (int, interface{}) } -type WebAPIHandlerWrapper func(*transact.TransNode, []byte) (int, proto.Message) +type WebAPIHandlerWrapper func(*transact.TransNode, []byte) (int, interface{}) -func (wshw WebAPIHandlerWrapper) Handler(tNode *transact.TransNode, params []byte) (int, proto.Message) { +func (wshw WebAPIHandlerWrapper) Handler(tNode *transact.TransNode, params []byte) (int, interface{}) { return wshw(tNode, params) } @@ -175,7 +175,7 @@ func (this *WebAPIHandlerMgr) GetWebAPIHandler(name string) WebAPIHandler { func init() { // 后台加币加钻石 WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Game/AddCoinByIdAndPT", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAAddCoinByIdAndPT{} msg := &webapiproto.ASAddCoinByIdAndPT{} err1 := proto.Unmarshal(params, msg) @@ -382,7 +382,7 @@ func init() { // 后台重置游戏池 WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Game/ResetGamePool", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAResetGamePool{} msg := &webapiproto.ASResetGamePool{} err := proto.Unmarshal(params, msg) @@ -421,7 +421,7 @@ func init() { // 更新水池 // 修改本地缓存,修改数据库,同步到gamesrv WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Game/UpdateGamePool", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAUpdateGamePool{} msg := &webapiproto.ASUpdateGamePool{} err := proto.Unmarshal(params, msg) @@ -499,7 +499,7 @@ func init() { //查询水池gameid WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Game/QueryGamePoolByGameId", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAQueryGamePoolByGameId{} msg := &webapiproto.ASQueryGamePoolByGameId{} err := proto.Unmarshal(params, msg) @@ -513,7 +513,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Cache/GetRoom", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAGetRoom{} msg := &webapiproto.ASGetRoom{} err := proto.Unmarshal(params, msg) @@ -600,7 +600,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Cache/ListRoom", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAListRoom{} msg := &webapiproto.ASListRoom{} err := proto.Unmarshal(params, msg) @@ -636,7 +636,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Cache/DestroyRoom", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SADestroyRoom{} msg := &webapiproto.ASDestroyRoom{} err := proto.Unmarshal(params, msg) @@ -702,7 +702,7 @@ func init() { ///////////////////////////玩家信息/////////////////////////// WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Player/PlayerData", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAGetPlayerData{} msg := &webapiproto.ASGetPlayerData{} err := proto.Unmarshal(params, msg) @@ -773,7 +773,7 @@ func init() { })) //多个玩家数据 WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Player/MorePlayerData", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAMorePlayerData{} msg := &webapiproto.ASMorePlayerData{} err := proto.Unmarshal(params, msg) @@ -843,7 +843,7 @@ func init() { })) //更新玩家数据 WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Cache/UpdatePlayerElement", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAUpdatePlayerElement{} msg := &webapiproto.ASUpdatePlayerElement{} uerr := proto.Unmarshal(params, msg) @@ -1006,7 +1006,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Player/KickPlayer", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAKickPlayer{} msg := &webapiproto.ASKickPlayer{} err := proto.Unmarshal(params, msg) @@ -1046,7 +1046,7 @@ func init() { })) //获取在线统计 WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Report/OnlineReportTotal", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAOnlineReportTotal{} msg := &webapiproto.ASOnlineReportTotal{} err := proto.Unmarshal(params, msg) @@ -1104,7 +1104,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Report/QueryOnlineReportList", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAQueryOnlineReportList{} msg := &webapiproto.ASQueryOnlineReportList{} err := proto.Unmarshal(params, msg) @@ -1265,7 +1265,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Player/WhiteBlackControl", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAWhiteBlackControl{} msg := &webapiproto.ASWhiteBlackControl{} err := proto.Unmarshal(params, msg) @@ -1366,7 +1366,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Ctrl/ListServerStates", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAListServerStates{} msg := &webapiproto.ASListServerStates{} err := proto.Unmarshal(params, msg) @@ -1382,7 +1382,7 @@ func init() { //邮件 WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Game/CreateShortMessage", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SACreateShortMessage{} msg := &webapiproto.ASCreateShortMessage{} err1 := proto.Unmarshal(params, msg) @@ -1520,7 +1520,7 @@ func init() { //查询邮件 WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Game/QueryShortMessageList", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAQueryShortMessageList{} msg := &webapiproto.ASQueryShortMessageList{} err := proto.Unmarshal(params, msg) @@ -1593,7 +1593,7 @@ func init() { //删除邮件 WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Game/DeleteShortMessage", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SADeleteShortMessage{} msg := &webapiproto.ASDeleteShortMessage{} err1 := proto.Unmarshal(params, msg) @@ -1656,7 +1656,7 @@ func init() { //删除玩家已经删除的邮件 WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Game/DeleteAllShortMessage", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SADeleteShortMessage{} msg := &webapiproto.ASDeleteShortMessage{} err1 := proto.Unmarshal(params, msg) @@ -1691,7 +1691,7 @@ func init() { //黑名单 WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Player/BlackBySnId", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SABlackBySnId{} msg := &webapiproto.ASBlackBySnId{} err := proto.Unmarshal(params, msg) @@ -1741,7 +1741,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Message/QueryHorseRaceLampList", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAQueryHorseRaceLampList{} msg := &webapiproto.ASQueryHorseRaceLampList{} err := proto.Unmarshal(params, msg) @@ -1801,7 +1801,7 @@ func init() { })) //WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Message/CreateHorseRaceLamp", WebAPIHandlerWrapper( - // func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + // func(tNode *transact.TransNode, params []byte) (int, interface{}) { // pack := &webapiproto.SACreateHorseRaceLamp{} // msg := &webapiproto.ASCreateHorseRaceLamp{} // err := proto.Unmarshal(params, msg) @@ -1844,7 +1844,7 @@ func init() { // })) // //WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Message/GetHorseRaceLampById", WebAPIHandlerWrapper( - // func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + // func(tNode *transact.TransNode, params []byte) (int, interface{}) { // pack := &webapiproto.SAGetHorseRaceLampById{} // msg := &webapiproto.ASGetHorseRaceLampById{} // err := proto.Unmarshal(params, msg) @@ -1879,7 +1879,7 @@ func init() { // })) // //WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Message/EditHorseRaceLamp", WebAPIHandlerWrapper( - // func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + // func(tNode *transact.TransNode, params []byte) (int, interface{}) { // pack := &webapiproto.SAEditHorseRaceLamp{} // msg := &webapiproto.ASEditHorseRaceLamp{} // err := proto.Unmarshal(params, msg) @@ -1967,7 +1967,7 @@ func init() { // })) // //WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Message/RemoveHorseRaceLampById", WebAPIHandlerWrapper( - // func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + // func(tNode *transact.TransNode, params []byte) (int, interface{}) { // pack := &webapiproto.SARemoveHorseRaceLampById{} // msg := &webapiproto.ASRemoveHorseRaceLampById{} // err := proto.Unmarshal(params, msg) @@ -2008,7 +2008,7 @@ func init() { // })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Ctrl/ResetEtcdData", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAResetEtcdData{} msg := &webapiproto.ASResetEtcdData{} err := proto.Unmarshal(params, msg) @@ -2024,7 +2024,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Game/CreateJYB", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SACreateJYB{} msg := &webapiproto.ASCreateJYB{} @@ -2093,7 +2093,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Game/UpdateJYB", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAUpdateJYB{} msg := &webapiproto.ASUpdateJYB{} err := proto.Unmarshal(params, msg) @@ -2129,7 +2129,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/Customer/UpExchangeStatus", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAUpExchangeStatus{} msg := &webapiproto.ASUpExchangeStatus{} err := proto.Unmarshal(params, msg) @@ -2211,7 +2211,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/pay/CallbackPayment", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { logger.Logger.Tracef("api /api/pay/CallbackPayment") msg := &webapiproto.ASCallbackPayment{} pack := &webapiproto.SACallbackPayment{} @@ -2303,7 +2303,7 @@ func init() { //======= 资源更新通知 ======= WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/game/resource", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAResource{} msg := &webapiproto.ASResource{} err := proto.Unmarshal(params, msg) @@ -2325,7 +2325,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/player/update_tel", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAUpdateTel{} msg := &webapiproto.ASUpdateTel{} @@ -2404,7 +2404,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/player/delete", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAPlayerDelete{} msg := &webapiproto.ASPlayerDelete{} @@ -2484,7 +2484,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/player/AddItem", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAAddItemById{} msg := &webapiproto.ASAddItemById{} @@ -2558,7 +2558,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/game/show_lottery", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { logger.Logger.Tracef("/api/game/show_lottery %v", params) pack := &webapiproto.SAShowLottery{} msg := &webapiproto.ASShowLottery{} @@ -2597,7 +2597,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/game/send_sms", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SASendSMSCode{} msg := &webapiproto.ASSendSMSCode{} @@ -2685,7 +2685,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/game/web_login", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAWebLogin{ Tag: webapiproto.TagCode_FAILED, Msg: "未知错误", @@ -2767,7 +2767,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/player/address", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAGetAddress{ Tag: webapiproto.TagCode_FAILED, Msg: "未知错误", @@ -2813,7 +2813,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/player/update_address", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAUpdateAddress{ Tag: webapiproto.TagCode_FAILED, Msg: "未知错误", @@ -2841,7 +2841,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/game/exchange_list", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAGetExchangeShop{ Tag: webapiproto.TagCode_FAILED, } @@ -2877,7 +2877,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/game/exchange_order", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAGetExchangeOrder{ Tag: webapiproto.TagCode_FAILED, } @@ -2913,7 +2913,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/game/exchange_create", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAWebCreateExchange{ Tag: webapiproto.ExchangeCreateCode_OPRC_Error, } @@ -2980,7 +2980,7 @@ func init() { })) WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/platform/createUse", WebAPIHandlerWrapper( - func(tNode *transact.TransNode, params []byte) (int, proto.Message) { + func(tNode *transact.TransNode, params []byte) (int, interface{}) { pack := &webapiproto.SAGetExchangeOrder{ Tag: webapiproto.TagCode_FAILED, } diff --git a/worldsrv/welfmgr.go b/worldsrv/welfmgr.go index 772d847..a0d0a49 100644 --- a/worldsrv/welfmgr.go +++ b/worldsrv/welfmgr.go @@ -1118,7 +1118,7 @@ func (this *WelfareMgr) BlindBoxInfo(p *Player, bid int32) { if cyc == 1 || blindBox.Cycle == model.WelfareOpen { p.WelfData.BlindBoxId = 0 } - } // == 1代表当日循环 + } // == 1代表当日循环 if p.WelfData.BlindBoxId == 0 { // 未领取过发随机Date idx := bid