diff --git a/Assets/StreamingAssets/Audios/NiuTips/N0111.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/N0111.mp3.meta deleted file mode 100644 index 5d5f18f..0000000 --- a/Assets/StreamingAssets/Audios/NiuTips/N0111.mp3.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0f3e731a957f712428817ba8d9b4d227 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Audios/NiuTips/N0107.mp3 b/Assets/StreamingAssets/Audios/NiuTips/N107.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/N0107.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/N107.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/N0107.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/N107.mp3.meta similarity index 74% rename from Assets/StreamingAssets/Audios/NiuTips/N0107.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/N107.mp3.meta index 66b83fd..a881622 100644 --- a/Assets/StreamingAssets/Audios/NiuTips/N0107.mp3.meta +++ b/Assets/StreamingAssets/Audios/NiuTips/N107.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c707a1fe8694ff5448749d4a89430a74 +guid: 19b153f675249184a8188420636e2db7 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/Audios/NiuTips/N0108.mp3 b/Assets/StreamingAssets/Audios/NiuTips/N108.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/N0108.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/N108.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/N0108.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/N108.mp3.meta similarity index 74% rename from Assets/StreamingAssets/Audios/NiuTips/N0108.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/N108.mp3.meta index 8dd4461..c239409 100644 --- a/Assets/StreamingAssets/Audios/NiuTips/N0108.mp3.meta +++ b/Assets/StreamingAssets/Audios/NiuTips/N108.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bb8e00a47177bdd4f9d5b6955a8b0ecc +guid: 97f763aee8c9487429c3315403909493 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/Audios/NiuTips/N0109.mp3 b/Assets/StreamingAssets/Audios/NiuTips/N109.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/N0109.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/N109.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/N0109.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/N109.mp3.meta similarity index 74% rename from Assets/StreamingAssets/Audios/NiuTips/N0109.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/N109.mp3.meta index 06ec74c..7ccfc64 100644 --- a/Assets/StreamingAssets/Audios/NiuTips/N0109.mp3.meta +++ b/Assets/StreamingAssets/Audios/NiuTips/N109.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eca563800e2c75642a83656f1b9e2b62 +guid: 7acf7e598b002fc4d966d91a622e244e DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/Audios/NiuTips/N0110.mp3 b/Assets/StreamingAssets/Audios/NiuTips/N110.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/N0110.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/N110.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/N0110.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/N110.mp3.meta similarity index 74% rename from Assets/StreamingAssets/Audios/NiuTips/N0110.mp3.meta rename to Assets/StreamingAssets/Audios/NiuTips/N110.mp3.meta index a432c05..41808a7 100644 --- a/Assets/StreamingAssets/Audios/NiuTips/N0110.mp3.meta +++ b/Assets/StreamingAssets/Audios/NiuTips/N110.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 27796b68819031644b35b763681fb4c6 +guid: 36df00c6412b44b46b4a1249aacaefdc DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/Audios/NiuTips/N0111.mp3 b/Assets/StreamingAssets/Audios/NiuTips/N111.mp3 similarity index 100% rename from Assets/StreamingAssets/Audios/NiuTips/N0111.mp3 rename to Assets/StreamingAssets/Audios/NiuTips/N111.mp3 diff --git a/Assets/StreamingAssets/Audios/NiuTips/N111.mp3.meta b/Assets/StreamingAssets/Audios/NiuTips/N111.mp3.meta new file mode 100644 index 0000000..32daf3b --- /dev/null +++ b/Assets/StreamingAssets/Audios/NiuTips/N111.mp3.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 976f80d2244e12441ac9081570ad2166 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scripts/Application/UI/OperationStepPanel.cs b/Assets/_Scripts/Application/UI/OperationStepPanel.cs index df19e7f..c725e5e 100644 --- a/Assets/_Scripts/Application/UI/OperationStepPanel.cs +++ b/Assets/_Scripts/Application/UI/OperationStepPanel.cs @@ -301,6 +301,11 @@ namespace ZXK.LouDiXvMuNiu { WordTip(obj); } + _nextBtn.GetComponent().anchoredPosition = new Vector2(890.0f, 966.0f); + } + else if(GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.TaskName == ConstCtrl.TaskName_OperationPlan) + { + WordTip(obj); } @@ -689,8 +694,8 @@ namespace ZXK.LouDiXvMuNiu private void WordTip(NiuData obj) { - if (obj.TaskType.Equals(ConstCtrl.TASKTYPE_Anim)) - { + // if (obj.TaskType.Equals(ConstCtrl.TASKTYPE_Anim)) + // { if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState")) { if (string.IsNullOrEmpty(obj.ProcessDescription)) @@ -713,8 +718,7 @@ namespace ZXK.LouDiXvMuNiu PopUpMng.PopToast(obj.ExamTip, -1, UIGroup.Tip); } } - _nextBtn.GetComponent().anchoredPosition = new Vector2(890.0f, 966.0f); - } + // } } diff --git a/Assets/_Scripts/Application/UI/ShowToastUIPrefab.cs b/Assets/_Scripts/Application/UI/ShowToastUIPrefab.cs index 0697c6d..e66a66e 100644 --- a/Assets/_Scripts/Application/UI/ShowToastUIPrefab.cs +++ b/Assets/_Scripts/Application/UI/ShowToastUIPrefab.cs @@ -39,8 +39,15 @@ namespace CG.UTility { if (clip) { - GetComponent().clip = clip; - GetComponent().Play(); + if (!gameObject.TryGetComponent(out AudioSource audioSource)) + { + audioSource = gameObject.AddComponent(); + } + if (audioSource != null) + { + GetComponent().clip = clip; + GetComponent().Play(); + } } }); }