diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index c249bcbe..c33e2b74 100644 Binary files a/.vs/RimWorld-Animation-Studio/v16/.suo and b/.vs/RimWorld-Animation-Studio/v16/.suo differ diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index d06f25f5..a26dbc4f 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -1638,7 +1638,6 @@ GameObject: - component: {fileID: 109039885} - component: {fileID: 109039884} - component: {fileID: 109039883} - - component: {fileID: 109039882} m_Layer: 5 m_Name: AboutButton m_TagString: Untagged @@ -1666,18 +1665,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -47} m_SizeDelta: {x: 300, y: 30} m_Pivot: {x: 0, y: 0.5} ---- !u!114 &109039882 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 109039880} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &109039883 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3944,7 +3931,6 @@ GameObject: - component: {fileID: 289329354} - component: {fileID: 289329353} - component: {fileID: 289329352} - - component: {fileID: 289329351} m_Layer: 5 m_Name: CopyKeyframesButton m_TagString: Untagged @@ -3973,18 +3959,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -77} m_SizeDelta: {x: 300, y: 30} m_Pivot: {x: 0, y: 0.5} ---- !u!114 &289329351 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 289329349} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &289329352 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5004,7 +4978,6 @@ GameObject: - component: {fileID: 352276162} - component: {fileID: 352276161} - component: {fileID: 352276160} - - component: {fileID: 352276159} m_Layer: 5 m_Name: OpenConsoleButton m_TagString: Untagged @@ -5032,18 +5005,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 300, y: 30} m_Pivot: {x: 0, y: 0.5} ---- !u!114 &352276159 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 352276157} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &352276160 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12925,7 +12886,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Past copied frames + m_Text: Paste copied frames --- !u!222 &841981647 CanvasRenderer: m_ObjectHideFlags: 0 @@ -14912,7 +14873,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2aa5d5fba80ba8346882964ef3756de3, type: 3} m_Name: m_EditorClassIdentifier: - command: UndoAction + command: CopyKeyframes --- !u!114 &985133704 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15403,7 +15364,6 @@ GameObject: - component: {fileID: 1018392371} - component: {fileID: 1018392370} - component: {fileID: 1018392369} - - component: {fileID: 1018392368} m_Layer: 5 m_Name: PasteKeyframesButton m_TagString: Untagged @@ -15432,18 +15392,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -107} m_SizeDelta: {x: 300, y: 30} m_Pivot: {x: 0, y: 0.5} ---- !u!114 &1018392368 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1018392366} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1018392369 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16475,7 +16423,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2aa5d5fba80ba8346882964ef3756de3, type: 3} m_Name: m_EditorClassIdentifier: - command: RedoAction + command: PasteKeyframes --- !u!114 &1110261508 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20546,7 +20494,6 @@ GameObject: - component: {fileID: 1345808907} - component: {fileID: 1345808906} - component: {fileID: 1345808905} - - component: {fileID: 1345808908} m_Layer: 5 m_Name: RedoButton m_TagString: Untagged @@ -20666,18 +20613,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1345808903} m_CullTransparentMesh: 0 ---- !u!114 &1345808908 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1345808903} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1347870115 GameObject: m_ObjectHideFlags: 0 @@ -27740,7 +27675,6 @@ GameObject: - component: {fileID: 1845596336} - component: {fileID: 1845596335} - component: {fileID: 1845596334} - - component: {fileID: 1845596337} m_Layer: 5 m_Name: RaceSettingsButton m_TagString: Untagged @@ -27860,18 +27794,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1845596332} m_CullTransparentMesh: 0 ---- !u!114 &1845596337 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1845596332} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1862378299 GameObject: m_ObjectHideFlags: 0 @@ -30773,7 +30695,6 @@ GameObject: - component: {fileID: 2134497167} - component: {fileID: 2134497166} - component: {fileID: 2134497165} - - component: {fileID: 2134497168} m_Layer: 5 m_Name: UndoButton m_TagString: Untagged @@ -30893,18 +30814,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2134497163} m_CullTransparentMesh: 0 ---- !u!114 &2134497168 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2134497163} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7903694afa5d7ba429917c147e222781, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &2140712441 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GUI/SelectRaceDropdown.cs b/Assets/Scripts/GUI/SelectRaceDropdown.cs index 05bd31e2..9a1b1957 100644 --- a/Assets/Scripts/GUI/SelectRaceDropdown.cs +++ b/Assets/Scripts/GUI/SelectRaceDropdown.cs @@ -22,9 +22,12 @@ namespace RimWorldAnimationStudio public void Update() { - if (Workspace.animationDef == null) return; + //if (Workspace.animationDef == null) return; - if (actorID != Workspace.actorID || hashcode != CustomTags.defNames.GetHashCode()) + //if (actorID != Workspace.actorID || hashcode != CustomTags.defNames.GetHashCode()) + //{ UpdateDropdown(); } + + if (hashcode != CustomTags.defNames.GetHashCode()) { UpdateDropdown(); } } @@ -33,21 +36,26 @@ namespace RimWorldAnimationStudio if (dropdown == null) { OnEnable(); } - string alienRaceDefName = Workspace.animationDef.actors[Workspace.actorID].GetAlienRaceDef().defName; + dropdown.ClearOptions(); + + /*string alienRaceDefName = Workspace.animationDef.actors[Workspace.actorID].GetAlienRaceDef().defName; dropdown.ClearOptions(); - dropdown.options.Add(new Dropdown.OptionData(alienRaceDefName)); - dropdown.value = 0; - label.text = alienRaceDefName; + dropdown.options.Add(new Dropdown.OptionData(alienRaceDefName));*/ IEnumerable optionsList = Tags.defNames.Concat(CustomTags.defNames); foreach (string defName in optionsList) { - if (defName != alienRaceDefName) - { dropdown.options.Add(new Dropdown.OptionData(defName)); } + //if (defName != alienRaceDefName) + //{ dropdown.options.Add(new Dropdown.OptionData(defName)); } + + dropdown.options.Add(new Dropdown.OptionData(defName)); } - actorID = Workspace.actorID; + dropdown.value = 0; + label.text = dropdown.options[0].text; + + //actorID = Workspace.actorID; hashcode = CustomTags.defNames.GetHashCode(); } diff --git a/Assets/Scripts/Managers/ApplicationManager.cs b/Assets/Scripts/Managers/ApplicationManager.cs index cba5ce53..ac08ea25 100644 --- a/Assets/Scripts/Managers/ApplicationManager.cs +++ b/Assets/Scripts/Managers/ApplicationManager.cs @@ -16,6 +16,12 @@ namespace RimWorldAnimationStudio public DialogBox newAnimationDialog; public SelectAnimationDialog selectAnimationDialog; + public void Start() + { + LoadAlienRaceDefs(); + LoadCustomArrays(); + } + public void TryToCloseApplication() { exitDialog.Pop(); @@ -56,10 +62,7 @@ namespace RimWorldAnimationStudio public void LoadAnimation(AnimationDef animationDef) { - LoadAlienRaceDefs(); - LoadCustomArrays(); UpdateCustomArrays(animationDef); - RunPostLoadOperations(animationDef); Debug.Log("Loaded AnimationDef: " + animationDef.defName); diff --git a/Assets/Scripts/Managers/InputManager.cs b/Assets/Scripts/Managers/InputManager.cs index 2eaa8974..3db59c04 100644 --- a/Assets/Scripts/Managers/InputManager.cs +++ b/Assets/Scripts/Managers/InputManager.cs @@ -138,19 +138,19 @@ namespace RimWorldAnimationStudio public void ActorMovementMode() { - if (Workspace.animationDef == null) return; + //if (Workspace.animationDef == null) return; AnimationController.Instance.ToggleActorManipulationMode(0); } public void ActorRotateMode() { - if (Workspace.animationDef == null) return; + //if (Workspace.animationDef == null) return; AnimationController.Instance.ToggleActorManipulationMode(1); } public void ActorFacingMode() { - if (Workspace.animationDef == null) return; + //if (Workspace.animationDef == null) return; AnimationController.Instance.ToggleActorManipulationMode(2); } diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index cf9e1c0d..a76f8fd0 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 3af4f6c8..74d4c0fb 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 9cb37064..bda743f1 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 c7b26481..d7158aa7 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 16209785..28f9e151 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 8eeaee2a..56645fa2 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 3a5573bb..f783b04f 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 daccf410..ff83bd92 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 fcaab5cb..478bd5a4 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 8c93c128..cdfd7a4a 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 71ac3914..dbc65bd0 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 26ac11dd..cc2550d1 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 d0f31345..d7b01ce4 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 dac02c92..e6793684 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 67292f47..4dd5779b 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/10/10ccf6b653911c4be105256ac5b7e151 b/Library/Artifacts/10/10ccf6b653911c4be105256ac5b7e151 new file mode 100644 index 00000000..3e11eee8 Binary files /dev/null and b/Library/Artifacts/10/10ccf6b653911c4be105256ac5b7e151 differ diff --git a/Library/Artifacts/18/185a5a3bf1fb5baf613685b38e9a2fac b/Library/Artifacts/18/185a5a3bf1fb5baf613685b38e9a2fac new file mode 100644 index 00000000..1112f317 Binary files /dev/null and b/Library/Artifacts/18/185a5a3bf1fb5baf613685b38e9a2fac differ diff --git a/Library/Artifacts/33/332928bdfaf0f2b1e07cf39d8bba263c b/Library/Artifacts/33/332928bdfaf0f2b1e07cf39d8bba263c new file mode 100644 index 00000000..4adc1433 Binary files /dev/null and b/Library/Artifacts/33/332928bdfaf0f2b1e07cf39d8bba263c differ diff --git a/Library/Artifacts/b6/b6b783ef9562a24c341a3df6068be62d b/Library/Artifacts/b6/b6b783ef9562a24c341a3df6068be62d new file mode 100644 index 00000000..796bb501 Binary files /dev/null and b/Library/Artifacts/b6/b6b783ef9562a24c341a3df6068be62d differ diff --git a/Library/Artifacts/bd/bde4348b229243174c6bce96340d72e5 b/Library/Artifacts/bd/bde4348b229243174c6bce96340d72e5 new file mode 100644 index 00000000..c9f986a4 Binary files /dev/null and b/Library/Artifacts/bd/bde4348b229243174c6bce96340d72e5 differ diff --git a/Library/Artifacts/f3/f3a39c5a05b576a60bd232164c0b770d b/Library/Artifacts/f3/f3a39c5a05b576a60bd232164c0b770d new file mode 100644 index 00000000..c6ff599d Binary files /dev/null and b/Library/Artifacts/f3/f3a39c5a05b576a60bd232164c0b770d differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index d5d7f1e0..edaabd08 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 300} + m_MinSize: {x: 875, y: 392} 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: 300} + m_MinSize: {x: 875, y: 392} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &3 MonoBehaviour: @@ -112,10 +112,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 679, y: 342} - m_MaxSize: {x: 12004, y: 8042} + m_MinSize: {x: 678, y: 342} + m_MaxSize: {x: 12003, y: 8042} vertical: 0 - controlID: 108 + controlID: 7459 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,7 +140,7 @@ MonoBehaviour: m_MinSize: {x: 403, y: 342} m_MaxSize: {x: 8003, y: 8042} vertical: 1 - controlID: 109 + controlID: 7460 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,7 +165,7 @@ MonoBehaviour: m_MinSize: {x: 403, y: 221} m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 110 + controlID: 7461 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -324,10 +324,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -537.5 - m_HBaseRangeMax: 537.5 - m_VBaseRangeMin: -325 - m_VBaseRangeMax: 325 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -453.5 + m_VBaseRangeMax: 453.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -344,24 +344,24 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 0 - width: 1075 - height: 650 + y: 21 + width: 1920 + height: 907 m_Scale: {x: 1, y: 1} - m_Translation: {x: 537.5, y: 325} + m_Translation: {x: 960, y: 453.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -537.5 - y: -325 - width: 1075 - height: 650 + x: -960 + y: -453.5 + width: 1920 + height: 907 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1075, y: 650} + m_LastWindowPixelSize: {x: 1920, y: 928} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -398,7 +398,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: acf6ffffc0f6ffff64f7ffff62fbffff + m_ExpandedIDs: 12a0ffff26a0ffff28a0ffff80a0ffff94a0ffff3aa1ffff12ecffff26ecffffcaecffff62fbffffe03a0000543b0000ea3b0000da3c0000fc3e0000663f0000f64000002a410000fe430000f095000076960000c49700000098000042990000cc9b0000169e0000669e0000d89e0000f4a10000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -458,9 +458,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 489.02322, y: 450.8198, z: -1197.6875} + m_Target: {x: 513.17865, y: 461.5993, z: -1199.1418} speed: 2 - m_Value: {x: 489.02322, y: 450.8198, z: -1197.6875} + m_Value: {x: 513.17865, y: 461.5993, z: -1199.1418} 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: 322.99918 + m_Target: 337.53415 speed: 2 - m_Value: 322.99918 + m_Value: 337.53415 m_Ortho: m_Target: 1 speed: 2 @@ -1295,4 +1295,4 @@ MonoBehaviour: m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 100 diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index beaf4aa8..9b0fde1b 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: 342} - m_MaxSize: {x: 12004, y: 8042} + m_MinSize: {x: 678, y: 342} + m_MaxSize: {x: 12003, y: 8042} vertical: 0 - controlID: 194503 + controlID: 7109 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 403, y: 342} m_MaxSize: {x: 8003, y: 8042} vertical: 1 - controlID: 194504 + controlID: 7110 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 403, y: 221} m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 194505 + controlID: 7111 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -221,10 +221,10 @@ MonoBehaviour: m_ViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} + scrollPos: {x: 0, y: 43} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 62a9f7ff76a9f7ff1aaaf7ff3cd9f8ff50d9f8fff4d9f8ff0441faff0641faff1041faff1c41faff9449faffa849faff4c4afaff484dfaff5c4dfaff004efaff2851faff3851faff4451faff0052faff1652faffc852faff0888faff5a8bfaff1896faff2296faffe4adfaff6c73fcff0c93fcff2802fdff0004fdff8873fdff0496fdfff896fdff400cffffce9effff84a2ffff52e6ffffcaedffffdeedffff80eeffff28f4ffff2ef4ffff1cf9ffff1ef9ffff28f9ffff62fbffffce3a0000b43e0000b0400000ec40000094590000d0590000fc590000185a0000ba5a0000ec5a00002c5b0000665c0000805c0000085d0000185d0000285d00002e5d0000765d00007e5d0000bc5e00008e5f0000a05f0000246000006a600000726000003061000070610000b06100004e620000d662000064630000c463000030640000fc6400003465000058660000666600006c660000b6660000ea660000f46600004a6700007a5e0800d463080016690800f0a90800f2ae08005eaf08000cb2080094b30800b8b4080012f20800e0f2080088f50800baf508004af608006cf60800b4f60800acf80800d6f808000af90800f6f9080088fa0800c0fa080034ff08008aff0800daa20a0058a50a0024a60a0046a60a00fea60a0036a70a00c0a70a00eea70a0060a80a0080ab0a00c4ab0a0096ac0a00baac0a009eae0a00c2b10a00d2b10a00 + m_ExpandedIDs: 12ecffff26ecffffcaecffff62fbffffe03a0000543b0000ea3b0000da3c0000fc3e0000663f0000f64000002a410000fe430000f095000076960000c49700000098000042990000cc9b0000169e0000669e0000d89e0000f4a10000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -313,9 +313,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 489.02322, y: 450.8198, z: -1197.6875} + m_Target: {x: 513.17865, y: 461.5993, z: -1199.1418} speed: 2 - m_Value: {x: 489.02322, y: 450.8198, z: -1197.6875} + m_Value: {x: 513.17865, y: 461.5993, z: -1199.1418} 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: 322.99918 + m_Target: 337.53415 speed: 2 - m_Value: 322.99918 + m_Value: 337.53415 m_Ortho: m_Target: 1 speed: 2 @@ -1000,7 +1000,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 26} m_SelectedIDs: bc490000 m_LastClickedID: 18876 - m_ExpandedIDs: 000000009c4900009e490000a0490000a2490000a4490000a6490000a849000000ca9a3b + m_ExpandedIDs: 00000000d0490000d2490000d4490000d6490000d8490000da490000dc490000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009c4900009e490000a0490000a2490000a4490000a6490000a849000000ca9a3b + m_ExpandedIDs: 00000000d0490000d2490000d4490000d6490000d8490000da490000dc490000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1160,8 +1160,8 @@ MonoBehaviour: y: 0 width: 506 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -1203,5 +1203,5 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastInspectedObjectInstanceID: 38422 + m_LastVerticalScrollValue: 100 diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index c9127ac2..662f7501 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 cf9e1c0d..a76f8fd0 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 3af4f6c8..74d4c0fb 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 9cb37064..bda743f1 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 c7b26481..d7158aa7 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 16209785..28f9e151 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 8eeaee2a..56645fa2 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 3a5573bb..f783b04f 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 daccf410..ff83bd92 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 fcaab5cb..478bd5a4 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 8c93c128..cdfd7a4a 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 71ac3914..dbc65bd0 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 26ac11dd..cc2550d1 100644 Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers and b/Library/PlayerDataCache/Win/Data/globalgamemanagers differ diff --git a/Library/PlayerDataCache/Win/Data/level0 b/Library/PlayerDataCache/Win/Data/level0 index d0f31345..d7b01ce4 100644 Binary files a/Library/PlayerDataCache/Win/Data/level0 and b/Library/PlayerDataCache/Win/Data/level0 differ diff --git a/Library/PlayerDataCache/Win/Data/sharedassets0.assets b/Library/PlayerDataCache/Win/Data/sharedassets0.assets index dac02c92..e6793684 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 b3b07ad4..4fb9601e 100644 --- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -23,7 +23,6 @@ ScriptsOnlyBuild: - RimWorldAnimationStudio.KeyframeSlider - RimWorldAnimationStudio.QuiverToggle - RimWorldAnimationStudio.RaceSettingsDialog - - RimWorldAnimationStudio.RequiresAnimationDef - RimWorldAnimationStudio.SelectAnimationDialog - RimWorldAnimationStudio.SelectBodyDefTypesDialog - RimWorldAnimationStudio.SelectBodyPartsDialog @@ -174,8 +173,6 @@ ScriptsOnlyBuild: Script: {instanceID: 13432} - Class: 114 Script: {instanceID: 13450} - - Class: 114 - Script: {instanceID: 13466} - Class: 114 Script: {instanceID: 13478} - Class: 114 diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index ebbd00c4..86cf6e69 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 1e51c554..a7d2792f 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 3c1f7cbc..13914902 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 534e10aa..0d46e6be 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/StateCache/SceneView/352ee9-mainStage.json b/Library/StateCache/SceneView/352ee9-mainStage.json index 0a4df237..d617814c 100644 --- a/Library/StateCache/SceneView/352ee9-mainStage.json +++ b/Library/StateCache/SceneView/352ee9-mainStage.json @@ -1 +1 @@ -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":489.0232238769531,"y":450.8197937011719,"z":-1197.6875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":322.9991760253906,"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":513.1786499023438,"y":461.59930419921877,"z":-1199.141845703125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":337.5341491699219,"orthographic":true} \ No newline at end of file diff --git a/Library/shadercompiler-UnityShaderCompiler.exe1.log b/Library/shadercompiler-UnityShaderCompiler.exe1.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe1.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe1.log @@ -1,4 +1,2 @@ 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.exe10.log b/Library/shadercompiler-UnityShaderCompiler.exe10.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe10.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe10.log @@ -1,4 +1,2 @@ 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 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe11.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe11.log @@ -1,4 +1,2 @@ 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.exe2.log b/Library/shadercompiler-UnityShaderCompiler.exe2.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe2.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe2.log @@ -1,4 +1,2 @@ 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 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe4.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe4.log @@ -1,4 +1,2 @@ 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 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe5.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe5.log @@ -1,4 +1,2 @@ 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 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe6.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe6.log @@ -1,4 +1,2 @@ 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 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe7.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe7.log @@ -1,4 +1,2 @@ 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