fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
laodaming 2023-09-06 10:14:45 +08:00
parent ff0e9cf17d
commit a39076d739
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/websocket/internal/logic/ws_render_image.go
View File

@ -163,7 +163,7 @@ func (w *wsConnectItem) renderImage(data []byte) {
return return
} }
//发送合图完毕阶段消息 //发送合图完毕阶段消息
w.sendCombineImageStepResponseMessage(renderImageData.RenderId, combineImage, res.DiffTimeLogoCombine, res.DiffTimeUploadFile) w.sendCombineImageStepResponseMessage(renderImageData.RenderId, combineImage, productSize.Id, res.DiffTimeLogoCombine, res.DiffTimeUploadFile)
//如果指定指定只返回刀版图 //如果指定指定只返回刀版图
if renderImageData.OnlyReturnCombineImage { if renderImageData.OnlyReturnCombineImage {
logx.Info("云渲染传入size id则不走unity云渲染,只返回刀版图，render_id:", renderImageData.RenderId) logx.Info("云渲染传入size id则不走unity云渲染,只返回刀版图，render_id:", renderImageData.RenderId)
@ -363,7 +363,7 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, combineImage st
} }
// 发送合图完毕阶段通知消息 // 发送合图完毕阶段通知消息
func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, combineImage string, combineTime, uploadTime int64) { func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, combineImage string, sizeId, combineTime, uploadTime int64) {
combineTakesTime := "cache" combineTakesTime := "cache"
uploadCombineImageTakesTime := "cache" uploadCombineImageTakesTime := "cache"
if combineTime > 0 { if combineTime > 0 {
@ -375,6 +375,7 @@ func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, combineIma
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{ w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
RenderId: renderId, RenderId: renderId,
CombineImage: combineImage, CombineImage: combineImage,
SizeId: sizeId,
CombineProcessTime: websocket_data.CombineProcessTime{ CombineProcessTime: websocket_data.CombineProcessTime{
CombineTakesTime: combineTakesTime, CombineTakesTime: combineTakesTime,
UploadCombineImageTakesTime: uploadCombineImageTakesTime, UploadCombineImageTakesTime: uploadCombineImageTakesTime,

1
utils/websocket_data/render_data.go
View File

@ -43,6 +43,7 @@ type RenderProcessTime struct {
type CombineImageRspMsg struct { type CombineImageRspMsg struct {
RenderId string `json:"render_id"` //渲染id RenderId string `json:"render_id"` //渲染id
CombineImage string `json:"combine_image"` //刀版图 CombineImage string `json:"combine_image"` //刀版图
SizeId int64 `json:"size_id"` //尺寸id
CombineProcessTime CombineProcessTime `json:"combine_process_time"` CombineProcessTime CombineProcessTime `json:"combine_process_time"`
} }
type CombineProcessTime struct { type CombineProcessTime struct {