AblativeAbsolute/rimworld-animation-studio
1
0
Fork 0
mirror of https://gitgud.io/AbstractConcept/rimworld-animation-studio.git synced 2024-08-15 00:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bug fix for menu items

Browse source
This commit is contained in:
AbstractConcept 2022-10-12 01:16:08 -05:00
parent 3d859555ad
commit 3d2c11f469
57 changed files with 73 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

97
Assets/Scenes/MainScene.unity
View file

@ -1638,7 +1638,6 @@ GameObject:
- component: {fileID: 109039885}
- component: {fileID: 109039884}
- component: {fileID: 109039883}
- component: {fileID: 109039882}
m_Layer: 5
m_Name: AboutButton
m_TagString: Untagged
@ -1666,18 +1665,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -47}
m_SizeDelta: {x: 300, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &109039882
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 109039880}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &109039883
MonoBehaviour:
m_ObjectHideFlags: 0
@ -3944,7 +3931,6 @@ GameObject:
- component: {fileID: 289329354}
- component: {fileID: 289329353}
- component: {fileID: 289329352}
- component: {fileID: 289329351}
m_Layer: 5
m_Name: CopyKeyframesButton
m_TagString: Untagged
@ -3973,18 +3959,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -77}
m_SizeDelta: {x: 300, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &289329351
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 289329349}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &289329352
MonoBehaviour:
m_ObjectHideFlags: 0
@ -5004,7 +4978,6 @@ GameObject:
- component: {fileID: 352276162}
- component: {fileID: 352276161}
- component: {fileID: 352276160}
- component: {fileID: 352276159}
m_Layer: 5
m_Name: OpenConsoleButton
m_TagString: Untagged
@ -5032,18 +5005,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -15}
m_SizeDelta: {x: 300, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &352276159
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 352276157}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &352276160
MonoBehaviour:
m_ObjectHideFlags: 0
@ -12925,7 +12886,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Past copied frames
m_Text: Paste copied frames
--- !u!222 &841981647
CanvasRenderer:
m_ObjectHideFlags: 0
@ -14912,7 +14873,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2aa5d5fba80ba8346882964ef3756de3, type: 3}
m_Name:
m_EditorClassIdentifier:
command: UndoAction
command: CopyKeyframes
--- !u!114 &985133704
MonoBehaviour:
m_ObjectHideFlags: 0
@ -15403,7 +15364,6 @@ GameObject:
- component: {fileID: 1018392371}
- component: {fileID: 1018392370}
- component: {fileID: 1018392369}
- component: {fileID: 1018392368}
m_Layer: 5
m_Name: PasteKeyframesButton
m_TagString: Untagged
@ -15432,18 +15392,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -107}
m_SizeDelta: {x: 300, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1018392368
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1018392366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1018392369
MonoBehaviour:
m_ObjectHideFlags: 0
@ -16475,7 +16423,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2aa5d5fba80ba8346882964ef3756de3, type: 3}
m_Name:
m_EditorClassIdentifier:
command: RedoAction
command: PasteKeyframes
--- !u!114 &1110261508
MonoBehaviour:
m_ObjectHideFlags: 0
@ -20546,7 +20494,6 @@ GameObject:
- component: {fileID: 1345808907}
- component: {fileID: 1345808906}
- component: {fileID: 1345808905}
- component: {fileID: 1345808908}
m_Layer: 5
m_Name: RedoButton
m_TagString: Untagged
@ -20666,18 +20613,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1345808903}
m_CullTransparentMesh: 0
--- !u!114 &1345808908
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1345808903}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1347870115
GameObject:
m_ObjectHideFlags: 0
@ -27740,7 +27675,6 @@ GameObject:
- component: {fileID: 1845596336}
- component: {fileID: 1845596335}
- component: {fileID: 1845596334}
- component: {fileID: 1845596337}
m_Layer: 5
m_Name: RaceSettingsButton
m_TagString: Untagged
@ -27860,18 +27794,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1845596332}
m_CullTransparentMesh: 0
--- !u!114 &1845596337
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1845596332}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1862378299
GameObject:
m_ObjectHideFlags: 0
@ -30773,7 +30695,6 @@ GameObject:
- component: {fileID: 2134497167}
- component: {fileID: 2134497166}
- component: {fileID: 2134497165}
- component: {fileID: 2134497168}
m_Layer: 5
m_Name: UndoButton
m_TagString: Untagged
@ -30893,18 +30814,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2134497163}
m_CullTransparentMesh: 0
--- !u!114 &2134497168
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2134497163}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2140712441
GameObject:
m_ObjectHideFlags: 0

26
Assets/Scripts/GUI/SelectRaceDropdown.cs
View file

@ -22,9 +22,12 @@ namespace RimWorldAnimationStudio
public void Update()
{
if (Workspace.animationDef == null) return;
//if (Workspace.animationDef == null) return;
if (actorID != Workspace.actorID || hashcode != CustomTags.defNames.GetHashCode())
//if (actorID != Workspace.actorID || hashcode != CustomTags.defNames.GetHashCode())
//{ UpdateDropdown(); }
if (hashcode != CustomTags.defNames.GetHashCode())
{ UpdateDropdown(); }
}
@ -33,21 +36,26 @@ namespace RimWorldAnimationStudio
if (dropdown == null)
{ OnEnable(); }
string alienRaceDefName = Workspace.animationDef.actors[Workspace.actorID].GetAlienRaceDef().defName;
dropdown.ClearOptions();
/*string alienRaceDefName = Workspace.animationDef.actors[Workspace.actorID].GetAlienRaceDef().defName;
dropdown.ClearOptions();
dropdown.options.Add(new Dropdown.OptionData(alienRaceDefName));
dropdown.value = 0;
label.text = alienRaceDefName;
dropdown.options.Add(new Dropdown.OptionData(alienRaceDefName));*/
IEnumerable<string> optionsList = Tags.defNames.Concat(CustomTags.defNames);
foreach (string defName in optionsList)
{
if (defName != alienRaceDefName)
{ dropdown.options.Add(new Dropdown.OptionData(defName)); }
//if (defName != alienRaceDefName)
//{ dropdown.options.Add(new Dropdown.OptionData(defName)); }
dropdown.options.Add(new Dropdown.OptionData(defName));
}
actorID = Workspace.actorID;
dropdown.value = 0;
label.text = dropdown.options[0].text;
//actorID = Workspace.actorID;
hashcode = CustomTags.defNames.GetHashCode();
}

9
Assets/Scripts/Managers/ApplicationManager.cs
View file

@ -16,6 +16,12 @@ namespace RimWorldAnimationStudio
public DialogBox newAnimationDialog;
public SelectAnimationDialog selectAnimationDialog;
public void Start()
{
LoadAlienRaceDefs();
LoadCustomArrays();
}
public void TryToCloseApplication()
{
exitDialog.Pop();
@ -56,10 +62,7 @@ namespace RimWorldAnimationStudio
public void LoadAnimation(AnimationDef animationDef)
{
LoadAlienRaceDefs();
LoadCustomArrays();
UpdateCustomArrays(animationDef);
RunPostLoadOperations(animationDef);
Debug.Log("Loaded AnimationDef: " + animationDef.defName);

6
Assets/Scripts/Managers/InputManager.cs
View file

@ -138,19 +138,19 @@ namespace RimWorldAnimationStudio
public void ActorMovementMode()
{
if (Workspace.animationDef == null) return;
//if (Workspace.animationDef == null) return;
AnimationController.Instance.ToggleActorManipulationMode(0);
}
public void ActorRotateMode()
{
if (Workspace.animationDef == null) return;
//if (Workspace.animationDef == null) return;
AnimationController.Instance.ToggleActorManipulationMode(1);
}
public void ActorFacingMode()
{
if (Workspace.animationDef == null) return;
//if (Workspace.animationDef == null) return;
AnimationController.Instance.ToggleActorManipulationMode(2);
}