diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index 3350b89d..0449ff7a 100644 Binary files a/.vs/RimWorld-Animation-Studio/v16/.suo and b/.vs/RimWorld-Animation-Studio/v16/.suo differ diff --git a/Assets/Resources/Prefabs/KeyframeSlider.prefab b/Assets/Resources/Prefabs/KeyframeSlider.prefab index ef4fd057..fd081f6b 100644 --- a/Assets/Resources/Prefabs/KeyframeSlider.prefab +++ b/Assets/Resources/Prefabs/KeyframeSlider.prefab @@ -221,7 +221,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_SelectedTrigger: Selected m_DisabledTrigger: Disabled - m_Interactable: 0 + m_Interactable: 1 m_TargetGraphic: {fileID: 0} m_FillRect: {fileID: 0} m_HandleRect: {fileID: 4629009613275671144} diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index a6e99aec..1beafe41 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -12899,7 +12899,7 @@ MonoBehaviour: currentMessage: {fileID: 1308919825} logMessagePrefab: {fileID: 7082774796440540818, guid: a29caea8e4b276d4c861e9eb083562fc, type: 3} - maxMessages: 100 + maxMessages: 500 --- !u!222 &1059017488 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs b/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs index cdf692bf..2a01c2dc 100644 --- a/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs +++ b/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs @@ -41,6 +41,8 @@ namespace RimWorldAnimationStudio int keyframePosition = 0; + keyframes[keyframes.Count - 1].tickDuration = 1; + for (int i = 0; i < keyframes.Count; i++) { PawnKeyframe keyframe = keyframes[i]; @@ -84,8 +86,6 @@ namespace RimWorldAnimationStudio keyframePosition += keyframe.tickDuration; } } - - keyframes[keyframes.Count - 1].tickDuration = 1; } public override void ValidateData() { } diff --git a/Assets/Scripts/AnimationComponents/AnimationStage.cs b/Assets/Scripts/AnimationComponents/AnimationStage.cs index c25676f4..0d7cf11d 100644 --- a/Assets/Scripts/AnimationComponents/AnimationStage.cs +++ b/Assets/Scripts/AnimationComponents/AnimationStage.cs @@ -34,11 +34,6 @@ namespace RimWorldAnimationStudio // Sort keyframes by atTick foreach (PawnAnimationClip clip in animationClips) { clip.keyframes = clip.keyframes.OrderBy(x => x.atTick).ToList(); } - - // Check if looping - stageWindowSize = stageWindowSize > 0 ? stageWindowSize : animationClips.Select(x => x.duration).Max(); - int cycles = Mathf.CeilToInt(playTimeTicks / stageWindowSize); - isLooping = cycles > 1; } public bool MakeNew() diff --git a/Assets/Scripts/GUI/ActorCard.cs b/Assets/Scripts/GUI/ActorCard.cs index 27720699..4c2aa57c 100644 --- a/Assets/Scripts/GUI/ActorCard.cs +++ b/Assets/Scripts/GUI/ActorCard.cs @@ -91,6 +91,7 @@ namespace RimWorldAnimationStudio Actor actor = Workspace.animationDef.actors[Workspace.actorID]; ActorBody actorBody = AnimationController.Instance.actorBodies.GetComponentsInChildren()[Workspace.actorID]; + PawnAnimationClip clip = Workspace.Instance.GetCurrentPawnAnimationClip(); string bodyType = actorBody.bodyType; bodyType = bodyType == null || bodyType == "" ? "Male" : bodyType; @@ -110,6 +111,21 @@ namespace RimWorldAnimationStudio { raceOffsetZField.text = actor.GetAlienRaceOffset().z.ToString(); } initiatorToggle.isOn = actor.initiator; + + if (actor.requiredGender.Contains("Female")) + { genderDropdown.SetValueWithoutNotify(0); } + + else if (actor.requiredGender.Contains("Male")) + { genderDropdown.SetValueWithoutNotify(2); } + + else + { genderDropdown.SetValueWithoutNotify(1); } + + for (int i = 0; i < selectActorLayerDropdown.options.Count; i++) + { + if (selectActorLayerDropdown.options[i].text == clip.layer) + { selectActorLayerDropdown.SetValueWithoutNotify(i); } + } } } } diff --git a/Assets/Scripts/GUI/KeyframeSlider.cs b/Assets/Scripts/GUI/KeyframeSlider.cs index fae0642f..4d48d837 100644 --- a/Assets/Scripts/GUI/KeyframeSlider.cs +++ b/Assets/Scripts/GUI/KeyframeSlider.cs @@ -107,15 +107,13 @@ namespace RimWorldAnimationStudio AnimationController.Instance.stageTick = keyframe.atTick.Value; Workspace.actorID = actorID; Workspace.keyframeID = keyframeID; - - if (keyframe.atTick == 1) - { return; } - - interactable = true; } public override void OnDrag(PointerEventData eventData) { + if (keyframe.atTick == 1) + { value = 1; return; } + base.OnDrag(eventData); AnimationController.Instance.stageTick = keyframe.atTick.Value; @@ -124,7 +122,8 @@ namespace RimWorldAnimationStudio public void OnEndDrag(PointerEventData eventData) { - interactable = false; + if (keyframe.atTick == 1) + { value = 1; return; } Workspace.Instance.RecordEvent("Keyframe tick"); } diff --git a/Assets/Scripts/Managers/AnimationController.cs b/Assets/Scripts/Managers/AnimationController.cs index 433dfd80..e8b0b772 100644 --- a/Assets/Scripts/Managers/AnimationController.cs +++ b/Assets/Scripts/Managers/AnimationController.cs @@ -361,20 +361,22 @@ namespace RimWorldAnimationStudio public void RemovePawnKeyframe(int actorID, int keyframeID) { PawnKeyframe keyframe = Workspace.Instance.GetPawnKeyframe(actorID, keyframeID); + PawnAnimationClip clip = Workspace.animationDef.animationStages[Workspace.stageID].animationClips[actorID]; - if (keyframe != null && keyframe.atTick == 1) - { Debug.LogWarning("Cannot delete key frame - the first key frame of an animation cannot be deleted"); return; } + if (keyframe == null || clip == null) return; - if (keyframe != null) - { - animationTimelines.GetComponentsInChildren()[Workspace.actorID].RemovePawnKeyFrame(keyframe.keyframeID); + if (keyframe.atTick == 1) + { Debug.LogWarning("Cannot delete key frame - the first key frame of an animation clip cannot be deleted"); return; } - PawnAnimationClip clip = Workspace.animationDef.animationStages[Workspace.stageID].animationClips[actorID]; - clip.keyframes.Remove(keyframe); - clip.BuildSimpleCurves(); + if (clip.keyframes.Count <= 2) + { Debug.LogWarning("Cannot delete key frame - an animation clip must have two or more keyframes"); return; } - Workspace.Instance.RecordEvent("Keyframe deletion"); - } + animationTimelines.GetComponentsInChildren()[Workspace.actorID].RemovePawnKeyFrame(keyframe.keyframeID); + + clip.keyframes.Remove(keyframe); + clip.BuildSimpleCurves(); + + Workspace.Instance.RecordEvent("Keyframe deletion"); } public void ToggleAnimation() @@ -453,8 +455,6 @@ namespace RimWorldAnimationStudio { foreach (PawnKeyframe keyframe in clip.keyframes) { - if (keyframe.atTick == 1) continue; - keyframe.tickDuration = Mathf.RoundToInt(keyframe.tickDuration * scale); keyframe.atTick = null; } @@ -468,7 +468,13 @@ namespace RimWorldAnimationStudio if (Workspace.animationDef == null) return; if (int.TryParse(cyclesNormalField.text, out int cycles)) - { Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicks = cycles * Workspace.StageWindowSize; } + { + Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicks = cycles * Workspace.StageWindowSize; + Workspace.animationDef.animationStages[Workspace.stageID].isLooping = cycles > 1; + + foreach(AnimationTimeline animationTimeline in animationTimelines.GetComponentsInChildren()) + { animationTimeline.InitiateUpdateOfGhostFrames(); } + } Workspace.Instance.RecordEvent("Cycle count (normal)"); } @@ -477,8 +483,14 @@ namespace RimWorldAnimationStudio { if (Workspace.animationDef == null) return; - if (int.TryParse(cyclesFastField.text, out int cycles)) - { Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicksQuick = cycles * Workspace.StageWindowSize; } + if (int.TryParse(cyclesFastField.text, out int fastCycles)) + { + int.TryParse(cyclesNormalField.text, out int cycles); + if (fastCycles > cycles) fastCycles = cycles; + cyclesFastField.text = fastCycles.ToString(); + + Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicksQuick = fastCycles * Workspace.StageWindowSize; + } Workspace.Instance.RecordEvent("Cycle count (fast)"); } diff --git a/Assets/Scripts/Math/Constants/Constants.cs b/Assets/Scripts/Math/Constants/Constants.cs index 4b55cacd..32dc8e06 100644 --- a/Assets/Scripts/Math/Constants/Constants.cs +++ b/Assets/Scripts/Math/Constants/Constants.cs @@ -88,7 +88,7 @@ namespace RimWorldAnimationStudio foreach (string bodyType in allTags) { path = alienRaceDef.GetBodyTypeGraphicPath(facing, bodyType); - Debug.Log(path); + if (path != null && path != "") { alienRaceDef.SetBodyTypeGraphicPath(path, facing, bodyType); } } diff --git a/Assets/Scripts/Workspace/Workspace.cs b/Assets/Scripts/Workspace/Workspace.cs index 9b774a5d..c4209c81 100644 --- a/Assets/Scripts/Workspace/Workspace.cs +++ b/Assets/Scripts/Workspace/Workspace.cs @@ -31,18 +31,12 @@ namespace RimWorldAnimationStudio { return -1; } if (animationDef.animationStages[stageID].stageWindowSize < 0) - { return animationDef.animationStages[stageID].animationClips.Select(x => x.duration).Max(); } + { animationDef.animationStages[stageID].stageWindowSize = animationDef.animationStages[stageID].animationClips.Select(x => x.duration).Max(); } return animationDef.animationStages[stageID].stageWindowSize; } } - public void Update() - { - //if (isDirty) - //{ TrackChanges(); } - } - public PawnKeyframe GetCurrentPawnKeyframe(bool makeKeyframe = false) { int stageTick = AnimationController.Instance.stageTick; diff --git a/Library/ArtifactDB b/Library/ArtifactDB index 812dbc71..52899031 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/02/02e72dde95d19a83ab8a4876d1b19f5a b/Library/Artifacts/02/02e72dde95d19a83ab8a4876d1b19f5a deleted file mode 100644 index 85bed0a5..00000000 Binary files a/Library/Artifacts/02/02e72dde95d19a83ab8a4876d1b19f5a and /dev/null differ diff --git a/Library/Artifacts/03/0339cf119ce13895ba31691c287331bd b/Library/Artifacts/03/0339cf119ce13895ba31691c287331bd new file mode 100644 index 00000000..2e22d0ca Binary files /dev/null and b/Library/Artifacts/03/0339cf119ce13895ba31691c287331bd differ diff --git a/Library/Artifacts/05/051722fd07f3017ac8b094ed58a250e9 b/Library/Artifacts/05/051722fd07f3017ac8b094ed58a250e9 new file mode 100644 index 00000000..457d4b4e Binary files /dev/null and b/Library/Artifacts/05/051722fd07f3017ac8b094ed58a250e9 differ diff --git a/Library/Artifacts/06/065ed3f2aa6870e1304b79783a14ea36 b/Library/Artifacts/06/065ed3f2aa6870e1304b79783a14ea36 deleted file mode 100644 index f448c72a..00000000 Binary files a/Library/Artifacts/06/065ed3f2aa6870e1304b79783a14ea36 and /dev/null differ diff --git a/Library/Artifacts/10/10728601dfded914ce3daa8513b7949c b/Library/Artifacts/10/10728601dfded914ce3daa8513b7949c new file mode 100644 index 00000000..e849c8cd Binary files /dev/null and b/Library/Artifacts/10/10728601dfded914ce3daa8513b7949c differ diff --git a/Library/Artifacts/19/1913a2b974ca7ab69ccba713ba78c210 b/Library/Artifacts/19/1913a2b974ca7ab69ccba713ba78c210 deleted file mode 100644 index b839e916..00000000 Binary files a/Library/Artifacts/19/1913a2b974ca7ab69ccba713ba78c210 and /dev/null differ diff --git a/Library/Artifacts/25/250e6ad3dae79a0b84cb631e4e6faef5 b/Library/Artifacts/25/250e6ad3dae79a0b84cb631e4e6faef5 deleted file mode 100644 index 21896b9b..00000000 Binary files a/Library/Artifacts/25/250e6ad3dae79a0b84cb631e4e6faef5 and /dev/null differ diff --git a/Library/Artifacts/29/297defdc7572782bb36f1aa63d217769 b/Library/Artifacts/29/297defdc7572782bb36f1aa63d217769 new file mode 100644 index 00000000..9db08d3a Binary files /dev/null and b/Library/Artifacts/29/297defdc7572782bb36f1aa63d217769 differ diff --git a/Library/Artifacts/2a/2a45c95f357176b8a9b0b135a6dcfe92 b/Library/Artifacts/2a/2a45c95f357176b8a9b0b135a6dcfe92 new file mode 100644 index 00000000..b4107572 Binary files /dev/null and b/Library/Artifacts/2a/2a45c95f357176b8a9b0b135a6dcfe92 differ diff --git a/Library/Artifacts/2a/2aced97cdcc20d8faff11dce24c8219e b/Library/Artifacts/2a/2aced97cdcc20d8faff11dce24c8219e deleted file mode 100644 index 0dd30597..00000000 Binary files a/Library/Artifacts/2a/2aced97cdcc20d8faff11dce24c8219e and /dev/null differ diff --git a/Library/Artifacts/2b/2b2efa7c38740ea822e03167c3b3e32c b/Library/Artifacts/2b/2b2efa7c38740ea822e03167c3b3e32c deleted file mode 100644 index 39a823e3..00000000 Binary files a/Library/Artifacts/2b/2b2efa7c38740ea822e03167c3b3e32c and /dev/null differ diff --git a/Library/Artifacts/2d/2dc0752d2732061ca3e9943262b5139e b/Library/Artifacts/2d/2dc0752d2732061ca3e9943262b5139e deleted file mode 100644 index e5cb3def..00000000 Binary files a/Library/Artifacts/2d/2dc0752d2732061ca3e9943262b5139e and /dev/null differ diff --git a/Library/Artifacts/8c/8c8d7bcbee298b5f170b9a26257b1c7a b/Library/Artifacts/4d/4d18a366ffd2106231e180478511eb04 similarity index 56% rename from Library/Artifacts/8c/8c8d7bcbee298b5f170b9a26257b1c7a rename to Library/Artifacts/4d/4d18a366ffd2106231e180478511eb04 index b8c3c11a..02f5f0a8 100644 Binary files a/Library/Artifacts/8c/8c8d7bcbee298b5f170b9a26257b1c7a and b/Library/Artifacts/4d/4d18a366ffd2106231e180478511eb04 differ diff --git a/Library/Artifacts/53/530d54e2462890265b7c59aaba1a2402 b/Library/Artifacts/53/530d54e2462890265b7c59aaba1a2402 deleted file mode 100644 index 7dae6517..00000000 Binary files a/Library/Artifacts/53/530d54e2462890265b7c59aaba1a2402 and /dev/null differ diff --git a/Library/Artifacts/5a/5a21625e8b67dee3c3704845a4ac8359 b/Library/Artifacts/5a/5a21625e8b67dee3c3704845a4ac8359 new file mode 100644 index 00000000..6d6b0ba2 Binary files /dev/null and b/Library/Artifacts/5a/5a21625e8b67dee3c3704845a4ac8359 differ diff --git a/Library/Artifacts/5e/5ef2e7d8bc81126dfbb75bec8ec2eb79 b/Library/Artifacts/5e/5ef2e7d8bc81126dfbb75bec8ec2eb79 deleted file mode 100644 index 431fac1d..00000000 Binary files a/Library/Artifacts/5e/5ef2e7d8bc81126dfbb75bec8ec2eb79 and /dev/null differ diff --git a/Library/Artifacts/64/64db42deef17a9a0202a715ef00d6fec b/Library/Artifacts/64/64db42deef17a9a0202a715ef00d6fec new file mode 100644 index 00000000..22aa8670 Binary files /dev/null and b/Library/Artifacts/64/64db42deef17a9a0202a715ef00d6fec differ diff --git a/Library/Artifacts/6b/6b254df2affb88356d7ee39f0bce3a3d b/Library/Artifacts/6b/6b254df2affb88356d7ee39f0bce3a3d new file mode 100644 index 00000000..8d8850ef Binary files /dev/null and b/Library/Artifacts/6b/6b254df2affb88356d7ee39f0bce3a3d differ diff --git a/Library/Artifacts/6d/6d5a5c944cbb4d7a0212adca1655c052 b/Library/Artifacts/6d/6d5a5c944cbb4d7a0212adca1655c052 deleted file mode 100644 index ca99dbf8..00000000 Binary files a/Library/Artifacts/6d/6d5a5c944cbb4d7a0212adca1655c052 and /dev/null differ diff --git a/Library/Artifacts/7a/7a9434511d944c1109b9f834b826a2b2 b/Library/Artifacts/7a/7a9434511d944c1109b9f834b826a2b2 deleted file mode 100644 index 6db096cc..00000000 Binary files a/Library/Artifacts/7a/7a9434511d944c1109b9f834b826a2b2 and /dev/null differ diff --git a/Library/Artifacts/7e/7e5daa1be2ed3fb16df281e43d777d2e b/Library/Artifacts/7e/7e5daa1be2ed3fb16df281e43d777d2e new file mode 100644 index 00000000..76d90840 Binary files /dev/null and b/Library/Artifacts/7e/7e5daa1be2ed3fb16df281e43d777d2e differ diff --git a/Library/Artifacts/7e/7e755464b2606ea57dc95fd369d1b69b b/Library/Artifacts/7e/7e755464b2606ea57dc95fd369d1b69b new file mode 100644 index 00000000..90d44ca3 Binary files /dev/null and b/Library/Artifacts/7e/7e755464b2606ea57dc95fd369d1b69b differ diff --git a/Library/Artifacts/7e/7ee6fd65d246d9f7f6fb910a6b86afee b/Library/Artifacts/7e/7ee6fd65d246d9f7f6fb910a6b86afee deleted file mode 100644 index 52f8c86a..00000000 Binary files a/Library/Artifacts/7e/7ee6fd65d246d9f7f6fb910a6b86afee and /dev/null differ diff --git a/Library/Artifacts/84/8451aa2dce77faec0987c6fc69bad9e8 b/Library/Artifacts/84/8451aa2dce77faec0987c6fc69bad9e8 deleted file mode 100644 index 7f012e65..00000000 Binary files a/Library/Artifacts/84/8451aa2dce77faec0987c6fc69bad9e8 and /dev/null differ diff --git a/Library/Artifacts/85/85d5c73f996647bdd65b9a66ca1aaeb3 b/Library/Artifacts/85/85d5c73f996647bdd65b9a66ca1aaeb3 deleted file mode 100644 index 245185a4..00000000 Binary files a/Library/Artifacts/85/85d5c73f996647bdd65b9a66ca1aaeb3 and /dev/null differ diff --git a/Library/Artifacts/88/88217039309fb15d4e01d02587f673a4 b/Library/Artifacts/88/88217039309fb15d4e01d02587f673a4 new file mode 100644 index 00000000..595cf3da Binary files /dev/null and b/Library/Artifacts/88/88217039309fb15d4e01d02587f673a4 differ diff --git a/Library/Artifacts/8b/8b62c48ad569492903dad0197bc4a4ca b/Library/Artifacts/8b/8b62c48ad569492903dad0197bc4a4ca new file mode 100644 index 00000000..026a871b Binary files /dev/null and b/Library/Artifacts/8b/8b62c48ad569492903dad0197bc4a4ca differ diff --git a/Library/Artifacts/94/945b2b1040231fe62590475b7a0237d2 b/Library/Artifacts/94/945b2b1040231fe62590475b7a0237d2 deleted file mode 100644 index d42c9582..00000000 Binary files a/Library/Artifacts/94/945b2b1040231fe62590475b7a0237d2 and /dev/null differ diff --git a/Library/Artifacts/9f/9f13080cc9e99c7f70d4c2bdb0c11c4d b/Library/Artifacts/9f/9f13080cc9e99c7f70d4c2bdb0c11c4d deleted file mode 100644 index e28ded46..00000000 Binary files a/Library/Artifacts/9f/9f13080cc9e99c7f70d4c2bdb0c11c4d and /dev/null differ diff --git a/Library/Artifacts/a5/a5241f43084ea999faeed8ec7be58596 b/Library/Artifacts/a5/a5241f43084ea999faeed8ec7be58596 new file mode 100644 index 00000000..326100dc Binary files /dev/null and b/Library/Artifacts/a5/a5241f43084ea999faeed8ec7be58596 differ diff --git a/Library/Artifacts/a8/a8919cc65632029ca3ef5543c54dd0b9 b/Library/Artifacts/a8/a8919cc65632029ca3ef5543c54dd0b9 deleted file mode 100644 index 155aa288..00000000 Binary files a/Library/Artifacts/a8/a8919cc65632029ca3ef5543c54dd0b9 and /dev/null differ diff --git a/Library/Artifacts/b5/b5046287344fe53abb7ede4043ac6e09 b/Library/Artifacts/b5/b5046287344fe53abb7ede4043ac6e09 deleted file mode 100644 index 785999d5..00000000 Binary files a/Library/Artifacts/b5/b5046287344fe53abb7ede4043ac6e09 and /dev/null differ diff --git a/Library/Artifacts/bf/bf4ecd9746f927dc079b2a9388a0d0cc b/Library/Artifacts/bf/bf4ecd9746f927dc079b2a9388a0d0cc deleted file mode 100644 index f105f82e..00000000 Binary files a/Library/Artifacts/bf/bf4ecd9746f927dc079b2a9388a0d0cc and /dev/null differ diff --git a/Library/Artifacts/c1/c10016e478cddc3f2ee474d2845aad7f b/Library/Artifacts/c1/c10016e478cddc3f2ee474d2845aad7f deleted file mode 100644 index 62e3f2bc..00000000 Binary files a/Library/Artifacts/c1/c10016e478cddc3f2ee474d2845aad7f and /dev/null differ diff --git a/Library/Artifacts/c2/c20486b9f0aff847a477fb41f48637f1 b/Library/Artifacts/c2/c20486b9f0aff847a477fb41f48637f1 new file mode 100644 index 00000000..01463b3e Binary files /dev/null and b/Library/Artifacts/c2/c20486b9f0aff847a477fb41f48637f1 differ diff --git a/Library/Artifacts/1a/1ac7dafc1ad8f9b7851d601f000d3efa b/Library/Artifacts/c3/c31368da8264b9daa02de6c27d2d6c65 similarity index 69% rename from Library/Artifacts/1a/1ac7dafc1ad8f9b7851d601f000d3efa rename to Library/Artifacts/c3/c31368da8264b9daa02de6c27d2d6c65 index c62664c6..159d00ce 100644 Binary files a/Library/Artifacts/1a/1ac7dafc1ad8f9b7851d601f000d3efa and b/Library/Artifacts/c3/c31368da8264b9daa02de6c27d2d6c65 differ diff --git a/Library/Artifacts/c3/c3953ffe4efaecba79d9466852494e7b b/Library/Artifacts/c3/c3953ffe4efaecba79d9466852494e7b deleted file mode 100644 index a492b231..00000000 Binary files a/Library/Artifacts/c3/c3953ffe4efaecba79d9466852494e7b and /dev/null differ diff --git a/Library/Artifacts/c5/c5e923a64a679938df6ec441d5ddf3d6 b/Library/Artifacts/c5/c5e923a64a679938df6ec441d5ddf3d6 new file mode 100644 index 00000000..a33a9cd0 Binary files /dev/null and b/Library/Artifacts/c5/c5e923a64a679938df6ec441d5ddf3d6 differ diff --git a/Library/Artifacts/f2/f2bffd4f52c0723496aebb41cca84016 b/Library/Artifacts/d5/d5674ce427cab6a2de8633bf94c077a5 similarity index 97% rename from Library/Artifacts/f2/f2bffd4f52c0723496aebb41cca84016 rename to Library/Artifacts/d5/d5674ce427cab6a2de8633bf94c077a5 index 584b1797..dab10389 100644 Binary files a/Library/Artifacts/f2/f2bffd4f52c0723496aebb41cca84016 and b/Library/Artifacts/d5/d5674ce427cab6a2de8633bf94c077a5 differ diff --git a/Library/Artifacts/d5/d5fbee3b1ce59b3ae313930d44391a4c b/Library/Artifacts/d5/d5fbee3b1ce59b3ae313930d44391a4c deleted file mode 100644 index 86ab3e3d..00000000 Binary files a/Library/Artifacts/d5/d5fbee3b1ce59b3ae313930d44391a4c and /dev/null differ diff --git a/Library/Artifacts/db/db1437d5a2bea1f7b63ac0ddb9be27f6 b/Library/Artifacts/db/db1437d5a2bea1f7b63ac0ddb9be27f6 new file mode 100644 index 00000000..4b0a56f7 Binary files /dev/null and b/Library/Artifacts/db/db1437d5a2bea1f7b63ac0ddb9be27f6 differ diff --git a/Library/Artifacts/dd/dd4438e79a406f9b27b7b4a2f466f457 b/Library/Artifacts/dd/dd4438e79a406f9b27b7b4a2f466f457 deleted file mode 100644 index e00a9581..00000000 Binary files a/Library/Artifacts/dd/dd4438e79a406f9b27b7b4a2f466f457 and /dev/null differ diff --git a/Library/Artifacts/e3/e36a598759ebdae9c856f35942087990 b/Library/Artifacts/e3/e36a598759ebdae9c856f35942087990 new file mode 100644 index 00000000..a6bd3462 Binary files /dev/null and b/Library/Artifacts/e3/e36a598759ebdae9c856f35942087990 differ diff --git a/Library/Artifacts/e3/e3de3e845ff4ac2b67ba2b55d58b429f b/Library/Artifacts/e3/e3de3e845ff4ac2b67ba2b55d58b429f new file mode 100644 index 00000000..b928b148 Binary files /dev/null and b/Library/Artifacts/e3/e3de3e845ff4ac2b67ba2b55d58b429f differ diff --git a/Library/Artifacts/e9/e9e29c2472299097c625c537bf34e0d9 b/Library/Artifacts/e9/e9e29c2472299097c625c537bf34e0d9 deleted file mode 100644 index cb524275..00000000 Binary files a/Library/Artifacts/e9/e9e29c2472299097c625c537bf34e0d9 and /dev/null differ diff --git a/Library/Artifacts/ee/eefddbc98781b9d82301e4a8a568b3d3 b/Library/Artifacts/ee/eefddbc98781b9d82301e4a8a568b3d3 deleted file mode 100644 index ec81757c..00000000 Binary files a/Library/Artifacts/ee/eefddbc98781b9d82301e4a8a568b3d3 and /dev/null differ diff --git a/Library/Artifacts/f1/f1c55dfe90058aee4c9c033cd1dae504 b/Library/Artifacts/f1/f1c55dfe90058aee4c9c033cd1dae504 new file mode 100644 index 00000000..4a5d6acf Binary files /dev/null and b/Library/Artifacts/f1/f1c55dfe90058aee4c9c033cd1dae504 differ diff --git a/Library/Artifacts/f7/f7cfb886470813e771c2771f09cba96c b/Library/Artifacts/f7/f7cfb886470813e771c2771f09cba96c new file mode 100644 index 00000000..00155c98 Binary files /dev/null and b/Library/Artifacts/f7/f7cfb886470813e771c2771f09cba96c differ diff --git a/Library/Artifacts/fc/fc9acc68d0ad93f32a3881ea5dbed44a b/Library/Artifacts/fc/fc9acc68d0ad93f32a3881ea5dbed44a new file mode 100644 index 00000000..0b9f9d73 Binary files /dev/null and b/Library/Artifacts/fc/fc9acc68d0ad93f32a3881ea5dbed44a differ diff --git a/Library/Artifacts/ff/ff9008f4342788b0ffa188b8ffd5f0f6 b/Library/Artifacts/ff/ff9008f4342788b0ffa188b8ffd5f0f6 new file mode 100644 index 00000000..a2bd9773 Binary files /dev/null and b/Library/Artifacts/ff/ff9008f4342788b0ffa188b8ffd5f0f6 differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index 15f827a0..7ded36d6 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -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: 521} 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: 521} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &3 MonoBehaviour: @@ -112,10 +112,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 679, y: 492} - m_MaxSize: {x: 14002, y: 14042} + m_MinSize: {x: 678, y: 471} + m_MaxSize: {x: 14001, y: 14021} vertical: 0 - controlID: 4354 + controlID: 12036 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -137,10 +137,10 @@ MonoBehaviour: y: 0 width: 1524 height: 947 - m_MinSize: {x: 403, y: 492} - m_MaxSize: {x: 10001, y: 14042} + m_MinSize: {x: 402, y: 471} + m_MaxSize: {x: 10000, y: 14021} vertical: 1 - controlID: 4355 + controlID: 12037 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,10 +162,10 @@ MonoBehaviour: y: 0 width: 1524 height: 648 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + m_MinSize: {x: 402, y: 221} + m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 4356 + controlID: 12038 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -396,9 +396,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: f41cffff081dffffa61dffff62fbffff + m_SelectedIDs: 46450000 + m_LastClickedID: 17734 + m_ExpandedIDs: ac95feffa605ffffe808ffff0a09ffff3809ffff2a76ffffee94ffff8696ffffd29cffff46a4ffffcca5ffffeea5ffff1ca6ffff4cfbffffaa3a0000503c0000e63f000060440000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -458,9 +458,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.3961211, y: 0.5866932, z: -0.3834264} + m_Target: {x: 1077.5, y: 57.5, z: 0} speed: 2 - m_Value: {x: 37.5, y: 0, z: 0} + m_Value: {x: 1077.5, y: 57.5, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -510,9 +510,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 2.3153484 + m_Target: 829.6356 speed: 2 - m_Value: 40.388737 + m_Value: 829.6356 m_Ortho: m_Target: 1 speed: 2 @@ -1104,20 +1104,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Prefabs/RaceDialogPrefabs + - Assets/Resources/Prefabs m_ViewMode: 1 m_StartGridSize: 67 m_LastFolders: - - Assets/Resources/Prefabs/RaceDialogPrefabs + - Assets/Resources/Prefabs m_LastFoldersGridSize: 67 m_LastProjectPath: C:\UnityDev\rimworld-animation-studio m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 12260100 - m_LastClickedID: 75282 - m_ExpandedIDs: 000000000448000006480000084800000a4800000c480000f22501000c26010000ca9a3b + m_SelectedIDs: 28480000 + m_LastClickedID: 18472 + m_ExpandedIDs: 0000000006480000084800000a4800000c4800000e4800001e48000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000000448000006480000084800000a4800000c48000000ca9a3b + m_ExpandedIDs: 0000000006480000084800000a4800000c4800000e48000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1295,4 +1295,4 @@ MonoBehaviour: m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 100 diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index 999738d0..72bbf808 100644 --- a/Library/CurrentMaximizeLayout.dwlt +++ b/Library/CurrentMaximizeLayout.dwlt @@ -21,10 +21,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 679, y: 492} - m_MaxSize: {x: 14002, y: 14042} + m_MinSize: {x: 678, y: 471} + m_MaxSize: {x: 14001, y: 14021} vertical: 0 - controlID: 4046 + controlID: 11839 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,10 +138,10 @@ MonoBehaviour: y: 0 width: 1524 height: 947 - m_MinSize: {x: 403, y: 492} - m_MaxSize: {x: 10001, y: 14042} + m_MinSize: {x: 402, y: 471} + m_MaxSize: {x: 10000, y: 14021} vertical: 1 - controlID: 4006 + controlID: 11840 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,10 +163,10 @@ MonoBehaviour: y: 0 width: 1524 height: 648 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + m_MinSize: {x: 402, y: 221} + m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 4007 + controlID: 11841 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -224,7 +224,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: b46cffffc06cffff362601003e260100 + m_ExpandedIDs: ac95feffa605ffffe808ffff0a09ffff3809ffff2a76ffffee94ffff8696ffffd29cffff46a4ffffcca5ffffeea5ffff1ca6ffff4cfbffffaa3a0000503c0000e63f000060440000 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: 37.5, y: 0, z: 0} + m_Target: {x: 1077.5, y: 57.5, z: 0} speed: 2 - m_Value: {x: 37.5, y: 0, z: 0} + m_Value: {x: 1077.5, y: 57.5, z: 0} 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: 40.388737 + m_Target: 829.6356 speed: 2 - m_Value: 40.388737 + m_Value: 829.6356 m_Ortho: m_Target: 1 speed: 2 @@ -987,20 +987,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Prefabs/RaceDialogPrefabs + - Assets/Resources/Prefabs m_ViewMode: 1 m_StartGridSize: 67 m_LastFolders: - - Assets/Resources/Prefabs/RaceDialogPrefabs + - Assets/Resources/Prefabs m_LastFoldersGridSize: 67 m_LastProjectPath: C:\UnityDev\rimworld-animation-studio m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 12260100 - m_LastClickedID: 75282 - m_ExpandedIDs: 000000000448000006480000084800000a4800000c480000f22501000c26010000ca9a3b + m_SelectedIDs: 28480000 + m_LastClickedID: 18472 + m_ExpandedIDs: 0000000006480000084800000a4800000c4800000e4800001e48000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000000448000006480000084800000a4800000c48000000ca9a3b + m_ExpandedIDs: 0000000006480000084800000a4800000c4800000e48000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1053,8 +1053,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 48260100 - m_LastClickedInstanceID: 75336 + m_SelectedInstanceIDs: 46450000 + m_LastClickedInstanceID: 17734 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c43000000000000 m_RenameOverlay: @@ -1203,5 +1203,5 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: 75336 - m_LastVerticalScrollValue: 0 + m_LastInspectedObjectInstanceID: 17734 + m_LastVerticalScrollValue: 100 diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 5e54feb2..55c8a1fa 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index 9b997543..6e788f8c 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb index e26c09a3..ef5c6d60 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Library/ScriptAssemblies/Assembly-CSharp.pdb differ diff --git a/Library/SourceAssetDB b/Library/SourceAssetDB index cf657694..aab4f22e 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/StateCache/Hierarchy/8cbfdc-2482d1331163f49448.json b/Library/StateCache/Hierarchy/8cbfdc-2482d1331163f49448.json index abfa4071..236edfd3 100644 --- a/Library/StateCache/Hierarchy/8cbfdc-2482d1331163f49448.json +++ b/Library/StateCache/Hierarchy/8cbfdc-2482d1331163f49448.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[4658118913435815158,2751111744579094145,8359461402257861397],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":3845252506739069817,"m_LastClickedInstanceID":0} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[4658118913435815158,2751111744579094145,8359461402257861397],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":4658118913435815158,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/SceneView/352ee9-mainStage.json b/Library/StateCache/SceneView/352ee9-mainStage.json index 7281e7a5..8ec9f95f 100644 --- a/Library/StateCache/SceneView/352ee9-mainStage.json +++ b/Library/StateCache/SceneView/352ee9-mainStage.json @@ -1 +1 @@ -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":1.3961211442947388,"y":0.5866932272911072,"z":-0.38342639803886416},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":2.3153483867645265,"orthographic":true} \ No newline at end of file +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":1077.5,"y":57.5,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":829.6356201171875,"orthographic":true} \ No newline at end of file