diff --git a/Assets/Resources/Games/lockstep.prefab b/Assets/Resources/Games/lockstep.prefab index 0d383b0e..110694c2 100644 --- a/Assets/Resources/Games/lockstep.prefab +++ b/Assets/Resources/Games/lockstep.prefab @@ -103,7 +103,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5822623106182197534} - m_RootOrder: 27 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &4375666065977025420 Camera: @@ -148,6 +148,90 @@ Camera: m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &1062481741219987324 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 668724129055865293} + - component: {fileID: 2221099543016921213} + m_Layer: 11 + m_Name: R3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &668724129055865293 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1062481741219987324} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.375, y: -3.48, z: 0} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5822623106182197534} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2221099543016921213 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1062481741219987324} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 471c4a2ed0684d24d9abb5c5aeffc0c4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: -6366962435105001689, guid: 927be5fac4a997244b6201c857fd91a5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 100, y: 5.5} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1116127266977386569 GameObject: m_ObjectHideFlags: 0 @@ -335,7 +419,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5822623106182197534} - m_RootOrder: 22 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4532798257539804896 SpriteRenderer: @@ -418,7 +502,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5822623106182197534} - m_RootOrder: 26 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2248617818051995982 GameObject: @@ -515,7 +599,7 @@ GameObject: - component: {fileID: 3934319583520123542} - component: {fileID: 8050626680266531175} - component: {fileID: 3631086194869090727} - m_Layer: 11 + m_Layer: 15 m_Name: OverPlayer m_TagString: Untagged m_Icon: {fileID: 0} @@ -557,7 +641,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 471c4a2ed0684d24d9abb5c5aeffc0c4, type: 2} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -808,7 +892,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5822623106182197534} - m_RootOrder: 25 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1533188956834819093 SpriteRenderer: @@ -938,6 +1022,7 @@ MonoBehaviour: - {fileID: 4209238681665287308} - {fileID: 8099115411269024535} - {fileID: 1030508991832533071} + - {fileID: 2221099543016921213} - {fileID: 6592758210475429824} - {fileID: 3605157125876727930} - {fileID: 8945482826445941702} @@ -1341,7 +1426,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 471c4a2ed0684d24d9abb5c5aeffc0c4, type: 2} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1592,7 +1677,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5822623106182197534} - m_RootOrder: 21 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3605157125876727930 SpriteRenderer: @@ -1699,7 +1784,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 471c4a2ed0684d24d9abb5c5aeffc0c4, type: 2} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1782,7 +1867,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5822623106182197534} - m_RootOrder: 28 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &5999766133995784627 Camera: @@ -2056,7 +2141,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5822623106182197534} - m_RootOrder: 23 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3262450115413950937 SpriteRenderer: @@ -2496,7 +2581,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5822623106182197534} - m_RootOrder: 24 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8945482826445941702 SpriteRenderer: @@ -2664,7 +2749,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5822623106182197534} - m_RootOrder: 29 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &1430771648366705456 Camera: @@ -2926,6 +3011,7 @@ Transform: - {fileID: 4281713574544881382} - {fileID: 6032092358538231119} - {fileID: 285201578801513332} + - {fileID: 668724129055865293} - {fileID: 8960539057473647192} - {fileID: 1697154566264949540} - {fileID: 3402850656474589604} @@ -3053,7 +3139,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5822623106182197534} - m_RootOrder: 20 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6592758210475429824 SpriteRenderer: diff --git a/Assets/Resources/Games/marchingOrders.prefab b/Assets/Resources/Games/marchingOrders.prefab index 6948e0f2..de7fdb07 100644 --- a/Assets/Resources/Games/marchingOrders.prefab +++ b/Assets/Resources/Games/marchingOrders.prefab @@ -27,6 +27,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.71, y: -3.373, z: 0} m_LocalScale: {x: 2.082, y: 2.082, z: 2.09291} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1558448215581441312} m_RootOrder: 2 @@ -42,6 +43,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -109,6 +111,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -2.325, z: 0} m_LocalScale: {x: 1.04, y: 1.04, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 708937727427539446} m_RootOrder: 2 @@ -124,6 +127,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -191,6 +195,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.659, y: -3.2057, z: 0} m_LocalScale: {x: 2.082, y: 2.082, z: 2.09291} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1558448215581441312} m_RootOrder: 1 @@ -206,6 +211,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -273,6 +279,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.02, y: -0.513, z: 0} m_LocalScale: {x: -1.04, y: 1.04, z: 1.0439054} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 708937727427539446} m_RootOrder: 0 @@ -288,6 +295,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -355,6 +363,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6576414245721136236} - {fileID: 984938186019639657} @@ -372,6 +381,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -421,7 +431,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1558448215581441312} - - component: {fileID: 4986707985294744365} m_Layer: 0 m_Name: BG m_TagString: Untagged @@ -439,6 +448,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7150405460527854978} - {fileID: 1361520185717226678} @@ -448,57 +458,6 @@ Transform: m_Father: {fileID: 4161079182365989534} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4986707985294744365 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4721136555746708586} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 394eab447e3d92140be461519b267611, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &4826819211563721063 GameObject: m_ObjectHideFlags: 0 @@ -526,6 +485,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.12, y: 0, z: 0} m_LocalScale: {x: 2.082, y: 2.082, z: 2.09291} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 757229637864904103} m_RootOrder: 0 @@ -541,6 +501,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -608,6 +569,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4516561034748738355} - {fileID: 4676267018483621227} @@ -625,6 +587,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -692,6 +655,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4.8700004, y: 1.29, z: 0} m_LocalScale: {x: 2.082, y: 2.082, z: 2.09291} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 26205533931196358} m_RootOrder: 1 @@ -707,6 +671,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -775,6 +740,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.66, y: -1.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6128300493106227402} - {fileID: 7162401519775036327} @@ -793,6 +759,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -830,12 +797,12 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!95 &2588778952987738506 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -848,10 +815,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &6782522466276628430 GameObject: m_ObjectHideFlags: 0 @@ -879,6 +848,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.37, y: 0, z: 0} m_LocalScale: {x: 2.082, y: 2.082, z: 2.09291} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 757229637864904103} m_RootOrder: 1 @@ -894,6 +864,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -961,6 +932,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 17.777779, y: 10, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1558448215581441312} m_RootOrder: 0 @@ -976,6 +948,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1005,7 +978,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -50 - m_Sprite: {fileID: 7482667652216324306, guid: 394eab447e3d92140be461519b267611, type: 3} + m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3} m_Color: {r: 0.2627451, g: 0.36078432, b: 0.39215687, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -1044,6 +1017,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.649, y: 2.213, z: 0} m_LocalScale: {x: 1.04, y: 1.04, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4161079182365989534} m_RootOrder: 2 @@ -1059,6 +1033,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1101,7 +1076,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &6480067077458975222 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1114,10 +1089,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &7465949559389362926 GameObject: m_ObjectHideFlags: 0 @@ -1145,6 +1122,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.083, y: 1.421, z: 0} m_LocalScale: {x: -1.04, y: 1.04, z: 1.0439054} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 708937727427539446} m_RootOrder: 1 @@ -1160,6 +1138,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1227,6 +1206,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1558448215581441312} - {fileID: 708937727427539446} @@ -1368,6 +1348,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -4.539, y: 1.29, z: 0} m_LocalScale: {x: 2.082, y: 2.082, z: 2.09291} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 26205533931196358} m_RootOrder: 0 @@ -1383,6 +1364,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1796,16 +1778,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3} ---- !u!4 &1638447572751535848 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3} - m_PrefabInstance: {fileID: 1366076435959956245} - m_PrefabAsset: {fileID: 0} --- !u!95 &416600750635270691 stripped Animator: m_CorrespondingSourceObject: {fileID: 1674590754458698038, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3} m_PrefabInstance: {fileID: 1366076435959956245} m_PrefabAsset: {fileID: 0} +--- !u!4 &1638447572751535848 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3} + m_PrefabInstance: {fileID: 1366076435959956245} + m_PrefabAsset: {fileID: 0} --- !u!95 &6030929238039482332 stripped Animator: m_CorrespondingSourceObject: {fileID: 4703848696091020489, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3} @@ -1872,16 +1854,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3} ---- !u!4 &1822172518577804911 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3} - m_PrefabInstance: {fileID: 2089670662784752530} - m_PrefabAsset: {fileID: 0} --- !u!95 &737841632799169188 stripped Animator: m_CorrespondingSourceObject: {fileID: 1674590754458698038, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3} m_PrefabInstance: {fileID: 2089670662784752530} m_PrefabAsset: {fileID: 0} +--- !u!4 &1822172518577804911 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3} + m_PrefabInstance: {fileID: 2089670662784752530} + m_PrefabAsset: {fileID: 0} --- !u!95 &6649403303197644635 stripped Animator: m_CorrespondingSourceObject: {fileID: 4703848696091020489, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3} diff --git a/Assets/Resources/Games/tapTroupe.prefab b/Assets/Resources/Games/tapTroupe.prefab index d76944f5..59c837b7 100644 --- a/Assets/Resources/Games/tapTroupe.prefab +++ b/Assets/Resources/Games/tapTroupe.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.86462736, y: -30.122763, z: 326.05524} m_LocalScale: {x: 141.85547, y: 47.383713, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1897369786098534687} m_RootOrder: 0 @@ -43,6 +44,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -122,6 +124,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.16, y: -0.83, z: 143.10336} m_LocalScale: {x: 0.38, y: 0.38, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7842623188933788604} m_RootOrder: 2 @@ -137,6 +140,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -203,6 +207,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.5865827, y: 0.100856654, z: -10.001053} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8106055227459882777} - {fileID: 6343048051081085708} @@ -238,6 +243,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.16, y: -0.83, z: 143.10336} m_LocalScale: {x: 0.38, y: 0.38, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8259004929389243547} m_RootOrder: 2 @@ -253,6 +259,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -320,6 +327,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.16, y: -0.83, z: 143.10336} m_LocalScale: {x: 0.38, y: 0.38, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3960404442465330201} m_RootOrder: 2 @@ -335,6 +343,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -401,6 +410,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4.503, y: 0.93235195, z: -9.178155} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8679065474153490714} - {fileID: 3164402338688351745} @@ -436,6 +446,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.92, y: 0.91, z: 10.001053} m_LocalScale: {x: 0.4, y: 0.4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8867049551599227347} m_Father: {fileID: 5646040752524136664} @@ -452,6 +463,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -519,6 +531,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -5.1, y: 0.91, z: 10.001053} m_LocalScale: {x: 0.4, y: 0.4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7124135669493761450} m_Father: {fileID: 5646040752524136664} @@ -535,6 +548,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -602,6 +616,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.11, y: 64.72, z: 143.10336} m_LocalScale: {x: 0.4, y: 0.4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8259004929389243547} m_RootOrder: 0 @@ -617,6 +632,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -684,6 +700,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2.2522, y: 0, z: 0} m_LocalScale: {x: 400, y: 400, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 781267280139074967} m_RootOrder: 0 @@ -699,6 +716,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -766,6 +784,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -4.1638274, y: -6.4448404, z: 320.86728} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2266375707430807129} - {fileID: 2364188660994577360} @@ -813,6 +832,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.11, y: 64.72, z: 143.10336} m_LocalScale: {x: 0.4, y: 0.4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 509176496249949167} m_RootOrder: 0 @@ -828,6 +848,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -894,6 +915,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9.01, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7299751633417405353} - {fileID: 105147413890102603} @@ -929,6 +951,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -41.583168, y: -12.286962, z: 326.05524} m_LocalScale: {x: 56.724, y: 15.3429785, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1897369786098534687} m_RootOrder: 2 @@ -944,6 +967,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1023,6 +1047,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.135, y: 31.4057, z: 143.10336} m_LocalScale: {x: 0.379, y: 0.379, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 509176496249949167} m_RootOrder: 1 @@ -1038,6 +1063,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1105,6 +1131,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.91, y: 0.91, z: 10.001053} m_LocalScale: {x: 0.4, y: 0.4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 887696229785984937} m_Father: {fileID: 5646040752524136664} @@ -1121,6 +1148,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1188,6 +1216,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6343048051081085708} m_RootOrder: 0 @@ -1203,6 +1232,7 @@ SpriteMask: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1270,6 +1300,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 5.2229, y: 64.5392, z: 20.09578} m_LocalScale: {x: 142.18599, y: 120.65881, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6499369440861734875} m_RootOrder: 0 @@ -1285,6 +1316,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1364,6 +1396,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.11, y: 64.72, z: 143.10336} m_LocalScale: {x: 0.4, y: 0.4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3960404442465330201} m_RootOrder: 0 @@ -1379,6 +1412,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1446,6 +1480,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.11, y: 64.72, z: 143.10336} m_LocalScale: {x: 0.4, y: 0.4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7842623188933788604} m_RootOrder: 0 @@ -1461,6 +1496,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1527,6 +1563,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6302125329956331579} - {fileID: 6528312903474099066} @@ -1561,6 +1598,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.16, y: -0.83, z: 143.10336} m_LocalScale: {x: 0.38, y: 0.38, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 509176496249949167} m_RootOrder: 2 @@ -1576,6 +1614,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1643,6 +1682,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 48530212580946997} m_RootOrder: 0 @@ -1658,6 +1698,7 @@ SpriteMask: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1724,6 +1765,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.135, y: 31.4057, z: 143.10336} m_LocalScale: {x: 0.379, y: 0.379, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8259004929389243547} m_RootOrder: 1 @@ -1739,6 +1781,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1805,6 +1848,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.3638709, y: 1.6623516, z: -143.10336} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 509176496249949167} - {fileID: 3960404442465330201} @@ -1840,6 +1884,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8106055227459882777} m_RootOrder: 0 @@ -1855,6 +1900,7 @@ SpriteMask: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1921,6 +1967,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2.02, y: 0.2, z: 20.095783} m_LocalScale: {x: 500, y: 500, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6499369440861734875} m_RootOrder: 1 @@ -1936,6 +1983,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2002,6 +2050,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -6.01, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2858186507511515158} - {fileID: 2599027865143194461} @@ -2036,6 +2085,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9157871296346160953} m_RootOrder: 0 @@ -2051,6 +2101,7 @@ SpriteMask: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2116,6 +2167,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 396561036207805484} - {fileID: 6877143038616850174} @@ -2150,6 +2202,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.135, y: 31.4057, z: 143.10336} m_LocalScale: {x: 0.379, y: 0.379, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3960404442465330201} m_RootOrder: 1 @@ -2165,6 +2218,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2233,6 +2287,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.866803, y: -6.546962, z: 326.05524} m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1897369786098534687} m_RootOrder: 1 @@ -2248,6 +2303,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2327,6 +2383,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.11, y: 0.91, z: 10.001053} m_LocalScale: {x: 0.4, y: 0.4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2736962449129303923} m_Father: {fileID: 5646040752524136664} @@ -2343,6 +2400,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2409,6 +2467,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.873769, y: -1.2993346, z: -20.09578} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7300017601209462654} - {fileID: 3215541483237215647} @@ -2441,6 +2500,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.596803, y: 3.477627, z: -326.0552} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7762572243762772068} - {fileID: 7255343223301782611} @@ -2477,6 +2537,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3812992600370832856} - {fileID: 6499369440861734875} @@ -2520,7 +2581,7 @@ MonoBehaviour: darkness: {fileID: 6333964518265533667} --- !u!95 &1464443001728871423 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2533,10 +2594,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &9099388898269379416 GameObject: m_ObjectHideFlags: 0 @@ -2564,6 +2627,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.135, y: 31.4057, z: 143.10336} m_LocalScale: {x: 0.379, y: 0.379, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7842623188933788604} m_RootOrder: 1 @@ -2579,6 +2643,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3250,11 +3315,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7bb6590d80f4d624987932f439222903, type: 3} ---- !u!4 &5911378620854522815 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8222931150450068117, guid: 7bb6590d80f4d624987932f439222903, type: 3} - m_PrefabInstance: {fileID: 2311709837228857642} - m_PrefabAsset: {fileID: 0} --- !u!114 &4835831880042317218 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7136099434120862856, guid: 7bb6590d80f4d624987932f439222903, type: 3} @@ -3266,6 +3326,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ddfec1a1860bd5a4486d8690d6b59396, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &5911378620854522815 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8222931150450068117, guid: 7bb6590d80f4d624987932f439222903, type: 3} + m_PrefabInstance: {fileID: 2311709837228857642} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2941717666903817529 PrefabInstance: m_ObjectHideFlags: 0 @@ -3614,6 +3679,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7bb6590d80f4d624987932f439222903, type: 3} +--- !u!4 &3164402338688351745 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8222931150450068117, guid: 7bb6590d80f4d624987932f439222903, type: 3} + m_PrefabInstance: {fileID: 6482807939298833556} + m_PrefabAsset: {fileID: 0} --- !u!114 &4251129601446570012 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7136099434120862856, guid: 7bb6590d80f4d624987932f439222903, type: 3} @@ -3625,11 +3695,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ddfec1a1860bd5a4486d8690d6b59396, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &3164402338688351745 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8222931150450068117, guid: 7bb6590d80f4d624987932f439222903, type: 3} - m_PrefabInstance: {fileID: 6482807939298833556} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7974833086625679325 PrefabInstance: m_ObjectHideFlags: 0 @@ -3715,11 +3780,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 351a7cb06f3d9504aac946406ac67406, type: 3} ---- !u!4 &9073063413360122139 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1388713331832348358, guid: 351a7cb06f3d9504aac946406ac67406, type: 3} - m_PrefabInstance: {fileID: 7974833086625679325} - m_PrefabAsset: {fileID: 0} --- !u!114 &2231021787619408423 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8095891093602516474, guid: 351a7cb06f3d9504aac946406ac67406, type: 3} @@ -3731,3 +3791,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12e2c9b60bfc1804aa8402261a998149, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &9073063413360122139 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1388713331832348358, guid: 351a7cb06f3d9504aac946406ac67406, type: 3} + m_PrefabInstance: {fileID: 7974833086625679325} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Cameras.prefab b/Assets/Resources/Prefabs/Cameras.prefab index d1c9adc9..24fbe39d 100644 --- a/Assets/Resources/Prefabs/Cameras.prefab +++ b/Assets/Resources/Prefabs/Cameras.prefab @@ -453,7 +453,7 @@ Camera: field of view: 53.15 orthographic: 1 orthographic size: 5 - m_Depth: 2 + m_Depth: 100 m_CullingMask: serializedVersion: 2 m_Bits: 72 @@ -614,7 +614,7 @@ GameObject: - component: {fileID: 9126116407185073410} - component: {fileID: 9182755598382872870} - component: {fileID: 3596148951806340129} - - component: {fileID: 4765703529618674964} + - component: {fileID: 2408100308142214852} m_Layer: 31 m_Name: LetterboxMask m_TagString: Untagged @@ -671,7 +671,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -681,7 +681,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4765703529618674964 +--- !u!114 &2408100308142214852 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -690,11 +690,10 @@ MonoBehaviour: m_GameObject: {fileID: 7252983913051326197} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Padding: {x: 0, y: 0, z: 0, w: 0} - m_Softness: {x: 0, y: 0} + m_ShowMaskGraphic: 1 --- !u!1 &8244570575520829750 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Editor/SettingsMenu/GameSettings.prefab b/Assets/Resources/Prefabs/Editor/SettingsMenu/GameSettings.prefab index a29b4efa..971cdb43 100644 --- a/Assets/Resources/Prefabs/Editor/SettingsMenu/GameSettings.prefab +++ b/Assets/Resources/Prefabs/Editor/SettingsMenu/GameSettings.prefab @@ -28,6 +28,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5821290602170312382} m_RootOrder: 0 @@ -103,6 +104,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7654418104757256077} m_RootOrder: 0 @@ -179,6 +181,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3848485333487225133} m_RootOrder: 4 @@ -265,6 +268,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8941175399843831914} m_RootOrder: 0 @@ -398,6 +402,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.99994, y: 0.99994, z: 0.99994} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4694534756629889673} - {fileID: 3114553210599439120} @@ -464,6 +469,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4509325072191871220} m_RootOrder: 0 @@ -598,6 +604,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.99992007, y: 0.99992007, z: 0.99992007} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7814438192891424201} m_RootOrder: 0 @@ -732,6 +739,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6195567239870245334} m_RootOrder: 0 @@ -866,16 +874,17 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.99994, y: 0.99994, z: 0.99994} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5819099401181543263} - {fileID: 7030288599176088473} m_Father: {fileID: 5256356839309956323} 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: 291, y: -30} - m_SizeDelta: {x: 566, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &519242634654431636 GameObject: @@ -905,6 +914,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7918602661836975353} m_RootOrder: 0 @@ -979,6 +989,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2176277386232130105} - {fileID: 7821480598508199316} @@ -1026,6 +1037,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 997283940027069377} m_RootOrder: 0 @@ -1101,6 +1113,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5790100943277126607} m_RootOrder: 0 @@ -1175,6 +1188,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8479791045444254489} - {fileID: 2594134676228012460} @@ -1278,6 +1292,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6386665601560602335} m_RootOrder: 1 @@ -1353,6 +1368,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2893130788615028402} m_RootOrder: 0 @@ -1429,6 +1445,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3848485333487225133} m_RootOrder: 3 @@ -1514,6 +1531,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.00008, y: 1.00008, z: 1.00008} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6852443500740329627} - {fileID: 5182218864720150285} @@ -1521,10 +1539,10 @@ RectTransform: m_Father: {fileID: 5256356839309956323} 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: 291, y: -130} - m_SizeDelta: {x: 566, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &922889753386770700 CanvasRenderer: @@ -1560,6 +1578,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.99994, y: 0.99994, z: 0.99994} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2163729441352068228} - {fileID: 5157073977999817124} @@ -1599,6 +1618,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6386665601560602335} m_RootOrder: 0 @@ -1674,6 +1694,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3190783907109547890} m_Father: {fileID: 7686431185093051364} @@ -1751,6 +1772,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7922159205701088344} m_Father: {fileID: 2767567597670246615} @@ -1883,6 +1905,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5182218864720150285} m_RootOrder: 0 @@ -2016,6 +2039,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3327429941818348724} - {fileID: 2359251859809030057} @@ -2118,6 +2142,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7964141121330962087} m_Father: {fileID: 1219800298077308675} @@ -2170,6 +2195,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 397806596092276485} m_Father: {fileID: 2830277776606474336} @@ -2245,6 +2271,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4469807140976476177} m_Father: {fileID: 7445086984111591383} @@ -2342,6 +2369,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0001401, y: 1.0001401, z: 1.0001401} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3128526663869996574} m_Father: {fileID: 3361920161722488605} @@ -2441,6 +2469,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8607588814069122572} m_Father: {fileID: 3398417292682828100} @@ -2566,6 +2595,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6522129410091287029} - {fileID: 9161835482758760361} @@ -2646,6 +2676,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4345872902674834405} m_RootOrder: 0 @@ -2721,6 +2752,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8607588814069122572} m_RootOrder: 0 @@ -2796,6 +2828,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6834513059876189284} m_RootOrder: 0 @@ -2871,6 +2904,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5157073977999817124} m_RootOrder: 1 @@ -2946,6 +2980,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8268216620055705424} m_RootOrder: 0 @@ -3079,6 +3114,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6933285011470190629} - {fileID: 7673159178363249492} @@ -3167,6 +3203,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7645412957436653029} m_RootOrder: 0 @@ -3246,6 +3283,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7074308801028673179} - {fileID: 7764823135968130501} @@ -3402,6 +3440,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6386665601560602335} m_Father: {fileID: 2030287996470378866} @@ -3440,6 +3479,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7030288599176088473} m_RootOrder: 0 @@ -3574,6 +3614,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7065078666370662917} m_RootOrder: 0 @@ -3649,6 +3690,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8134684175945914138} m_RootOrder: 0 @@ -3725,6 +3767,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5116802176554254617} m_Father: {fileID: 191656411815939086} @@ -3911,6 +3954,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6169665252022083263} - {fileID: 8800668829680167042} @@ -3992,6 +4036,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2253112300073465862} m_Father: {fileID: 8134684175945914138} @@ -4028,6 +4073,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1751651485190533021} m_Father: {fileID: 3311259660666547012} @@ -4066,6 +4112,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4044636343879897205} m_Father: {fileID: 3114553210599439120} @@ -4143,6 +4190,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1997222146871242934} m_Father: {fileID: 7821480598508199316} @@ -4330,6 +4378,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8268216620055705424} m_Father: {fileID: 2283766207844113876} @@ -4514,6 +4563,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6238887108514093961} m_Father: {fileID: 6834513059876189284} @@ -4556,6 +4606,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2030287996470378866} - {fileID: 2881806848219520342} @@ -4713,6 +4764,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4345872902674834405} m_Father: {fileID: 8800668829680167042} @@ -4810,16 +4862,17 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.00008, y: 1.00008, z: 1.00008} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8673084873521828151} - {fileID: 7441941011271040640} m_Father: {fileID: 5256356839309956323} 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: 291, y: -80} - m_SizeDelta: {x: 566, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3713167126177139283 CanvasRenderer: @@ -4858,6 +4911,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6052241083500664374} m_Father: {fileID: 2767567597670246615} @@ -4991,6 +5045,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6195567239870245334} - {fileID: 1951313028187671742} @@ -5098,6 +5153,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5209250545580042160} - {fileID: 8134684175945914138} @@ -5137,6 +5193,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.99992007, y: 0.99992007, z: 0.99992007} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7798023574788727625} m_RootOrder: 0 @@ -5269,6 +5326,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 9126409843654449543} m_Father: {fileID: 997283940027069377} @@ -5308,6 +5366,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7654418104757256077} m_Father: {fileID: 3924865486090506284} @@ -5431,6 +5490,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6501835171074076108} - {fileID: 8461959293491014789} @@ -5470,6 +5530,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2821612991251782289} m_RootOrder: 0 @@ -5545,6 +5606,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1497338812327975221} m_Father: {fileID: 6414734252487272423} @@ -5683,6 +5745,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4509325072191871220} m_Father: {fileID: 4410142017820409948} @@ -5869,6 +5932,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 388938735701368950} m_Father: {fileID: 5273861267663017545} @@ -5945,6 +6009,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8466556674462945585} m_Father: {fileID: 6414734252487272423} @@ -6082,6 +6147,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1997222146871242934} m_RootOrder: 0 @@ -6216,6 +6282,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2767567597670246615} - {fileID: 5256356839309956323} @@ -6293,6 +6360,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2537340250667140071} m_RootOrder: 0 @@ -6368,6 +6436,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6568744135880543145} m_RootOrder: 2 @@ -6500,6 +6569,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6797414637491485191} - {fileID: 5721367413284659555} @@ -6539,6 +6609,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.99992007, y: 0.99992007, z: 0.99992007} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7613229331419581146} m_RootOrder: 0 @@ -6674,16 +6745,17 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5766177323745960640} - {fileID: 2350888091022947968} m_Father: {fileID: 5256356839309956323} 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: 291, y: -230} - m_SizeDelta: {x: 566, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9010809872578740536 CanvasRenderer: @@ -6720,6 +6792,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5290515840031716306} m_Father: {fileID: 6169665252022083263} @@ -6818,6 +6891,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4469807140976476177} m_RootOrder: 0 @@ -6893,6 +6967,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2517450412301195709} m_RootOrder: 0 @@ -6967,6 +7042,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5344093786750252533} - {fileID: 6103340934978755671} @@ -7070,6 +7146,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6568744135880543145} m_RootOrder: 0 @@ -7143,6 +7220,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 982679010081692269} m_Father: {fileID: 7764823135968130501} @@ -7180,6 +7258,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.99992007, y: 0.99992007, z: 0.99992007} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2997948181207646515} - {fileID: 191656411815939086} @@ -7227,6 +7306,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2359251859809030057} m_RootOrder: 0 @@ -7301,6 +7381,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6518799358487835110} - {fileID: 7875356877471585366} @@ -7389,6 +7470,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8168696137620781156} m_Father: {fileID: 7441941011271040640} @@ -7463,6 +7545,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6568744135880543145} m_Father: {fileID: 7074308801028673179} @@ -7501,6 +7584,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8366932106210718241} m_Father: {fileID: 1497338812327975221} @@ -7577,6 +7661,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7030288599176088473} m_RootOrder: 1 @@ -7652,6 +7737,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1281277023310204088} m_Father: {fileID: 3067777520871423963} @@ -7728,6 +7814,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5157073977999817124} m_RootOrder: 0 @@ -7862,6 +7949,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5800215045752463141} m_RootOrder: 0 @@ -7938,6 +8026,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5912324267477093347} m_Father: {fileID: 2767567597670246615} @@ -8057,6 +8146,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1644269987380582452} m_Father: {fileID: 6797414637491485191} @@ -8109,6 +8199,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 856218621513008687} m_RootOrder: 0 @@ -8184,6 +8275,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3002058643519247768} - {fileID: 5800215045752463141} @@ -8260,6 +8352,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3128526663869996574} m_RootOrder: 0 @@ -8335,6 +8428,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3361920161722488605} m_RootOrder: 0 @@ -8469,6 +8563,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8571135572688934492} m_Father: {fileID: 6414734252487272423} @@ -8603,6 +8698,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7619743492103153514} m_Father: {fileID: 7814438192891424201} @@ -8701,6 +8797,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3505853704266402246} m_RootOrder: 0 @@ -8774,6 +8871,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2598324992479817966} m_Father: {fileID: 8461959293491014789} @@ -8812,6 +8910,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4270351156630110492} m_Father: {fileID: 8571135572688934492} @@ -8888,6 +8987,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1338763785512398547} m_RootOrder: 0 @@ -9022,6 +9122,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1951313028187671742} m_RootOrder: 0 @@ -9157,6 +9258,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3848485333487225133} m_RootOrder: 2 @@ -9190,7 +9292,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -9244,6 +9346,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6414734252487272423} m_Father: {fileID: 3398417292682828100} @@ -9332,6 +9435,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0001401, y: 1.0001401, z: 1.0001401} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2893130788615028402} m_Father: {fileID: 352916495994336378} @@ -9428,6 +9532,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7535006554387361842} - {fileID: 6834513059876189284} @@ -9468,6 +9573,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5948204175369372050} - {fileID: 1903781279517821455} @@ -9616,6 +9722,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4248813755905171305} m_RootOrder: 0 @@ -9748,6 +9855,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2731359021802261551} m_Father: {fileID: 8461959293491014789} @@ -9786,6 +9894,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7713499248213741045} m_RootOrder: 0 @@ -9860,6 +9969,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.99992007, y: 0.99992007, z: 0.99992007} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4193803299480421518} - {fileID: 2283766207844113876} @@ -9907,6 +10017,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3848485333487225133} m_RootOrder: 0 @@ -10041,6 +10152,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8942094585367754950} m_Father: {fileID: 997283940027069377} @@ -10080,6 +10192,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4476710119336366620} - {fileID: 3311259660666547012} @@ -10187,6 +10300,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2594134676228012460} m_RootOrder: 0 @@ -10262,6 +10376,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1074170538819331136} m_RootOrder: 0 @@ -10396,6 +10511,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2767567597670246615} m_RootOrder: 0 @@ -10530,6 +10646,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6103340934978755671} m_RootOrder: 0 @@ -10605,6 +10722,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7652358658696101217} m_RootOrder: 0 @@ -10739,6 +10857,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 352916495994336378} m_RootOrder: 0 @@ -10871,6 +10990,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8243922492801169335} m_Father: {fileID: 6834513059876189284} @@ -10909,6 +11029,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6568744135880543145} m_RootOrder: 1 @@ -10984,6 +11105,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3848485333487225133} - {fileID: 1392417398346307937} @@ -11057,6 +11179,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1736249616898258198} m_RootOrder: 0 @@ -11191,6 +11314,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 90} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9161835482758760361} m_RootOrder: 0 @@ -11267,6 +11391,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2935381741796751039} m_Father: {fileID: 6426176561345564781} @@ -11356,6 +11481,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1861134600182876603} m_Father: {fileID: 8466556674462945585} @@ -11432,6 +11558,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5721367413284659555} m_RootOrder: 0 @@ -11507,6 +11634,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3398417292682828100} - {fileID: 8941175399843831914} @@ -11586,6 +11714,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7118846338265942634} m_Father: {fileID: 7613229331419581146} @@ -11682,6 +11811,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5011782870015506542} m_Father: {fileID: 8134684175945914138} @@ -11721,6 +11851,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4780676134441214942} m_Father: {fileID: 3924865486090506284} @@ -11809,6 +11940,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.00008, y: 1.00008, z: 1.00008} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2856007510812930645} - {fileID: 5273861267663017545} @@ -11854,6 +11986,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7199319973227214648} m_Father: {fileID: 2881806848219520342} @@ -11892,6 +12025,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5116802176554254617} m_RootOrder: 0 @@ -12025,6 +12159,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7065078666370662917} m_Father: {fileID: 7199445264310719903} @@ -12122,6 +12257,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2600040459246414695} m_Father: {fileID: 5209250545580042160} @@ -12175,6 +12311,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4949635979177622905} m_Father: {fileID: 2767567597670246615} @@ -12296,6 +12433,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1736249616898258198} m_Father: {fileID: 2350888091022947968} @@ -12483,6 +12621,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2821612991251782289} m_Father: {fileID: 6426176561345564781} @@ -12607,6 +12746,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4811978818431723510} - {fileID: 3505853704266402246} @@ -12710,6 +12850,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7619743492103153514} m_RootOrder: 0 @@ -12783,6 +12924,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7030584964961222471} m_Father: {fileID: 5721367413284659555} @@ -12822,6 +12964,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5182956050531481019} - {fileID: 5360633346054037496} @@ -12954,6 +13097,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2830277776606474336} m_Father: {fileID: 6414734252487272423} @@ -13090,6 +13234,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4677917754446835147} m_Father: {fileID: 7535006554387361842} @@ -13142,6 +13287,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2487136151389908656} m_RootOrder: 0 @@ -13218,6 +13364,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6333297351521765582} - {fileID: 5761262922024577280} @@ -13319,6 +13466,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1537969916687496039} - {fileID: 3067777520871423963} @@ -13357,6 +13505,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5006774382929409460} - {fileID: 5821290602170312382} @@ -13458,6 +13607,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1219800298077308675} - {fileID: 997283940027069377} @@ -13497,6 +13647,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 842496262423431826} m_RootOrder: 0 @@ -13631,6 +13782,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6386665601560602335} m_RootOrder: 2 @@ -13766,6 +13918,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8823099424137248163} m_Father: {fileID: 3848485333487225133} @@ -13855,16 +14008,17 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6111198605817918901} - {fileID: 4410142017820409948} m_Father: {fileID: 5256356839309956323} 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: 291, y: -180} - m_SizeDelta: {x: 566, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8096023217859052254 CanvasRenderer: @@ -13902,6 +14056,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8461959293491014789} m_RootOrder: 0 @@ -13977,6 +14132,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7118846338265942634} m_RootOrder: 0 @@ -14050,6 +14206,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5116813921729453847} m_Father: {fileID: 5721367413284659555} @@ -14087,6 +14244,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5930488943369551258} m_Father: {fileID: 6501835171074076108} @@ -14139,6 +14297,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5290515840031716306} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/EditorPreviewTex.renderTexture b/Assets/Resources/Prefabs/EditorPreviewTex.renderTexture index c53c76d1..eadd0112 100644 --- a/Assets/Resources/Prefabs/EditorPreviewTex.renderTexture +++ b/Assets/Resources/Prefabs/EditorPreviewTex.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 1280 m_Height: 720 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 0 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -36,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Resources/Prefabs/GameTex.renderTexture b/Assets/Resources/Prefabs/GameTex.renderTexture index 64a1fbdd..1d9300ac 100644 --- a/Assets/Resources/Prefabs/GameTex.renderTexture +++ b/Assets/Resources/Prefabs/GameTex.renderTexture @@ -18,7 +18,7 @@ RenderTexture: m_Height: 1259 m_AntiAliasing: 2 m_MipCount: -1 - m_DepthStencilFormat: 91 + m_DepthStencilFormat: 92 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 diff --git a/Assets/Resources/Prefabs/GameTexMaterial.mat b/Assets/Resources/Prefabs/GameTexMaterial.mat index a583d8f3..9c55a022 100644 --- a/Assets/Resources/Prefabs/GameTexMaterial.mat +++ b/Assets/Resources/Prefabs/GameTexMaterial.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: GameTexMaterial - m_Shader: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 0ae724cf80d801b43b140517e4bbb12f, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -62,6 +62,9 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _Alpha: 1 + - _BlendDst: 1 + - _BlendSrc: 1 - _BumpScale: 1 - _ColorMask: 15 - _Cutoff: 0.5 @@ -89,4 +92,6 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Tint1: {r: 1, g: 1, b: 1, a: 0} + - _Tint2: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/FanClub/fanClub_AmieParts.png b/Assets/Resources/Sprites/Games/FanClub/fanClub_AmieParts.png new file mode 100644 index 00000000..4f9c0cdb Binary files /dev/null and b/Assets/Resources/Sprites/Games/FanClub/fanClub_AmieParts.png differ diff --git a/Assets/Resources/Sprites/Games/FanClub/fanClub_AmieParts.png.meta b/Assets/Resources/Sprites/Games/FanClub/fanClub_AmieParts.png.meta new file mode 100644 index 00000000..74039f20 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FanClub/fanClub_AmieParts.png.meta @@ -0,0 +1,1400 @@ +fileFormatVersion: 2 +guid: 9b797d05e70a609439baca5da1b256c1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 300 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: fanClub_AmieParts_0 + rect: + serializedVersion: 2 + x: 70 + y: 5617 + width: 587 + height: 628 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 39555edbffffffff0800000000000000 + internalID: -1109043821 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_1 + rect: + serializedVersion: 2 + x: 785 + y: 5617 + width: 588 + height: 628 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 1ea3e5ccffffffff0800000000000000 + internalID: -866239775 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_2 + rect: + serializedVersion: 2 + x: 1502 + y: 5617 + width: 586 + height: 628 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 43bb7000000000000800000000000000 + internalID: 506676 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_3 + rect: + serializedVersion: 2 + x: 2213 + y: 5617 + width: 588 + height: 628 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: b83e79ceffffffff0800000000000000 + internalID: -325590133 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_4 + rect: + serializedVersion: 2 + x: 3016 + y: 5743 + width: 364 + height: 467 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 74367864000000000800000000000000 + internalID: 1183277895 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_5 + rect: + serializedVersion: 2 + x: 3586 + y: 5822 + width: 242 + height: 340 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 75a4c725000000000800000000000000 + internalID: 1383877207 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_6 + rect: + serializedVersion: 2 + x: 3997 + y: 5826 + width: 363 + height: 239 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 31890fbbffffffff0800000000000000 + internalID: -1141860333 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_7 + rect: + serializedVersion: 2 + x: 4439 + y: 5820 + width: 329 + height: 247 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: da221c81000000000800000000000000 + internalID: 415310509 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_8 + rect: + serializedVersion: 2 + x: 4819 + y: 5805 + width: 318 + height: 239 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: e07f8855000000000800000000000000 + internalID: 1435039502 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_9 + rect: + serializedVersion: 2 + x: 5207 + y: 5838 + width: 342 + height: 244 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c84460cfffffffff0800000000000000 + internalID: -66698100 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_10 + rect: + serializedVersion: 2 + x: 5620 + y: 5811 + width: 233 + height: 340 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: be7bc5f5000000000800000000000000 + internalID: 1599911915 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_11 + rect: + serializedVersion: 2 + x: 5964 + y: 5811 + width: 318 + height: 253 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 1b1f1235000000000800000000000000 + internalID: 1394733489 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_12 + rect: + serializedVersion: 2 + x: 69 + y: 4948 + width: 588 + height: 628 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 04807b39ffffffff0800000000000000 + internalID: -1816721344 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_13 + rect: + serializedVersion: 2 + x: 785 + y: 4948 + width: 588 + height: 628 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 10fd703cffffffff0800000000000000 + internalID: -1022894335 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_14 + rect: + serializedVersion: 2 + x: 1502 + y: 4948 + width: 586 + height: 628 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 4d311a7affffffff0800000000000000 + internalID: -1482615852 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_15 + rect: + serializedVersion: 2 + x: 2190 + y: 5068 + width: 195 + height: 465 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: eaeb3a64000000000800000000000000 + internalID: 1185136302 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_16 + rect: + serializedVersion: 2 + x: 2538 + y: 5068 + width: 179 + height: 465 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 247375ecffffffff0800000000000000 + internalID: -833145022 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_17 + rect: + serializedVersion: 2 + x: 2848 + y: 5068 + width: 170 + height: 496 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 5f093d50000000000800000000000000 + internalID: 97751285 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_18 + rect: + serializedVersion: 2 + x: 3142 + y: 5070 + width: 279 + height: 476 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 42cd9985000000000800000000000000 + internalID: 1486478372 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_19 + rect: + serializedVersion: 2 + x: 3606 + y: 5135 + width: 68 + height: 71 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 79576f22000000000800000000000000 + internalID: 586577303 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_20 + rect: + serializedVersion: 2 + x: 3617 + y: 5070 + width: 230 + height: 468 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 6b07caf4000000000800000000000000 + internalID: 1336701110 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_21 + rect: + serializedVersion: 2 + x: 4037 + y: 5068 + width: 242 + height: 458 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 22367bbcffffffff0800000000000000 + internalID: -877173982 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_22 + rect: + serializedVersion: 2 + x: 4461 + y: 5068 + width: 245 + height: 442 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 1c2e925cffffffff0800000000000000 + internalID: -987110719 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_23 + rect: + serializedVersion: 2 + x: 4907 + y: 5064 + width: 219 + height: 429 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 5f935e43000000000800000000000000 + internalID: 887437813 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_24 + rect: + serializedVersion: 2 + x: 5350 + y: 5067 + width: 199 + height: 460 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 5aeee981000000000800000000000000 + internalID: 413068965 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_25 + rect: + serializedVersion: 2 + x: 5794 + y: 5065 + width: 187 + height: 504 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f6306629ffffffff0800000000000000 + internalID: -1838808209 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_26 + rect: + serializedVersion: 2 + x: 69 + y: 4278 + width: 588 + height: 628 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 4c55fb67000000000800000000000000 + internalID: 1992250820 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_27 + rect: + serializedVersion: 2 + x: 785 + y: 4278 + width: 588 + height: 628 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 1d328017000000000800000000000000 + internalID: 1896358865 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_28 + rect: + serializedVersion: 2 + x: 1502 + y: 4278 + width: 586 + height: 628 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: b56f24bcffffffff0800000000000000 + internalID: -884804005 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_29 + rect: + serializedVersion: 2 + x: 2161 + y: 4656 + width: 229 + height: 193 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 0e4e537effffffff0800000000000000 + internalID: -415898400 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_30 + rect: + serializedVersion: 2 + x: 2564 + y: 4635 + width: 188 + height: 239 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 5468342cffffffff0800000000000000 + internalID: -1035762107 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_31 + rect: + serializedVersion: 2 + x: 2857 + y: 4512 + width: 272 + height: 463 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 96925e5dffffffff0800000000000000 + internalID: -706401943 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_32 + rect: + serializedVersion: 2 + x: 3259 + y: 4673 + width: 236 + height: 216 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 8802d4e6000000000800000000000000 + internalID: 1850548360 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_33 + rect: + serializedVersion: 2 + x: 3637 + y: 4692 + width: 271 + height: 188 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 278ced99ffffffff0800000000000000 + internalID: -1713452942 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_34 + rect: + serializedVersion: 2 + x: 4089 + y: 4582 + width: 204 + height: 344 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: e34f4f18ffffffff0800000000000000 + internalID: -2114653122 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_35 + rect: + serializedVersion: 2 + x: 4466 + y: 4644 + width: 148 + height: 253 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 36d4153fffffffff0800000000000000 + internalID: -212775581 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_36 + rect: + serializedVersion: 2 + x: 4696 + y: 4572 + width: 193 + height: 396 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: aee655a7000000000800000000000000 + internalID: 2052419306 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_38 + rect: + serializedVersion: 2 + x: 2129 + y: 4184 + width: 242 + height: 193 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 81a9935affffffff0800000000000000 + internalID: -1522951656 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_39 + rect: + serializedVersion: 2 + x: 2458 + y: 4178 + width: 267 + height: 241 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 66e7d7c1000000000800000000000000 + internalID: 477986406 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_40 + rect: + serializedVersion: 2 + x: 2813 + y: 4172 + width: 230 + height: 259 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ebec63fcffffffff0800000000000000 + internalID: -818491714 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_41 + rect: + serializedVersion: 2 + x: 3240 + y: 4167 + width: 232 + height: 264 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c2d99346000000000800000000000000 + internalID: 1681497388 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_42 + rect: + serializedVersion: 2 + x: 3655 + y: 4158 + width: 261 + height: 261 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c7a379afffffffff0800000000000000 + internalID: -90752388 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_43 + rect: + serializedVersion: 2 + x: 4098 + y: 4169 + width: 245 + height: 242 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ca715f66000000000800000000000000 + internalID: 1727338412 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_44 + rect: + serializedVersion: 2 + x: 4545 + y: 4172 + width: 220 + height: 235 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 899ee992000000000800000000000000 + internalID: 698280344 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_45 + rect: + serializedVersion: 2 + x: 4984 + y: 4186 + width: 211 + height: 219 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: a619acd9ffffffff0800000000000000 + internalID: -1647668886 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_46 + rect: + serializedVersion: 2 + x: 5305 + y: 4186 + width: 257 + height: 234 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 3357208bffffffff0800000000000000 + internalID: -1207798477 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_47 + rect: + serializedVersion: 2 + x: 5709 + y: 4175 + width: 206 + height: 264 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 72e01d1affffffff0800000000000000 + internalID: -1580134873 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_48 + rect: + serializedVersion: 2 + x: 6060 + y: 4180 + width: 221 + height: 259 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 0bac6f33000000000800000000000000 + internalID: 871811760 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_49 + rect: + serializedVersion: 2 + x: 95 + y: 3383 + width: 534 + height: 544 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: a8245620000000000800000000000000 + internalID: 40190602 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_50 + rect: + serializedVersion: 2 + x: 813 + y: 3382 + width: 533 + height: 543 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: cca42b2bffffffff0800000000000000 + internalID: -1296938292 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_51 + rect: + serializedVersion: 2 + x: 1528 + y: 3382 + width: 534 + height: 543 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 488d03f5000000000800000000000000 + internalID: 1597036676 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_52 + rect: + serializedVersion: 2 + x: 2244 + y: 3383 + width: 533 + height: 544 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 48d5b6a1000000000800000000000000 + internalID: 443243908 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_53 + rect: + serializedVersion: 2 + x: 96 + y: 2713 + width: 533 + height: 544 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 04020967000000000800000000000000 + internalID: 1989156928 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_54 + rect: + serializedVersion: 2 + x: 811 + y: 2713 + width: 533 + height: 545 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c94347f3000000000800000000000000 + internalID: 1064580252 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_55 + rect: + serializedVersion: 2 + x: 1526 + y: 2713 + width: 533 + height: 545 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: eba64e35000000000800000000000000 + internalID: 1407478462 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_56 + rect: + serializedVersion: 2 + x: 96 + y: 2044 + width: 533 + height: 544 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: a604e429ffffffff0800000000000000 + internalID: -1840365462 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_57 + rect: + serializedVersion: 2 + x: 813 + y: 2044 + width: 533 + height: 544 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 66078172000000000800000000000000 + internalID: 655913062 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fanClub_AmieParts_58 + rect: + serializedVersion: 2 + x: 1529 + y: 2044 + width: 533 + height: 544 + alignment: 9 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f79233d3000000000800000000000000 + internalID: 1026763135 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + fanClub_AmieParts_0: -1109043821 + fanClub_AmieParts_1: -866239775 + fanClub_AmieParts_10: 1599911915 + fanClub_AmieParts_11: 1394733489 + fanClub_AmieParts_12: -1816721344 + fanClub_AmieParts_13: -1022894335 + fanClub_AmieParts_14: -1482615852 + fanClub_AmieParts_15: 1185136302 + fanClub_AmieParts_16: -833145022 + fanClub_AmieParts_17: 97751285 + fanClub_AmieParts_18: 1486478372 + fanClub_AmieParts_19: 586577303 + fanClub_AmieParts_2: 506676 + fanClub_AmieParts_20: 1336701110 + fanClub_AmieParts_21: -877173982 + fanClub_AmieParts_22: -987110719 + fanClub_AmieParts_23: 887437813 + fanClub_AmieParts_24: 413068965 + fanClub_AmieParts_25: -1838808209 + fanClub_AmieParts_26: 1992250820 + fanClub_AmieParts_27: 1896358865 + fanClub_AmieParts_28: -884804005 + fanClub_AmieParts_29: -415898400 + fanClub_AmieParts_3: -325590133 + fanClub_AmieParts_30: -1035762107 + fanClub_AmieParts_31: -706401943 + fanClub_AmieParts_32: 1850548360 + fanClub_AmieParts_33: -1713452942 + fanClub_AmieParts_34: -2114653122 + fanClub_AmieParts_35: -212775581 + fanClub_AmieParts_36: 2052419306 + fanClub_AmieParts_37: 301551796 + fanClub_AmieParts_38: -1522951656 + fanClub_AmieParts_39: 477986406 + fanClub_AmieParts_4: 1183277895 + fanClub_AmieParts_40: -818491714 + fanClub_AmieParts_41: 1681497388 + fanClub_AmieParts_42: -90752388 + fanClub_AmieParts_43: 1727338412 + fanClub_AmieParts_44: 698280344 + fanClub_AmieParts_45: -1647668886 + fanClub_AmieParts_46: -1207798477 + fanClub_AmieParts_47: -1580134873 + fanClub_AmieParts_48: 871811760 + fanClub_AmieParts_49: 40190602 + fanClub_AmieParts_5: 1383877207 + fanClub_AmieParts_50: -1296938292 + fanClub_AmieParts_51: 1597036676 + fanClub_AmieParts_52: 443243908 + fanClub_AmieParts_53: 1989156928 + fanClub_AmieParts_54: 1064580252 + fanClub_AmieParts_55: 1407478462 + fanClub_AmieParts_56: -1840365462 + fanClub_AmieParts_57: 655913062 + fanClub_AmieParts_58: 1026763135 + fanClub_AmieParts_6: -1141860333 + fanClub_AmieParts_7: 415310509 + fanClub_AmieParts_8: 1435039502 + fanClub_AmieParts_9: -66698100 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: ntridol/common + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FanClub/fanClub_IdolParts.png b/Assets/Resources/Sprites/Games/FanClub/fanClub_IdolParts.png index 2d7aa33f..d784ca55 100644 Binary files a/Assets/Resources/Sprites/Games/FanClub/fanClub_IdolParts.png and b/Assets/Resources/Sprites/Games/FanClub/fanClub_IdolParts.png differ diff --git a/Assets/Resources/Sprites/Games/FanClub/fanClub_IdolParts.png.meta b/Assets/Resources/Sprites/Games/FanClub/fanClub_IdolParts.png.meta index c3e4c3e3..b868ea99 100644 --- a/Assets/Resources/Sprites/Games/FanClub/fanClub_IdolParts.png.meta +++ b/Assets/Resources/Sprites/Games/FanClub/fanClub_IdolParts.png.meta @@ -296,12 +296,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 2 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 300 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 diff --git a/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png index aac3c957..ae7bb753 100644 Binary files a/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png and b/Assets/Resources/Sprites/Games/WizardsWaltz/wizardswaltz_main.png differ diff --git a/Assets/Resources/Sprites/UI/Common/StudioDance/StudioDanceRender.renderTexture b/Assets/Resources/Sprites/UI/Common/StudioDance/StudioDanceRender.renderTexture index 33e0bd90..79e05d18 100644 --- a/Assets/Resources/Sprites/UI/Common/StudioDance/StudioDanceRender.renderTexture +++ b/Assets/Resources/Sprites/UI/Common/StudioDance/StudioDanceRender.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 - m_Width: 1280 - m_Height: 1280 + serializedVersion: 5 + m_Width: 1000 + m_Height: 1000 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 0 + m_DepthStencilFormat: 0 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -28,7 +28,7 @@ RenderTexture: m_EnableCompatibleFormat: 1 m_TextureSettings: serializedVersion: 2 - m_FilterMode: 1 + m_FilterMode: 2 m_Aniso: 0 m_MipBias: 0 m_WrapU: 1 @@ -36,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 7c68ea78..0e1346a1 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -511,6 +511,7 @@ namespace HeavenStudio Destroy(SoundObjects[i].gameObject); SoundObjects.Clear(); + Util.Jukebox.KillOneShots(); } #endregion diff --git a/Assets/Scripts/Games/DJSchool/DJSchool.cs b/Assets/Scripts/Games/DJSchool/DJSchool.cs index fd7d73c4..69360542 100644 --- a/Assets/Scripts/Games/DJSchool/DJSchool.cs +++ b/Assets/Scripts/Games/DJSchool/DJSchool.cs @@ -56,7 +56,7 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("dj voice lines", "DJ Yellow Banter") { - function = delegate { DJSchool.instance.voiceLines(eventCaller.currentEntity.beat, eventCaller.currentEntity["type"]); }, + function = delegate { DJSchool.instance.VoiceLines(eventCaller.currentEntity.beat, eventCaller.currentEntity["type"]); }, defaultLength = 2f, inactiveFunction = delegate { DJSchool.WarnDJVoiceLines(eventCaller.currentEntity.beat, eventCaller.currentEntity["type"]); }, parameters = new List() @@ -66,11 +66,11 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("sound FX", "Scratchy Music") { - function = delegate { DJSchool.instance.soundFX(eventCaller.currentEntity["toggle"]); }, + function = delegate { DJSchool.SoundFX(eventCaller.currentEntity["toggle"]); }, defaultLength = 0.5f, parameters = new List() { - new Param("toggle", false, "Radio FX", "Toggle on and off for Radio Effects") + new Param("toggle", true, "Radio FX", "Toggle on and off for Radio Effects") } }, new GameAction("forceHold", "Force Hold") @@ -156,7 +156,7 @@ namespace HeavenStudio.Games } else if(wantDJVoiceLines != Single.MinValue) { - voiceLines(wantDJVoiceLines, 0); + VoiceLines(wantDJVoiceLines, 0); wantDJVoiceLines = Single.MinValue; } } @@ -549,11 +549,11 @@ namespace HeavenStudio.Games // student.ResetState(); //} - public void soundFX(bool toggle) + public static void SoundFX(bool toggle) { - student.soundFX = toggle; + Student.soundFX = toggle; } - public void voiceLines(float beat, int type) + public void VoiceLines(float beat, int type) { string[] sounds; var sound = new MultiSound.Sound[] { }; diff --git a/Assets/Scripts/Games/DJSchool/Student.cs b/Assets/Scripts/Games/DJSchool/Student.cs index 84358d96..4847dfe4 100644 --- a/Assets/Scripts/Games/DJSchool/Student.cs +++ b/Assets/Scripts/Games/DJSchool/Student.cs @@ -12,6 +12,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool public class Student : PlayerActionObject { public Animator anim; + public static bool soundFX; [Header("Properties")] public float holdBeat; @@ -21,7 +22,6 @@ namespace HeavenStudio.Games.Scripts_DJSchool public bool eligible; public bool missed; public bool swiping; - public bool soundFX; bool canBoo = true; [Header("Components")] diff --git a/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs b/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs index f6004260..47d942b2 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs @@ -104,6 +104,10 @@ namespace HeavenStudio.Editor active = true; } + else + { + active = false; + } } private void AddParam(string propertyName, object type, string caption, string tooltip = "") diff --git a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs index 58da4e8f..58607bef 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs @@ -28,7 +28,7 @@ namespace HeavenStudio.Editor _ => Editor.instance.editingInputField = true ); - inputFieldString.onEndEdit.AddListener( + inputFieldString.onValueChanged.AddListener( _ => {; parameterManager.entity[propertyName] = inputFieldString.text; diff --git a/Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/StringChartPropertyPrefab.cs b/Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/StringChartPropertyPrefab.cs index 8a142ab0..5bd84dd5 100644 --- a/Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/StringChartPropertyPrefab.cs +++ b/Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/StringChartPropertyPrefab.cs @@ -28,7 +28,7 @@ namespace HeavenStudio.Editor _ => Editor.instance.editingInputField = true ); - inputFieldString.onEndEdit.AddListener( + inputFieldString.onValueChanged.AddListener( _ => {; parameterManager.chart[propertyName] = inputFieldString.text; diff --git a/Assets/Scripts/UI/Overlays/SectionMedalsManager.cs b/Assets/Scripts/UI/Overlays/SectionMedalsManager.cs index e63c0534..b5b7cd1c 100644 --- a/Assets/Scripts/UI/Overlays/SectionMedalsManager.cs +++ b/Assets/Scripts/UI/Overlays/SectionMedalsManager.cs @@ -51,7 +51,7 @@ namespace HeavenStudio.Common public void OnSectionChange(DynamicBeatmap.ChartSection section) { if (section == null) return; - Debug.Log(PersistentDataManager.gameSettings.isMedalOn); + if (!PersistentDataManager.gameSettings.isMedalOn) return; if (PersistentDataManager.gameSettings.isMedalOn && !isMedalsStarted) { isMedalsStarted = true; @@ -67,6 +67,7 @@ namespace HeavenStudio.Common public void OnRemixEnd() { + if (!PersistentDataManager.gameSettings.isMedalOn) return; if (PersistentDataManager.gameSettings.isMedalOn && isMedalsStarted) { GameObject medal = Instantiate(isMedalsEligible ? MedalOkPrefab : MedalMissPrefab, MedalsHolder.transform); diff --git a/Assets/Scripts/Util/Jukebox.cs b/Assets/Scripts/Util/Jukebox.cs index 75b134d7..7a77a4d2 100644 --- a/Assets/Scripts/Util/Jukebox.cs +++ b/Assets/Scripts/Util/Jukebox.cs @@ -7,6 +7,9 @@ namespace HeavenStudio.Util { public class Jukebox { + static GameObject oneShotAudioSourceObject; + static AudioSource oneShotAudioSource; + public enum AudioType { OGG, @@ -23,6 +26,14 @@ namespace HeavenStudio.Util GameObject Jukebox = new GameObject("Jukebox"); Jukebox.AddComponent(); Jukebox.tag = "Jukebox"; + + + } + if (oneShotAudioSourceObject == null) + { + oneShotAudioSourceObject = new GameObject("OneShot Audio Source"); + oneShotAudioSource = oneShotAudioSourceObject.AddComponent(); + UnityEngine.Object.DontDestroyOnLoad(oneShotAudioSourceObject); } } @@ -40,15 +51,16 @@ namespace HeavenStudio.Util FindJukebox().GetComponent().volume = volume; } + public static void KillOneShots() + { + if (oneShotAudioSource != null) + { + oneShotAudioSource.Stop(); + } + } + public static Sound PlayOneShot(string name, float beat = -1, float pitch = 1f, float volume = 1f, bool looping = false, string game = null) { - GameObject oneShot = new GameObject("oneShot"); - - AudioSource audioSource = oneShot.AddComponent(); - //audioSource.outputAudioMixerGroup = Settings.GetSFXMixer(); - audioSource.playOnAwake = false; - - Sound snd = oneShot.AddComponent(); AudioClip clip = null; if (game != null) { @@ -72,16 +84,39 @@ namespace HeavenStudio.Util clip = Resources.Load($"Sfx/{name}"); } - snd.clip = clip; - snd.beat = beat; - snd.pitch = pitch; - snd.volume = volume; - snd.looping = looping; - // snd.pitch = (clip.length / Conductor.instance.secPerBeat); + if (looping || beat != -1 || pitch != 1f) + { + GameObject oneShot = new GameObject("oneShot"); - GameManager.instance.SoundObjects.Add(oneShot); + AudioSource audioSource = oneShot.AddComponent(); + //audioSource.outputAudioMixerGroup = Settings.GetSFXMixer(); + audioSource.playOnAwake = false; - return snd; + Sound snd = oneShot.AddComponent(); + + snd.clip = clip; + snd.beat = beat; + snd.pitch = pitch; + snd.volume = volume; + snd.looping = looping; + // snd.pitch = (clip.length / Conductor.instance.secPerBeat); + + GameManager.instance.SoundObjects.Add(oneShot); + + return snd; + } + else + { + if (oneShotAudioSourceObject == null) + { + oneShotAudioSourceObject = new GameObject("OneShot Audio Source"); + oneShotAudioSource = oneShotAudioSourceObject.AddComponent(); + UnityEngine.Object.DontDestroyOnLoad(oneShotAudioSourceObject); + } + + oneShotAudioSource.PlayOneShot(clip, volume); + return null; + } } public static Sound PlayOneShotScheduled(string name, double targetTime, float pitch = 1f, float volume = 1f, bool looping = false, string game = null) diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index 39daefbf..98a4d003 100644 Binary files a/Assets/StreamingAssets/StreamingAssets and b/Assets/StreamingAssets/StreamingAssets differ diff --git a/Assets/StreamingAssets/StreamingAssets.manifest b/Assets/StreamingAssets/StreamingAssets.manifest index 2281801b..737e27cd 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 3784306723 +CRC: 4155798416 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/Assets/StreamingAssets/agbmarcher/common b/Assets/StreamingAssets/agbmarcher/common index 5aba71fe..0d4abba8 100644 Binary files a/Assets/StreamingAssets/agbmarcher/common and b/Assets/StreamingAssets/agbmarcher/common differ diff --git a/Assets/StreamingAssets/agbmarcher/common.manifest b/Assets/StreamingAssets/agbmarcher/common.manifest index 372c0f00..f5f50844 100644 --- a/Assets/StreamingAssets/agbmarcher/common.manifest +++ b/Assets/StreamingAssets/agbmarcher/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 3928469644 +CRC: 2696947868 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 144370751551b2ea261e8003716088ad + Hash: 71227d2dea00e50f13fabe3452feedb0 TypeTreeHash: serializedVersion: 2 Hash: 66d7bc0128dfa9bd2a6d8ac797c3d10f diff --git a/Assets/StreamingAssets/ntridol/common b/Assets/StreamingAssets/ntridol/common index 600a5379..14ffd62d 100644 Binary files a/Assets/StreamingAssets/ntridol/common and b/Assets/StreamingAssets/ntridol/common differ diff --git a/Assets/StreamingAssets/ntridol/common.manifest b/Assets/StreamingAssets/ntridol/common.manifest index 769cda12..7be1c6e4 100644 --- a/Assets/StreamingAssets/ntridol/common.manifest +++ b/Assets/StreamingAssets/ntridol/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 3021707106 +CRC: 1164448568 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 3aa0646695d683b93bdee5580c806613 + Hash: 4a6c0ecd333ce5354d27cff0b9bd39b4 TypeTreeHash: serializedVersion: 2 Hash: a69a432361ad996e59b7d2fb60b810e3 @@ -121,6 +121,7 @@ Assets: - Assets/Resources/Sprites/Games/FanClub/fanClub_IdolParts.png - Assets/Resources/Sprites/Games/FanClub/Animations/Arisa/Long/IdolBigCall1.anim - Assets/Resources/Sprites/Games/FanClub/Animations/Arisa/Long/IdolDab.anim +- Assets/Resources/Sprites/Games/FanClub/fanClub_AmieParts.png - Assets/Resources/Sprites/Games/FanClub/Animations/Arisa/Arrange/IdolBigCall0Arrange.anim - Assets/Resources/Sfx/games/fanClub/play_clap.wav - Assets/Resources/Sprites/Games/FanClub/Animations/Arisa/Long/IdolPeace.anim diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index a1e4f798..3af3701b 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -15,13 +15,13 @@ TagManager: - EventBlocks - EventProperties - RenderTextures - - 3DDefault - - 3DAlt + - GameCamera0 + - GameCamera1 - Flash - Textboxes - StudioDanceRender - - - - + - GameCamera2 + - GameCamera3 - - -