Compare commits
No commits in common. "3a3ff0429a13df0af2a478e1457cae7ef805b0b0" and "8216fd8b4bebcc0d95d0d5429f14782795bd4ce7" have entirely different histories.
3a3ff0429a
...
8216fd8b4b
@ -212,11 +212,6 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
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
|
--- !u!114 &852064453 stripped
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_CorrespondingSourceObject: {fileID: 8544101838369953974, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
|
m_CorrespondingSourceObject: {fileID: 8544101838369953974, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
|
||||||
@ -450,11 +445,6 @@ Transform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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
|
--- !u!1001 &1986279549016710772
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -494,14 +484,6 @@ PrefabInstance:
|
|||||||
propertyPath: NPCName
|
propertyPath: NPCName
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 198436690}
|
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}
|
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
|
||||||
propertyPath: Situation_Tip_1
|
propertyPath: Situation_Tip_1
|
||||||
value:
|
value:
|
||||||
@ -820,10 +802,6 @@ PrefabInstance:
|
|||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
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}
|
- target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
|
||||||
propertyPath: m_Pivot.x
|
propertyPath: m_Pivot.x
|
||||||
value: 0
|
value: 0
|
||||||
|
@ -161,8 +161,6 @@ public class ZZUIManager : MonoBehaviour
|
|||||||
//两个叉叉
|
//两个叉叉
|
||||||
public Button Close1;
|
public Button Close1;
|
||||||
public Button Close2;
|
public Button Close2;
|
||||||
public GameObject Close1Panel;
|
|
||||||
public GameObject FreePanel;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 楼梯口
|
/// 楼梯口
|
||||||
@ -342,7 +340,6 @@ public class ZZUIManager : MonoBehaviour
|
|||||||
}
|
}
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
Frist();
|
|
||||||
initialized();
|
initialized();
|
||||||
|
|
||||||
//动画位移位置数据
|
//动画位移位置数据
|
||||||
@ -433,7 +430,6 @@ public class ZZUIManager : MonoBehaviour
|
|||||||
Flee.onClick.AddListener(() =>
|
Flee.onClick.AddListener(() =>
|
||||||
{
|
{
|
||||||
DiaLogBox2.SetActive(true);
|
DiaLogBox2.SetActive(true);
|
||||||
Close1Panel.SetActive(true);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Close1.onClick.AddListener(() => { Close(); });
|
Close1.onClick.AddListener(() => { Close(); });
|
||||||
@ -554,16 +550,7 @@ public class ZZUIManager : MonoBehaviour
|
|||||||
yield return new WaitForSeconds(0.3f);
|
yield return new WaitForSeconds(0.3f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// <summary>
|
|
||||||
/// 第一次弹出楼梯队形
|
|
||||||
/// </summary>
|
|
||||||
public void Frist()
|
|
||||||
{
|
|
||||||
DiaLogBox2?.SetActive(true);
|
|
||||||
Close1Panel.SetActive(false);
|
|
||||||
|
|
||||||
FreePanel.SetActive(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 创建疏散情况内容
|
/// 创建疏散情况内容
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 0385375c1818fc57f42407a6c5301a26ded3a19a
|
Subproject commit 2e42b278d4c6ac9e045925dcc6e04896a19cbfd8
|
Loading…
Reference in New Issue
Block a user