fix

server/websocket/internal/logic/ws_ok_response.go

@@ -10,33 +10,40 @@ 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.IsCache != 0 {
-		combineTakesTime = "cache"
-		uploadCombineImageTakesTime = "cache"
+	if w.debug != nil { //开启debug
+		//开了缓存
+		if w.debug.IsCache != 0 {
+			combineTakesTime = "cache"
+			uploadCombineImageTakesTime = "cache"
+		}
+		if debugData != nil && debugData.DiffTimeLogoCombine > 0 {
+			combineTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeLogoCombine)
+		}
+		if debugData != nil && debugData.DiffTimeUploadFile > 0 {
+			uploadCombineImageTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeUploadFile)
+		}
+		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,
+		}))
 	}
-	if debugData != nil && debugData.DiffTimeLogoCombine > 0 {
-		combineTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeLogoCombine)
-	}
-	if debugData != nil && debugData.DiffTimeUploadFile > 0 {
-		uploadCombineImageTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeUploadFile)
-	}
-	w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
-		RequestId:    requestId,
-		CombineImage: combineImage,
-		SizeId:       sizeId,
-		ModelId:      modelId,
-		TemplateId:   templateId,
-		CombineProcessTime: &websocket_data.CombineProcessTime{
-			CombineTakesTime:            combineTakesTime,
-			UploadCombineImageTakesTime: uploadCombineImageTakesTime,
-		},
-	}))
+
 }
 
 // 发送组装unity需要的数据完毕消息