diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 5c325a1..ec73f91 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -9705,7 +9705,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 diff --git a/Assets/Scripts/Map/MapManager.Camera.cs b/Assets/Scripts/Map/MapManager.Camera.cs index 913c335..f2a1731 100644 --- a/Assets/Scripts/Map/MapManager.Camera.cs +++ b/Assets/Scripts/Map/MapManager.Camera.cs @@ -38,7 +38,7 @@ public partial class MapManager : MonoBehaviour } } - private void ReseCamera(float x, float y) + public void ReseCamera(float x, float y) { Camera.main.transform.position = new Vector3(x / 2, y / 2, -10); Camera.main.orthographicSize = 5; diff --git a/Assets/Scripts/Map/MapManager.Cell.cs b/Assets/Scripts/Map/MapManager.Cell.cs index b211a63..dc361e8 100644 --- a/Assets/Scripts/Map/MapManager.Cell.cs +++ b/Assets/Scripts/Map/MapManager.Cell.cs @@ -17,7 +17,6 @@ public partial class MapManager : MonoBehaviour PathNodeCell, //路点 NpcPath, //npc巡逻路径 MonsterPath, //怪物巡逻路径 - //SafeArea, //安全区 AudioTrigger, //音效触发 TriggerCell, //触发点 ReliveCell, //复活点 diff --git a/Assets/Scripts/Map/MapManager.Region.cs b/Assets/Scripts/Map/MapManager.Region.cs index 4828306..b7e4390 100644 --- a/Assets/Scripts/Map/MapManager.Region.cs +++ b/Assets/Scripts/Map/MapManager.Region.cs @@ -108,28 +108,7 @@ public partial class MapManager : MonoBehaviour UIWindow.Instance.ShowMessage($"没有扫描到当前地图 [{_curOpenMapId}]"); return; } - _curMapRegions?.SaveXML(mapId); - //MapRegions mapRegions = new MapRegions(); - //mapRegions.regionRowNum = curMap.maxRow; - //mapRegions.regionColNum = curMap.maxCol; - //mapRegions.regionWidth = PicMapPixel; - //mapRegions.regionHeight = PicMapPixel; - //mapRegions.cellWidthPixel = widthPixel; - //mapRegions.cellHeightPixel = heightPixel; - //mapRegions.regions = new Region[mapRegions.regionRowNum, mapRegions.regionColNum]; - //for (int row = 0; row < mapRegions.regionRowNum; row++) - //{ - // for (int col = 0; col < mapRegions.regionColNum; col++) - // { - // mapRegions.regions[row, col] = new Region(); - // mapRegions.regions[row, col].indexX = row; - // mapRegions.regions[row, col].indexY = col; - // int ldx = mapRegions.regionRowNum - row; - // int ldy = col + 1; - // mapRegions.regions[row, col].regionName = $"v{mapId}_r{ldx}_c{ldy}"; // 构造文件名,v1000_r1_c1.jpg - // } - //} - //mapRegions.SaveXML(mapId); + _curMapRegions?.SaveXML(mapId); } public void LoadMapRegionSprites(int mapId) @@ -150,7 +129,7 @@ public partial class MapManager : MonoBehaviour _curMapRegions.cellWidthPixel = widthPixel; _curMapRegions.cellHeightPixel = heightPixel; _curMapRegions.regions = new Region[mapRownum, mapColumn]; - float jpgscenew = PicMapPixel / 100; + float jpgscenew = PicMapPixel / 100.0f; for (int row = 0; row < mapRownum; row++) { for (int col = 0; col < mapColumn; col++) @@ -173,8 +152,6 @@ public partial class MapManager : MonoBehaviour } } MapManager.Instance.ReseCamera(jpgscenew * mapColumn, jpgscenew * mapRownum); - UICellInfo.Instance.ShowMapCellInfo(); - } public void ClearMapRegions() { diff --git a/Assets/Scripts/UI/UIMapPanel.cs b/Assets/Scripts/UI/UIMapPanel.cs index 62ac1eb..31db909 100644 --- a/Assets/Scripts/UI/UIMapPanel.cs +++ b/Assets/Scripts/UI/UIMapPanel.cs @@ -115,22 +115,21 @@ public class UIMapPanel : MonoBehaviour } int mapId = Convert.ToInt32(dropMap.options[dropMap.value].text); _curOpenMapId = mapId; + UIWindow.Instance.uiEditMapConfig.LoadMapConfig(mapId); MapManager.Instance.LoadMapRegionSprites(_curOpenMapId); MapManager.Instance.LoadMapObs(_curOpenMapId); - //UIWindow.Instance.uiCellInfo.ShowCells(); - //UIWindow.Instance.uiEditMapConfig.LoadMapConfig(mapId); - //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); + 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(); - } + } + UICellInfo.Instance.ShowMapCellInfo(); } public void CloseMap() @@ -160,15 +159,14 @@ public class UIMapPanel : MonoBehaviour _saving = true; Debug.Log("正在保存所有数据..."); MapManager.Instance.SaveRegionXML(); - //UIWindow.Instance.uiCreateMap.SaveRegions(); - //UIWindow.Instance.uiCellEditor.SaveCells(); - //UIWindow.Instance.uiEditMapConfig.SaveMapConfig(); - //UIWindow.Instance.uiMonstersPanel.SaveMonsterConfig(); - //UIWindow.Instance.uiNpcsPanel.SaveNpcsConfig(); - //UIWindow.Instance.uiTriggersPanel.SaveTriggersConfig(); - //UIWindow.Instance.uiJuBaosPanel.SaveJuBaoConfig(); - //UIWindow.Instance.uiFuBensPanel.SaveFuBenConfig(); - //UIWindow.Instance.ShowMessage("保存成功"); + MapManager.Instance.SaveMapObs(); + UIWindow.Instance.uiEditMapConfig.SaveMapConfig(); + UIWindow.Instance.uiMonstersPanel.SaveMonsterConfig(); + UIWindow.Instance.uiNpcsPanel.SaveNpcsConfig(); + UIWindow.Instance.uiTriggersPanel.SaveTriggersConfig(); + UIWindow.Instance.uiJuBaosPanel.SaveJuBaoConfig(); + UIWindow.Instance.uiFuBensPanel.SaveFuBenConfig(); + UIWindow.Instance.ShowMessage("保存成功"); _saving = false; } }