diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index 4bc86fbb..21bc43e4 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 0e769b73..a5b4697b 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -63,7 +63,6 @@ - @@ -75,14 +74,12 @@ + + - - - - @@ -90,6 +87,7 @@ + @@ -104,14 +102,20 @@ + + + - - + + + + + @@ -122,14 +126,10 @@ - - - - - + diff --git a/Assets/Resources/Textures/Props/Bed_east.png.meta b/Assets/Resources/Textures/Props/Bed_east.png.meta index 0981b990..7b343ae3 100644 --- a/Assets/Resources/Textures/Props/Bed_east.png.meta +++ b/Assets/Resources/Textures/Props/Bed_east.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 62 + spritePixelsToUnits: 85 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 1863a5d6..189002f8 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -156,13 +156,13 @@ RectTransform: - {fileID: 1128954052} - {fileID: 1124030520} m_Father: {fileID: 935483303140078260} - m_RootOrder: 19 + m_RootOrder: 12 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.4899902, y: -354.99976} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -370} + m_SizeDelta: {x: 120, y: 30} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &11575767 MonoBehaviour: m_ObjectHideFlags: 0 @@ -554,11 +554,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 935483303140078260} - m_RootOrder: 0 + m_RootOrder: 1 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: -14.999756} + m_AnchoredPosition: {x: 1, y: -150} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &47347462 @@ -593,7 +593,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Actor Controls + m_Text: Actor Management --- !u!222 &47347463 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5152,11 +5152,11 @@ RectTransform: - {fileID: 1351975245} - {fileID: 1699709245} m_Father: {fileID: 279689758} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -167} + m_AnchoredPosition: {x: 0, y: -209} m_SizeDelta: {x: 300, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!114 &360685718 @@ -5793,13 +5793,13 @@ RectTransform: m_Children: - {fileID: 316478197} m_Father: {fileID: 935483303140078260} - m_RootOrder: 21 + m_RootOrder: 14 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: -31.48999, y: -384.99976} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -95, y: -370} m_SizeDelta: {x: 60, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &375594582 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7596,11 +7596,11 @@ RectTransform: - {fileID: 497204243} - {fileID: 592091831} m_Father: {fileID: 2085905668} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -408.99207} + m_AnchoredPosition: {x: 155, y: -275} m_SizeDelta: {x: 310, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &476324336 @@ -7841,11 +7841,11 @@ RectTransform: - {fileID: 2050414524} - {fileID: 448745872} m_Father: {fileID: 279689758} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -137} + m_AnchoredPosition: {x: 0, y: -179} m_SizeDelta: {x: 300, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!114 &488764905 @@ -8472,7 +8472,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 0, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -9244,11 +9244,11 @@ RectTransform: - {fileID: 731648729} - {fileID: 1166876753} m_Father: {fileID: 279689758} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -197} + m_AnchoredPosition: {x: 0, y: -239} m_SizeDelta: {x: 300, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!114 &536561404 @@ -9387,11 +9387,11 @@ RectTransform: - {fileID: 1486546821} - {fileID: 433613848} m_Father: {fileID: 2085905668} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -133.99207} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 310, y: 240} m_Pivot: {x: 0, y: 1} --- !u!114 &537488935 @@ -9620,7 +9620,7 @@ RectTransform: 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: 85} + m_AnchoredPosition: {x: 0, y: 84.99998} m_SizeDelta: {x: 0, y: 5} m_Pivot: {x: 0, y: 1} --- !u!114 &542629604 @@ -9819,7 +9819,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -9965,11 +9965,11 @@ RectTransform: - {fileID: 1976644221} - {fileID: 374166309} m_Father: {fileID: 279689758} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -77} + m_AnchoredPosition: {x: 0, y: -119} m_SizeDelta: {x: 300, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!114 &567790996 @@ -11413,12 +11413,12 @@ RectTransform: - {fileID: 1190554011} - {fileID: 681903173} m_Father: {fileID: 2085905668} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -578.99207} - m_SizeDelta: {x: 310, y: 270} + m_AnchoredPosition: {x: 155, y: -395} + m_SizeDelta: {x: 310, y: 170} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &629081415 MonoBehaviour: @@ -11987,12 +11987,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 935483303140078260} - m_RootOrder: 16 + m_RootOrder: 9 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: -46.48999, y: -264.99976} - m_SizeDelta: {x: 60, y: 30} + m_AnchoredPosition: {x: -72.244995, y: -305} + m_SizeDelta: {x: 143.51001, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &671921655 MonoBehaviour: @@ -12020,13 +12020,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 'Layer:' + m_Text: 'In-game render layer:' --- !u!222 &671921656 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12068,9 +12068,9 @@ RectTransform: m_Father: {fileID: 629081414} m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.163, y: -10} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -156.16, y: -145} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &681903174 @@ -13619,6 +13619,80 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: valiationType: 1 +--- !u!1 &763620509 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 763620510} + - component: {fileID: 763620512} + - component: {fileID: 763620511} + m_Layer: 5 + m_Name: Spacer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &763620510 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 763620509} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.95, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 279689758} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -73} + m_SizeDelta: {x: 300, y: 2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &763620511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 763620509} + 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.9245283, g: 0.9245283, b: 0.9245283, 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 &763620512 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 763620509} + m_CullTransparentMesh: 0 --- !u!1 &765752266 GameObject: m_ObjectHideFlags: 0 @@ -15277,6 +15351,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 868090572} m_CullTransparentMesh: 0 +--- !u!1 &874388433 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 874388434} + m_Layer: 5 + m_Name: SexProp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &874388434 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874388433} + 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: 2070462932} + - {fileID: 2061561785} + m_Father: {fileID: 279689758} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -52} + m_SizeDelta: {x: 300, y: 40} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &891070577 GameObject: m_ObjectHideFlags: 0 @@ -15399,9 +15510,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -80, y: -115} + m_AnchoredPosition: {x: -10, y: -115} m_SizeDelta: {x: 145, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &891468916 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15764,13 +15875,13 @@ RectTransform: m_Children: - {fileID: 395375412} m_Father: {fileID: 935483303140078260} - m_RootOrder: 1 + m_RootOrder: 2 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.4899902, y: -29.999756} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 11, y: -165} + m_SizeDelta: {x: 145, y: 30} + m_Pivot: {x: 0, y: 1} --- !u!114 &899286716 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16822,11 +16933,11 @@ RectTransform: - {fileID: 825034535} - {fileID: 148615401} m_Father: {fileID: 279689758} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -47} + m_AnchoredPosition: {x: 0, y: -89} m_SizeDelta: {x: 300, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!114 &971656501 @@ -17182,13 +17293,13 @@ RectTransform: - {fileID: 225041961} - {fileID: 593007063} m_Father: {fileID: 935483303140078260} - m_RootOrder: 17 + m_RootOrder: 10 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: 23.51001, y: -264.99976} - m_SizeDelta: {x: 110, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -9, y: -305} + m_SizeDelta: {x: 145, y: 30} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &1001419736 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17335,11 +17446,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 935483303140078260} - m_RootOrder: 18 + m_RootOrder: 11 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: -324.99976} + m_AnchoredPosition: {x: 0, y: -340} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1012383902 @@ -18283,9 +18394,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -115} + m_AnchoredPosition: {x: 10, y: -115} m_SizeDelta: {x: 145, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &1092312355 MonoBehaviour: m_ObjectHideFlags: 0 @@ -18827,13 +18938,13 @@ RectTransform: m_Children: - {fileID: 1321044693} m_Father: {fileID: 935483303140078260} - m_RootOrder: 2 + m_RootOrder: 3 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.4899902, y: -74.999756} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -9, y: -165} + m_SizeDelta: {x: 145, y: 30} + m_Pivot: {x: 1, y: 1} --- !u!114 &1136677498 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20044,7 +20155,7 @@ GameObject: - component: {fileID: 1169056257} - component: {fileID: 1169056256} m_Layer: 5 - m_Name: ActorPropsText + m_Name: ActorPropertiesText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -20062,11 +20173,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 935483303140078260} - m_RootOrder: 3 + m_RootOrder: 4 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: -114.999756} + m_AnchoredPosition: {x: 1, y: -215} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1169056256 @@ -20388,13 +20499,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 935483303140078260} - m_RootOrder: 20 + m_RootOrder: 13 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: -66.67999, y: -384.99976} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -150, y: -370} m_SizeDelta: {x: 19.951263, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &1179892062 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21963,13 +22074,13 @@ RectTransform: m_Children: - {fileID: 1475781912} m_Father: {fileID: 935483303140078260} - m_RootOrder: 23 + m_RootOrder: 16 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: 47.974014, y: -384.99976} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -10, y: -370} m_SizeDelta: {x: 58.349854, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &1293104867 MonoBehaviour: m_ObjectHideFlags: 0 @@ -22689,7 +22800,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Remove selected actor + m_Text: Remove actor --- !u!222 &1321044695 CanvasRenderer: m_ObjectHideFlags: 0 @@ -23800,7 +23911,7 @@ PrefabInstance: - target: {fileID: 5792094730711952121, guid: 9070db4f6841de145b1ceb2f217d92f7, type: 3} propertyPath: m_SizeDelta.y - value: 212 + value: 254 objectReference: {fileID: 0} - target: {fileID: 5792094730752706041, guid: 9070db4f6841de145b1ceb2f217d92f7, type: 3} @@ -27904,6 +28015,12 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_IsOn: 1 +--- !u!1 &1603551865 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5792094730711952120, guid: 9070db4f6841de145b1ceb2f217d92f7, + type: 3} + m_PrefabInstance: {fileID: 1381284432} + m_PrefabAsset: {fileID: 0} --- !u!1 &1613308231 GameObject: m_ObjectHideFlags: 0 @@ -29515,11 +29632,11 @@ RectTransform: - {fileID: 369911214} - {fileID: 1854887604} m_Father: {fileID: 279689758} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -107} + m_AnchoredPosition: {x: 0, y: -149} m_SizeDelta: {x: 300, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1723646253 @@ -34479,14 +34596,14 @@ RectTransform: - {fileID: 542804684} - {fileID: 530782062} - {fileID: 1072006786} - m_Father: {fileID: 935483303140078260} - m_RootOrder: 25 + m_Father: {fileID: 874388434} + m_RootOrder: 1 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.4899902, y: -554.99976} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -10, y: -5} m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 1} --- !u!114 &2061561786 MonoBehaviour: m_ObjectHideFlags: 0 @@ -34549,6 +34666,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1603551865} + m_MethodName: SetActive + m_Mode: 6 + 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: @@ -34616,14 +34744,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 935483303140078260} - m_RootOrder: 24 + m_Father: {fileID: 874388434} + 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: -524.99976} - m_SizeDelta: {x: 0, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.000015258789, y: -5} + m_SizeDelta: {x: -19.999977, y: 30} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &2070462933 MonoBehaviour: m_ObjectHideFlags: 0 @@ -34637,7 +34765,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.196, g: 0.196, b: 0.196, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -34646,11 +34774,11 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 - m_FontStyle: 1 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -34714,13 +34842,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 935483303140078260} - m_RootOrder: 22 + m_RootOrder: 15 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: 14.51001, y: -384.99976} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -65, y: -370} m_SizeDelta: {x: 17.537262, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &2081541322 MonoBehaviour: m_ObjectHideFlags: 0 @@ -34793,7 +34921,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2130812669} - {fileID: 537488934} - {fileID: 468781281} - {fileID: 629081414} @@ -35295,7 +35422,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2130812668} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: @@ -35306,12 +35433,12 @@ RectTransform: - {fileID: 1402648197} - {fileID: 1092312354} - {fileID: 891468915} - m_Father: {fileID: 2085905668} + m_Father: {fileID: 935483303140078260} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 155, y: -66.99603} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -69.7} m_SizeDelta: {x: 310, y: 133.99207} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2130812670 @@ -35599,232 +35726,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!222 &935483302723718512 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302723718519} - m_CullTransparentMesh: 0 ---- !u!114 &935483302723718513 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302723718519} - 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: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Gender:' ---- !u!224 &935483302723718518 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302723718519} - 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: 4 - 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: 3.5100098, y: -234.99976} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &935483302723718519 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483302723718518} - - component: {fileID: 935483302723718512} - - component: {fileID: 935483302723718513} - m_Layer: 5 - m_Name: GenderLabel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &935483302762038124 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302762038125} - 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: 935483303454972386} - 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: 15, y: 15} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &935483302762038125 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483302762038124} - - component: {fileID: 935483302762038126} - - component: {fileID: 935483302762038127} - m_Layer: 5 - m_Name: Item Checkmark - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!222 &935483302762038126 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302762038125} - m_CullTransparentMesh: 0 ---- !u!114 &935483302762038127 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302762038125} - 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: 21300000, guid: a7501a95e5706da4b8e569080b29ac47, type: 3} - 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!1 &935483302802449730 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483302802449741} - - component: {fileID: 935483302802449743} - - component: {fileID: 935483302802449740} - m_Layer: 5 - m_Name: Arrow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &935483302802449740 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302802449730} - 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!224 &935483302802449741 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302802449730} - 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: 935483304810320908} - 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!222 &935483302802449743 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302802449730} - m_CullTransparentMesh: 0 --- !u!222 &935483302804963664 CanvasRenderer: m_ObjectHideFlags: 0 @@ -36051,95 +35952,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &935483302878664592 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302878664596} - m_CullTransparentMesh: 0 ---- !u!114 &935483302878664593 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302878664596} - 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!1 &935483302878664596 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483302878664599} - - component: {fileID: 935483302878664592} - - component: {fileID: 935483302878664593} - - component: {fileID: 935483302878664598} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &935483302878664598 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302878664596} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!224 &935483302878664599 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483302878664596} - 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: 935483304263471094} - m_Father: {fileID: 935483303326700530} - 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!224 &935483302917639724 RectTransform: m_ObjectHideFlags: 0 @@ -36152,13 +35964,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 935483303140078260} - m_RootOrder: 8 + m_RootOrder: 19 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: -66.28996, y: -486.2997} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -150, y: -435} m_SizeDelta: {x: 19.951263, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!1 &935483302917639725 GameObject: m_ObjectHideFlags: 0 @@ -36351,22 +36163,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2130812669} - {fileID: 47347461} - {fileID: 899286715} - {fileID: 1136677497} - {fileID: 1169056255} - - {fileID: 935483302723718518} - - {fileID: 935483304810320908} - - {fileID: 935483304393195702} - - {fileID: 935483303887120943} - - {fileID: 935483302917639724} - - {fileID: 935483304332071718} - - {fileID: 935483303345155101} - - {fileID: 935483304128418023} - - {fileID: 935483303288600285} - {fileID: 4300837137793644386} - - {fileID: 6085830301866471447} - {fileID: 4070467796814498374} + - {fileID: 6085830301866471447} + - {fileID: 935483303288600285} - {fileID: 671921654} - {fileID: 1001419735} - {fileID: 1012383901} @@ -36375,15 +36180,19 @@ RectTransform: - {fileID: 375594581} - {fileID: 2081541321} - {fileID: 1293104866} - - {fileID: 2070462932} - - {fileID: 2061561785} + - {fileID: 935483304393195702} + - {fileID: 935483303887120943} + - {fileID: 935483302917639724} + - {fileID: 935483304332071718} + - {fileID: 935483303345155101} + - {fileID: 935483304128418023} m_Father: {fileID: 531246357} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -15} - m_SizeDelta: {x: 180, y: -110} + m_SizeDelta: {x: 310, y: -110} m_Pivot: {x: 0, y: 0.5} --- !u!1 &935483303140078261 GameObject: @@ -36398,7 +36207,7 @@ GameObject: - component: {fileID: 935483303140078263} - component: {fileID: 3804747680621674853} m_Layer: 5 - m_Name: ActorCard + m_Name: AnimDefAndActorCard m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -36530,11 +36339,11 @@ RectTransform: - {fileID: 935483304659652922} - {fileID: 935483304589176913} m_Father: {fileID: 935483303140078260} - m_RootOrder: 12 + m_RootOrder: 8 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: -5, y: -289.99976} + m_AnchoredPosition: {x: 81.741, y: -275} m_SizeDelta: {x: 150, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &935483303314225216 @@ -36615,113 +36424,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &935483303326700530 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303326700531} - 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: 935483302878664599} - - {fileID: 935483303408820693} - m_Father: {fileID: 935483304810320908} - 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!1 &935483303326700531 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483303326700530} - - component: {fileID: 935483303326700543} - - component: {fileID: 935483303326700540} - - component: {fileID: 935483303326700541} - m_Layer: 5 - m_Name: Template - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &935483303326700540 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303326700531} - 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!114 &935483303326700541 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303326700531} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 935483304263471094} - 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: 935483302878664599} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 935483303408820692} - m_HorizontalScrollbarVisibility: 0 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: 0 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!222 &935483303326700543 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303326700531} - m_CullTransparentMesh: 0 --- !u!1 &935483303345155090 GameObject: m_ObjectHideFlags: 0 @@ -36785,13 +36487,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 935483303140078260} - m_RootOrder: 10 + m_RootOrder: 21 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: 14.51001, y: -486.2997} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -65, y: -435} m_SizeDelta: {x: 17.537262, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &935483303345155103 CanvasRenderer: m_ObjectHideFlags: 0 @@ -36800,130 +36502,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 935483303345155090} m_CullTransparentMesh: 0 ---- !u!1 &935483303408820682 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483303408820693} - - component: {fileID: 935483303408820694} - - component: {fileID: 935483303408820695} - - component: {fileID: 935483303408820692} - m_Layer: 5 - m_Name: Scrollbar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &935483303408820692 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303408820682} - 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: 935483303425993482} - m_HandleRect: {fileID: 935483303425993483} - m_Direction: 2 - m_Value: 0 - m_Size: 0.2 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!224 &935483303408820693 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303408820682} - 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: 935483304253652427} - m_Father: {fileID: 935483303326700530} - 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!222 &935483303408820694 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303408820682} - m_CullTransparentMesh: 0 ---- !u!114 &935483303408820695 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303408820682} - 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!224 &935483303425689024 RectTransform: m_ObjectHideFlags: 0 @@ -37031,166 +36609,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 935483303425689025} m_CullTransparentMesh: 0 ---- !u!1 &935483303425993480 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483303425993483} - - component: {fileID: 935483303425993493} - - component: {fileID: 935483303425993482} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &935483303425993482 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303425993480} - 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!224 &935483303425993483 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303425993480} - 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: 935483304253652427} - 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!222 &935483303425993493 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303425993480} - m_CullTransparentMesh: 0 ---- !u!224 &935483303454972386 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303454972387} - 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: 935483304441793174} - - {fileID: 935483302762038124} - - {fileID: 935483304481796590} - m_Father: {fileID: 935483304263471094} - 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!1 &935483303454972387 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483303454972386} - - component: {fileID: 935483303454972397} - m_Layer: 5 - m_Name: Item - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &935483303454972397 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483303454972387} - 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: 935483304441793169} - toggleTransition: 1 - graphic: {fileID: 935483302762038127} - m_Group: {fileID: 0} - onValueChanged: - m_PersistentCalls: - m_Calls: [] - m_IsOn: 1 --- !u!224 &935483303688936898 RectTransform: m_ObjectHideFlags: 0 @@ -37409,13 +36827,13 @@ RectTransform: - {fileID: 935483304684194972} - {fileID: 935483303425689024} m_Father: {fileID: 935483303140078260} - m_RootOrder: 7 + m_RootOrder: 18 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.4899902, y: -454.99976} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -435} + m_SizeDelta: {x: 120, y: 30} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &935483303909693488 MonoBehaviour: m_ObjectHideFlags: 0 @@ -37776,13 +37194,13 @@ RectTransform: m_Children: - {fileID: 935483302828269144} m_Father: {fileID: 935483303140078260} - m_RootOrder: 11 + m_RootOrder: 22 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: 48.51001, y: -484.99976} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -8.3498535, y: -435} m_SizeDelta: {x: 60, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!1 &935483304221730466 GameObject: m_ObjectHideFlags: 0 @@ -37819,78 +37237,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &935483304253652424 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483304253652427} - 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 &935483304253652427 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304253652424} - 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: 935483303425993483} - m_Father: {fileID: 935483303408820693} - 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!224 &935483304263471094 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304263471095} - 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: 935483303454972386} - m_Father: {fileID: 935483302878664599} - 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 &935483304263471095 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483304263471094} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!114 &935483304332071712 MonoBehaviour: m_ObjectHideFlags: 0 @@ -38016,13 +37362,13 @@ RectTransform: m_Children: - {fileID: 935483304430676515} m_Father: {fileID: 935483303140078260} - m_RootOrder: 9 + m_RootOrder: 20 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: -31.48999, y: -484.99976} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -94, y: -435} m_SizeDelta: {x: 60, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!1 &935483304332071719 GameObject: m_ObjectHideFlags: 0 @@ -38159,10 +37505,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 13 + m_FontSize: 14 m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -38183,11 +37529,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 935483303140078260} - m_RootOrder: 6 + m_RootOrder: 17 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: -424.99976} + m_AnchoredPosition: {x: 1.7409973, y: -405} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &935483304393195703 @@ -38286,236 +37632,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 935483304430676512} m_CullTransparentMesh: 0 ---- !u!222 &935483304441793168 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304441793175} - m_CullTransparentMesh: 0 ---- !u!114 &935483304441793169 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304441793175} - 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!224 &935483304441793174 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304441793175} - 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: 935483303454972386} - 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!1 &935483304441793175 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483304441793174} - - component: {fileID: 935483304441793168} - - component: {fileID: 935483304441793169} - m_Layer: 5 - m_Name: Item Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!222 &935483304443169129 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304443169132} - m_CullTransparentMesh: 0 ---- !u!1 &935483304443169132 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483304443169135} - - component: {fileID: 935483304443169129} - - component: {fileID: 935483304443169134} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &935483304443169134 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304443169132} - 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: Any gender ---- !u!224 &935483304443169135 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304443169132} - 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: 935483304810320908} - 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!222 &935483304481796584 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304481796591} - m_CullTransparentMesh: 0 ---- !u!114 &935483304481796585 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304481796591} - 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!224 &935483304481796590 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304481796591} - 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: 935483303454972386} - 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!1 &935483304481796591 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483304481796590} - - component: {fileID: 935483304481796584} - - component: {fileID: 935483304481796585} - m_Layer: 5 - m_Name: Item Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!114 &935483304589176912 MonoBehaviour: m_ObjectHideFlags: 0 @@ -38548,7 +37664,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Is the initiator + m_Text: Is initiator of sex --- !u!224 &935483304589176913 RectTransform: m_ObjectHideFlags: 0 @@ -38832,153 +37948,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &935483304810320905 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304810320909} - m_CullTransparentMesh: 0 ---- !u!224 &935483304810320908 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304810320909} - 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: 935483304443169135} - - {fileID: 935483302802449741} - - {fileID: 935483303326700530} - m_Father: {fileID: 935483303140078260} - m_RootOrder: 5 - 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: 33.51001, y: -234.99976} - m_SizeDelta: {x: 90, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &935483304810320909 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 935483304810320908} - - component: {fileID: 935483304810320905} - - component: {fileID: 935483304810320910} - - component: {fileID: 935483304810320911} - m_Layer: 5 - m_Name: GenderDropdown - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &935483304810320910 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304810320909} - 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!114 &935483304810320911 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 935483304810320909} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 0 - 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: 935483304810320910} - m_Template: {fileID: 935483303326700530} - m_CaptionText: {fileID: 935483304443169134} - m_CaptionImage: {fileID: 0} - m_ItemText: {fileID: 935483304481796585} - m_ItemImage: {fileID: 0} - m_Value: 1 - m_Options: - m_Options: - - m_Text: Female - m_Image: {fileID: 0} - - m_Text: Any gender - m_Image: {fileID: 0} - - m_Text: Male - m_Image: {fileID: 0} - m_OnValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 3804747680621674853} - m_MethodName: OnValueChanged - 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!224 &1453461556519350520 RectTransform: m_ObjectHideFlags: 0 @@ -39478,7 +38447,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9731614c7527b624492dd33f9b006fcb, type: 3} m_Name: m_EditorClassIdentifier: - genderDropdown: {fileID: 935483304810320911} bodyTypeDropdown: {fileID: 935483303887120942} bodyOffsetXField: {fileID: 935483304332071713} bodyOffsetZField: {fileID: 935483304128418022} @@ -39499,13 +38467,13 @@ RectTransform: m_Children: - {fileID: 5155145354840193887} m_Father: {fileID: 935483303140078260} - m_RootOrder: 15 + m_RootOrder: 6 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.4899902, y: -174.99976} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -9, y: -245} + m_SizeDelta: {x: 145, y: 30} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &4220699018471944123 CanvasRenderer: m_ObjectHideFlags: 0 @@ -39546,13 +38514,13 @@ RectTransform: m_Children: - {fileID: 1453461556519350520} m_Father: {fileID: 935483303140078260} - m_RootOrder: 13 + m_RootOrder: 5 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.4899902, y: -144.99976} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 11, y: -245} + m_SizeDelta: {x: 145, y: 30} + m_Pivot: {x: 0, y: 0.5} --- !u!1 &4446261852394827046 GameObject: m_ObjectHideFlags: 0 @@ -39828,13 +38796,13 @@ RectTransform: m_Children: - {fileID: 7357923201829463118} m_Father: {fileID: 935483303140078260} - m_RootOrder: 14 + m_RootOrder: 7 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.4899902, y: -204.99976} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 11, y: -275} + m_SizeDelta: {x: 145, y: 30} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &6164565606941102640 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ButtonWithKeyCode.cs b/Assets/Scripts/AnimationComponents/ButtonWithKeyCode.cs similarity index 100% rename from Assets/Scripts/ButtonWithKeyCode.cs rename to Assets/Scripts/AnimationComponents/ButtonWithKeyCode.cs diff --git a/Assets/Scripts/ButtonWithKeyCode.cs.meta b/Assets/Scripts/AnimationComponents/ButtonWithKeyCode.cs.meta similarity index 100% rename from Assets/Scripts/ButtonWithKeyCode.cs.meta rename to Assets/Scripts/AnimationComponents/ButtonWithKeyCode.cs.meta diff --git a/Assets/Scripts/Chaser.cs b/Assets/Scripts/AnimationComponents/Chaser.cs similarity index 100% rename from Assets/Scripts/Chaser.cs rename to Assets/Scripts/AnimationComponents/Chaser.cs diff --git a/Assets/Scripts/Chaser.cs.meta b/Assets/Scripts/AnimationComponents/Chaser.cs.meta similarity index 100% rename from Assets/Scripts/Chaser.cs.meta rename to Assets/Scripts/AnimationComponents/Chaser.cs.meta diff --git a/Assets/Scripts/GUI/ActorCard.cs b/Assets/Scripts/GUI/ActorCard.cs index b2c01f41..e8d428f2 100644 --- a/Assets/Scripts/GUI/ActorCard.cs +++ b/Assets/Scripts/GUI/ActorCard.cs @@ -8,7 +8,7 @@ namespace RimWorldAnimationStudio { public class ActorCard : MonoBehaviour { - public Dropdown genderDropdown; + //public Dropdown genderDropdown; public Dropdown bodyTypeDropdown; public InputField bodyOffsetXField; public InputField bodyOffsetZField; @@ -58,12 +58,12 @@ namespace RimWorldAnimationStudio actor.initiator = initiatorToggle.isOn; - switch (genderDropdown.value) - { - case 0: actor.requiredGender = new List() { "Female" }; break; - case 2: actor.requiredGender = new List() { "Male" }; break; - default: actor.requiredGender = null; break; - } + //switch (genderDropdown.value) + //{ + // case 0: actor.requiredGender = new List() { "Female" }; break; + // case 2: actor.requiredGender = new List() { "Male" }; break; + // default: actor.requiredGender = null; break; + //} float.TryParse(raceOffsetXField.text, out x); float.TryParse(raceOffsetZField.text, out z); @@ -116,14 +116,14 @@ namespace RimWorldAnimationStudio initiatorToggle.isOn = actor.initiator; - if (actor.requiredGender.NotNullOrEmpty() && actor.requiredGender.Contains("Female")) - { genderDropdown.SetValueWithoutNotify(0); } + //if (actor.requiredGender.NotNullOrEmpty() && actor.requiredGender.Contains("Female")) + //{ genderDropdown.SetValueWithoutNotify(0); } - else if (actor.requiredGender.NotNullOrEmpty() && actor.requiredGender.Contains("Male")) - { genderDropdown.SetValueWithoutNotify(2); } + //else if (actor.requiredGender.NotNullOrEmpty() && actor.requiredGender.Contains("Male")) + //{ genderDropdown.SetValueWithoutNotify(2); } - else - { genderDropdown.SetValueWithoutNotify(1); } + //else + //{ genderDropdown.SetValueWithoutNotify(1); } for (int i = 0; i < selectActorLayerDropdown.options.Count; i++) { diff --git a/Assets/Scripts/ActorManipulator.cs b/Assets/Scripts/GUI/ActorManipulator.cs similarity index 100% rename from Assets/Scripts/ActorManipulator.cs rename to Assets/Scripts/GUI/ActorManipulator.cs diff --git a/Assets/Scripts/ActorManipulator.cs.meta b/Assets/Scripts/GUI/ActorManipulator.cs.meta similarity index 100% rename from Assets/Scripts/ActorManipulator.cs.meta rename to Assets/Scripts/GUI/ActorManipulator.cs.meta diff --git a/Assets/Scripts/DropdownMenu.cs b/Assets/Scripts/GUI/DropdownMenu.cs similarity index 65% rename from Assets/Scripts/DropdownMenu.cs rename to Assets/Scripts/GUI/DropdownMenu.cs index e949a42f..55d44eb7 100644 --- a/Assets/Scripts/DropdownMenu.cs +++ b/Assets/Scripts/GUI/DropdownMenu.cs @@ -21,6 +21,17 @@ namespace RimWorldAnimationStudio public void CloseMenu() { + if (EventSystem.current.currentSelectedGameObject != null) + { + Transform child = transform.FindDeepChild(EventSystem.current.currentSelectedGameObject.name); + + if (child != null) + { + EventSystem.current.SetSelectedGameObject(this.gameObject); + return; + } + } + dropdownMenu.gameObject.SetActive(false); } diff --git a/Assets/Scripts/DropdownMenu.cs.meta b/Assets/Scripts/GUI/DropdownMenu.cs.meta similarity index 100% rename from Assets/Scripts/DropdownMenu.cs.meta rename to Assets/Scripts/GUI/DropdownMenu.cs.meta diff --git a/Assets/Scripts/RequiresAnimationDef.cs b/Assets/Scripts/GUI/RequiresAnimationDef.cs similarity index 100% rename from Assets/Scripts/RequiresAnimationDef.cs rename to Assets/Scripts/GUI/RequiresAnimationDef.cs diff --git a/Assets/Scripts/RequiresAnimationDef.cs.meta b/Assets/Scripts/GUI/RequiresAnimationDef.cs.meta similarity index 100% rename from Assets/Scripts/RequiresAnimationDef.cs.meta rename to Assets/Scripts/GUI/RequiresAnimationDef.cs.meta diff --git a/Assets/Scripts/SnapToKeyframe.cs b/Assets/Scripts/GUI/SnapToKeyframe.cs similarity index 100% rename from Assets/Scripts/SnapToKeyframe.cs rename to Assets/Scripts/GUI/SnapToKeyframe.cs diff --git a/Assets/Scripts/SnapToKeyframe.cs.meta b/Assets/Scripts/GUI/SnapToKeyframe.cs.meta similarity index 100% rename from Assets/Scripts/SnapToKeyframe.cs.meta rename to Assets/Scripts/GUI/SnapToKeyframe.cs.meta diff --git a/Assets/Scripts/Tooltip.cs b/Assets/Scripts/GUI/Tooltip.cs similarity index 100% rename from Assets/Scripts/Tooltip.cs rename to Assets/Scripts/GUI/Tooltip.cs diff --git a/Assets/Scripts/Tooltip.cs.meta b/Assets/Scripts/GUI/Tooltip.cs.meta similarity index 100% rename from Assets/Scripts/Tooltip.cs.meta rename to Assets/Scripts/GUI/Tooltip.cs.meta diff --git a/Assets/Scripts/Graphics.meta b/Assets/Scripts/Graphics.meta new file mode 100644 index 00000000..2b0fb892 --- /dev/null +++ b/Assets/Scripts/Graphics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ccde298059e1b04cb377c332260a2a5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DirectionalGraphic.cs b/Assets/Scripts/Graphics/DirectionalGraphic.cs similarity index 100% rename from Assets/Scripts/DirectionalGraphic.cs rename to Assets/Scripts/Graphics/DirectionalGraphic.cs diff --git a/Assets/Scripts/DirectionalGraphic.cs.meta b/Assets/Scripts/Graphics/DirectionalGraphic.cs.meta similarity index 100% rename from Assets/Scripts/DirectionalGraphic.cs.meta rename to Assets/Scripts/Graphics/DirectionalGraphic.cs.meta diff --git a/Assets/Scripts/MultiDirectionalGraphic.cs b/Assets/Scripts/Graphics/MultiDirectionalGraphic.cs similarity index 100% rename from Assets/Scripts/MultiDirectionalGraphic.cs rename to Assets/Scripts/Graphics/MultiDirectionalGraphic.cs diff --git a/Assets/Scripts/MultiDirectionalGraphic.cs.meta b/Assets/Scripts/Graphics/MultiDirectionalGraphic.cs.meta similarity index 100% rename from Assets/Scripts/MultiDirectionalGraphic.cs.meta rename to Assets/Scripts/Graphics/MultiDirectionalGraphic.cs.meta diff --git a/Assets/Scripts/Keybinds.meta b/Assets/Scripts/Keybinds.meta new file mode 100644 index 00000000..db34e1b2 --- /dev/null +++ b/Assets/Scripts/Keybinds.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64cb267b2695e8a4e84ae6a89b852632 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Keybind.cs b/Assets/Scripts/Keybinds/Keybind.cs similarity index 100% rename from Assets/Scripts/Keybind.cs rename to Assets/Scripts/Keybinds/Keybind.cs diff --git a/Assets/Scripts/Keybind.cs.meta b/Assets/Scripts/Keybinds/Keybind.cs.meta similarity index 100% rename from Assets/Scripts/Keybind.cs.meta rename to Assets/Scripts/Keybinds/Keybind.cs.meta diff --git a/Assets/Scripts/KeybindConfig.cs b/Assets/Scripts/Keybinds/KeybindConfig.cs similarity index 100% rename from Assets/Scripts/KeybindConfig.cs rename to Assets/Scripts/Keybinds/KeybindConfig.cs diff --git a/Assets/Scripts/KeybindConfig.cs.meta b/Assets/Scripts/Keybinds/KeybindConfig.cs.meta similarity index 100% rename from Assets/Scripts/KeybindConfig.cs.meta rename to Assets/Scripts/Keybinds/KeybindConfig.cs.meta diff --git a/Assets/Scripts/Managers/CameraController.cs b/Assets/Scripts/Managers/CameraController.cs index 0be106ff..1f71af20 100644 --- a/Assets/Scripts/Managers/CameraController.cs +++ b/Assets/Scripts/Managers/CameraController.cs @@ -71,7 +71,7 @@ namespace RimWorldAnimationStudio public void ResetCamera() { - cam.transform.position = new Vector3(1, 0, -10); + cam.transform.position = new Vector3(0, 0, -10); curZoom = zoom; mouseDragActive = false; diff --git a/Assets/Scripts/Managers/InputManager.cs b/Assets/Scripts/Managers/InputManager.cs index 8914616a..a1bc0e8e 100644 --- a/Assets/Scripts/Managers/InputManager.cs +++ b/Assets/Scripts/Managers/InputManager.cs @@ -57,7 +57,7 @@ namespace RimWorldAnimationStudio public void Update() { if (IsDialogBoxIsActive()) return; - if (EventSystem.current.currentSelectedGameObject?.GetComponent()?.isFocused == true) return; + if (EventSystem.current.currentSelectedGameObject != null && EventSystem.current.currentSelectedGameObject.GetComponent()?.isFocused == true) return; bool canRepeatThisUpdate = CanRepeatThisUpdate(); // Check keybinds diff --git a/Assets/Scripts/Strings.meta b/Assets/Scripts/Strings.meta new file mode 100644 index 00000000..df259cec --- /dev/null +++ b/Assets/Scripts/Strings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0bce7b60b8a9f07459340a5c89f01995 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/NumberValidator.cs b/Assets/Scripts/Strings/NumberValidator.cs similarity index 100% rename from Assets/Scripts/NumberValidator.cs rename to Assets/Scripts/Strings/NumberValidator.cs diff --git a/Assets/Scripts/NumberValidator.cs.meta b/Assets/Scripts/Strings/NumberValidator.cs.meta similarity index 100% rename from Assets/Scripts/NumberValidator.cs.meta rename to Assets/Scripts/Strings/NumberValidator.cs.meta diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index 4cddf42a..f7e88b2d 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 78547310..be07d227 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 248dfc32..3f8ffd9a 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 072b6c7d..e8d032a8 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 c19f651c..53a8ecd2 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 2119d502..cc9f1207 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 7aa4815d..bf8eeeb4 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 de4d4cc9..a00f5a1f 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 5a3b423f..2137d44c 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 2822c86f..f66508d7 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 0c45cc37..bcd03fc8 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 7d255f19..e52dc2dc 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 eb16d4b5..69b44deb 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 b3cd8404..f369e13f 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/level0 and b/Build/RimWorld-Animation-Studio_Data/level0 differ diff --git a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets index 92d6f46b..74899ed8 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets and b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets differ diff --git a/Library/ArtifactDB b/Library/ArtifactDB index b4235b48..09cd931e 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/12/12addefdaca15ff7b10b72b5ee132877 b/Library/Artifacts/12/12addefdaca15ff7b10b72b5ee132877 deleted file mode 100644 index 31dd8cd1..00000000 Binary files a/Library/Artifacts/12/12addefdaca15ff7b10b72b5ee132877 and /dev/null differ diff --git a/Library/Artifacts/1f/1f78b251201cebbaa2d16f722a54df73 b/Library/Artifacts/1f/1f78b251201cebbaa2d16f722a54df73 new file mode 100644 index 00000000..519adb20 Binary files /dev/null and b/Library/Artifacts/1f/1f78b251201cebbaa2d16f722a54df73 differ diff --git a/Library/Artifacts/11/11b43cee23a98cf3f78ac4475c34e36d b/Library/Artifacts/34/34d0473e47a4313b79cd131ada10e103 similarity index 98% rename from Library/Artifacts/11/11b43cee23a98cf3f78ac4475c34e36d rename to Library/Artifacts/34/34d0473e47a4313b79cd131ada10e103 index 77dacf39..473532b5 100644 Binary files a/Library/Artifacts/11/11b43cee23a98cf3f78ac4475c34e36d and b/Library/Artifacts/34/34d0473e47a4313b79cd131ada10e103 differ diff --git a/Library/Artifacts/3e/3e8bc4205694114b6d5555460c2390a6 b/Library/Artifacts/56/56377868ca81e67a6dee55b0c46f2f06 similarity index 99% rename from Library/Artifacts/3e/3e8bc4205694114b6d5555460c2390a6 rename to Library/Artifacts/56/56377868ca81e67a6dee55b0c46f2f06 index e3f19a20..6ea7ba2c 100644 Binary files a/Library/Artifacts/3e/3e8bc4205694114b6d5555460c2390a6 and b/Library/Artifacts/56/56377868ca81e67a6dee55b0c46f2f06 differ diff --git a/Library/Artifacts/93/9357ab657d7c1828a218220b61716a0c b/Library/Artifacts/93/9357ab657d7c1828a218220b61716a0c new file mode 100644 index 00000000..05cba104 Binary files /dev/null and b/Library/Artifacts/93/9357ab657d7c1828a218220b61716a0c differ diff --git a/Library/Artifacts/02/02fd097c22712033223733e7f18433bd b/Library/Artifacts/98/98d92dc0bb0fc48944f1896f352a72df similarity index 80% rename from Library/Artifacts/02/02fd097c22712033223733e7f18433bd rename to Library/Artifacts/98/98d92dc0bb0fc48944f1896f352a72df index 38037bb0..e7a5fcfb 100644 Binary files a/Library/Artifacts/02/02fd097c22712033223733e7f18433bd and b/Library/Artifacts/98/98d92dc0bb0fc48944f1896f352a72df differ diff --git a/Library/Artifacts/9f/9f7d86ddcb6e82e0963946102d9cf72d b/Library/Artifacts/9f/9f7d86ddcb6e82e0963946102d9cf72d new file mode 100644 index 00000000..7c1bd787 Binary files /dev/null and b/Library/Artifacts/9f/9f7d86ddcb6e82e0963946102d9cf72d differ diff --git a/Library/Artifacts/e9/e935b6b3405c2c82773ee10f3092f1b5 b/Library/Artifacts/ad/ad4dec64255e3e80220b8f480a5724a2 similarity index 89% rename from Library/Artifacts/e9/e935b6b3405c2c82773ee10f3092f1b5 rename to Library/Artifacts/ad/ad4dec64255e3e80220b8f480a5724a2 index 973df976..7e9443c8 100644 Binary files a/Library/Artifacts/e9/e935b6b3405c2c82773ee10f3092f1b5 and b/Library/Artifacts/ad/ad4dec64255e3e80220b8f480a5724a2 differ diff --git a/Library/Artifacts/d9/d90ea51ada3e42889b9f61dcc7995348 b/Library/Artifacts/bb/bbb17d0996be86e222367470c41ea93f similarity index 98% rename from Library/Artifacts/d9/d90ea51ada3e42889b9f61dcc7995348 rename to Library/Artifacts/bb/bbb17d0996be86e222367470c41ea93f index 48a8d566..f51bd3fe 100644 Binary files a/Library/Artifacts/d9/d90ea51ada3e42889b9f61dcc7995348 and b/Library/Artifacts/bb/bbb17d0996be86e222367470c41ea93f differ diff --git a/Library/Artifacts/48/48d16e8c08c8744b8282f2b1989ba5c3 b/Library/Artifacts/cc/cc52c91be3d3b830fbbb2e991abb85f2 similarity index 69% rename from Library/Artifacts/48/48d16e8c08c8744b8282f2b1989ba5c3 rename to Library/Artifacts/cc/cc52c91be3d3b830fbbb2e991abb85f2 index a3ffd582..e7dad4ce 100644 Binary files a/Library/Artifacts/48/48d16e8c08c8744b8282f2b1989ba5c3 and b/Library/Artifacts/cc/cc52c91be3d3b830fbbb2e991abb85f2 differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index c727f386..f9d1a6df 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 392} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -46,7 +46,7 @@ MonoBehaviour: y: 0 width: 1920 height: 997 - m_MinSize: {x: 875, y: 392} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &3 MonoBehaviour: @@ -112,10 +112,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 677, y: 342} - m_MaxSize: {x: 12002, y: 8042} + m_MinSize: {x: 678, y: 492} + m_MaxSize: {x: 14002, y: 14042} vertical: 0 - controlID: 271 + controlID: 41 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -137,10 +137,10 @@ MonoBehaviour: y: 0 width: 1414 height: 947 - m_MinSize: {x: 402, y: 342} - m_MaxSize: {x: 8002, y: 8042} + m_MinSize: {x: 402, y: 492} + m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 272 + controlID: 42 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,7 +165,7 @@ MonoBehaviour: m_MinSize: {x: 402, y: 221} m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 273 + controlID: 43 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -231,7 +231,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -240,15 +240,15 @@ MonoBehaviour: y: 671 width: 1414 height: 276 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} - {fileID: 18} - {fileID: 19} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -324,10 +324,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -453.5 - m_VBaseRangeMax: 453.5 + m_HBaseRangeMin: -537.5 + m_HBaseRangeMax: 537.5 + m_VBaseRangeMin: -325 + m_VBaseRangeMax: 325 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -344,24 +344,24 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 21 - width: 1920 - height: 907 + y: 0 + width: 1075 + height: 650 m_Scale: {x: 1, y: 1} - m_Translation: {x: 960, y: 453.5} + m_Translation: {x: 537.5, y: 325} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -960 - y: -453.5 - width: 1920 - height: 907 + x: -537.5 + y: -325 + width: 1075 + height: 650 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1920, y: 928} + m_LastWindowPixelSize: {x: 1075, y: 650} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -398,7 +398,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: d2efffffe6efffff86f0ffff62fbffff + m_ExpandedIDs: 0ef6ffff22f6ffffc2f6ffff62fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -458,9 +458,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 655.9438, y: 467.4639, z: 12.5} + m_Target: {x: 441.49475, y: 308.12756, z: -55.76247} speed: 2 - m_Value: {x: 655.9438, y: 467.4639, z: 12.5} + m_Value: {x: 441.49475, y: 308.12756, z: -55.76247} 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: 550.26544 + m_Target: 468.04825 speed: 2 - m_Value: 550.26544 + m_Value: 468.04825 m_Ortho: m_Target: 1 speed: 2 @@ -1104,20 +1104,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Prefabs + - Assets/Resources/Textures/Props m_ViewMode: 1 m_StartGridSize: 67 m_LastFolders: - - Assets/Resources/Prefabs + - 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: 41} - m_SelectedIDs: 4c4c0000 - m_LastClickedID: 19532 - m_ExpandedIDs: 00000000144c0000164c0000184c00001a4c00001c4c00001e4c0000204c0000 + m_SelectedIDs: e24b0000 + m_LastClickedID: 19426 + m_ExpandedIDs: 00000000b44b0000b64b0000b84b0000ba4b0000bc4b0000be4b0000c04b0000d84b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000144c0000164c0000184c00001a4c00001c4c00001e4c0000204c0000 + m_ExpandedIDs: 00000000b44b0000b64b0000b84b0000ba4b0000bc4b0000be4b0000c04b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1170,8 +1170,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: ac6c0100 - m_LastClickedInstanceID: 93356 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e9800000249000086980000000000007a140100 m_RenameOverlay: @@ -1197,7 +1197,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 5} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 67 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 379 diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index 1ad3dbcc..bdcfc9b1 100644 --- a/Library/CurrentMaximizeLayout.dwlt +++ b/Library/CurrentMaximizeLayout.dwlt @@ -21,10 +21,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 677, y: 342} - m_MaxSize: {x: 12002, y: 8042} + m_MinSize: {x: 678, y: 492} + m_MaxSize: {x: 14002, y: 14042} vertical: 0 - controlID: 125 + controlID: 34952 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,10 +138,10 @@ MonoBehaviour: y: 0 width: 1414 height: 947 - m_MinSize: {x: 402, y: 342} - m_MaxSize: {x: 8002, y: 8042} + m_MinSize: {x: 402, y: 492} + m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 88 + controlID: 34953 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 402, y: 221} m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 64 + controlID: 34954 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -186,8 +186,8 @@ MonoBehaviour: y: 0 width: 337 height: 671 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -224,7 +224,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 62fbffff + m_ExpandedIDs: 1aa2ffff6af9ffff62fbffffcc3a0000d63a0000083b0000f23b0000143d00003a3d0000663d0000f03d0000123e0000544000005e400000c4410000184200003c460000504700006c47000088470000c6470000e2470000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -313,9 +313,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 655.9438, y: 467.4639, z: 12.5} + m_Target: {x: 441.49475, y: 308.12756, z: -55.76247} speed: 2 - m_Value: {x: 655.9438, y: 467.4639, z: 12.5} + m_Value: {x: 441.49475, y: 308.12756, z: -55.76247} 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: 550.26544 + m_Target: 468.04825 speed: 2 - m_Value: 550.26544 + m_Value: 468.04825 m_Ortho: m_Target: 1 speed: 2 @@ -930,7 +930,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -939,15 +939,15 @@ MonoBehaviour: y: 671 width: 1414 height: 276 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} - {fileID: 13} - {fileID: 14} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -987,20 +987,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Prefabs + - Assets/Resources/Textures/Props m_ViewMode: 1 m_StartGridSize: 67 m_LastFolders: - - Assets/Resources/Prefabs + - 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: 41} - m_SelectedIDs: 4c4c0000 - m_LastClickedID: 19532 - m_ExpandedIDs: 00000000144c0000164c0000184c00001a4c00001c4c00001e4c0000204c0000 + m_SelectedIDs: 62470100 + m_LastClickedID: 83810 + m_ExpandedIDs: 00000000144c0000164c0000184c00001a4c00001c4c00001e4c0000204c00003c47010000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000144c0000164c0000184c00001a4c00001c4c00001e4c0000204c0000 + m_ExpandedIDs: 00000000144c0000164c0000184c00001a4c00001c4c00001e4c0000204c000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1053,8 +1053,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: ac6c0100 - m_LastClickedInstanceID: 93356 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e9800000249000086980000000000007a140100 m_RenameOverlay: @@ -1080,7 +1080,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 5} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 67 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 379 @@ -1160,8 +1160,8 @@ MonoBehaviour: y: 0 width: 506 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset index 7d776e2d..bb510230 100644 Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index 023e6633..aeced68a 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 4cddf42a..f7e88b2d 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 78547310..be07d227 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 248dfc32..3f8ffd9a 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 072b6c7d..e8d032a8 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 c19f651c..53a8ecd2 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 2119d502..cc9f1207 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 7aa4815d..bf8eeeb4 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 de4d4cc9..a00f5a1f 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 5a3b423f..2137d44c 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 2822c86f..f66508d7 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 0c45cc37..bcd03fc8 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 7d255f19..e52dc2dc 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 eb16d4b5..69b44deb 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 b3cd8404..f369e13f 100644 Binary files a/Library/PlayerDataCache/Win/Data/level0 and b/Library/PlayerDataCache/Win/Data/level0 differ diff --git a/Library/PlayerDataCache/Win/Data/sharedassets0.assets b/Library/PlayerDataCache/Win/Data/sharedassets0.assets index 92d6f46b..74899ed8 100644 Binary files a/Library/PlayerDataCache/Win/Data/sharedassets0.assets and b/Library/PlayerDataCache/Win/Data/sharedassets0.assets differ diff --git a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml index 1eb8b949..b67aa84e 100644 --- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -794,7 +794,7 @@ ScriptsOnlyBuild: className: AudioTrack - hash: serializedVersion: 2 - Hash: 15aa81e28766f9f5cc91cb80cfb7e0d6 + Hash: 2244d80d1ef6f91cef63f050c57c3ca9 assemblyName: Assembly-CSharp.dll namespaceName: RimWorldAnimationStudio className: ActorCard diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 7763b978..b95d77b3 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 bff9ade2..b5206af3 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 9b48901b..d8fedfea 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 56920cad..80fb0077 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 29043444..bc77b084 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":655.9437866210938,"y":467.4638977050781,"z":12.5},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":550.2654418945313,"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":441.4947509765625,"y":308.1275634765625,"z":-55.76247024536133},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":468.0482482910156,"orthographic":true} \ No newline at end of file diff --git a/Library/shadercompiler-UnityShaderCompiler.exe4.log b/Library/shadercompiler-UnityShaderCompiler.exe4.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe4.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe4.log @@ -1,4 +1,2 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler - -Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe5.log b/Library/shadercompiler-UnityShaderCompiler.exe5.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe5.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe5.log @@ -1,4 +1,2 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler - -Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe7.log b/Library/shadercompiler-UnityShaderCompiler.exe7.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe7.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe7.log @@ -1,4 +1,2 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler - -Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe8.log b/Library/shadercompiler-UnityShaderCompiler.exe8.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe8.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe8.log @@ -1,4 +1,2 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler - -Quitting shader compiler process diff --git a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache index 650ea8c5..657e19fa 100644 Binary files a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache differ