JiNan/loudixvmuniu
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化胚胎选择

Browse Source
This commit is contained in:
“CongG” 2025-01-03 08:42:56 +08:00
parent 72e99cb143
commit 6a99eb370a
5 changed files with 1078 additions and 1522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/TimeLine/PTXZTimeLineCtrl.playable
View File

@ -1216,7 +1216,7 @@ MonoBehaviour:
m_Start: 8 m_Start: 8
m_ClipIn: 0 m_ClipIn: 0
m_Asset: {fileID: 1254238980418159717} m_Asset: {fileID: 1254238980418159717}
m_Duration: 1 m_Duration: 1.0166666666666675
m_TimeScale: 1 m_TimeScale: 1
m_ParentTrack: {fileID: 15467939957697792} m_ParentTrack: {fileID: 15467939957697792}
m_EaseInDuration: 0 m_EaseInDuration: 0

2583
Assets/_Scenes/TrainExam.unity
View File

File diff suppressed because one or more lines are too long

5
Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs
View File

@ -137,15 +137,12 @@ namespace ZXK.LouDiXvMuNiu
{ {
ClickToolCallInTrainState(rayHit.transform.gameObject, () => ClickToolCallInTrainState(rayHit.transform.gameObject, () =>
{ {
GameObject videoGeo = UI_Manage.Instance.ShowPanel("VideoShowPanel", Type.GetType("ZXK.LouDiXvMuNiu.VideoShowPanel"), UIGroup.Tip); GameObject videoGeo = UI_Manage.Instance.ShowPanel("VideoShowNoCtrlPanel", Type.GetType("ZXK.LouDiXvMuNiu.VideoShowPanel"), UIGroup.Tip);
videoGeo.GetComponent<VideoShowPanel>().PlayVideoClip(_CurSceneStep.VideoPath, () => videoGeo.GetComponent<VideoShowPanel>().PlayVideoClip(_CurSceneStep.VideoPath, () =>
{ {
GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep(); GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep();
}); });
}); });
if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState"))
{
}
} }
} }

9
Assets/_Scripts/Application/UI/OperationStepPanel.cs
View File

@ -231,6 +231,11 @@ namespace ZXK.LouDiXvMuNiu
if (obj.TaskName != GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.TaskName) if (obj.TaskName != GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.TaskName)
{//前后任务名字不同 {//前后任务名字不同
NiuSceneMng._Instance.InitPlayAnmState(obj, GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue); NiuSceneMng._Instance.InitPlayAnmState(obj, GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue);
if (obj.TaskName == ConstCtrl.TaskName_ActualOperation
&& GameManager.Instance._CurModelType == ConstCtrl.ModuleName_CP)
{
NiuSceneMng._Instance.UseToolsActive(false);
}
} }
if(obj.ThreeTaskName != GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.ThreeTaskName) if(obj.ThreeTaskName != GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.ThreeTaskName)
{//前后三级人物名字不同 {//前后三级人物名字不同
@ -370,7 +375,7 @@ namespace ZXK.LouDiXvMuNiu
} }
else if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState")) else if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState"))
{ {
GameObject videoGeo = UI_Manage.Instance.ShowPanel("VideoShowPanel", Type.GetType("ZXK.LouDiXvMuNiu.VideoShowPanel"), UIGroup.Tip); GameObject videoGeo = UI_Manage.Instance.ShowPanel("VideoShowNoCtrlPanel", Type.GetType("ZXK.LouDiXvMuNiu.VideoShowPanel"), UIGroup.Tip);
videoGeo.GetComponent<VideoShowPanel>().PlayVideoClip(obj.VideoPath, () => videoGeo.GetComponent<VideoShowPanel>().PlayVideoClip(obj.VideoPath, () =>
{ {
GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep(obj.QNextNum); GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep(obj.QNextNum);
@ -379,7 +384,7 @@ namespace ZXK.LouDiXvMuNiu
} }
if (obj.TaskType.Equals(ConstCtrl.TASKTYPE_VideoAuto)) if (obj.TaskType.Equals(ConstCtrl.TASKTYPE_VideoAuto))
{ {
GameObject videoGeo = UI_Manage.Instance.ShowPanel("VideoShowPanel", Type.GetType("ZXK.LouDiXvMuNiu.VideoShowPanel"), UIGroup.Tip); GameObject videoGeo = UI_Manage.Instance.ShowPanel("VideoShowNoCtrlPanel", Type.GetType("ZXK.LouDiXvMuNiu.VideoShowPanel"), UIGroup.Tip);
videoGeo.GetComponent<VideoShowPanel>().PlayVideoClip(obj.VideoPath, () => videoGeo.GetComponent<VideoShowPanel>().PlayVideoClip(obj.VideoPath, () =>
{ {
GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep(); GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep();

1
Assets/_Scripts/Application/UI/VideoShowPanel.cs
View File

@ -22,6 +22,7 @@ namespace ZXK.LouDiXvMuNiu
{ {
_exitEvent?.Invoke(); _exitEvent?.Invoke();
UI_Manage.Instance.ClosePanel("VideoShowPanel"); UI_Manage.Instance.ClosePanel("VideoShowPanel");
UI_Manage.Instance.ClosePanel("VideoShowNoCtrlPanel");
}); });
} }