This commit is contained in:
tangbin
2025-06-19 13:32:33 +08:00
parent c9984c9055
commit 0f78ad7a32
5 changed files with 20 additions and 46 deletions

View File

@@ -9705,7 +9705,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &496305461 --- !u!224 &496305461
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -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.transform.position = new Vector3(x / 2, y / 2, -10);
Camera.main.orthographicSize = 5; Camera.main.orthographicSize = 5;

View File

@@ -17,7 +17,6 @@ public partial class MapManager : MonoBehaviour
PathNodeCell, //·<><C2B7> PathNodeCell, //·<><C2B7>
NpcPath, //npcѲ<63><D1B2>·<EFBFBD><C2B7> NpcPath, //npcѲ<63><D1B2>·<EFBFBD><C2B7>
MonsterPath, //<2F><><EFBFBD><EFBFBD>Ѳ<EFBFBD><D1B2>·<EFBFBD><C2B7> MonsterPath, //<2F><><EFBFBD><EFBFBD>Ѳ<EFBFBD><D1B2>·<EFBFBD><C2B7>
//SafeArea, //<2F><>ȫ<EFBFBD><C8AB>
AudioTrigger, //<2F><>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD> AudioTrigger, //<2F><>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>
TriggerCell, //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> TriggerCell, //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
ReliveCell, //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReliveCell, //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

View File

@@ -109,27 +109,6 @@ public partial class MapManager : MonoBehaviour
return; return;
} }
_curMapRegions?.SaveXML(mapId); _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}"; // <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD>v1000_r1_c1.jpg
// }
//}
//mapRegions.SaveXML(mapId);
} }
public void LoadMapRegionSprites(int mapId) public void LoadMapRegionSprites(int mapId)
@@ -150,7 +129,7 @@ public partial class MapManager : MonoBehaviour
_curMapRegions.cellWidthPixel = widthPixel; _curMapRegions.cellWidthPixel = widthPixel;
_curMapRegions.cellHeightPixel = heightPixel; _curMapRegions.cellHeightPixel = heightPixel;
_curMapRegions.regions = new Region[mapRownum, mapColumn]; _curMapRegions.regions = new Region[mapRownum, mapColumn];
float jpgscenew = PicMapPixel / 100; float jpgscenew = PicMapPixel / 100.0f;
for (int row = 0; row < mapRownum; row++) for (int row = 0; row < mapRownum; row++)
{ {
for (int col = 0; col < mapColumn; col++) for (int col = 0; col < mapColumn; col++)
@@ -173,8 +152,6 @@ public partial class MapManager : MonoBehaviour
} }
} }
MapManager.Instance.ReseCamera(jpgscenew * mapColumn, jpgscenew * mapRownum); MapManager.Instance.ReseCamera(jpgscenew * mapColumn, jpgscenew * mapRownum);
UICellInfo.Instance.ShowMapCellInfo();
} }
public void ClearMapRegions() public void ClearMapRegions()
{ {

View File

@@ -115,22 +115,21 @@ public class UIMapPanel : MonoBehaviour
} }
int mapId = Convert.ToInt32(dropMap.options[dropMap.value].text); int mapId = Convert.ToInt32(dropMap.options[dropMap.value].text);
_curOpenMapId = mapId; _curOpenMapId = mapId;
UIWindow.Instance.uiEditMapConfig.LoadMapConfig(mapId);
MapManager.Instance.LoadMapRegionSprites(_curOpenMapId); MapManager.Instance.LoadMapRegionSprites(_curOpenMapId);
MapManager.Instance.LoadMapObs(_curOpenMapId); MapManager.Instance.LoadMapObs(_curOpenMapId);
//UIWindow.Instance.uiCellInfo.ShowCells(); UIWindow.Instance.uiMonstersPanel.LoadMonsterConfig(mapId);
//UIWindow.Instance.uiEditMapConfig.LoadMapConfig(mapId); UIWindow.Instance.uiNpcsPanel.LoadNpcsConfig(mapId);
//UIWindow.Instance.uiMonstersPanel.LoadMonsterConfig(mapId); UIWindow.Instance.uiTriggersPanel.LoadTriggersConfig(mapId);
//UIWindow.Instance.uiNpcsPanel.LoadNpcsConfig(mapId); UIWindow.Instance.uiFuBensPanel.LoadFuBenConfig(mapId);
//UIWindow.Instance.uiTriggersPanel.LoadTriggersConfig(mapId); UIWindow.Instance.uiJuBaosPanel.LoadJuBaoConfig(mapId);
//UIWindow.Instance.uiFuBensPanel.LoadFuBenConfig(mapId);
//UIWindow.Instance.uiJuBaosPanel.LoadJuBaoConfig(mapId);
//<2F><><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>ã<EFBFBD><C3A3><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //<2F><><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>ã<EFBFBD><C3A3><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if (MapManager.Instance.map == null) if (MapManager.Instance.map == null)
{ {
MapManager.Instance.CreateObs(); MapManager.Instance.CreateObs();
} }
UICellInfo.Instance.ShowMapCellInfo();
} }
public void CloseMap() public void CloseMap()
@@ -160,15 +159,14 @@ public class UIMapPanel : MonoBehaviour
_saving = true; _saving = true;
Debug.Log("<22><><EFBFBD>ڱ<EFBFBD><DAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."); Debug.Log("<22><><EFBFBD>ڱ<EFBFBD><DAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...");
MapManager.Instance.SaveRegionXML(); MapManager.Instance.SaveRegionXML();
//UIWindow.Instance.uiCreateMap.SaveRegions(); MapManager.Instance.SaveMapObs();
//UIWindow.Instance.uiCellEditor.SaveCells(); UIWindow.Instance.uiEditMapConfig.SaveMapConfig();
//UIWindow.Instance.uiEditMapConfig.SaveMapConfig(); UIWindow.Instance.uiMonstersPanel.SaveMonsterConfig();
//UIWindow.Instance.uiMonstersPanel.SaveMonsterConfig(); UIWindow.Instance.uiNpcsPanel.SaveNpcsConfig();
//UIWindow.Instance.uiNpcsPanel.SaveNpcsConfig(); UIWindow.Instance.uiTriggersPanel.SaveTriggersConfig();
//UIWindow.Instance.uiTriggersPanel.SaveTriggersConfig(); UIWindow.Instance.uiJuBaosPanel.SaveJuBaoConfig();
//UIWindow.Instance.uiJuBaosPanel.SaveJuBaoConfig(); UIWindow.Instance.uiFuBensPanel.SaveFuBenConfig();
//UIWindow.Instance.uiFuBensPanel.SaveFuBenConfig(); UIWindow.Instance.ShowMessage("<22><><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD>");
//UIWindow.Instance.ShowMessage("<22><><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD>");
_saving = false; _saving = false;
} }
} }