|
@@ -155,13 +155,13 @@ public class ModelList: System.ICloneable
|
|
|
case (int)MaterialType.Model:
|
|
|
case (int)MaterialType.Text:
|
|
|
case (int)MaterialType.LocaImage:
|
|
|
- CreateSuCaiObj(this, Model);
|
|
|
+ GameManager.Instance.StartCoroutine( CreateSuCaiObj(this, Model));
|
|
|
break;
|
|
|
case (int)MaterialType.Image_Video_Text:
|
|
|
- CreateImage_Video_Text(this, Model);
|
|
|
+ GameManager.Instance.StartCoroutine(CreateImage_Video_Text(this, Model));
|
|
|
break;
|
|
|
case (int)MaterialType.Model_Text:
|
|
|
- CreateModel_Text(this, Model);
|
|
|
+ GameManager.Instance.StartCoroutine(CreateModel_Text(this, Model));
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
@@ -174,7 +174,7 @@ public class ModelList: System.ICloneable
|
|
|
|
|
|
|
|
|
|
|
|
- private void CreateSuCaiObj(ModelList material, GameObject spoit)
|
|
|
+ private IEnumerator CreateSuCaiObj(ModelList material, GameObject spoit)
|
|
|
{
|
|
|
List<ObjectValue> objects = new List<ObjectValue>();
|
|
|
List<ModelItem> objs = material.materialList;
|
|
@@ -187,16 +187,18 @@ public class ModelList: System.ICloneable
|
|
|
case (int)MaterialType.None:
|
|
|
break;
|
|
|
case (int)MaterialType.Image:
|
|
|
- var pImage = ResMgr.Instance.Load<GameObject>("Template/Prefab/Image");
|
|
|
- go = GameObject.Instantiate(pImage, spoit.transform);
|
|
|
+ var pImage = ResMgr.Instance.LoadAsync<GameObject>("Template/Prefab/Image");
|
|
|
+ yield return pImage;
|
|
|
+ go = GameObject.Instantiate(pImage.asset as GameObject, spoit.transform);
|
|
|
go.SetActive(true);
|
|
|
go.AddComponent<TemplateImage>();
|
|
|
|
|
|
|
|
|
break;
|
|
|
case (int)MaterialType.Video:
|
|
|
- var pVideo = ResMgr.Instance.Load<GameObject>("Template/Prefab/Video");
|
|
|
- go = GameObject.Instantiate(pVideo, spoit.transform);
|
|
|
+ var pVideo = ResMgr.Instance.LoadAsync<GameObject>("Template/Prefab/Video");
|
|
|
+ yield return pVideo;
|
|
|
+ go = GameObject.Instantiate(pVideo.asset as GameObject, spoit.transform);
|
|
|
go.SetActive(true);
|
|
|
TemplateVideo video = go.AddComponent<TemplateVideo>();
|
|
|
video.localSavePath = Application.persistentDataPath + "/Material/" + Path.GetFileName(objs[i].DownloadPath);
|
|
@@ -205,8 +207,9 @@ public class ModelList: System.ICloneable
|
|
|
|
|
|
break;
|
|
|
case (int)MaterialType.Model:
|
|
|
- var pModel = ResMgr.Instance.Load<GameObject>("Template/Prefab/Model");
|
|
|
- go = GameObject.Instantiate(pModel, spoit.transform);
|
|
|
+ var pModel = ResMgr.Instance.LoadAsync<GameObject>("Template/Prefab/Model");
|
|
|
+ yield return pModel;
|
|
|
+ go = GameObject.Instantiate(pModel.asset as GameObject, spoit.transform);
|
|
|
go.SetActive(true);
|
|
|
go.AddComponent<TemplateModel>();
|
|
|
|
|
@@ -214,16 +217,18 @@ public class ModelList: System.ICloneable
|
|
|
|
|
|
break;
|
|
|
case (int)MaterialType.Text:
|
|
|
- var pText = ResMgr.Instance.Load<GameObject>("Template/Prefab/Text");
|
|
|
- go = GameObject.Instantiate(pText, spoit.transform);
|
|
|
+ var pText = ResMgr.Instance.LoadAsync<GameObject>("Template/Prefab/Text");
|
|
|
+ yield return pText;
|
|
|
+ go = GameObject.Instantiate(pText.asset as GameObject, spoit.transform);
|
|
|
go.SetActive(true);
|
|
|
go.AddComponent<TemplateText>();
|
|
|
|
|
|
|
|
|
break;
|
|
|
case (int)MaterialType.LocaImage:
|
|
|
- var pLocaImage = ResMgr.Instance.Load<GameObject>("Template/Prefab/Image");
|
|
|
- go = GameObject.Instantiate(pLocaImage, spoit.transform);
|
|
|
+ var pLocaImage = ResMgr.Instance.LoadAsync<GameObject>("Template/Prefab/Image");
|
|
|
+ yield return pLocaImage;
|
|
|
+ go = GameObject.Instantiate(pLocaImage.asset as GameObject, spoit.transform);
|
|
|
go.SetActive(true);
|
|
|
go.AddComponent<TemplateImage>();
|
|
|
|
|
@@ -280,7 +285,7 @@ public class ModelList: System.ICloneable
|
|
|
|
|
|
|
|
|
|
|
|
- private void CreateModel_Text(ModelList material, GameObject spoit)
|
|
|
+ private IEnumerator CreateModel_Text(ModelList material, GameObject spoit)
|
|
|
{
|
|
|
List<ObjectValue> objects = new List<ObjectValue>();
|
|
|
List<ModelItem> objs = material.materialList;
|
|
@@ -294,16 +299,18 @@ public class ModelList: System.ICloneable
|
|
|
case (int)MaterialType.None:
|
|
|
break;
|
|
|
case (int)MaterialType.Model:
|
|
|
- var pModel = ResMgr.Instance.Load<GameObject>("Template/Prefab/Model");
|
|
|
- go = GameObject.Instantiate(pModel, spoit.transform);
|
|
|
+ var pModel = ResMgr.Instance.LoadAsync<GameObject>("Template/Prefab/Model");
|
|
|
+ yield return pModel;
|
|
|
+ go = GameObject.Instantiate(pModel.asset as GameObject, spoit.transform);
|
|
|
go.SetActive(true);
|
|
|
go.AddComponent<TemplateModel>();
|
|
|
|
|
|
|
|
|
break;
|
|
|
case (int)MaterialType.Text:
|
|
|
- var pText = ResMgr.Instance.Load<GameObject>("Template/Prefab/Text");
|
|
|
- go = GameObject.Instantiate(pText, spoit.transform);
|
|
|
+ var pText = ResMgr.Instance.LoadAsync<GameObject>("Template/Prefab/Text");
|
|
|
+ yield return pText;
|
|
|
+ go = GameObject.Instantiate(pText.asset as GameObject, spoit.transform);
|
|
|
go.SetActive(true);
|
|
|
go.AddComponent<TemplateText>();
|
|
|
|
|
@@ -368,7 +375,7 @@ public class ModelList: System.ICloneable
|
|
|
|
|
|
|
|
|
|
|
|
- private void CreateImage_Video_Text(ModelList material, GameObject spoit)
|
|
|
+ private IEnumerator CreateImage_Video_Text(ModelList material, GameObject spoit)
|
|
|
{
|
|
|
|
|
|
List<ObjectValue> objects = new List<ObjectValue>();
|
|
@@ -398,28 +405,28 @@ public class ModelList: System.ICloneable
|
|
|
switch (material.typesetting)
|
|
|
{
|
|
|
case "1":
|
|
|
- SRTitleLayout.CalLayout(material, spoit);
|
|
|
+ yield return GameManager.Instance.StartCoroutine(SRTitleLayout.CalLayout(material, spoit));
|
|
|
break;
|
|
|
case "2":
|
|
|
- SRTitleLayout.CalLayout(material, spoit);
|
|
|
+ yield return GameManager.Instance.StartCoroutine(SRTitleLayout.CalLayout(material, spoit));
|
|
|
break;
|
|
|
case "3":
|
|
|
- SRTitleLayout.CalLayout(material, spoit);
|
|
|
+ yield return GameManager.Instance.StartCoroutine(SRTitleLayout.CalLayout(material, spoit));
|
|
|
break;
|
|
|
case "4":
|
|
|
- SRSectorLayout.CalLayout(material, spoit);
|
|
|
+ yield return GameManager.Instance.StartCoroutine(SRSectorLayout.CalLayout(material, spoit));
|
|
|
break;
|
|
|
case "5":
|
|
|
- DRTitleLayout.CalLayout(material, spoit);
|
|
|
+ yield return GameManager.Instance.StartCoroutine(DRTitleLayout.CalLayout(material, spoit));
|
|
|
break;
|
|
|
case "6":
|
|
|
- DRTitleLayout.CalLayout(material, spoit);
|
|
|
+ yield return GameManager.Instance.StartCoroutine(DRTitleLayout.CalLayout(material, spoit));
|
|
|
break;
|
|
|
case "7":
|
|
|
- DRTitleLayout.CalLayout(material, spoit);
|
|
|
+ yield return GameManager.Instance.StartCoroutine(DRTitleLayout.CalLayout(material, spoit));
|
|
|
break;
|
|
|
case "8":
|
|
|
- DRFanLayout.CalLayout(material, spoit);
|
|
|
+ yield return GameManager.Instance.StartCoroutine(DRFanLayout.CalLayout(material, spoit));
|
|
|
break;
|
|
|
|
|
|
default:
|