diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index 9704dc52..72a7283e 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll index 48a9c05d..6450d6d5 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll index 2b8d0a47..cad53633 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll index 27d5e298..a3181161 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll index 19c0a6a1..40bc94d9 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll index efd99ec8..9f3fbd53 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll index 4502f28b..2204e131 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll index 9a684de8..45aa1a84 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll index a2898f52..9935d6e2 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll index e528e1ee..11391329 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll b/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll index 92277bd4..569088c2 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers index 08e1dbbc..898c942d 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers and b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers differ diff --git a/Build/RimWorld-Animation-Studio_Data/level0 b/Build/RimWorld-Animation-Studio_Data/level0 index 1a238f76..9f904677 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/level0 and b/Build/RimWorld-Animation-Studio_Data/level0 differ diff --git a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets index 739e7671..aff373d8 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets and b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets differ diff --git a/Source/.vs/Source/v16/.suo b/Source/.vs/Source/v16/.suo index a7f3b18a..4627ffa0 100644 Binary files a/Source/.vs/Source/v16/.suo and b/Source/.vs/Source/v16/.suo differ diff --git a/Source/Assets/Scenes/MainScene.unity b/Source/Assets/Scenes/MainScene.unity index f474456b..dde5a42b 100644 --- a/Source/Assets/Scenes/MainScene.unity +++ b/Source/Assets/Scenes/MainScene.unity @@ -1412,8 +1412,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 145, y: -15} - m_SizeDelta: {x: 53.699097, y: 30} + m_AnchoredPosition: {x: 142.86, y: -15} + m_SizeDelta: {x: 49.426086, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &105454401 MonoBehaviour: @@ -1441,7 +1441,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -8150,7 +8150,7 @@ MonoBehaviour: m_HorizontalScrollbarVisibility: 2 m_VerticalScrollbarVisibility: 2 m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -15 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -17352,7 +17352,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.99998623} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -20461,7 +20461,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: -5, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1144641953 MonoBehaviour: @@ -21024,7 +21024,7 @@ MonoBehaviour: m_HandleRect: {fileID: 922060209} m_Direction: 2 m_Value: 0 - m_Size: 0.99998623 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -25501,7 +25501,7 @@ MonoBehaviour: m_HorizontalScrollbarVisibility: 2 m_VerticalScrollbarVisibility: 2 m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -15 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -26731,7 +26731,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.9999999} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -32426,7 +32426,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000049342736} + m_AnchoredPosition: {x: 0, y: 0.00014121436} m_SizeDelta: {x: 0, y: 461.0254} m_Pivot: {x: 0, y: 1} --- !u!1 &1757069697 stripped @@ -35198,7 +35198,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: -5, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1895507858 MonoBehaviour: @@ -36089,8 +36089,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 240, y: -15} - m_SizeDelta: {x: 52.045288, y: 30} + m_AnchoredPosition: {x: 237.86, y: -15} + m_SizeDelta: {x: 47.77234, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1960844027 MonoBehaviour: @@ -36118,13 +36118,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Quickie + m_Text: Quick --- !u!222 &1960844028 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Source/Assets/Scripts/AnimationComponents/AnimationDef.cs b/Source/Assets/Scripts/AnimationComponents/AnimationDef.cs index 1239bbf5..f4bd827f 100644 --- a/Source/Assets/Scripts/AnimationComponents/AnimationDef.cs +++ b/Source/Assets/Scripts/AnimationComponents/AnimationDef.cs @@ -170,8 +170,15 @@ namespace RimWorldAnimationStudio { SexTypes = SexTypes.Intersect(DefaultTags.sexTypes.Concat(CustomTags.sexTypes))?.ToList(); InteractionDefTypes = InteractionDefTypes.Intersect(DefaultTags.interactionDefTypes.Concat(CustomTags.interactionDefTypes))?.ToList(); + + if (SexTypes.NullOrEmpty() && InteractionDefTypes.NullOrEmpty()) + { SexTypes.Add("None"); } } - public void OnPostLoad() { } + public void OnPostLoad() + { + if (SexTypes.Contains("None")) + { SexTypes.Remove("None"); } + } } } diff --git a/Source/Assets/Scripts/Data/Constants.cs b/Source/Assets/Scripts/Data/Constants.cs index ef17fc73..d3096462 100644 --- a/Source/Assets/Scripts/Data/Constants.cs +++ b/Source/Assets/Scripts/Data/Constants.cs @@ -8,7 +8,7 @@ namespace RimWorldAnimationStudio public static class Constants { // Project data - public static string currentVersion = "1.0.1"; + public static string currentVersion = "1.0.2"; public static string projectHome = "https://gitgud.io/AbstractConcept/rimworld-animation-studio"; public static string projectWiki = "https://gitgud.io/AbstractConcept/rimworld-animation-studio/-/wikis/home"; diff --git a/Source/Assets/Scripts/Data/DefaultTags.cs b/Source/Assets/Scripts/Data/DefaultTags.cs index fc85e6be..5066f20e 100644 --- a/Source/Assets/Scripts/Data/DefaultTags.cs +++ b/Source/Assets/Scripts/Data/DefaultTags.cs @@ -12,7 +12,7 @@ namespace RimWorldAnimationStudio public static List defNames = new List() { "Human", "Wolf_Timber", "Horse" }; public static List bodyParts = new List() { "Penis", "Vagina", "Anus", "Breasts", "Mouth" }; public static List bodyDefTypes = new List() { "Human", "Bird", "BeetleLike", "BeetleLikeWithClaw", "MechanicalCentipede", "MechanicalTermite", "Lancer", "Pikeman", "Monkey", "QuadrupedAnimalWithClawsTailAndJowl", "QuadrupedAnimalWithHooves", "QuadrupedAnimalWithHoovesAndHorn", "QuadrupedAnimalWithHoovesAndHump", "QuadrupedAnimalWithHoovesAndTusks", "QuadrupedAnimalWithHoovesTusksAndTrunk", "QuadrupedAnimalWithPaws", "QuadrupedAnimalWithPawsAndTail", "Scyther", "Snake", "TurtleLike" }; - public static List sexTypes = new List() { "None", "Vaginal", "Anal", "Oral", "Masturbation", "DoublePenetration", "Boobjob", "Handjob", "Footjob", "Fingering", "Scissoring", "MutualMasturbation", "Fisting", "MechImplant", "Rimming", "Fellatio", "Cunnilingus", "Sixtynine" }; + public static List sexTypes = new List() { "Vaginal", "Anal", "Oral", "Masturbation", "DoublePenetration", "Boobjob", "Handjob", "Footjob", "Fingering", "Scissoring", "MutualMasturbation", "Fisting", "MechImplant", "Rimming", "Fellatio", "Cunnilingus", "Sixtynine" }; public static List interactionDefTypes = new List() { "Bestiality_Anal", "Bestiality_Double_Penetration_M", "Bestiality_Oral", "Bestiality_Vaginal", "Breeding_Lick", "Breeding_Fingering", "Breeding_OralS", "Bestiality_Reverse_Anal", "Bestiality_Reverse_Double_Penetration_M", "Bestiality_Reverse_Handjob", "Bestiality_Reverse_Oral", "Bestiality_Reverse_Oral_Service", "Bestiality_Reverse_Vaginal", "AnimalSexChat", "Masturbation_AutoBreastjob", "Masturbation_AutoFellatio", "Masturbation_Breastjob", "Masturbation_HandjobA", "Masturbation_HandjobP", "Masturbation_HandjobV", "rjw_interaction_template", "Necro_Anal", "Necro_DoublePenetration", "Necro_DoublePenetrationM", "Necro_Vaginal", "Necro_Reverse_Anal", "Necro_Reverse_DoublePenetration", "Necro_Reverse_DoublePenetrationM", "Necro_Reverse_Vaginal", "Rape_MechImplant", "Rape_Anal", "Rape_Beakjob", "Rape_Breastjob", "Rape_Cunnilingus", "Rape_DoublePenetration", "Rape_DoublePenetrationM", "Rape_Fellatio", "Rape_Fingering", "Rape_Fisting", "Rape_Footjob", "Rape_Handjob", "Rape_Oral", "Rape_Rimming", "Rape_Scissoring", "Rape_Vaginal", "Rape_Reverse_Anal", "Rape_Reverse_Beakjob", "Rape_Reverse_Breastjob", "Rape_Reverse_Cunnilingus", "Rape_Reverse_DoublePenetration", "Rape_Reverse_DoublePenetrationM", "Rape_Reverse_Fellatio", "Rape_Reverse_Fingering", "Rape_Reverse_Fisting", "Rape_Reverse_Footjob", "Rape_Reverse_Handjob", "Rape_Reverse_Rimming", "Rape_Reverse_Scissoring", "Rape_Reverse_Vaginal", "Sex_Reverse_Anal", "Sex_Reverse_Beakjob", "Sex_Reverse_Breastjob", "Sex_Reverse_Cunnilingus", "Sex_Reverse_DoublePenetration", "Sex_Reverse_DoublePenetrationM", "Sex_Reverse_Fellatio", "Sex_Reverse_Fingering", "Sex_Reverse_Fisting", "Sex_Reverse_Footjob", "Sex_Reverse_Handjob", "Sex_Reverse_Rimming", "Sex_Reverse_Vaginal", "Sex_Anal", "Sex_Beakjob", "Sex_Breastjob", "Sex_Cunnilingus", "Sex_DoublePenetration", "Sex_DoublePenetrationM", "Sex_Fellatio", "Sex_Fingering", "Sex_Fisting", "Sex_Footjob", "Sex_Handjob", "Sex_MutualMasturbation", "Sex_Rimming", "Sex_Scissoring", "Sex_Sixtynine", "Sex_Vaginal" }; public static List soundDefs = new List() { "None", "Sex", "Fuck", "Slimy", "Suck", "Cum" }; public static List actorLayers = new List() { "LayingPawn", "PawnRope", "Projectile", "Pawn", "PawnUnused" }; diff --git a/Source/Assets/Scripts/Managers/ApplicationManager.cs b/Source/Assets/Scripts/Managers/ApplicationManager.cs index ac4f9b91..8b26e7b8 100644 --- a/Source/Assets/Scripts/Managers/ApplicationManager.cs +++ b/Source/Assets/Scripts/Managers/ApplicationManager.cs @@ -69,10 +69,9 @@ namespace RimWorldAnimationStudio { Workspace.Reset(); - Workspace.animationDef = animationDef; - UpdateCustomArrays(animationDef); + Workspace.animationDef = animationDef; RunPostLoadOperations(animationDef); - + UpdateCustomArrays(animationDef); animationDef.Initialize(); Debug.Log("Loaded AnimationDef: " + animationDef.DefName); @@ -89,6 +88,22 @@ namespace RimWorldAnimationStudio public void RunPostLoadOperations(AnimationDef animationDef) { + animationDef.OnPostLoad(); + + foreach (AnimationStage stage in animationDef.AnimationStages) + { + stage.OnPostLoad(); + + foreach (PawnAnimationClip clip in stage.AnimationClips) + { + clip.OnPostLoad(); + + foreach (PawnKeyframe keyframe in clip.Keyframes) + { keyframe.OnPostLoad(); } + } + } + + // Adjustment to add absent quick animation length if (animationDef.animationTimeTicksQuick <= 0) { if (animationDef.AnimationStages.Count > 1) @@ -103,9 +118,6 @@ namespace RimWorldAnimationStudio else if (animationDef.AnimationStages.Count == 1) { animationDef.AnimationStages[0].PlayTimeTicksQuick = animationDef.AnimationStages[0].PlayTimeTicks; } } - - foreach (AnimationStage stage in animationDef.AnimationStages) - { stage.OnPostLoad(); } } public void TryToSaveAnimation() diff --git a/Source/Library/ArtifactDB b/Source/Library/ArtifactDB index 69626338..e9002423 100644 Binary files a/Source/Library/ArtifactDB and b/Source/Library/ArtifactDB differ diff --git a/Source/Library/Artifacts/06/060609330682eb08abd19e163386e7f1 b/Source/Library/Artifacts/06/060609330682eb08abd19e163386e7f1 deleted file mode 100644 index e9bf8221..00000000 Binary files a/Source/Library/Artifacts/06/060609330682eb08abd19e163386e7f1 and /dev/null differ diff --git a/Source/Library/Artifacts/07/07d6adfff864b621fbf83a1da47ec255 b/Source/Library/Artifacts/07/07d6adfff864b621fbf83a1da47ec255 deleted file mode 100644 index f5b46408..00000000 Binary files a/Source/Library/Artifacts/07/07d6adfff864b621fbf83a1da47ec255 and /dev/null differ diff --git a/Source/Library/Artifacts/13/133a0d3ac11307d31124c67a88ef813c b/Source/Library/Artifacts/13/133a0d3ac11307d31124c67a88ef813c deleted file mode 100644 index c5383e21..00000000 Binary files a/Source/Library/Artifacts/13/133a0d3ac11307d31124c67a88ef813c and /dev/null differ diff --git a/Source/Library/Artifacts/13/135e187924bf2f316ae525f52e3ac2b0 b/Source/Library/Artifacts/13/135e187924bf2f316ae525f52e3ac2b0 deleted file mode 100644 index 62e3e5fe..00000000 Binary files a/Source/Library/Artifacts/13/135e187924bf2f316ae525f52e3ac2b0 and /dev/null differ diff --git a/Source/Library/Artifacts/15/151a98f28b0701bda44243c967ed09bb b/Source/Library/Artifacts/15/151a98f28b0701bda44243c967ed09bb deleted file mode 100644 index a9abce40..00000000 Binary files a/Source/Library/Artifacts/15/151a98f28b0701bda44243c967ed09bb and /dev/null differ diff --git a/Source/Library/Artifacts/1d/1d5e441f4534ef24b442d519cbf2f69d b/Source/Library/Artifacts/1d/1d5e441f4534ef24b442d519cbf2f69d deleted file mode 100644 index 8e9e25da..00000000 Binary files a/Source/Library/Artifacts/1d/1d5e441f4534ef24b442d519cbf2f69d and /dev/null differ diff --git a/Source/Library/Artifacts/29/293eb5c901cbfa01221c5b1c50064ed5 b/Source/Library/Artifacts/29/293eb5c901cbfa01221c5b1c50064ed5 deleted file mode 100644 index 3bd36b79..00000000 Binary files a/Source/Library/Artifacts/29/293eb5c901cbfa01221c5b1c50064ed5 and /dev/null differ diff --git a/Source/Library/Artifacts/33/33a13c754f8aa748f265ee650ebdae42 b/Source/Library/Artifacts/33/33a13c754f8aa748f265ee650ebdae42 deleted file mode 100644 index 673e8464..00000000 Binary files a/Source/Library/Artifacts/33/33a13c754f8aa748f265ee650ebdae42 and /dev/null differ diff --git a/Source/Library/Artifacts/35/35aaeeb19e9b509691d3eed15b4a4a0a b/Source/Library/Artifacts/35/35aaeeb19e9b509691d3eed15b4a4a0a deleted file mode 100644 index 1c6775c8..00000000 Binary files a/Source/Library/Artifacts/35/35aaeeb19e9b509691d3eed15b4a4a0a and /dev/null differ diff --git a/Source/Library/Artifacts/39/398066c03f6ed931f2ded2e9aff23e63 b/Source/Library/Artifacts/39/398066c03f6ed931f2ded2e9aff23e63 deleted file mode 100644 index 25529b7f..00000000 Binary files a/Source/Library/Artifacts/39/398066c03f6ed931f2ded2e9aff23e63 and /dev/null differ diff --git a/Source/Library/Artifacts/50/503728ac80044db0ba5baa4f16c3a841 b/Source/Library/Artifacts/50/503728ac80044db0ba5baa4f16c3a841 new file mode 100644 index 00000000..cb796f5b Binary files /dev/null and b/Source/Library/Artifacts/50/503728ac80044db0ba5baa4f16c3a841 differ diff --git a/Source/Library/Artifacts/57/57cd0d0919ecccf801517f90debdf4ff b/Source/Library/Artifacts/57/57cd0d0919ecccf801517f90debdf4ff deleted file mode 100644 index 00410ccf..00000000 Binary files a/Source/Library/Artifacts/57/57cd0d0919ecccf801517f90debdf4ff and /dev/null differ diff --git a/Source/Library/Artifacts/5d/5dc9ff12e8b79fa36bf0888f3854eb52 b/Source/Library/Artifacts/5d/5dc9ff12e8b79fa36bf0888f3854eb52 deleted file mode 100644 index 3b9bc613..00000000 Binary files a/Source/Library/Artifacts/5d/5dc9ff12e8b79fa36bf0888f3854eb52 and /dev/null differ diff --git a/Source/Library/Artifacts/5f/5f2606f3da5e4ec715c25b43607a5837 b/Source/Library/Artifacts/5f/5f2606f3da5e4ec715c25b43607a5837 deleted file mode 100644 index 2558d363..00000000 Binary files a/Source/Library/Artifacts/5f/5f2606f3da5e4ec715c25b43607a5837 and /dev/null differ diff --git a/Source/Library/Artifacts/68/68e0e648f3f77162c49fc170bd8f9d48 b/Source/Library/Artifacts/68/68e0e648f3f77162c49fc170bd8f9d48 deleted file mode 100644 index 1479c78d..00000000 Binary files a/Source/Library/Artifacts/68/68e0e648f3f77162c49fc170bd8f9d48 and /dev/null differ diff --git a/Source/Library/Artifacts/6f/6f7ea963bc45af1485064e4fcdd421d5 b/Source/Library/Artifacts/6f/6f7ea963bc45af1485064e4fcdd421d5 deleted file mode 100644 index 5685f84c..00000000 Binary files a/Source/Library/Artifacts/6f/6f7ea963bc45af1485064e4fcdd421d5 and /dev/null differ diff --git a/Source/Library/Artifacts/74/74cb42e7df209d80c08244c3bffb2d11 b/Source/Library/Artifacts/74/74cb42e7df209d80c08244c3bffb2d11 new file mode 100644 index 00000000..c12d50e8 Binary files /dev/null and b/Source/Library/Artifacts/74/74cb42e7df209d80c08244c3bffb2d11 differ diff --git a/Source/Library/Artifacts/79/798e1a3a02685fcdf524ff301143b66a b/Source/Library/Artifacts/79/798e1a3a02685fcdf524ff301143b66a new file mode 100644 index 00000000..fdfd5899 Binary files /dev/null and b/Source/Library/Artifacts/79/798e1a3a02685fcdf524ff301143b66a differ diff --git a/Source/Library/Artifacts/80/8047d4fa37e80e7814e9739a50379bae b/Source/Library/Artifacts/80/8047d4fa37e80e7814e9739a50379bae deleted file mode 100644 index 27a6fb60..00000000 Binary files a/Source/Library/Artifacts/80/8047d4fa37e80e7814e9739a50379bae and /dev/null differ diff --git a/Source/Library/Artifacts/82/8282890e71defbdecf0bdee090713635 b/Source/Library/Artifacts/82/8282890e71defbdecf0bdee090713635 deleted file mode 100644 index 8c6bcb31..00000000 Binary files a/Source/Library/Artifacts/82/8282890e71defbdecf0bdee090713635 and /dev/null differ diff --git a/Source/Library/Artifacts/8b/8b9f459ad2ac70f6b393f2407ccfcf54 b/Source/Library/Artifacts/8b/8b9f459ad2ac70f6b393f2407ccfcf54 deleted file mode 100644 index ed3dd92f..00000000 Binary files a/Source/Library/Artifacts/8b/8b9f459ad2ac70f6b393f2407ccfcf54 and /dev/null differ diff --git a/Source/Library/Artifacts/93/93e085d05dffedeb7895afbe23bfc82b b/Source/Library/Artifacts/93/93e085d05dffedeb7895afbe23bfc82b deleted file mode 100644 index 93bb1ffe..00000000 Binary files a/Source/Library/Artifacts/93/93e085d05dffedeb7895afbe23bfc82b and /dev/null differ diff --git a/Source/Library/Artifacts/97/97b34c4146c9ffffaec9ffe6a666e3c7 b/Source/Library/Artifacts/97/97b34c4146c9ffffaec9ffe6a666e3c7 deleted file mode 100644 index 375f41f8..00000000 Binary files a/Source/Library/Artifacts/97/97b34c4146c9ffffaec9ffe6a666e3c7 and /dev/null differ diff --git a/Source/Library/Artifacts/9c/9ca4540f251d20e252c1cfe0ce352283 b/Source/Library/Artifacts/9c/9ca4540f251d20e252c1cfe0ce352283 deleted file mode 100644 index c037ce80..00000000 Binary files a/Source/Library/Artifacts/9c/9ca4540f251d20e252c1cfe0ce352283 and /dev/null differ diff --git a/Source/Library/Artifacts/14/14619c35be9da5325a4be208c95ac7c0 b/Source/Library/Artifacts/b0/b0b96fe78b324b2f27123ef82efa3d9f similarity index 99% rename from Source/Library/Artifacts/14/14619c35be9da5325a4be208c95ac7c0 rename to Source/Library/Artifacts/b0/b0b96fe78b324b2f27123ef82efa3d9f index c3824bdd..0eb3b93b 100644 Binary files a/Source/Library/Artifacts/14/14619c35be9da5325a4be208c95ac7c0 and b/Source/Library/Artifacts/b0/b0b96fe78b324b2f27123ef82efa3d9f differ diff --git a/Source/Library/Artifacts/b5/b5861601792a10100dada76a043bd595 b/Source/Library/Artifacts/b5/b5861601792a10100dada76a043bd595 deleted file mode 100644 index 2987be6f..00000000 Binary files a/Source/Library/Artifacts/b5/b5861601792a10100dada76a043bd595 and /dev/null differ diff --git a/Source/Library/Artifacts/bb/bb78ddefe3523cd408f8ed301e2c84ae b/Source/Library/Artifacts/bb/bb78ddefe3523cd408f8ed301e2c84ae new file mode 100644 index 00000000..374c9fec Binary files /dev/null and b/Source/Library/Artifacts/bb/bb78ddefe3523cd408f8ed301e2c84ae differ diff --git a/Source/Library/Artifacts/bd/bd8e17848e57cc8daa963800b8d528f9 b/Source/Library/Artifacts/bd/bd8e17848e57cc8daa963800b8d528f9 deleted file mode 100644 index 94bb6b2a..00000000 Binary files a/Source/Library/Artifacts/bd/bd8e17848e57cc8daa963800b8d528f9 and /dev/null differ diff --git a/Source/Library/Artifacts/ca/ca8bcb1034c2900d50155799b1ae0b2b b/Source/Library/Artifacts/ca/ca8bcb1034c2900d50155799b1ae0b2b deleted file mode 100644 index 0fcbbed7..00000000 Binary files a/Source/Library/Artifacts/ca/ca8bcb1034c2900d50155799b1ae0b2b and /dev/null differ diff --git a/Source/Library/Artifacts/f3/f3da119bc13a92affe60150073bc9fe1 b/Source/Library/Artifacts/f3/f3da119bc13a92affe60150073bc9fe1 deleted file mode 100644 index 06215abb..00000000 Binary files a/Source/Library/Artifacts/f3/f3da119bc13a92affe60150073bc9fe1 and /dev/null differ diff --git a/Source/Library/Artifacts/f4/f41fc9bcc4c5635059b3b4f9abd2bdb5 b/Source/Library/Artifacts/f4/f41fc9bcc4c5635059b3b4f9abd2bdb5 deleted file mode 100644 index 5fe39847..00000000 Binary files a/Source/Library/Artifacts/f4/f41fc9bcc4c5635059b3b4f9abd2bdb5 and /dev/null differ diff --git a/Source/Library/Artifacts/fa/fae7ffec46f31e2a94d71705ce90207e b/Source/Library/Artifacts/fa/fae7ffec46f31e2a94d71705ce90207e deleted file mode 100644 index 4f38ce4c..00000000 Binary files a/Source/Library/Artifacts/fa/fae7ffec46f31e2a94d71705ce90207e and /dev/null differ diff --git a/Source/Library/CurrentLayout-default.dwlt b/Source/Library/CurrentLayout-default.dwlt index af66c655..e9293d89 100644 --- a/Source/Library/CurrentLayout-default.dwlt +++ b/Source/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: 371} 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: 371} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &3 MonoBehaviour: @@ -112,10 +112,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 678, y: 342} - m_MaxSize: {x: 12003, y: 8042} + m_MinSize: {x: 677, y: 321} + m_MaxSize: {x: 12002, y: 8021} vertical: 0 - controlID: 51636 + controlID: 3922 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -137,10 +137,10 @@ MonoBehaviour: y: 0 width: 1414 height: 947 - m_MinSize: {x: 402, y: 342} - m_MaxSize: {x: 8002, y: 8042} + m_MinSize: {x: 402, y: 321} + m_MaxSize: {x: 8002, y: 8021} vertical: 1 - controlID: 51588 + controlID: 3923 --- !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: 51566 + controlID: 3924 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -398,7 +398,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: b262fbffc662fbffc862fbfffa62fbff0e63fbffb463fbffc879fbffdc79fbff8c7afbff189cffffb0c9ffffa0f6ffffdcf7ffff62fbffffa03a0000b43a0000c03b0000e23c00008a3d0000b03d0000c23e0000d0420000ae440000624600005e470000e6470000 + m_ExpandedIDs: c423ffffd823ffffda23ffff8025ffff9425ffff3a26ffff562fffff6a2fffff6c2fffffe82ffffffc2ffffffe2fffffe432fffff832ffff9e33ffff62fbffff103d0000223d0000a43d0000523e00000e430000a2460000d646000066e8000078e800001ee90000d8e90000d0ef00002ef400006af400007030010022370100da67010092680100706d0100446f0100946f0100de730100f0c20100a2c90100f2c90100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -458,9 +458,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 503.66406, y: 306.76, z: -208.375} + m_Target: {x: 507.95483, y: 270.6315, z: -252.25} speed: 2 - m_Value: {x: 503.66406, y: 306.76, z: -208.375} + m_Value: {x: 507.95483, y: 270.6315, z: -252.25} 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: 340.93237 + m_Target: 284.62003 speed: 2 - m_Value: 340.93237 + m_Value: 298.03143 m_Ortho: m_Target: 1 speed: 2 @@ -1117,7 +1117,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 41} m_SelectedIDs: 7c4e0000 m_LastClickedID: 20092 - m_ExpandedIDs: 00000000704e0000724e0000744e0000764e0000784e00007a4e00007c4e00007e4e0000844e0000864e000000ca9a3b + m_ExpandedIDs: 00000000cc4e0000ce4e0000d04e0000d24e0000d44e0000d64e0000d84e0000da4e0000dc4e0000de4e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000704e0000724e0000744e0000764e0000784e00007a4e00007c4e00007e4e0000844e0000864e000000ca9a3b + m_ExpandedIDs: 00000000cc4e0000ce4e0000d04e0000d24e0000d44e0000d64e0000d84e0000da4e0000dc4e0000de4e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/Source/Library/CurrentMaximizeLayout.dwlt b/Source/Library/CurrentMaximizeLayout.dwlt index cd5825c1..934f3b7e 100644 --- a/Source/Library/CurrentMaximizeLayout.dwlt +++ b/Source/Library/CurrentMaximizeLayout.dwlt @@ -21,10 +21,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 678, y: 492} - m_MaxSize: {x: 14002, y: 14042} + m_MinSize: {x: 677, y: 321} + m_MaxSize: {x: 12002, y: 8021} vertical: 0 - controlID: 51280 + controlID: 1006 --- !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: 321} + m_MaxSize: {x: 8002, y: 8021} vertical: 1 - controlID: 51281 + controlID: 1007 --- !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: 51282 + controlID: 1008 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -186,8 +186,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: 6} m_Panes: - {fileID: 6} @@ -224,7 +224,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c879fbffdc79fbff8c7afbff189cffffb0c9ffffa0f6ffffdcf7ffff62fbffffa03a0000b43a0000c03b0000e23c00008a3d0000b03d0000c23e0000d0420000ae440000624600005e470000e6470000 + m_ExpandedIDs: 562fffff6a2fffff6c2fffffe82ffffffc2ffffffe2fffffe432fffff832ffff9e33ffff62fbffff103d0000223d0000a43d0000523e00000e430000a2460000d646000066e8000078e800001ee90000d8e90000d0ef00002ef400006af40000703001002237010092680100706d0100446f0100946f0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -313,9 +313,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 503.66406, y: 306.76, z: -208.375} + m_Target: {x: 336.24997, y: 300.388, z: -236.90625} speed: 2 - m_Value: {x: 503.66406, y: 306.76, z: -208.375} + m_Value: {x: 336.24997, y: 300.388, z: -236.90625} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -365,9 +365,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 340.93237 + m_Target: 263.2901 speed: 2 - m_Value: 340.93237 + m_Value: 263.2901 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: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - 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 @@ -1000,7 +1000,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 41} m_SelectedIDs: 7c4e0000 m_LastClickedID: 20092 - m_ExpandedIDs: 00000000704e0000724e0000744e0000764e0000784e00007a4e00007c4e00007e4e0000844e0000864e000000ca9a3b + m_ExpandedIDs: 00000000cc4e0000ce4e0000d04e0000d24e0000d44e0000d64e0000d84e0000da4e0000dc4e0000de4e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000704e0000724e0000744e0000764e0000784e00007a4e00007c4e00007e4e0000844e0000864e000000ca9a3b + m_ExpandedIDs: 00000000cc4e0000ce4e0000d04e0000d24e0000d44e0000d64e0000d84e0000da4e0000dc4e0000de4e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1203,5 +1203,5 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 94100 m_LastVerticalScrollValue: 0 diff --git a/Source/Library/LastBuild.buildreport b/Source/Library/LastBuild.buildreport index e73a6ae3..e375350f 100644 Binary files a/Source/Library/LastBuild.buildreport and b/Source/Library/LastBuild.buildreport differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll index 9704dc52..72a7283e 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll index 48a9c05d..6450d6d5 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll index 2b8d0a47..cad53633 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll index 27d5e298..a3181161 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll index 19c0a6a1..40bc94d9 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll index efd99ec8..9f3fbd53 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll index 4502f28b..2204e131 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll index 9a684de8..45aa1a84 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll index a2898f52..9935d6e2 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll index e528e1ee..11391329 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll index 92277bd4..569088c2 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/globalgamemanagers b/Source/Library/PlayerDataCache/Win/Data/globalgamemanagers index 08e1dbbc..898c942d 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/globalgamemanagers and b/Source/Library/PlayerDataCache/Win/Data/globalgamemanagers differ diff --git a/Source/Library/PlayerDataCache/Win/Data/level0 b/Source/Library/PlayerDataCache/Win/Data/level0 index 1a238f76..9f904677 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/level0 and b/Source/Library/PlayerDataCache/Win/Data/level0 differ diff --git a/Source/Library/PlayerDataCache/Win/Data/sharedassets0.assets b/Source/Library/PlayerDataCache/Win/Data/sharedassets0.assets index 739e7671..aff373d8 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/sharedassets0.assets and b/Source/Library/PlayerDataCache/Win/Data/sharedassets0.assets differ diff --git a/Source/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml b/Source/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml index 2e41d0db..b09f7e7e 100644 --- a/Source/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Source/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -169,99 +169,99 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 11958} - Class: 114 - Script: {instanceID: 12146} + Script: {instanceID: 11964} - Class: 114 - Script: {instanceID: 12182} + Script: {instanceID: 12052} - Class: 114 - Script: {instanceID: 12326} + Script: {instanceID: 12150} - Class: 114 - Script: {instanceID: 12350} + Script: {instanceID: 12186} - Class: 114 - Script: {instanceID: 12366} + Script: {instanceID: 12330} - Class: 114 - Script: {instanceID: 12436} + Script: {instanceID: 12354} - Class: 114 - Script: {instanceID: 12616} + Script: {instanceID: 12370} - Class: 114 - Script: {instanceID: 12640} + Script: {instanceID: 12440} - Class: 114 - Script: {instanceID: 12758} + Script: {instanceID: 12620} - Class: 114 - Script: {instanceID: 12882} + Script: {instanceID: 12644} - Class: 114 - Script: {instanceID: 12926} + Script: {instanceID: 12762} - Class: 114 - Script: {instanceID: 13176} + Script: {instanceID: 12886} - Class: 114 - Script: {instanceID: 13202} + Script: {instanceID: 12930} - Class: 114 - Script: {instanceID: 13242} + Script: {instanceID: 13180} - Class: 114 - Script: {instanceID: 13252} + Script: {instanceID: 13206} - Class: 114 - Script: {instanceID: 13262} + Script: {instanceID: 13246} - Class: 114 - Script: {instanceID: 13272} + Script: {instanceID: 13256} - Class: 114 - Script: {instanceID: 13374} + Script: {instanceID: 13266} - Class: 114 - Script: {instanceID: 13392} + Script: {instanceID: 13276} - Class: 114 - Script: {instanceID: 13394} + Script: {instanceID: 13378} - Class: 114 - Script: {instanceID: 13428} + Script: {instanceID: 13396} - Class: 114 - Script: {instanceID: 13468} + Script: {instanceID: 13398} - Class: 114 - Script: {instanceID: 13484} + Script: {instanceID: 13432} - Class: 114 - Script: {instanceID: 13500} + Script: {instanceID: 13472} - Class: 114 - Script: {instanceID: 13512} + Script: {instanceID: 13488} + - Class: 114 + Script: {instanceID: 13504} - Class: 114 Script: {instanceID: 13516} - Class: 114 - Script: {instanceID: 13552} + Script: {instanceID: 13520} - Class: 114 - Script: {instanceID: 13684} + Script: {instanceID: 13556} - Class: 114 - Script: {instanceID: 13710} + Script: {instanceID: 13688} - Class: 114 - Script: {instanceID: 13842} + Script: {instanceID: 13714} - Class: 114 - Script: {instanceID: 13916} + Script: {instanceID: 13846} - Class: 114 Script: {instanceID: 13920} - Class: 114 - Script: {instanceID: 14048} + Script: {instanceID: 13924} - Class: 114 - Script: {instanceID: 14112} + Script: {instanceID: 14052} - Class: 114 - Script: {instanceID: 14208} + Script: {instanceID: 14116} - Class: 114 - Script: {instanceID: 14358} + Script: {instanceID: 14212} - Class: 114 - Script: {instanceID: 14506} + Script: {instanceID: 14362} - Class: 114 - Script: {instanceID: 14532} + Script: {instanceID: 14510} - Class: 114 - Script: {instanceID: 14534} + Script: {instanceID: 14536} - Class: 114 - Script: {instanceID: 14566} + Script: {instanceID: 14538} - Class: 114 - Script: {instanceID: 14588} + Script: {instanceID: 14570} - Class: 114 - Script: {instanceID: 14590} + Script: {instanceID: 14592} - Class: 114 - Script: {instanceID: 14630} + Script: {instanceID: 14594} - Class: 114 - Script: {instanceID: 14636} + Script: {instanceID: 14634} - Class: 114 - Script: {instanceID: 14678} + Script: {instanceID: 14640} - Class: 114 - Script: {instanceID: 174674} - - Class: 114 - Script: {instanceID: 357434} + Script: {instanceID: 14682} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -527,6 +527,12 @@ ScriptsOnlyBuild: assemblyName: Assembly-CSharp.dll namespaceName: RimWorldAnimationStudio className: UIScaler + - hash: + serializedVersion: 2 + Hash: 6e721463c327b3d7aa6f7ce246d2d8c9 + assemblyName: Assembly-CSharp.dll + namespaceName: RimWorldAnimationStudio + className: UIAutoAdjust - hash: serializedVersion: 2 Hash: cf9f5cf2c3145a37ac07f00e50e460f9 @@ -563,6 +569,12 @@ ScriptsOnlyBuild: assemblyName: Unity.2D.PixelPerfect.dll namespaceName: UnityEngine.U2D className: PixelPerfectCamera + - hash: + serializedVersion: 2 + Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f + assemblyName: Assembly-CSharp.dll + namespaceName: RimWorldAnimationStudio + className: VersionText - hash: serializedVersion: 2 Hash: 5ab533713adae59372fb3e10a585c186 @@ -1067,18 +1079,6 @@ ScriptsOnlyBuild: assemblyName: Assembly-CSharp.dll namespaceName: RimWorldAnimationStudio className: DropdownMenu - - hash: - serializedVersion: 2 - Hash: 6e721463c327b3d7aa6f7ce246d2d8c9 - assemblyName: Assembly-CSharp.dll - namespaceName: RimWorldAnimationStudio - className: UIAutoAdjust - - hash: - serializedVersion: 2 - Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f - assemblyName: Assembly-CSharp.dll - namespaceName: RimWorldAnimationStudio - className: VersionText platform: 5 scenePathNames: - Assets/Scenes/MainScene.unity diff --git a/Source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 42cc6c1c..7317a6f5 100644 Binary files a/Source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/Source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/Source/Library/ScriptAssemblies/Assembly-CSharp.dll b/Source/Library/ScriptAssemblies/Assembly-CSharp.dll index 91754de5..644ee381 100644 Binary files a/Source/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Source/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Source/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Source/Library/ScriptAssemblies/Assembly-CSharp.pdb index 817bafe1..39f55af4 100644 Binary files a/Source/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Source/Library/ScriptAssemblies/Assembly-CSharp.pdb differ diff --git a/Source/Library/SourceAssetDB b/Source/Library/SourceAssetDB index d20b246b..e8ef3abe 100644 Binary files a/Source/Library/SourceAssetDB and b/Source/Library/SourceAssetDB differ diff --git a/Source/Library/StateCache/SceneView/352ee9-mainStage.json b/Source/Library/StateCache/SceneView/352ee9-mainStage.json index c3f86758..95167266 100644 --- a/Source/Library/StateCache/SceneView/352ee9-mainStage.json +++ b/Source/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":503.6640625,"y":306.760009765625,"z":-208.375},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":340.932373046875,"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":507.954833984375,"y":270.6315002441406,"z":-252.25},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":284.6200256347656,"orthographic":true} \ No newline at end of file