Merge branch 'develop' into release

This commit is contained in:
sk 2024-09-19 09:39:31 +08:00
commit cca29b64c6
1 changed files with 9 additions and 3 deletions

View File

@ -20,6 +20,7 @@ import (
"mongo.games.com/game/common" "mongo.games.com/game/common"
"mongo.games.com/game/model" "mongo.games.com/game/model"
"mongo.games.com/game/proto"
"mongo.games.com/game/protocol/webapi" "mongo.games.com/game/protocol/webapi"
) )
@ -176,9 +177,14 @@ func init() {
}), }),
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("GameSrvApi OnChildRespWrapper %v:%v", hChild, ud) logger.Logger.Tracef("GameSrvApi OnChildRespWrapper %v:%v", hChild, ud)
msg, ok := ud.(*webapi.SARoomInfo) if v, ok := ud.([]byte); ok {
if ok && msg.GetTag() == webapi.TagCode_SUCCESS { var msg webapi.SARoomInfo
err := proto.Unmarshal(v, &msg)
if err == nil && msg.GetTag() == webapi.TagCode_SUCCESS {
tNode.TransEnv.SetField(GAMESRVAPI_TRANSACTE_RESPONSE, ud) tNode.TransEnv.SetField(GAMESRVAPI_TRANSACTE_RESPONSE, ud)
} else {
logger.Logger.Errorf("GameSrvApi OnChildRespWrapper unmarshal err %v", err)
}
} }
return transact.TransExeResult(retCode) return transact.TransExeResult(retCode)
}), }),