Restructure main layout

Author: Perdition-117

DressCodeControl.cs

@@ -3,24 +3,32 @@
 namespace COM3D2.DressCode;
 
 internal class DressCodeControl : MonoBehaviour {
-	private ScopeSelectTabBar _scopeSelectTabBar;
-	private MaidSelectPanel _maidSelectPanel;
+	private const int UiWidth = 1920;
+
+	private static readonly Vector3 PanelMargin = new(15, 0);
+	private static readonly Vector2 SceneListSize = new(184, 925);
+	private static readonly Vector2 ScopeListSize = new(144, 925);
+	private static readonly Vector2 MaidListSize = new(502, 925);
+
 	private SceneList _sceneList;
+	private ScopeList _scopeList;
+	private MaidSelectPanel _maidSelectPanel;
 	private ProfilePanel _profilePanel;
 
 	private DressCodeManager m_mgr;
 	private GameObject m_goPanel;
 
-	public ProfileScope SelectedScope {
-		get => _scopeSelectTabBar.SelectedScope;
-		set => _scopeSelectTabBar.SelectScope(value);
-	}
 
 	public CostumeScene SelectedScene {
 		get => _sceneList.SelectedValue;
 		set => _sceneList.SelectValue(value);
 	}
 
+	public ProfileScope SelectedScope {
+		get => _scopeList.SelectedValue;
+		set => _scopeList.SelectValue(value);
+	}
+
 	public Maid SelectedMaid {
 		get => _maidSelectPanel.SelectedMaid;
 		set => _maidSelectPanel.SelectMaid(value);
@@ -37,14 +45,22 @@ public void Init(DressCodeManager manager, CanvasComponent panel) {
 		panel.AddComponent<uGUICanvas>();
 		panel.AddComponent<GraphicRaycaster>();
 
-		_scopeSelectTabBar = new ScopeSelectTabBar(panel);
-		_scopeSelectTabBar.ScopeSelected += (o, e) => UpdateScopeSelection();
+		_sceneList = new SceneList(panel);
+		_sceneList.Position = new(-(UiWidth / 2) + SceneListSize.x / 2 + 41, 0);
+		_sceneList.Size = SceneListSize;
+		_sceneList.ValueSelected += (o, e) => UpdateProfileSelection();
+
+		_scopeList = new ScopeList(panel);
+		_scopeList.Position = _sceneList.Position + PanelMargin + new Vector3(SceneListSize.x / 2 + ScopeListSize.x / 2, 0);
+		_scopeList.Size = ScopeListSize;
+		_scopeList.ValueSelected += (o, e) => UpdateScopeSelection();
 
 		_maidSelectPanel = new MaidSelectPanel(panel);
+		_maidSelectPanel.Position = _scopeList.Position + PanelMargin + new Vector3(ScopeListSize.x / 2 + MaidListSize.x / 2, 0);
+		_maidSelectPanel.Size = MaidListSize;
 		_maidSelectPanel.MaidSelected += (o, e) => UpdateMaidSelection();
 
-		_sceneList = new SceneList(panel);
-		_sceneList.ValueSelected += (o, e) => UpdateProfileSelection();
+		_maidSelectPanel.ScrollChild.Position = new(0, MaidListSize.y / 2 - 112.5f);
 
 		_profilePanel = new ProfilePanel(panel, this);
 		_profilePanel.ProfileSelected += OnProfileChanged;
@@ -76,13 +92,11 @@ public void CreateSelector() {
 
 	private void SetSceneMode() {
 		_maidSelectPanel.SetActive(false);
-		_sceneList.Position = new(-832, 0);
 		_profilePanel.SetSceneMode();
 	}
 
 	private void SetMaidMode() {
 		_maidSelectPanel.SetActive(true);
-		_sceneList.Position = new(-337, 0);
 		_profilePanel.SetMaidMode();
 	}
 

Panels/MaidSelectPanel.cs

@@ -1,18 +1,11 @@
 namespace COM3D2.DressCode;
 
 internal class MaidSelectPanel : GridScrollViewPanel {
-	private static readonly Vector2 PanelSize = new(502, 1080);
-
 	private readonly CharacterSelectManager _characterSelectManager;
 
 	public MaidSelectPanel(CanvasComponent parent) : base(parent, nameof(MaidSelectPanel)) {
-		Position = new(-690, 0);
 		ContentPivot = UIWidget.Pivot.Top;
 
-		Size = PanelSize;
-
-		ScrollChild.Position = new(0, PanelSize.y / 2 - 112.5f);
-
 		Grid.cellHeight = 130;
 		Grid.pivot = UIWidget.Pivot.Top;
 		Grid.sorting = UIGrid.Sorting.Custom;
@@ -34,13 +27,9 @@ protected virtual void OnMaidSelected(MaidSelectedEventArgs e) {
 		MaidSelected?.Invoke(this, e);
 	}
 
-	public void Initialize() {
-		_characterSelectManager.Create(CharacterSelectManager.Type.Select);
-	}
+	public void Initialize() => _characterSelectManager.Create(CharacterSelectManager.Type.Select);
 
-	public void SelectMaid(Maid maid) {
-		_characterSelectManager.SelectMaid(maid);
-	}
+	public void SelectMaid(Maid maid) => _characterSelectManager.SelectMaid(maid);
 
 	private void GetMaidList(List<Maid> drawMaidList) {
 		var characterManager = GameMain.Instance.CharacterMgr;

Panels/ProfilePanel.cs

@@ -4,7 +4,7 @@ internal class ProfilePanel : CanvasComponent {
 	private const int ThumbnailPanelWidth = 615;
 	private const int ButtonSpacing = 115;
 
-	private static readonly Vector2 PanelSize = new(956, 830);
+	private static readonly Vector2 PanelSize = new(890, 830);
 
 	private readonly DressCodeControl _parentControl;
 	private readonly ThumbnailPanel _thumbnailPanel;

Panels/SceneList.cs

@@ -1,14 +1,12 @@
 namespace COM3D2.DressCode;
 
 internal class SceneList : ButtonScrollList<CostumeScene> {
-	private static readonly Vector2 PanelSize = new(174, 848);
-
-	private readonly CostumeScene[] _npcScenes = {
+	private static readonly CostumeScene[] NpcScenes = {
 		CostumeScene.Dance,
 		CostumeScene.PoleDance,
 	};
 
-	private readonly KeyValuePair<string, CostumeScene>[] _scenes = {
+	private static readonly KeyValuePair<string, CostumeScene>[] Scenes = {
 		new("SceneDance", CostumeScene.Dance),
 		new("ScenePoleDance", CostumeScene.PoleDance),
 		new("SceneYotogi", CostumeScene.Yotogi),
@@ -17,12 +15,10 @@ internal class SceneList : ButtonScrollList<CostumeScene> {
 	};
 
 	public SceneList(BaseComponent parent) : base(parent, nameof(SceneList)) {
-		Size = PanelSize;
-
 		ScrollValue = 0.5f;
 
-		foreach (var scene in _scenes) {
-			AddButton(scene.Value, scene.Key, 140);
+		foreach (var scene in Scenes) {
+			AddButton(scene.Value, scene.Key, 150);
 		}
 
 		UpdateChildren();
@@ -34,7 +30,7 @@ public void SelectFirstAvailable() {
 	}
 
 	public void SetNpcMode(bool isNpcMode) {
-		foreach (var button in Buttons.Where(e => !_npcScenes.Contains(e.Value))) {
+		foreach (var button in Buttons.Where(e => !NpcScenes.Contains(e.Value))) {
 			if (isNpcMode) {
 				button.SetSelected(false);
 			}

Panels/ScopeList.cs

@@ -0,0 +1,10 @@
+namespace COM3D2.DressCode;
+
+internal class ScopeList : ButtonScrollList<ProfileScope> {
+	public ScopeList(BaseComponent parent) : base(parent, nameof(ScopeList)) {
+		AddButton(ProfileScope.Scene, "SceneSetting", 110);
+		AddButton(ProfileScope.Maid, "MaidSetting", 110);
+
+		UpdateChildren();
+	}
+}

Panels/ScopeSelectTabBar.cs

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Localization>
 	<Language Code="en">
 		<Term Key="BackButton" Translation="Back" />
 
-		<Term Key="SceneSetting" Translation="Scene settings" />
-		<Term Key="MaidSetting" Translation="Maid settings" />
+		<Term Key="SceneSetting" Translation="Scene" />
+		<Term Key="MaidSetting" Translation="Maid" />
 
 		<Term Key="SceneDance" Translation="Dance" />
 		<Term Key="ScenePoleDance" Translation="Pole dance" />
@@ -24,6 +24,9 @@
 		<Term Key="EditButton" Translation="Edit" />
 	</Language>
 	<Language Code="ja">
+		<Term Key="SceneSetting" Translation="シーン" />
+		<Term Key="MaidSetting" Translation="メイド" />
+
 		<Term Key="SceneDance" Translation="ダンス" />
 		<Term Key="ScenePoleDance" Translation="ポールダンス" />
 		<Term Key="SceneYotogi" Translation="夜伽" />