v1.0.4
- Fixed a bug which would cause keyframes to be pasted incorrectly in the later stages of an animation after loading an existing file
This commit is contained in:
parent
ab53ed284f
commit
648acb325f
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.
|
@ -175,8 +175,7 @@ namespace RimWorldAnimationStudio
|
|||
|
||||
public void OnPostLoad()
|
||||
{
|
||||
foreach (PawnAnimationClip clip in AnimationClips)
|
||||
{ clip.OnPostLoad(); }
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -195,9 +195,17 @@ namespace RimWorldAnimationStudio
|
|||
|
||||
public int GetOwningActorID()
|
||||
{
|
||||
if (Workspace.animationDef == null) return -1;
|
||||
if (Workspace.animationDef == null)
|
||||
{ Debug.Log("Cannot get actor ID - the AnimationDef is invalid"); return -1; }
|
||||
|
||||
return Workspace.GetCurrentAnimationStage().AnimationClips.IndexOf(this);
|
||||
foreach (AnimationStage stage in Workspace.animationDef.animationStages)
|
||||
{
|
||||
if (stage.AnimationClips.Contains(this))
|
||||
{ return stage.AnimationClips.IndexOf(this); }
|
||||
}
|
||||
|
||||
Debug.Log("Cannot get actor ID - animation clip has been orphaned");
|
||||
return -1;
|
||||
}
|
||||
|
||||
public void AddPawnKeyframe()
|
||||
|
|
|
@ -8,7 +8,7 @@ namespace RimWorldAnimationStudio
|
|||
public static class Constants
|
||||
{
|
||||
// Project data
|
||||
public static string currentVersion = "1.0.3";
|
||||
public static string currentVersion = "1.0.4";
|
||||
public static string projectHome = "https://gitgud.io/AbstractConcept/rimworld-animation-studio";
|
||||
public static string projectWiki = "https://gitgud.io/AbstractConcept/rimworld-animation-studio/-/wikis/home";
|
||||
|
||||
|
|
|
@ -201,7 +201,7 @@ namespace RimWorldAnimationStudio
|
|||
|
||||
public void Initialize()
|
||||
{
|
||||
Debug.Log("Initializing animation preview");
|
||||
//Debug.Log("Initializing animation preview");
|
||||
|
||||
int actorCount = Workspace.animationDef.Actors.Count;
|
||||
int childCount = animationTimelines.GetComponentsInChildren<AnimationTimeline>().Count();
|
||||
|
|
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.
|
@ -21,7 +21,7 @@ MonoBehaviour:
|
|||
m_ShowMode: 4
|
||||
m_Title:
|
||||
m_RootView: {fileID: 2}
|
||||
m_MinSize: {x: 875, y: 542}
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_Maximized: 1
|
||||
--- !u!114 &2
|
||||
|
@ -46,7 +46,7 @@ MonoBehaviour:
|
|||
y: 0
|
||||
width: 1920
|
||||
height: 997
|
||||
m_MinSize: {x: 875, y: 542}
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
|
@ -112,10 +112,10 @@ MonoBehaviour:
|
|||
y: 30
|
||||
width: 1920
|
||||
height: 947
|
||||
m_MinSize: {x: 677, y: 492}
|
||||
m_MaxSize: {x: 14001, y: 14042}
|
||||
m_MinSize: {x: 677, y: 342}
|
||||
m_MaxSize: {x: 12002, y: 8042}
|
||||
vertical: 0
|
||||
controlID: 1183
|
||||
controlID: 2744
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
@ -137,10 +137,10 @@ MonoBehaviour:
|
|||
y: 0
|
||||
width: 1414
|
||||
height: 947
|
||||
m_MinSize: {x: 402, y: 492}
|
||||
m_MaxSize: {x: 10001, y: 14042}
|
||||
m_MinSize: {x: 402, y: 342}
|
||||
m_MaxSize: {x: 8002, y: 8042}
|
||||
vertical: 1
|
||||
controlID: 1184
|
||||
controlID: 2745
|
||||
--- !u!114 &7
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
@ -165,7 +165,7 @@ MonoBehaviour:
|
|||
m_MinSize: {x: 402, y: 221}
|
||||
m_MaxSize: {x: 8002, y: 4021}
|
||||
vertical: 0
|
||||
controlID: 1185
|
||||
controlID: 2746
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
@ -185,8 +185,8 @@ MonoBehaviour:
|
|||
y: 0
|
||||
width: 337
|
||||
height: 671
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 13}
|
||||
m_Panes:
|
||||
- {fileID: 13}
|
||||
|
@ -211,8 +211,8 @@ MonoBehaviour:
|
|||
y: 0
|
||||
width: 1077
|
||||
height: 671
|
||||
m_MinSize: {x: 202, y: 221}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 14}
|
||||
m_Panes:
|
||||
- {fileID: 14}
|
||||
|
@ -231,7 +231,7 @@ MonoBehaviour:
|
|||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: ProjectBrowser
|
||||
m_Name: ConsoleWindow
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
|
@ -240,15 +240,15 @@ MonoBehaviour:
|
|||
y: 671
|
||||
width: 1414
|
||||
height: 276
|
||||
m_MinSize: {x: 231, y: 271}
|
||||
m_MaxSize: {x: 10001, y: 10021}
|
||||
m_ActualView: {fileID: 17}
|
||||
m_MinSize: {x: 101, y: 121}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 18}
|
||||
m_Panes:
|
||||
- {fileID: 17}
|
||||
- {fileID: 18}
|
||||
- {fileID: 19}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
m_Selected: 1
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &11
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
@ -268,8 +268,8 @@ MonoBehaviour:
|
|||
y: 0
|
||||
width: 506
|
||||
height: 947
|
||||
m_MinSize: {x: 276, y: 71}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_MinSize: {x: 275, y: 50}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 20}
|
||||
m_Panes:
|
||||
- {fileID: 20}
|
||||
|
@ -324,10 +324,10 @@ MonoBehaviour:
|
|||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -960
|
||||
m_HBaseRangeMax: 960
|
||||
m_VBaseRangeMin: -453.5
|
||||
m_VBaseRangeMax: 453.5
|
||||
m_HBaseRangeMin: -537.5
|
||||
m_HBaseRangeMax: 537.5
|
||||
m_VBaseRangeMin: -314.5
|
||||
m_VBaseRangeMax: 314.5
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
|
@ -345,23 +345,23 @@ MonoBehaviour:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 1920
|
||||
height: 907
|
||||
width: 1075
|
||||
height: 629
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Translation: {x: 960, y: 453.5}
|
||||
m_Translation: {x: 537.5, y: 314.5}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -960
|
||||
y: -453.5
|
||||
width: 1920
|
||||
height: 907
|
||||
x: -537.5
|
||||
y: -314.5
|
||||
width: 1075
|
||||
height: 629
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 1
|
||||
m_LastWindowPixelSize: {x: 1920, y: 928}
|
||||
m_LastWindowPixelSize: {x: 1075, y: 650}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
|
@ -398,7 +398,7 @@ MonoBehaviour:
|
|||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 3ef8feff52f8fefff8f8feff62fbffff
|
||||
m_ExpandedIDs: d619fdffea19fdff901afdffdad9feff00dafeffa6dafeff62fbffff
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
|
@ -460,7 +460,7 @@ MonoBehaviour:
|
|||
m_Position:
|
||||
m_Target: {x: 632.8636, y: 316.5322, z: -264.26733}
|
||||
speed: 2
|
||||
m_Value: {x: 557.8876, y: 330.72833, z: -128.25}
|
||||
m_Value: {x: 632.8636, y: 316.5322, z: -264.26733}
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
|
@ -512,7 +512,7 @@ MonoBehaviour:
|
|||
m_Size:
|
||||
m_Target: 404.75827
|
||||
speed: 2
|
||||
m_Value: 302.3116
|
||||
m_Value: 404.75827
|
||||
m_Ortho:
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
|
@ -1295,4 +1295,4 @@ MonoBehaviour:
|
|||
m_PrefName: Preview_InspectorPreview
|
||||
m_PreviewWindow: {fileID: 0}
|
||||
m_LastInspectedObjectInstanceID: -1
|
||||
m_LastVerticalScrollValue: 100
|
||||
m_LastVerticalScrollValue: 0
|
||||
|
|
|
@ -21,10 +21,10 @@ MonoBehaviour:
|
|||
y: 30
|
||||
width: 1920
|
||||
height: 947
|
||||
m_MinSize: {x: 677, y: 492}
|
||||
m_MaxSize: {x: 14001, y: 14042}
|
||||
m_MinSize: {x: 677, y: 342}
|
||||
m_MaxSize: {x: 12002, y: 8042}
|
||||
vertical: 0
|
||||
controlID: 1015
|
||||
controlID: 2536
|
||||
--- !u!114 &2
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
@ -138,10 +138,10 @@ MonoBehaviour:
|
|||
y: 0
|
||||
width: 1414
|
||||
height: 947
|
||||
m_MinSize: {x: 402, y: 492}
|
||||
m_MaxSize: {x: 10001, y: 14042}
|
||||
m_MinSize: {x: 402, y: 342}
|
||||
m_MaxSize: {x: 8002, y: 8042}
|
||||
vertical: 1
|
||||
controlID: 1016
|
||||
controlID: 2488
|
||||
--- !u!114 &4
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
@ -166,7 +166,7 @@ MonoBehaviour:
|
|||
m_MinSize: {x: 402, y: 221}
|
||||
m_MaxSize: {x: 8002, y: 4021}
|
||||
vertical: 0
|
||||
controlID: 1017
|
||||
controlID: 2463
|
||||
--- !u!114 &5
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
@ -224,7 +224,7 @@ MonoBehaviour:
|
|||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 38d1ffff44d1ffff8c4f0000
|
||||
m_ExpandedIDs: dad9feff00dafeffa6dafeff62fbffff
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
|
@ -306,16 +306,16 @@ MonoBehaviour:
|
|||
m_ShowContextualTools: 0
|
||||
m_WindowGUID: 352ee9c972596684b9fdf9db32bf21bf
|
||||
m_Gizmos: 0
|
||||
m_SceneIsLit: 0
|
||||
m_SceneIsLit: 1
|
||||
m_SceneLighting: 1
|
||||
m_2DMode: 1
|
||||
m_isRotationLocked: 0
|
||||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_Position:
|
||||
m_Target: {x: 557.8876, y: 330.72833, z: -128.25}
|
||||
m_Target: {x: 632.8636, y: 316.5322, z: -264.26733}
|
||||
speed: 2
|
||||
m_Value: {x: 557.8876, y: 330.72833, z: -128.25}
|
||||
m_Value: {x: 632.8636, y: 316.5322, z: -264.26733}
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
|
@ -328,7 +328,7 @@ MonoBehaviour:
|
|||
m_SceneViewState:
|
||||
showFog: 1
|
||||
showMaterialUpdate: 0
|
||||
showSkybox: 0
|
||||
showSkybox: 1
|
||||
showFlares: 1
|
||||
showImageEffects: 1
|
||||
showParticleSystems: 1
|
||||
|
@ -365,9 +365,9 @@ MonoBehaviour:
|
|||
speed: 2
|
||||
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_Size:
|
||||
m_Target: 302.3116
|
||||
m_Target: 404.75827
|
||||
speed: 2
|
||||
m_Value: 302.3116
|
||||
m_Value: 404.75827
|
||||
m_Ortho:
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
|
@ -930,7 +930,7 @@ MonoBehaviour:
|
|||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: ProjectBrowser
|
||||
m_Name: ConsoleWindow
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
|
@ -939,15 +939,15 @@ MonoBehaviour:
|
|||
y: 671
|
||||
width: 1414
|
||||
height: 276
|
||||
m_MinSize: {x: 231, y: 271}
|
||||
m_MaxSize: {x: 10001, y: 10021}
|
||||
m_ActualView: {fileID: 12}
|
||||
m_MinSize: {x: 100, y: 100}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 13}
|
||||
m_Panes:
|
||||
- {fileID: 12}
|
||||
- {fileID: 13}
|
||||
- {fileID: 14}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
m_Selected: 1
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &12
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
@ -1053,8 +1053,8 @@ MonoBehaviour:
|
|||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_ListAreaState:
|
||||
m_SelectedInstanceIDs: 944f0000
|
||||
m_LastClickedInstanceID: 20372
|
||||
m_SelectedInstanceIDs:
|
||||
m_LastClickedInstanceID: 0
|
||||
m_HadKeyboardFocusLastEvent: 0
|
||||
m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e9800000249000086980000000000007a140100
|
||||
m_RenameOverlay:
|
||||
|
@ -1203,5 +1203,5 @@ MonoBehaviour:
|
|||
m_ControlHash: -371814159
|
||||
m_PrefName: Preview_InspectorPreview
|
||||
m_PreviewWindow: {fileID: 0}
|
||||
m_LastInspectedObjectInstanceID: 20372
|
||||
m_LastVerticalScrollValue: 100
|
||||
m_LastInspectedObjectInstanceID: -1
|
||||
m_LastVerticalScrollValue: 0
|
||||
|
|
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.
|
@ -55,7 +55,6 @@ ScriptsOnlyBuild:
|
|||
- UnityEditor.U2D.Animation.BoneGizmo
|
||||
Unity.2D.Tilemap.Editor.dll:
|
||||
- UnityEditor.Tilemaps.GridBrush
|
||||
- UnityEditor.Tilemaps.GridBrushEditor
|
||||
- UnityEditor.Tilemaps.GridPaintPaletteClipboard
|
||||
- UnityEditor.Tilemaps.GridPaintPaletteWindow
|
||||
- UnityEditor.Tilemaps.GridPaintingState
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue