diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index 7e25714c..18ca3c39 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -363,10 +363,10 @@ func (w *wsConnectItem) getProductRelationInfo(renderImageData *websocket_data.R // 组装数据发送给unity func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, resolution int, combineImage string, info websocket_data.RenderImageReqMsg, productTemplate *gmodel.FsProductTemplateV2, model3dInfo *gmodel.FsProductModel3d, element *gmodel.FsProductTemplateElement, productSize *gmodel.FsProductSize) (err error) { - if w.userId != 127 { + /*if w.userId != 127 { w.renderErrResponse(info.RequestId, info.RenderData.TemplateTag, taskId, "测试拦截,稍后开放", info.RenderData.ProductId, w.userId, w.guestId, productTemplate.Id, model3dInfo.Id, productSize.Id, *productTemplate.ElementModelId) return err - } + }*/ //组装数据 refletion := -1 if element.Refletion != nil && *element.Refletion != "" { @@ -418,7 +418,7 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, resolution int, }) } //××××××××××××××××××××××××××××××××××××××××××××××××××××× - if w.userId == 127 && info.RenderData.ProductId == 32 { + /*if w.userId == 127 && info.RenderData.ProductId == 32 { if element.Base != nil && *element.Base != "" { tempData = append(tempData, map[string]interface{}{ "name": "model_1", @@ -442,11 +442,11 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, resolution int, if element.ModelP != nil && *element.ModelP != "" { tempData = append(tempData, map[string]interface{}{ "name": "model_P_1", - "data": "0," + *element.ModelP, + "data": "0,", "type": "other", "layer": "0", "is_update": 0, - "mode": mode["model_P"], + "mode": mode["model_P_1"], }) } if element.Base != nil && *element.Base != "" { @@ -479,7 +479,7 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, resolution int, "mode": mode["model_P"], }) } - } + }*/ //×××××××××××××××××××××××××××××××××××××××××××××××××××× result := []interface{}{ @@ -494,22 +494,22 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, resolution int, "data": tempData, }, } - //************************** - if w.userId == 127 && info.RenderData.ProductId == 32 { - result = []interface{}{ - map[string]interface{}{ - "light": 22, - "refletion": refletion, - "scale": *element.Scale, - "sku_id": info.RenderData.ProductId, - "tid": "ceshi", - "rotation": *element.Rotation, - "filePath": "", //todo 文件路径,针对千人千面 - "data": tempData, - }, + /* //************************** + if w.userId == 127 && info.RenderData.ProductId == 32 { + result = []interface{}{ + map[string]interface{}{ + "light": 22, + "refletion": refletion, + "scale": *element.Scale, + "sku_id": info.RenderData.ProductId, + "tid": "ceshi", + "rotation": *element.Rotation, + "filePath": "", //todo 文件路径,针对千人千面 + "data": tempData, + }, + } } - } - //******************************* + //********************************/ //发送运行阶段消息(组装数据) w.sendAssembleRenderDataStepResponseMessage(info.RequestId) temId := websocket_data.ToUnityIdStruct{