解決拖動BUG 和文字BUG

Assets/2.0/User/Model/ModelItem.cs

@@ -18,7 +18,9 @@ public enum ModelType
 }
 public class ModelItem 
 {
-    
+
+    //WEB端排版
+    public string template { get; set; }
     //模型所在组合素材内
     public GameObject modelList;
 
@@ -148,6 +150,8 @@ public class ModelItem
     /// </summary>
     public ObjectTransform objectTransform { get; set; }
 
+    public int fileId { get; set; }
+    public int id { get; set; }
 
     public void init(GameObject modelList)
     {
@@ -212,6 +216,7 @@ public class ModelItem
                 prefabModel.GetComponent<TemplateModel>().LoadModel(assetBundle);
                 break;
             case ModelType.Text:
+                Debug.Log("HJJTEST  ModelType.Text   " + DownloadPath);
                 prefabModel.GetComponent<TemplateText>().SetData(textContent, TextBJ);
                 break;
             default:
@@ -233,5 +238,13 @@ public class ModelItem
         }
         // prefabModel.transform.localPosition = getInfoPos();
         //  prefabModel.transform.localEulerAngles = getInfoEul();
+         switch (modelType)
+        {
+            case ModelType.Text:
+            prefabModel.GetComponent<TemplateText>().SetData(textContent, TextBJ);
+            break;
+            default:
+                break;
+        }
     }
 }

Assets/2.0/User/Spots/SpotsItem.cs

@@ -116,7 +116,7 @@ public class SpotsItem
             //sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
 
             sendNet.projectId = int.Parse(usi.id);
-            sendNet.name = name;
+            sendNet.id =int.Parse(id);
             string jsonData = JsonMapper.ToJson(sendNet);
 
             Debug.Log(jsonData);

Assets/COSScripts/DownloadResManager.cs

@@ -294,7 +294,7 @@ public class DownLoadMaterial
     public DownLoadMaterial(MaterialObjValue value)
     {
         this.downLoadPath = value.DownloadPath;
-        this.type = value.type;
+        this.type = value.type.ToString();
         this.localLoadPath = Application.persistentDataPath + "/Material/" + Path.GetFileName(value.DownloadPath);
     }
 }

Assets/MRNavigatorPro.unity

@@ -2247,7 +2247,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 1994181261}
+  m_Mesh: {fileID: 1593389663}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2784,6 +2784,7 @@ MonoBehaviour:
   immser: {fileID: 1327983565}
   m_IsRuning: 0
   m_UIAnchorsPanel: {fileID: 1180406930700069014}
+  EditorToggle: {fileID: 0}
   isShowDownTip: 0
   avplayer: {fileID: 0}
 --- !u!4 &588301977
@@ -2890,7 +2891,7 @@ PrefabInstance:
         type: 3}
       propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 588301976}
     - target: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
       propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
@@ -3062,6 +3063,11 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8221249705219883143, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7e724082e3f166747b1152780155e212, type: 3}
 --- !u!4 &630007990 stripped
@@ -5493,7 +5499,7 @@ PrefabInstance:
         type: 3}
       propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 588301976}
     - target: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
       propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
@@ -6546,7 +6552,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0050896145
+      value: -0.0051647467
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6676,7 +6682,7 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0019107637
+      value: -0.0019267632
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6869,7 +6875,7 @@ PrefabInstance:
         type: 3}
       propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 588301976}
     - target: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
       propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
@@ -7080,6 +7086,170 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 8019606653617611915}
   m_PrefabAsset: {fileID: 0}
+--- !u!43 &1593389663
+Mesh:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 10
+  m_SubMeshes:
+  - serializedVersion: 2
+    firstByte: 0
+    indexCount: 0
+    topology: 5
+    baseVertex: 0
+    firstVertex: 0
+    vertexCount: 0
+    localAABB:
+      m_Center: {x: 0, y: 0, z: 0}
+      m_Extent: {x: 0, y: 0, z: 0}
+  m_Shapes:
+    vertices: []
+    shapes: []
+    channels: []
+    fullWeights: []
+  m_BindPose: []
+  m_BoneNameHashes: 
+  m_RootBoneNameHash: 0
+  m_BonesAABB: []
+  m_VariableBoneCountWeights:
+    m_Data: 
+  m_MeshCompression: 0
+  m_IsReadable: 1
+  m_KeepVertices: 0
+  m_KeepIndices: 0
+  m_IndexFormat: 1
+  m_IndexBuffer: 
+  m_VertexData:
+    serializedVersion: 3
+    m_VertexCount: 0
+    m_Channels:
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 3
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    m_DataSize: 0
+    _typelessdata: 
+  m_CompressedMesh:
+    m_Vertices:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UV:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Normals:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Tangents:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Weights:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_NormalSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_TangentSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_FloatColors:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_BoneIndices:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Triangles:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UVInfo: 0
+  m_LocalAABB:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
+  m_MeshUsageFlags: 0
+  m_BakedConvexCollisionMesh: 
+  m_BakedTriangleCollisionMesh: 
+  m_MeshMetrics[0]: 1
+  m_MeshMetrics[1]: 1
+  m_MeshOptimizationFlags: 1
+  m_StreamData:
+    serializedVersion: 2
+    offset: 0
+    size: 0
+    path: 
 --- !u!1 &1594020696
 GameObject:
   m_ObjectHideFlags: 0
@@ -9318,170 +9488,6 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 100, y: 100, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
---- !u!43 &1994181261
-Mesh:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 10
-  m_SubMeshes:
-  - serializedVersion: 2
-    firstByte: 0
-    indexCount: 0
-    topology: 5
-    baseVertex: 0
-    firstVertex: 0
-    vertexCount: 0
-    localAABB:
-      m_Center: {x: 0, y: 0, z: 0}
-      m_Extent: {x: 0, y: 0, z: 0}
-  m_Shapes:
-    vertices: []
-    shapes: []
-    channels: []
-    fullWeights: []
-  m_BindPose: []
-  m_BoneNameHashes: 
-  m_RootBoneNameHash: 0
-  m_BonesAABB: []
-  m_VariableBoneCountWeights:
-    m_Data: 
-  m_MeshCompression: 0
-  m_IsReadable: 1
-  m_KeepVertices: 0
-  m_KeepIndices: 0
-  m_IndexFormat: 1
-  m_IndexBuffer: 
-  m_VertexData:
-    serializedVersion: 3
-    m_VertexCount: 0
-    m_Channels:
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 3
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    m_DataSize: 0
-    _typelessdata: 
-  m_CompressedMesh:
-    m_Vertices:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UV:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Normals:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Tangents:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Weights:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_NormalSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_TangentSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_FloatColors:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_BoneIndices:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Triangles:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UVInfo: 0
-  m_LocalAABB:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
-  m_MeshUsageFlags: 0
-  m_BakedConvexCollisionMesh: 
-  m_BakedTriangleCollisionMesh: 
-  m_MeshMetrics[0]: 1
-  m_MeshMetrics[1]: 1
-  m_MeshOptimizationFlags: 1
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 
 --- !u!1001 &1997991780
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -10029,7 +10035,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0012626331
+      value: -0.001263615
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -13875,7 +13881,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.005126646}
+  m_AnchoredPosition: {x: 0, y: -0.00511703}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

Assets/Script/MQTTClient.cs

@@ -262,7 +262,7 @@ public class MQTTClient : MonoSingleton<MQTTClient>
     {
         if(qt!=null&& qt.IsConnect())
         {
-            Debug.Log(id + "  DGJ  publish =====>  " + front+rid + "   " + bs.Length);
+           // Debug.Log(id + "  DGJ  publish =====>  " + front+rid + "   " + bs.Length);
             qt.Publish(rid, bs, MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE, false);
         }
         else

Assets/Scripts/BaseManager/DataManager.cs

@@ -192,7 +192,34 @@ public class SendSaveAnchor
     public int id { get; set; }
 
     public ObjectTransform objectTransform { get; set; }
-   
+
+}
+public class SendSaveDataNew
+{
+    /// <summary>
+    /// 景点ID
+    /// </summary>
+    public int id;
+    /// <summary>
+    /// 景点名称
+    /// </summary>
+    public string name { get; set; }
+    /// <summary>
+    /// 场景id
+    /// </summary>
+    public int projectId;
+    /// <summary>
+    /// 素材
+    /// </summary>
+    public List<MaterialOblNew> material { get; set; }
+    /// <summary>
+    /// 坐标 旋转 尺寸 如果没有数据的话默认为NULL
+    /// </summary>
+    public ObjectTransform spoittf { get; set; }
+    /// <summary>
+    /// 触发范围
+    /// </summary>
+    public SpoitPos triggerRange { get; set; }
 }
 
 public class SendSaveData

Assets/Scripts/Blue/Controller/SavePanel.cs

@@ -40,7 +40,7 @@ public class SavePanel : AbstractController
         parentObj.SetActive(!b);
     }
 
-    private string URL = "https://api-fat3.ghz-tech.com/mr-navigator/v1/project/createposition";
+   // private string URL = "https://api-fat3.ghz-tech.com/mr-navigator/v1/project/createposition";
     private void Save()
     {
         meshTest.transform.parent = aRSpaceForAll;
@@ -66,7 +66,7 @@ public class SavePanel : AbstractController
         posRotlist[1].y = poslist[1].y;
         posRotlist[1].z = 0;
         string jsonString = JsonConvert.SerializeObject(posRotlist);
-        this.SendCommand(new PointPosRotUploadCommand(URL, jsonString));
+        this.SendCommand(new PointPosRotUploadCommand(HttpSDKAction.Instance.loginUrl+ "/project/createPosition", jsonString));
     }
     void setIsOn()
     {

Assets/Scripts/Blue/Service/IUpOrDownloadService.cs

@@ -20,19 +20,17 @@ public class UpOrDownloadService : IUpOrDownloadService
 {
     public List<ScenePosRotInfo> PosRot { get; private set; }
     public int ProjectID { get; private set; }
-    private string UrlPointCloudPosRot;
 
     public void OnInit()
     {
-       // UrlPointCloudPosRot = "http://192.168.50.114:8888/mr-navigator/v1/project/position";
-        UrlPointCloudPosRot = "https://api-fat2.ghz-tech.com/mr-navigator/v1/project/position";
 
     }
 
     void IUpOrDownloadService.GetScenePosRot(int projectID)
     {
         TimerMgr.Instance.CreateTimer(()=> {
-        CoroutineSystem.Instance.StartCoroutine(GetScenePosRotRequest(projectID));
+            Debug.Log("HJJ.GetScenePosRot   " + projectID);
+            CoroutineSystem.Instance.StartCoroutine(GetScenePosRotRequest(projectID));
        },1,1);
     }
 
@@ -43,7 +41,8 @@ public class UpOrDownloadService : IUpOrDownloadService
 
     private IEnumerator GetScenePosRotRequest(int projectID)
     {
-        using (UnityWebRequest webRequest = new UnityWebRequest(UrlPointCloudPosRot, "POST"))
+        Debug.Log("HJJ.GetScenePosRot   " + HttpSDKAction.Instance.loginUrl + "/project/position");
+        using (UnityWebRequest webRequest = new UnityWebRequest(HttpSDKAction.Instance.loginUrl+ "/project/position", "POST"))
         {
             ProjectID = projectID;
             ScenePointBodyInfo TestGet = new ScenePointBodyInfo();
@@ -85,7 +84,10 @@ public class UpOrDownloadService : IUpOrDownloadService
                             }
                             else
                             {
-
+                                while(DataManager.Instance.CurrentScene == null)
+                                {
+                                    yield return null;
+                                }
                                 Debug.Log("Hjj   message=1==>" + ScenePosRotInfoList[0].x);
                                 Debug.Log("Hjj   message=2==>" + DataManager.Instance.CurrentScene.width);
                                 Debug.Log("Hjj   message=3==>" + GameManager.Instance.WebMapSize.x);
@@ -102,6 +104,9 @@ public class UpOrDownloadService : IUpOrDownloadService
 
     public IEnumerator RequestUpload(string Url, string jsonString)
     {
+        Debug.Log("HJJSAVE   Url ====>" + Url);
+        Debug.Log("HJJSAVE   jsonString ====>" + jsonString);
+
         using (UnityWebRequest webRequest = new UnityWebRequest(Url, "POST"))
         {
             JsonData data = JsonMapper.ToObject(jsonString);
@@ -126,6 +131,7 @@ public class UpOrDownloadService : IUpOrDownloadService
             if (webRequest.result == UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError)
             {
                 Debug.LogError(webRequest.downloadHandler.error);
+                Debug.LogError(webRequest.downloadHandler.text);
                 InstantiateCommand Command = new InstantiateCommand(
                     InstantiateSystem.Instance.BlueObject.WarningPopUp,
                     InstantiateSystem.Instance.BlueObject.NetErrorText);
@@ -142,7 +148,9 @@ public class UpOrDownloadService : IUpOrDownloadService
                         message = jobject["data"].ToString();
                         if (!string.IsNullOrWhiteSpace(message))
                         {
-                            List<ScenePosRotInfo> ScenePosRotInfoList = JsonConvert.DeserializeObject<List<ScenePosRotInfo>>(message);
+                            Debug.Log("HJJSave   "+ message);
+                            JsonData data2 = JsonMapper.ToObject(message);
+                            List<ScenePosRotInfo> ScenePosRotInfoList = JsonConvert.DeserializeObject<List<ScenePosRotInfo>>(data2["position"].ToJson());
                             PosRot = ScenePosRotInfoList;
                         }
                     }

Assets/Scripts/Blue/Temp/MoveChange.cs

@@ -13,7 +13,11 @@ public class MoveChange : MonoBehaviour
     private float y=> SetSceneActive.Instance.goReference_y;
     void Start()
     {
+#if UNITY_EDITOR
+        ControllerTracker = OpenXRCamera.Instance.head;
+#else
         ControllerTracker = API_GSXR_Module_InputSystem_KS.GSXR_KSRight.inputDeviceKSPartUI.transform;
+#endif
         DispatcherBase.KeyDownDelegateRegister(keyDownEventDelegate);
         DispatcherBase.KeyUpDelegateRegister(keyUpEventDelegate);
         RotToggle.onValueChanged.AddListener(RotToggleOnValueChanged);
@@ -103,9 +107,10 @@ public class MoveChange : MonoBehaviour
             }
             else
             {
-                v3.y = ControllerTracker_Y - ControllerTracker.localEulerAngles.y;
+                Debug.Log("正在旋轉======》");
+                v3.y = ControllerTracker_Y - ControllerTracker.eulerAngles.y;
                 goRefrence.transform.localEulerAngles +=v3;
-                ControllerTracker_Y = ControllerTracker.localEulerAngles.y;
+                ControllerTracker_Y = ControllerTracker.eulerAngles.y;
                 /*
                 goRefrence.transform.localEulerAngles = ControllerTracker.localEulerAngles - TempVector3;
                 goRefrence.transform.localEulerAngles = new Vector3(0, goRefrence.transform.localEulerAngles.y, 0);
@@ -117,7 +122,7 @@ public class MoveChange : MonoBehaviour
         {
             ARSpace.isFind = true;
         }
-        ControllerTracker_Y = ControllerTracker.localEulerAngles.y;
+        ControllerTracker_Y = ControllerTracker.eulerAngles.y;
     }
     private Vector3 v3 = Vector3.zero; // 用于存放手柄上次与下次的差值
     private float ControllerTracker_Y = 0; // 上次手柄的旋转Y值

Assets/Scripts/Config/DataConfig.cs

@@ -142,6 +142,53 @@ public class SpoitPos
     public double areaRelativeX { get; set; }
     public double areaRelativeY { get; set; }
 
+}
+/// <summary>
+/// 单个素材属性
+/// </summary>
+public class MaterialObjValueNew
+{
+    //WEB端排版
+    public string template { get; set; }
+
+
+    public int fileId { get; set; }
+    public int id { get; set; }
+    public string uid { get; set; }
+
+    //素材名称
+    public string name { get; set; }
+    /// <summary>
+    /// 素材类型
+    /// </summary>
+    public int type { get; set; }
+    /// <summary>
+    /// 文本内容
+    /// </summary>
+    public string textContent { get; set; }
+    /// <summary>
+    /// 文字位置（如果类型不为文字 则为NULL）
+    /// </summary>
+    public string textPosition { get; set; }
+    /// <summary>
+    /// 文本框背景
+    /// </summary>
+    public string textBJ { get; set; }
+    /// <summary>
+    /// 下载地址
+    /// </summary>
+    public string downloadPath { get; set; }
+    /// <summary>
+    /// 本地保存地址
+    /// </summary>
+    public string localSavePath { get; set; }
+    /// <summary>
+    /// 素材位置信息
+    /// 文字传递的是方位，其余类型场地为空值
+    /// </summary>
+    public ObjectTransform objectTransform { get; set; }
+
+
 }
 
 /// <summary>
@@ -156,7 +203,7 @@ public class MaterialObjValue
     /// <summary>
     /// 素材类型
     /// </summary>
-    public string type { get; set; }
+    public int type { get; set; }
     /// <summary>
     /// 文本内容
     /// </summary>
@@ -248,6 +295,69 @@ public class MaterialObl
     }
 }
 
+/// <summary>
+/// 景点下素材组合
+/// </summary>
+public class MaterialOblNew
+{
+    /// <summary>
+    /// 主键id
+    /// </summary>
+    public int id { get; set; }
+    /// <summary>
+    /// 是否设置过素材
+    /// </summary>
+    public bool select { get; set; }
+    /// <summary>
+    /// 素材名称
+    /// </summary>
+    public string name { get; set; }
+    /// <summary>
+    /// 素材类型 1图片 2视频 3模型 4文字 5图片+文字/视频+文字 6模型+文字
+    /// </summary>
+    public int type { get; set; }
+    /// <summary>
+    /// 描述
+    /// </summary>
+    public string describe { get; set; }
+    /// <summary>
+    /// 素材json数组
+    /// </summary>
+    public List<MaterialObjValueNew> materialList { get; set; }
+    /// <summary>
+    /// 素材图标（缩略图）
+    /// </summary> 
+    public string icon { get; set; }
+    /// <summary>
+    /// 更新时间
+    /// </summary>
+    public int updateTime { get; set; }
+    /// <summary>
+    /// 素材坐标
+    /// 网页端传递的数据为空
+    /// </summary>
+    public ObjectTransform objectTransform { get; set; }
+    /// <summary>
+    /// 用户ID
+    /// </summary>
+    public int userId { get; set; }
+    /// <summary>
+    /// 排版
+    /// 1-单排平铺,2-单排扇形,3-双排平铺,4-双排扇形,5-巨幕
+    /// </summary>
+    public string typesetting { get; set; }
+
+    public bool autoplay { get; set; }
+
+
+    public MaterialOblNew()
+    {
+        select = false;
+        materialList = new List<MaterialObjValueNew>();
+        objectTransform = new ObjectTransform();
+    }
+}
+
 /// <summary>
 /// 景点属性
 /// </summary>

Assets/Scripts/LayoutGroup/DRFanLayout.cs

@@ -21,7 +21,7 @@ public class DRFanLayout : MonoBehaviour
         {
             var mat = materialObls.materialList[i];
             GameObject go = null;
-            switch (int.Parse(mat.type))
+            switch (mat.type)
             {
                 case (int)MaterialType.None:
                     break;
@@ -59,7 +59,7 @@ public class DRFanLayout : MonoBehaviour
             if (go != null)
             {
                 go.name = string.IsNullOrWhiteSpace(mat.name) ? par.name + "-" + i.ToString() : mat.name;
-                go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
+                go.AddComponent<EditorEventHandler>().Type = (MaterialType)(mat.type);
                 if (materialObls.select)
                 {
                     go.transform.localPosition = mat.ObjectTransform.nowPos;
@@ -71,7 +71,7 @@ public class DRFanLayout : MonoBehaviour
                     go.transform.localEulerAngles = Vector3.zero;
                     go.transform.localScale = new Vector3(1, 1, 1);
 
-                    if (int.Parse(mat.type) != (int)MaterialType.Text)
+                    if (mat.type != (int)MaterialType.Text)
                     {
                         go.transform.localPosition = Vector3.zero;
                     }

Assets/Scripts/LayoutGroup/DRTitleLayout.cs

@@ -30,7 +30,7 @@ public class DRTitleLayout : MonoBehaviour
         {
             var mat = materialObls.materialList[i];
             GameObject go = null;
-            switch (int.Parse(mat.type))
+            switch (mat.type)
             {
                 case (int)MaterialType.None:
                     break;
@@ -68,7 +68,7 @@ public class DRTitleLayout : MonoBehaviour
             if (go != null)
             {
                 go.name = string.IsNullOrWhiteSpace(mat.name) ? par.name + "-" + i.ToString() : mat.name;
-                go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
+                go.AddComponent<EditorEventHandler>().Type = (MaterialType)(mat.type);
 
                 if (materialObls.select)
                 {
@@ -82,7 +82,7 @@ public class DRTitleLayout : MonoBehaviour
                     go.transform.localEulerAngles = Vector3.zero;
                     go.transform.localScale = new Vector3(1, 1, 1);
 
-                    if (int.Parse(mat.type) != (int)MaterialType.Text)
+                    if (mat.type != (int)MaterialType.Text)
                     {
                         go.transform.localPosition = Vector3.zero;
                     }

Assets/Scripts/LayoutGroup/SRSectorLayout.cs

@@ -27,7 +27,7 @@ public class SRSectorLayout : MonoBehaviour
         {
             var mat = materialObls.materialList[i];
             GameObject go = null;
-            switch (int.Parse(mat.type))
+            switch (mat.type)
             {
                 case (int)MaterialType.None:
                     break;
@@ -65,7 +65,7 @@ public class SRSectorLayout : MonoBehaviour
             if (go != null)
             {
                 go.name = string.IsNullOrWhiteSpace(mat.name) ? par.name + "-" + i.ToString() : mat.name;
-                go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
+                go.AddComponent<EditorEventHandler>().Type = (MaterialType)(mat.type);
 
                 if (materialObls.select)
                 {
@@ -79,7 +79,7 @@ public class SRSectorLayout : MonoBehaviour
                     go.transform.localEulerAngles = Vector3.zero;
                     go.transform.localScale = new Vector3(1, 1, 1);
 
-                    if (int.Parse(mat.type) != (int)MaterialType.Text)
+                    if (mat.type != (int)MaterialType.Text)
                     {
                         go.transform.localPosition = Vector3.zero;
                     }

Assets/Scripts/LayoutGroup/SRTitleLayout.cs

@@ -27,7 +27,7 @@ public class SRTitleLayout : MonoBehaviour
         {
             var mat = materialObls.materialList[i];
             GameObject go = null;
-            switch (int.Parse(mat.type))
+            switch (mat.type)
             {
                 case (int)MaterialType.None:
                     break;
@@ -65,7 +65,7 @@ public class SRTitleLayout : MonoBehaviour
             if (go != null)
             {
                 go.name = string.IsNullOrWhiteSpace(mat.name) ? par.name + "-" + i.ToString() : mat.name;
-                go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
+                go.AddComponent<EditorEventHandler>().Type = (MaterialType)(mat.type);
 
                 if (materialObls.select)
                 {
@@ -79,7 +79,7 @@ public class SRTitleLayout : MonoBehaviour
                     go.transform.localEulerAngles = Vector3.zero;
                     go.transform.localScale = new Vector3(1, 1, 1);
 
-                    if (int.Parse(mat.type) != (int)MaterialType.Text)
+                    if (mat.type != (int)MaterialType.Text)
                     {
                         go.transform.localPosition = Vector3.zero;
                     }

Assets/Scripts/LayoutTemplate/TemplateText.cs

@@ -40,7 +40,11 @@ public class TemplateText : BaseTemPlate
                 SuCaiData.textContent = SuCaiData.textContent.Replace("<br>","\n");
             m_Text.text = SuCaiData.textContent;
             m_BG.sprite = ResMgr.Instance.Load<Sprite>("Template/Texture/文本框" + SuCaiData.TextBJ.ToString());
+
+
         }
+
+
     }
 
 
@@ -70,22 +74,38 @@ public class TemplateText : BaseTemPlate
 
         if(value.textContent.Contains("<br>"))
             value.textContent = value.textContent.Replace("<br>","\n");
-        m_Text.text = value.textContent;
-        m_BG.sprite = ResMgr.Instance.Load<Sprite>("Template/Texture/文本框" + value.TextBJ.ToString());
 
-    }
+        
 
+    }
+    string str;
     public void SetData(string text ,string bg )
     {
         if (string.IsNullOrWhiteSpace(text))
         {
             return;
         }
+        str = text;
+        Debug.Log("HJJTEST   賦值Text===》"+text);
 
-        m_Text.text = text;
-        m_BG.sprite = ResMgr.Instance.Load<Sprite>("Template/Texture/文本框" + bg);
+        if (m_Text)
+        {
+            m_Text.text = text;
+            m_BG.sprite = ResMgr.Instance.Load<Sprite>("Template/Texture/文本框" + bg);
+        }
+        else
+        {
+
+            m_Canvas = transform.Find("Canvas").GetComponent<RectTransform>();
+            m_BG = transform.Find("Canvas/Image").GetComponent<Image>();
+            m_Text = transform.Find("Canvas/Text").GetComponent<Text>();
+            m_Text.text = text;
+            m_BG.sprite = ResMgr.Instance.Load<Sprite>("Template/Texture/文本框" + bg);
+        }
     }
 
+    
+
     public override void HideCollider()
     {
         base.HideCollider();

Assets/Scripts/UI/EdirPanel/UIAddMaterialPanel.cs

@@ -138,7 +138,7 @@ public class UIAddMaterialPanel : UIPanelBase
             MaterialObjValue value = new MaterialObjValue();
             value.DownloadPath = path;
             value.name = "";
-            value.type = ((int)MaterialType.LocaImage).ToString();
+            value.type = ((int)MaterialType.LocaImage);
             value.ObjectTransform = new ObjectTransform();
 
             material.materialList.Add(value);

Assets/Scripts/UI/GameManager.cs

@@ -558,18 +558,18 @@ public class GameManager : MonoSingleton<GameManager>
 
         if (!m_IsStartEditor)
         {
-            List<SendSaveData> saveData = new List<SendSaveData>();
+            List<SendSaveDataNew> saveData = new List<SendSaveDataNew>();
             foreach (var i in UserSceneManager.Instance.SceneList[UserSceneManager.Instance.nowId].SpotsList.Keys)
             {
                 SpotsItem sp = UserSceneManager.Instance.SceneList[UserSceneManager.Instance.nowId].SpotsList[i.ToString()];
-                SendSaveData data = new SendSaveData();
+                SendSaveDataNew data = new SendSaveDataNew();
 
 
                 data.id = int.Parse(sp.id);
                 data.name = sp.name;
                 data.projectId = int.Parse(UserSceneManager.Instance.SceneList[UserSceneManager.Instance.nowId].id);
 
-                List<MaterialObl> MaterialObllsit = new List<MaterialObl>();
+                List<MaterialOblNew> MaterialObllsit = new List<MaterialOblNew>();
                 foreach (var z in sp.modelList.Keys)
                 {
                     ObjectTransform objt2 = new ObjectTransform();
@@ -579,7 +579,7 @@ public class GameManager : MonoSingleton<GameManager>
                     sp.modelList[z].objectTransform = objt2;
 
 
-                    List<MaterialObjValue> materialList = new List<MaterialObjValue>();
+                    List<MaterialObjValueNew> materialList = new List<MaterialObjValueNew>();
                     for (int j = 0; j < sp.modelList[z].materialList.Count; j++)
                     {
                         ObjectTransform objt3 = new ObjectTransform();
@@ -588,12 +588,22 @@ public class GameManager : MonoSingleton<GameManager>
                         objt3.nowScale = sp.modelList[z].materialList[j].prefabModel.transform.localScale;
                         sp.modelList[z].materialList[j].objectTransform = objt3;
 
-                        MaterialObjValue mov = new MaterialObjValue();
+                        MaterialObjValueNew mov = new MaterialObjValueNew();
+                        mov.uid = sp.modelList[z].materialList[j].uid;
+                        mov.id = sp.modelList[z].materialList[j].id;
+                        mov.fileId = sp.modelList[z].materialList[j].fileId;
+                        mov.type = sp.modelList[z].materialList[j].type;
+                        mov.textContent = sp.modelList[z].materialList[j].textContent.ToString();
+                        mov.textPosition = sp.modelList[z].materialList[j].textPosition.ToString();
+                        mov.textBJ = sp.modelList[z].materialList[j].TextBJ.ToString();
+                        mov.downloadPath = sp.modelList[z].materialList[j].DownloadPath.ToString();
+                        mov.localSavePath = sp.modelList[z].materialList[j].localSavePath.ToString();
                         mov.name = sp.modelList[z].materialList[j].name;
-                        mov.ObjectTransform = sp.modelList[z].materialList[j].objectTransform;
+                        mov.template = sp.modelList[z].materialList[j].template;
+                        mov.objectTransform = sp.modelList[z].materialList[j].objectTransform;
                         materialList.Add(mov);
                     }
-                    MaterialObl obj = new MaterialObl();
+                    MaterialOblNew obj = new MaterialOblNew();
                     obj.id = sp.modelList[z].id;
                     obj.name = sp.modelList[z].name;
                     obj.objectTransform = sp.modelList[z].objectTransform;
@@ -1203,7 +1213,7 @@ public class GameManager : MonoSingleton<GameManager>
         {
             var mat = objs[i];
             GameObject go = null;
-            switch (int.Parse(mat.type))
+            switch (mat.type)
             {
                 case (int)MaterialType.None:
                     break;
@@ -1253,7 +1263,7 @@ public class GameManager : MonoSingleton<GameManager>
             {
                 go.name = string.IsNullOrWhiteSpace(mat.name) ? spoit.name + "-" + i.ToString() : mat.name;
                 mat.name = go.name;
-                go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
+                go.AddComponent<EditorEventHandler>().Type = (MaterialType)(mat.type);
 
                 if (material.select)
                 {
@@ -1266,7 +1276,7 @@ public class GameManager : MonoSingleton<GameManager>
                 {
                     go.transform.localEulerAngles = Vector3.zero;
                     go.transform.localScale = new Vector3(1, 1, 1);
-                    if (int.Parse(mat.type) != (int)MaterialType.Text)
+                    if (mat.type != (int)MaterialType.Text)
                     {
                         go.transform.localPosition = Vector3.zero;
                     }
@@ -1308,7 +1318,7 @@ public class GameManager : MonoSingleton<GameManager>
         {
             var mat = objs[i];
             GameObject go = null;
-            switch (int.Parse(mat.type))
+            switch (mat.type)
             {
                 case (int)MaterialType.None:
                     break;
@@ -1333,7 +1343,7 @@ public class GameManager : MonoSingleton<GameManager>
             if (go != null)
             {
                 go.name = string.IsNullOrWhiteSpace(mat.name) ? spoit.name + "-" + i.ToString() : mat.name;
-                go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
+                go.AddComponent<EditorEventHandler>().Type = (MaterialType)(mat.type);
 
                 if (material.select)
                 {
@@ -1345,7 +1355,7 @@ public class GameManager : MonoSingleton<GameManager>
                 {
                     go.transform.localEulerAngles = Vector3.zero;
                     go.transform.localScale = new Vector3(1, 1, 1);
-                    if (int.Parse(mat.type) != (int)MaterialType.Text)
+                    if (mat.type != (int)MaterialType.Text)
                     {
                         go.transform.localPosition = Vector3.zero;
                     }
@@ -1456,7 +1466,7 @@ public class GameManager : MonoSingleton<GameManager>
     private ObjectValue CreateMatObjectValue(int id, int parentid, GameObject go, MaterialObjValue mat)
     {
         go.name = string.IsNullOrWhiteSpace(mat.name) ? go.name : mat.name;
-        go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
+        go.AddComponent<EditorEventHandler>().Type = (MaterialType)(mat.type);
         //为物体位置信息赋值
         if (mat.ObjectTransform != null)
         {

Assets/Scripts/UI/LoginPanel.cs

@@ -310,8 +310,8 @@ public class LoginPanel : BaseUI
       //  m_AccountStr = "jiajun.hu@ghz-tech.com";
        //   m_AccountStr = "advtest1@1.com";
        // m_AccountStr = "bactest1@1.com";
-        m_AccountStr = "1768147286@qq.com";
-        //  m_AccountStr = "advtest1@1.com";
+       // m_AccountStr = "1768147286@qq.com";
+          m_AccountStr = "advtest1@1.com";
 #endif
 
         if (string.IsNullOrWhiteSpace(m_AccountStr))
@@ -674,7 +674,7 @@ public class LoginPanel : BaseUI
                 for (int m = 0; m < mat.materialList.Count; m++)
                 {
                     var matObj = mat.materialList[m];
-                    if (int.Parse(matObj.type) != 4 && int.Parse(matObj.type) != 0)
+                    if (matObj.type != 4 && matObj.type != 0)
                     {
                         DownLoadMaterial data1 = new DownLoadMaterial();
                         string filename = Path.GetFileName(matObj.DownloadPath);