Bug fixes
- Fixed issue where animation would not evaluate the clip percentage correctly - Fixed pawn race selection drop down not updating - Fixed issue that was stopping animations with floating points in integer fields from loading
This commit is contained in:
parent
bb2cc29393
commit
270c4cf55b
Binary file not shown.
|
@ -96,11 +96,11 @@ namespace RimWorldAnimationStudio
|
||||||
{
|
{
|
||||||
PawnKeyframe keyframe = Keyframes[i];
|
PawnKeyframe keyframe = Keyframes[i];
|
||||||
|
|
||||||
|
if (keyframe.HasValidKeyframeID() == false)
|
||||||
|
{ keyframe.GenerateKeyframeID(GetOwningActorID()); }
|
||||||
|
|
||||||
if (keyframe.atTick.HasValue)
|
if (keyframe.atTick.HasValue)
|
||||||
{
|
{
|
||||||
if (keyframe.HasValidKeyframeID() == false)
|
|
||||||
{ keyframe.GenerateKeyframeID(Workspace.animationDef.AnimationStages[Workspace.StageID].AnimationClips.IndexOf(this)); }
|
|
||||||
|
|
||||||
BodyAngle.Add((float)keyframe.atTick / (float)duration, keyframe.BodyAngle, true);
|
BodyAngle.Add((float)keyframe.atTick / (float)duration, keyframe.BodyAngle, true);
|
||||||
HeadAngle.Add((float)keyframe.atTick / (float)duration, keyframe.HeadAngle, true);
|
HeadAngle.Add((float)keyframe.atTick / (float)duration, keyframe.HeadAngle, true);
|
||||||
BodyOffsetX.Add((float)keyframe.atTick / (float)duration, keyframe.BodyOffsetX, true);
|
BodyOffsetX.Add((float)keyframe.atTick / (float)duration, keyframe.BodyOffsetX, true);
|
||||||
|
@ -343,12 +343,8 @@ namespace RimWorldAnimationStudio
|
||||||
|
|
||||||
public void OnPostLoad()
|
public void OnPostLoad()
|
||||||
{
|
{
|
||||||
Addons = addons.Copy();
|
|
||||||
|
|
||||||
foreach (PawnKeyframe keyframe in Keyframes)
|
foreach (PawnKeyframe keyframe in Keyframes)
|
||||||
{
|
{ keyframe.OnPostLoad(); }
|
||||||
keyframe.OnPostLoad();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,8 +16,8 @@ namespace RimWorldAnimationStudio
|
||||||
public float? headBob;
|
public float? headBob;
|
||||||
public float? bodyOffsetX;
|
public float? bodyOffsetX;
|
||||||
public float? bodyOffsetZ;
|
public float? bodyOffsetZ;
|
||||||
public int? headFacing;
|
public float? headFacing;
|
||||||
public int? bodyFacing;
|
public float? bodyFacing;
|
||||||
public float? genitalAngle;
|
public float? genitalAngle;
|
||||||
public bool? quiver;
|
public bool? quiver;
|
||||||
public int? tickDuration;
|
public int? tickDuration;
|
||||||
|
@ -69,14 +69,14 @@ namespace RimWorldAnimationStudio
|
||||||
|
|
||||||
[XmlIgnore] public int HeadFacing
|
[XmlIgnore] public int HeadFacing
|
||||||
{
|
{
|
||||||
get { return headFacing.HasValue ? headFacing.Value : (int)(headFacing = 2); }
|
get { return headFacing.HasValue ? (int)headFacing.Value : (int)(headFacing = 2); }
|
||||||
set { headFacing = value; }
|
set { headFacing = (int)value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
[XmlIgnore] public int BodyFacing
|
[XmlIgnore] public int BodyFacing
|
||||||
{
|
{
|
||||||
get { return bodyFacing.HasValue ? bodyFacing.Value : (int)(bodyFacing = 2); }
|
get { return bodyFacing.HasValue ? (int)bodyFacing.Value : (int)(bodyFacing = 2); }
|
||||||
set { bodyFacing = value; }
|
set { bodyFacing = (int)value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
[XmlIgnore] public float GenitalAngle
|
[XmlIgnore] public float GenitalAngle
|
||||||
|
@ -227,12 +227,7 @@ namespace RimWorldAnimationStudio
|
||||||
|
|
||||||
public void OnPostLoad()
|
public void OnPostLoad()
|
||||||
{
|
{
|
||||||
AddonKeyframes.Clear();
|
|
||||||
|
|
||||||
foreach (AddonKeyframe addonKeyframe in addonKeyframes)
|
|
||||||
{
|
|
||||||
AddonKeyframes.Add(addonKeyframe.Copy());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,10 +21,9 @@ namespace RimWorldAnimationStudio
|
||||||
|
|
||||||
public ActorPosition(int actorID, int atTick)
|
public ActorPosition(int actorID, int atTick)
|
||||||
{
|
{
|
||||||
Actor actor = Workspace.GetActor(actorID);
|
|
||||||
PawnAnimationClip clip = Workspace.GetPawnAnimationClip(actorID);
|
PawnAnimationClip clip = Workspace.GetPawnAnimationClip(actorID);
|
||||||
|
|
||||||
float clipPercent = atTick / Workspace.StageWindowSize;
|
float clipPercent = (float)atTick / Workspace.StageWindowSize;
|
||||||
if (atTick > Constants.minTick && atTick == clip.duration) clipPercent = 1f;
|
if (atTick > Constants.minTick && atTick == clip.duration) clipPercent = 1f;
|
||||||
|
|
||||||
if (Workspace.GetCurrentAnimationStage().IsLooping == false)
|
if (Workspace.GetCurrentAnimationStage().IsLooping == false)
|
||||||
|
|
|
@ -89,14 +89,17 @@ namespace RimWorldAnimationStudio
|
||||||
|
|
||||||
public void UpdateRaceDropdown()
|
public void UpdateRaceDropdown()
|
||||||
{
|
{
|
||||||
raceDropdown.ClearOptions();
|
|
||||||
int index = raceDropdown.value;
|
int index = raceDropdown.value;
|
||||||
|
raceDropdown.ClearOptions();
|
||||||
|
|
||||||
IEnumerable<string> optionsList = DefaultTags.defNames.Concat(CustomTags.defNames);
|
IEnumerable<string> optionsList = DefaultTags.defNames.Concat(CustomTags.defNames);
|
||||||
foreach (string defName in optionsList)
|
foreach (string defName in optionsList)
|
||||||
{ raceDropdown.options.Add(new Dropdown.OptionData(defName)); }
|
{ raceDropdown.options.Add(new Dropdown.OptionData(defName)); }
|
||||||
|
|
||||||
raceDropdown.value = Mathf.Clamp(index, 0, raceDropdown.options.Count - 1);
|
raceDropdown.value = Mathf.Clamp(index, 0, raceDropdown.options.Count - 1);
|
||||||
|
raceDropdown.captionText.text = raceDropdown.options[raceDropdown.value].text;
|
||||||
|
|
||||||
|
UpdateGUI();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdateGUI()
|
public void UpdateGUI()
|
||||||
|
|
|
@ -20,7 +20,7 @@ namespace RimWorldAnimationStudio
|
||||||
protected override void OnEnable()
|
protected override void OnEnable()
|
||||||
{
|
{
|
||||||
raceSelectDropdown.ClearOptions();
|
raceSelectDropdown.ClearOptions();
|
||||||
raceSelectDropdown.AddOptions(PawnRaceDefs.allDefs.Select(x => x.defName).ToList());
|
raceSelectDropdown.AddOptions(DefaultTags.defNames.Concat(CustomTags.defNames).ToList());
|
||||||
|
|
||||||
base.OnEnable();
|
base.OnEnable();
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,10 @@ namespace RimWorldAnimationStudio
|
||||||
{
|
{
|
||||||
Button deleteButton = _optionToggle.Find("DeleteButton").GetComponent<Button>();
|
Button deleteButton = _optionToggle.Find("DeleteButton").GetComponent<Button>();
|
||||||
deleteButton.gameObject.SetActive(true);
|
deleteButton.gameObject.SetActive(true);
|
||||||
deleteButton.onClick.AddListener(delegate { RemoveCustomTag(ref CustomTags.defNames, tag); });
|
deleteButton.onClick.AddListener(delegate {
|
||||||
|
RemoveCustomTag(ref CustomTags.defNames, tag);
|
||||||
|
EventsManager.OnDefNamesChanged();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (addedNewTag && i == allTags.Count() - 1)
|
if (addedNewTag && i == allTags.Count() - 1)
|
||||||
|
@ -57,7 +60,8 @@ namespace RimWorldAnimationStudio
|
||||||
fieldComp.onEndEdit.AddListener(delegate
|
fieldComp.onEndEdit.AddListener(delegate
|
||||||
{
|
{
|
||||||
AddCustomTag(fieldComp, ref DefaultTags.defNames, ref CustomTags.defNames);
|
AddCustomTag(fieldComp, ref DefaultTags.defNames, ref CustomTags.defNames);
|
||||||
AddCustomRace(fieldComp);
|
AddCustomRace(fieldComp);
|
||||||
|
EventsManager.OnDefNamesChanged();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -63,15 +63,16 @@ namespace RimWorldAnimationStudio
|
||||||
|
|
||||||
public void LoadAnimation(AnimationDef animationDef)
|
public void LoadAnimation(AnimationDef animationDef)
|
||||||
{
|
{
|
||||||
|
Workspace.Reset();
|
||||||
|
|
||||||
|
Workspace.animationDef = animationDef;
|
||||||
UpdateCustomArrays(animationDef);
|
UpdateCustomArrays(animationDef);
|
||||||
RunPostLoadOperations(animationDef);
|
RunPostLoadOperations(animationDef);
|
||||||
|
|
||||||
animationDef.Initialize();
|
animationDef.Initialize();
|
||||||
|
|
||||||
Debug.Log("Loaded AnimationDef: " + animationDef.DefName);
|
Debug.Log("Loaded AnimationDef: " + animationDef.DefName);
|
||||||
|
|
||||||
Workspace.Reset();
|
|
||||||
Workspace.animationDef = animationDef;
|
|
||||||
|
|
||||||
AnimationController.Instance.Reset();
|
AnimationController.Instance.Reset();
|
||||||
AnimationController.Instance.Initialize();
|
AnimationController.Instance.Initialize();
|
||||||
|
|
||||||
|
@ -100,9 +101,7 @@ namespace RimWorldAnimationStudio
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (AnimationStage stage in animationDef.AnimationStages)
|
foreach (AnimationStage stage in animationDef.AnimationStages)
|
||||||
{
|
{ stage.OnPostLoad(); }
|
||||||
stage.OnPostLoad();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void TryToSaveAnimation()
|
public void TryToSaveAnimation()
|
||||||
|
|
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.
|
@ -21,7 +21,7 @@ MonoBehaviour:
|
||||||
m_ShowMode: 4
|
m_ShowMode: 4
|
||||||
m_Title:
|
m_Title:
|
||||||
m_RootView: {fileID: 2}
|
m_RootView: {fileID: 2}
|
||||||
m_MinSize: {x: 875, y: 392}
|
m_MinSize: {x: 875, y: 300}
|
||||||
m_MaxSize: {x: 10000, y: 10000}
|
m_MaxSize: {x: 10000, y: 10000}
|
||||||
m_Maximized: 1
|
m_Maximized: 1
|
||||||
--- !u!114 &2
|
--- !u!114 &2
|
||||||
|
@ -46,7 +46,7 @@ MonoBehaviour:
|
||||||
y: 0
|
y: 0
|
||||||
width: 1920
|
width: 1920
|
||||||
height: 997
|
height: 997
|
||||||
m_MinSize: {x: 875, y: 392}
|
m_MinSize: {x: 875, y: 300}
|
||||||
m_MaxSize: {x: 10000, y: 10000}
|
m_MaxSize: {x: 10000, y: 10000}
|
||||||
--- !u!114 &3
|
--- !u!114 &3
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -112,10 +112,10 @@ MonoBehaviour:
|
||||||
y: 30
|
y: 30
|
||||||
width: 1920
|
width: 1920
|
||||||
height: 947
|
height: 947
|
||||||
m_MinSize: {x: 678, y: 342}
|
m_MinSize: {x: 679, y: 342}
|
||||||
m_MaxSize: {x: 12003, y: 8042}
|
m_MaxSize: {x: 12004, y: 8042}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 10945
|
controlID: 4951
|
||||||
--- !u!114 &6
|
--- !u!114 &6
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
@ -137,10 +137,10 @@ MonoBehaviour:
|
||||||
y: 0
|
y: 0
|
||||||
width: 1414
|
width: 1414
|
||||||
height: 947
|
height: 947
|
||||||
m_MinSize: {x: 402, y: 342}
|
m_MinSize: {x: 403, y: 342}
|
||||||
m_MaxSize: {x: 8002, y: 8042}
|
m_MaxSize: {x: 8003, y: 8042}
|
||||||
vertical: 1
|
vertical: 1
|
||||||
controlID: 10946
|
controlID: 4952
|
||||||
--- !u!114 &7
|
--- !u!114 &7
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
@ -162,10 +162,10 @@ MonoBehaviour:
|
||||||
y: 0
|
y: 0
|
||||||
width: 1414
|
width: 1414
|
||||||
height: 671
|
height: 671
|
||||||
m_MinSize: {x: 402, y: 221}
|
m_MinSize: {x: 403, y: 221}
|
||||||
m_MaxSize: {x: 8002, y: 4021}
|
m_MaxSize: {x: 8003, y: 4021}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 10947
|
controlID: 4953
|
||||||
--- !u!114 &8
|
--- !u!114 &8
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
@ -185,8 +185,8 @@ MonoBehaviour:
|
||||||
y: 0
|
y: 0
|
||||||
width: 337
|
width: 337
|
||||||
height: 671
|
height: 671
|
||||||
m_MinSize: {x: 201, y: 221}
|
m_MinSize: {x: 200, y: 200}
|
||||||
m_MaxSize: {x: 4001, y: 4021}
|
m_MaxSize: {x: 4000, y: 4000}
|
||||||
m_ActualView: {fileID: 13}
|
m_ActualView: {fileID: 13}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 13}
|
- {fileID: 13}
|
||||||
|
@ -324,10 +324,10 @@ MonoBehaviour:
|
||||||
m_VRangeLocked: 0
|
m_VRangeLocked: 0
|
||||||
hZoomLockedByDefault: 0
|
hZoomLockedByDefault: 0
|
||||||
vZoomLockedByDefault: 0
|
vZoomLockedByDefault: 0
|
||||||
m_HBaseRangeMin: -960
|
m_HBaseRangeMin: -537.5
|
||||||
m_HBaseRangeMax: 960
|
m_HBaseRangeMax: 537.5
|
||||||
m_VBaseRangeMin: -453.5
|
m_VBaseRangeMin: -314.5
|
||||||
m_VBaseRangeMax: 453.5
|
m_VBaseRangeMax: 314.5
|
||||||
m_HAllowExceedBaseRangeMin: 1
|
m_HAllowExceedBaseRangeMin: 1
|
||||||
m_HAllowExceedBaseRangeMax: 1
|
m_HAllowExceedBaseRangeMax: 1
|
||||||
m_VAllowExceedBaseRangeMin: 1
|
m_VAllowExceedBaseRangeMin: 1
|
||||||
|
@ -345,23 +345,23 @@ MonoBehaviour:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 21
|
y: 21
|
||||||
width: 1920
|
width: 1075
|
||||||
height: 907
|
height: 629
|
||||||
m_Scale: {x: 1, y: 1}
|
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_MarginLeft: 0
|
||||||
m_MarginRight: 0
|
m_MarginRight: 0
|
||||||
m_MarginTop: 0
|
m_MarginTop: 0
|
||||||
m_MarginBottom: 0
|
m_MarginBottom: 0
|
||||||
m_LastShownAreaInsideMargins:
|
m_LastShownAreaInsideMargins:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: -960
|
x: -537.5
|
||||||
y: -453.5
|
y: -314.5
|
||||||
width: 1920
|
width: 1075
|
||||||
height: 907
|
height: 629
|
||||||
m_MinimalGUI: 1
|
m_MinimalGUI: 1
|
||||||
m_defaultScale: 1
|
m_defaultScale: 1
|
||||||
m_LastWindowPixelSize: {x: 1920, y: 928}
|
m_LastWindowPixelSize: {x: 1075, y: 650}
|
||||||
m_ClearInEditMode: 1
|
m_ClearInEditMode: 1
|
||||||
m_NoCameraWarning: 1
|
m_NoCameraWarning: 1
|
||||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||||
|
@ -398,7 +398,7 @@ MonoBehaviour:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs:
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: 703effff843effff283fffff3e6fffff526ffffff66fffff72acffff50dbffff1ee8ffff34f5ffff62fbffffd63a0000043b0000543e0000d83e00002040000086400000064100004a420000aa420000e04300002e440000bc4500002a46000026470000505f0100ae620100d6630100d266010098680100086901008c690100726b0100446d0100346f010084700100
|
m_ExpandedIDs: d2b4fdffe6b4fdff8ab5fdff4a97feff64b4feff8eb4feff2afaffff0c40000046450000c2490000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
|
@ -1117,7 +1117,7 @@ MonoBehaviour:
|
||||||
scrollPos: {x: 0, y: 229}
|
scrollPos: {x: 0, y: 229}
|
||||||
m_SelectedIDs: 284f0000
|
m_SelectedIDs: 284f0000
|
||||||
m_LastClickedID: 20264
|
m_LastClickedID: 20264
|
||||||
m_ExpandedIDs: 000000002c4e00002e4e0000304e0000324e0000344e0000364e0000384e00003a4e0000564e00005a4e0000284f00005c4f000000ca9a3b
|
m_ExpandedIDs: 000000009e500000a0500000a2500000a4500000a6500000a8500000aa500000ac500000ae500000b0500000b2500000b4500000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
|
@ -1145,7 +1145,7 @@ MonoBehaviour:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs:
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: 000000002c4e00002e4e0000304e0000324e0000344e0000364e0000384e00003a4e0000564e00005a4e0000284f00005c4f000000ca9a3b
|
m_ExpandedIDs: 000000009e500000a0500000a2500000a4500000a6500000a8500000aa500000ac500000ae500000b0500000b2500000b4500000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
|
|
|
@ -21,10 +21,10 @@ MonoBehaviour:
|
||||||
y: 30
|
y: 30
|
||||||
width: 1920
|
width: 1920
|
||||||
height: 947
|
height: 947
|
||||||
m_MinSize: {x: 678, y: 342}
|
m_MinSize: {x: 679, y: 342}
|
||||||
m_MaxSize: {x: 12003, y: 8042}
|
m_MaxSize: {x: 12004, y: 8042}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 10709
|
controlID: 4784
|
||||||
--- !u!114 &2
|
--- !u!114 &2
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
@ -138,10 +138,10 @@ MonoBehaviour:
|
||||||
y: 0
|
y: 0
|
||||||
width: 1414
|
width: 1414
|
||||||
height: 947
|
height: 947
|
||||||
m_MinSize: {x: 402, y: 342}
|
m_MinSize: {x: 403, y: 342}
|
||||||
m_MaxSize: {x: 8002, y: 8042}
|
m_MaxSize: {x: 8003, y: 8042}
|
||||||
vertical: 1
|
vertical: 1
|
||||||
controlID: 10710
|
controlID: 4748
|
||||||
--- !u!114 &4
|
--- !u!114 &4
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
@ -163,10 +163,10 @@ MonoBehaviour:
|
||||||
y: 0
|
y: 0
|
||||||
width: 1414
|
width: 1414
|
||||||
height: 671
|
height: 671
|
||||||
m_MinSize: {x: 402, y: 221}
|
m_MinSize: {x: 403, y: 221}
|
||||||
m_MaxSize: {x: 8002, y: 4021}
|
m_MaxSize: {x: 8003, y: 4021}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 10711
|
controlID: 4749
|
||||||
--- !u!114 &5
|
--- !u!114 &5
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
@ -186,8 +186,8 @@ MonoBehaviour:
|
||||||
y: 0
|
y: 0
|
||||||
width: 337
|
width: 337
|
||||||
height: 671
|
height: 671
|
||||||
m_MinSize: {x: 200, y: 200}
|
m_MinSize: {x: 201, y: 221}
|
||||||
m_MaxSize: {x: 4000, y: 4000}
|
m_MaxSize: {x: 4001, y: 4021}
|
||||||
m_ActualView: {fileID: 6}
|
m_ActualView: {fileID: 6}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 6}
|
- {fileID: 6}
|
||||||
|
@ -224,7 +224,7 @@ MonoBehaviour:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs:
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: 3e6fffff526ffffff66fffff72acffff50dbffff1ee8ffff34f5ffff62fbffffd63a0000043b0000543e0000d83e00002040000086400000064100004a420000aa420000e04300002e440000bc4500002a46000026470000505f0100ae620100d6630100d266010098680100086901008c690100726b0100446d0100346f010084700100
|
m_ExpandedIDs: 4a97feff64b4feff8eb4feff2afaffff0c40000046450000c2490000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
|
@ -939,8 +939,8 @@ MonoBehaviour:
|
||||||
y: 671
|
y: 671
|
||||||
width: 1414
|
width: 1414
|
||||||
height: 276
|
height: 276
|
||||||
m_MinSize: {x: 100, y: 100}
|
m_MinSize: {x: 101, y: 121}
|
||||||
m_MaxSize: {x: 4000, y: 4000}
|
m_MaxSize: {x: 4001, y: 4021}
|
||||||
m_ActualView: {fileID: 13}
|
m_ActualView: {fileID: 13}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 12}
|
- {fileID: 12}
|
||||||
|
@ -1000,7 +1000,7 @@ MonoBehaviour:
|
||||||
scrollPos: {x: 0, y: 229}
|
scrollPos: {x: 0, y: 229}
|
||||||
m_SelectedIDs: 284f0000
|
m_SelectedIDs: 284f0000
|
||||||
m_LastClickedID: 20264
|
m_LastClickedID: 20264
|
||||||
m_ExpandedIDs: 000000002c4e00002e4e0000304e0000324e0000344e0000364e0000384e00003a4e0000564e00005a4e0000284f00005c4f000000ca9a3b
|
m_ExpandedIDs: 000000009e500000a0500000a2500000a4500000a6500000a8500000aa500000ac500000ae500000b0500000b2500000b4500000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
|
@ -1028,7 +1028,7 @@ MonoBehaviour:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs:
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: 000000002c4e00002e4e0000304e0000324e0000344e0000364e0000384e00003a4e0000564e00005a4e0000284f00005c4f000000ca9a3b
|
m_ExpandedIDs: 000000009e500000a0500000a2500000a4500000a6500000a8500000aa500000ac500000ae500000b0500000b2500000b4500000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
|
@ -1160,8 +1160,8 @@ MonoBehaviour:
|
||||||
y: 0
|
y: 0
|
||||||
width: 506
|
width: 506
|
||||||
height: 947
|
height: 947
|
||||||
m_MinSize: {x: 275, y: 50}
|
m_MinSize: {x: 276, y: 71}
|
||||||
m_MaxSize: {x: 4000, y: 4000}
|
m_MaxSize: {x: 4001, y: 4021}
|
||||||
m_ActualView: {fileID: 16}
|
m_ActualView: {fileID: 16}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 16}
|
- {fileID: 16}
|
||||||
|
@ -1203,5 +1203,5 @@ MonoBehaviour:
|
||||||
m_ControlHash: -371814159
|
m_ControlHash: -371814159
|
||||||
m_PrefName: Preview_InspectorPreview
|
m_PrefName: Preview_InspectorPreview
|
||||||
m_PreviewWindow: {fileID: 0}
|
m_PreviewWindow: {fileID: 0}
|
||||||
m_LastInspectedObjectInstanceID: 94004
|
m_LastInspectedObjectInstanceID: 16624
|
||||||
m_LastVerticalScrollValue: 0
|
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.
Binary file not shown.
|
@ -123,131 +123,131 @@ ScriptsOnlyBuild:
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11260}
|
Script: {instanceID: 11260}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11262}
|
Script: {instanceID: 11408}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11264}
|
Script: {instanceID: 11432}
|
||||||
- Class: 114
|
|
||||||
Script: {instanceID: 11268}
|
|
||||||
- Class: 114
|
|
||||||
Script: {instanceID: 11292}
|
|
||||||
- Class: 114
|
|
||||||
Script: {instanceID: 11450}
|
|
||||||
- Class: 114
|
|
||||||
Script: {instanceID: 11504}
|
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11590}
|
Script: {instanceID: 11590}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11604}
|
Script: {instanceID: 11644}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11658}
|
Script: {instanceID: 11720}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11732}
|
Script: {instanceID: 11732}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11756}
|
Script: {instanceID: 11746}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11760}
|
Script: {instanceID: 11800}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11762}
|
Script: {instanceID: 11874}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11770}
|
Script: {instanceID: 11898}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11780}
|
Script: {instanceID: 11902}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11802}
|
Script: {instanceID: 11904}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11866}
|
Script: {instanceID: 11912}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 11872}
|
Script: {instanceID: 11922}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 12138}
|
Script: {instanceID: 11944}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 12174}
|
Script: {instanceID: 12008}
|
||||||
|
- Class: 114
|
||||||
|
Script: {instanceID: 12014}
|
||||||
|
- Class: 114
|
||||||
|
Script: {instanceID: 12282}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 12318}
|
Script: {instanceID: 12318}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 12342}
|
Script: {instanceID: 12462}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 12358}
|
Script: {instanceID: 12486}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 12428}
|
Script: {instanceID: 12502}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 12608}
|
Script: {instanceID: 12572}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 12632}
|
Script: {instanceID: 12752}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 12750}
|
Script: {instanceID: 12776}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 12874}
|
Script: {instanceID: 12872}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 12918}
|
Script: {instanceID: 12896}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13168}
|
Script: {instanceID: 13020}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13194}
|
Script: {instanceID: 13064}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13234}
|
Script: {instanceID: 13314}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13244}
|
Script: {instanceID: 13340}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13254}
|
Script: {instanceID: 13380}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13266}
|
Script: {instanceID: 13390}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13368}
|
Script: {instanceID: 13400}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13386}
|
Script: {instanceID: 13410}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13388}
|
Script: {instanceID: 13512}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13420}
|
Script: {instanceID: 13530}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13460}
|
Script: {instanceID: 13532}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13476}
|
Script: {instanceID: 13564}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13492}
|
Script: {instanceID: 13604}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13504}
|
Script: {instanceID: 13620}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13508}
|
Script: {instanceID: 13636}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13544}
|
Script: {instanceID: 13648}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13676}
|
Script: {instanceID: 13652}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13702}
|
Script: {instanceID: 13688}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13834}
|
Script: {instanceID: 13820}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13908}
|
Script: {instanceID: 13846}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 13912}
|
Script: {instanceID: 13978}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 14102}
|
Script: {instanceID: 14052}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 14198}
|
Script: {instanceID: 14056}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 14348}
|
Script: {instanceID: 14246}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 14496}
|
Script: {instanceID: 14342}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 14522}
|
Script: {instanceID: 14492}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 14524}
|
Script: {instanceID: 14640}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 14556}
|
Script: {instanceID: 14666}
|
||||||
- Class: 114
|
|
||||||
Script: {instanceID: 14578}
|
|
||||||
- Class: 114
|
|
||||||
Script: {instanceID: 14580}
|
|
||||||
- Class: 114
|
|
||||||
Script: {instanceID: 14620}
|
|
||||||
- Class: 114
|
|
||||||
Script: {instanceID: 14626}
|
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 14668}
|
Script: {instanceID: 14668}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {instanceID: 58294}
|
Script: {instanceID: 14700}
|
||||||
|
- Class: 114
|
||||||
|
Script: {instanceID: 14722}
|
||||||
|
- Class: 114
|
||||||
|
Script: {instanceID: 14724}
|
||||||
|
- Class: 114
|
||||||
|
Script: {instanceID: 14746}
|
||||||
|
- Class: 114
|
||||||
|
Script: {instanceID: 14766}
|
||||||
|
- Class: 114
|
||||||
|
Script: {instanceID: 14772}
|
||||||
|
- Class: 114
|
||||||
|
Script: {instanceID: 14814}
|
||||||
- Class: 115
|
- Class: 115
|
||||||
Script: {instanceID: 0}
|
Script: {instanceID: 0}
|
||||||
- Class: 128
|
- Class: 128
|
||||||
|
@ -273,12 +273,6 @@ ScriptsOnlyBuild:
|
||||||
assemblyName: UnityEngine.UI.dll
|
assemblyName: UnityEngine.UI.dll
|
||||||
namespaceName: UnityEngine.UI
|
namespaceName: UnityEngine.UI
|
||||||
className: Button
|
className: Button
|
||||||
- hash:
|
|
||||||
serializedVersion: 2
|
|
||||||
Hash: d4020bafcd3ccbb5601a6e6c8ac78be0
|
|
||||||
assemblyName: UnityEngine.UI.dll
|
|
||||||
namespaceName: UnityEngine.UI
|
|
||||||
className: ScrollRect
|
|
||||||
- hash:
|
- hash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: aeb62f729c52c814dec86c47dcac1471
|
Hash: aeb62f729c52c814dec86c47dcac1471
|
||||||
|
@ -291,12 +285,6 @@ ScriptsOnlyBuild:
|
||||||
assemblyName: UnityEngine.UI.dll
|
assemblyName: UnityEngine.UI.dll
|
||||||
namespaceName: UnityEngine.UI
|
namespaceName: UnityEngine.UI
|
||||||
className: GraphicRaycaster
|
className: GraphicRaycaster
|
||||||
- hash:
|
|
||||||
serializedVersion: 2
|
|
||||||
Hash: 7072231382eb3c4871b3dd75ad0227e1
|
|
||||||
assemblyName: UnityEngine.UI.dll
|
|
||||||
namespaceName: UnityEngine.UI
|
|
||||||
className: Slider
|
|
||||||
- hash:
|
- hash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 8aa3d6ccbcb54ee8db6c1229854adaaa
|
Hash: 8aa3d6ccbcb54ee8db6c1229854adaaa
|
||||||
|
@ -369,6 +357,12 @@ ScriptsOnlyBuild:
|
||||||
assemblyName: Unity.Timeline.dll
|
assemblyName: Unity.Timeline.dll
|
||||||
namespaceName: UnityEngine.Timeline
|
namespaceName: UnityEngine.Timeline
|
||||||
className: ActivationTrack
|
className: ActivationTrack
|
||||||
|
- hash:
|
||||||
|
serializedVersion: 2
|
||||||
|
Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f
|
||||||
|
assemblyName: Assembly-CSharp.dll
|
||||||
|
namespaceName: RimWorldAnimationStudio
|
||||||
|
className: SnapToKeyframe
|
||||||
- hash:
|
- hash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 77e6a8684e87c7149fe7ed4aefc411cc
|
Hash: 77e6a8684e87c7149fe7ed4aefc411cc
|
||||||
|
@ -639,6 +633,12 @@ ScriptsOnlyBuild:
|
||||||
assemblyName: Assembly-CSharp.dll
|
assemblyName: Assembly-CSharp.dll
|
||||||
namespaceName: RimWorldAnimationStudio
|
namespaceName: RimWorldAnimationStudio
|
||||||
className: AddonAnchorDropdown
|
className: AddonAnchorDropdown
|
||||||
|
- hash:
|
||||||
|
serializedVersion: 2
|
||||||
|
Hash: d4020bafcd3ccbb5601a6e6c8ac78be0
|
||||||
|
assemblyName: UnityEngine.UI.dll
|
||||||
|
namespaceName: UnityEngine.UI
|
||||||
|
className: ScrollRect
|
||||||
- hash:
|
- hash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 7fa489254157ab6a0341a98a57005c5f
|
Hash: 7fa489254157ab6a0341a98a57005c5f
|
||||||
|
@ -1011,6 +1011,12 @@ ScriptsOnlyBuild:
|
||||||
assemblyName: Unity.Timeline.dll
|
assemblyName: Unity.Timeline.dll
|
||||||
namespaceName: UnityEngine.Timeline
|
namespaceName: UnityEngine.Timeline
|
||||||
className: SignalEmitter
|
className: SignalEmitter
|
||||||
|
- hash:
|
||||||
|
serializedVersion: 2
|
||||||
|
Hash: 7072231382eb3c4871b3dd75ad0227e1
|
||||||
|
assemblyName: UnityEngine.UI.dll
|
||||||
|
namespaceName: UnityEngine.UI
|
||||||
|
className: Slider
|
||||||
- hash:
|
- hash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: a513e3161c99b15c1f575ee892238730
|
Hash: a513e3161c99b15c1f575ee892238730
|
||||||
|
@ -1035,12 +1041,6 @@ ScriptsOnlyBuild:
|
||||||
assemblyName: Assembly-CSharp.dll
|
assemblyName: Assembly-CSharp.dll
|
||||||
namespaceName: RimWorldAnimationStudio
|
namespaceName: RimWorldAnimationStudio
|
||||||
className: DropdownMenu
|
className: DropdownMenu
|
||||||
- hash:
|
|
||||||
serializedVersion: 2
|
|
||||||
Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f
|
|
||||||
assemblyName: Assembly-CSharp.dll
|
|
||||||
namespaceName: RimWorldAnimationStudio
|
|
||||||
className: SnapToKeyframe
|
|
||||||
platform: 5
|
platform: 5
|
||||||
scenePathNames:
|
scenePathNames:
|
||||||
- Assets/Scenes/MainScene.unity
|
- Assets/Scenes/MainScene.unity
|
||||||
|
|
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