GUI rearrangement

This commit is contained in:
AbstractConcept 2022-10-20 00:32:13 -05:00
parent 04f8c6a2e4
commit 2e50221118
90 changed files with 435 additions and 1440 deletions

View file

@ -8,7 +8,7 @@ namespace RimWorldAnimationStudio
{
public class ActorCard : MonoBehaviour
{
public Dropdown genderDropdown;
//public Dropdown genderDropdown;
public Dropdown bodyTypeDropdown;
public InputField bodyOffsetXField;
public InputField bodyOffsetZField;
@ -58,12 +58,12 @@ namespace RimWorldAnimationStudio
actor.initiator = initiatorToggle.isOn;
switch (genderDropdown.value)
{
case 0: actor.requiredGender = new List<string>() { "Female" }; break;
case 2: actor.requiredGender = new List<string>() { "Male" }; break;
default: actor.requiredGender = null; break;
}
//switch (genderDropdown.value)
//{
// case 0: actor.requiredGender = new List<string>() { "Female" }; break;
// case 2: actor.requiredGender = new List<string>() { "Male" }; break;
// default: actor.requiredGender = null; break;
//}
float.TryParse(raceOffsetXField.text, out x);
float.TryParse(raceOffsetZField.text, out z);
@ -116,14 +116,14 @@ namespace RimWorldAnimationStudio
initiatorToggle.isOn = actor.initiator;
if (actor.requiredGender.NotNullOrEmpty() && actor.requiredGender.Contains("Female"))
{ genderDropdown.SetValueWithoutNotify(0); }
//if (actor.requiredGender.NotNullOrEmpty() && actor.requiredGender.Contains("Female"))
//{ genderDropdown.SetValueWithoutNotify(0); }
else if (actor.requiredGender.NotNullOrEmpty() && actor.requiredGender.Contains("Male"))
{ genderDropdown.SetValueWithoutNotify(2); }
//else if (actor.requiredGender.NotNullOrEmpty() && actor.requiredGender.Contains("Male"))
//{ genderDropdown.SetValueWithoutNotify(2); }
else
{ genderDropdown.SetValueWithoutNotify(1); }
//else
//{ genderDropdown.SetValueWithoutNotify(1); }
for (int i = 0; i < selectActorLayerDropdown.options.Count; i++)
{

View file

@ -21,6 +21,17 @@ namespace RimWorldAnimationStudio
public void CloseMenu()
{
if (EventSystem.current.currentSelectedGameObject != null)
{
Transform child = transform.FindDeepChild(EventSystem.current.currentSelectedGameObject.name);
if (child != null)
{
EventSystem.current.SetSelectedGameObject(this.gameObject);
return;
}
}
dropdownMenu.gameObject.SetActive(false);
}

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0ccde298059e1b04cb377c332260a2a5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 64cb267b2695e8a4e84ae6a89b852632
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -71,7 +71,7 @@ namespace RimWorldAnimationStudio
public void ResetCamera()
{
cam.transform.position = new Vector3(1, 0, -10);
cam.transform.position = new Vector3(0, 0, -10);
curZoom = zoom;
mouseDragActive = false;

View file

@ -57,7 +57,7 @@ namespace RimWorldAnimationStudio
public void Update()
{
if (IsDialogBoxIsActive()) return;
if (EventSystem.current.currentSelectedGameObject?.GetComponent<InputField>()?.isFocused == true) return;
if (EventSystem.current.currentSelectedGameObject != null && EventSystem.current.currentSelectedGameObject.GetComponent<InputField>()?.isFocused == true) return;
bool canRepeatThisUpdate = CanRepeatThisUpdate();
// Check keybinds

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0bce7b60b8a9f07459340a5c89f01995
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: