diff --git a/Assets/Resources/Games/chargingChicken.prefab b/Assets/Resources/Games/chargingChicken.prefab
index ed628c74b..6111c4379 100644
--- a/Assets/Resources/Games/chargingChicken.prefab
+++ b/Assets/Resources/Games/chargingChicken.prefab
@@ -961,7 +961,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 7175441d8335b0b48a7c1ee600c3cc06, type: 2}
+ - {fileID: 2100000, guid: 0c0682d28a35bcf4cb11ee90866d8317, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -1449,7 +1449,7 @@ Transform:
m_Children:
- {fileID: 1720440360485531206}
m_Father: {fileID: 3741404894539420991}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1480850386324900587
GameObject:
@@ -1940,7 +1940,7 @@ Transform:
- {fileID: 3423256163495674151}
- {fileID: 537626956312802891}
m_Father: {fileID: 3741404894539420991}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2096291403803851841
GameObject:
@@ -2259,6 +2259,7 @@ Transform:
m_Children:
- {fileID: 2891446056348125130}
- {fileID: 757813538384980026}
+ - {fileID: 1147558205228425458}
- {fileID: 8586197149551125814}
- {fileID: 4973083106942372806}
- {fileID: 3999153472455551722}
@@ -2860,10 +2861,13 @@ MonoBehaviour:
endingText: {fileID: 8315137396691253404}
bubbleText: {fileID: 5637715493577622280}
countBubble: {fileID: 1476223279408625812}
+ Helmet: {fileID: 7194465983669311796}
+ FallingHelmet: {fileID: 8083878461408320050}
IslandBase: {fileID: 452761269397350257, guid: 9b9f56f7fd4b4ea43a550dca1b787e98, type: 3}
chickenColors: {fileID: 2100000, guid: acc543038ca31514fa57524efa7642f9, type: 2}
chickenColorsCar: {fileID: 2100000, guid: 4aa5aff8032c4fc4c9eed48b94c47773, type: 2}
chickenColorsCloud: {fileID: 2100000, guid: 7175441d8335b0b48a7c1ee600c3cc06, type: 2}
+ chickenColorsDoodles: {fileID: 2100000, guid: d04b9deac089bcc46bde5eb3994b4fd9, type: 2}
chickenColorsWater: {fileID: 2100000, guid: 05842492ce6e9674c8e9aedb25b185e1, type: 2}
headlightColor: {fileID: 1126427993834615640}
--- !u!1 &3118360541996936646
@@ -3570,7 +3574,8 @@ Transform:
m_LocalPosition: {x: 0.088, y: -0.328, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children: []
+ m_Children:
+ - {fileID: 1727878830292410856}
m_Father: {fileID: 4525194693114590921}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3740,7 +3745,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3741404894539420991}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4717235389013309727
SpriteRenderer:
@@ -4266,7 +4271,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 7175441d8335b0b48a7c1ee600c3cc06, type: 2}
+ - {fileID: 2100000, guid: 0c0682d28a35bcf4cb11ee90866d8317, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -4518,7 +4523,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 7175441d8335b0b48a7c1ee600c3cc06, type: 2}
+ - {fileID: 2100000, guid: 0c0682d28a35bcf4cb11ee90866d8317, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -4938,7 +4943,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 7175441d8335b0b48a7c1ee600c3cc06, type: 2}
+ - {fileID: 2100000, guid: 0c0682d28a35bcf4cb11ee90866d8317, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -5457,7 +5462,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3741404894539420991}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7873478731497898566
SpriteRenderer:
@@ -6027,7 +6032,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 7175441d8335b0b48a7c1ee600c3cc06, type: 2}
+ - {fileID: 2100000, guid: 0c0682d28a35bcf4cb11ee90866d8317, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -6647,6 +6652,90 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &7194465983669311796
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1147558205228425458}
+ - component: {fileID: 5852159007658532023}
+ m_Layer: 0
+ m_Name: Helmet
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &1147558205228425458
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7194465983669311796}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -2.624, y: 2.027, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 3741404894539420991}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &5852159007658532023
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7194465983669311796}
+ 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: 9
+ m_Sprite: {fileID: -302632905, guid: 3ac0eae7763e7cc4ab4d8c48e0be1115, 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.83, y: 1.84}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
--- !u!1 &7367307379309811386
GameObject:
m_ObjectHideFlags: 0
@@ -7450,6 +7539,90 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &8083878461408320050
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1727878830292410856}
+ - component: {fileID: 4321222784282943869}
+ m_Layer: 0
+ m_Name: Helmet
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &1727878830292410856
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8083878461408320050}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.039000094, y: 1.3610001, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1383189561106073464}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &4321222784282943869
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8083878461408320050}
+ 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: 20
+ m_Sprite: {fileID: -302632905, guid: 3ac0eae7763e7cc4ab4d8c48e0be1115, 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.83, y: 1.84}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
--- !u!1 &8114048626471391837
GameObject:
m_ObjectHideFlags: 0
@@ -8348,7 +8521,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 7175441d8335b0b48a7c1ee600c3cc06, type: 2}
+ - {fileID: 2100000, guid: 0c0682d28a35bcf4cb11ee90866d8317, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
diff --git a/Assets/Resources/Prefabs/Games/ChargingChicken/Island.prefab b/Assets/Resources/Prefabs/Games/ChargingChicken/Island.prefab
index 59b1079ba..151afd519 100644
--- a/Assets/Resources/Prefabs/Games/ChargingChicken/Island.prefab
+++ b/Assets/Resources/Prefabs/Games/ChargingChicken/Island.prefab
@@ -34545,6 +34545,90 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &1907570764600372448
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 953509404933137280}
+ - component: {fileID: 2976796257370822217}
+ m_Layer: 0
+ m_Name: Helmet
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &953509404933137280
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1907570764600372448}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -2.6230047, y: 2.0330043, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 190759122121786419}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &2976796257370822217
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1907570764600372448}
+ m_Enabled: 0
+ 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: 16
+ m_Sprite: {fileID: -302632905, guid: 3ac0eae7763e7cc4ab4d8c48e0be1115, 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.83, y: 1.84}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
--- !u!1 &2831391949085393977
GameObject:
m_ObjectHideFlags: 0
@@ -83981,6 +84065,7 @@ MonoBehaviour:
Platform1: {fileID: 7681896577572022242}
Platform2: {fileID: 80156402005524873}
Platform3: {fileID: 8734499266199773495}
+ Helmet: {fileID: 1907570764600372448}
IslandCollapse: {fileID: 6717171227533536638}
IslandCollapseNg: {fileID: 8060048147632201339}
StoneSplashEffect: {fileID: 9098506809280722272}
@@ -98916,6 +99001,7 @@ Transform:
- {fileID: 7608079015913830658}
- {fileID: 607444921054889115}
- {fileID: 3266090551929058196}
+ - {fileID: 953509404933137280}
m_Father: {fileID: 6281723798938720719}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenBomb.anim b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenBomb.anim
index 89b412d57..fb5527b3b 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenBomb.anim
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenBomb.anim
@@ -127,7 +127,26 @@ AnimationClip:
m_RotationOrder: 4
path:
m_ScaleCurves: []
- m_FloatCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
@@ -164,6 +183,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 3305885265
+ script: {fileID: 0}
+ typeID: 212
+ customType: 0
+ isPPtrCurve: 0
- serializedVersion: 2
path: 1529485059
attribute: 0
@@ -554,6 +580,25 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenCharge.anim b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenCharge.anim
index 46949e5b6..7e50d7063 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenCharge.anim
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenCharge.anim
@@ -84,7 +84,26 @@ AnimationClip:
m_RotationOrder: 4
path: CarBody
m_ScaleCurves: []
- m_FloatCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
@@ -114,6 +133,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 3305885265
+ script: {fileID: 0}
+ typeID: 212
+ customType: 0
+ isPPtrCurve: 0
- serializedVersion: 2
path: 1529485059
attribute: 0
@@ -366,6 +392,25 @@ AnimationClip:
path: CarBody
classID: 4
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenFall.anim b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenFall.anim
index 5eea207d6..753cdd03f 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenFall.anim
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenFall.anim
@@ -234,6 +234,25 @@ AnimationClip:
path: WheelR
classID: 1
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -291,6 +310,13 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 3305885265
+ script: {fileID: 0}
+ typeID: 212
+ customType: 0
+ isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -684,6 +710,25 @@ AnimationClip:
path: FallingCar
classID: 4
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenGone.anim b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenGone.anim
index cd60514ca..5161cd419 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenGone.anim
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenGone.anim
@@ -131,6 +131,25 @@ AnimationClip:
path: CarBody/CarColor
classID: 212
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -181,6 +200,13 @@ AnimationClip:
typeID: 212
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 3305885265
+ script: {fileID: 0}
+ typeID: 212
+ customType: 0
+ isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -317,6 +343,25 @@ AnimationClip:
path: CarBody/CarColor
classID: 212
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenIdle.anim b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenIdle.anim
index 551105691..81652ec99 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenIdle.anim
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenIdle.anim
@@ -48,7 +48,26 @@ AnimationClip:
m_RotationOrder: 4
path: CarWindow
m_ScaleCurves: []
- m_FloatCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
@@ -78,6 +97,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 3305885265
+ script: {fileID: 0}
+ typeID: 212
+ customType: 0
+ isPPtrCurve: 0
- serializedVersion: 2
path: 1529485059
attribute: 0
@@ -222,6 +248,25 @@ AnimationClip:
path: CarWindow
classID: 4
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenPrepare.anim b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenPrepare.anim
index b994149c0..b6ae1e9a0 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenPrepare.anim
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenPrepare.anim
@@ -110,8 +110,77 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path:
- m_ScaleCurves: []
- m_FloatCurves: []
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: -2.624, y: 2.262, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.033333335
+ value: {x: -2.624, y: 1.674, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path: Helmet
+ m_ScaleCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: 0.9, y: 1, z: 1}
+ inSlope: {x: Infinity, y: 0, z: 0}
+ outSlope: {x: Infinity, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path: Helmet
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.06666667
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
@@ -149,6 +218,27 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 3
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 3305885265
+ script: {fileID: 0}
+ typeID: 212
+ customType: 0
+ isPPtrCurve: 0
- serializedVersion: 2
path: 1529485059
attribute: 0
@@ -486,6 +576,175 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -2.624
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.033333335
+ value: -2.624
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path: Helmet
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 2.262
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.033333335
+ value: 1.674
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path: Helmet
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.033333335
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path: Helmet
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.9
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.x
+ path: Helmet
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.y
+ path: Helmet
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalScale.z
+ path: Helmet
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.06666667
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenRide.anim b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenRide.anim
index e3016a2e7..423b600da 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenRide.anim
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenRide.anim
@@ -101,6 +101,49 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: CarBody
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: -2.492, y: 2.027, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.06666667
+ value: {x: -2.624, y: 1.987, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.13333334
+ value: {x: -2.703, y: 2.027, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.2
+ value: {x: -2.703, y: 1.987, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path: Helmet
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
@@ -154,6 +197,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
- serializedVersion: 2
path: 1529485059
attribute: 0
@@ -480,6 +530,144 @@ AnimationClip:
path: CarBody
classID: 4
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -2.492
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.06666667
+ value: -2.624
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.13333334
+ value: -2.703
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.2
+ value: -2.703
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path: Helmet
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 2.027
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.06666667
+ value: 1.987
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.13333334
+ value: 2.027
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.2
+ value: 1.987
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path: Helmet
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.06666667
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.13333334
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.2
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path: Helmet
+ classID: 4
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenTooFar.anim b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenTooFar.anim
index 3e4b67766..8fe1a09b7 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenTooFar.anim
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/Chicken/ChickenTooFar.anim
@@ -234,6 +234,25 @@ AnimationClip:
path: WheelR
classID: 1
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -291,6 +310,13 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 3305885265
+ script: {fileID: 0}
+ typeID: 212
+ customType: 0
+ isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -684,6 +710,25 @@ AnimationClip:
path: FallingCar
classID: 4
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/FakeChicken/FakeChickenBurn.anim b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/FakeChicken/FakeChickenBurn.anim
index 9437114c7..5ec16ff1b 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/FakeChicken/FakeChickenBurn.anim
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/FakeChicken/FakeChickenBurn.anim
@@ -55,6 +55,25 @@ AnimationClip:
path: BurnedChicken/Eyeball
classID: 212
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
@@ -92,6 +111,13 @@ AnimationClip:
typeID: 212
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 3305885265
+ script: {fileID: 0}
+ typeID: 212
+ customType: 0
+ isPPtrCurve: 0
- serializedVersion: 2
path: 1360033472
attribute: 0
@@ -164,6 +190,25 @@ AnimationClip:
path: BurnedChicken/Eyeball
classID: 212
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/FakeChicken/FakeChickenIdle.anim b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/FakeChicken/FakeChickenIdle.anim
index 2400a6917..032ae2e8e 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/FakeChicken/FakeChickenIdle.anim
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/FakeChicken/FakeChickenIdle.anim
@@ -93,6 +93,25 @@ AnimationClip:
path: CarBody/CarWindow
classID: 212
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -129,6 +148,13 @@ AnimationClip:
typeID: 212
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 3305885265
+ script: {fileID: 0}
+ typeID: 212
+ customType: 0
+ isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -227,6 +253,25 @@ AnimationClip:
path: CarBody/CarWindow
classID: 212
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/FakeChicken/FakeChickenRespawn.anim b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/FakeChicken/FakeChickenRespawn.anim
index 2705ace7f..0c352e8ab 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Animations/FakeChicken/FakeChickenRespawn.anim
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Animations/FakeChicken/FakeChickenRespawn.anim
@@ -202,6 +202,43 @@ AnimationClip:
path: CarBody/CarColor
classID: 212
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.06666667
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.13333334
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -245,6 +282,13 @@ AnimationClip:
typeID: 212
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2097605520
+ attribute: 3305885265
+ script: {fileID: 0}
+ typeID: 212
+ customType: 0
+ isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -452,6 +496,43 @@ AnimationClip:
path: CarBody/CarColor
classID: 212
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.06666667
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.13333334
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Enabled
+ path: Helmet
+ classID: 212
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Materials/ChickenMirage.shader b/Assets/Resources/Sprites/Games/ChargingChicken/Materials/ChickenMirage.shader
index 709d4fc8c..d422e769a 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Materials/ChickenMirage.shader
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Materials/ChickenMirage.shader
@@ -3,7 +3,8 @@ Shader "Sprites/ChickenMirage"
Properties
{
[PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {}
- _Color ("Tint", Color) = (1,1,1,1)
+ _Color1 ("Top Color", Color) = (1,1,1,1)
+ _Color ("Bottom Color", Color) = (1,1,1,1)
_Speed1 ("Wobble Speed", Float) = 1
_Alpha ("Alpha", Float) = 1
[MaterialToggle] PixelSnap ("Pixel snap", Float) = 0
@@ -44,9 +45,11 @@ Shader "Sprites/ChickenMirage"
{
float4 vertex : SV_POSITION;
fixed4 color : COLOR;
- float2 texcoord : TEXCOORD0;
+ float2 texcoord : TEXCOORD0;
+ float2 screenPos: TEXCOORD2;
};
+ fixed4 _Color1;
fixed4 _Color;
v2f vert(appdata_t IN)
@@ -54,7 +57,8 @@ Shader "Sprites/ChickenMirage"
v2f OUT;
OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord;
- OUT.color = IN.color * _Color;
+ OUT.color = IN.color;
+ OUT.screenPos = ComputeScreenPos(IN.vertex);
#ifdef PIXELSNAP_ON
OUT.vertex = UnityPixelSnap (OUT.vertex);
#endif
@@ -86,8 +90,12 @@ Shader "Sprites/ChickenMirage"
fixed2 wobble = (IN.texcoord);
wobble.x = ((wobble.x + (sin((_Time.y * _Speed1 * 3) + wobble.y * 100) / 1000) + 1)) % 1;
fixed4 input2 = SampleSpriteTexture (wobble);
+ float screenPosAdjusted = clamp((IN.screenPos.y / 30) + 0.5, 0, 1);
+ fixed4 ColorAdjusted = ((_Color) * screenPosAdjusted) + ((_Color1) * (1 - screenPosAdjusted));
+ input1 *= ColorAdjusted;
+ input2 *= ColorAdjusted;
fixed4 c = (input1 + input2) / 1.5;
- c *= _Color;
+ c *= ColorAdjusted;
c.a *= _Alpha;
return c;
}
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Materials/chicken_mirage.mat b/Assets/Resources/Sprites/Games/ChargingChicken/Materials/chicken_mirage.mat
index f19488fb6..9a6758912 100644
--- a/Assets/Resources/Sprites/Games/ChargingChicken/Materials/chicken_mirage.mat
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Materials/chicken_mirage.mat
@@ -102,7 +102,8 @@ Material:
m_Colors:
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 0.78431374, g: 0.9411765, b: 0.9411765, a: 1}
+ - _Color1: {r: 1, g: 1, b: 1, a: 1}
- _ColorAlpha: {r: 1, g: 0, b: 0, a: 1}
- _ColorBravo: {r: 0, g: 1, b: 0, a: 1}
- _ColorDelta: {r: 0, g: 0, b: 1, a: 1}
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Materials/chicken_starshader.mat b/Assets/Resources/Sprites/Games/ChargingChicken/Materials/chicken_starshader.mat
new file mode 100644
index 000000000..e8241f6b8
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Materials/chicken_starshader.mat
@@ -0,0 +1,95 @@
+%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: chicken_starshader
+ m_Shader: {fileID: 4800000, guid: 05b2b41ae5e852e44a848016376434c8, 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:
+ - PixelSnap: 0
+ - _Alpha: 1
+ - _BumpScale: 1
+ - _ColorMask: 15
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _GrayscaleAmount: 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.78431374, g: 0.9411765, b: 0.9411765, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _ColorAlpha: {r: 1, g: 0, b: 0, a: 1}
+ - _ColorBravo: {r: 0, g: 1, b: 0, a: 1}
+ - _ColorDelta: {r: 0, g: 0, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _OutlineColor: {r: 0.9529412, g: 0.92058825, b: 0.8401961, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Materials/chicken_starshader.mat.meta b/Assets/Resources/Sprites/Games/ChargingChicken/Materials/chicken_starshader.mat.meta
new file mode 100644
index 000000000..df27e7131
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/ChargingChicken/Materials/chicken_starshader.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0c0682d28a35bcf4cb11ee90866d8317
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/future.000.png b/Assets/Resources/Sprites/Games/ChargingChicken/future.000.png
deleted file mode 100644
index dfd663301..000000000
Binary files a/Assets/Resources/Sprites/Games/ChargingChicken/future.000.png and /dev/null differ
diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/future.000.png.meta b/Assets/Resources/Sprites/Games/ChargingChicken/future.000.png.meta
deleted file mode 100644
index 229fd788f..000000000
--- a/Assets/Resources/Sprites/Games/ChargingChicken/future.000.png.meta
+++ /dev/null
@@ -1,123 +0,0 @@
-fileFormatVersion: 2
-guid: 367b968bb890ae341887e6b785cf1495
-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: 1
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- 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: 2048
- 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: []
- outline: []
- physicsShape: []
- bones: []
- spriteID: 5e97eb03825dee720800000000000000
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- nameFileIdTable: {}
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity
index 5bc407179..b67171529 100644
--- a/Assets/Scenes/Editor.unity
+++ b/Assets/Scenes/Editor.unity
@@ -414,9 +414,9 @@ RectTransform:
m_Father: {fileID: 574002313}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 0, y: -21}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &9435782
@@ -3846,9 +3846,9 @@ RectTransform:
m_Father: {fileID: 539838476}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 32, y: -21}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &121871281
@@ -4070,9 +4070,9 @@ RectTransform:
m_Father: {fileID: 539838476}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 72, y: -21}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &129013734
@@ -4206,9 +4206,9 @@ RectTransform:
m_Father: {fileID: 539838476}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 112, y: -21}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &151246938
@@ -24623,8 +24623,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
- m_Value: 1
- m_Size: 1
+ m_Value: 0
+ m_Size: 0.99946696
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -30367,7 +30367,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 91.91835}
+ m_AnchoredPosition: {x: 0, y: 91.91836}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945
@@ -34621,9 +34621,9 @@ RectTransform:
m_Father: {fileID: 574002313}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 40, y: -21}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1345846031
@@ -42945,9 +42945,9 @@ RectTransform:
m_Father: {fileID: 574002313}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 80, y: -21}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1783491359
diff --git a/Assets/Scripts/Games/ChargingChicken/ChargingChicken.cs b/Assets/Scripts/Games/ChargingChicken/ChargingChicken.cs
index e0e811add..5c8121393 100644
--- a/Assets/Scripts/Games/ChargingChicken/ChargingChicken.cs
+++ b/Assets/Scripts/Games/ChargingChicken/ChargingChicken.cs
@@ -22,13 +22,14 @@ namespace HeavenStudio.Games.Loaders
preFunction = delegate {
var e = eventCaller.currentEntity;
if (eventCaller.gameManager.minigameObj.TryGetComponent(out ChargingChicken instance)) {
- instance.ChargeUp(e.beat, e.length, 4 /*e["forceHold"]*/, e["drumbeat"], e["bubble"], e["endText"], e["textLength"], e["success"], e["fail"], e["destination"], e["customDestination"]);
+ instance.ChargeUp(e.beat, e.length, 4 /*e["forceHold"]*/, e["drumbeat"], e["bubble"], e["endText"], e["textLength"], e["success"], e["fail"], e["destination"], e["customDestination"], e["spaceHelmet"]);
}
ChargingChicken.CountIn(e.beat, e["cowbell"]);
},
parameters = new List()
{
new Param("cowbell", true, "Cue Sound", "Choose whether to play the cue sound for this charge."),
+ new Param("spaceHelmet", false, "Space Helmet", "Choose whether the chicken wears its trusty space helmet while driving."),
new Param("drumbeat", ChargingChicken.DrumLoopList.Straight, "Drum Beat", "Choose which drum beat to play while filling."),
new Param("bubble", false, "Countdown Bubble", "Choose whether the counting bubble will spawn for this input."),
//ending text
@@ -87,14 +88,17 @@ namespace HeavenStudio.Games.Loaders
function = delegate {
var e = eventCaller.currentEntity;
if (eventCaller.gameManager.minigameObj.TryGetComponent(out ChargingChicken instance)) {
- instance.MusicFade(e.beat, e.length, e["fadeIn"]);
+ instance.MusicFade(e.beat, e.length, e["fadeIn"], e["instant"], e["drums"], e["reset"]);
}
},
defaultLength = 4f,
resizable = true,
parameters = new List()
{
+ new Param("instant", false, "Instant", "Whether the fade is instant."),
new Param("fadeIn", false, "Fade In", "Fade the music back in."),
+ new Param("drums", true, "Affect Drums", "Whether to affect the volume of the charging drums."),
+ new Param("reset", true, "Reset After Blastoff", "Whether to reset the volume of the music after a charge input is over."),
}
},
new GameAction("changeCarColor", "Car Appearance")
@@ -164,10 +168,10 @@ namespace HeavenStudio.Games.Loaders
resizable = true,
parameters = new List()
{
- new Param("colorFrom", ChargingChicken.defaultCloudColor, "Primary Color Start", "Set the midground's primary color at the start of the event. (Used in: Clouds, Stars, Doodles)"),
- new Param("colorTo", ChargingChicken.defaultCloudColor, "Primary Color End", "Set the midground's primary color at the start of the event. (Used in: Clouds, Stars, Doodles)"),
- new Param("colorFrom2", ChargingChicken.defaultCloudColorBottom, "Secondary Color Start", "Set the midground's secondary color at the start of the event. (Used in: Clouds)"),
- new Param("colorTo2", ChargingChicken.defaultCloudColorBottom, "Secondary Color End", "Set the midground's secondary color at the start of the event. (Used in: Clouds)"),
+ new Param("colorFrom", ChargingChicken.defaultCloudColor, "Primary Color Start", "Set the midground's primary color at the start of the event. (Used in: Clouds, Doodles)"),
+ new Param("colorTo", ChargingChicken.defaultCloudColor, "Primary Color End", "Set the midground's primary color at the start of the event. (Used in: Clouds, Doodles)"),
+ new Param("colorFrom2", ChargingChicken.defaultCloudColorBottom, "Secondary Color Start", "Set the midground's secondary color at the start of the event. (Used in: Clouds, Doodles)"),
+ new Param("colorTo2", ChargingChicken.defaultCloudColorBottom, "Secondary Color End", "Set the midground's secondary color at the start of the event. (Used in: Clouds, Doodles)"),
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.", new() {
new Param.CollapseParam((x, _) => (int)x != (int)Util.EasingFunction.Ease.Instant, new[] { "colorFrom", "colorFrom2" }),
}),
@@ -274,10 +278,13 @@ namespace HeavenStudio.Games
[SerializeField] TMP_Text endingText;
[SerializeField] TMP_Text bubbleText;
[SerializeField] GameObject countBubble;
+ [SerializeField] GameObject Helmet;
+ [SerializeField] GameObject FallingHelmet;
[SerializeField] Island IslandBase;
[SerializeField] Material chickenColors;
[SerializeField] Material chickenColorsCar;
[SerializeField] Material chickenColorsCloud;
+ [SerializeField] Material chickenColorsDoodles;
[SerializeField] Material chickenColorsWater;
[SerializeField] SpriteRenderer headlightColor;
@@ -385,9 +392,12 @@ namespace HeavenStudio.Games
}
float drumVolume = 1;
+ float drumTempVolume = 1;
double drumFadeStart = 0;
double drumFadeLength = 0;
bool drumFadeIn = true;
+ bool drumReset = true;
+ bool drumLoud = false;
Sound whirring;
bool isWhirringPlaying = false;
@@ -763,14 +773,17 @@ namespace HeavenStudio.Games
}
//drum volume
- double valueFade = Conductor.instance.GetPositionFromBeat(drumFadeStart, drumFadeLength);
- drumVolume = Mathf.Lerp(drumFadeIn ? 0 : 1, drumFadeIn ? 1 : 0, (float)valueFade);
- Conductor.instance.SetMinigameVolume(drumFadeIn ? (float)valueFade : 1 - (float)valueFade);
+ if (Conductor.instance.songPositionInBeatsAsDouble <= drumFadeStart + drumFadeLength + 0.5)
+ {
+ double valueFade = Conductor.instance.GetPositionFromBeat(drumFadeStart, drumFadeLength);
+ drumVolume = Mathf.Lerp(drumFadeIn ? 0 : 1, drumFadeIn ? 1 : 0, (float)valueFade);
+ }
//various sound loops and shizz
if (isInputting)
{
chickenColorsCar.SetFloat("_Progress", Conductor.instance.GetPositionFromBeat(nextInputReady - (yardsTextLength * 2), yardsTextLength));
+ drumTempVolume = 0;
if (!isWhirringPlaying) { whirring = SoundByte.PlayOneShotGame("chargingChicken/chargeLoop", volume: 0.5f, looping: true); isWhirringPlaying = true; }
}
@@ -779,11 +792,15 @@ namespace HeavenStudio.Games
chickenColorsCar.SetFloat("_Progress", 0);
Conductor.instance.FadeMinigameVolume(0, 0, 1);
- drumVolume = 1;
+ drumTempVolume = 1;
if (isWhirringPlaying) { whirring.Stop(); isWhirringPlaying = false; }
}
+ //make sure music volume resetting can be remembered between blastoffs
+ float drumActualVolume = (drumVolume > drumTempVolume) ? drumVolume : drumTempVolume;
+ Conductor.instance.SetMinigameVolume(drumActualVolume);
+
//chicken fall off the right of the platform
if (checkFallingDistance && nextIsland.transform.localPosition.x < -2f)
{
@@ -826,7 +843,7 @@ namespace HeavenStudio.Games
{
var e = entity;
double lateness = entity.beat - beat;
- ChargeUp(e.beat, e.length, lateness /*e["forceHold"]*/, e["drumbeat"], e["bubble"], e["endText"], e["textLength"], e["success"], e["fail"], e["destination"], e["customDestination"]);
+ ChargeUp(e.beat, e.length, lateness /*e["forceHold"]*/, e["drumbeat"], e["bubble"], e["endText"], e["textLength"], e["success"], e["fail"], e["destination"], e["customDestination"], e["spaceHelmet"]);
}
}
}
@@ -885,7 +902,7 @@ namespace HeavenStudio.Games
}, forcePlay: true);
}
- public void ChargeUp(double beat, double actualLength, double lateness, int whichDrum, bool bubble = false, int endText = 0, int textLength = 4, string successText = "", string failText = "", int destination = 1, string customDestination = "You arrived in The Backrooms!")
+ public void ChargeUp(double beat, double actualLength, double lateness, int whichDrum, bool bubble = false, int endText = 0, int textLength = 4, string successText = "", string failText = "", int destination = 1, string customDestination = "You arrived in The Backrooms!", bool helmet = false)
{
//convert length to an integer, which is at least 4
double length = Math.Ceiling(actualLength);
@@ -974,7 +991,7 @@ namespace HeavenStudio.Games
SpawnStones(journeyBeat, yardsTextLength - 1, lateness < 2);
}));
- //chicken ducks into the car window, and the bubble text is set up, and the platform noise plays, and next island spawns
+ //chicken ducks into the car window, and the bubble text is set up, and the platform noise plays, music volume is reset if needed, and next island spawns
actions.Add(new(beat - 1, delegate {
if (lateness >= 1) ChickenAnim.DoScaledAnimationAsync("Prepare", 0.5f);
if (lateness > 0 && lateness < 1) ChickenAnim.DoScaledAnimationAsync("Idle", 0.5f);
@@ -982,6 +999,7 @@ namespace HeavenStudio.Games
if (lateness >= 2) SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_BLOCK_SET");
if (lateness >= 1) SpawnJourney(journeyBeat, yardsTextLength - 1);
canPressWhiff = true;
+ if (drumReset) drumVolume = 1;
}));
//spawns the countdown bubble, allows stones to fall, resets the success anim killer
@@ -993,6 +1011,10 @@ namespace HeavenStudio.Games
stone.isBeingSet = false;
}
successAnimationKillOnBeat = double.MaxValue;
+ Helmet.SetActive(helmet);
+ FallingHelmet.SetActive(helmet);
+ currentIsland.Helmet.SetActive(helmet);
+ nextIsland.Helmet.SetActive(helmet);
}));
length += 1;
@@ -1144,7 +1166,8 @@ namespace HeavenStudio.Games
public void PlayDrum(string whichDrum, float drumVolumeThis, double lateness)
{
- if (isInputting && (lateness * 48 == Math.Floor(Conductor.instance.songPositionInBeatsAsDouble * 48))) SoundByte.PlayOneShotGame(whichDrum, volume: drumVolumeThis * drumVolume);
+ float drumActualVolume = (drumVolume > drumTempVolume) ? drumVolumeThis * drumVolume : drumVolumeThis * drumTempVolume;
+ if (isInputting && (lateness * 4 == Math.Floor(Conductor.instance.songPositionInBeatsAsDouble * 4))) SoundByte.PlayOneShotGame(whichDrum, volume: drumLoud ? drumVolumeThis : drumActualVolume);
}
public void PumpBeat()
@@ -1599,11 +1622,13 @@ namespace HeavenStudio.Games
}
}
- public void MusicFade(double beat, double length, bool fadeIn)
+ public void MusicFade(double beat, double length, bool fadeIn, bool instant, bool drums, bool reset)
{
drumFadeStart = beat;
- drumFadeLength = length;
+ drumFadeLength = instant ? 0 : length;
drumFadeIn = fadeIn;
+ drumReset = reset;
+ drumLoud = !drums;
}
public void ParallaxObjects(double beat, double length, bool instant, bool stars, bool clouds, bool earth, bool mars, bool doodles, bool birds)
@@ -1875,11 +1900,13 @@ namespace HeavenStudio.Games
newColorG = func(cloudColorFrom.g, cloudColorTo.g, normalizedBeatBG);
newColorB = func(cloudColorFrom.b, cloudColorTo.b, normalizedBeatBG);
chickenColorsCloud.SetColor("_Color", new Color(newColorR, newColorG, newColorB));
+ chickenColorsDoodles.SetColor("_Color1", new Color(newColorR, newColorG, newColorB));
newColorR = func(cloudColorFrom2.r, cloudColorTo2.r, normalizedBeatBG);
newColorG = func(cloudColorFrom2.g, cloudColorTo2.g, normalizedBeatBG);
newColorB = func(cloudColorFrom2.b, cloudColorTo2.b, normalizedBeatBG);
chickenColorsCloud.SetColor("_OutlineColor", new Color(newColorR, newColorG, newColorB));
+ chickenColorsDoodles.SetColor("_Color", new Color(newColorR, newColorG, newColorB));
}
#endregion
diff --git a/Assets/Scripts/Games/ChargingChicken/Island.cs b/Assets/Scripts/Games/ChargingChicken/Island.cs
index 3694da5bb..e8ba02e1c 100644
--- a/Assets/Scripts/Games/ChargingChicken/Island.cs
+++ b/Assets/Scripts/Games/ChargingChicken/Island.cs
@@ -24,6 +24,7 @@ namespace HeavenStudio.Games.Scripts_ChargingChicken
[SerializeField] public GameObject Platform1;
[SerializeField] public GameObject Platform2;
[SerializeField] public GameObject Platform3;
+ [SerializeField] public GameObject Helmet;
[SerializeField] public ParticleSystem IslandCollapse;
[SerializeField] public ParticleSystem IslandCollapseNg;
[SerializeField] public ParticleSystem StoneSplashEffect;