修改无提示文本问题
修改声音不对问题
This commit is contained in:
parent
89e6ad056d
commit
dbba0ea0f0
@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 0f3e731a957f712428817ba8d9b4d227
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: c707a1fe8694ff5448749d4a89430a74
|
guid: 19b153f675249184a8188420636e2db7
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: bb8e00a47177bdd4f9d5b6955a8b0ecc
|
guid: 97f763aee8c9487429c3315403909493
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: eca563800e2c75642a83656f1b9e2b62
|
guid: 7acf7e598b002fc4d966d91a622e244e
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 27796b68819031644b35b763681fb4c6
|
guid: 36df00c6412b44b46b4a1249aacaefdc
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
7
Assets/StreamingAssets/Audios/NiuTips/N111.mp3.meta
Normal file
7
Assets/StreamingAssets/Audios/NiuTips/N111.mp3.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 976f80d2244e12441ac9081570ad2166
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -301,6 +301,11 @@ namespace ZXK.LouDiXvMuNiu
|
|||||||
{
|
{
|
||||||
WordTip(obj);
|
WordTip(obj);
|
||||||
}
|
}
|
||||||
|
_nextBtn.GetComponent<RectTransform>().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)
|
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 (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState"))
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(obj.ProcessDescription))
|
if (string.IsNullOrEmpty(obj.ProcessDescription))
|
||||||
@ -713,8 +718,7 @@ namespace ZXK.LouDiXvMuNiu
|
|||||||
PopUpMng.PopToast(obj.ExamTip, -1, UIGroup.Tip);
|
PopUpMng.PopToast(obj.ExamTip, -1, UIGroup.Tip);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_nextBtn.GetComponent<RectTransform>().anchoredPosition = new Vector2(890.0f, 966.0f);
|
// }
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -39,8 +39,15 @@ namespace CG.UTility
|
|||||||
{
|
{
|
||||||
if (clip)
|
if (clip)
|
||||||
{
|
{
|
||||||
GetComponent<AudioSource>().clip = clip;
|
if (!gameObject.TryGetComponent(out AudioSource audioSource))
|
||||||
GetComponent<AudioSource>().Play();
|
{
|
||||||
|
audioSource = gameObject.AddComponent<AudioSource>();
|
||||||
|
}
|
||||||
|
if (audioSource != null)
|
||||||
|
{
|
||||||
|
GetComponent<AudioSource>().clip = clip;
|
||||||
|
GetComponent<AudioSource>().Play();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user