diff --git a/Assets/Resources/Games/forkLifter.prefab b/Assets/Resources/Games/forkLifter.prefab index afa471bdb..48db2abd3 100644 --- a/Assets/Resources/Games/forkLifter.prefab +++ b/Assets/Resources/Games/forkLifter.prefab @@ -1,89 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1149529152017899140 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7756588035483065508} - - component: {fileID: 5509506644699650990} - m_Layer: 0 - m_Name: ViewerBG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7756588035483065508 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1149529152017899140} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.121, y: -0.0864, z: 0} - m_LocalScale: {x: 2.1919, y: 2.2835865, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5813499710761815888} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5509506644699650990 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1149529152017899140} - 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: 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: -252 - m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - 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 &2710624465797362219 GameObject: m_ObjectHideFlags: 0 @@ -366,9 +282,7 @@ Transform: m_LocalPosition: {x: -0.077264786, y: 0.66982126, z: 74.52776} m_LocalScale: {x: 1.5850028, y: 1.5866843, z: 1.6180401} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7756588035483065508} - - {fileID: 4441240923074664422} + m_Children: [] m_Father: {fileID: 5813499711174113251} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -892,7 +806,6 @@ MonoBehaviour: currentEarlyPeasOnFork: 0 currentPerfectPeasOnFork: 0 currentLatePeasOnFork: 0 - eatType: 0 topbun: 0 middleburger: 0 bottombun: 0 @@ -1110,15 +1023,6 @@ MonoBehaviour: handAnim: {fileID: 5813499711174113250} flickedObject: {fileID: 5813499710694194086} peaPreview: {fileID: 5813499711025093251} - bgRecolorables: - - {fileID: 5813499711658895221} - - {fileID: 5813499710761815889} - gradRecolorables: - - {fileID: 5813499711561122392} - - {fileID: 5813499712485673336} - - {fileID: 5509506644699650990} - - {fileID: 1661519934678317608} - - {fileID: 5813499711762093784} bg: {fileID: 5813499711658895221} bgGradient: {fileID: 5813499711561122392} viewerCircle: {fileID: 5813499710761815889} @@ -1581,7 +1485,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5813499711561122393} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -2.36, z: 0} + m_LocalPosition: {x: 0, y: -2.0479, z: 0} m_LocalScale: {x: 134.83125, y: 2.495626, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2543,90 +2447,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &7181315906917902434 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4441240923074664422} - - component: {fileID: 1661519934678317608} - m_Layer: 0 - m_Name: ViewerBGExtension - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4441240923074664422 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7181315906917902434} - m_LocalRotation: {x: -0, y: -0, z: 0.96384364, w: -0.2664687} - m_LocalPosition: {x: 0.6536316, y: -1.0729094, z: 0} - m_LocalScale: {x: 0.19709346, y: 0.31798187, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5813499710761815888} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -149.092} ---- !u!212 &1661519934678317608 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7181315906917902434} - 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: 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: -252 - m_Sprite: {fileID: 7482667652216324306, guid: 75f5f34dc1b5347e0b8351032682f224, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - 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 &8163793729482436657 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 1P/GameSprites.png.meta b/Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 1P/GameSprites.png.meta index 6ee8e4209..0b62c09ad 100644 --- a/Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 1P/GameSprites.png.meta +++ b/Assets/Resources/Sprites/Games/ForkLifter/Fork Lifter 1P/GameSprites.png.meta @@ -348,10 +348,10 @@ TextureImporter: name: bg rect: serializedVersion: 2 - x: 4977 - y: 51 - width: 152 - height: 1004 + x: 4976.5967 + y: 50.7816 + width: 152.3448 + height: 1066.4136 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -941,7 +941,7 @@ TextureImporter: width: 990.2412 height: 431.64362 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs index 92f0e59d0..d16efd5ea 100644 --- a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs +++ b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs @@ -107,8 +107,11 @@ namespace HeavenStudio.Games public Animator handAnim; public GameObject flickedObject; public SpriteRenderer peaPreview; - [SerializeField] SpriteRenderer[] bgRecolorables; - [SerializeField] SpriteRenderer[] gradRecolorables; + [SerializeField] SpriteRenderer bg; + [SerializeField] SpriteRenderer bgGradient; + [SerializeField] SpriteRenderer viewerCircle; + [SerializeField] SpriteRenderer playerShadow; + [SerializeField] SpriteRenderer handShadow; public Sprite[] peaSprites; public Sprite[] peaHitSprites; @@ -181,15 +184,12 @@ namespace HeavenStudio.Games //call this in update private void BackgroundColorUpdate() { - var bgColor = bgColorEase.GetColor(); - foreach (var sr in bgRecolorables) { - sr.color = bgColor; - } + bg.color = + viewerCircle.color = + handShadow.color = bgColorEase.GetColor(); - var gradColor = gradColorEase.GetColor(); - foreach (var sr in gradRecolorables) { - sr.color = gradColor; - } + bgGradient.color = + playerShadow.color = gradColorEase.GetColor(); } public void BackgroundColor(double beat, float length, Color startColor, Color endColor, int ease)