Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
This commit is contained in:
commit
5101cb63bd
@ -444,7 +444,7 @@ public class ZZUIManager : MonoBehaviour
|
||||
if (Warn_Tip.activeSelf && (Input.GetMouseButtonDown(0) || Input.GetMouseButtonDown(1) || Input.GetMouseButtonDown(2)))
|
||||
{
|
||||
Warn_Tip.SetActive(false);
|
||||
|
||||
DiaLogBox.gameObject.SetActive(true);
|
||||
////
|
||||
//foreach (var npcDict in NPCController.instance.npcsList)
|
||||
//{
|
||||
@ -531,6 +531,7 @@ public class ZZUIManager : MonoBehaviour
|
||||
Debug.LogError(NPCdian[i]);
|
||||
}
|
||||
DiaLogBox.SetActive(false);
|
||||
DiaLogBox2.SetActive(true);
|
||||
}
|
||||
});
|
||||
//ÌݶÓÑ¡Ôñ¶ÓÐÎ
|
||||
@ -940,7 +941,7 @@ public class ZZUIManager : MonoBehaviour
|
||||
Command02.SetActive(false);
|
||||
isEnd = false;
|
||||
StopCoroutine(Flicker());
|
||||
DiaLogBox.gameObject.SetActive(true);
|
||||
Warn_Tip.gameObject.SetActive(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user