Bug fixes
This commit is contained in:
parent
721443592f
commit
c63e08b554
Binary file not shown.
|
@ -4293,7 +4293,7 @@ MonoBehaviour:
|
||||||
m_OnEndEdit:
|
m_OnEndEdit:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls:
|
m_Calls:
|
||||||
- m_Target: {fileID: 0}
|
- m_Target: {fileID: 2130812670}
|
||||||
m_MethodName: UpdateAnimationDef
|
m_MethodName: UpdateAnimationDef
|
||||||
m_Mode: 1
|
m_Mode: 1
|
||||||
m_Arguments:
|
m_Arguments:
|
||||||
|
@ -10026,7 +10026,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 84.999985}
|
m_AnchoredPosition: {x: 0, y: 84.99986}
|
||||||
m_SizeDelta: {x: 0, y: 5}
|
m_SizeDelta: {x: 0, y: 5}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &542629604
|
--- !u!114 &542629604
|
||||||
|
@ -16479,7 +16479,7 @@ RectTransform:
|
||||||
m_Father: {fileID: 971413406}
|
m_Father: {fileID: 971413406}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0.003863871}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 20, y: 20}
|
m_SizeDelta: {x: 20, y: 20}
|
||||||
|
@ -19822,8 +19822,8 @@ MonoBehaviour:
|
||||||
m_TargetGraphic: {fileID: 922060210}
|
m_TargetGraphic: {fileID: 922060210}
|
||||||
m_HandleRect: {fileID: 922060209}
|
m_HandleRect: {fileID: 922060209}
|
||||||
m_Direction: 2
|
m_Direction: 2
|
||||||
m_Value: 0
|
m_Value: 1
|
||||||
m_Size: 1
|
m_Size: 0.9961361
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
m_OnValueChanged:
|
m_OnValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
@ -24740,7 +24740,7 @@ MonoBehaviour:
|
||||||
m_OnEndEdit:
|
m_OnEndEdit:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls:
|
m_Calls:
|
||||||
- m_Target: {fileID: 0}
|
- m_Target: {fileID: 2130812670}
|
||||||
m_MethodName: UpdateAnimationDef
|
m_MethodName: UpdateAnimationDef
|
||||||
m_Mode: 1
|
m_Mode: 1
|
||||||
m_Arguments:
|
m_Arguments:
|
||||||
|
@ -35640,6 +35640,7 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 2130812669}
|
- component: {fileID: 2130812669}
|
||||||
|
- component: {fileID: 2130812670}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: AnimationDefCard
|
m_Name: AnimationDefCard
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -35673,6 +35674,20 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 155, y: -66.99603}
|
m_AnchoredPosition: {x: 155, y: -66.99603}
|
||||||
m_SizeDelta: {x: 310, y: 133.99207}
|
m_SizeDelta: {x: 310, y: 133.99207}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &2130812670
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2130812668}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: e1d8f33927e6b4d44914a445362b802d, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
defNameField: {fileID: 295308631}
|
||||||
|
labelField: {fileID: 1402648198}
|
||||||
--- !u!1 &2134497163
|
--- !u!1 &2134497163
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -12,7 +12,7 @@ namespace RimWorldAnimationStudio
|
||||||
{
|
{
|
||||||
public InputField defNameField;
|
public InputField defNameField;
|
||||||
public InputField labelField;
|
public InputField labelField;
|
||||||
public Toggle playSoundsToggle;
|
//public Toggle playSoundsToggle;
|
||||||
|
|
||||||
public void Update()
|
public void Update()
|
||||||
{
|
{
|
||||||
|
@ -24,14 +24,14 @@ namespace RimWorldAnimationStudio
|
||||||
if (labelField.isFocused == false)
|
if (labelField.isFocused == false)
|
||||||
{ labelField.text = Workspace.animationDef.label; }
|
{ labelField.text = Workspace.animationDef.label; }
|
||||||
|
|
||||||
playSoundsToggle.isOn = Workspace.animationDef.sounds;
|
//playSoundsToggle.isOn = Workspace.animationDef.sounds;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdateAnimationDef()
|
public void UpdateAnimationDef()
|
||||||
{
|
{
|
||||||
Workspace.animationDef.defName = defNameField.text;
|
Workspace.animationDef.defName = defNameField.text;
|
||||||
Workspace.animationDef.label = labelField.text;
|
Workspace.animationDef.label = labelField.text;
|
||||||
Workspace.animationDef.sounds = playSoundsToggle.isOn;
|
//Workspace.animationDef.sounds = playSoundsToggle.isOn;
|
||||||
|
|
||||||
Workspace.Instance.MakeHistoricRecord("AnimationDef update");
|
Workspace.Instance.MakeHistoricRecord("AnimationDef update");
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ namespace RimWorldAnimationStudio
|
||||||
public void Update()
|
public void Update()
|
||||||
{
|
{
|
||||||
if (IsDialogBoxIsActive()) return;
|
if (IsDialogBoxIsActive()) return;
|
||||||
|
if (EventSystem.current.currentSelectedGameObject?.GetComponent<InputField>()?.isFocused == true) return;
|
||||||
bool canRepeatThisUpdate = CanRepeatThisUpdate();
|
bool canRepeatThisUpdate = CanRepeatThisUpdate();
|
||||||
|
|
||||||
// Check keybinds
|
// Check keybinds
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue