fix

server/websocket/internal/logic/ws_ok_response.go

@@ -10,11 +10,9 @@ import (
 // *******************************合图相关begin******************************
 // 发送合图完毕阶段通知消息
 func (w *wsConnectItem) sendCombineImageStepResponseMessage(requestId, combineImage string, sizeId, modelId, templateId int64, debugData *auth.DebugData) {
-	if w.debug == nil {
-		return
-	}
 	combineTakesTime := ""
 	uploadCombineImageTakesTime := ""
+	if w.debug != nil { //开启debug
 		//开了缓存
 		if w.debug.IsCache != 0 {
 			combineTakesTime = "cache"
@@ -29,14 +27,23 @@ func (w *wsConnectItem) sendCombineImageStepResponseMessage(requestId, combineIm
 		w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
 			RequestId:    requestId,
 			CombineImage: combineImage,
+			CombineRelative: &websocket_data.CombineRelative{
 				SizeId:     sizeId,
 				ModelId:    modelId,
 				TemplateId: templateId,
+			},
 			CombineProcessTime: &websocket_data.CombineProcessTime{
 				CombineTakesTime:            combineTakesTime,
 				UploadCombineImageTakesTime: uploadCombineImageTakesTime,
 			},
 		}))
+	} else {
+		w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
+			RequestId:    requestId,
+			CombineImage: combineImage,
+		}))
+	}
+
 }
 
 // 发送组装unity需要的数据完毕消息

utils/websocket_data/render_data.go

@@ -35,17 +35,20 @@ type RenderImageRspMsg struct {
 type RenderProcessTime struct {
 	UnityRenderTakesTime            string `json:"unity_render_takes_time"`              //unity渲染用时
 	UploadUnityRenderImageTakesTime string `json:"upload_unity_render_image_takes_time"` //上传unity渲染结果图时间
-	UnityRealTakesTime string `json:"unity_real_takes_time"`//unity真实处理时间
+	UnityRealTakesTime              string `json:"unity_real_takes_time"`                //unity真实处理时间
 }
 
 // 合图返回数据
 type CombineImageRspMsg struct {
 	RequestId          string              `json:"request_id"`
 	CombineImage       string              `json:"combine_image"`    //刀版图
+	CombineRelative    *CombineRelative    `json:"combine_relative"` //合图相关数据
+	CombineProcessTime *CombineProcessTime `json:"combine_process_time"`
+}
+type CombineRelative struct {
 	SizeId     int64 `json:"size_id"` //尺寸id
 	ModelId    int64 `json:"model_id"`
 	TemplateId int64 `json:"template_id"`
-	CombineProcessTime *CombineProcessTime `json:"combine_process_time"`
 }
 type CombineProcessTime struct {
 	CombineTakesTime            string `json:"combine_takes_time"`              //合图时间