diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index 5658e120..11c8cc05 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/Actor.cs b/Assets/Scripts/AnimationComponents/Actor.cs index 623eebd4..9035f13f 100644 --- a/Assets/Scripts/AnimationComponents/Actor.cs +++ b/Assets/Scripts/AnimationComponents/Actor.cs @@ -89,7 +89,7 @@ namespace RimWorldAnimationStudio public Vector3 GetFinalTransformOffset() { - Vector3 offset = bodyTypeOffset.GetOffset(bodyType) + GetAlienRaceOffset(); + Vector3 offset = GetAlienRaceOffset() + (GetAlienRaceDef().isHumanoid ? bodyTypeOffset.GetOffset(bodyType) : new Vector3()); return new Vector3(offset.x, offset.z, offset.y); } diff --git a/Assets/Scripts/GUI/ActorCard.cs b/Assets/Scripts/GUI/ActorCard.cs index 4e9fae96..b2c01f41 100644 --- a/Assets/Scripts/GUI/ActorCard.cs +++ b/Assets/Scripts/GUI/ActorCard.cs @@ -104,6 +104,10 @@ namespace RimWorldAnimationStudio if (bodyOffsetZField.isFocused == false) { bodyOffsetZField.text = actor.bodyTypeOffset.GetOffset(bodyType).z.ToString(); } + bodyTypeDropdown.interactable = actor.GetAlienRaceDef().isHumanoid; + bodyOffsetXField.interactable = actor.GetAlienRaceDef().isHumanoid; + bodyOffsetZField.interactable = actor.GetAlienRaceDef().isHumanoid; + if (raceOffsetXField.isFocused == false) { raceOffsetXField.text = actor.GetAlienRaceOffset().x.ToString(); } diff --git a/Assets/Scripts/GUI/DialogBoxes/RaceSettingsDialog.cs b/Assets/Scripts/GUI/DialogBoxes/RaceSettingsDialog.cs index 5115cb69..3114c0a8 100644 --- a/Assets/Scripts/GUI/DialogBoxes/RaceSettingsDialog.cs +++ b/Assets/Scripts/GUI/DialogBoxes/RaceSettingsDialog.cs @@ -19,19 +19,23 @@ namespace RimWorldAnimationStudio public override void Initialize(bool addedNewTag = false) { + Debug.Log("Init"); + Reset(); AlienRaceDef alienRaceDef = GetCurrentRaceDef(); if (alienRaceDef == null) return; - isHumanoidToggle.isOn = alienRaceDef.isHumanoid; + isHumanoidToggle.SetIsOnWithoutNotify(alienRaceDef.isHumanoid); Text bodyGraphicsTitle = AddCloneObjectToParent(raceSettingsWindow, 2).GetComponent(); bodyGraphicsTitle.text = "Body graphic filepaths"; - foreach (string bodyType in Tags.bodyTypes) + List allTags = alienRaceDef.isHumanoid ? Tags.bodyTypes : new List() { "None" }; + + foreach (string bodyType in allTags) { - string _bodyType = alienRaceDef.isHumanoid ? bodyType : "None"; + string _bodyType = bodyType; if (alienRaceDef.isHumanoid) { @@ -53,9 +57,6 @@ namespace RimWorldAnimationStudio } AddCloneObjectToParent(raceSettingsWindow, 3); - - if (alienRaceDef.isHumanoid == false) - { break; } } if (alienRaceDef.isHumanoid) diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index a87f28f5..6d639629 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 2f3e77f5..46e23b08 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 9e10fcc5..013732c5 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 c70e8ea3..bfb2bd01 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 38db81cd..2b76d7eb 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 b66f2735..5e9f6883 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 3d750202..2b2373ac 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 f963b5c5..d6c62f16 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 06ebae6e..5cf0ac08 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 0e0b5168..fa3b8b49 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 c44b1f73..07194bf6 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 bc57b276..4fd32a24 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 48f2eed8..19c5884d 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 0ca52138..cefde1c1 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/26/260af44b31942969773d17e079740f9e b/Library/Artifacts/26/260af44b31942969773d17e079740f9e deleted file mode 100644 index f0cbd09e..00000000 Binary files a/Library/Artifacts/26/260af44b31942969773d17e079740f9e and /dev/null differ diff --git a/Library/Artifacts/50/5019082ec3c8c265f082a862699a3475 b/Library/Artifacts/50/5019082ec3c8c265f082a862699a3475 new file mode 100644 index 00000000..cb19f451 Binary files /dev/null and b/Library/Artifacts/50/5019082ec3c8c265f082a862699a3475 differ diff --git a/Library/Artifacts/64/64894f1a76e346849d5e7b67577241fb b/Library/Artifacts/64/64894f1a76e346849d5e7b67577241fb new file mode 100644 index 00000000..26b2dc71 Binary files /dev/null and b/Library/Artifacts/64/64894f1a76e346849d5e7b67577241fb differ diff --git a/Library/Artifacts/6d/6dfaae18123bd067c098dbc4afe2e79c b/Library/Artifacts/6d/6dfaae18123bd067c098dbc4afe2e79c new file mode 100644 index 00000000..7e4456f7 Binary files /dev/null and b/Library/Artifacts/6d/6dfaae18123bd067c098dbc4afe2e79c differ diff --git a/Library/Artifacts/88/88d202be0b729dcfdc11d269f83075de b/Library/Artifacts/88/88d202be0b729dcfdc11d269f83075de deleted file mode 100644 index 5270f58e..00000000 Binary files a/Library/Artifacts/88/88d202be0b729dcfdc11d269f83075de and /dev/null differ diff --git a/Library/Artifacts/8e/8e038cdf39da7a92e16ab5d716c65fb4 b/Library/Artifacts/8e/8e038cdf39da7a92e16ab5d716c65fb4 deleted file mode 100644 index 4b3344cd..00000000 Binary files a/Library/Artifacts/8e/8e038cdf39da7a92e16ab5d716c65fb4 and /dev/null differ diff --git a/Library/Artifacts/93/935eb96db0d42ada09a45b097bcdc10b b/Library/Artifacts/93/935eb96db0d42ada09a45b097bcdc10b deleted file mode 100644 index 47497f7a..00000000 Binary files a/Library/Artifacts/93/935eb96db0d42ada09a45b097bcdc10b and /dev/null differ diff --git a/Library/Artifacts/4c/4cac066088f2d00f660318aef4328b83 b/Library/Artifacts/9f/9f1906ccfd9d2884de8972120cfcab90 similarity index 94% rename from Library/Artifacts/4c/4cac066088f2d00f660318aef4328b83 rename to Library/Artifacts/9f/9f1906ccfd9d2884de8972120cfcab90 index dd44e69f..a4593dbc 100644 Binary files a/Library/Artifacts/4c/4cac066088f2d00f660318aef4328b83 and b/Library/Artifacts/9f/9f1906ccfd9d2884de8972120cfcab90 differ diff --git a/Library/Artifacts/a0/a041a0cb559d59aaf131a425e6a2a329 b/Library/Artifacts/a0/a041a0cb559d59aaf131a425e6a2a329 deleted file mode 100644 index bc673de1..00000000 Binary files a/Library/Artifacts/a0/a041a0cb559d59aaf131a425e6a2a329 and /dev/null differ diff --git a/Library/Artifacts/a9/a9941019930771b00be8cacb688ec03a b/Library/Artifacts/a9/a9941019930771b00be8cacb688ec03a deleted file mode 100644 index 685f3a46..00000000 Binary files a/Library/Artifacts/a9/a9941019930771b00be8cacb688ec03a and /dev/null differ diff --git a/Library/Artifacts/b7/b720e530980223f61d49950e72698e75 b/Library/Artifacts/b7/b720e530980223f61d49950e72698e75 deleted file mode 100644 index a43f290b..00000000 Binary files a/Library/Artifacts/b7/b720e530980223f61d49950e72698e75 and /dev/null differ diff --git a/Library/Artifacts/d9/d9a723d487c340ab099ad684ed9e17d4 b/Library/Artifacts/d9/d9a723d487c340ab099ad684ed9e17d4 new file mode 100644 index 00000000..87ad1ca3 Binary files /dev/null and b/Library/Artifacts/d9/d9a723d487c340ab099ad684ed9e17d4 differ diff --git a/Library/Artifacts/f3/f3c468be4ccf2072686a94eba206e4cc b/Library/Artifacts/f3/f3c468be4ccf2072686a94eba206e4cc new file mode 100644 index 00000000..0c7e4c29 Binary files /dev/null and b/Library/Artifacts/f3/f3c468be4ccf2072686a94eba206e4cc differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index 24a75c82..60fd34eb 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -115,7 +115,7 @@ MonoBehaviour: m_MinSize: {x: 678, y: 492} m_MaxSize: {x: 14001, y: 14042} vertical: 0 - controlID: 1188 + controlID: 1911 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,7 +140,7 @@ MonoBehaviour: m_MinSize: {x: 403, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 1189 + controlID: 1912 --- !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: 1190 + controlID: 1913 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -398,7 +398,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: e0d2fffff4d2ffff92d3ffff62fbffff + m_ExpandedIDs: 4694ffff5a94fffff894ffff4cfbffff123d00003a3d0000a63d0000fa3e0000703f0000e43f00003e40000054450000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1117,7 +1117,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 22480000 m_LastClickedID: 18466 - m_ExpandedIDs: 00000000fc470000fe4700000048000002480000044800001a48000000ca9a3b + m_ExpandedIDs: 000000000448000006480000084800000a4800000c4800001a48000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000fc470000fe47000000480000024800000448000000ca9a3b + m_ExpandedIDs: 000000000448000006480000084800000a4800000c48000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index 4ac5acfc..18dc2039 100644 --- a/Library/CurrentMaximizeLayout.dwlt +++ b/Library/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 678, y: 492} m_MaxSize: {x: 14001, y: 14042} vertical: 0 - controlID: 1062 + controlID: 1750 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 403, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 1063 + controlID: 1751 --- !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: 1038 + controlID: 1752 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -224,7 +224,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 62fbffff + m_ExpandedIDs: 4cfbffff123d00003a3d0000a63d0000fa3e0000703f0000e43f00003e40000054450000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1000,7 +1000,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 22480000 m_LastClickedID: 18466 - m_ExpandedIDs: 00000000fc470000fe4700000048000002480000044800001a48000000ca9a3b + m_ExpandedIDs: 000000000448000006480000084800000a4800000c4800001a48000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000fc470000fe47000000480000024800000448000000ca9a3b + m_ExpandedIDs: 000000000448000006480000084800000a4800000c48000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1160,8 +1160,8 @@ MonoBehaviour: y: 0 width: 396 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} diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index cce9d843..78f2f651 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 a87f28f5..6d639629 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 2f3e77f5..46e23b08 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 9e10fcc5..013732c5 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 c70e8ea3..bfb2bd01 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 38db81cd..2b76d7eb 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 b66f2735..5e9f6883 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 3d750202..2b2373ac 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 f963b5c5..d6c62f16 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 06ebae6e..5cf0ac08 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 0e0b5168..fa3b8b49 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 c44b1f73..07194bf6 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 bc57b276..4fd32a24 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 48f2eed8..19c5884d 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 a5859fca..5737dfe1 100644 --- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -109,99 +109,99 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 11262} - Class: 114 - Script: {instanceID: 11288} + Script: {instanceID: 11290} - Class: 114 - Script: {instanceID: 11448} + Script: {instanceID: 11450} - Class: 114 - Script: {instanceID: 11500} - - Class: 114 - Script: {instanceID: 11596} + Script: {instanceID: 11502} - Class: 114 Script: {instanceID: 11598} - Class: 114 - Script: {instanceID: 11652} + Script: {instanceID: 11600} - Class: 114 - Script: {instanceID: 11728} + Script: {instanceID: 11654} - Class: 114 - Script: {instanceID: 11752} + Script: {instanceID: 11730} - Class: 114 - Script: {instanceID: 11764} + Script: {instanceID: 11754} - Class: 114 - Script: {instanceID: 11774} + Script: {instanceID: 11766} - Class: 114 - Script: {instanceID: 11796} + Script: {instanceID: 11776} - Class: 114 - Script: {instanceID: 11858} + Script: {instanceID: 11798} - Class: 114 - Script: {instanceID: 12128} + Script: {instanceID: 11860} - Class: 114 - Script: {instanceID: 12164} + Script: {instanceID: 12130} - Class: 114 - Script: {instanceID: 12330} + Script: {instanceID: 12166} - Class: 114 - Script: {instanceID: 12344} + Script: {instanceID: 12332} - Class: 114 - Script: {instanceID: 12592} + Script: {instanceID: 12346} - Class: 114 - Script: {instanceID: 12708} + Script: {instanceID: 12594} - Class: 114 - Script: {instanceID: 12732} + Script: {instanceID: 12710} - Class: 114 - Script: {instanceID: 12896} + Script: {instanceID: 12734} - Class: 114 - Script: {instanceID: 13142} + Script: {instanceID: 12898} - Class: 114 - Script: {instanceID: 13166} + Script: {instanceID: 13144} - Class: 114 - Script: {instanceID: 13206} + Script: {instanceID: 13168} - Class: 114 - Script: {instanceID: 13224} + Script: {instanceID: 13208} - Class: 114 - Script: {instanceID: 13234} + Script: {instanceID: 13226} - Class: 114 - Script: {instanceID: 13352} + Script: {instanceID: 13236} - Class: 114 - Script: {instanceID: 13384} + Script: {instanceID: 13354} - Class: 114 - Script: {instanceID: 13422} + Script: {instanceID: 13386} - Class: 114 - Script: {instanceID: 13440} + Script: {instanceID: 13424} - Class: 114 - Script: {instanceID: 13456} + Script: {instanceID: 13442} - Class: 114 - Script: {instanceID: 13468} + Script: {instanceID: 13458} - Class: 114 - Script: {instanceID: 13472} + Script: {instanceID: 13470} - Class: 114 - Script: {instanceID: 13506} + Script: {instanceID: 13474} - Class: 114 - Script: {instanceID: 13624} + Script: {instanceID: 13508} - Class: 114 - Script: {instanceID: 13638} + Script: {instanceID: 13626} - Class: 114 - Script: {instanceID: 13664} + Script: {instanceID: 13640} - Class: 114 - Script: {instanceID: 13866} + Script: {instanceID: 13666} - Class: 114 - Script: {instanceID: 14060} + Script: {instanceID: 13868} - Class: 114 - Script: {instanceID: 14140} + Script: {instanceID: 14062} - Class: 114 - Script: {instanceID: 14154} + Script: {instanceID: 14142} - Class: 114 - Script: {instanceID: 14302} + Script: {instanceID: 14156} - Class: 114 - Script: {instanceID: 14474} + Script: {instanceID: 14304} - Class: 114 - Script: {instanceID: 14506} + Script: {instanceID: 14476} - Class: 114 - Script: {instanceID: 14528} + Script: {instanceID: 14508} - Class: 114 Script: {instanceID: 14530} - Class: 114 - Script: {instanceID: 14570} + Script: {instanceID: 14532} - Class: 114 - Script: {instanceID: 14576} + Script: {instanceID: 14572} + - Class: 114 + Script: {instanceID: 14578} - Class: 115 Script: {instanceID: 0} - Class: 128 diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 083a6d73..4fb921b8 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 247d0959..82a1a3b6 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 03c3d3e2..97e930ec 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 587aacc9..65b8f8ba 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.exe2.log b/Library/shadercompiler-UnityShaderCompiler.exe2.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe2.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe2.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.exe3.log b/Library/shadercompiler-UnityShaderCompiler.exe3.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe3.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe3.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 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6ff694be..30cf7a17 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -124,7 +124,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1.1 + bundleVersion: 0.1.2 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0