This commit is contained in:
2025-06-16 23:59:28 +08:00
parent 60fe962606
commit 1a5115c678
10 changed files with 260 additions and 156 deletions

View File

@@ -229,15 +229,4 @@ public class UICellEditor : MonoBehaviour
{
MapManager.Instance.CleanSafe();
}
public void SaveCells()
{
if (!UIWindow.Instance.uiCellInfo.bMapOpened)
{
UIWindow.Instance.ShowMessage("<22><><EFBFBD>ȴ򿪵<C8B4>ͼ");
return;
}
MapManager.Instance.SaveCellsXml();
}
}

View File

@@ -60,25 +60,6 @@ public class UICellInfo : MonoBehaviour
UIWindow.Instance.uiCellEditor.togEdit.isOn = false;
UIWindow.Instance.uiCellEditor.togPathTest.isOn = false;
}
public void LoadCells()
{
if (!bMapOpened)
{
UIWindow.Instance.ShowMessage("<22><><EFBFBD>ȴ򿪵<C8B4>ͼ");
return;
}
if (!MapManager.Instance.LoadObsXml())
CalculationCells();
txtCellWidth.text = MapManager.Instance.CellWidth.ToString();
txtCellHeight.text = MapManager.Instance.CellHeight.ToString();
txtCellRows.text = MapManager.Instance.CellRows.ToString();
txtCellCols.text = MapManager.Instance.CellCols.ToString();
txtTotalCells.text = (MapManager.Instance.CellRows * MapManager.Instance.CellCols).ToString();
}
public void ShowCells()
{
MapManager.Instance.ShowMapGrid();

View File

@@ -312,64 +312,14 @@ public class UICreateMap : MonoBehaviour
btnAutoCleanupRegion.gameObject.SetActive(false);
}
public void SaveRegions()
{
if (!CheckValid())
return;
Transform regionsTrans = UIWindow.Instance.mapTrans.Find("Regions");
if (regionsTrans == null)
{
UIWindow.Instance.ShowMessage(<><C3BB><EFBFBD>ҵ<EFBFBD>Regions<6E>ڵ<EFBFBD>");
return;
}
MapRegions mapRegions = new MapRegions();
mapRegions.mapWidth = Convert.ToInt32(txtMapWidth.text);
mapRegions.mapHeight = Convert.ToInt32(txtMapHeight.text);
mapRegions.regionWidth = Convert.ToInt32(txtRegionWidth.text);
mapRegions.regionHeight = Convert.ToInt32(txtRegionHeight.text);
int row = mapRegions.mapWidth / MapManager.CELLSCALE / mapRegions.regionWidth;
int col = mapRegions.mapHeight / MapManager.CELLSCALE / mapRegions.regionHeight;
Transform trans = null;
mapRegions.regions = new Region[row, col];
for (int i = 0; i < row; i++)
{
for (int j = 0; j < col; j++)
{
mapRegions.regions[i, j] = new Region();
mapRegions.regions[i, j].indexX = i;
mapRegions.regions[i, j].indexY = j;
string regionName = $"{i}_{j}";
trans = regionsTrans.Find(regionName);
if(trans == null)
{
UIWindow.Instance.ShowMessage($"û<><C3BB><EFBFBD>ҵ<EFBFBD>region<6F>ڵ<EFBFBD> name={regionName}");
return;
}
//mapRegions.regions[i, j].regionName = trans.GetComponent<Image>().sprite.name;
mapRegions.regions[i, j].regionName = trans.GetComponent<RawImage>().texture.name;
}
}
mapRegions.SaveXML(Convert.ToInt32(txtMapID.text));
}
public void LoadMapRegions(int mapId)
{
//MapRegions mapRegions = new MapRegions();
//if (!mapRegions.LoadXML(mapId))
// return;
if (!_curMapRegions.LoadXML(mapId))
return;
txtMapID.text = mapId.ToString();
txtMapWidth.text = _curMapRegions.mapWidth.ToString();
txtMapHeight.text = _curMapRegions.mapHeight.ToString();
txtMapWidth.text = _curMapRegions.regionRowNum.ToString();
txtMapHeight.text = _curMapRegions.regionColNum.ToString();
txtRegionWidth.text = _curMapRegions.regionWidth.ToString();
txtRegionHeight.text = _curMapRegions.regionHeight.ToString();

View File

@@ -114,8 +114,7 @@ public class UIMapPanel : MonoBehaviour
}
int mapId = Convert.ToInt32(dropMap.options[dropMap.value].text);
_curOpenMapId = mapId;
MapManager.Instance.LoadMapRegions(_curOpenMapId);
UIWindow.Instance.uiCellInfo.LoadCells();
MapManager.Instance.LoadMapRegionSprites(_curOpenMapId);
//UIWindow.Instance.uiCellInfo.ShowCells();
//UIWindow.Instance.uiEditMapConfig.LoadMapConfig(mapId);
//UIWindow.Instance.uiMonstersPanel.LoadMonsterConfig(mapId);
@@ -174,15 +173,16 @@ public class UIMapPanel : MonoBehaviour
{
_saving = true;
Debug.Log("<22><><EFBFBD>ڱ<EFBFBD><DAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...");
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("<22><><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD>");
//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("<22><><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD>");
_saving = false;
}
}