diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index 3af9d578..356b9a50 100644 Binary files a/.vs/RimWorld-Animation-Studio/v16/.suo and b/.vs/RimWorld-Animation-Studio/v16/.suo differ diff --git a/Assets/Scripts/AudioController.cs b/Assets/Scripts/AudioController.cs index 5ba92ec3..4e727470 100644 --- a/Assets/Scripts/AudioController.cs +++ b/Assets/Scripts/AudioController.cs @@ -21,6 +21,9 @@ namespace RimWorldAnimationStudio public void PlaySound(string soundDefName) { + if (string.IsNullOrEmpty(soundDefName) || soundDefName.ToLower() == "none") + { return; } + SoundDef soundDef = SoundDefs.GetNamed(soundDefName); if (soundDef == null) diff --git a/Assets/Scripts/GUI/AddSoundDefButton.cs b/Assets/Scripts/GUI/AddSoundDefButton.cs index 8911a2cb..98edde09 100644 --- a/Assets/Scripts/GUI/AddSoundDefButton.cs +++ b/Assets/Scripts/GUI/AddSoundDefButton.cs @@ -19,7 +19,7 @@ namespace RimWorldAnimationStudio PawnKeyframe keyframe = Workspace.GetCurrentOrPreviousKeyframe(Workspace.ActorID); if (keyframe != null) - { text.text = keyframe.SoundEffect == null || keyframe.SoundEffect == "" ? "None" : keyframe.SoundEffect; } + { text.text = string.IsNullOrEmpty(keyframe.SoundEffect) ? "None" : keyframe.SoundEffect; } else { text.text = "None"; } diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index ef272cce..b5d9bf1b 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 1c688964..48517140 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 4432b253..83257d74 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 c0f4c55f..afcfa6fd 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 69acae4a..bd1072a3 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 57d70629..f5b6b583 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 bf786a0f..94cabb66 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 19ce3fae..4d8bf82a 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 df51edec..d3ea2c3e 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 9a52dc37..460f5933 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 6f47ea06..3ec2abc3 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 c1ca3333..a5b963d0 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 a985b3e4..bbae7116 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 d5e2233e..f99db02e 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/0c/0ce712a9cbf8d8a453830731f126d39c b/Library/Artifacts/0c/0ce712a9cbf8d8a453830731f126d39c deleted file mode 100644 index a9f2c682..00000000 Binary files a/Library/Artifacts/0c/0ce712a9cbf8d8a453830731f126d39c and /dev/null differ diff --git a/Library/Artifacts/26/2629eea06e9739597d578fa0b983f39e b/Library/Artifacts/26/2629eea06e9739597d578fa0b983f39e deleted file mode 100644 index 852899cc..00000000 Binary files a/Library/Artifacts/26/2629eea06e9739597d578fa0b983f39e and /dev/null differ diff --git a/Library/Artifacts/26/264e363c3cac710fd2031e3cef9a51aa b/Library/Artifacts/26/264e363c3cac710fd2031e3cef9a51aa new file mode 100644 index 00000000..176aa596 Binary files /dev/null and b/Library/Artifacts/26/264e363c3cac710fd2031e3cef9a51aa differ diff --git a/Library/Artifacts/2c/2cf858eaf9ad74fa0a8c83e6f8231e5e b/Library/Artifacts/2c/2cf858eaf9ad74fa0a8c83e6f8231e5e deleted file mode 100644 index f2bc7f00..00000000 Binary files a/Library/Artifacts/2c/2cf858eaf9ad74fa0a8c83e6f8231e5e and /dev/null differ diff --git a/Library/Artifacts/30/307ecb97e9976b3a0f6a6358f3b4b0d3 b/Library/Artifacts/30/307ecb97e9976b3a0f6a6358f3b4b0d3 deleted file mode 100644 index 165c3f4a..00000000 Binary files a/Library/Artifacts/30/307ecb97e9976b3a0f6a6358f3b4b0d3 and /dev/null differ diff --git a/Library/Artifacts/4c/4c28a98251ae9e407ff21f499b40ee44 b/Library/Artifacts/4c/4c28a98251ae9e407ff21f499b40ee44 deleted file mode 100644 index ac049c9a..00000000 Binary files a/Library/Artifacts/4c/4c28a98251ae9e407ff21f499b40ee44 and /dev/null differ diff --git a/Library/Artifacts/c3/c33b839ed2b05b102de6a49f93af7639 b/Library/Artifacts/53/536241b5e9df324efc5aca8c6b4bfafc similarity index 53% rename from Library/Artifacts/c3/c33b839ed2b05b102de6a49f93af7639 rename to Library/Artifacts/53/536241b5e9df324efc5aca8c6b4bfafc index cf180ec4..8472331d 100644 Binary files a/Library/Artifacts/c3/c33b839ed2b05b102de6a49f93af7639 and b/Library/Artifacts/53/536241b5e9df324efc5aca8c6b4bfafc differ diff --git a/Library/Artifacts/5f/5f0ddcee147b84b599329fcef1a8f592 b/Library/Artifacts/5f/5f0ddcee147b84b599329fcef1a8f592 deleted file mode 100644 index 856248a3..00000000 Binary files a/Library/Artifacts/5f/5f0ddcee147b84b599329fcef1a8f592 and /dev/null differ diff --git a/Library/Artifacts/62/626bb8f07c965d64feeda0b575529c22 b/Library/Artifacts/62/626bb8f07c965d64feeda0b575529c22 deleted file mode 100644 index 49ff8856..00000000 Binary files a/Library/Artifacts/62/626bb8f07c965d64feeda0b575529c22 and /dev/null differ diff --git a/Library/Artifacts/77/774425f6b8d54c83d5e0b44f061363a2 b/Library/Artifacts/77/774425f6b8d54c83d5e0b44f061363a2 deleted file mode 100644 index 49beb84e..00000000 Binary files a/Library/Artifacts/77/774425f6b8d54c83d5e0b44f061363a2 and /dev/null differ diff --git a/Library/Artifacts/81/81dda9aa73f9939980d2885eea6ad9a5 b/Library/Artifacts/81/81dda9aa73f9939980d2885eea6ad9a5 deleted file mode 100644 index 25f84b7d..00000000 Binary files a/Library/Artifacts/81/81dda9aa73f9939980d2885eea6ad9a5 and /dev/null differ diff --git a/Library/Artifacts/8c/8c3d724c42a1fd5b6b96685702123c03 b/Library/Artifacts/8c/8c3d724c42a1fd5b6b96685702123c03 deleted file mode 100644 index 8a4ac6bf..00000000 Binary files a/Library/Artifacts/8c/8c3d724c42a1fd5b6b96685702123c03 and /dev/null differ diff --git a/Library/Artifacts/b0/b0e08e47cbf49d91b0716175c7c77743 b/Library/Artifacts/b0/b0e08e47cbf49d91b0716175c7c77743 deleted file mode 100644 index 57827162..00000000 Binary files a/Library/Artifacts/b0/b0e08e47cbf49d91b0716175c7c77743 and /dev/null differ diff --git a/Library/Artifacts/ba/ba2aad654daf0a1312277bf5bdd97e52 b/Library/Artifacts/ba/ba2aad654daf0a1312277bf5bdd97e52 deleted file mode 100644 index 8ff8c7bd..00000000 Binary files a/Library/Artifacts/ba/ba2aad654daf0a1312277bf5bdd97e52 and /dev/null differ diff --git a/Library/Artifacts/bd/bdcc70180edee2d030a6fbb1c7f40e94 b/Library/Artifacts/bd/bdcc70180edee2d030a6fbb1c7f40e94 deleted file mode 100644 index 9f1ea863..00000000 Binary files a/Library/Artifacts/bd/bdcc70180edee2d030a6fbb1c7f40e94 and /dev/null differ diff --git a/Library/Artifacts/c1/c1363c60b00f9b3aa6c506810369c565 b/Library/Artifacts/c1/c1363c60b00f9b3aa6c506810369c565 deleted file mode 100644 index 5d1a3ad1..00000000 Binary files a/Library/Artifacts/c1/c1363c60b00f9b3aa6c506810369c565 and /dev/null differ diff --git a/Library/Artifacts/cf/cf4b75fb09f27c3ec1a7c9bc81c39173 b/Library/Artifacts/cf/cf4b75fb09f27c3ec1a7c9bc81c39173 deleted file mode 100644 index 341bb582..00000000 Binary files a/Library/Artifacts/cf/cf4b75fb09f27c3ec1a7c9bc81c39173 and /dev/null differ diff --git a/Library/Artifacts/d2/d2301b2b5b07af2c0da0c7e76ddb059f b/Library/Artifacts/d2/d2301b2b5b07af2c0da0c7e76ddb059f deleted file mode 100644 index b581c9c8..00000000 Binary files a/Library/Artifacts/d2/d2301b2b5b07af2c0da0c7e76ddb059f and /dev/null differ diff --git a/Library/Artifacts/d4/d4441467233f3155380197909e659f32 b/Library/Artifacts/d4/d4441467233f3155380197909e659f32 deleted file mode 100644 index a02bd0bf..00000000 Binary files a/Library/Artifacts/d4/d4441467233f3155380197909e659f32 and /dev/null differ diff --git a/Library/Artifacts/dc/dc968ae3005c3bc5581a19f74e560899 b/Library/Artifacts/dc/dc968ae3005c3bc5581a19f74e560899 deleted file mode 100644 index 75a16a46..00000000 Binary files a/Library/Artifacts/dc/dc968ae3005c3bc5581a19f74e560899 and /dev/null differ diff --git a/Library/Artifacts/f4/f4e5b70a0d73e6e06c4576ce692b9616 b/Library/Artifacts/f4/f4e5b70a0d73e6e06c4576ce692b9616 deleted file mode 100644 index 7a424ab7..00000000 Binary files a/Library/Artifacts/f4/f4e5b70a0d73e6e06c4576ce692b9616 and /dev/null differ diff --git a/Library/Artifacts/f6/f61b39aa8a509fa6e8394bb9bc32d54d b/Library/Artifacts/f6/f61b39aa8a509fa6e8394bb9bc32d54d deleted file mode 100644 index 95f47034..00000000 Binary files a/Library/Artifacts/f6/f61b39aa8a509fa6e8394bb9bc32d54d and /dev/null differ diff --git a/Library/Artifacts/f9/f906c1d02e00dd085f215dc96dccf4a6 b/Library/Artifacts/f9/f906c1d02e00dd085f215dc96dccf4a6 deleted file mode 100644 index 16204745..00000000 Binary files a/Library/Artifacts/f9/f906c1d02e00dd085f215dc96dccf4a6 and /dev/null differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index 73067500..f8a0fddb 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 542} + m_MinSize: {x: 875, y: 300} 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: 300} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &3 MonoBehaviour: @@ -115,7 +115,7 @@ MonoBehaviour: m_MinSize: {x: 677, y: 492} m_MaxSize: {x: 14001, y: 14042} vertical: 0 - controlID: 3533 + controlID: 41 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,7 +140,7 @@ MonoBehaviour: m_MinSize: {x: 402, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 3534 + controlID: 42 --- !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: 3535 + controlID: 43 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -324,10 +324,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -453.5 - m_VBaseRangeMax: 453.5 + m_HBaseRangeMin: -537.5 + m_HBaseRangeMax: 537.5 + m_VBaseRangeMin: -325 + m_VBaseRangeMax: 325 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -344,24 +344,24 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 21 - width: 1920 - height: 907 + y: 0 + width: 1075 + height: 650 m_Scale: {x: 1, y: 1} - m_Translation: {x: 960, y: 453.5} + m_Translation: {x: 537.5, y: 325} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -960 - y: -453.5 - width: 1920 - height: 907 + x: -537.5 + y: -325 + width: 1075 + height: 650 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1920, y: 928} + m_LastWindowPixelSize: {x: 1075, y: 650} 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: 74a0fcff88a0fcff2ea1fcff4cfbffffbc420000 + m_ExpandedIDs: 8af5ffff9ef5ffff44f6ffff4afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1115,9 +1115,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 143} - m_SelectedIDs: 4e4e0000 - m_LastClickedID: 20046 - m_ExpandedIDs: 00000000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e0000584e000000ca9a3b + m_SelectedIDs: 4c4e0000 + m_LastClickedID: 20044 + m_ExpandedIDs: 00000000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e0000584e000000ca9a3b + m_ExpandedIDs: 00000000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index c1b8fa54..23d40093 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 ef272cce..b5d9bf1b 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 1c688964..48517140 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 4432b253..83257d74 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 c0f4c55f..afcfa6fd 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 69acae4a..bd1072a3 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 57d70629..f5b6b583 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 bf786a0f..94cabb66 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 19ce3fae..4d8bf82a 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 df51edec..d3ea2c3e 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 9a52dc37..460f5933 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 6f47ea06..3ec2abc3 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 c1ca3333..a5b963d0 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 a985b3e4..bbae7116 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 9de803d0..4902a745 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: 11270} + Script: {instanceID: 11272} - Class: 114 - Script: {instanceID: 11294} + Script: {instanceID: 11296} - Class: 114 - Script: {instanceID: 11452} + Script: {instanceID: 11454} - Class: 114 - Script: {instanceID: 11506} + Script: {instanceID: 11508} - Class: 114 - Script: {instanceID: 11582} + Script: {instanceID: 11584} - Class: 114 - Script: {instanceID: 11594} + Script: {instanceID: 11596} - Class: 114 - Script: {instanceID: 11608} + Script: {instanceID: 11610} - Class: 114 - Script: {instanceID: 11662} + Script: {instanceID: 11664} - Class: 114 - Script: {instanceID: 11736} + Script: {instanceID: 11738} - Class: 114 - Script: {instanceID: 11762} - - Class: 114 - Script: {instanceID: 11766} + Script: {instanceID: 11764} - Class: 114 Script: {instanceID: 11768} - Class: 114 - Script: {instanceID: 11776} + Script: {instanceID: 11770} - Class: 114 - Script: {instanceID: 11786} + Script: {instanceID: 11778} - Class: 114 - Script: {instanceID: 11808} + Script: {instanceID: 11788} - Class: 114 - Script: {instanceID: 11872} + Script: {instanceID: 11810} - Class: 114 - Script: {instanceID: 11878} + Script: {instanceID: 11874} - Class: 114 - Script: {instanceID: 12146} + Script: {instanceID: 11880} - Class: 114 - Script: {instanceID: 12182} + Script: {instanceID: 12148} - Class: 114 - Script: {instanceID: 12326} + Script: {instanceID: 12184} - Class: 114 - Script: {instanceID: 12350} + Script: {instanceID: 12328} - Class: 114 - Script: {instanceID: 12366} + Script: {instanceID: 12352} - Class: 114 - Script: {instanceID: 12436} + Script: {instanceID: 12368} - Class: 114 - Script: {instanceID: 12616} + Script: {instanceID: 12438} - Class: 114 - Script: {instanceID: 12640} + Script: {instanceID: 12618} - Class: 114 - Script: {instanceID: 12758} + Script: {instanceID: 12642} - Class: 114 - Script: {instanceID: 12882} + Script: {instanceID: 12760} - Class: 114 - Script: {instanceID: 12926} + Script: {instanceID: 12884} - Class: 114 - Script: {instanceID: 13176} + Script: {instanceID: 12928} - Class: 114 - Script: {instanceID: 13202} + Script: {instanceID: 13178} - Class: 114 - Script: {instanceID: 13242} + Script: {instanceID: 13204} - Class: 114 - Script: {instanceID: 13252} + Script: {instanceID: 13244} - Class: 114 - Script: {instanceID: 13262} + Script: {instanceID: 13254} - Class: 114 - Script: {instanceID: 13272} + Script: {instanceID: 13264} - Class: 114 - Script: {instanceID: 13374} + Script: {instanceID: 13274} - Class: 114 - Script: {instanceID: 13392} + Script: {instanceID: 13376} - Class: 114 Script: {instanceID: 13394} - Class: 114 - Script: {instanceID: 13428} + Script: {instanceID: 13396} - Class: 114 - Script: {instanceID: 13468} + Script: {instanceID: 13430} - Class: 114 - Script: {instanceID: 13484} + Script: {instanceID: 13470} - Class: 114 - Script: {instanceID: 13500} + Script: {instanceID: 13486} - Class: 114 - Script: {instanceID: 13512} + Script: {instanceID: 13502} - Class: 114 - Script: {instanceID: 13516} + Script: {instanceID: 13514} - Class: 114 - Script: {instanceID: 13552} + Script: {instanceID: 13518} - Class: 114 - Script: {instanceID: 13684} + Script: {instanceID: 13554} - Class: 114 - Script: {instanceID: 13710} + Script: {instanceID: 13686} - Class: 114 - Script: {instanceID: 13842} + Script: {instanceID: 13712} - Class: 114 - Script: {instanceID: 13916} + Script: {instanceID: 13844} - Class: 114 - Script: {instanceID: 13920} + Script: {instanceID: 13918} - Class: 114 - Script: {instanceID: 14048} + Script: {instanceID: 13922} - Class: 114 - Script: {instanceID: 14112} + Script: {instanceID: 14050} - Class: 114 - Script: {instanceID: 14208} + Script: {instanceID: 14114} - Class: 114 - Script: {instanceID: 14358} + Script: {instanceID: 14210} - Class: 114 - Script: {instanceID: 14506} + Script: {instanceID: 14360} - Class: 114 - Script: {instanceID: 14532} + Script: {instanceID: 14508} - Class: 114 Script: {instanceID: 14534} - Class: 114 - Script: {instanceID: 14566} + Script: {instanceID: 14536} - Class: 114 - Script: {instanceID: 14588} + Script: {instanceID: 14568} - Class: 114 Script: {instanceID: 14590} - Class: 114 - Script: {instanceID: 14630} + Script: {instanceID: 14592} - Class: 114 - Script: {instanceID: 14636} + Script: {instanceID: 14632} - Class: 114 - Script: {instanceID: 14678} + Script: {instanceID: 14638} + - Class: 114 + Script: {instanceID: 14680} - Class: 115 Script: {instanceID: 0} - Class: 128 diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index c8db32da..00cea09c 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 bb4fba1c..420513df 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 8365ebe4..905c3609 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 9f6e930b..5d37448a 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 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.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 diff --git a/Library/shadercompiler-UnityShaderCompiler.exe8.log b/Library/shadercompiler-UnityShaderCompiler.exe8.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe8.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe8.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.exe9.log b/Library/shadercompiler-UnityShaderCompiler.exe9.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe9.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe9.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