修改2.1加载组合模型的逻辑 以及添加寻找模型的字典

Assets/2.0/User/Model/ModelItem.cs

@@ -1,7 +1,9 @@
+using SC.XR.Unity.Module_InputSystem;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
+using XRTool.Util;
 
 public enum ModelType
 {
@@ -41,7 +43,7 @@ public class ModelItem
 
                 Debug.Log(" ModelName>>>>  " + name + "   Type    " + type);
 
-   
+
             }
             return _model; }
     }
@@ -60,9 +62,10 @@ public class ModelItem
             {
                 _model = prefabModel;
                 obj.name ="加载出来的模型-----"+ obj.name;
-               // obj.transform.parent = _model.transform;
-             //   obj.transform.localPosition = getInfoPos(); 
-              //  obj.transform.localEulerAngles = getInfoEul(); 
+                // obj.transform.parent = _model.transform;
+                //   obj.transform.localPosition = getInfoPos(); 
+                //  obj.transform.localEulerAngles = getInfoEul(); 
+
 
             });
       //  else
@@ -180,7 +183,24 @@ public class ModelItem
         url = DownloadPath;
         Debug.Log(url);
         this.modelList = modelList;
-       
+
+        if (!modelList.GetComponent<BoundingBox>())
+        {
+            BoundingBox bb = modelList.AddComponent<BoundingBox>();
+            bb.FlattenAxis = BoundingBox.FlattenModeType.FlattenZ;
+            bb.ActiveHandle = BoundingBox.HandleType.Rotation | BoundingBox.HandleType.Scale;
+            modelList.AddComponent<NearInterationGrabbable>();
+            modelList.AddComponent<ManipulationHandler>();
+            GameObject ob = GameObject.Instantiate(Resources.Load<GameObject>("Template/Prefab/TipJD"), modelList.transform);
+            ob.transform.localPosition = new Vector3(0, -0.3f, 0);// Vector3.zero;
+            ob.transform.localEulerAngles = Vector3.zero;
+            ob.transform.localScale = Vector3.one;
+            ob.SetActive(false);
+            TimerMgr.Instance.CreateTimer(() => {
+                ob.SetActive(GameManager.Instance.IsStartEditor);
+                bb.enabled = GameManager.Instance.IsStartEditor;
+            }, 1, -1);
+        }
         if (Version == null)
             Version = Application.version.ToString();
         init();

Assets/2.0/User/Model/ModelList.cs

@@ -377,7 +377,8 @@ public class ModelList: System.ICloneable
     /// </summary>
     private IEnumerator CreateImage_Video_Text(ModelList material, GameObject spoit)
     {
-      
+        yield return GameManager.Instance.StartCoroutine(SRTitleLayout.CalLayout(material, spoit));
+        /*
         List<ObjectValue> objects = new List<ObjectValue>();
         //switch (material.typesetting)
         //{
@@ -432,7 +433,7 @@ public class ModelList: System.ICloneable
             default:
                 break;
         }
-
+        */
     }
     /// <summary>
     /// 创建物体ObjectValue，并赋值位置信息
@@ -481,13 +482,11 @@ public class ModelList: System.ICloneable
         {
             _model.transform.localEulerAngles = getInfoPos();
         }
-        if (!_model.GetComponent<BoxCollider>())
+        if (!_model.GetComponent<BoundingBox>())
         {
-            BoxCollider box = _model.AddComponent<BoxCollider>();
-            box.center = new Vector3(0, -0.3f, 0);
-            box.size = new Vector3(0.5f, 0.5f, 0.01f);
             BoundingBox bb = _model.AddComponent<BoundingBox>();
-            bb.ActiveHandle = BoundingBox.HandleType.None;
+            bb.FlattenAxis = BoundingBox.FlattenModeType.FlattenZ;
+            bb.ActiveHandle = BoundingBox.HandleType.Rotation | BoundingBox.HandleType.Scale;
             _model.AddComponent<NearInterationGrabbable>();
             _model.AddComponent<ManipulationHandler>();
             GameObject ob =GameObject.Instantiate( Resources.Load<GameObject>("Template/Prefab/Tip"),_model.transform);
@@ -497,7 +496,6 @@ public class ModelList: System.ICloneable
             ob.SetActive(false);
             TimerMgr.Instance.CreateTimer(()=> { 
                     ob.SetActive(GameManager.m_IsStartEditorzu);
-                    box.enabled = GameManager.m_IsStartEditorzu;
                 bb.enabled = GameManager.m_IsStartEditorzu;
             },1,-1);
         }

Assets/2.0/User/Spots/SpotsItem.cs

@@ -22,6 +22,8 @@ public class SpotsItem
 
     public string triggerImage;
 
+    public int triggerImageId;
+
     public UserSceneItem usi;
     //¾°µãÖеÄÄ£ÐÍ
     public Dictionary<string, ModelList> modelList = new Dictionary<string, ModelList>();
@@ -42,13 +44,11 @@ public class SpotsItem
                 _spotsObj.transform.parent = VuforiaItem.transform;
 
 
-                if (!_spotsObj.GetComponent<BoxCollider>())
+                if (!_spotsObj.GetComponent<BoundingBox>())
                 {
-                    BoxCollider box = _spotsObj.AddComponent<BoxCollider>();
-                    box.center = new Vector3(0, -0.3f, 0);
-                    box.size = new Vector3(0.5f, 0.5f, 0.01f);
                     BoundingBox bb = _spotsObj.AddComponent<BoundingBox>();
-                    bb.ActiveHandle = BoundingBox.HandleType.None;
+                    bb.FlattenAxis = BoundingBox.FlattenModeType.FlattenZ;
+                    bb.ActiveHandle = BoundingBox.HandleType.Rotation| BoundingBox.HandleType.Scale;
                     _spotsObj.AddComponent<NearInterationGrabbable>();
                     _spotsObj.AddComponent<ManipulationHandler>();
                     GameObject ob = GameObject.Instantiate(Resources.Load<GameObject>("Template/Prefab/TipJD"), _spotsObj.transform);
@@ -58,7 +58,6 @@ public class SpotsItem
                     ob.SetActive(false);
                     TimerMgr.Instance.CreateTimer(() => {
                         ob.SetActive(GameManager.m_IsStartEditorJD);
-                        box.enabled = GameManager.m_IsStartEditorJD;
                         bb.enabled = GameManager.m_IsStartEditorJD;
                     }, 1, -1);
                 }

Assets/2.0/User/UserScene/UserSceneManager.cs

@@ -111,7 +111,8 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
                         si.SpotsObj.transform.localScale = Vector3.one;
                     }
                     si.updateTime = msg["listSpoit"][i]["updateTime"].ToString();
-                    si.triggerImage = msg["listSpoit"][i]["triggerImage"].ToString();
+                    if ( msg["listSpoit"][i].Keys.Contains("triggerImage"))
+                        si.triggerImage = msg["listSpoit"][i]["triggerImage"].ToString();
                     if(msg["listSpoit"][i]["material"]!=null&& msg["listSpoit"][i]["material"].IsArray)
                     {
                         for (int j = 0; j < msg["listSpoit"][i]["material"].Count; j++)

Assets/MRNavigatorPro.unity

@@ -2247,7 +2247,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 2036575705}
+  m_Mesh: {fileID: 1100279748}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2787,6 +2787,7 @@ MonoBehaviour:
   EditorToggle: {fileID: 0}
   isShowDownTip: 0
   avplayer: {fileID: 0}
+  needSavePosRotScale: 1
 --- !u!4 &588301977
 Transform:
   m_ObjectHideFlags: 0
@@ -3066,7 +3067,7 @@ PrefabInstance:
     - target: {fileID: 8221249705219883143, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7e724082e3f166747b1152780155e212, type: 3}
@@ -4854,6 +4855,170 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1074227623}
   m_PrefabAsset: {fileID: 0}
+--- !u!43 &1100279748
+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 &1129952195
 GameObject:
   m_ObjectHideFlags: 0
@@ -5674,7 +5839,7 @@ PrefabInstance:
     - target: {fileID: 8221249705219883143, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7e724082e3f166747b1152780155e212, type: 3}
@@ -6552,7 +6717,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0051234276
+      value: -0.0050992616
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6682,7 +6847,7 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0019214216
+      value: -0.001961661
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -9403,170 +9568,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
---- !u!43 &2036575705
-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 &2063916783
 GameObject:
   m_ObjectHideFlags: 0
@@ -10035,7 +10036,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0012451621
+      value: -0.0012415011
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -13881,7 +13882,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.0051484634}
+  m_AnchoredPosition: {x: 0, y: -0.00510156}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

Assets/Resources/Template/Prefab/Tip.prefab

@@ -1,263 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &2828833021118674287
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2828833021118674286}
-  - component: {fileID: 2828833021118674280}
-  - component: {fileID: 2828833021118674281}
-  m_Layer: 0
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2828833021118674286
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833021118674287}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2828833022409846366}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2828833021118674280
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833021118674287}
-  m_CullTransparentMesh: 0
---- !u!114 &2828833021118674281
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833021118674287}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 669f8168965942c4ba600ec149dbcbdf, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!1 &2828833021312147518
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2828833021312147513}
-  - component: {fileID: 2828833021312147514}
-  - component: {fileID: 2828833021312147515}
-  m_Layer: 0
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2828833021312147513
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833021312147518}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2828833022409846366}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 51.1, y: -52.8}
-  m_SizeDelta: {x: -99.9, y: 395.3}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &2828833021312147514
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833021312147518}
-  m_CullTransparentMesh: 0
---- !u!114 &2828833021312147515
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833021312147518}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 64
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 64
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u70B9\u51FB\u6B64\u533A\u57DF\u8FDB\u884C\u79FB\u52A8\u7269\u4F53\u7EC4"
---- !u!1 &2828833022409846367
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2828833022409846366}
-  - component: {fileID: 2828833022409846363}
-  - component: {fileID: 2828833022409846360}
-  - component: {fileID: 2828833022409846361}
-  m_Layer: 0
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2828833022409846366
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833022409846367}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2828833021118674286}
-  - {fileID: 2828833021312147513}
-  m_Father: {fileID: 2828833022510646942}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.2321, y: 0.246}
-  m_SizeDelta: {x: 459.0534, y: 501.747}
-  m_Pivot: {x: 0, y: 1}
---- !u!223 &2828833022409846363
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833022409846367}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &2828833022409846360
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833022409846367}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
---- !u!114 &2828833022409846361
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833022409846367}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
 --- !u!1 &2828833022510646943
 GameObject:
   m_ObjectHideFlags: 0
@@ -285,8 +27,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2828833022409846366}
+  m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resources/Template/Prefab/TipJD.prefab

@@ -1,263 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &2828833021118674287
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2828833021118674286}
-  - component: {fileID: 2828833021118674280}
-  - component: {fileID: 2828833021118674281}
-  m_Layer: 0
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2828833021118674286
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833021118674287}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2828833022409846366}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2828833021118674280
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833021118674287}
-  m_CullTransparentMesh: 0
---- !u!114 &2828833021118674281
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833021118674287}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 669f8168965942c4ba600ec149dbcbdf, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!1 &2828833021312147518
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2828833021312147513}
-  - component: {fileID: 2828833021312147514}
-  - component: {fileID: 2828833021312147515}
-  m_Layer: 0
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2828833021312147513
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833021312147518}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2828833022409846366}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 51.1, y: -52.8}
-  m_SizeDelta: {x: -99.9, y: 395.3}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &2828833021312147514
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833021312147518}
-  m_CullTransparentMesh: 0
---- !u!114 &2828833021312147515
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833021312147518}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 64
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 64
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u70B9\u51FB\u6B64\u533A\u57DF\u8FDB\u884C\u79FB\u52A8\u666F\u70B9"
---- !u!1 &2828833022409846367
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2828833022409846366}
-  - component: {fileID: 2828833022409846363}
-  - component: {fileID: 2828833022409846360}
-  - component: {fileID: 2828833022409846361}
-  m_Layer: 0
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2828833022409846366
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833022409846367}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2828833021118674286}
-  - {fileID: 2828833021312147513}
-  m_Father: {fileID: 2828833022510646942}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.2321, y: 0.246}
-  m_SizeDelta: {x: 459.0534, y: 501.747}
-  m_Pivot: {x: 0, y: 1}
---- !u!223 &2828833022409846363
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833022409846367}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &2828833022409846360
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833022409846367}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
---- !u!114 &2828833022409846361
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2828833022409846367}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
 --- !u!1 &2828833022510646943
 GameObject:
   m_ObjectHideFlags: 0
@@ -285,8 +27,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2828833022409846366}
+  m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Script/UserChooseScene.cs

@@ -43,7 +43,6 @@ public class UserChooseScene : MonoBehaviour
                 break;
             }
         }
-        GameManager.Instance.isShowDownTip = true;
         DownloadResManager.Instance.StartDownLoad();
     }
 }

Assets/Scripts/Blue/Patch/Video/Patch_VideoController.cs

@@ -12,12 +12,12 @@ public class Patch_VideoController : AbstractController
     {
         if (GetComponent<ManipulationHandler>() != null)
         {
-            Destroy(manipulationHandler);
+            GetComponent<ManipulationHandler>().enabled = false;
         }
 
         if (GetComponent<BoundingBox>() != null)
         {
-            Destroy(boundingBox);
+            GetComponent<BoundingBox>().enabled = false;
         }
 
         toggle = GameObject.Find("SetBtn/2.1/Canvas/Parent/EditorBtn/Toggle").GetComponent<Toggle>();
@@ -26,29 +26,40 @@ public class Patch_VideoController : AbstractController
     private Toggle toggle;
     private void Update()
     {
-        if(!toggle.isOn)
+        if(toggle)
         {
-            if(manipulationHandler!=null)
-                Destroy(manipulationHandler);
-            if (boundingBox != null)
+            if (!toggle.isOn)
             {
-                Destroy(boundingBox);
-                if (transform.Find("BoundingBox").gameObject != null)
-                    Destroy(transform.Find("BoundingBox").gameObject);
+                if (manipulationHandler != null)
+                    manipulationHandler.enabled=false;
+                if (boundingBox != null)
+                {
+                    boundingBox.enabled = false;
+                    if (transform.Find("BoundingBox")&&transform.Find("BoundingBox").gameObject != null)
+                        transform.Find("BoundingBox").gameObject.SetActive(false);
+                }
             }
-        }
-        else
-        {
-            if (manipulationHandler == null)
+            else
             {
-                manipulationHandler = gameObject.AddComponent<ManipulationHandler>();
-            }
-            if (boundingBox == null)
-            {
-                boundingBox = gameObject.AddComponent<BoundingBox>();
-                boundingBox.FlattenAxis = FlattenModeType.FlattenZ;
-                boundingBox.ActiveHandle = HandleType.Rotation | HandleType.Scale;
+                if (manipulationHandler == null)
+                {
+                    manipulationHandler = gameObject.AddComponent<ManipulationHandler>();
+                }
+                else
+                {
+                    manipulationHandler.enabled = true;
+                }
+                if (boundingBox == null)
+                {
+                    boundingBox = gameObject.AddComponent<BoundingBox>();
+                    boundingBox.FlattenAxis = FlattenModeType.FlattenZ;
+                    boundingBox.ActiveHandle = HandleType.Rotation | HandleType.Scale;
+                }else
+                {
+                    boundingBox.enabled = true;
+                }
             }
+
         }
     }
 }

Assets/Scripts/Config/DataConfig.cs

@@ -232,7 +232,6 @@ public class MaterialObjValue
     /// </summary>
     public ObjectTransform ObjectTransform { get; set; }
 
-
 }
 /// <summary>
 /// 景点下素材组合
@@ -288,7 +287,7 @@ public class MaterialObl
 
     public bool autoplay { get; set; }
     public int iconId { get; set; }
-    
+
 
     public MaterialObl()
     {

Assets/Scripts/LayoutGroup/SRTitleLayout.cs

@@ -15,33 +15,40 @@ public class SRTitleLayout : MonoBehaviour
     /// <param name="materialObls">素材</param>
     /// <param name="par">素材父物体,景点</param>
     /// <returns></returns>
-    public static List<ObjectValue> CalLayout(MaterialObl materialObls, GameObject par, out MaterialObl newmaterial,string type ="1")
+    public static List<ObjectValue> CalLayout(SpoitValue spoitjd, MaterialObl materialObls, GameObject par, out MaterialObl newmaterial,string type ="1")
     {
+        var yangshi = ResMgr.Instance.Load<GameObject>("Template/Prefab/yangshi" + materialObls.typesetting);
+        GameObject ys = Instantiate((yangshi as GameObject), par.transform);
+        YangShiManager ysm = ys.GetComponent<YangShiManager>();
+        ys.transform.localEulerAngles = Vector3.zero;
+        ys.transform.localScale = new Vector3(1, 1, 1);
         newmaterial = materialObls;
         BaseTemPlate text = new BaseTemPlate();
         List<BaseTemPlate> noText = new List<BaseTemPlate>();
         MaterialObjValue textmat = null;
         List<ObjectValue> objectValues = new List<ObjectValue>();
 
+        ysm.yangshiText.gameObject.SetActive(false);
+        Debug.LogError("TextTextTextTextText.select  DRFanLayout.CreateImage_Video_Text  " + materialObls.materialList.Count);
         for (int i = 0; i < materialObls.materialList.Count; i++)
         {
             var mat = materialObls.materialList[i];
+            Debug.LogError("TextTextTextTextText.select  DRFanLayout.CreateImage_Video_Text  " + mat.type);
             GameObject go = null;
             switch (mat.type)
             {
                 case (int)MaterialType.None:
+                    ysm.yangshiList[i].Close();
                     break;
                 case (int)MaterialType.Image:
-                    var pImage = ResMgr.Instance.Load<GameObject>("Template/Prefab/Image");
-                    go = Instantiate(pImage, par.transform);
+                    go = ysm.yangshiList[i].showimg();
                     var imageitem = go.AddComponent<TemplateImage>();
                     go.SetActive(true);
                     imageitem.SetData(mat, materialObls.updateTime);
                     noText.Add(imageitem);
                     break;
                 case (int)MaterialType.Video:
-                    var pVideo = ResMgr.Instance.Load<GameObject>("Template/Prefab/Video");
-                    go = Instantiate(pVideo, par.transform);
+                    go = ysm.yangshiList[i].showvideo();
                     var videoitem = go.AddComponent<TemplateVideo>();
                     videoitem.autoplay = materialObls.autoplay;
                     go.SetActive(true);
@@ -50,20 +57,36 @@ public class SRTitleLayout : MonoBehaviour
                     break;
                 case (int)MaterialType.Text:
                     textmat = mat;
-                    var pText = ResMgr.Instance.Load<GameObject>("Template/Prefab/Text");
-                    go = Instantiate(pText, par.transform);
+                    go = ysm.yangshiText.gameObject;
                     var textitem = go.AddComponent<TemplateText>();
                     go.SetActive(true);
+
                     textitem.SetData(mat, materialObls.updateTime);
                     text = textitem;
-                    go.SetActive(false);
                     break;
                 default:
+                    ysm.yangshiList[i].Close();
                     break;
             }
-
             if (go != null)
             {
+                if (!GameManager.Instance.allobjs.ContainsKey(spoitjd.id.ToString()))
+                {
+                    GameManager.Instance.allobjs.Add(spoitjd.id.ToString(), new Dictionary<string, Dictionary<string, GameObject>>());
+                }
+                if (!GameManager.Instance.allobjs[spoitjd.id.ToString()].ContainsKey(materialObls.id.ToString()))
+                {
+                    GameManager.Instance.allobjs[spoitjd.id.ToString()].Add(materialObls.id.ToString(), new Dictionary<string, GameObject>());
+                }
+                if (!GameManager.Instance.allobjs[spoitjd.id.ToString()][materialObls.id.ToString()].ContainsKey(mat.id.ToString()))
+                {
+                    GameManager.Instance.allobjs[spoitjd.id.ToString()][materialObls.id.ToString()].Add(mat.id.ToString(), go);
+                }
+                else
+                {
+                    GameManager.Instance.allobjs[spoitjd.id.ToString()][materialObls.id.ToString()][mat.id.ToString()] = go;
+                }
+                Debug.Log("HJJSSSSSSSSSSSSSSSS获取      ===》" + spoitjd.id.ToString() + "_" + materialObls.id.ToString() + "_" + mat.id.ToString());
                 go.name = string.IsNullOrWhiteSpace(mat.name) ? par.name + "-" + i.ToString() : mat.name;
                 go.AddComponent<EditorEventHandler>().Type = (MaterialType)(mat.type);
 
@@ -76,8 +99,6 @@ public class SRTitleLayout : MonoBehaviour
                 }
                 else
                 {
-                    go.transform.localEulerAngles = Vector3.zero;
-                    go.transform.localScale = new Vector3(1, 1, 1);
 
                     if (mat.type != (int)MaterialType.Text)
                     {
@@ -88,11 +109,11 @@ public class SRTitleLayout : MonoBehaviour
                         //Set text position
                         if (mat.textPosition == "top")
                         {
-                            go.transform.localPosition = new Vector3(0, 0.6f, 0);
+                            go.transform.localPosition = new Vector3(0, ysm.yangshiText.topf, 0);
                         }
                         else if (mat.textPosition == "bottom")
                         {
-                            go.transform.localPosition = new Vector3(0, -0.6f, 0);
+                            go.transform.localPosition = new Vector3(0, ysm.yangshiText.buttomf, 0);
                         }
                     }
                     mat.ObjectTransform.SetStartValue(go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);
@@ -106,16 +127,6 @@ public class SRTitleLayout : MonoBehaviour
 
         if (!materialObls.select)
         {
-            Column(noText, par);
-
-            //第一次排列后，需调整初始坐标和当前坐标保持一致
-            for (int i = 0; i < objectValues.Count; i++)
-            {
-                objectValues[i].InitTransform();
-                objectValues[i].Object.SetActive(true);
-                var go = objectValues[i].Object;
-                newmaterial.materialList[objectValues[i].ID].ObjectTransform.SetStartValue(go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);
-            }
             if(type !="1") // 判断是不是巨幕
             {
                 if (objectValues.Count > 0)
@@ -141,7 +152,12 @@ public class SRTitleLayout : MonoBehaviour
     /// <returns></returns>
     public static IEnumerator CalLayout(ModelList materialObls, GameObject par)
     {
-        
+        var yangshi = ResMgr.Instance.LoadAsync<GameObject>("Template/Prefab/yangshi" + materialObls.typesetting);
+        yield return yangshi;
+        GameObject ys = Instantiate((yangshi.asset as GameObject), par.transform);
+        YangShiManager ysm = ys.GetComponent<YangShiManager>();
+        ys.transform.localEulerAngles = Vector3.zero;
+        ys.transform.localScale = new Vector3(1, 1, 1);
         BaseTemPlate text = new BaseTemPlate();
         List<BaseTemPlate> noText = new List<BaseTemPlate>();
         ModelItem textmat = null;
@@ -156,18 +172,14 @@ public class SRTitleLayout : MonoBehaviour
                 case (int)MaterialType.None:
                     break;
                 case (int)MaterialType.Image:
-                    var pImage = ResMgr.Instance.LoadAsync<GameObject>("Template/Prefab/Image");
-                    yield return pImage;
-                    go = Instantiate(pImage.asset as GameObject, par.transform);
+                    go = ysm.yangshiList[i].showimg();
                     var imageitem = go.AddComponent<TemplateImage>();
                     go.SetActive(true);
                    // imageitem.SetData(mat, materialObls.updateTime);
                     noText.Add(imageitem);
                     break;
                 case (int)MaterialType.Video:
-                    var pVideo = ResMgr.Instance.LoadAsync<GameObject>("Template/Prefab/Video");
-                    yield return pVideo;
-                    go = Instantiate(pVideo.asset as GameObject, par.transform);
+                    go = ysm.yangshiList[i].showvideo();
                     var videoitem = go.AddComponent<TemplateVideo>();
                     videoitem.autoplay = materialObls.autoplay;
                     go.SetActive(true);
@@ -175,10 +187,7 @@ public class SRTitleLayout : MonoBehaviour
                     noText.Add(videoitem);
                     break;
                 case (int)MaterialType.Text:
-                    textmat = mat;
-                    var pText = ResMgr.Instance.LoadAsync<GameObject>("Template/Prefab/Text");
-                    yield return pText;
-                    go = Instantiate(pText.asset as GameObject, par.transform);
+                    go = ysm.yangshiText.gameObject;
                     var textitem = go.AddComponent<TemplateText>();
                     go.SetActive(true);
                   //  textitem.SetData(mat, materialObls.updateTime);
@@ -203,8 +212,6 @@ public class SRTitleLayout : MonoBehaviour
                 }
                 else
                 {
-                    go.transform.localEulerAngles = Vector3.zero;
-                    go.transform.localScale = new Vector3(1, 1, 1);
 
                     if (mat.type != (int)MaterialType.Text)
                     {
@@ -215,11 +222,11 @@ public class SRTitleLayout : MonoBehaviour
                         //Set text position
                         if (mat.textPosition == "top")
                         {
-                            go.transform.localPosition = new Vector3(0, 0.3f, 0);
+                            go.transform.localPosition = new Vector3(0, ysm.yangshiText.topf, 0);
                         }
                         else if (mat.textPosition == "bottom")
                         {
-                            go.transform.localPosition = new Vector3(0, -0.3f, 0);
+                            go.transform.localPosition = new Vector3(0, ysm.yangshiText.buttomf, 0);
                         }
                     }
                     mat.objectTransform.SetStartValue(go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);
@@ -230,17 +237,6 @@ public class SRTitleLayout : MonoBehaviour
 
         #region 需要判断是否是第一次编辑坐标，若是则执行下方代码，不是则直接返回
 
-        if (!materialObls.select)
-        {
-            Column(noText, par);
-
-            //第一次排列后，需调整初始坐标和当前坐标保持一致
-            for (int i = 0; i < objectValues.Count; i++)
-            {
-                objectValues[i].InitTransform();
-                objectValues[i].Object.SetActive(true);
-            }
-        }
         if (textmat != null)
         {
             text.gameObject.SetActive(true);

Assets/Scripts/LayoutTemplate/TemplateModel.cs

@@ -105,7 +105,7 @@ public class TemplateModel : BaseTemPlate
     }
     public void LoadModel(AssetBundle ab)
     {
-       StartCoroutine(LoadABModel(ab));
+      GameManager.Instance.StartCoroutine(LoadABModel(ab));
         //LoadABModel(ab);
     }
     private IEnumerator LoadABModel(AssetBundle ab)
@@ -280,8 +280,10 @@ public class TemplateModel : BaseTemPlate
         m_ModelObj = Instantiate(prefab, transform);
         ab.Unload(false);
 
-        gameObject.AddComponent<ManipulationHandler>();
-        gameObject.AddComponent<BoundingBox>();
+        ManipulationHandler manipulation = gameObject.AddComponent<ManipulationHandler>();
+        manipulation.enabled = false;
+        BoundingBox boundingBox = gameObject.AddComponent<BoundingBox>();
+        boundingBox.enabled = false;
     }
 
     private void TriLibModel()
@@ -293,8 +295,10 @@ public class TemplateModel : BaseTemPlate
             Debug.Log("载材质加完成");
           //  ac.RootGameObject.transform.position = Camera.main.transform.forward;
             m_ModelObj = Instantiate(ac.RootGameObject, transform);
-            gameObject.AddComponent<ManipulationHandler>();
-            gameObject.AddComponent<BoundingBox>();
+            ManipulationHandler manipulation = gameObject.AddComponent<ManipulationHandler>();
+            manipulation.enabled = false;
+            BoundingBox boundingBox = gameObject.AddComponent<BoundingBox>();
+            boundingBox.enabled = false;
             ac.RootGameObject.SetActive(false);
         }, (AssetLoaderContext ac, float f) => {
 

Assets/Scripts/LayoutTemplate/TemplateText.cs

@@ -63,6 +63,8 @@ public class TemplateText : BaseTemPlate
 
     public override void SetData(MaterialObjValue value, int updateTime)
     {
+        Debug.Log("Text +++++" + value.TextBJ);
+        Debug.Log("Text +++++" + value.textContent);
         base.SetData(value, updateTime);
         SuCaiData = value;
         Data = new DownLoadMaterial(value);
@@ -75,7 +77,6 @@ public class TemplateText : BaseTemPlate
         if(value.textContent.Contains("<br>"))
             value.textContent = value.textContent.Replace("<br>","\n");
 
-
         if (m_Text)
         {
             m_Text.text = value.textContent;

Assets/Scripts/PlayerTrigger.cs

@@ -73,7 +73,6 @@ public class PlayerTrigger : MonoBehaviour
              
                 HttpSocket.Instance.SendIpToPointPos(pos, (message) =>
                 {
-                    //Debug.Log(message);
                 });
             }
         }

Assets/Scripts/UI/EdirPanel/UIEditorPanel.cs

@@ -265,19 +265,24 @@ public class UIEditorPanel : AbstractController, EventObserver
                 for (int k = 0;k< spoit.material[j].materialList.Count; k++)
                 {
                     spoit.material[j].select = true;
-                    if (GameManager.Instance.ObjsParent.childCount > i)
+                    if(GameManager.Instance.allobjs.ContainsKey(spoit.id.ToString()))
                     {
-                        if (GameManager.Instance.ObjsParent.GetChild(i).childCount > j)
+
+                        if (GameManager.Instance.allobjs[spoit.id.ToString()].ContainsKey(spoit.material[j].id.ToString()))
                         {
-                            if (GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).childCount > k)
+
+
+                            if (GameManager.Instance.allobjs[spoit.id.ToString()][spoit.material[j].id.ToString()].ContainsKey(spoit.material[j].materialList[k].id.ToString()))
                             {
-                                Debug.LogError("HJJ  materialList   " + GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).name +"_" + GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition);
-                                spoit.material[j].materialList[k].ObjectTransform.nowPos = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition;
-                                spoit.material[j].materialList[k].ObjectTransform.nowRot = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localEulerAngles;
-                                spoit.material[j].materialList[k].ObjectTransform.nowScale = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localScale;
+                                spoit.material[j].materialList[k].ObjectTransform.nowPos = GameManager.Instance.allobjs[spoit.id.ToString()][spoit.material[j].id.ToString()][spoit.material[j].materialList[k].id.ToString()].transform.localPosition;// spoit.material[j].materialList[k].obj.transform.localPosition;// GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition;
+                                spoit.material[j].materialList[k].ObjectTransform.nowRot = GameManager.Instance.allobjs[spoit.id.ToString()][spoit.material[j].id.ToString()][spoit.material[j].materialList[k].id.ToString()].transform.localEulerAngles;//spoit.material[j].materialList[k].obj.transform.localEulerAngles;// GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localEulerAngles;
+                                spoit.material[j].materialList[k].ObjectTransform.nowScale = GameManager.Instance.allobjs[spoit.id.ToString()][spoit.material[j].id.ToString()][spoit.material[j].materialList[k].id.ToString()].transform.localScale;//spoit.material[j].materialList[k].obj.transform.localScale;// GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localScale;
+
                             }
                         }
                     }
+
+                   // Debug.Log("HJJSSSSSSSSSSSSSSSS保存      ===》"+ spoit.id.ToString()+"_"+ spoit.material[j].id.ToString() + "_"+ spoit.material[j].materialList[k].id.ToString());
                 }
             }
             SplitSpoitData(spoit,count-1); //// 第一个LocalNULLShowObj是无用的 ,so -1

Assets/Scripts/UI/GameManager.cs

@@ -221,6 +221,8 @@ public class GameManager : MonoSingleton<GameManager>
        // Debug.unityLogger.logEnabled = false;
     }
 
+    public Dictionary<string, Dictionary<string, Dictionary<string, GameObject>>> allobjs = new Dictionary<string, Dictionary<string, Dictionary<string, GameObject>>>();
+
     public bool isShowDownTip;
     private void Start()
     {
@@ -280,15 +282,11 @@ public class GameManager : MonoSingleton<GameManager>
                 }
                 else
                 {
-                    if (downLoadCount != 0)
-                    {
-                        Debug.Log("HJJ  判断正在下载downLoadCount != 0");
-                        UIManager.Instance.HideUI(UINameConfig.LoadingPanel);
-                        downLoadCount = 0;
-                        UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.updateEnd);
-                        isShowDownTip = false;
-                       // TimerMgr.Instance.DestroyTimer(t);
-                    }
+                    Debug.Log("HJJ  判断正在下载downLoadCount != 0");
+                    UIManager.Instance.HideUI(UINameConfig.LoadingPanel);
+                    downLoadCount = 0;
+                    UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.updateEnd);
+                    isShowDownTip = false;
                 }
 
                 if(COSDownLoad.showDownLoadCount==0&& downLoadCount ==0)
@@ -762,7 +760,7 @@ public class GameManager : MonoSingleton<GameManager>
 
 #region 创建水晶点、触发器范围、显示物体
 
-    public void CreateScene(SceneValue scene)
+    public IEnumerator CreateScene(SceneValue scene)
     {
         SceneValue = scene;
         if (m_MinMap.Map.sprite == null)
@@ -771,9 +769,10 @@ public class GameManager : MonoSingleton<GameManager>
         }
         else
         {
-            StartCreateScene(scene);
+            yield return StartCoroutine(StartCreateScene(scene));
         }
-        Invoke("MoveScenePatch",1);
+        yield return new WaitForSeconds(1f);
+        MoveScenePatch();
     }
     private void MoveScenePatch()
     {
@@ -781,7 +780,7 @@ public class GameManager : MonoSingleton<GameManager>
         temp.z += MapSize.y;
         ObjsParent.parent.localPosition = temp;
     }
-    private void StartCreateScene(SceneValue scene)
+    private IEnumerator StartCreateScene(SceneValue scene)
     {
         if (scene.navLines != null && scene.navLines.Count > 0)
             SetRouteValue(scene.navLines);
@@ -789,7 +788,7 @@ public class GameManager : MonoSingleton<GameManager>
             Debug.LogError(" 当前场景未设置路径");
         Debug.Log("DGJ ====>  " + JsonConvert.SerializeObject(scene));
         if (scene.listSpoit != null && scene.listSpoit.Count > 0)
-            SetSpoitValue(scene.listSpoit);
+            yield return StartCoroutine(SetSpoitValue(scene.listSpoit));
         else
             Debug.LogError(" 当前场景未创建景点");
 
@@ -799,7 +798,7 @@ public class GameManager : MonoSingleton<GameManager>
             Debug.LogError(" 当前场景未创建锚点");
         //设置小地图景点
         //  m_CalMap.SettingMapPoint(ListCrystals);
-       
+        yield return null;
         //UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.download);
         //  DownloadManager.Instance.UpdataData();
       
@@ -877,7 +876,7 @@ public class GameManager : MonoSingleton<GameManager>
         //        }
         //    }
         //});
-        GameManager.Instance.isShowDownTip = true;
+       GameManager.Instance.isShowDownTip = true;
         DownloadResManager.Instance.StartDownLoad();
     }
 
@@ -934,7 +933,7 @@ public class GameManager : MonoSingleton<GameManager>
     /// 设置景点素材信息
     /// </summary>
     /// <param name="spoits"></param>
-    public void SetSpoitValue(List<SpoitValue> spoits)
+    public IEnumerator SetSpoitValue(List<SpoitValue> spoits)
     {
       
         SpoitValue spoitValue;
@@ -959,8 +958,8 @@ public class GameManager : MonoSingleton<GameManager>
             SpoitValue spoit1 = spoit;
 
             CreateCrystalAndTrigger(spoit);
-            CreateMaterial(spoit, out spoit1);
-            spoits[i] = spoit1;
+            yield return StartCoroutine(CreateMaterial(spoit));
+            spoits[i] = SV;
         }
         for (int i = 0; i < ListColiderBoxs_Mesh.Count; i++)
         {
@@ -1058,16 +1057,16 @@ public class GameManager : MonoSingleton<GameManager>
 
         return spoitObj;
     }
-
+    SpoitValue SV;
     /// <summary>
     /// 创建整体素材
     /// 一个景点下应只有一个父物体，其他素材都在父物体下
     /// </summary>
-    private void CreateMaterial(SpoitValue spoit, out SpoitValue newspoit)
+    private IEnumerator CreateMaterial(SpoitValue spoit)
     {
         if(!ObjectValues.ContainsKey(spoit.id))
         {
-            newspoit = new SpoitValue();
+            SV = new SpoitValue();
         }
         else
         {
@@ -1113,15 +1112,15 @@ public class GameManager : MonoSingleton<GameManager>
                 case (int)MaterialType.Text:
                 case (int)MaterialType.LocaImage:
                     Debug.Log("DGJ  ===>  LocalImage " + material.name);
-                    objsvalue = CreateSuCaiObj(material, matObj, out newmaterial);
+                    objsvalue = CreateSuCaiObj(spoit,material, matObj, out newmaterial);
                     break;
                 case (int)MaterialType.Image_Video_Text:
                     Debug.Log("DGJ  ===>  Image_Video_Text " + material.name);
-                    objsvalue = CreateImage_Video_Text(material, matObj, out newmaterial);
+                    objsvalue = CreateImage_Video_Text(spoit,material, matObj, out newmaterial);
                     break;
                 case (int)MaterialType.Model_Text:
                     Debug.Log("DGJ  ===>  Model_Text " + material.name);
-                    objsvalue = CreateModel_Text(material, matObj, out newmaterial);
+                    objsvalue = CreateModel_Text(spoit,material, matObj, out newmaterial);
                     break;
                 default:
                     break;
@@ -1133,7 +1132,7 @@ public class GameManager : MonoSingleton<GameManager>
         }
 
 
-        newspoit = spoit;
+            SV = spoit;
 
         if (ObjectValues.ContainsKey(spoit.id))
         {
@@ -1145,6 +1144,7 @@ public class GameManager : MonoSingleton<GameManager>
         }
         spoitObj.gameObject.SetActive(false);
         }
+        yield return null;
     }
 
     /// <summary>
@@ -1196,13 +1196,13 @@ public class GameManager : MonoSingleton<GameManager>
             case (int)MaterialType.Model:
             case (int)MaterialType.Text:
             case (int)MaterialType.LocaImage:
-                objsvalue = CreateSuCaiObj(newmaterial, matObj, out newmaterial);
+                objsvalue = CreateSuCaiObj(spoit, newmaterial, matObj, out newmaterial);
                 break;
             case (int)MaterialType.Image_Video_Text:
-                objsvalue = CreateImage_Video_Text(newmaterial, matObj, out newmaterial);
+                objsvalue = CreateImage_Video_Text(spoit,newmaterial, matObj, out newmaterial);
                 break;
             case (int)MaterialType.Model_Text:
-                objsvalue = CreateModel_Text(newmaterial, matObj, out newmaterial);
+                objsvalue = CreateModel_Text(spoit, newmaterial, matObj, out newmaterial);
                 break;
             default:
                 break;
@@ -1235,7 +1235,7 @@ public class GameManager : MonoSingleton<GameManager>
     /// <param name="material">素材数据</param>
     /// <param name="spoit">景点</param>
     /// <returns></returns>
-    private List<ObjectValue> CreateSuCaiObj(MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
+    private List<ObjectValue> CreateSuCaiObj(SpoitValue spoitjd, MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
     {
         List<ObjectValue> objects = new List<ObjectValue>();
         List<MaterialObjValue> objs = material.materialList;
@@ -1298,6 +1298,23 @@ public class GameManager : MonoSingleton<GameManager>
 
             if (go != null)
             {
+
+                if (!GameManager.Instance.allobjs.ContainsKey(spoitjd.id.ToString()))
+                {
+                    GameManager.Instance.allobjs.Add(spoitjd.id.ToString(), new Dictionary<string, Dictionary<string, GameObject>>());
+                }
+                if (!GameManager.Instance.allobjs[spoitjd.id.ToString()].ContainsKey(material.id.ToString()))
+                {
+                    GameManager.Instance.allobjs[spoitjd.id.ToString()].Add(material.id.ToString(), new Dictionary<string, GameObject>());
+                }
+                if (!GameManager.Instance.allobjs[spoitjd.id.ToString()][material.id.ToString()].ContainsKey(mat.id.ToString()))
+                {
+                    GameManager.Instance.allobjs[spoitjd.id.ToString()][material.id.ToString()].Add(mat.id.ToString(), go);
+                }
+                else
+                {
+                    GameManager.Instance.allobjs[spoitjd.id.ToString()][material.id.ToString()][mat.id.ToString()] = go;
+                }
                 go.name = string.IsNullOrWhiteSpace(mat.name) ? spoit.name + "-" + i.ToString() : mat.name;
                 mat.name = go.name;
                 go.AddComponent<EditorEventHandler>().Type = (MaterialType)(mat.type);
@@ -1346,7 +1363,7 @@ public class GameManager : MonoSingleton<GameManager>
     /// <param name="material"></param>
     /// <param name="spoit"></param>
     /// <returns></returns>
-    private List<ObjectValue> CreateModel_Text(MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
+    private List<ObjectValue> CreateModel_Text(SpoitValue spoitjd, MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
     {
         List<ObjectValue> objects = new List<ObjectValue>();
         List<MaterialObjValue> objs = material.materialList;
@@ -1379,6 +1396,22 @@ public class GameManager : MonoSingleton<GameManager>
 
             if (go != null)
             {
+                if (!GameManager.Instance.allobjs.ContainsKey(spoitjd.id.ToString()))
+                {
+                    GameManager.Instance.allobjs.Add(spoitjd.id.ToString(), new Dictionary<string, Dictionary<string, GameObject>>());
+                }
+                if (!GameManager.Instance.allobjs[spoitjd.id.ToString()].ContainsKey(material.id.ToString()))
+                {
+                    GameManager.Instance.allobjs[spoitjd.id.ToString()].Add(material.id.ToString(), new Dictionary<string, GameObject>());
+                }
+                if (!GameManager.Instance.allobjs[spoitjd.id.ToString()][material.id.ToString()].ContainsKey(mat.id.ToString()))
+                {
+                    GameManager.Instance.allobjs[spoitjd.id.ToString()][material.id.ToString()].Add(mat.id.ToString(), go);
+                }
+                else
+                {
+                    GameManager.Instance.allobjs[spoitjd.id.ToString()][material.id.ToString()][mat.id.ToString()] = go;
+                }
                 go.name = string.IsNullOrWhiteSpace(mat.name) ? spoit.name + "-" + i.ToString() : mat.name;
                 go.AddComponent<EditorEventHandler>().Type = (MaterialType)(mat.type);
 
@@ -1431,65 +1464,13 @@ public class GameManager : MonoSingleton<GameManager>
     /// <summary>
     /// 创建 5图片+文字/视频+文字
     /// </summary>
-    private List<ObjectValue> CreateImage_Video_Text(MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
+    private List<ObjectValue> CreateImage_Video_Text(SpoitValue spoitjd,MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
     {
         Debug.LogError("HJJmaterialObls.select  DRFanLayout.CreateImage_Video_Text  ");
         newmaterial = material;
         List<ObjectValue> objects = new List<ObjectValue>();
-        //switch (material.typesetting)
-        //{
-        //    case "1":
-        //        objects = SRTitleLayout.CalLayout(material, spoit, out newmaterial);
-        //        break;
-        //    case "2":
-        //        objects = SRSectorLayout.CalLayout(material, spoit, out newmaterial);
-        //        break;
-        //    case "3":
-        //        objects = DRTitleLayout.CalLayout(material, spoit, out newmaterial);
-        //        break;
-        //    case "4":
-        //        objects = DRFanLayout.CalLayout(material, spoit, out newmaterial);
-        //        break;
-        //    case "5":
-        //        objects = SRTitleLayout.CalLayout(material, spoit, out newmaterial,"5");
-        //        break;
-        //    case "自定义":
-        //        break;
-        //    default:
-        //        break;
-        //}
-
-        switch (material.typesetting)
-        {
-            case "1":
-                SRTitleLayout.CalLayout(material, spoit, out newmaterial);
-                break;
-            case "2":
-                SRTitleLayout.CalLayout(material, spoit, out newmaterial);
-                break;
-            case "3":
-                SRTitleLayout.CalLayout(material, spoit, out newmaterial);
-                break;
-            case "4":
-                SRSectorLayout.CalLayout(material, spoit, out newmaterial);
-                break;
-            case "5":
-                DRTitleLayout.CalLayout(material, spoit, out newmaterial);
-                break;
-            case "6":
-                DRTitleLayout.CalLayout(material, spoit, out newmaterial);
-                break;
-            case "7":
-                DRTitleLayout.CalLayout(material, spoit, out newmaterial);
-                break;
-            case "8":
-                Debug.LogError("HJJmaterialObls.select  DRFanLayout.CalLayout  ");
-                DRFanLayout.CalLayout(material, spoit, out newmaterial);
-                break;
+        SRTitleLayout.CalLayout(spoitjd,material, spoit, out newmaterial);
 
-            default:
-                break;
-        }
         Debug.LogError("HJJmaterialObls.select  DRFanLayout.CalLayout default ");
 
         return objects;

Assets/Scripts/UI/SceneChoose.cs

@@ -332,9 +332,9 @@ public class SceneChoose : BaseUI
         }
 
         yield return new WaitForSeconds(1f);
-    
+
         //创建场景
-        GameManager.Instance.CreateScene(scene);
+        StartCoroutine(GameManager.Instance.CreateScene(scene));
         Hide();
         
     }