vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(42c79b8de) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-05 16:10:45 +03:00
parent 458143c84a
commit 95698f5eb5
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
+21 -6
View File
@@ -886,6 +886,20 @@ namespace Barotrauma
}
private void UpdatePlayerFrame(CharacterInfo characterInfo, bool allowEditing = true)
{
UpdatePlayerFrame(characterInfo, allowEditing, playerInfoContainer);
}
public void CreatePlayerFrame(GUIComponent parent)
{
UpdatePlayerFrame(
playerInfoContainer.Children?.First().UserData as CharacterInfo,
allowEditing: campaignCharacterInfo == null,
parent: parent);
}
private void UpdatePlayerFrame(CharacterInfo characterInfo, bool allowEditing, GUIComponent parent)
{
if (characterInfo == null)
{
@@ -901,12 +915,13 @@ namespace Barotrauma
GameMain.Client.CharacterInfo = characterInfo;
}
playerInfoContainer.ClearChildren();
GUIComponent infoContainer = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.9f), playerInfoContainer.RectTransform, Anchor.BottomCenter), childAnchor: Anchor.TopCenter)
parent.ClearChildren();
GUIComponent infoContainer = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.9f), parent.RectTransform, Anchor.BottomCenter), childAnchor: Anchor.TopCenter)
{
RelativeSpacing = 0.02f,
Stretch = true
Stretch = true,
UserData = characterInfo
};
new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.1f), infoContainer.RectTransform), characterInfo.Name, font: GUI.LargeFont, textAlignment: Alignment.Center, wrap: true);
@@ -974,7 +989,7 @@ namespace Barotrauma
JobPrefab job = JobPrefab.List.Find(j => j.Identifier == jobIdentifier);
if (job == null || job.MaxNumber <= 0) continue;
var jobFrame = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.2f), jobList.Content.RectTransform), style: "ListBoxElement")
var jobFrame = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.2f), jobList.Content.RectTransform) { MinSize = new Point(0, 20) }, style: "ListBoxElement")
{
UserData = job
};
@@ -1013,7 +1028,7 @@ namespace Barotrauma
}
GUITickBox randPrefTickBox = new GUITickBox(
new RectTransform(new Vector2(0.5f, 0.05f), infoContainer.RectTransform)
new RectTransform(new Vector2(0.5f, 0.08f), infoContainer.RectTransform)
{ RelativeOffset = new Vector2(-0.0f, 0.0f) },
TextManager.Get("RandomPreferences"))
{