diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index 25fbbbf1..3af9d578 100644 Binary files a/.vs/RimWorld-Animation-Studio/v16/.suo and b/.vs/RimWorld-Animation-Studio/v16/.suo differ diff --git a/Assets/Scripts/AnimationComponents/AnimationDef.cs b/Assets/Scripts/AnimationComponents/AnimationDef.cs index f599a556..1239bbf5 100644 --- a/Assets/Scripts/AnimationComponents/AnimationDef.cs +++ b/Assets/Scripts/AnimationComponents/AnimationDef.cs @@ -128,7 +128,7 @@ namespace RimWorldAnimationStudio public void CloneAnimationStage() { - AnimationStage stage = Workspace.GetCurrentAnimationStage().Copy(); + AnimationStage stage = Workspace.GetCurrentAnimationStage().GetClone(); stage.StageName += " (Clone)"; Workspace.animationDef.AnimationStages.Insert(Workspace.StageID + 1, stage); diff --git a/Assets/Scripts/AnimationComponents/AnimationStage.cs b/Assets/Scripts/AnimationComponents/AnimationStage.cs index db982d42..dcac62a4 100644 --- a/Assets/Scripts/AnimationComponents/AnimationStage.cs +++ b/Assets/Scripts/AnimationComponents/AnimationStage.cs @@ -59,7 +59,7 @@ namespace RimWorldAnimationStudio [XmlIgnore] public int StageLoopsQuick { get { return Mathf.CeilToInt(PlayTimeTicksQuick / Workspace.StageWindowSize); } - set { value = Math.Max(0, Math.Min(value, StageLoopsNormal)); PlayTimeTicksQuick = value * Workspace.StageWindowSize; IsLooping = value > 1; } + set { value = Math.Max(0, Math.Min(value, StageLoopsNormal)); PlayTimeTicksQuick = value * Workspace.StageWindowSize; } } // Local data @@ -86,13 +86,15 @@ namespace RimWorldAnimationStudio public void StretchStageWindow(int newStageWindowSize) { + ResizeStageWindow(newStageWindowSize); + float scale = (float)newStageWindowSize / Workspace.StageWindowSize; foreach (PawnAnimationClip clip in AnimationClips) { foreach (PawnKeyframe keyframe in clip.Keyframes) { - keyframe.atTick = Mathf.CeilToInt((float)keyframe.atTick.Value * scale); + keyframe.atTick = keyframe.atTick == Constants.minTick ? Constants.minTick : Mathf.CeilToInt((float)keyframe.atTick.Value * scale); keyframe.TickDuration = 0; } @@ -103,10 +105,10 @@ namespace RimWorldAnimationStudio } public void ResizeStageWindow(int newStageWindowSize) - { - Workspace.GetCurrentAnimationStage().stageWindowSize = newStageWindowSize; + { Workspace.GetCurrentAnimationStage().PlayTimeTicks = newStageWindowSize * StageLoopsNormal; Workspace.GetCurrentAnimationStage().PlayTimeTicksQuick = newStageWindowSize * StageLoopsQuick; + Workspace.GetCurrentAnimationStage().stageWindowSize = newStageWindowSize; EventsManager.OnStageWindowSizeChanged(this); } @@ -121,17 +123,17 @@ namespace RimWorldAnimationStudio if (lastkeyframe != null) { - PawnKeyframe keyframeA = lastkeyframe.Copy(); + PawnKeyframe keyframeA = lastkeyframe.GetClone(); + keyframeA.GenerateKeyframeID(actorID); keyframeA.atTick = null; keyframeA.TickDuration = Constants.defaultAnimationClipLength - 1; - keyframeA.GenerateKeyframeID(actorID); clip.Keyframes.Add(keyframeA); - PawnKeyframe keyframeB = lastkeyframe.Copy(); + PawnKeyframe keyframeB = lastkeyframe.GetClone(); + keyframeB.GenerateKeyframeID(actorID); keyframeB.atTick = null; keyframeB.TickDuration = 1; - keyframeB.GenerateKeyframeID(actorID); clip.Keyframes.Add(keyframeB); } @@ -151,6 +153,19 @@ namespace RimWorldAnimationStudio animationClips.Add(clip); } + public AnimationStage GetClone() + { + AnimationStage clone = this.Copy(); + + foreach (PawnAnimationClip clip in clone.animationClips) + { + foreach (PawnKeyframe keyframe in clip.Keyframes) + { keyframe.GenerateKeyframeID(keyframe.actorID); } + } + + return clone; + } + // Pre-save / post-load public void OnPreSave() { diff --git a/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs b/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs index 587e3838..89fd2b84 100644 --- a/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs +++ b/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs @@ -236,7 +236,7 @@ namespace RimWorldAnimationStudio List keyframesToClone = Workspace.GetPawnKeyframesByID(Workspace.keyframeID); foreach (PawnKeyframe keyframe in keyframesToClone) - { Workspace.copiedKeyframes.Add(keyframe.Copy()); } + { Workspace.copiedKeyframes.Add(keyframe.GetClone()); } } public void PastePawnKeyframes() @@ -273,7 +273,7 @@ namespace RimWorldAnimationStudio Workspace.GetAnimationClipThatOwnsKeyframe(oldKeyframe.keyframeID).RemovePawnKeyframe(oldKeyframe.keyframeID, true); } - PawnKeyframe clonedKeyframe = copiedKeyframe.Copy(); + PawnKeyframe clonedKeyframe = copiedKeyframe.GetClone(); clonedKeyframe.GenerateKeyframeID(targetActorID); clonedKeyframe.atTick = tickToPasteAt; @@ -305,13 +305,24 @@ namespace RimWorldAnimationStudio PawnKeyframe keyframe = Workspace.GetPawnKeyframe(keyframeID); if (keyframe == null || IsOwnerOfKeyframe(keyframeID) == false) return; - if (keyframe.atTick == Constants.minTick && force == false) - { Debug.LogWarning("Cannot delete key frame - the first key frame of an animation clip cannot be deleted"); return; } - - if (Keyframes.Count <= 2 && force == false) - { Debug.LogWarning("Cannot delete key frame - an animation clip must have two or more keyframes"); return; } - Keyframes.Remove(keyframe); + + if (Workspace.GetAllPawnKeyframesAtTick(GetOwningActorID(), Constants.minTick).NullOrEmpty()) + { + PawnKeyframe newKeyframe = new PawnKeyframe(); + newKeyframe.GenerateKeyframeID(GetOwningActorID()); + newKeyframe.atTick = Constants.minTick; + Keyframes.Insert(0, newKeyframe); + } + + // Add missing second keyframe (if needed) + if (Keyframes.Count == 1) + { + PawnKeyframe newKeyframe = Workspace.GetAllPawnKeyframesAtTick(GetOwningActorID(), Constants.minTick).First().GetClone(); + newKeyframe.atTick = 10; + Keyframes.Add(newKeyframe); + } + BuildSimpleCurves(); EventsManager.OnKeyframeCountChanged(this); @@ -323,11 +334,6 @@ namespace RimWorldAnimationStudio return Keyframes.Any(x => x.keyframeID == keyframeID); } - public float GetStageTickPercentage() - { - return (float)(Workspace.StageTick % duration) / duration; - } - // Pre-save / post-load public void OnPreSave() { diff --git a/Assets/Scripts/AnimationComponents/PawnKeyframe.cs b/Assets/Scripts/AnimationComponents/PawnKeyframe.cs index fc052bf1..84b2ee39 100644 --- a/Assets/Scripts/AnimationComponents/PawnKeyframe.cs +++ b/Assets/Scripts/AnimationComponents/PawnKeyframe.cs @@ -39,7 +39,7 @@ namespace RimWorldAnimationStudio // Data helper functions [XmlIgnore] public float BodyAngle { - get { return bodyAngle.HasValue ? bodyAngle.Value : 0f; } + get { return bodyAngle.HasValue ? bodyAngle.Value : (float)(bodyAngle = 0f); } set { bodyAngle = value; } } @@ -205,6 +205,14 @@ namespace RimWorldAnimationStudio Workspace.RecordEvent("Actor position / orientation"); } + public PawnKeyframe GetClone() + { + PawnKeyframe clone = this.Copy(); + clone.GenerateKeyframeID(actorID); + + return clone; + } + // Pre-save / post-load public void OnPreSave() { diff --git a/Assets/Scripts/Data/ActorPosition.cs b/Assets/Scripts/Data/ActorPosition.cs index 9e8be354..4c61070a 100644 --- a/Assets/Scripts/Data/ActorPosition.cs +++ b/Assets/Scripts/Data/ActorPosition.cs @@ -23,7 +23,7 @@ namespace RimWorldAnimationStudio { PawnAnimationClip clip = Workspace.GetPawnAnimationClip(actorID); - float clipPercent = (float)atTick / Workspace.StageWindowSize; + float clipPercent = (float)(atTick % clip.duration) / clip.duration; if (atTick > Constants.minTick && atTick == clip.duration) clipPercent = 1f; if (Workspace.GetCurrentAnimationStage().IsLooping == false) diff --git a/Assets/Scripts/GUI/Actors/ActorBody.cs b/Assets/Scripts/GUI/Actors/ActorBody.cs index def06e47..0a228cfb 100644 --- a/Assets/Scripts/GUI/Actors/ActorBody.cs +++ b/Assets/Scripts/GUI/Actors/ActorBody.cs @@ -18,6 +18,10 @@ namespace RimWorldAnimationStudio { EventsManager.onActorBodyPartSelected.AddListener(delegate(ActorBodyPart bodyPart) { OnActorBodyPartSelected(bodyPart); }); EventsManager.onActorBodySelected.AddListener(delegate(ActorBody actorBody) { OnActorBodySelected(actorBody); }); + EventsManager.onActorIDChanged.AddListener(delegate { + if (Workspace.ActorID == actorID) + { EventsManager.OnActorBodySelected(this); } + }); if (Workspace.ActorID == actorID) { Activate(); } diff --git a/Assets/Scripts/GUI/AnimationTimeline.cs b/Assets/Scripts/GUI/AnimationTimeline.cs index d341b599..f066efc3 100644 --- a/Assets/Scripts/GUI/AnimationTimeline.cs +++ b/Assets/Scripts/GUI/AnimationTimeline.cs @@ -22,6 +22,7 @@ namespace RimWorldAnimationStudio EventsManager.onKeyframeCountChanged.AddListener(delegate { UpdateGUI(); }); EventsManager.onActorIDChanged.AddListener(delegate { UpdateTimelineSelection(); }); EventsManager.onStageWindowSizeChanged.AddListener(delegate { UpdateGUI(); }); + EventsManager.onAnimationStageChanged.AddListener(delegate { UpdateGUI(); }); UpdateTimelineSelection(); UpdateGUI(); diff --git a/Assets/Scripts/GUI/Cards/AnimationControlCard.cs b/Assets/Scripts/GUI/Cards/AnimationControlCard.cs index 5e190954..7085931d 100644 --- a/Assets/Scripts/GUI/Cards/AnimationControlCard.cs +++ b/Assets/Scripts/GUI/Cards/AnimationControlCard.cs @@ -58,6 +58,8 @@ namespace RimWorldAnimationStudio else { + Workspace.GetCurrentAnimationStage().ResizeStageWindow(newStageWindowSize); + foreach (PawnAnimationClip clip in Workspace.GetCurrentAnimationStage().AnimationClips) { List keyframes = clip.Keyframes.Where(x => x.atTick > newStageWindowSize)?.ToList(); @@ -75,7 +77,6 @@ namespace RimWorldAnimationStudio } } - Workspace.GetCurrentAnimationStage().ResizeStageWindow(newStageWindowSize); Workspace.RecordEvent("Stage length"); UpdateGUI(); diff --git a/Assets/Scripts/GUI/KeyframeSlider.cs b/Assets/Scripts/GUI/KeyframeSlider.cs index 433fc978..481833a6 100644 --- a/Assets/Scripts/GUI/KeyframeSlider.cs +++ b/Assets/Scripts/GUI/KeyframeSlider.cs @@ -111,7 +111,8 @@ namespace RimWorldAnimationStudio } public void OnBeginDrag(PointerEventData eventData) - { + { + // Select key Workspace.ActorID = actorID; dragTimeStart = Time.unscaledTime; dragTickStart = keyframe.atTick.Value; @@ -119,6 +120,12 @@ namespace RimWorldAnimationStudio if (Workspace.keyframeID.NullOrEmpty() || Workspace.keyframeID.Contains(keyframeID) == false) { Workspace.keyframeID = new List { keyframeID }; } + // The first key can't be moved though + if (keyframe.atTick == Constants.minTick) + { interactable = false; return; } + + interactable = true; + List selectedKeyframes = Workspace.GetPawnKeyframesByID(Workspace.keyframeID).Except(new List() { keyframe })?.ToList(); // Link other selected keyframes to the movement of this one @@ -134,6 +141,7 @@ namespace RimWorldAnimationStudio if (unlinkedSlider != null) { + if (selectedKeyframe.atTick == Constants.minTick) continue; if (Workspace.stretchKeyframes && unlinkedSlider.keyframe.atTick == pivotKeyframe.atTick) continue; unlinkedSlider.linkedSlider = this; @@ -147,31 +155,19 @@ namespace RimWorldAnimationStudio { Workspace.ActorID = actorID; - // The first keyframe can't be moved - if (keyframe.atTick == Constants.minTick) - { value = Constants.minTick; return; } - // Sticky drag if (Time.unscaledTime - dragTimeStart < 0.05f) return; - interactable = true; base.OnDrag(eventData); // Snap to nearest keyframe (on another timeline) int targetTick = Workspace.FindClosestKeyFrameAtTick(keyframe.atTick.Value, Mathf.CeilToInt(Workspace.StageWindowSize * 0.01f), actorID); if (Input.GetKey(KeyCode.LeftShift) && Workspace.DoesPawnKeyframeExistAtTick(Workspace.StageID, actorID, targetTick) == false) { value = (float)targetTick; } - - // Prevent other frames from being moved to the first keyframe - if (value == Constants.minTick) - { value = Constants.minTick + 1; } } public void OnEndDrag(PointerEventData eventData) { - if (keyframe.atTick == Constants.minTick) - { value = Constants.minTick; return; } - List keyframesToCheck = Workspace.GetAllPawnKeyframesAtTick(actorID, keyframe.atTick.Value); if (keyframesToCheck.NotNullOrEmpty()) { @@ -227,7 +223,7 @@ namespace RimWorldAnimationStudio { value = Mathf.CeilToInt(linkedSlider.keyframe.atTick.Value + linkedOffset * linkedSlider.ScaledOffsetFromPivot()); } else if (Workspace.stretchKeyframes == false && linkedSlider != null) - { value = Mathf.Clamp(linkedSlider.keyframe.atTick.Value + linkedOffset, Constants.minTick + 1, Workspace.StageWindowSize); } + { value = Mathf.Clamp(linkedSlider.keyframe.atTick.Value + linkedOffset, Constants.minTick, Workspace.StageWindowSize); } else if (keyframe.atTick.Value != value) { value = keyframe.atTick.Value; } diff --git a/Assets/Scripts/Managers/AnimationController.cs b/Assets/Scripts/Managers/AnimationController.cs index baff8496..00afaaec 100644 --- a/Assets/Scripts/Managers/AnimationController.cs +++ b/Assets/Scripts/Managers/AnimationController.cs @@ -89,21 +89,24 @@ namespace RimWorldAnimationStudio for (int actorID = 0; actorID < Workspace.animationDef.actors.Count; actorID++) { - // Get the current actor and their animation clip + // Get the current actor Actor actor = Workspace.GetActor(actorID); + + // Get their animation clip and rebuild it to ensure it is up to date PawnAnimationClip clip = Workspace.GetPawnAnimationClip(actorID); + clip.BuildSimpleCurves(); // Get flags bool quiver = Workspace.IsAnimating && Workspace.GetCurrentOrPreviousKeyframe(actorID).Quiver == true; bool requiresGenitals = actor.RequiredGenitals.Any(x => x == "Penis") || actor.IsFucking; - // Get clip percentage - float clipPercent = clip.GetStageTickPercentage(); - if (Workspace.StageTick > Constants.minTick && Workspace.StageTick == clip.duration) clipPercent = 1f; - + // Get clip percentage + float clipPercent = (float)(Workspace.StageTick % clip.duration) / clip.duration; + if (Workspace.StageTick > Constants.minTick && Workspace.StageTick == clip.duration) clipPercent = 1f; + if (Workspace.GetCurrentAnimationStage().IsLooping == false) { clipPercent = (float)Workspace.StageTick / clip.duration; } - + // Get the actors race and body type PawnRaceDef pawnRaceDef = actor.GetPawnRaceDef(); string bodyType = pawnRaceDef.isHumanoid ? actor.bodyType : "None"; @@ -188,7 +191,7 @@ namespace RimWorldAnimationStudio // Play sounds if (Workspace.IsAnimating) { - PawnKeyframe keyframe = clip.keyframes.FirstOrDefault(x => x.atTick == Workspace.StageTick); + PawnKeyframe keyframe = clip.keyframes.FirstOrDefault(x => x.atTick == (int)(clip.duration * clipPercent)); if (keyframe != null && string.IsNullOrEmpty(keyframe.soundEffect) == false) { actorBody.GetComponent().PlaySound(keyframe.soundEffect); } diff --git a/Assets/Scripts/Managers/InputManager.cs b/Assets/Scripts/Managers/InputManager.cs index c6846b7d..7722d0c4 100644 --- a/Assets/Scripts/Managers/InputManager.cs +++ b/Assets/Scripts/Managers/InputManager.cs @@ -316,8 +316,8 @@ namespace RimWorldAnimationStudio { if (Workspace.animationDef == null) return; - ActorBody actorBody = AnimationController.Instance.actorBodies.GetChild(Workspace.ActorID).GetComponent(); - List actorBodyParts = actorBody.GetComponentsInChildren().Where(x => x.gameObject.activeInHierarchy)?.ToList(); + ActorBody actorBody = AnimationController.Instance.actorBodies.GetComponentsInChildren().FirstOrDefault(x => x.actorID == Workspace.ActorID); + List actorBodyParts = actorBody?.GetComponentsInChildren()?.Where(x => x.gameObject.activeInHierarchy)?.ToList(); if (actorBodyParts.NullOrEmpty()) return; diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index ab65a0d3..ef272cce 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 c8ec883e..1c688964 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 e15d7685..4432b253 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 b6da0e68..c0f4c55f 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 3f895154..69acae4a 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 bef37809..57d70629 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 cd813ae1..bf786a0f 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 19c84600..19ce3fae 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 21313fe7..df51edec 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 d7ae17cb..9a52dc37 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 23cb4b46..6f47ea06 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 2010ce49..c1ca3333 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/sharedassets0.assets b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets index bbae7116..a985b3e4 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets and b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets differ diff --git a/Library/ArtifactDB b/Library/ArtifactDB index 0ace9208..d5e2233e 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/26/2629eea06e9739597d578fa0b983f39e b/Library/Artifacts/26/2629eea06e9739597d578fa0b983f39e new file mode 100644 index 00000000..852899cc Binary files /dev/null and b/Library/Artifacts/26/2629eea06e9739597d578fa0b983f39e differ diff --git a/Library/Artifacts/2c/2cf858eaf9ad74fa0a8c83e6f8231e5e b/Library/Artifacts/2c/2cf858eaf9ad74fa0a8c83e6f8231e5e new file mode 100644 index 00000000..f2bc7f00 Binary files /dev/null and b/Library/Artifacts/2c/2cf858eaf9ad74fa0a8c83e6f8231e5e differ diff --git a/Library/Artifacts/30/307ecb97e9976b3a0f6a6358f3b4b0d3 b/Library/Artifacts/30/307ecb97e9976b3a0f6a6358f3b4b0d3 new file mode 100644 index 00000000..165c3f4a Binary files /dev/null and b/Library/Artifacts/30/307ecb97e9976b3a0f6a6358f3b4b0d3 differ diff --git a/Library/Artifacts/4c/4c28a98251ae9e407ff21f499b40ee44 b/Library/Artifacts/4c/4c28a98251ae9e407ff21f499b40ee44 new file mode 100644 index 00000000..ac049c9a Binary files /dev/null and b/Library/Artifacts/4c/4c28a98251ae9e407ff21f499b40ee44 differ diff --git a/Library/Artifacts/0f/0f76ed68819fcb252e71f08f99ad06ca b/Library/Artifacts/4e/4e85a0f8913eec5050647d4fd6143320 similarity index 90% rename from Library/Artifacts/0f/0f76ed68819fcb252e71f08f99ad06ca rename to Library/Artifacts/4e/4e85a0f8913eec5050647d4fd6143320 index f14c8560..c70621ec 100644 Binary files a/Library/Artifacts/0f/0f76ed68819fcb252e71f08f99ad06ca and b/Library/Artifacts/4e/4e85a0f8913eec5050647d4fd6143320 differ diff --git a/Library/Artifacts/5f/5f0ddcee147b84b599329fcef1a8f592 b/Library/Artifacts/5f/5f0ddcee147b84b599329fcef1a8f592 new file mode 100644 index 00000000..856248a3 Binary files /dev/null and b/Library/Artifacts/5f/5f0ddcee147b84b599329fcef1a8f592 differ diff --git a/Library/Artifacts/62/626bb8f07c965d64feeda0b575529c22 b/Library/Artifacts/62/626bb8f07c965d64feeda0b575529c22 new file mode 100644 index 00000000..49ff8856 Binary files /dev/null and b/Library/Artifacts/62/626bb8f07c965d64feeda0b575529c22 differ diff --git a/Library/Artifacts/14/14f46ee7aa2b95ecdc267bd6e407f902 b/Library/Artifacts/6c/6c9d0817e9152b67efa24f71edf8ba66 similarity index 52% rename from Library/Artifacts/14/14f46ee7aa2b95ecdc267bd6e407f902 rename to Library/Artifacts/6c/6c9d0817e9152b67efa24f71edf8ba66 index 5e2a32c7..3d75b1a4 100644 Binary files a/Library/Artifacts/14/14f46ee7aa2b95ecdc267bd6e407f902 and b/Library/Artifacts/6c/6c9d0817e9152b67efa24f71edf8ba66 differ diff --git a/Library/Artifacts/77/774425f6b8d54c83d5e0b44f061363a2 b/Library/Artifacts/77/774425f6b8d54c83d5e0b44f061363a2 new file mode 100644 index 00000000..49beb84e Binary files /dev/null and b/Library/Artifacts/77/774425f6b8d54c83d5e0b44f061363a2 differ diff --git a/Library/Artifacts/f1/f1f7b17c649a56602034395f4877b37a b/Library/Artifacts/81/81dda9aa73f9939980d2885eea6ad9a5 similarity index 96% rename from Library/Artifacts/f1/f1f7b17c649a56602034395f4877b37a rename to Library/Artifacts/81/81dda9aa73f9939980d2885eea6ad9a5 index 8350457a..25f84b7d 100644 Binary files a/Library/Artifacts/f1/f1f7b17c649a56602034395f4877b37a and b/Library/Artifacts/81/81dda9aa73f9939980d2885eea6ad9a5 differ diff --git a/Library/Artifacts/e9/e9fdafb7a300bd271c3849544ec259f0 b/Library/Artifacts/85/855d715e8cf296ac3fc5e0199aa902a2 similarity index 95% rename from Library/Artifacts/e9/e9fdafb7a300bd271c3849544ec259f0 rename to Library/Artifacts/85/855d715e8cf296ac3fc5e0199aa902a2 index 4d51b402..1d40a777 100644 Binary files a/Library/Artifacts/e9/e9fdafb7a300bd271c3849544ec259f0 and b/Library/Artifacts/85/855d715e8cf296ac3fc5e0199aa902a2 differ diff --git a/Library/Artifacts/e1/e1c62e8e6f416da9ce692a7fa7ba0b4a b/Library/Artifacts/8c/8c3d724c42a1fd5b6b96685702123c03 similarity index 94% rename from Library/Artifacts/e1/e1c62e8e6f416da9ce692a7fa7ba0b4a rename to Library/Artifacts/8c/8c3d724c42a1fd5b6b96685702123c03 index cf198397..8a4ac6bf 100644 Binary files a/Library/Artifacts/e1/e1c62e8e6f416da9ce692a7fa7ba0b4a and b/Library/Artifacts/8c/8c3d724c42a1fd5b6b96685702123c03 differ diff --git a/Library/Artifacts/8f/8f27f0d7b36315eb1fa10c59cabe8cfd b/Library/Artifacts/8f/8f27f0d7b36315eb1fa10c59cabe8cfd deleted file mode 100644 index ee358a2d..00000000 Binary files a/Library/Artifacts/8f/8f27f0d7b36315eb1fa10c59cabe8cfd and /dev/null differ diff --git a/Library/Artifacts/a0/a085cbd60e7cce6f6db895f502e616ac b/Library/Artifacts/a0/a085cbd60e7cce6f6db895f502e616ac new file mode 100644 index 00000000..86dc7957 Binary files /dev/null and b/Library/Artifacts/a0/a085cbd60e7cce6f6db895f502e616ac differ diff --git a/Library/Artifacts/b0/b0e08e47cbf49d91b0716175c7c77743 b/Library/Artifacts/b0/b0e08e47cbf49d91b0716175c7c77743 new file mode 100644 index 00000000..57827162 Binary files /dev/null and b/Library/Artifacts/b0/b0e08e47cbf49d91b0716175c7c77743 differ diff --git a/Library/Artifacts/81/81ab542e7c8c9afa968e162d9e4d9589 b/Library/Artifacts/b6/b6d572061868897ded1673f76b24e55d similarity index 96% rename from Library/Artifacts/81/81ab542e7c8c9afa968e162d9e4d9589 rename to Library/Artifacts/b6/b6d572061868897ded1673f76b24e55d index 5397c306..d1de26c7 100644 Binary files a/Library/Artifacts/81/81ab542e7c8c9afa968e162d9e4d9589 and b/Library/Artifacts/b6/b6d572061868897ded1673f76b24e55d differ diff --git a/Library/Artifacts/bc/bc70f7d187322735821144a702fedbf8 b/Library/Artifacts/bc/bc70f7d187322735821144a702fedbf8 new file mode 100644 index 00000000..7ae0b41a Binary files /dev/null and b/Library/Artifacts/bc/bc70f7d187322735821144a702fedbf8 differ diff --git a/Library/Artifacts/bd/bdcc70180edee2d030a6fbb1c7f40e94 b/Library/Artifacts/bd/bdcc70180edee2d030a6fbb1c7f40e94 new file mode 100644 index 00000000..9f1ea863 Binary files /dev/null and b/Library/Artifacts/bd/bdcc70180edee2d030a6fbb1c7f40e94 differ diff --git a/Library/Artifacts/c1/c1363c60b00f9b3aa6c506810369c565 b/Library/Artifacts/c1/c1363c60b00f9b3aa6c506810369c565 new file mode 100644 index 00000000..5d1a3ad1 Binary files /dev/null and b/Library/Artifacts/c1/c1363c60b00f9b3aa6c506810369c565 differ diff --git a/Library/Artifacts/cf/cfc4604826578471db647802ac6cbf0f b/Library/Artifacts/cf/cf4b75fb09f27c3ec1a7c9bc81c39173 similarity index 91% rename from Library/Artifacts/cf/cfc4604826578471db647802ac6cbf0f rename to Library/Artifacts/cf/cf4b75fb09f27c3ec1a7c9bc81c39173 index fd359be8..341bb582 100644 Binary files a/Library/Artifacts/cf/cfc4604826578471db647802ac6cbf0f and b/Library/Artifacts/cf/cf4b75fb09f27c3ec1a7c9bc81c39173 differ diff --git a/Library/Artifacts/d2/d2301b2b5b07af2c0da0c7e76ddb059f b/Library/Artifacts/d2/d2301b2b5b07af2c0da0c7e76ddb059f new file mode 100644 index 00000000..b581c9c8 Binary files /dev/null and b/Library/Artifacts/d2/d2301b2b5b07af2c0da0c7e76ddb059f differ diff --git a/Library/Artifacts/d4/d4441467233f3155380197909e659f32 b/Library/Artifacts/d4/d4441467233f3155380197909e659f32 new file mode 100644 index 00000000..a02bd0bf Binary files /dev/null and b/Library/Artifacts/d4/d4441467233f3155380197909e659f32 differ diff --git a/Library/Artifacts/dc/dc968ae3005c3bc5581a19f74e560899 b/Library/Artifacts/dc/dc968ae3005c3bc5581a19f74e560899 new file mode 100644 index 00000000..75a16a46 Binary files /dev/null and b/Library/Artifacts/dc/dc968ae3005c3bc5581a19f74e560899 differ diff --git a/Library/Artifacts/a1/a17e55fa54b2e584b6623e6d4726873f b/Library/Artifacts/e4/e4734270a6bc26bcccfb2e393ef8993e similarity index 95% rename from Library/Artifacts/a1/a17e55fa54b2e584b6623e6d4726873f rename to Library/Artifacts/e4/e4734270a6bc26bcccfb2e393ef8993e index 60efb18f..f00bd779 100644 Binary files a/Library/Artifacts/a1/a17e55fa54b2e584b6623e6d4726873f and b/Library/Artifacts/e4/e4734270a6bc26bcccfb2e393ef8993e differ diff --git a/Library/Artifacts/ea/ea482f70fb313709289fec635f1c8881 b/Library/Artifacts/ea/ea482f70fb313709289fec635f1c8881 new file mode 100644 index 00000000..fc89ac1f Binary files /dev/null and b/Library/Artifacts/ea/ea482f70fb313709289fec635f1c8881 differ diff --git a/Library/Artifacts/10/10a81ddd4937114006af8da429c61da5 b/Library/Artifacts/f3/f3016ece3ace10b42f68c96e9f627cab similarity index 94% rename from Library/Artifacts/10/10a81ddd4937114006af8da429c61da5 rename to Library/Artifacts/f3/f3016ece3ace10b42f68c96e9f627cab index 75a748be..8f7a4e90 100644 Binary files a/Library/Artifacts/10/10a81ddd4937114006af8da429c61da5 and b/Library/Artifacts/f3/f3016ece3ace10b42f68c96e9f627cab differ diff --git a/Library/Artifacts/f4/f4e5b70a0d73e6e06c4576ce692b9616 b/Library/Artifacts/f4/f4e5b70a0d73e6e06c4576ce692b9616 new file mode 100644 index 00000000..7a424ab7 Binary files /dev/null and b/Library/Artifacts/f4/f4e5b70a0d73e6e06c4576ce692b9616 differ diff --git a/Library/Artifacts/9e/9e3fbdc71fe3984a5bba1539c0d8676e b/Library/Artifacts/f6/f61b39aa8a509fa6e8394bb9bc32d54d similarity index 96% rename from Library/Artifacts/9e/9e3fbdc71fe3984a5bba1539c0d8676e rename to Library/Artifacts/f6/f61b39aa8a509fa6e8394bb9bc32d54d index 54dc7a9b..95f47034 100644 Binary files a/Library/Artifacts/9e/9e3fbdc71fe3984a5bba1539c0d8676e and b/Library/Artifacts/f6/f61b39aa8a509fa6e8394bb9bc32d54d differ diff --git a/Library/Artifacts/7b/7ba609933a8a540647bf7beb44934bfe b/Library/Artifacts/f9/f903cb19b1ebd86befd9a09e7f8a5e17 similarity index 94% rename from Library/Artifacts/7b/7ba609933a8a540647bf7beb44934bfe rename to Library/Artifacts/f9/f903cb19b1ebd86befd9a09e7f8a5e17 index 09797063..9b8bccb8 100644 Binary files a/Library/Artifacts/7b/7ba609933a8a540647bf7beb44934bfe and b/Library/Artifacts/f9/f903cb19b1ebd86befd9a09e7f8a5e17 differ diff --git a/Library/Artifacts/fb/fbf614b97a79f6dce96b33991604b41b b/Library/Artifacts/fb/fbf614b97a79f6dce96b33991604b41b new file mode 100644 index 00000000..b928ef5d Binary files /dev/null and b/Library/Artifacts/fb/fbf614b97a79f6dce96b33991604b41b differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index d92d9da9..73067500 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -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: 677, y: 492} + m_MaxSize: {x: 14001, y: 14042} vertical: 0 - controlID: 2473 + controlID: 3533 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -137,10 +137,10 @@ MonoBehaviour: y: 0 width: 1414 height: 947 - m_MinSize: {x: 403, y: 492} + m_MinSize: {x: 402, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 2478 + controlID: 3534 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,10 +162,10 @@ MonoBehaviour: y: 0 width: 1414 height: 671 - 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: 2479 + controlID: 3535 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -398,7 +398,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 28a2feff3ca2feffe2a2feff62fbffff7a3d0000a83d000010410000b4420000 + m_ExpandedIDs: 74a0fcff88a0fcff2ea1fcff4cfbffffbc420000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1115,9 +1115,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 143} - m_SelectedIDs: 464e0000 - m_LastClickedID: 20038 - m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b + m_SelectedIDs: 4e4e0000 + m_LastClickedID: 20046 + m_ExpandedIDs: 00000000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e0000584e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b + m_ExpandedIDs: 00000000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e0000584e000000ca9a3b 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: 100 + m_LastVerticalScrollValue: 0 diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index 808b09d2..0df7e85f 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: 677, y: 492} + m_MaxSize: {x: 14001, y: 14042} vertical: 0 - controlID: 2139 + controlID: 3438 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,10 +138,10 @@ MonoBehaviour: y: 0 width: 1414 height: 947 - m_MinSize: {x: 403, y: 492} + m_MinSize: {x: 402, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 2140 + controlID: 3439 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,10 +163,10 @@ MonoBehaviour: y: 0 width: 1414 height: 671 - 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: 2141 + controlID: 3440 --- !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: 62fbffff7a3d0000a83d000010410000b4420000 + m_ExpandedIDs: 4cfbffffbc420000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -939,8 +939,8 @@ MonoBehaviour: y: 671 width: 1414 height: 276 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -998,9 +998,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 143} - m_SelectedIDs: 464e0000 - m_LastClickedID: 20038 - m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b + m_SelectedIDs: 4e4e0000 + m_LastClickedID: 20046 + m_ExpandedIDs: 00000000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e0000584e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b + m_ExpandedIDs: 00000000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e0000584e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1053,8 +1053,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: ec440000 - m_LastClickedInstanceID: 17644 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e9800000249000086980000000000007a140100 m_RenameOverlay: @@ -1203,5 +1203,5 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: 17644 - m_LastVerticalScrollValue: 100 + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index 869bb6e6..c1b8fa54 100644 Binary files a/Library/LastBuild.buildreport and b/Library/LastBuild.buildreport differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll b/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll index ab65a0d3..ef272cce 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll and b/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll index c8ec883e..1c688964 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll index e15d7685..4432b253 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll index b6da0e68..c0f4c55f 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll index 3f895154..69acae4a 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll index bef37809..57d70629 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll index cd813ae1..bf786a0f 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll index 19c84600..19ce3fae 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll index 21313fe7..df51edec 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll index d7ae17cb..9a52dc37 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll b/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll index 23cb4b46..6f47ea06 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll and b/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll differ diff --git a/Library/PlayerDataCache/Win/Data/globalgamemanagers b/Library/PlayerDataCache/Win/Data/globalgamemanagers index 2010ce49..c1ca3333 100644 Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers and b/Library/PlayerDataCache/Win/Data/globalgamemanagers differ diff --git a/Library/PlayerDataCache/Win/Data/sharedassets0.assets b/Library/PlayerDataCache/Win/Data/sharedassets0.assets index bbae7116..a985b3e4 100644 Binary files a/Library/PlayerDataCache/Win/Data/sharedassets0.assets and b/Library/PlayerDataCache/Win/Data/sharedassets0.assets differ diff --git a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml index 31146eac..9de803d0 100644 --- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -130,129 +130,129 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 11264} - Class: 114 - Script: {instanceID: 11268} + Script: {instanceID: 11270} - Class: 114 - Script: {instanceID: 11292} + Script: {instanceID: 11294} - Class: 114 - Script: {instanceID: 11450} + Script: {instanceID: 11452} - Class: 114 - Script: {instanceID: 11504} + Script: {instanceID: 11506} - Class: 114 - Script: {instanceID: 11580} + Script: {instanceID: 11582} - Class: 114 - Script: {instanceID: 11592} + Script: {instanceID: 11594} - Class: 114 - Script: {instanceID: 11606} + Script: {instanceID: 11608} - Class: 114 - Script: {instanceID: 11660} + Script: {instanceID: 11662} - Class: 114 - Script: {instanceID: 11734} + Script: {instanceID: 11736} - Class: 114 - Script: {instanceID: 11760} - - Class: 114 - Script: {instanceID: 11764} + Script: {instanceID: 11762} - Class: 114 Script: {instanceID: 11766} - Class: 114 - Script: {instanceID: 11774} + Script: {instanceID: 11768} - Class: 114 - Script: {instanceID: 11784} + Script: {instanceID: 11776} - Class: 114 - Script: {instanceID: 11806} + Script: {instanceID: 11786} - Class: 114 - Script: {instanceID: 11870} + Script: {instanceID: 11808} - Class: 114 - Script: {instanceID: 11876} + Script: {instanceID: 11872} - Class: 114 - Script: {instanceID: 12144} + Script: {instanceID: 11878} - Class: 114 - Script: {instanceID: 12180} + Script: {instanceID: 12146} - Class: 114 - Script: {instanceID: 12324} + Script: {instanceID: 12182} - Class: 114 - Script: {instanceID: 12348} + Script: {instanceID: 12326} - Class: 114 - Script: {instanceID: 12364} + Script: {instanceID: 12350} - Class: 114 - Script: {instanceID: 12434} + Script: {instanceID: 12366} - Class: 114 - Script: {instanceID: 12614} + Script: {instanceID: 12436} - Class: 114 - Script: {instanceID: 12638} + Script: {instanceID: 12616} - Class: 114 - Script: {instanceID: 12756} + Script: {instanceID: 12640} - Class: 114 - Script: {instanceID: 12880} + Script: {instanceID: 12758} - Class: 114 - Script: {instanceID: 12924} + Script: {instanceID: 12882} - Class: 114 - Script: {instanceID: 13174} + Script: {instanceID: 12926} - Class: 114 - Script: {instanceID: 13200} + Script: {instanceID: 13176} - Class: 114 - Script: {instanceID: 13240} + Script: {instanceID: 13202} - Class: 114 - Script: {instanceID: 13250} + Script: {instanceID: 13242} - Class: 114 - Script: {instanceID: 13260} + Script: {instanceID: 13252} - Class: 114 - Script: {instanceID: 13270} + Script: {instanceID: 13262} - Class: 114 - Script: {instanceID: 13372} + Script: {instanceID: 13272} - Class: 114 - Script: {instanceID: 13390} + Script: {instanceID: 13374} - Class: 114 Script: {instanceID: 13392} - Class: 114 - Script: {instanceID: 13426} + Script: {instanceID: 13394} - Class: 114 - Script: {instanceID: 13466} + Script: {instanceID: 13428} - Class: 114 - Script: {instanceID: 13482} + Script: {instanceID: 13468} - Class: 114 - Script: {instanceID: 13498} + Script: {instanceID: 13484} - Class: 114 - Script: {instanceID: 13510} + Script: {instanceID: 13500} - Class: 114 - Script: {instanceID: 13514} + Script: {instanceID: 13512} - Class: 114 - Script: {instanceID: 13550} + Script: {instanceID: 13516} - Class: 114 - Script: {instanceID: 13682} + Script: {instanceID: 13552} - Class: 114 - Script: {instanceID: 13708} + Script: {instanceID: 13684} - Class: 114 - Script: {instanceID: 13840} + Script: {instanceID: 13710} - Class: 114 - Script: {instanceID: 13914} + Script: {instanceID: 13842} - Class: 114 - Script: {instanceID: 13918} + Script: {instanceID: 13916} - Class: 114 - Script: {instanceID: 14046} + Script: {instanceID: 13920} - Class: 114 - Script: {instanceID: 14110} + Script: {instanceID: 14048} - Class: 114 - Script: {instanceID: 14206} + Script: {instanceID: 14112} - Class: 114 - Script: {instanceID: 14356} + Script: {instanceID: 14208} - Class: 114 - Script: {instanceID: 14504} + Script: {instanceID: 14358} - Class: 114 - Script: {instanceID: 14530} + Script: {instanceID: 14506} - Class: 114 Script: {instanceID: 14532} - Class: 114 - Script: {instanceID: 14564} + Script: {instanceID: 14534} - Class: 114 - Script: {instanceID: 14586} + Script: {instanceID: 14566} - Class: 114 Script: {instanceID: 14588} - Class: 114 - Script: {instanceID: 14628} + Script: {instanceID: 14590} - Class: 114 - Script: {instanceID: 14634} + Script: {instanceID: 14630} - Class: 114 - Script: {instanceID: 14676} + Script: {instanceID: 14636} + - Class: 114 + Script: {instanceID: 14678} - Class: 115 Script: {instanceID: 0} - Class: 128 diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 3573e6e6..c8db32da 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 9af65a6e..bb4fba1c 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 90c6a64e..8365ebe4 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 1c7709d6..9f6e930b 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/shadercompiler-UnityShaderCompiler.exe10.log b/Library/shadercompiler-UnityShaderCompiler.exe10.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe10.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe10.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe11.log b/Library/shadercompiler-UnityShaderCompiler.exe11.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe11.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe11.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe4.log b/Library/shadercompiler-UnityShaderCompiler.exe4.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe4.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe4.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe5.log b/Library/shadercompiler-UnityShaderCompiler.exe5.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe5.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe5.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe6.log b/Library/shadercompiler-UnityShaderCompiler.exe6.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe6.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe6.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe7.log b/Library/shadercompiler-UnityShaderCompiler.exe7.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe7.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe7.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe8.log b/Library/shadercompiler-UnityShaderCompiler.exe8.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe8.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe8.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe9.log b/Library/shadercompiler-UnityShaderCompiler.exe9.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe9.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe9.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process