diff --git a/Assets/Scripts/Leave/LeavePlayPrefabControll.cs b/Assets/Scripts/Leave/LeavePlayPrefabControll.cs index 79e4e3e7..aea2f064 100644 --- a/Assets/Scripts/Leave/LeavePlayPrefabControll.cs +++ b/Assets/Scripts/Leave/LeavePlayPrefabControll.cs @@ -25,12 +25,17 @@ public class LeavePlayPrefabControll : MonoBehaviour //string index = boxName.Replace("LeaveBoxCollider_", ""); GameDataManage.Instance.isShowLeaveOn = true; RenderSettings.fog = false; - //GameObject gameScene = GameObject.Find("GameScene"); + GameObject gameScene = GameObject.Find("GameScene"); //GameObject staticObj = gameScene.transform.Find("Static").gameObject; - //gameScene.transform.Find("Static").gameObject.SetActive(false); - //Renderer[] renderers = staticObj.GetComponentsInChildren(); - - SetObjsRender(false); + if (SceneMgr.Instance.nowSceneId == 4) + { + SetObjsRender(false); + } + else + { + gameScene.transform.Find("Static").gameObject.SetActive(false); + gameScene.transform.Find("Dynamic").gameObject.SetActive(false); + } GameObject gameEnvi = GameObject.Find("GameScene/Environment/SkyBox_360Player"); SetGameObjectLayer(gameEnvi, false); leavePrefab.transform.position = new Vector3(v3.x, 0, v3.z); @@ -45,10 +50,18 @@ public class LeavePlayPrefabControll : MonoBehaviour Debug.Log("显示的位置:" + index); GameDataManage.Instance.isShowLeaveOn = true; RenderSettings.fog = false; - //GameObject gameScene = GameObject.Find("GameScene"); + GameObject gameScene = GameObject.Find("GameScene"); //gameScene.transform.Find("Static").gameObject.SetActive(false); //gameScene.transform.Find("Dynamic").gameObject.SetActive(false); - SetObjsRender(false); + if (SceneMgr.Instance.nowSceneId == 4) + { + SetObjsRender(false); + } + else + { + gameScene.transform.Find("Static").gameObject.SetActive(false); + gameScene.transform.Find("Dynamic").gameObject.SetActive(false); + } GameObject SkyBox = GameObject.Find("GameScene/Environment/SkyBox_360Player"); SetGameObjectLayer(SkyBox, false);//修改天空球显示层级为Invisible GameObject tagObj = GameObject.Find("LeaveBoxCollider_" + index+ "/StartPosition"); @@ -176,12 +189,18 @@ public class LeavePlayPrefabControll : MonoBehaviour Debug.Log("到位置了还原回来"); GameDataManage.Instance.isShowLeaveOn = false; RenderSettings.fog = true; - // GameObject gameScene = GameObject.Find("GameScene"); + GameObject gameScene = GameObject.Find("GameScene"); if (GameDataManage.Instance.isNeedShowAnyBuyOffline) { - //gameScene.transform.Find("Static").gameObject.SetActive(true); - //gameScene.transform.Find("Dynamic").gameObject.SetActive(true); - SetObjsRender(true); + if (SceneMgr.Instance.nowSceneId==4) + { + SetObjsRender(true); + } + else + { + gameScene.transform.Find("Static").gameObject.SetActive(true); + gameScene.transform.Find("Dynamic").gameObject.SetActive(true); + } } GameObject SkyBox = GameObject.Find("GameScene/Environment/SkyBox_360Player"); SetGameObjectLayer(SkyBox, true);//恢复天空球显示层级为Default diff --git a/Assets/代码/资源下载/UploadInfoToWeb.cs b/Assets/代码/资源下载/UploadInfoToWeb.cs index 26d4f482..04100eac 100644 --- a/Assets/代码/资源下载/UploadInfoToWeb.cs +++ b/Assets/代码/资源下载/UploadInfoToWeb.cs @@ -34,7 +34,7 @@ public class UploadInfoToWeb : MonoBehaviour begin_at = DateTime.Now; dateTime = DateTime.Now.AddSeconds(-10); - //StartCoroutine(check()); + StartCoroutine(check()); InvokeRepeating("UploadEQ", 1f, 60f); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c7e99167..f7fc734e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,8 +141,6 @@ PlayerSettings: bundleVersion: 1.0 preloadedAssets: - {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2} - - {fileID: -1506098009177567215, guid: f2f89e34580da664ea7627784c93a3d6, type: 2} - - {fileID: 11400000, guid: 846a6119e15216d4fbad905eb21e4169, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1