diff --git a/Assets/GameAssets/Maps/1/XML/MapConfig.xml b/Assets/GameAssets/Maps/1/XML/MapConfig.xml index 383a380..eec2889 100644 --- a/Assets/GameAssets/Maps/1/XML/MapConfig.xml +++ b/Assets/GameAssets/Maps/1/XML/MapConfig.xml @@ -1,7 +1,9 @@  - - + + + + diff --git a/Assets/GameAssets/Maps/1/XML/MapRegions.xml b/Assets/GameAssets/Maps/1/XML/MapRegions.xml index 20cdc51..f6caa35 100644 --- a/Assets/GameAssets/Maps/1/XML/MapRegions.xml +++ b/Assets/GameAssets/Maps/1/XML/MapRegions.xml @@ -1,6 +1,6 @@  - + diff --git a/Assets/GameAssets/Maps/1/XML/NpcsConfig.xml b/Assets/GameAssets/Maps/1/XML/NpcsConfig.xml index 764c6ca..2d21681 100644 --- a/Assets/GameAssets/Maps/1/XML/NpcsConfig.xml +++ b/Assets/GameAssets/Maps/1/XML/NpcsConfig.xml @@ -5,19 +5,19 @@ - + - + - + - + diff --git a/Assets/GameAssets/Maps/1/XML/Obs.bytes b/Assets/GameAssets/Maps/1/XML/Obs.bytes index 1f869b0..c91e9e7 100644 Binary files a/Assets/GameAssets/Maps/1/XML/Obs.bytes and b/Assets/GameAssets/Maps/1/XML/Obs.bytes differ diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 81bdc9e..b722850 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -9679,7 +9679,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &496305461 RectTransform: m_ObjectHideFlags: 0 @@ -17052,7 +17052,6 @@ MonoBehaviour: mapPic: {fileID: 1213416635} mapWidth: 0 mapHeight: 0 - _curOpenMapId: 0 mapRegionParent: {fileID: 782149589} mapGridParent: {fileID: 504155531} mapAreaParent: {fileID: 519310460} diff --git a/Assets/Scripts/Map/MapManager.cs b/Assets/Scripts/Map/MapManager.cs index 089679e..bfcbc8f 100644 --- a/Assets/Scripts/Map/MapManager.cs +++ b/Assets/Scripts/Map/MapManager.cs @@ -17,9 +17,9 @@ public partial class MapManager : MonoBehaviour //ͼ public const int CELLSCALE = 100; //ӿ - public const int widthPixel = 64; + public const int widthPixel = 60; //Ӹ - public const int heightPixel = 32; + public const int heightPixel = 40; //ŵͼ public int PicMapPixel => int.Parse(mapPic.text); @@ -55,7 +55,10 @@ public partial class MapManager : MonoBehaviour private int _cellCols; //public CellNode[,] cellNodes; - public int _curOpenMapId; + public int _curOpenMapId { + get; + set; + } private Material _cellMoveMat; private Material _cellObsMat; diff --git a/Assets/Scripts/Map/SceneArea.cs b/Assets/Scripts/Map/SceneArea.cs index ef7fa5a..e94cbda 100644 --- a/Assets/Scripts/Map/SceneArea.cs +++ b/Assets/Scripts/Map/SceneArea.cs @@ -73,6 +73,10 @@ public class SceneArea : MonoBehaviour if (obj == null) return null; GameObject cellObj = GameObject.Instantiate(obj,parentTrans); var area = cellObj.GetComponent(); + if (area == null) + { + Debug.LogError($" {obj.name} ..."); + } area.editCellType = baseItem.editCellType; area.baseItem = baseItem; baseItem.sceneArea = area; diff --git a/Assets/Scripts/UI/UICellInfo.cs b/Assets/Scripts/UI/UICellInfo.cs index 87eab65..f030817 100644 --- a/Assets/Scripts/UI/UICellInfo.cs +++ b/Assets/Scripts/UI/UICellInfo.cs @@ -79,7 +79,7 @@ public class UICellInfo : MonoBehaviour /// public void LoadCell() { - MapManager.Instance.LoadMapObs(UIWindow.Instance.uiMapPanel.CurOpenMapId); + MapManager.Instance.LoadMapObs(MapManager.Instance._curOpenMapId); ShowMapCellInfo(); } /// @@ -91,7 +91,7 @@ public class UICellInfo : MonoBehaviour int height = int.Parse(txtCellCols.text); float cellW = int.Parse(txtCellWidth.text) / 100.0f; float cellH = int.Parse(txtCellHeight.text) / 100.0f; - MapManager.Instance.GenerateMap(UIWindow.Instance.uiMapPanel.CurOpenMapId,width * cellW, height * cellH, cellW, cellH); + MapManager.Instance.GenerateMap(MapManager.Instance._curOpenMapId,width * cellW, height * cellH, cellW, cellH); ShowMapCellInfo(); } public void Update() diff --git a/Assets/Scripts/UI/UIMapPanel.cs b/Assets/Scripts/UI/UIMapPanel.cs index 0f4909b..7d4528d 100644 --- a/Assets/Scripts/UI/UIMapPanel.cs +++ b/Assets/Scripts/UI/UIMapPanel.cs @@ -14,14 +14,11 @@ public class UIMapPanel : MonoBehaviour { public ToggleGroup mapEditorGroup; public Dropdown dropMap; - private int _curOpenMapId; private bool _saving; - public int CurOpenMapId => _curOpenMapId; // Start is called before the first frame update void Start() { _saving = false; - _curOpenMapId = -1; } void OnDataLoaded() @@ -112,26 +109,25 @@ public class UIMapPanel : MonoBehaviour return; } - if(_curOpenMapId > 0) + if(MapManager.Instance._curOpenMapId > 0) { UIWindow.Instance.ShowMessage("ȹرеͼ"); return; } int mapId = Convert.ToInt32(dropMap.options[dropMap.value].text); - _curOpenMapId = mapId; + MapManager.Instance._curOpenMapId = mapId; + MapManager.Instance.LoadMapRegionSprites(mapId); + MapManager.Instance.LoadMapObs(mapId); UIWindow.Instance.uiEditMapConfig.LoadMapConfig(mapId); - MapManager.Instance.LoadMapRegionSprites(_curOpenMapId); - MapManager.Instance.LoadMapObs(_curOpenMapId); UIWindow.Instance.uiMonstersPanel.LoadMonsterConfig(mapId); UIWindow.Instance.uiNpcsPanel.LoadNpcsConfig(mapId); UIWindow.Instance.uiTriggersPanel.LoadTriggersConfig(mapId); UIWindow.Instance.uiFuBensPanel.LoadFuBenConfig(mapId); UIWindow.Instance.uiJuBaosPanel.LoadJuBaoConfig(mapId); - //ûãҪ if (MapManager.Instance.map == null) { - MapManager.Instance.CreateObs(_curOpenMapId); + MapManager.Instance.CreateObs(mapId); } UICellInfo.Instance.ShowMapCellInfo(); } @@ -139,7 +135,7 @@ public class UIMapPanel : MonoBehaviour public void CloseMap() { MapManager.Instance.CloseMap(); - _curOpenMapId = -1; + MapManager.Instance._curOpenMapId = -1; foreach (var toggle in mapEditorGroup.ActiveToggles()) { toggle.isOn = false; diff --git a/Assets/Scripts/UI/UITeleportPanel.cs b/Assets/Scripts/UI/UITeleportPanel.cs index 986ddad..3a282c0 100644 --- a/Assets/Scripts/UI/UITeleportPanel.cs +++ b/Assets/Scripts/UI/UITeleportPanel.cs @@ -54,7 +54,7 @@ public class UITeleportPanel : MonoBehaviour item.txtPos.text = $"{pos.x},{pos.y}"; item.txtNextMapID.text = nextMapId.ToString(); item.txtNextMapPos.text = $"{newMapPos.x},{newMapPos.y}"; - item.editCellType = MapManager.EditCellType.TriggerCell; + item.editCellType = MapManager.EditCellType.TeleportCell; MapManager.Instance.CreateSpecialPoint(pos, item); } diff --git a/Assets/Scripts/Utils/UIMouseOver.cs b/Assets/Scripts/Utils/UIMouseOver.cs index d2bfc41..6a3d1f5 100644 --- a/Assets/Scripts/Utils/UIMouseOver.cs +++ b/Assets/Scripts/Utils/UIMouseOver.cs @@ -25,7 +25,7 @@ public class UIMouseOver : MonoBehaviour, IPointerClickHandler, IPointerEnterHan public void OnPointerEnter(PointerEventData eventData) { - if(UIWindow.Instance.uiMapPanel.CurOpenMapId < 0) + if(MapManager.Instance._curOpenMapId < 0) { UIWindow.Instance.ShowMessage("先打开地图"); return;