Browse Source

Dropdowns in Debug UI

master
laurids 2 years ago
parent
commit
aab4a97c23
3 changed files with 607 additions and 464 deletions
  1. +16
    -1
      Assets/GWConquest/Prefabs/UI/Dropdown.prefab
  2. +559
    -448
      Assets/GWConquest/Scenes/GalaxyMap.unity
  3. +32
    -15
      Assets/GWConquest/Scripts/UI/DebugUI.cs

+ 16
- 1
Assets/GWConquest/Prefabs/UI/Dropdown.prefab View File

@ -53,6 +53,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -146,6 +147,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.33333334}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -220,6 +222,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.33333334}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -294,6 +297,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -370,6 +374,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -398,6 +403,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -492,6 +498,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -570,6 +577,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -644,6 +652,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -718,6 +727,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -801,6 +811,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.01, g: 0.01, b: 0.01, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -829,6 +840,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -973,6 +985,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.03, g: 0.03, b: 0.03, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1006,7 +1019,7 @@ MonoBehaviour:
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
m_ScrollSensitivity: 1
m_ScrollSensitivity: 5
m_Viewport: {fileID: 1636751272606410708}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 4520657860803175750}
@ -1079,6 +1092,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1166,6 +1180,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:


+ 559
- 448
Assets/GWConquest/Scenes/GalaxyMap.unity
File diff suppressed because it is too large
View File


+ 32
- 15
Assets/GWConquest/Scripts/UI/DebugUI.cs View File

@ -14,10 +14,10 @@ namespace GWConquest
public static bool FreeBuild = false;
public InputField UnitNameText;
public Dropdown UnitNameText;
public InputField AmountText;
public InputField PlanetText;
public InputField PlayerText;
public Dropdown PlanetText;
public Dropdown PlayerText;
public Toggle LogBattleEventsToggle;
public Toggle ShowHiddenUnitsToggle;
@ -33,20 +33,22 @@ namespace GWConquest
if(!int.TryParse(AmountText.text, out int amount))
throw new ArgumentException("Amount is not an integer");
if(!int.TryParse(PlayerText.text, out int playerID))
throw new ArgumentException("PlayerID is not an integer");
//if(!int.TryParse(PlayerText.text, out int playerID))
// throw new ArgumentException("PlayerID is not an integer");
var playerID = PlayerText.value;
if(playerID < 0 || playerID >= Player.PlayerList.Count)
throw new ArgumentException("Player not found");
Player player = Player.GetPlayerById(playerID);
UnitClass uc = UnitClass.FromName(UnitNameText.text);
UnitClass uc = UnitClass.FromName(UnitNameText.options[UnitNameText.value].text);
if(uc == null)
throw new ArgumentException("Unit Class not found");
Planet planet = Planet.AllPlanets.FirstOrDefault(p => p.PlanetName.ToLower().Contains(PlanetText.text.ToLower()));
var planetName = PlanetText.options[PlanetText.value].text;
Planet planet = Planet.AllPlanets.FirstOrDefault(p => p.PlanetName.ToLower().Contains(planetName.ToLower()));
Zone zone = planet.GetZones(uc.ZoneType).Where(z => !z.attackZone).First();
@ -60,15 +62,30 @@ namespace GWConquest
void Start()
{
UpdateFlags();
}
/*void OnEnable()
{
LogBattleEventsToggle.isOn = LogBattleEvents;
ShowHiddenUnitsToggle.isOn = ShowHiddenUnits;
MoveEnemyUnitsToggle.isOn = MoveEnemyUnits;
FreeBuildToggle.isOn = FreeBuild;
}*/
var ucs = UnitClass.AllUnitClasses.Select(uc => uc.ShortName).ToList();
ucs.Sort();
foreach(var uc in ucs)
{
UnitNameText.options.Add(new Dropdown.OptionData(uc));
}
UnitNameText.value = 0;
var planets = Planet.AllPlanets.Select(p => p.PlanetName).ToList();
planets.Sort();
foreach(var p in planets)
{
PlanetText.options.Add(new Dropdown.OptionData(p));
}
PlanetText.value = 0;
var players = Player.PlayerList;
foreach(var p in players)
{
PlayerText.options.Add(new Dropdown.OptionData(p.Faction.FactionName));
}
PlayerText.value = 0;
}
public void UpdateFlags()
{


Loading…
Cancel
Save