diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index c8a6ab90..da68992b 100644 Binary files a/.vs/RimWorld-Animation-Studio/v16/.suo and b/.vs/RimWorld-Animation-Studio/v16/.suo differ diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 63c271ff..9059e6d9 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -120,6 +120,8 @@ + + diff --git a/Assets/Resources/Textures/Props.meta b/Assets/Resources/Textures/Props.meta new file mode 100644 index 00000000..520a9c83 --- /dev/null +++ b/Assets/Resources/Textures/Props.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a617f36023d29334395bcdea6dc988c5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Textures/Props/Bed_east.png b/Assets/Resources/Textures/Props/Bed_east.png new file mode 100644 index 00000000..52133d1f Binary files /dev/null and b/Assets/Resources/Textures/Props/Bed_east.png differ diff --git a/Assets/Resources/Textures/Props/Bed_east.png.meta b/Assets/Resources/Textures/Props/Bed_east.png.meta new file mode 100644 index 00000000..0981b990 --- /dev/null +++ b/Assets/Resources/Textures/Props/Bed_east.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: d200f76a362555742ab5cc80b974e978 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 62 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Textures/Props/Bed_south.png b/Assets/Resources/Textures/Props/Bed_south.png new file mode 100644 index 00000000..401ef4cf Binary files /dev/null and b/Assets/Resources/Textures/Props/Bed_south.png differ diff --git a/Assets/Resources/Textures/Props/Bed_south.png.meta b/Assets/Resources/Textures/Props/Bed_south.png.meta new file mode 100644 index 00000000..e6c9c021 --- /dev/null +++ b/Assets/Resources/Textures/Props/Bed_south.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 96812a154c94f614a9f1cb4efcdc71d8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 85 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Textures/Props/DoubleBed_south.png b/Assets/Resources/Textures/Props/DoubleBed_south.png new file mode 100644 index 00000000..0fff7932 Binary files /dev/null and b/Assets/Resources/Textures/Props/DoubleBed_south.png differ diff --git a/Assets/Resources/Textures/Props/DoubleBed_south.png.meta b/Assets/Resources/Textures/Props/DoubleBed_south.png.meta new file mode 100644 index 00000000..65c0309e --- /dev/null +++ b/Assets/Resources/Textures/Props/DoubleBed_south.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: b5ea419faec767a4484f4159980421f3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 85 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Textures/Props/Spot.png b/Assets/Resources/Textures/Props/Spot.png new file mode 100644 index 00000000..62c9f279 Binary files /dev/null and b/Assets/Resources/Textures/Props/Spot.png differ diff --git a/Assets/Resources/Textures/Props/Spot.png.meta b/Assets/Resources/Textures/Props/Spot.png.meta new file mode 100644 index 00000000..5866a81e --- /dev/null +++ b/Assets/Resources/Textures/Props/Spot.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 5411e5a72310c1a47a8ac4061556a2d5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 85 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index a7e76762..446fb3a3 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -1649,8 +1649,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 305.5, y: -7.5} - m_SizeDelta: {x: 611, y: 15} + m_AnchoredPosition: {x: 377, y: -7.5} + m_SizeDelta: {x: 754, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &138865805 MonoBehaviour: @@ -2197,6 +2197,173 @@ MonoBehaviour: exitDialog: {fileID: 1588340716} newAnimationDialog: {fileID: 1717923583} selectAnimationDialog: {fileID: 56207934} +--- !u!1 &183290581 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 183290582} + - component: {fileID: 183290585} + - component: {fileID: 183290584} + - component: {fileID: 183290583} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &183290582 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183290581} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 656587834} + m_Father: {fileID: 1072006786} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -18, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &183290583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183290581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &183290584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183290581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &183290585 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183290581} + m_CullTransparentMesh: 0 +--- !u!1 &185989292 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 185989293} + - component: {fileID: 185989295} + - component: {fileID: 185989294} + m_Layer: 5 + m_Name: Item Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &185989293 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185989292} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 562222308} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 5, y: -0.5} + m_SizeDelta: {x: -30, y: -3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &185989294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185989292} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Option A +--- !u!222 &185989295 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185989292} + m_CullTransparentMesh: 0 --- !u!1 &219230437 GameObject: m_ObjectHideFlags: 0 @@ -2505,6 +2672,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 239634963} m_CullTransparentMesh: 0 +--- !u!1 &252080743 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 252080744} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &252080744 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 252080743} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 348870825} + m_Father: {fileID: 1068786482} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &254347857 GameObject: m_ObjectHideFlags: 0 @@ -4024,6 +4227,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 347034221} m_CullTransparentMesh: 0 +--- !u!1 &348870824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 348870825} + - component: {fileID: 348870827} + - component: {fileID: 348870826} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &348870825 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 348870824} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 252080744} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.2} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &348870826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 348870824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &348870827 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 348870824} + m_CullTransparentMesh: 0 --- !u!1 &358700604 GameObject: m_ObjectHideFlags: 0 @@ -6735,6 +7012,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 529071176} m_CullTransparentMesh: 0 +--- !u!1 &530782061 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 530782062} + - component: {fileID: 530782064} + - component: {fileID: 530782063} + m_Layer: 5 + m_Name: Arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &530782062 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 530782061} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2061561785} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -15, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &530782063 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 530782061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &530782064 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 530782061} + m_CullTransparentMesh: 0 --- !u!1 &531246356 GameObject: m_ObjectHideFlags: 0 @@ -7419,6 +7770,170 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 1 +--- !u!1 &542804683 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 542804684} + - component: {fileID: 542804686} + - component: {fileID: 542804685} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &542804684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542804683} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2061561785} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -7.5, y: -0.5} + m_SizeDelta: {x: -35, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &542804685 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542804683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &542804686 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542804683} + m_CullTransparentMesh: 0 +--- !u!1 &562222307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 562222308} + - component: {fileID: 562222309} + m_Layer: 5 + m_Name: Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &562222308 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 562222307} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 927660571} + - {fileID: 1163890310} + - {fileID: 185989293} + m_Father: {fileID: 656587834} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &562222309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 562222307} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 927660572} + toggleTransition: 1 + graphic: {fileID: 1163890311} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 1 --- !u!1 &563088255 GameObject: m_ObjectHideFlags: 0 @@ -9131,6 +9646,42 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &656587833 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 656587834} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &656587834 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 656587833} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 562222308} + m_Father: {fileID: 183290582} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 28} + m_Pivot: {x: 0.5, y: 1} --- !u!1 &671921653 GameObject: m_ObjectHideFlags: 0 @@ -11632,8 +12183,82 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &927660570 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 927660571} + - component: {fileID: 927660573} + - component: {fileID: 927660572} + m_Layer: 5 + m_Name: Item Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &927660571 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927660570} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 562222308} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &927660572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927660570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &927660573 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927660570} + m_CullTransparentMesh: 0 --- !u!1 &932977621 GameObject: m_ObjectHideFlags: 0 @@ -13108,6 +13733,237 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &1068786481 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1068786482} + - component: {fileID: 1068786485} + - component: {fileID: 1068786484} + - component: {fileID: 1068786483} + m_Layer: 5 + m_Name: Scrollbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1068786482 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068786481} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 252080744} + m_Father: {fileID: 1072006786} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1068786483 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068786481} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 348870826} + m_HandleRect: {fileID: 348870825} + m_Direction: 2 + m_Value: 0 + m_Size: 0.2 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1068786484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068786481} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1068786485 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068786481} + m_CullTransparentMesh: 0 +--- !u!1 &1072006785 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1072006786} + - component: {fileID: 1072006789} + - component: {fileID: 1072006788} + - component: {fileID: 1072006787} + m_Layer: 5 + m_Name: Template + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1072006786 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072006785} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 183290582} + - {fileID: 1068786482} + m_Father: {fileID: 2061561785} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 0, y: 150} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1072006787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072006785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 656587834} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 183290582} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1068786483} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1072006788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072006785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1072006789 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072006785} + m_CullTransparentMesh: 0 --- !u!1 &1073938046 GameObject: m_ObjectHideFlags: 0 @@ -14182,7 +15038,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 922060210} m_HandleRect: {fileID: 922060209} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -14333,6 +15189,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1157449298} m_CullTransparentMesh: 0 +--- !u!1 &1163890309 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1163890310} + - component: {fileID: 1163890312} + - component: {fileID: 1163890311} + m_Layer: 5 + m_Name: Item Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1163890310 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163890309} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 562222308} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1163890311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163890309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1163890312 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163890309} + m_CullTransparentMesh: 0 --- !u!1 &1164674333 GameObject: m_ObjectHideFlags: 0 @@ -15779,6 +16709,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1245671150} m_CullTransparentMesh: 0 +--- !u!1 &1245912340 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1245912342} + - component: {fileID: 1245912341} + - component: {fileID: 1245912343} + m_Layer: 0 + m_Name: SexProp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1245912341 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245912340} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.5058824, y: 1.5058824} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1245912342 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245912340} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.37, y: 1.37, z: 1.37} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1245912343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245912340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 587f7397b0c3ecf4495edb8af5dbd777, type: 3} + m_Name: + m_EditorClassIdentifier: + sexProps: + - label: None + sprite: {fileID: 0} + - label: Double bed + sprite: {fileID: 21300000, guid: b5ea419faec767a4484f4159980421f3, type: 3} + - label: Single bed (South) + sprite: {fileID: 21300000, guid: 96812a154c94f614a9f1cb4efcdc71d8, type: 3} + - label: Single bed (East) + sprite: {fileID: 21300000, guid: d200f76a362555742ab5cc80b974e978, type: 3} + - label: Spot + sprite: {fileID: 21300000, guid: 5411e5a72310c1a47a8ac4061556a2d5, type: 3} + sexPropDropdown: {fileID: 2061561786} --- !u!1 &1249623549 GameObject: m_ObjectHideFlags: 0 @@ -16961,7 +17997,7 @@ RectTransform: - {fileID: 168629121} - {fileID: 1059017486} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -18345,7 +19381,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 1 + m_Text: 0 --- !u!222 &1406142643 CanvasRenderer: m_ObjectHideFlags: 0 @@ -23709,7 +24745,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 1 + m_Text: 0 --- !u!222 &1728158176 CanvasRenderer: m_ObjectHideFlags: 0 @@ -25173,7 +26209,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1829858720 GameObject: @@ -27733,6 +28769,225 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2050850092} m_CullTransparentMesh: 0 +--- !u!1 &2061561784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2061561785} + - component: {fileID: 2061561788} + - component: {fileID: 2061561787} + - component: {fileID: 2061561786} + m_Layer: 5 + m_Name: SexPropDropdown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2061561785 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061561784} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 542804684} + - {fileID: 530782062} + - {fileID: 1072006786} + m_Father: {fileID: 935483303140078260} + m_RootOrder: 24 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -535} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2061561786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061561784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2061561787} + m_Template: {fileID: 1072006786} + m_CaptionText: {fileID: 542804685} + m_CaptionImage: {fileID: 0} + m_ItemText: {fileID: 185989294} + m_ItemImage: {fileID: 0} + m_Value: 0 + m_Options: + m_Options: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1245912343} + m_MethodName: OnOptionChanged + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_AlphaFadeSpeed: 0.15 +--- !u!114 &2061561787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061561784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2061561788 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061561784} + m_CullTransparentMesh: 0 +--- !u!1 &2070462931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2070462932} + - component: {fileID: 2070462934} + - component: {fileID: 2070462933} + m_Layer: 5 + m_Name: SexPropLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2070462932 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070462931} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 935483303140078260} + m_RootOrder: 23 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -1.3611, y: -505} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2070462933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070462931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Prop +--- !u!222 &2070462934 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070462931} + m_CullTransparentMesh: 0 --- !u!1 &2076684196 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7715503544683182667, guid: 8b89f6c9e5f696c4997760829c45a505, @@ -29419,6 +30674,8 @@ RectTransform: - {fileID: 2081541321} - {fileID: 1293104866} - {fileID: 1012383901} + - {fileID: 2070462932} + - {fileID: 2061561785} m_Father: {fileID: 531246357} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/GUI/AddSoundDefButton.cs b/Assets/Scripts/GUI/AddSoundDefButton.cs index b0ea55db..cb263f42 100644 --- a/Assets/Scripts/GUI/AddSoundDefButton.cs +++ b/Assets/Scripts/GUI/AddSoundDefButton.cs @@ -16,7 +16,7 @@ namespace RimWorldAnimationStudio void Update() { - PawnKeyframe keyframe = Workspace.Instance.GetCurrentPawnKeyframe(); + PawnKeyframe keyframe = Workspace.Instance.GetCurrentOrPreviousKeyframe(Workspace.actorID); if (keyframe != null) { text.text = keyframe.soundEffect == null || keyframe.soundEffect == "" ? "None" : keyframe.soundEffect; } diff --git a/Assets/Scripts/GUI/DialogBoxes/SelectSoundDefDialog.cs b/Assets/Scripts/GUI/DialogBoxes/SelectSoundDefDialog.cs index 9377be1c..031eb80c 100644 --- a/Assets/Scripts/GUI/DialogBoxes/SelectSoundDefDialog.cs +++ b/Assets/Scripts/GUI/DialogBoxes/SelectSoundDefDialog.cs @@ -28,10 +28,10 @@ namespace RimWorldAnimationStudio _optionToggle.Find("Text").GetComponent().text = tag; Toggle toggleComp = _optionToggle.GetComponent(); - toggleComp.isOn = Workspace.Instance.GetCurrentPawnKeyframe()?.soundEffect == tag; + toggleComp.isOn = Workspace.Instance.GetCurrentOrPreviousKeyframe(Workspace.actorID)?.soundEffect == tag; toggleComp.onValueChanged.AddListener(delegate { - PawnKeyframe keyframe = Workspace.Instance.GetCurrentPawnKeyframe(); + PawnKeyframe keyframe = Workspace.Instance.GetCurrentOrPreviousKeyframe(Workspace.actorID); if (keyframe != null) { keyframe.soundEffect = tag; } diff --git a/Assets/Scripts/GUI/QuiverToggle.cs b/Assets/Scripts/GUI/QuiverToggle.cs index 16908eb5..0ca85e93 100644 --- a/Assets/Scripts/GUI/QuiverToggle.cs +++ b/Assets/Scripts/GUI/QuiverToggle.cs @@ -9,13 +9,13 @@ namespace RimWorldAnimationStudio { public void Update() { - PawnKeyframe keyframe = Workspace.Instance.GetCurrentPawnKeyframe(); + PawnKeyframe keyframe = Workspace.Instance.GetCurrentOrPreviousKeyframe(Workspace.actorID); GetComponent().isOn = keyframe != null && keyframe.quiver.HasValue && keyframe.quiver.Value; } public void OnValueChanged() { - PawnKeyframe keyframe = Workspace.Instance.GetCurrentPawnKeyframe(); + PawnKeyframe keyframe = Workspace.Instance.GetCurrentOrPreviousKeyframe(Workspace.actorID); if (keyframe != null) { keyframe.quiver = GetComponent().isOn; } diff --git a/Assets/Scripts/Managers/AnimationController.cs b/Assets/Scripts/Managers/AnimationController.cs index 837769e0..e27c9ca4 100644 --- a/Assets/Scripts/Managers/AnimationController.cs +++ b/Assets/Scripts/Managers/AnimationController.cs @@ -5,7 +5,6 @@ using System.Linq; using System.IO; using System.Xml.Serialization; using UnityEngine; -using SFB; using UnityEngine.UI; namespace RimWorldAnimationStudio @@ -143,6 +142,8 @@ namespace RimWorldAnimationStudio if (clip == null) { continue; } + bool quiver = isAnimating && Workspace.Instance.GetCurrentOrPreviousKeyframe(actorID).quiver == true; + float clipPercent = (float)(stageTick % clip.duration) / clip.duration; if (stageTick == clip.duration) clipPercent = 1f; @@ -156,6 +157,8 @@ namespace RimWorldAnimationStudio Vector3 deltaPos = new Vector3(clip.BodyOffsetX.Evaluate(clipPercent), 0, clip.BodyOffsetZ.Evaluate(clipPercent)); float bodyAngle = clip.BodyAngle.Evaluate(clipPercent); + bodyAngle += quiver ? UnityEngine.Random.value * 2f - 1f : 0f; + float headAngle = clip.HeadAngle.Evaluate(clipPercent); int bodyFacing = (int)clip.BodyFacing.Evaluate(clipPercent); diff --git a/Assets/Scripts/Managers/ApplicationManager.cs b/Assets/Scripts/Managers/ApplicationManager.cs index ef4832c6..fc058f8d 100644 --- a/Assets/Scripts/Managers/ApplicationManager.cs +++ b/Assets/Scripts/Managers/ApplicationManager.cs @@ -144,7 +144,7 @@ namespace RimWorldAnimationStudio public void SaveCustomArrays() { - var path = Path.Combine(Application.streamingAssetsPath, "customTags.xml"); + var path = Path.Combine(Application.persistentDataPath, "customTags.xml"); CustomTagsHelper helper = new CustomTagsHelper(); @@ -159,8 +159,14 @@ namespace RimWorldAnimationStudio public void LoadCustomArrays() { - var path = Path.Combine(Application.streamingAssetsPath, "customTags.xml"); + string path; + if (File.Exists(Path.Combine(Application.persistentDataPath, "customTags.xml"))) + { path = Path.Combine(Application.persistentDataPath, "customTags.xml"); } + + else + { path = Path.Combine(Application.streamingAssetsPath, "customTags.xml"); } + if (File.Exists(path) == false) { SaveCustomArrays(); return; } @@ -186,7 +192,13 @@ namespace RimWorldAnimationStudio public void LoadAlienRaceDefs() { - var path = Path.Combine(Application.streamingAssetsPath, "alienRaceDefs.xml"); + string path; + + if (File.Exists(Path.Combine(Application.persistentDataPath, "alienRaceDefs.xml"))) + { path = Path.Combine(Application.persistentDataPath, "alienRaceDefs.xml"); } + + else + { path = Path.Combine(Application.streamingAssetsPath, "alienRaceDefs.xml"); } if (File.Exists(path) == false) { SaveAlienRaceDefs(); return; } @@ -197,7 +209,7 @@ namespace RimWorldAnimationStudio public void SaveAlienRaceDefs() { - var path = Path.Combine(Application.streamingAssetsPath, "alienRaceDefs.xml"); + var path = Path.Combine(Application.persistentDataPath, "alienRaceDefs.xml"); XmlUtility.WriteXML(AlienRaceDefs.allDefs, path); } diff --git a/Assets/Scripts/SexProp.cs b/Assets/Scripts/SexProp.cs new file mode 100644 index 00000000..c6fa3c69 --- /dev/null +++ b/Assets/Scripts/SexProp.cs @@ -0,0 +1,12 @@ +using System; +using UnityEngine; + +namespace RimWorldAnimationStudio +{ + [Serializable] + public class SexProp + { + public string label; + public Sprite sprite; + } +} diff --git a/Assets/Scripts/SexProp.cs.meta b/Assets/Scripts/SexProp.cs.meta new file mode 100644 index 00000000..8f7b51da --- /dev/null +++ b/Assets/Scripts/SexProp.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 94f6b7ad49adabe428c011abfcf4da53 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SexPropManager.cs b/Assets/Scripts/SexPropManager.cs new file mode 100644 index 00000000..991f05e2 --- /dev/null +++ b/Assets/Scripts/SexPropManager.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +namespace RimWorldAnimationStudio +{ + public class SexPropManager : MonoBehaviour + { + public List sexProps = new List(); + public Dropdown sexPropDropdown; + + private SpriteRenderer spriteRenderer; + + public void OnEnable() + { + spriteRenderer = GetComponent(); + + foreach (SexProp sexProp in sexProps) + { sexPropDropdown.options.Add(new Dropdown.OptionData(sexProp.label)); } + } + + public void OnOptionChanged() + { + spriteRenderer.sprite = sexProps[sexPropDropdown.value].sprite; + } + } +} diff --git a/Assets/Scripts/SexPropManager.cs.meta b/Assets/Scripts/SexPropManager.cs.meta new file mode 100644 index 00000000..1d0abce7 --- /dev/null +++ b/Assets/Scripts/SexPropManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 587f7397b0c3ecf4495edb8af5dbd777 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Workspace/Workspace.cs b/Assets/Scripts/Workspace/Workspace.cs index d98965ae..d2f25b20 100644 --- a/Assets/Scripts/Workspace/Workspace.cs +++ b/Assets/Scripts/Workspace/Workspace.cs @@ -109,36 +109,20 @@ namespace RimWorldAnimationStudio return animationDef.animationStages[stageID].animationClips[actorID].keyframes.Any(x => x.atTick == atTick); } - public static void FindAdjacentKeyframes(int atTick, out PawnKeyframe prevKeyframe, out PawnKeyframe nextKeyframe, int actorID = -1, int excludedActorID = -1, bool ignoreSelf = true, int searchDistance = int.MaxValue) + public PawnKeyframe GetCurrentOrPreviousKeyframe(int actorID) { - prevKeyframe = null; - nextKeyframe = null; + PawnKeyframe pawnKeyframe = null; + PawnAnimationClip clip = GetPawnAnimationClip(actorID); - List keyframesToCheck; + int stageTick = AnimationController.Instance.stageTick; - if (actorID >= 0) - { keyframesToCheck = animationDef.animationStages[stageID].animationClips[actorID].keyframes; } - - else + foreach (PawnKeyframe keyframe in clip.keyframes) { - keyframesToCheck = animationDef.animationStages[stageID].animationClips.Where(x => - animationDef.animationStages[stageID].animationClips.IndexOf(x) != excludedActorID).SelectMany(x => x.keyframes)?.ToList(); + if (keyframe.atTick <= stageTick) + { pawnKeyframe = keyframe; } } - foreach (PawnKeyframe keyframe in keyframesToCheck) - { - if (keyframe.atTick <= atTick && atTick - keyframe.atTick <= searchDistance) - { - if (keyframe.atTick != atTick || ignoreSelf) - { prevKeyframe = keyframe; } - - else - { prevKeyframe = null; } - } - - if (nextKeyframe == null && keyframe.atTick > atTick && keyframe.atTick - atTick <= searchDistance) - { nextKeyframe = keyframe; } - } + return pawnKeyframe; } public static int FindClosestKeyFrameAtTick(int atTick, int searchDistance = int.MaxValue, int excludedActorID = -1) diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index 605eeb34..b70b05f9 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 26ce4006..82b24bb9 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 1458a668..c7bef56e 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 a38fc264..52322eb0 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 842db926..f0b0b09c 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 3d4d67a3..67a1f17b 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 6e83e57d..3bea6897 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 8616b994..da1ce1d7 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 1ee51660..74cfe1a1 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 00e43188..0794438c 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 95c1a520..df36ec54 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 bdc7054f..3748504f 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/globalgamemanagers.assets b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets index c0bc72c9..249a6957 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets and b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets differ diff --git a/Build/RimWorld-Animation-Studio_Data/level0 b/Build/RimWorld-Animation-Studio_Data/level0 index 568cbc0b..7f5bd4eb 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/resources.assets b/Build/RimWorld-Animation-Studio_Data/resources.assets index cb6e8df6..4617b973 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/resources.assets and b/Build/RimWorld-Animation-Studio_Data/resources.assets differ diff --git a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets index 27a1581e..59e512c0 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets and b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets differ diff --git a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets.resS b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets.resS index ab87f5ee..261643fc 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets.resS and b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets.resS differ diff --git a/Library/ArtifactDB b/Library/ArtifactDB index c73a1b9a..fe759b8e 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/00/0058e49d2f590bbdef73a878bebfbb0b b/Library/Artifacts/00/0058e49d2f590bbdef73a878bebfbb0b new file mode 100644 index 00000000..07d98389 Binary files /dev/null and b/Library/Artifacts/00/0058e49d2f590bbdef73a878bebfbb0b differ diff --git a/Library/Artifacts/03/037f252297ff40c9cb4d44f1237fe7ec b/Library/Artifacts/03/037f252297ff40c9cb4d44f1237fe7ec new file mode 100644 index 00000000..d76a4dfc Binary files /dev/null and b/Library/Artifacts/03/037f252297ff40c9cb4d44f1237fe7ec differ diff --git a/Library/Artifacts/05/05a406e5e7bbc64b2d3c1cab77287dbd b/Library/Artifacts/05/05a406e5e7bbc64b2d3c1cab77287dbd new file mode 100644 index 00000000..ce37a414 Binary files /dev/null and b/Library/Artifacts/05/05a406e5e7bbc64b2d3c1cab77287dbd differ diff --git a/Library/Artifacts/07/078861858ad05691fac8607fecc37fa6 b/Library/Artifacts/07/078861858ad05691fac8607fecc37fa6 new file mode 100644 index 00000000..4ef6dc7f Binary files /dev/null and b/Library/Artifacts/07/078861858ad05691fac8607fecc37fa6 differ diff --git a/Library/Artifacts/0a/0a480c9dbd996b5889600da5361667d0 b/Library/Artifacts/0a/0a480c9dbd996b5889600da5361667d0 new file mode 100644 index 00000000..7d19e437 Binary files /dev/null and b/Library/Artifacts/0a/0a480c9dbd996b5889600da5361667d0 differ diff --git a/Library/Artifacts/0b/0bb3da36a4d1ee1b9f94739cca77e678 b/Library/Artifacts/0b/0bb3da36a4d1ee1b9f94739cca77e678 deleted file mode 100644 index e454b0b0..00000000 Binary files a/Library/Artifacts/0b/0bb3da36a4d1ee1b9f94739cca77e678 and /dev/null differ diff --git a/Library/Artifacts/94/9441fb22ed53bba950fedf10d162749f b/Library/Artifacts/16/16029695ddc7399dc1b64938a1d31222 similarity index 97% rename from Library/Artifacts/94/9441fb22ed53bba950fedf10d162749f rename to Library/Artifacts/16/16029695ddc7399dc1b64938a1d31222 index 6902ba37..8c0cdc9b 100644 Binary files a/Library/Artifacts/94/9441fb22ed53bba950fedf10d162749f and b/Library/Artifacts/16/16029695ddc7399dc1b64938a1d31222 differ diff --git a/Library/Artifacts/16/16e40efe4416de8f173e35d04799e192 b/Library/Artifacts/16/16e40efe4416de8f173e35d04799e192 deleted file mode 100644 index 30ac3975..00000000 Binary files a/Library/Artifacts/16/16e40efe4416de8f173e35d04799e192 and /dev/null differ diff --git a/Library/Artifacts/1f/1f422eb1e235abd20092c1df0bcd375e b/Library/Artifacts/1f/1f422eb1e235abd20092c1df0bcd375e deleted file mode 100644 index aa1bed6f..00000000 Binary files a/Library/Artifacts/1f/1f422eb1e235abd20092c1df0bcd375e and /dev/null differ diff --git a/Library/Artifacts/1f/1fbfe68e175288f0e2df5afa34deccfc b/Library/Artifacts/1f/1fbfe68e175288f0e2df5afa34deccfc deleted file mode 100644 index a43052b8..00000000 Binary files a/Library/Artifacts/1f/1fbfe68e175288f0e2df5afa34deccfc and /dev/null differ diff --git a/Library/Artifacts/20/20ec1a9ec243c1bdf36d0dff0f911bab b/Library/Artifacts/20/20ec1a9ec243c1bdf36d0dff0f911bab new file mode 100644 index 00000000..7afc9f8a Binary files /dev/null and b/Library/Artifacts/20/20ec1a9ec243c1bdf36d0dff0f911bab differ diff --git a/Library/Artifacts/21/214c84c8424b5586c75e02ac49863143 b/Library/Artifacts/21/214c84c8424b5586c75e02ac49863143 deleted file mode 100644 index afd9b1b8..00000000 Binary files a/Library/Artifacts/21/214c84c8424b5586c75e02ac49863143 and /dev/null differ diff --git a/Library/Artifacts/27/27f28e57fa1cd9ce98ac65d20964ad76 b/Library/Artifacts/27/27f28e57fa1cd9ce98ac65d20964ad76 deleted file mode 100644 index 09b778ff..00000000 Binary files a/Library/Artifacts/27/27f28e57fa1cd9ce98ac65d20964ad76 and /dev/null differ diff --git a/Library/Artifacts/2c/2c33b5adca9ff8791724c61a1f724120 b/Library/Artifacts/2c/2c33b5adca9ff8791724c61a1f724120 new file mode 100644 index 00000000..0dec2af9 Binary files /dev/null and b/Library/Artifacts/2c/2c33b5adca9ff8791724c61a1f724120 differ diff --git a/Library/Artifacts/2e/2e1f03d08705b461f87105910e982c5b b/Library/Artifacts/2e/2e1f03d08705b461f87105910e982c5b new file mode 100644 index 00000000..e03cb3c2 Binary files /dev/null and b/Library/Artifacts/2e/2e1f03d08705b461f87105910e982c5b differ diff --git a/Library/Artifacts/33/33d99fbfe7e52e4927defd9237ecf795 b/Library/Artifacts/33/33d99fbfe7e52e4927defd9237ecf795 new file mode 100644 index 00000000..c52ff6cd Binary files /dev/null and b/Library/Artifacts/33/33d99fbfe7e52e4927defd9237ecf795 differ diff --git a/Library/Artifacts/c9/c933b2dbef131fcf56982bca6249ca73 b/Library/Artifacts/36/36db749f13d147ddbb73498598a15c0a similarity index 88% rename from Library/Artifacts/c9/c933b2dbef131fcf56982bca6249ca73 rename to Library/Artifacts/36/36db749f13d147ddbb73498598a15c0a index e008e50b..de664315 100644 Binary files a/Library/Artifacts/c9/c933b2dbef131fcf56982bca6249ca73 and b/Library/Artifacts/36/36db749f13d147ddbb73498598a15c0a differ diff --git a/Library/Artifacts/3b/3be71268f2398b6f1a2a0725e0e32b85 b/Library/Artifacts/3b/3be71268f2398b6f1a2a0725e0e32b85 new file mode 100644 index 00000000..2654d82c Binary files /dev/null and b/Library/Artifacts/3b/3be71268f2398b6f1a2a0725e0e32b85 differ diff --git a/Library/Artifacts/3c/3ca558ce9a8d735b635d36236d196911 b/Library/Artifacts/3c/3ca558ce9a8d735b635d36236d196911 new file mode 100644 index 00000000..b499b776 Binary files /dev/null and b/Library/Artifacts/3c/3ca558ce9a8d735b635d36236d196911 differ diff --git a/Library/Artifacts/3e/3e8bc4205694114b6d5555460c2390a6 b/Library/Artifacts/3e/3e8bc4205694114b6d5555460c2390a6 new file mode 100644 index 00000000..e3f19a20 Binary files /dev/null and b/Library/Artifacts/3e/3e8bc4205694114b6d5555460c2390a6 differ diff --git a/Library/Artifacts/3f/3f6e9beb041c512cc8910f2d3211948a b/Library/Artifacts/3f/3f6e9beb041c512cc8910f2d3211948a new file mode 100644 index 00000000..ce556fca Binary files /dev/null and b/Library/Artifacts/3f/3f6e9beb041c512cc8910f2d3211948a differ diff --git a/Library/Artifacts/3f/3fa73cee402b2ab31ddce959dcecd292 b/Library/Artifacts/3f/3fa73cee402b2ab31ddce959dcecd292 deleted file mode 100644 index 28f0fb16..00000000 Binary files a/Library/Artifacts/3f/3fa73cee402b2ab31ddce959dcecd292 and /dev/null differ diff --git a/Library/Artifacts/40/405a3a249ee7e6d3b6e289e645a5d2b5 b/Library/Artifacts/40/405a3a249ee7e6d3b6e289e645a5d2b5 new file mode 100644 index 00000000..23bd2022 Binary files /dev/null and b/Library/Artifacts/40/405a3a249ee7e6d3b6e289e645a5d2b5 differ diff --git a/Library/Artifacts/42/42978a7aeee62c3f2d0712e99abb346e b/Library/Artifacts/42/42978a7aeee62c3f2d0712e99abb346e deleted file mode 100644 index 98d44d81..00000000 Binary files a/Library/Artifacts/42/42978a7aeee62c3f2d0712e99abb346e and /dev/null differ diff --git a/Library/Artifacts/44/44c22d2ae10f63efe68037c554c4bb82 b/Library/Artifacts/44/44c22d2ae10f63efe68037c554c4bb82 new file mode 100644 index 00000000..2dc0ffc5 Binary files /dev/null and b/Library/Artifacts/44/44c22d2ae10f63efe68037c554c4bb82 differ diff --git a/Library/Artifacts/45/450e967ce48e1b8eb49dbd99a5f6164a b/Library/Artifacts/45/450e967ce48e1b8eb49dbd99a5f6164a new file mode 100644 index 00000000..f1562755 Binary files /dev/null and b/Library/Artifacts/45/450e967ce48e1b8eb49dbd99a5f6164a differ diff --git a/Library/Artifacts/49/49fc063fdbe74c2767cb49063bc03661 b/Library/Artifacts/49/49fc063fdbe74c2767cb49063bc03661 deleted file mode 100644 index 76966123..00000000 Binary files a/Library/Artifacts/49/49fc063fdbe74c2767cb49063bc03661 and /dev/null differ diff --git a/Library/Artifacts/4a/4a09d0ffc33058f9b2b113da32cc10b9 b/Library/Artifacts/4a/4a09d0ffc33058f9b2b113da32cc10b9 new file mode 100644 index 00000000..9872b23b Binary files /dev/null and b/Library/Artifacts/4a/4a09d0ffc33058f9b2b113da32cc10b9 differ diff --git a/Library/Artifacts/4b/4bcf8c677c0ce95575fd04f92cddd44a b/Library/Artifacts/4b/4bcf8c677c0ce95575fd04f92cddd44a deleted file mode 100644 index 29da0cc0..00000000 Binary files a/Library/Artifacts/4b/4bcf8c677c0ce95575fd04f92cddd44a and /dev/null differ diff --git a/Library/Artifacts/50/5050ab5f06f2cbfda4a0898a4bbfd796 b/Library/Artifacts/50/5050ab5f06f2cbfda4a0898a4bbfd796 deleted file mode 100644 index 84c7623b..00000000 Binary files a/Library/Artifacts/50/5050ab5f06f2cbfda4a0898a4bbfd796 and /dev/null differ diff --git a/Library/Artifacts/54/5455e5ea9140968b438160e5223ad8f0 b/Library/Artifacts/54/5455e5ea9140968b438160e5223ad8f0 new file mode 100644 index 00000000..e49cc9e5 Binary files /dev/null and b/Library/Artifacts/54/5455e5ea9140968b438160e5223ad8f0 differ diff --git a/Library/Artifacts/12/12378e7458135f0de028526443229943 b/Library/Artifacts/54/54a46dac484d48404ada5ea176a0ad7f similarity index 97% rename from Library/Artifacts/12/12378e7458135f0de028526443229943 rename to Library/Artifacts/54/54a46dac484d48404ada5ea176a0ad7f index d5ebaac7..d567c9f3 100644 Binary files a/Library/Artifacts/12/12378e7458135f0de028526443229943 and b/Library/Artifacts/54/54a46dac484d48404ada5ea176a0ad7f differ diff --git a/Library/Artifacts/56/56377868ca81e67a6dee55b0c46f2f06 b/Library/Artifacts/56/56377868ca81e67a6dee55b0c46f2f06 new file mode 100644 index 00000000..6ea7ba2c Binary files /dev/null and b/Library/Artifacts/56/56377868ca81e67a6dee55b0c46f2f06 differ diff --git a/Library/Artifacts/57/57529a414e2147873d56af3323e9c44c b/Library/Artifacts/57/57529a414e2147873d56af3323e9c44c new file mode 100644 index 00000000..73b27b12 Binary files /dev/null and b/Library/Artifacts/57/57529a414e2147873d56af3323e9c44c differ diff --git a/Library/Artifacts/57/57538832b23a7bfcf1b21608b57122f1 b/Library/Artifacts/57/57538832b23a7bfcf1b21608b57122f1 new file mode 100644 index 00000000..ac33c84a Binary files /dev/null and b/Library/Artifacts/57/57538832b23a7bfcf1b21608b57122f1 differ diff --git a/Library/Artifacts/58/58ab404c6d94dd89dade6509eb616f2a b/Library/Artifacts/58/58ab404c6d94dd89dade6509eb616f2a deleted file mode 100644 index 5e7bca4a..00000000 Binary files a/Library/Artifacts/58/58ab404c6d94dd89dade6509eb616f2a and /dev/null differ diff --git a/Library/Artifacts/59/59653602b7a7cc0bb6548a9ece477b43 b/Library/Artifacts/59/59653602b7a7cc0bb6548a9ece477b43 new file mode 100644 index 00000000..6bbb0918 Binary files /dev/null and b/Library/Artifacts/59/59653602b7a7cc0bb6548a9ece477b43 differ diff --git a/Library/Artifacts/59/59e221fa162e63e68cbf6e50ad789db9 b/Library/Artifacts/59/59e221fa162e63e68cbf6e50ad789db9 new file mode 100644 index 00000000..b2f3445d Binary files /dev/null and b/Library/Artifacts/59/59e221fa162e63e68cbf6e50ad789db9 differ diff --git a/Library/Artifacts/5b/5bfdd4a9c2f0a207293a6acd2de1b180 b/Library/Artifacts/5b/5bfdd4a9c2f0a207293a6acd2de1b180 new file mode 100644 index 00000000..2e92aea8 Binary files /dev/null and b/Library/Artifacts/5b/5bfdd4a9c2f0a207293a6acd2de1b180 differ diff --git a/Library/Artifacts/65/65aeb2ffaeb0295203f40caec296a575 b/Library/Artifacts/65/65aeb2ffaeb0295203f40caec296a575 new file mode 100644 index 00000000..8319fd70 Binary files /dev/null and b/Library/Artifacts/65/65aeb2ffaeb0295203f40caec296a575 differ diff --git a/Library/Artifacts/29/2922f683c1d5e3b640cab03856a39d0d b/Library/Artifacts/65/65e7738fc9d94ea9446f338e5fcc5a41 similarity index 94% rename from Library/Artifacts/29/2922f683c1d5e3b640cab03856a39d0d rename to Library/Artifacts/65/65e7738fc9d94ea9446f338e5fcc5a41 index 81e3ca7f..4ec3a0c2 100644 Binary files a/Library/Artifacts/29/2922f683c1d5e3b640cab03856a39d0d and b/Library/Artifacts/65/65e7738fc9d94ea9446f338e5fcc5a41 differ diff --git a/Library/Artifacts/6b/6baec19778384f281028b73505908d3e b/Library/Artifacts/6b/6baec19778384f281028b73505908d3e new file mode 100644 index 00000000..c82c6ffa Binary files /dev/null and b/Library/Artifacts/6b/6baec19778384f281028b73505908d3e differ diff --git a/Library/Artifacts/6f/6f722158073ef0cd047a16f7dee41da7 b/Library/Artifacts/6f/6f722158073ef0cd047a16f7dee41da7 deleted file mode 100644 index 2f632bb8..00000000 Binary files a/Library/Artifacts/6f/6f722158073ef0cd047a16f7dee41da7 and /dev/null differ diff --git a/Library/Artifacts/77/771322925e5f3dff82d76747b4f1ef21 b/Library/Artifacts/77/771322925e5f3dff82d76747b4f1ef21 new file mode 100644 index 00000000..af10dcc5 Binary files /dev/null and b/Library/Artifacts/77/771322925e5f3dff82d76747b4f1ef21 differ diff --git a/Library/Artifacts/78/78a9a9faac6499aba30db209690f900f b/Library/Artifacts/7b/7b7ce051cd44ab4b05044d2a7da92cb2 similarity index 96% rename from Library/Artifacts/78/78a9a9faac6499aba30db209690f900f rename to Library/Artifacts/7b/7b7ce051cd44ab4b05044d2a7da92cb2 index c931204f..40161e0a 100644 Binary files a/Library/Artifacts/78/78a9a9faac6499aba30db209690f900f and b/Library/Artifacts/7b/7b7ce051cd44ab4b05044d2a7da92cb2 differ diff --git a/Library/Artifacts/7d/7d1c54d30ed263ff08a84f3a7cca1bdc b/Library/Artifacts/7d/7d1c54d30ed263ff08a84f3a7cca1bdc deleted file mode 100644 index b631c9c5..00000000 Binary files a/Library/Artifacts/7d/7d1c54d30ed263ff08a84f3a7cca1bdc and /dev/null differ diff --git a/Library/Artifacts/7f/7f34a2e454d437475c7e64d16dd94b5c b/Library/Artifacts/7f/7f34a2e454d437475c7e64d16dd94b5c new file mode 100644 index 00000000..7f2e9856 Binary files /dev/null and b/Library/Artifacts/7f/7f34a2e454d437475c7e64d16dd94b5c differ diff --git a/Library/Artifacts/7f/7f6aaa16f97571a6434049fc34b718bd b/Library/Artifacts/7f/7f6aaa16f97571a6434049fc34b718bd deleted file mode 100644 index de7c2f9d..00000000 Binary files a/Library/Artifacts/7f/7f6aaa16f97571a6434049fc34b718bd and /dev/null differ diff --git a/Library/Artifacts/7f/7f834f39b12cb1ea64402376d3b2682c b/Library/Artifacts/7f/7f834f39b12cb1ea64402376d3b2682c new file mode 100644 index 00000000..8e8793d9 Binary files /dev/null and b/Library/Artifacts/7f/7f834f39b12cb1ea64402376d3b2682c differ diff --git a/Library/Artifacts/7f/7f9ee86925f151b9dd26aec4d53d8c5b b/Library/Artifacts/7f/7f9ee86925f151b9dd26aec4d53d8c5b new file mode 100644 index 00000000..9139145f Binary files /dev/null and b/Library/Artifacts/7f/7f9ee86925f151b9dd26aec4d53d8c5b differ diff --git a/Library/Artifacts/83/83298cde2f067e6bf7b96291a40f1ecf b/Library/Artifacts/83/83298cde2f067e6bf7b96291a40f1ecf new file mode 100644 index 00000000..9954ef66 Binary files /dev/null and b/Library/Artifacts/83/83298cde2f067e6bf7b96291a40f1ecf differ diff --git a/Library/Artifacts/85/85a3b8a62badfb4b60e1663e3cd6d998 b/Library/Artifacts/85/85a3b8a62badfb4b60e1663e3cd6d998 new file mode 100644 index 00000000..0315cc7d Binary files /dev/null and b/Library/Artifacts/85/85a3b8a62badfb4b60e1663e3cd6d998 differ diff --git a/Library/Artifacts/89/89bc333af6b27ad83500f9dfce5f1eff b/Library/Artifacts/89/89bc333af6b27ad83500f9dfce5f1eff deleted file mode 100644 index ba757a6b..00000000 Binary files a/Library/Artifacts/89/89bc333af6b27ad83500f9dfce5f1eff and /dev/null differ diff --git a/Library/Artifacts/8a/8aad68960d1a93681e12961504576217 b/Library/Artifacts/8a/8aad68960d1a93681e12961504576217 deleted file mode 100644 index 0db2b0b8..00000000 Binary files a/Library/Artifacts/8a/8aad68960d1a93681e12961504576217 and /dev/null differ diff --git a/Library/Artifacts/90/901b4225796a9f1fde8cf123cdad4076 b/Library/Artifacts/90/901b4225796a9f1fde8cf123cdad4076 new file mode 100644 index 00000000..b4cab5cf Binary files /dev/null and b/Library/Artifacts/90/901b4225796a9f1fde8cf123cdad4076 differ diff --git a/Library/Artifacts/93/931f3274a595c2eb6fadef75857aafe8 b/Library/Artifacts/93/931f3274a595c2eb6fadef75857aafe8 deleted file mode 100644 index b967ffb0..00000000 Binary files a/Library/Artifacts/93/931f3274a595c2eb6fadef75857aafe8 and /dev/null differ diff --git a/Library/Artifacts/93/93764886118d0e60a167bd9e28c22c02 b/Library/Artifacts/93/93764886118d0e60a167bd9e28c22c02 deleted file mode 100644 index 327ff5af..00000000 Binary files a/Library/Artifacts/93/93764886118d0e60a167bd9e28c22c02 and /dev/null differ diff --git a/Library/Artifacts/9b/9b353a3142f782a0542f61f39acfc2c5 b/Library/Artifacts/9b/9b353a3142f782a0542f61f39acfc2c5 new file mode 100644 index 00000000..2bca18a4 Binary files /dev/null and b/Library/Artifacts/9b/9b353a3142f782a0542f61f39acfc2c5 differ diff --git a/Library/Artifacts/a8/a818e3fbec59f406239d254f3d46d7c6 b/Library/Artifacts/a8/a818e3fbec59f406239d254f3d46d7c6 deleted file mode 100644 index f14873e4..00000000 Binary files a/Library/Artifacts/a8/a818e3fbec59f406239d254f3d46d7c6 and /dev/null differ diff --git a/Library/Artifacts/b0/b03929bc84b38ac99706989321a28dd2 b/Library/Artifacts/b0/b03929bc84b38ac99706989321a28dd2 new file mode 100644 index 00000000..8ab56997 Binary files /dev/null and b/Library/Artifacts/b0/b03929bc84b38ac99706989321a28dd2 differ diff --git a/Library/Artifacts/b0/b0fdd9039549e1c182c4379d859e851f b/Library/Artifacts/b0/b0fdd9039549e1c182c4379d859e851f new file mode 100644 index 00000000..bd3a73b5 Binary files /dev/null and b/Library/Artifacts/b0/b0fdd9039549e1c182c4379d859e851f differ diff --git a/Library/Artifacts/b9/b97918e385b4acf5514ec2a12cedac5e b/Library/Artifacts/b9/b97918e385b4acf5514ec2a12cedac5e new file mode 100644 index 00000000..3e96aeee Binary files /dev/null and b/Library/Artifacts/b9/b97918e385b4acf5514ec2a12cedac5e differ diff --git a/Library/Artifacts/bf/bf2a4c221f929728b4d68c2db8ece00c b/Library/Artifacts/bf/bf2a4c221f929728b4d68c2db8ece00c new file mode 100644 index 00000000..86263dc9 Binary files /dev/null and b/Library/Artifacts/bf/bf2a4c221f929728b4d68c2db8ece00c differ diff --git a/Library/Artifacts/c3/c3df35f8dd68a602d2f2cbc7854bf77a b/Library/Artifacts/c3/c3df35f8dd68a602d2f2cbc7854bf77a new file mode 100644 index 00000000..407c6fe5 Binary files /dev/null and b/Library/Artifacts/c3/c3df35f8dd68a602d2f2cbc7854bf77a differ diff --git a/Library/Artifacts/cb/cbe45db60f412aa7f4a0c834ceb02bd4 b/Library/Artifacts/cb/cbe45db60f412aa7f4a0c834ceb02bd4 deleted file mode 100644 index 471e9033..00000000 Binary files a/Library/Artifacts/cb/cbe45db60f412aa7f4a0c834ceb02bd4 and /dev/null differ diff --git a/Library/Artifacts/cc/cc17bda9cf2394901bff3ddb24dd8c37 b/Library/Artifacts/cc/cc17bda9cf2394901bff3ddb24dd8c37 new file mode 100644 index 00000000..630f3076 Binary files /dev/null and b/Library/Artifacts/cc/cc17bda9cf2394901bff3ddb24dd8c37 differ diff --git a/Library/Artifacts/95/956c5b4520e3fa97ae747c497fb7e05e b/Library/Artifacts/cf/cfa197d86d0f4d8f9e6062091c509185 similarity index 96% rename from Library/Artifacts/95/956c5b4520e3fa97ae747c497fb7e05e rename to Library/Artifacts/cf/cfa197d86d0f4d8f9e6062091c509185 index 1a453f77..413345e9 100644 Binary files a/Library/Artifacts/95/956c5b4520e3fa97ae747c497fb7e05e and b/Library/Artifacts/cf/cfa197d86d0f4d8f9e6062091c509185 differ diff --git a/Library/Artifacts/cf/cfe90fe0f68a7c9d857bea2cd2ec3684 b/Library/Artifacts/cf/cfe90fe0f68a7c9d857bea2cd2ec3684 new file mode 100644 index 00000000..84e7a553 Binary files /dev/null and b/Library/Artifacts/cf/cfe90fe0f68a7c9d857bea2cd2ec3684 differ diff --git a/Library/Artifacts/d0/d07fd9b49a31f0fd1857cab2e11d70f6 b/Library/Artifacts/d0/d07fd9b49a31f0fd1857cab2e11d70f6 deleted file mode 100644 index 3a929a18..00000000 Binary files a/Library/Artifacts/d0/d07fd9b49a31f0fd1857cab2e11d70f6 and /dev/null differ diff --git a/Library/Artifacts/d5/d5b84316c31adf495e7404bcd9c04947 b/Library/Artifacts/d5/d5b84316c31adf495e7404bcd9c04947 deleted file mode 100644 index 883fa8a9..00000000 Binary files a/Library/Artifacts/d5/d5b84316c31adf495e7404bcd9c04947 and /dev/null differ diff --git a/Library/Artifacts/d5/d5f639473352f80ade6a286ba80a2c2f b/Library/Artifacts/d5/d5f639473352f80ade6a286ba80a2c2f new file mode 100644 index 00000000..d20939e2 Binary files /dev/null and b/Library/Artifacts/d5/d5f639473352f80ade6a286ba80a2c2f differ diff --git a/Library/Artifacts/da/da018ee3064e8a2319cca5d364bb29e3 b/Library/Artifacts/da/da018ee3064e8a2319cca5d364bb29e3 deleted file mode 100644 index 48308e69..00000000 Binary files a/Library/Artifacts/da/da018ee3064e8a2319cca5d364bb29e3 and /dev/null differ diff --git a/Library/Artifacts/da/da14ca3fc00e2e0d39ff6fcc60b39f99 b/Library/Artifacts/da/da14ca3fc00e2e0d39ff6fcc60b39f99 new file mode 100644 index 00000000..113a5e3b Binary files /dev/null and b/Library/Artifacts/da/da14ca3fc00e2e0d39ff6fcc60b39f99 differ diff --git a/Library/Artifacts/e5/e5ca88f9f6b2e645674007297d93b3ed b/Library/Artifacts/e5/e5ca88f9f6b2e645674007297d93b3ed new file mode 100644 index 00000000..3dd5a076 Binary files /dev/null and b/Library/Artifacts/e5/e5ca88f9f6b2e645674007297d93b3ed differ diff --git a/Library/Artifacts/9b/9b24acc6361c24a1e2469826207f248e b/Library/Artifacts/e8/e8790d41a725f7300a7f0e24ca9bf50c similarity index 88% rename from Library/Artifacts/9b/9b24acc6361c24a1e2469826207f248e rename to Library/Artifacts/e8/e8790d41a725f7300a7f0e24ca9bf50c index d524b026..8e5f4f17 100644 Binary files a/Library/Artifacts/9b/9b24acc6361c24a1e2469826207f248e and b/Library/Artifacts/e8/e8790d41a725f7300a7f0e24ca9bf50c differ diff --git a/Library/Artifacts/eb/eba648e0aa00e3a89a8de243d66d3df5 b/Library/Artifacts/eb/eba648e0aa00e3a89a8de243d66d3df5 new file mode 100644 index 00000000..07de3dc6 Binary files /dev/null and b/Library/Artifacts/eb/eba648e0aa00e3a89a8de243d66d3df5 differ diff --git a/Library/Artifacts/ec/ec2e0eb5c7eb98999e25a8aab95c0d71 b/Library/Artifacts/ec/ec2e0eb5c7eb98999e25a8aab95c0d71 new file mode 100644 index 00000000..d514be25 Binary files /dev/null and b/Library/Artifacts/ec/ec2e0eb5c7eb98999e25a8aab95c0d71 differ diff --git a/Library/Artifacts/ef/ef767980398b9ccb5fcc94dfed1d1260 b/Library/Artifacts/ef/ef767980398b9ccb5fcc94dfed1d1260 new file mode 100644 index 00000000..1253d29b Binary files /dev/null and b/Library/Artifacts/ef/ef767980398b9ccb5fcc94dfed1d1260 differ diff --git a/Library/Artifacts/f0/f02aec2a40c82d4c65abbcacce2e6e37 b/Library/Artifacts/f0/f02aec2a40c82d4c65abbcacce2e6e37 new file mode 100644 index 00000000..a77b41a9 Binary files /dev/null and b/Library/Artifacts/f0/f02aec2a40c82d4c65abbcacce2e6e37 differ diff --git a/Library/Artifacts/f0/f02e3687b39f4690086c1f8260449df1 b/Library/Artifacts/f0/f02e3687b39f4690086c1f8260449df1 deleted file mode 100644 index e3f8d92c..00000000 Binary files a/Library/Artifacts/f0/f02e3687b39f4690086c1f8260449df1 and /dev/null differ diff --git a/Library/Artifacts/f5/f5cc6fff9b7ab8026d3bc54cfb05db1f b/Library/Artifacts/f5/f5cc6fff9b7ab8026d3bc54cfb05db1f new file mode 100644 index 00000000..e3589df5 Binary files /dev/null and b/Library/Artifacts/f5/f5cc6fff9b7ab8026d3bc54cfb05db1f differ diff --git a/Library/Artifacts/f9/f9d8e4bc9bad09ac33c1cf74a38c693f b/Library/Artifacts/f9/f9d8e4bc9bad09ac33c1cf74a38c693f deleted file mode 100644 index d11d6e44..00000000 Binary files a/Library/Artifacts/f9/f9d8e4bc9bad09ac33c1cf74a38c693f and /dev/null differ diff --git a/Library/Artifacts/ff/ff321c03627e1c87770a7242005d93b4 b/Library/Artifacts/ff/ff321c03627e1c87770a7242005d93b4 deleted file mode 100644 index 74e744f2..00000000 Binary files a/Library/Artifacts/ff/ff321c03627e1c87770a7242005d93b4 and /dev/null differ diff --git a/Library/Artifacts/ff/ff5944239874fe760ca9ef423d77d8ee b/Library/Artifacts/ff/ff5944239874fe760ca9ef423d77d8ee new file mode 100644 index 00000000..f08563ed Binary files /dev/null and b/Library/Artifacts/ff/ff5944239874fe760ca9ef423d77d8ee differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index e5063333..baf36db5 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -112,10 +112,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 678, y: 492} + m_MinSize: {x: 679, y: 492} m_MaxSize: {x: 14002, y: 14042} vertical: 0 - controlID: 6748 + controlID: 10142 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -135,12 +135,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1314 + width: 1414 height: 947 - m_MinSize: {x: 402, y: 492} + m_MinSize: {x: 403, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 6749 + controlID: 10143 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -160,12 +160,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1314 - height: 426 - m_MinSize: {x: 402, y: 221} - m_MaxSize: {x: 8002, y: 4021} + width: 1414 + height: 676 + m_MinSize: {x: 403, y: 221} + m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 6750 + controlID: 10144 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -183,8 +183,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 441 - height: 426 + width: 279 + height: 676 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -207,10 +207,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 441 + x: 279 y: 0 - width: 873 - height: 426 + width: 1135 + height: 676 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} @@ -237,9 +237,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 426 - width: 1314 - height: 521 + y: 676 + width: 1414 + height: 271 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 17} @@ -264,9 +264,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1314 + x: 1414 y: 0 - width: 606 + width: 506 height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -296,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 442 + x: 280 y: 19 - width: 871 - height: 405 + width: 1133 + height: 655 m_ViewDataDictionary: {fileID: 0} m_SerializedViewNames: [] m_SerializedViewValues: [] @@ -309,7 +309,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 871, y: 384} + m_TargetSize: {x: 1014, y: 634} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -318,14 +318,14 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 04000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 + m_HBaseRangeMin: -725.5 + m_HBaseRangeMax: 725.5 m_VBaseRangeMin: -453.5 m_VBaseRangeMax: 453.5 m_HAllowExceedBaseRangeMin: 1 @@ -390,15 +390,15 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 440 - height: 405 + width: 278 + height: 655 m_ViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: f45bfeff085cfeffa65cfeffc661feffda61feff7862fefff6a0feff0aa1feffa8a1feff62fbffffa23a0000f03f0000ba2a0100b62c0100542d0100822d010082300100c4300100e4320100 + m_ExpandedIDs: d884ffffec84ffff8a85ffff30a7ffff44a7ffffe2a7ffffaccdffff62fbffff563c0000a04400002c4500008c1d0100f6210100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -443,10 +443,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 441 + x: 279 y: 73 - width: 871 - height: 405 + width: 1133 + height: 655 m_ViewDataDictionary: {fileID: 0} m_ShowContextualTools: 0 m_WindowGUID: 352ee9c972596684b9fdf9db32bf21bf @@ -458,9 +458,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 598.16425, y: 121.84375, z: -73.88001} + m_Target: {x: 790.24, y: 221.74434, z: -17.972433} speed: 2 - m_Value: {x: 598.16425, y: 121.84375, z: -73.88001} + m_Value: {x: 790.24, y: 221.74434, z: -17.972433} 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: 291.54535 + m_Target: 274.369 speed: 2 - m_Value: 291.54535 + m_Value: 274.369 m_Ortho: m_Target: 1 speed: 2 @@ -1087,9 +1087,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 499 - width: 1313 - height: 500 + y: 749 + width: 1413 + height: 250 m_ViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -1104,20 +1104,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Resources/Textures/Props m_ViewMode: 1 m_StartGridSize: 67 m_LastFolders: - - Assets + - Assets/Resources/Textures/Props m_LastFoldersGridSize: 67 m_LastProjectPath: C:\UnityDev\rimworld-animation-studio m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 40480000 - m_LastClickedID: 18496 - m_ExpandedIDs: 0000000040480000424800004448000046480000484800004a4800004c48000000ca9a3b + m_SelectedIDs: ec480000 + m_LastClickedID: 18668 + m_ExpandedIDs: 0000000046480000484800004a4800004c4800004e48000050480000524800006848000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000040480000424800004448000046480000484800004a4800004c48000000ca9a3b + m_ExpandedIDs: 0000000046480000484800004a4800004c4800004e480000504800005248000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1173,7 +1173,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c43000000000000 + m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c4300000000000000490000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1279,9 +1279,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1314 + x: 1414 y: 73 - width: 605 + width: 505 height: 926 m_ViewDataDictionary: {fileID: 0} m_OpenAddComponentMenu: 0 diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index 7a7a64e3..d63137b2 100644 --- a/Library/CurrentMaximizeLayout.dwlt +++ b/Library/CurrentMaximizeLayout.dwlt @@ -21,10 +21,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 678, y: 492} + m_MinSize: {x: 679, y: 492} m_MaxSize: {x: 14002, y: 14042} vertical: 0 - controlID: 6521 + controlID: 9932 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,10 +46,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 442 + x: 280 y: 19 - width: 871 - height: 405 + width: 1133 + height: 655 m_ViewDataDictionary: {fileID: 0} m_SerializedViewNames: [] m_SerializedViewValues: [] @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 871, y: 384} + m_TargetSize: {x: 1014, y: 634} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -68,16 +68,16 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 04000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -435.5 - m_HBaseRangeMax: 435.5 - m_VBaseRangeMin: -192 - m_VBaseRangeMax: 192 + m_HBaseRangeMin: -507 + m_HBaseRangeMax: 507 + m_VBaseRangeMin: -317 + m_VBaseRangeMax: 317 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 871 - height: 384 + width: 1133 + height: 634 m_Scale: {x: 1, y: 1} - m_Translation: {x: 435.5, y: 192} + m_Translation: {x: 566.5, y: 317} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -435.5 - y: -192 - width: 871 - height: 384 + x: -566.5 + y: -317 + width: 1133 + height: 634 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 871, y: 405} + m_LastWindowPixelSize: {x: 1133, y: 655} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -136,12 +136,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1314 + width: 1414 height: 947 - m_MinSize: {x: 402, y: 492} + m_MinSize: {x: 403, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 6522 + controlID: 9933 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,12 +161,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1314 - height: 426 - m_MinSize: {x: 402, y: 221} - m_MaxSize: {x: 8002, y: 4021} + width: 1414 + height: 676 + m_MinSize: {x: 403, y: 221} + m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 6523 + controlID: 9898 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -184,10 +184,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 441 - height: 426 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 279 + height: 676 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -216,15 +216,15 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 440 - height: 405 + width: 278 + height: 655 m_ViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c661feffda61feff7862fefff6a0feff0aa1feffa8a1feff62fbffffa23a0000f03f0000ba2a0100b62c0100542d0100822d010082300100c4300100e4320100 + m_ExpandedIDs: 30a7ffff44a7ffffe2a7ffffaccdffff62fbffff563c0000a04400002c4500008c1d0100f6210100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -263,10 +263,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 441 + x: 279 y: 0 - width: 873 - height: 426 + width: 1135 + height: 676 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} @@ -298,10 +298,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 441 + x: 279 y: 73 - width: 871 - height: 405 + width: 1133 + height: 655 m_ViewDataDictionary: {fileID: 0} m_ShowContextualTools: 0 m_WindowGUID: 352ee9c972596684b9fdf9db32bf21bf @@ -313,9 +313,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 598.16425, y: 121.84375, z: -73.88001} + m_Target: {x: 790.24, y: 221.74434, z: -17.972433} speed: 2 - m_Value: {x: 598.16425, y: 121.84375, z: -73.88001} + m_Value: {x: 790.24, y: 221.74434, z: -17.972433} 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: 291.54535 + m_Target: 274.369 speed: 2 - m_Value: 291.54535 + m_Value: 274.369 m_Ortho: m_Target: 1 speed: 2 @@ -936,11 +936,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 426 - width: 1314 - height: 521 - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} + y: 676 + width: 1414 + height: 271 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -970,9 +970,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 499 - width: 1313 - height: 500 + y: 749 + width: 1413 + height: 250 m_ViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -987,20 +987,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Resources/Textures/Props m_ViewMode: 1 m_StartGridSize: 67 m_LastFolders: - - Assets + - Assets/Resources/Textures/Props m_LastFoldersGridSize: 67 m_LastProjectPath: C:\UnityDev\rimworld-animation-studio m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 40480000 - m_LastClickedID: 18496 - m_ExpandedIDs: 0000000040480000424800004448000046480000484800004a4800004c48000000ca9a3b + m_SelectedIDs: ec480000 + m_LastClickedID: 18668 + m_ExpandedIDs: 0000000046480000484800004a4800004c4800004e48000050480000524800006848000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000040480000424800004448000046480000484800004a4800004c48000000ca9a3b + m_ExpandedIDs: 0000000046480000484800004a4800004c4800004e480000504800005248000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1053,10 +1053,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 162401009a1c01000c270100701d0100fe1b0100ce230100c61b01005c1e0100a61d0100 + m_LastClickedInstanceID: 73126 m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c43000000000000 + m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c4300000000000000490000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1156,9 +1156,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1314 + x: 1414 y: 0 - width: 606 + width: 506 height: 947 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} @@ -1188,9 +1188,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1314 + x: 1414 y: 73 - width: 605 + width: 505 height: 926 m_ViewDataDictionary: {fileID: 0} m_OpenAddComponentMenu: 0 @@ -1203,5 +1203,5 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 72646 m_LastVerticalScrollValue: 0 diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset index 5e92d4c9..599fab6b 100644 Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index 10cbe7cf..8786cce6 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 605eeb34..b70b05f9 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 26ce4006..82b24bb9 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 1458a668..c7bef56e 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 a38fc264..52322eb0 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 842db926..f0b0b09c 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 3d4d67a3..67a1f17b 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 6e83e57d..3bea6897 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 8616b994..da1ce1d7 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 1ee51660..74cfe1a1 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 00e43188..0794438c 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 95c1a520..df36ec54 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 bdc7054f..3748504f 100644 Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers and b/Library/PlayerDataCache/Win/Data/globalgamemanagers differ diff --git a/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets b/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets index c0bc72c9..249a6957 100644 Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets and b/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets differ diff --git a/Library/PlayerDataCache/Win/Data/level0 b/Library/PlayerDataCache/Win/Data/level0 index 568cbc0b..7f5bd4eb 100644 Binary files a/Library/PlayerDataCache/Win/Data/level0 and b/Library/PlayerDataCache/Win/Data/level0 differ diff --git a/Library/PlayerDataCache/Win/Data/resources.assets b/Library/PlayerDataCache/Win/Data/resources.assets index cb6e8df6..4617b973 100644 Binary files a/Library/PlayerDataCache/Win/Data/resources.assets and b/Library/PlayerDataCache/Win/Data/resources.assets differ diff --git a/Library/PlayerDataCache/Win/Data/sharedassets0.assets b/Library/PlayerDataCache/Win/Data/sharedassets0.assets index 27a1581e..59e512c0 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/Data/sharedassets0.assets.resS b/Library/PlayerDataCache/Win/Data/sharedassets0.assets.resS index ab87f5ee..261643fc 100644 Binary files a/Library/PlayerDataCache/Win/Data/sharedassets0.assets.resS and b/Library/PlayerDataCache/Win/Data/sharedassets0.assets.resS differ diff --git a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml index b3685878..772ba4a8 100644 --- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -31,6 +31,7 @@ ScriptsOnlyBuild: - RimWorldAnimationStudio.SelectRaceDropdown - RimWorldAnimationStudio.SelectSexTypesDialog - RimWorldAnimationStudio.SelectSoundDefDialog + - RimWorldAnimationStudio.SexPropManager - RimWorldAnimationStudio.SnapToKeyframe - RimWorldAnimationStudio.StageCard - RimWorldAnimationStudio.StageCardManager @@ -160,55 +161,57 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 13222} - Class: 114 - Script: {instanceID: 13232} + Script: {instanceID: 13230} - Class: 114 - Script: {instanceID: 13350} + Script: {instanceID: 13234} - Class: 114 - Script: {instanceID: 13382} + Script: {instanceID: 13352} - Class: 114 - Script: {instanceID: 13420} + Script: {instanceID: 13384} - Class: 114 - Script: {instanceID: 13438} + Script: {instanceID: 13422} - Class: 114 - Script: {instanceID: 13454} + Script: {instanceID: 13440} - Class: 114 - Script: {instanceID: 13466} + Script: {instanceID: 13456} - Class: 114 - Script: {instanceID: 13470} + Script: {instanceID: 13468} - Class: 114 - Script: {instanceID: 13504} + Script: {instanceID: 13472} - Class: 114 - Script: {instanceID: 13622} + Script: {instanceID: 13506} - Class: 114 - Script: {instanceID: 13636} + Script: {instanceID: 13624} - Class: 114 - Script: {instanceID: 13662} + Script: {instanceID: 13638} - Class: 114 - Script: {instanceID: 13864} + Script: {instanceID: 13664} - Class: 114 - Script: {instanceID: 14058} + Script: {instanceID: 13866} - Class: 114 - Script: {instanceID: 14140} + Script: {instanceID: 14060} - Class: 114 - Script: {instanceID: 14154} + Script: {instanceID: 14142} - Class: 114 - Script: {instanceID: 14302} + Script: {instanceID: 14156} - Class: 114 - Script: {instanceID: 14448} + Script: {instanceID: 14304} - Class: 114 - Script: {instanceID: 14476} + Script: {instanceID: 14450} - Class: 114 - Script: {instanceID: 14508} + Script: {instanceID: 14478} - Class: 114 - Script: {instanceID: 14530} + Script: {instanceID: 14510} - Class: 114 Script: {instanceID: 14532} - Class: 114 - Script: {instanceID: 14572} + Script: {instanceID: 14534} - Class: 114 - Script: {instanceID: 14578} + Script: {instanceID: 14574} - Class: 114 - Script: {instanceID: 79764} + Script: {instanceID: 14580} + - Class: 114 + Script: {instanceID: 26010} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -630,6 +633,12 @@ ScriptsOnlyBuild: assemblyName: Assembly-CSharp.dll namespaceName: RimWorldAnimationStudio className: Chaser + - hash: + serializedVersion: 2 + Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f + assemblyName: Assembly-CSharp.dll + namespaceName: RimWorldAnimationStudio + className: SnapToKeyframe - hash: serializedVersion: 2 Hash: 5ad4aa237d47ac2bab17bacb672edf7a @@ -920,10 +929,10 @@ ScriptsOnlyBuild: className: PlayableTrack - hash: serializedVersion: 2 - Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f + Hash: a7e8a0f1f025151d5d79185a8445febd assemblyName: Assembly-CSharp.dll namespaceName: RimWorldAnimationStudio - className: SnapToKeyframe + className: SexPropManager platform: 5 scenePathNames: - Assets/Scenes/MainScene.unity diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 343e72d5..5d8ad89a 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 5f83f5b8..f035fad1 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 68f22f27..ab507d97 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 c9907487..c6a78c0d 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 f2c79316..0037ddcd 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":598.1642456054688,"y":121.84375,"z":-73.88001251220703},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":291.54534912109377,"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":790.239990234375,"y":221.7443389892578,"z":-17.97243309020996},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":274.3689880371094,"orthographic":true} \ No newline at end of file diff --git a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache index c50563b2..decc8a17 100644 Binary files a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache differ