From 23021cb033aaeb597923530223eed46c7ef0dd1d Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 23 五月 2019 18:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/HazyRegion/HazyMapNpcScriptableObject.cs | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/System/HazyRegion/HazyMapNpcScriptableObject.cs b/System/HazyRegion/HazyMapNpcScriptableObject.cs
index 7603e14..2d1c1f4 100644
--- a/System/HazyRegion/HazyMapNpcScriptableObject.cs
+++ b/System/HazyRegion/HazyMapNpcScriptableObject.cs
@@ -7,35 +7,22 @@
#endif
public class HazyMapNpcScriptableObject : ScriptableObject
{
- [SerializeField] NpcInfo[] m_MapNpcInfos;
+ [SerializeField] List<Vector3> m_NpcPositions;
- public NpcInfo[] GetAllNpcInfos()
+ public List<Vector3> GetNpcPositions()
{
- return m_MapNpcInfos;
+ return m_NpcPositions;
}
#if UNITY_EDITOR
public void Save(int index, Vector3 position)
{
- if (m_MapNpcInfos != null && index < m_MapNpcInfos.Length)
+ if (m_NpcPositions != null && index < m_NpcPositions.Count)
{
- m_MapNpcInfos[index] = new NpcInfo()
- {
- npcId = m_MapNpcInfos[index].npcId,
- npcType = m_MapNpcInfos[index].npcType,
- position = position,
- };
+ m_NpcPositions[index] = position;
}
}
#endif
-
- [Serializable]
- public struct NpcInfo
- {
- public int npcId;
- public E_NpcType npcType;
- public Vector3 position;
- }
}
#if UNITY_EDITOR
--
Gitblit v1.8.0