mirror of
https://github.com/nolen777/eagle0.git
synced 2026-07-28 22:35:42 +00:00
Clarify Eagle play area standard layout (#8403)
This commit is contained in:
@@ -59,9 +59,6 @@ namespace eagle {
|
||||
|
||||
[Header("Layout Spacers")]
|
||||
public GameObject wideSpacer;
|
||||
public LayoutElement heroesAndBattalionsLayoutElement;
|
||||
public LayoutElement popupCanvasLeftSpacer;
|
||||
public LayoutElement popupCanvasRightSpacer;
|
||||
|
||||
[Header("Clicked Province Panel")]
|
||||
public GameObject clickedProvincePanel;
|
||||
@@ -187,15 +184,6 @@ namespace eagle {
|
||||
dominionPanelControllerNarrow.gameObject.SetActive(false);
|
||||
if (wideSpacer != null) wideSpacer.SetActive(true);
|
||||
|
||||
// Match HeroesAndBattalions width to Popup Canvas spacers
|
||||
if (heroesAndBattalionsLayoutElement != null && popupCanvasLeftSpacer != null &&
|
||||
popupCanvasRightSpacer != null) {
|
||||
var width = popupCanvasLeftSpacer.preferredWidth +
|
||||
popupCanvasRightSpacer.preferredWidth;
|
||||
heroesAndBattalionsLayoutElement.preferredWidth = width;
|
||||
SetPopupColumnSpacerWidth(width);
|
||||
}
|
||||
|
||||
provinceInfoPanelController.WideScreen = true;
|
||||
} else {
|
||||
// Show narrow layout containers, hide wide layout containers
|
||||
@@ -205,13 +193,6 @@ namespace eagle {
|
||||
// Narrow dominion panel visibility controlled by user toggle, don't change here
|
||||
if (wideSpacer != null) wideSpacer.SetActive(false);
|
||||
|
||||
// Match HeroesAndBattalions width to left spacer only
|
||||
if (heroesAndBattalionsLayoutElement != null && popupCanvasLeftSpacer != null) {
|
||||
var width = popupCanvasLeftSpacer.preferredWidth;
|
||||
heroesAndBattalionsLayoutElement.preferredWidth = width;
|
||||
SetPopupColumnSpacerWidth(width);
|
||||
}
|
||||
|
||||
provinceInfoPanelController.WideScreen = false;
|
||||
}
|
||||
|
||||
@@ -221,14 +202,6 @@ namespace eagle {
|
||||
underClickedProvincePanel.SetActive(IsNarrowScreen);
|
||||
}
|
||||
|
||||
private void SetPopupColumnSpacerWidth(float width) {
|
||||
var spacer = heroesAndBattalionsPanelController?.popupColumnSpacer;
|
||||
if (spacer == null) return;
|
||||
spacer.preferredWidth = width;
|
||||
spacer.minWidth = width;
|
||||
spacer.flexibleWidth = 0;
|
||||
}
|
||||
|
||||
public void StopAll() {
|
||||
_newModel = null;
|
||||
if (ModelUpdater != null) {
|
||||
|
||||
@@ -4146,7 +4146,7 @@ GameObject:
|
||||
- component: {fileID: 5993840303912702679}
|
||||
- component: {fileID: 2842856604550030747}
|
||||
m_Layer: 0
|
||||
m_Name: Command Row
|
||||
m_Name: Standard Command Row
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@@ -9746,7 +9746,7 @@ GameObject:
|
||||
- component: {fileID: 1445788806017443158}
|
||||
- component: {fileID: 3391666280041911029}
|
||||
m_Layer: 0
|
||||
m_Name: First Column
|
||||
m_Name: Standard Left Column
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@@ -10193,7 +10193,7 @@ GameObject:
|
||||
- component: {fileID: 7203724644386752203}
|
||||
- component: {fileID: 5560956191405327673}
|
||||
m_Layer: 0
|
||||
m_Name: Info Row
|
||||
m_Name: Standard Info Row
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@@ -13526,6 +13526,16 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Factions and Moving Armies row
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4311515829041748981, guid: 95c6956ab496b400abfa20e57158362a,
|
||||
type: 3}
|
||||
propertyPath: m_MinHeight
|
||||
value: 225
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4311515829041748981, guid: 95c6956ab496b400abfa20e57158362a,
|
||||
type: 3}
|
||||
propertyPath: m_PreferredHeight
|
||||
value: 225
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4591590346421151747, guid: 95c6956ab496b400abfa20e57158362a,
|
||||
type: 3}
|
||||
propertyPath: mapController
|
||||
|
||||
Reference in New Issue
Block a user