diff --git a/Assets/GameAssets/Maps/1000/XML/MonstersConfig.xml b/Assets/GameAssets/Maps/1000/XML/MonstersConfig.xml index 2f5824e..27e94b9 100644 --- a/Assets/GameAssets/Maps/1000/XML/MonstersConfig.xml +++ b/Assets/GameAssets/Maps/1000/XML/MonstersConfig.xml @@ -2,25 +2,25 @@ - + - + - + - + - + - + - + diff --git a/Assets/Scripts/UI/UICellEditor.cs b/Assets/Scripts/UI/UICellEditor.cs index 6dc958c..0d3fc0c 100644 --- a/Assets/Scripts/UI/UICellEditor.cs +++ b/Assets/Scripts/UI/UICellEditor.cs @@ -290,4 +290,11 @@ public class UICellEditor : MonoBehaviour return; MapManager.Instance.SaveMapObs(); } + private void OnDisable() + { + foreach(var toggle in editorAreaToggle.ActiveToggles()) + { + toggle.isOn = false; + } + } } diff --git a/Assets/Scripts/UI/UIEditMapConfig.cs b/Assets/Scripts/UI/UIEditMapConfig.cs index 673ea97..0f8664b 100644 --- a/Assets/Scripts/UI/UIEditMapConfig.cs +++ b/Assets/Scripts/UI/UIEditMapConfig.cs @@ -31,8 +31,6 @@ public class UIEditMapConfig : MonoBehaviour public Toggle togEditRelives; public Toggle togEditTeleports; - //public Toggle togEditSafeAreas; - public Toggle togEditSellAreas; public Toggle togEditMonsters; public Toggle togEditNPCs; public Toggle togEditAudioTriggers; @@ -70,7 +68,6 @@ public class UIEditMapConfig : MonoBehaviour togEditRelives.isOn = false; togEditTeleports.isOn = false; - togEditSellAreas.isOn = false; togEditMonsters.isOn = false; togEditNPCs.isOn = false; togEditAudioTriggers.isOn = false; @@ -137,20 +134,6 @@ public class UIEditMapConfig : MonoBehaviour } } - public void OnEditSellAreasToggle() - { - if (togEditSellAreas.isOn) - { - UIWindow.Instance.uiSellAreasPanel.gameObject.SetActive(true); - MapManager.Instance.ShowSpecialPoint(MapManager.EditCellType.SellArea); - } - else - { - UIWindow.Instance.uiSellAreasPanel.gameObject.SetActive(false); - MapManager.Instance.HideSpecialPoint(MapManager.EditCellType.SellArea); - } - } - public void OnEditMonsterToggle() { if (togEditMonsters.isOn) @@ -504,4 +487,16 @@ public class UIEditMapConfig : MonoBehaviour UIWindow.Instance.uiConditionsPanel.AddItem(cc); } } + private void OnDisable() + { + togEditRelives.isOn = false; + togEditTeleports.isOn = false; + togEditMonsters.isOn = false; + togEditNPCs.isOn = false; + togEditAudioTriggers.isOn = false; + togEditTriggers.isOn = false; + togEditConditions.isOn = false; + togEditFuBen.isOn = false; + togEditJuBao.isOn = false; + } } diff --git a/Assets/Scripts/UI/UIMonsterPanel.cs b/Assets/Scripts/UI/UIMonsterPanel.cs index c408e00..cb66fd1 100644 --- a/Assets/Scripts/UI/UIMonsterPanel.cs +++ b/Assets/Scripts/UI/UIMonsterPanel.cs @@ -448,6 +448,7 @@ public class UIMonsterPanel : MonoBehaviour if (_dicAllItem.TryGetValue(Idx, out var monsterItem)) { monsterItem.btnClickSelf.Select(); + OnClickItem(monsterItem); } } public void UpdateMonsterPos(int Idx, Vector2Int newPos)