diff --git a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity index f2a2cb14..73d25a30 100644 --- a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity +++ b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity @@ -212,6 +212,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &454864855 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1986279549150508378, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + m_PrefabInstance: {fileID: 1986279549016710772} + m_PrefabAsset: {fileID: 0} --- !u!114 &852064453 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8544101838369953974, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} @@ -445,6 +450,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2138670361 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1986279548236674885, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + m_PrefabInstance: {fileID: 1986279549016710772} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1986279549016710772 PrefabInstance: m_ObjectHideFlags: 0 @@ -484,6 +494,14 @@ PrefabInstance: propertyPath: NPCName value: objectReference: {fileID: 198436690} + - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: FreePanel + value: + objectReference: {fileID: 454864855} + - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: Close1Panel + value: + objectReference: {fileID: 2138670361} - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: Situation_Tip_1 value: @@ -802,6 +820,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1986279549150508378, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_Pivot.x value: 0 diff --git a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs index 092addf3..3efba79c 100644 --- a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs +++ b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs @@ -161,6 +161,8 @@ public class ZZUIManager : MonoBehaviour //两个叉叉 public Button Close1; public Button Close2; + public GameObject Close1Panel; + public GameObject FreePanel; /// /// 楼梯口 @@ -340,6 +342,7 @@ public class ZZUIManager : MonoBehaviour } private void Start() { + Frist(); initialized(); //动画位移位置数据 @@ -430,6 +433,7 @@ public class ZZUIManager : MonoBehaviour Flee.onClick.AddListener(() => { DiaLogBox2.SetActive(true); + Close1Panel.SetActive(true); }); Close1.onClick.AddListener(() => { Close(); }); @@ -550,7 +554,16 @@ public class ZZUIManager : MonoBehaviour yield return new WaitForSeconds(0.3f); } } + /// + /// 第一次弹出楼梯队形 + /// + public void Frist() + { + DiaLogBox2?.SetActive(true); + Close1Panel.SetActive(false); + FreePanel.SetActive(true); + } /// /// 创建疏散情况内容 diff --git a/xiaofang/Assets/UnityCommon b/xiaofang/Assets/UnityCommon index 2e42b278..0385375c 160000 --- a/xiaofang/Assets/UnityCommon +++ b/xiaofang/Assets/UnityCommon @@ -1 +1 @@ -Subproject commit 2e42b278d4c6ac9e045925dcc6e04896a19cbfd8 +Subproject commit 0385375c1818fc57f42407a6c5301a26ded3a19a