OracleStudio/PrinceOfGlory
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
kridoo
2025-11-17 17:25:11 +08:00
parent 83eeb61088
commit 6bcbc56c2d
7 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Res/Models/Environments/Intro/Materials/Pillar_Rad.mat
View File

@@ -16,7 +16,7 @@ Material:
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: 3005 m_CustomRenderQueue: 2005
stringTagMap: {} stringTagMap: {}
disabledShaderPasses: [] disabledShaderPasses: []
m_LockedProperties: _AlphaTex m_LockedProperties: _AlphaTex

2
Assets/Res/Models/Environments/Intro/Materials/Pillar_White.mat
View File

@@ -16,7 +16,7 @@ Material:
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: 3005 m_CustomRenderQueue: 2005
stringTagMap: {} stringTagMap: {}
disabledShaderPasses: [] disabledShaderPasses: []
m_LockedProperties: _AlphaTex m_LockedProperties: _AlphaTex

13
Assets/Scripts/Scene_02/RayCtr.cs
View File

@@ -10,7 +10,6 @@ public class RayCtr : MonoBehaviour
public bool starRay = false; //<2F>Ƿ<EFBFBD><C7B7><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD> public bool starRay = false; //<2F>Ƿ<EFBFBD><C7B7><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
public LayerMask detectionLayer ; //<2F><><EFBFBD><EFBFBD><EFBFBD>IJ㼶 public LayerMask detectionLayer ; //<2F><><EFBFBD><EFBFBD><EFBFBD>IJ㼶
public int myhandType; //<2F>Լ<EFBFBD><D4BC>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD>1<EFBFBD><31><EFBFBD><EFBFBD> 2<><32><EFBFBD><EFBFBD> public int myhandType; //<2F>Լ<EFBFBD><D4BC>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD>1<EFBFBD><31><EFBFBD><EFBFBD> 2<><32><EFBFBD><EFBFBD>
public bool isstarRay = false;
//<2F><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD> //<2F><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>
@@ -29,8 +28,6 @@ public class RayCtr : MonoBehaviour
void Start() void Start()
{ {
GlobalEventMgr.Listen<int>(GameEvent.EventRayStart, GameDataManage_EventRayStart); GlobalEventMgr.Listen<int>(GameEvent.EventRayStart, GameDataManage_EventRayStart);
GlobalEventMgr.Listen<int>(GameEvent.EventRayEnd, GameDataManage_EventRayEnd);
GlobalEventMgr.Listen<int>(GameEvent.EventRayEnd, GameDataManage_EventRayEnd2);
//// <20><><EFBFBD><EFBFBD>LineRenderer<65><72><EFBFBD><EFBFBD> //// <20><><EFBFBD><EFBFBD>LineRenderer<65><72><EFBFBD><EFBFBD>
//lineRenderer = gameObject.AddComponent<LineRenderer>(); //lineRenderer = gameObject.AddComponent<LineRenderer>();
@@ -69,7 +66,6 @@ public class RayCtr : MonoBehaviour
void Update() void Update()
{ {
//UpdateVisualRay(); //<2F><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD> //UpdateVisualRay(); //<2F><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>
if (!isstarRay) { return; }
// <20>ڳ<EFBFBD><DAB3><EFBFBD><EFBFBD><EFBFBD>ͼ<EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߣ<EFBFBD><DFA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD><DAB5>ԣ<EFBFBD> // <20>ڳ<EFBFBD><DAB3><EFBFBD><EFBFBD><EFBFBD>ͼ<EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߣ<EFBFBD><DFA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD><DAB5>ԣ<EFBFBD>
if (!SceneMgr.Instance.isTrigger) if (!SceneMgr.Instance.isTrigger)
{ {
@@ -122,12 +118,5 @@ public class RayCtr : MonoBehaviour
runTime = 0; runTime = 0;
} }
} }
void GameDataManage_EventRayEnd(int type)
{
isstarRay = true;
}
void GameDataManage_EventRayEnd2(int type)
{
isstarRay = false;
}
} }

3
Assets/Scripts/Scene_04/PlayJiaGuAnimator.cs
View File

@@ -56,8 +56,7 @@ public class PlayJiaGuAnimator : MonoBehaviour
{ {
for (int i = 0; i < childAnimator.Count; i++) for (int i = 0; i < childAnimator.Count; i++)
{ {
Destroy(childAnimator[i]); childAnimator[i].transform.localScale = Vector3.zero;
childAnimator[i] = null;
} }
} }
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)

8
Assets/Scripts/Scene_05/SingleTouchPlayAnimator.cs
View File

@@ -62,13 +62,13 @@ public class SingleTouchPlayAnimator : MonoBehaviour
SetTriggerParameter("DisTrigger"); SetTriggerParameter("DisTrigger");
if (Vfx != null) if (Vfx != null)
{ {
Destroy(Vfx);
Vfx = null;
Vfx.transform.localScale = Vector3.zero;
} }
if (Vfx1 != null) if (Vfx1 != null)
{ {
Destroy(Vfx1); Vfx1.transform.localScale = Vector3.zero;
Vfx1 = null;
} }
animator.Play("Touch"); animator.Play("Touch");
animatorpig.Play("Touch"); animatorpig.Play("Touch");

5
Assets/Scripts/Scene_05/TouchPlayAnimatior.cs
View File

@@ -74,14 +74,13 @@ public class TouchPlayAnimatior : MonoBehaviour
} }
} }
[Header("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")] [Header("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")]
[SerializeField] private Object childAnimator; // ֱ<><D6B1><EFBFBD>϶<EFBFBD><CFB6><EFBFBD> [SerializeField] private GameObject childAnimator; // ֱ<><D6B1><EFBFBD>϶<EFBFBD><CFB6><EFBFBD>
public void SetTriggerParameter(string parameterName) public void SetTriggerParameter(string parameterName)
{ {
if (childAnimator != null) if (childAnimator != null)
{ {
Destroy(childAnimator); childAnimator.transform.localScale = Vector3.zero;
childAnimator = null;
} }
} }
void ShowFont() void ShowFont()

2
ProjectSettings/ProjectSettings.asset
View File

@@ -141,8 +141,6 @@ PlayerSettings:
bundleVersion: 1.0 bundleVersion: 1.0
preloadedAssets: preloadedAssets:
- {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2} - {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}
- {fileID: -1506098009177567215, guid: f2f89e34580da664ea7627784c93a3d6, type: 2}
- {fileID: 11400000, guid: 846a6119e15216d4fbad905eb21e4169, type: 2}
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1 m_HolographicPauseOnTrackingLoss: 1