diff --git a/Assets/Resources/Games/airboarder.prefab b/Assets/Resources/Games/airboarder.prefab index faad3d48..a9039e70 100644 --- a/Assets/Resources/Games/airboarder.prefab +++ b/Assets/Resources/Games/airboarder.prefab @@ -159,7 +159,7 @@ Transform: m_Children: - {fileID: 5254664032251897646} m_Father: {fileID: 8154153378120042038} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -165.407, z: 0} --- !u!33 &723254299125788594 MeshFilter: @@ -318,6 +318,7 @@ MonoBehaviour: scheduledInputs: [] wantsCrouch: 0 bgMaterial: {fileID: 2100000, guid: d308d6053cbc091489ae82391d36d476, type: 2} + fadeMaterial: {fileID: 2100000, guid: 5ad5f9e65ea02ac4c95e42c36fc8d39e, type: 2} floorMaterial: - {fileID: 0} - {fileID: 0} @@ -372,6 +373,90 @@ Transform: m_Father: {fileID: 9145231469005479427} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4022844232052126898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5056534597293888936} + - component: {fileID: 7346242310816610269} + m_Layer: 0 + m_Name: fade + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5056534597293888936 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4022844232052126898} + m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} + m_LocalPosition: {x: -26, y: 0, z: -26.9} + m_LocalScale: {x: 4.0466557, y: 116.84518, z: 0.23581862} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8154153378120042038} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90} +--- !u!212 &7346242310816610269 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4022844232052126898} + 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: 5ad5f9e65ea02ac4c95e42c36fc8d39e, 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: 0 + m_Sprite: {fileID: 21300000, guid: 46de3d8607cd10740aa20eee24d189e5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 8, y: 6} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &4957977851139062575 GameObject: m_ObjectHideFlags: 0 @@ -612,9 +697,12 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 3958381838429371481} + - {fileID: 5056534597293888936} - {fileID: 3104724556747080712} - {fileID: 1798043517605732004} - {fileID: 6450464862444400699} + - {fileID: 7939081579296747827} m_Father: {fileID: 4475688631540571435} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1448,7 +1536,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3} propertyPath: m_LocalScale.x @@ -1595,6 +1683,88 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} m_PrefabInstance: {fileID: 2877353907410208422} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3559046787070024626 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8154153378120042038} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalScale.x + value: -0.21153791 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalScale.y + value: 0.79999995 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalScale.z + value: 0.79999995 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalPosition.x + value: -283.4 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalPosition.y + value: -0.92 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_Name + value: floor_model + objectReference: {fileID: 0} + - target: {fileID: 5521721997653780584, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5ad5f9e65ea02ac4c95e42c36fc8d39e, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} +--- !u!4 &3958381838429371481 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + m_PrefabInstance: {fileID: 3559046787070024626} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4463438238432265654 PrefabInstance: m_ObjectHideFlags: 0 @@ -2538,7 +2708,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3} propertyPath: m_LocalScale.x @@ -2637,6 +2807,88 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3} m_PrefabInstance: {fileID: 6777388439690958800} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7613319636757059288 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8154153378120042038} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalScale.x + value: 0.2115379 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalScale.y + value: 0.79999995 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalScale.z + value: 0.79999995 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalPosition.x + value: 293.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalPosition.y + value: -0.92 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_Name + value: floor_model (1) + objectReference: {fileID: 0} + - target: {fileID: 5521721997653780584, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5ad5f9e65ea02ac4c95e42c36fc8d39e, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} +--- !u!4 &7939081579296747827 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3} + m_PrefabInstance: {fileID: 7613319636757059288} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8025970981515624470 PrefabInstance: m_ObjectHideFlags: 0 @@ -2804,6 +3056,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6432378845429944051, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 6432378845429944051, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6432378845429944051, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6432378845429944051, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8078603837876992818, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: -0.10196886 diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/arch/move.anim b/Assets/Resources/Models/Games/Airboarder/Animations/arch/move.anim index a0c3bc5f..c2e849ba 100644 --- a/Assets/Resources/Models/Games/Airboarder/Animations/arch/move.anim +++ b/Assets/Resources/Models/Games/Airboarder/Animations/arch/move.anim @@ -47,7 +47,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -79,6 +79,245 @@ AnimationClip: path: wall_high_model classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.65 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Mode + path: wall_high_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.68333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.r + path: wall_high_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.68333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.g + path: wall_high_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.68333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.b + path: wall_high_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.68333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.a + path: wall_high_model + classID: 137 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -101,6 +340,41 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3051566205 + attribute: 2329778318 + script: {fileID: 0} + typeID: 137 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3051566205 + attribute: 2108656497 + script: {fileID: 0} + typeID: 137 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3051566205 + attribute: 1303350129 + script: {fileID: 0} + typeID: 137 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3051566205 + attribute: 1571785585 + script: {fileID: 0} + typeID: 137 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3051566205 + attribute: 1840221041 + script: {fileID: 0} + typeID: 137 + customType: 22 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -212,7 +486,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -244,6 +518,245 @@ AnimationClip: path: wall_high_model classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.65 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Mode + path: wall_high_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.68333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.r + path: wall_high_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.68333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.g + path: wall_high_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.68333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.b + path: wall_high_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.68333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.a + path: wall_high_model + classID: 137 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim b/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim index 9a090023..79cc94b8 100644 --- a/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim +++ b/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim @@ -47,7 +47,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -79,6 +79,191 @@ AnimationClip: path: wall_low_model classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Mode + path: wall_low_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.r + path: wall_low_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.g + path: wall_low_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.b + path: wall_low_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.a + path: wall_low_model + classID: 137 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -101,6 +286,41 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3301542606 + attribute: 2329778318 + script: {fileID: 0} + typeID: 137 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3301542606 + attribute: 2108656497 + script: {fileID: 0} + typeID: 137 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3301542606 + attribute: 1303350129 + script: {fileID: 0} + typeID: 137 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3301542606 + attribute: 1571785585 + script: {fileID: 0} + typeID: 137 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3301542606 + attribute: 1840221041 + script: {fileID: 0} + typeID: 137 + customType: 22 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -212,7 +432,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -244,6 +464,191 @@ AnimationClip: path: wall_low_model classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Mode + path: wall_low_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.r + path: wall_low_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.g + path: wall_low_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.b + path: wall_low_model + classID: 137 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.a + path: wall_low_model + classID: 137 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/Dog.mat b/Assets/Resources/Models/Games/Airboarder/Materials/Dog.mat index 9303f51d..9264bf22 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/Dog.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/Dog.mat @@ -38,11 +38,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 2800000, guid: 88ca27f4018b240448b1385495b8f5e8, type: 3} + m_Texture: {fileID: 2800000, guid: 0ecceba387529984a9ee91e382fe65d0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 88ca27f4018b240448b1385495b8f5e8, type: 3} + m_Texture: {fileID: 2800000, guid: 0ecceba387529984a9ee91e382fe65d0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/Materials.meta b/Assets/Resources/Models/Games/Airboarder/Materials/Materials.meta new file mode 100644 index 00000000..c4c84c89 --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 135a856dfc1ca234e995829e0b73e1f8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/Materials/fade.mat b/Assets/Resources/Models/Games/Airboarder/Materials/Materials/fade.mat new file mode 100644 index 00000000..10dda273 --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/Materials/fade.mat @@ -0,0 +1,80 @@ +%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: fade + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + 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: 2800000, guid: 46de3d8607cd10740aa20eee24d189e5, type: 3} + 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 + - _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 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/Materials/fade.mat.meta b/Assets/Resources/Models/Games/Airboarder/Materials/Materials/fade.mat.meta new file mode 100644 index 00000000..ee1f3c8e --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/Materials/fade.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd396c8227de0af418968ce89358cca8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/Sky.png b/Assets/Resources/Models/Games/Airboarder/Materials/Sky.png deleted file mode 100644 index 3410c682..00000000 Binary files a/Assets/Resources/Models/Games/Airboarder/Materials/Sky.png and /dev/null differ diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/Sky.png.meta b/Assets/Resources/Models/Games/Airboarder/Materials/Sky.png.meta deleted file mode 100644 index 0b25187b..00000000 --- a/Assets/Resources/Models/Games/Airboarder/Materials/Sky.png.meta +++ /dev/null @@ -1,176 +0,0 @@ -fileFormatVersion: 2 -guid: 5b82c9572d4fe7c41af997c06e051ea0 -TextureImporter: - internalIDToNameTable: - - first: - 213: 7482667652216324306 - second: Square - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - 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: 256 - spriteBorder: {x: 4, y: 4, z: 4, w: 4} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: 0 - textureType: 1 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 1 - 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: iPhone - 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: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: Square - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 256 - height: 256 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 2d009a6b596c7d760800000000000000 - internalID: 7482667652216324306 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - physicsShape: - - - {x: -128, y: 128} - - {x: -128, y: -128} - - {x: 128, y: -128} - - {x: 128, y: 128} - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: - Square: 7482667652216324306 - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/block_shadow.mat b/Assets/Resources/Models/Games/Airboarder/Materials/block_shadow.mat index 5959a062..01d6e413 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/block_shadow.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/block_shadow.mat @@ -14,7 +14,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2450 stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: @@ -75,6 +75,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 0.5019608} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/block_shadow_up.png b/Assets/Resources/Models/Games/Airboarder/Materials/block_shadow_up.png index 547a4bd1..0fc1b169 100644 Binary files a/Assets/Resources/Models/Games/Airboarder/Materials/block_shadow_up.png and b/Assets/Resources/Models/Games/Airboarder/Materials/block_shadow_up.png differ diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/dog.png b/Assets/Resources/Models/Games/Airboarder/Materials/dog.png deleted file mode 100644 index bef1c6f5..00000000 Binary files a/Assets/Resources/Models/Games/Airboarder/Materials/dog.png and /dev/null differ diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/fade.mat b/Assets/Resources/Models/Games/Airboarder/Materials/fade.mat new file mode 100644 index 00000000..71dfb88e --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/fade.mat @@ -0,0 +1,92 @@ +%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: fade + m_Shader: {fileID: 4800000, guid: 6edf21a3fdd28154ab40e23fb0660133, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 5000 + 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: 2800000, guid: 46de3d8607cd10740aa20eee24d189e5, type: 3} + m_Scale: {x: 1, y: 0} + m_Offset: {x: 1, 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 + - _CullMode: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _Threshold: 0 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _Color: {r: 0.9921569, g: 0.7686275, b: 0.9921569, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/fade.mat.meta b/Assets/Resources/Models/Games/Airboarder/Materials/fade.mat.meta new file mode 100644 index 00000000..afccde52 --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/fade.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ad5f9e65ea02ac4c95e42c36fc8d39e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/fade.png b/Assets/Resources/Models/Games/Airboarder/Materials/fade.png new file mode 100644 index 00000000..46135717 Binary files /dev/null and b/Assets/Resources/Models/Games/Airboarder/Materials/fade.png differ diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/dog.png.meta b/Assets/Resources/Models/Games/Airboarder/Materials/fade.png.meta similarity index 96% rename from Assets/Resources/Models/Games/Airboarder/Materials/dog.png.meta rename to Assets/Resources/Models/Games/Airboarder/Materials/fade.png.meta index 03e23e74..deab6e7e 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/dog.png.meta +++ b/Assets/Resources/Models/Games/Airboarder/Materials/fade.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 88ca27f4018b240448b1385495b8f5e8 +guid: 46de3d8607cd10740aa20eee24d189e5 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -36,9 +36,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 2 + wrapV: 2 + wrapW: 2 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/floor.mat b/Assets/Resources/Models/Games/Airboarder/Materials/floor.mat index bfc34749..fe9869bf 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/floor.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/floor.mat @@ -8,10 +8,10 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: floor - m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: - _EMISSION + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/metal_env.png.meta b/Assets/Resources/Models/Games/Airboarder/Materials/metal_env.png.meta index 3b4aba05..c9e3a566 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/metal_env.png.meta +++ b/Assets/Resources/Models/Games/Airboarder/Materials/metal_env.png.meta @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/wall_body.mat b/Assets/Resources/Models/Games/Airboarder/Materials/wall_body.mat index 92a1a5ff..0b5c56d4 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/wall_body.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/wall_body.mat @@ -10,13 +10,15 @@ Material: m_Name: wall_body m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: + - _ALPHABLEND_ON - _EMISSION m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -54,7 +56,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ee81d836898ee474a80f704b7a905b0f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: @@ -73,19 +75,19 @@ Material: m_Floats: - _BumpScale: 1 - _ColorMask: 15 - - _Cutoff: 0.5 + - _Cutoff: 0.317 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0.65 - _GlossyReflections: 1 - _Metallic: 0 - - _Mode: 0 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 @@ -93,7 +95,7 @@ Material: - _StencilWriteMask: 255 - _UVSec: 0 - _UseUIAlphaClip: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BlendColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scripts/Games/Airboarder/Airboarder.cs b/Assets/Scripts/Games/Airboarder/Airboarder.cs index 58adebfd..2476981f 100644 --- a/Assets/Scripts/Games/Airboarder/Airboarder.cs +++ b/Assets/Scripts/Games/Airboarder/Airboarder.cs @@ -162,6 +162,7 @@ namespace HeavenStudio.Games public bool wantsCrouch; [Header("Materials")] [SerializeField] private Material bgMaterial; + [SerializeField] private Material fadeMaterial; [SerializeField] private Material[] floorMaterial; [Header("Camera")] @@ -251,6 +252,7 @@ namespace HeavenStudio.Games { EntityPreCheck(Conductor.instance.songPositionInBeatsAsDouble); bgMaterial.color = defaultBGColor; + fadeMaterial.color = defaultBGColor; } void EntityPreCheck(double beat) @@ -359,6 +361,7 @@ namespace HeavenStudio.Games private void BackgroundColorUpdate() { bgMaterial.color = bgColorEase.GetColor(); + fadeMaterial.color = bgColorEase.GetColor(); } public void BackgroundColor(double beat, float length, Color startColor, Color endColor, int ease)