Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

server/websocket/internal/logic/ws_render_image.go

@@ -363,6 +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 {
+		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 != "" {
@@ -404,17 +408,17 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, resolution int,
 		})
 	}
 	if element.ModelP != nil && *element.ModelP != "" {
-		tempData = append(tempData, map[string]interface{}{
+		/*tempData = append(tempData, map[string]interface{}{
 			"name":      "model_P",
 			"data":      "0," + *element.ModelP,
 			"type":      "other",
 			"layer":     "0",
 			"is_update": 0,
 			"mode":      mode["model_P"],
-		})
+		})*/
 	}
 	//×××××××××××××××××××××××××××××××××××××××××××××××××××××
-	if w.userId == 127 {
+	if w.userId == 127 && info.RenderData.ProductId == 32 {
 		if element.Base != nil && *element.Base != "" {
 			tempData = append(tempData, map[string]interface{}{
 				"name":      "model_1",
@@ -435,16 +439,16 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, resolution int,
 				"mode":      mode["shadow"],
 			})
 		}
-		if element.ModelP != nil && *element.ModelP != "" {
+		/*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_1"],
+				"mode":      mode["model_P"],
 			})
-		}
+		}*/
 		if element.Base != nil && *element.Base != "" {
 			tempData = append(tempData, map[string]interface{}{
 				"name":      "model_2",
@@ -491,14 +495,14 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, resolution int,
 		},
 	}
 	//**************************
-	if w.userId == 127 {
+	if w.userId == 127 && info.RenderData.ProductId == 32 {
 		result = []interface{}{
 			map[string]interface{}{
 				"light":     22,
 				"refletion": refletion,
-				"scale":     *element.Scale,
+				"scale":     20,
 				"sku_id":    info.RenderData.ProductId,
-				"tid":       *element.Title,
+				"tid":       "ceshi",
 				"rotation":  *element.Rotation,
 				"filePath":  "", //todo 文件路径,针对千人千面
 				"data":      tempData,