Fork Lifter - new gradients + extra customization
Currently doesn't have proper support for old charts, those will be made to default to the Classic gradient at some point in the future
This commit is contained in:
MiiKEmblem
GitHub
parent
18e4df042a
commit
1fbfa8f41c
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
|
|
@ -360,10 +360,10 @@ TextureImporter:
|
|||
name: bg
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 4976.5967
|
||||
y: 50.7816
|
||||
width: 152.3448
|
||||
height: 1066.4136
|
||||
x: 4983
|
||||
y: 51
|
||||
width: 142
|
||||
height: 1066
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
|
|
@ -953,7 +953,7 @@ TextureImporter:
|
|||
width: 990.2412
|
||||
height: 431.64362
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
|
|
@ -965,6 +965,69 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: gamegradient
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 193
|
||||
y: 1060
|
||||
width: 128
|
||||
height: 500
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: a3a425c27e3c10642b6367c9ca02eb74
|
||||
internalID: 1074703595
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: remixgradient
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 28
|
||||
y: 27
|
||||
width: 128
|
||||
height: 1532
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 15a192101a788b046a32390667a7d1af
|
||||
internalID: -1788309548
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: viewcirclebg
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 2471
|
||||
y: 1830
|
||||
width: 1046
|
||||
height: 1105
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 23216d8b8d38fae4b8c418c129acfe97
|
||||
internalID: 2024232511
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
|
|
@ -999,18 +1062,21 @@ TextureImporter:
|
|||
fork_swipe_1: -7294697356220309840
|
||||
fork_swipe_2: 7602230395459695148
|
||||
forkstab_effect: -2535895568687023267
|
||||
gamegradient: 1074703595
|
||||
hand_shadow1: 7562980635367501552
|
||||
hand_shadow2: -1164378328580708214
|
||||
hitfx_1: 8176908352783466543
|
||||
hitfx_2: -2809503619127399702
|
||||
pea_1: 5792877419163235472
|
||||
pea_2: 5655859219183449053
|
||||
remixgradient: -1788309548
|
||||
shadow: -4362852279230612367
|
||||
thumb_1: 8729287508403444602
|
||||
thumb_2: -4214774725070190255
|
||||
thumb_3: -1669373453243010765
|
||||
topbun: 6815597139681551923
|
||||
topbun_hit: -6775943870119716595
|
||||
viewcirclebg: 2024232511
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
|
|
|
|||
91
Assets/Bundled/Games/ForkLifter/Sprites/flgradient.mat
Normal file
91
Assets/Bundled/Games/ForkLifter/Sprites/flgradient.mat
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: flgradient
|
||||
m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3}
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailAlbedoMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailMask:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailNormalMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _OcclusionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ParallaxMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _ColorMask: 15
|
||||
- _Cutoff: 0.5
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _Stencil: 0
|
||||
- _StencilComp: 8
|
||||
- _StencilOp: 0
|
||||
- _StencilReadMask: 255
|
||||
- _StencilWriteMask: 255
|
||||
- _UVSec: 0
|
||||
- _UseUIAlphaClip: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _ColorAlpha: {r: 0.8784314, g: 0.8784314, b: 0.8784314, a: 1}
|
||||
- _ColorBravo: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _ColorDelta: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f985b76340b0bde458325abfef2cc1e3
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,5 +1,173 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &853955153253986647
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8954726529296470591}
|
||||
- component: {fileID: 5384656832768884501}
|
||||
m_Layer: 0
|
||||
m_Name: Filler
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8954726529296470591
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 853955153253986647}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -0.16016705, y: -7.2698, z: 0}
|
||||
m_LocalScale: {x: 45.859734, y: 14.285204, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4708225563451011159}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &5384656832768884501
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 853955153253986647}
|
||||
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: -151
|
||||
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, 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 &2014175700125331933
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3563736496448447984}
|
||||
- component: {fileID: 4810061997930658618}
|
||||
m_Layer: 0
|
||||
m_Name: viewcirclebg
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3563736496448447984
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2014175700125331933}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0.105, y: -0.089, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5813499710761815888}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &4810061997930658618
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2014175700125331933}
|
||||
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: -100
|
||||
m_Sprite: {fileID: 2024232511, guid: 52117e1d5cd298c42adfea952676c7d6, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 2.288668, y: 2.417761}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &2710624465797362219
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -82,8 +250,11 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 5813499711561122399}
|
||||
- {fileID: 5813499711658895220}
|
||||
- {fileID: 4291166107880106781}
|
||||
- {fileID: 4236074751736965253}
|
||||
- {fileID: 5813499711561122399}
|
||||
- {fileID: 8954726529296470591}
|
||||
m_Father: {fileID: 5813499711186931250}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -282,7 +453,8 @@ 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: []
|
||||
m_Children:
|
||||
- {fileID: 3563736496448447984}
|
||||
m_Father: {fileID: 5813499711174113251}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -447,7 +619,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5813499710843775435}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 2.582, y: -3.9987, z: 0}
|
||||
m_LocalPosition: {x: 2.575, y: -3.9987, z: 0}
|
||||
m_LocalScale: {x: 1.080676, y: 1.2177411, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -474,7 +646,7 @@ SpriteRenderer:
|
|||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
- {fileID: 2100000, guid: f985b76340b0bde458325abfef2cc1e3, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -806,6 +978,7 @@ MonoBehaviour:
|
|||
currentEarlyPeasOnFork: 0
|
||||
currentPerfectPeasOnFork: 0
|
||||
currentLatePeasOnFork: 0
|
||||
eatType: 0
|
||||
topbun: 0
|
||||
middleburger: 0
|
||||
bottombun: 0
|
||||
|
|
@ -1024,8 +1197,14 @@ MonoBehaviour:
|
|||
flickedObject: {fileID: 5813499710694194086}
|
||||
peaPreview: {fileID: 5813499711025093251}
|
||||
bg: {fileID: 5813499711658895221}
|
||||
bgGradient: {fileID: 5813499711561122392}
|
||||
gradientMaterial: {fileID: 2100000, guid: f985b76340b0bde458325abfef2cc1e3, type: 2}
|
||||
Gradients:
|
||||
- {fileID: 9176978866574094514}
|
||||
- {fileID: 92558363803441739}
|
||||
- {fileID: 5813499711561122392}
|
||||
gradientFiller: {fileID: 5384656832768884501}
|
||||
viewerCircle: {fileID: 5813499710761815889}
|
||||
viewerCircleBg: {fileID: 4810061997930658618}
|
||||
playerShadow: {fileID: 5813499712485673336}
|
||||
handShadow: {fileID: 5813499711762093784}
|
||||
peaSprites:
|
||||
|
|
@ -1471,12 +1650,12 @@ GameObject:
|
|||
- component: {fileID: 5813499711561122399}
|
||||
- component: {fileID: 5813499711561122392}
|
||||
m_Layer: 0
|
||||
m_Name: Gradient
|
||||
m_Name: GradientClassic
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &5813499711561122399
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1485,12 +1664,12 @@ 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.0479, z: 0}
|
||||
m_LocalScale: {x: 134.83125, y: 2.495626, z: 1}
|
||||
m_LocalPosition: {x: -0.18896, y: -2.0479, z: 0}
|
||||
m_LocalScale: {x: 146.75307, y: 2.495626, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4708225563451011159}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &5813499711561122392
|
||||
SpriteRenderer:
|
||||
|
|
@ -1680,7 +1859,7 @@ SpriteRenderer:
|
|||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
- {fileID: 2100000, guid: f985b76340b0bde458325abfef2cc1e3, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -1742,7 +1921,7 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4708225563451011159}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &5813499711658895221
|
||||
SpriteRenderer:
|
||||
|
|
@ -2219,7 +2398,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5813499712464370668}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 1.8255, y: -3.9987, z: 0}
|
||||
m_LocalPosition: {x: 1.845, y: -3.9987, z: 0}
|
||||
m_LocalScale: {x: 1.080676, y: 1.2177411, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -2246,7 +2425,7 @@ SpriteRenderer:
|
|||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
- {fileID: 2100000, guid: f985b76340b0bde458325abfef2cc1e3, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -2447,6 +2626,174 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &6267496672331785062
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4236074751736965253}
|
||||
- component: {fileID: 92558363803441739}
|
||||
m_Layer: 0
|
||||
m_Name: GradientRemix
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!4 &4236074751736965253
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6267496672331785062}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -1.0583, y: -1.968, z: 0}
|
||||
m_LocalScale: {x: 157.24158, y: 1.55, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4708225563451011159}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &92558363803441739
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6267496672331785062}
|
||||
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: f985b76340b0bde458325abfef2cc1e3, 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: -150
|
||||
m_Sprite: {fileID: -1788309548, guid: 52117e1d5cd298c42adfea952676c7d6, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.28006643, y: 3.3520453}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &7849765946591428912
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4291166107880106781}
|
||||
- component: {fileID: 9176978866574094514}
|
||||
m_Layer: 0
|
||||
m_Name: GradientGame
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4291166107880106781
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7849765946591428912}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -1.0434, y: -0.07, z: 0}
|
||||
m_LocalScale: {x: 157.23148, y: 1.2, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4708225563451011159}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &9176978866574094514
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7849765946591428912}
|
||||
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: f985b76340b0bde458325abfef2cc1e3, 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: -150
|
||||
m_Sprite: {fileID: 1074703595, guid: 52117e1d5cd298c42adfea952676c7d6, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.28006643, y: 1.0940095}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &8163793729482436657
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||
using UnityEngine;
|
||||
|
||||
using HeavenStudio.Util;
|
||||
using Jukebox;
|
||||
using HeavenStudio.Games.Scripts_ForkLifter;
|
||||
|
||||
namespace HeavenStudio.Games.Loaders
|
||||
|
|
@ -11,6 +12,7 @@ namespace HeavenStudio.Games.Loaders
|
|||
public static class RvlForkLoader
|
||||
{
|
||||
public static Minigame AddGame(EventCaller eventCaller) {
|
||||
|
||||
return new Minigame("forkLifter", "Fork Lifter", "f1f1f1", false, false, new List<GameAction>()
|
||||
{
|
||||
new GameAction("flick", "Flick Food")
|
||||
|
|
@ -64,12 +66,24 @@ namespace HeavenStudio.Games.Loaders
|
|||
},
|
||||
new GameAction("colorGrad", "Gradient Appearance")
|
||||
{
|
||||
function = delegate { var e = eventCaller.currentEntity; ForkLifter.instance.BackgroundColorGrad(e.beat, e.length, e["start"], e["end"], e["ease"]); },
|
||||
function = delegate { var e = eventCaller.currentEntity; ForkLifter.instance.BackgroundColorGrad(e.beat, e.length, e["type"], e["toggle"], e["start"], e["end"], e["startBG"], e["endBG"], e["ease"]); },
|
||||
resizable = true,
|
||||
parameters = new List<Param>()
|
||||
{
|
||||
new Param("start", Color.white, "Start Color", "Set the color at the start of the event."),
|
||||
new Param("end", Color.white, "End Color", "Set the color at the end of the event."),
|
||||
new Param("type", ForkLifter.GradientType.Game, "Gradient Type", "Set the type of gradient.", new List<Param.CollapseParam>()
|
||||
{
|
||||
new Param.CollapseParam((x, _) => (int)x != (int)ForkLifter.GradientType.Classic, new string[] { "startBG", "endBG" })
|
||||
}),
|
||||
|
||||
new Param("toggle", false, "Viewcircle Uses Gradient Color", "If toggled, the viewcircle's background will use the gradient color."),
|
||||
|
||||
new Param("start", new Color(224/255f, 224/255f, 224/255f), "Gradient Start", "Set the color at the start of the event."),
|
||||
new Param("end", new Color(224/255f, 224/255f, 224/255f), "Gradient End", "Set the color at the end of the event."),
|
||||
|
||||
|
||||
new Param("startBG", Color.white, "Gradient BG Start", "Set the color at the start of the event."),
|
||||
new Param("endBG", Color.white, "Gradient BG End", "Set the color at the end of the event."),
|
||||
|
||||
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.")
|
||||
},
|
||||
},
|
||||
|
|
@ -85,11 +99,12 @@ namespace HeavenStudio.Games.Loaders
|
|||
|
||||
namespace HeavenStudio.Games
|
||||
{
|
||||
using Jukebox;
|
||||
// using Jukebox;
|
||||
using Scripts_ForkLifter;
|
||||
|
||||
public class ForkLifter : Minigame
|
||||
{
|
||||
|
||||
public enum FlickType
|
||||
{
|
||||
Pea,
|
||||
|
|
@ -97,6 +112,13 @@ namespace HeavenStudio.Games
|
|||
Burger,
|
||||
BottomBun
|
||||
}
|
||||
|
||||
public enum GradientType
|
||||
{
|
||||
Game,
|
||||
Remix,
|
||||
Classic
|
||||
}
|
||||
|
||||
public static ForkLifter instance;
|
||||
public static ForkLifterPlayer playerInstance => ForkLifterPlayer.instance;
|
||||
|
|
@ -109,10 +131,16 @@ namespace HeavenStudio.Games
|
|||
public GameObject flickedObject;
|
||||
public SpriteRenderer peaPreview;
|
||||
[SerializeField] SpriteRenderer bg;
|
||||
[SerializeField] SpriteRenderer bgGradient;
|
||||
|
||||
public Material gradientMaterial;
|
||||
public SpriteRenderer[] Gradients;
|
||||
[SerializeField] SpriteRenderer gradientFiller;
|
||||
|
||||
[SerializeField] SpriteRenderer viewerCircle;
|
||||
[SerializeField] SpriteRenderer viewerCircleBg;
|
||||
[SerializeField] SpriteRenderer playerShadow;
|
||||
[SerializeField] SpriteRenderer handShadow;
|
||||
//public SpriteRenderer[] forkEffects;
|
||||
|
||||
public Sprite[] peaSprites;
|
||||
public Sprite[] peaHitSprites;
|
||||
|
|
@ -120,6 +148,9 @@ namespace HeavenStudio.Games
|
|||
private void Awake()
|
||||
{
|
||||
instance = this;
|
||||
//gradientMaterial.SetColor("_ColorAlpha", new Color(224/255f, 224/255f, 224/255f));
|
||||
//gradientMaterial.SetColor("_ColorBravo", Color.white);
|
||||
//gradientMaterial.SetColor("_ColorDelta", Color.white);
|
||||
}
|
||||
|
||||
private void Update()
|
||||
|
|
@ -145,7 +176,7 @@ namespace HeavenStudio.Games
|
|||
|
||||
var lastColorGrad = actionsBefore.FindLast(e => e.datamodel == "forkLifter/colorGrad");
|
||||
if (lastColorGrad != null) {
|
||||
BackgroundColorGrad(lastColorGrad.beat, lastColorGrad.length, lastColorGrad["start"], lastColorGrad["end"], lastColorGrad["ease"]);
|
||||
BackgroundColorGrad(lastColorGrad.beat, lastColorGrad.length, lastColorGrad["type"], lastColorGrad["toggle"], lastColorGrad["start"], lastColorGrad["end"], lastColorGrad["startBG"], lastColorGrad["endBG"], lastColorGrad["ease"]);
|
||||
}
|
||||
|
||||
var tempFlicks = actions.FindAll(e => e.datamodel == "forkLifter/flick");
|
||||
|
|
@ -180,17 +211,45 @@ namespace HeavenStudio.Games
|
|||
}
|
||||
|
||||
private ColorEase bgColorEase = new(Color.white);
|
||||
private ColorEase gradColorEase = new(Color.white);
|
||||
private ColorEase gradColorEase = new(new Color(224/255f, 224/255f, 224/255f));
|
||||
private ColorEase gradBgEase = new(Color.white);
|
||||
private bool vCircleToggle = false;
|
||||
|
||||
//call this in update
|
||||
private void BackgroundColorUpdate()
|
||||
{
|
||||
bg.color =
|
||||
viewerCircle.color =
|
||||
handShadow.color = bgColorEase.GetColor();
|
||||
|
||||
bgGradient.color =
|
||||
playerShadow.color = gradColorEase.GetColor();
|
||||
bg.color =
|
||||
viewerCircle.color = bgColorEase.GetColor();
|
||||
|
||||
if (Gradients[2].gameObject.activeSelf)
|
||||
{
|
||||
Gradients[2].color =
|
||||
gradientFiller.color =
|
||||
playerShadow.color = gradColorEase.GetColor();
|
||||
|
||||
gradientMaterial.SetColor("_ColorDelta", gradColorEase.GetColor());
|
||||
}
|
||||
else
|
||||
{
|
||||
playerShadow.color =
|
||||
gradientFiller.color = gradBgEase.GetColor();
|
||||
|
||||
gradientMaterial.SetColor("_ColorAlpha", gradColorEase.GetColor());
|
||||
gradientMaterial.SetColor("_ColorBravo", bgColorEase.GetColor());
|
||||
gradientMaterial.SetColor("_ColorDelta", gradBgEase.GetColor());
|
||||
}
|
||||
|
||||
if (vCircleToggle)
|
||||
{
|
||||
viewerCircleBg.color =
|
||||
handShadow.color = gradColorEase.GetColor();
|
||||
}
|
||||
else
|
||||
{
|
||||
viewerCircleBg.color =
|
||||
handShadow.color = bgColorEase.GetColor();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void BackgroundColor(double beat, float length, Color startColor, Color endColor, int ease)
|
||||
|
|
@ -198,9 +257,17 @@ namespace HeavenStudio.Games
|
|||
bgColorEase = new ColorEase(beat, length, startColor, endColor, ease);
|
||||
}
|
||||
|
||||
public void BackgroundColorGrad(double beat, float length, Color startColor, Color endColor, int ease)
|
||||
public void BackgroundColorGrad(double beat, float length, int gradType, bool vCircle, Color startColor, Color endColor, Color startBottom, Color endBottom, int ease)
|
||||
{
|
||||
gradColorEase = new ColorEase(beat, length, startColor, endColor, ease);
|
||||
gradBgEase = new ColorEase(beat, length, startBottom, endBottom, ease);
|
||||
|
||||
for (int i = 0; i < Gradients.Length; i++)
|
||||
{
|
||||
Gradients[i].gameObject.SetActive(gradType == (i));
|
||||
}
|
||||
|
||||
vCircleToggle = (vCircle);
|
||||
}
|
||||
|
||||
//call this in OnPlay(double beat) and OnGameSwitch(double beat)
|
||||
|
|
@ -219,7 +286,7 @@ namespace HeavenStudio.Games
|
|||
{
|
||||
allEventsBeforeBeatGrad.Sort((x, y) => x.beat.CompareTo(y.beat)); //just in case
|
||||
var lastEventGrad = allEventsBeforeBeatGrad[^1];
|
||||
BackgroundColorGrad(lastEventGrad.beat, lastEventGrad.length, lastEventGrad["start"], lastEventGrad["end"], lastEventGrad["ease"]);
|
||||
BackgroundColorGrad(lastEventGrad.beat, lastEventGrad.length, lastEventGrad["type"], lastEventGrad["toggle"], lastEventGrad["start"], lastEventGrad["end"], lastEventGrad["startBG"], lastEventGrad["endBG"], lastEventGrad["ease"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue