diff --git a/Assets/Res/Models/Environments/Intro/Materials/Pillar_Rad.mat b/Assets/Res/Models/Environments/Intro/Materials/Pillar_Rad.mat index eecaad3c..434d5805 100644 --- a/Assets/Res/Models/Environments/Intro/Materials/Pillar_Rad.mat +++ b/Assets/Res/Models/Environments/Intro/Materials/Pillar_Rad.mat @@ -16,7 +16,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3005 + m_CustomRenderQueue: 2005 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: _AlphaTex diff --git a/Assets/Res/Models/Environments/Intro/Materials/Pillar_White.mat b/Assets/Res/Models/Environments/Intro/Materials/Pillar_White.mat index 4586dec7..18db8fcc 100644 --- a/Assets/Res/Models/Environments/Intro/Materials/Pillar_White.mat +++ b/Assets/Res/Models/Environments/Intro/Materials/Pillar_White.mat @@ -16,7 +16,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3005 + m_CustomRenderQueue: 2005 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: _AlphaTex diff --git a/Assets/Scripts/Scene_02/RayCtr.cs b/Assets/Scripts/Scene_02/RayCtr.cs index e18e11d9..dc56a11a 100644 --- a/Assets/Scripts/Scene_02/RayCtr.cs +++ b/Assets/Scripts/Scene_02/RayCtr.cs @@ -10,7 +10,6 @@ public class RayCtr : MonoBehaviour public bool starRay = false; //是否开始射线 public LayerMask detectionLayer ; //检测的层级 public int myhandType; //自己手的类型1:左 2:右 - public bool isstarRay = false; //计时相关 @@ -29,8 +28,6 @@ public class RayCtr : MonoBehaviour void Start() { GlobalEventMgr.Listen(GameEvent.EventRayStart, GameDataManage_EventRayStart); - GlobalEventMgr.Listen(GameEvent.EventRayEnd, GameDataManage_EventRayEnd); - GlobalEventMgr.Listen(GameEvent.EventRayEnd, GameDataManage_EventRayEnd2); //// 创建LineRenderer组件 //lineRenderer = gameObject.AddComponent(); @@ -69,7 +66,6 @@ public class RayCtr : MonoBehaviour void Update() { //UpdateVisualRay(); //显示射线 - if (!isstarRay) { return; } // 在场景视图中绘制射线(仅用于调试) if (!SceneMgr.Instance.isTrigger) { @@ -122,12 +118,5 @@ public class RayCtr : MonoBehaviour runTime = 0; } } - void GameDataManage_EventRayEnd(int type) - { - isstarRay = true; - } - void GameDataManage_EventRayEnd2(int type) - { - isstarRay = false; - } + } diff --git a/Assets/Scripts/Scene_04/PlayJiaGuAnimator.cs b/Assets/Scripts/Scene_04/PlayJiaGuAnimator.cs index d14c140a..15cdbc05 100644 --- a/Assets/Scripts/Scene_04/PlayJiaGuAnimator.cs +++ b/Assets/Scripts/Scene_04/PlayJiaGuAnimator.cs @@ -56,8 +56,7 @@ public class PlayJiaGuAnimator : MonoBehaviour { for (int i = 0; i < childAnimator.Count; i++) { - Destroy(childAnimator[i]); - childAnimator[i] = null; + childAnimator[i].transform.localScale = Vector3.zero; } } private void OnTriggerEnter(Collider other) diff --git a/Assets/Scripts/Scene_05/SingleTouchPlayAnimator.cs b/Assets/Scripts/Scene_05/SingleTouchPlayAnimator.cs index 47d78eec..3467648a 100644 --- a/Assets/Scripts/Scene_05/SingleTouchPlayAnimator.cs +++ b/Assets/Scripts/Scene_05/SingleTouchPlayAnimator.cs @@ -62,13 +62,13 @@ public class SingleTouchPlayAnimator : MonoBehaviour SetTriggerParameter("DisTrigger"); if (Vfx != null) { - Destroy(Vfx); - Vfx = null; + + + Vfx.transform.localScale = Vector3.zero; } if (Vfx1 != null) { - Destroy(Vfx1); - Vfx1 = null; + Vfx1.transform.localScale = Vector3.zero; } animator.Play("Touch"); animatorpig.Play("Touch"); diff --git a/Assets/Scripts/Scene_05/TouchPlayAnimatior.cs b/Assets/Scripts/Scene_05/TouchPlayAnimatior.cs index abbcce4d..eec2aca2 100644 --- a/Assets/Scripts/Scene_05/TouchPlayAnimatior.cs +++ b/Assets/Scripts/Scene_05/TouchPlayAnimatior.cs @@ -74,14 +74,13 @@ public class TouchPlayAnimatior : MonoBehaviour } } [Header("锟斤拷锟斤拷锟斤拷锟斤拷")] - [SerializeField] private Object childAnimator; // 直锟斤拷锟较讹拷锟斤拷 + [SerializeField] private GameObject childAnimator; // 直锟斤拷锟较讹拷锟斤拷 public void SetTriggerParameter(string parameterName) { if (childAnimator != null) { - Destroy(childAnimator); - childAnimator = null; + childAnimator.transform.localScale = Vector3.zero; } } void ShowFont() 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