diff --git a/Assets/Resources/Games/airboarder.prefab b/Assets/Resources/Games/airboarder.prefab index d3b9ba3ce..af02e9000 100644 --- a/Assets/Resources/Games/airboarder.prefab +++ b/Assets/Resources/Games/airboarder.prefab @@ -681,7 +681,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_LocalPosition.y @@ -773,11 +773,11 @@ PrefabInstance: objectReference: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3} - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_CastShadows - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_ReceiveShadows - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_UpdateWhenOffscreen @@ -788,9 +788,17 @@ PrefabInstance: value: 3 objectReference: {fileID: 0} - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} - propertyPath: m_Materials.Array.data[3] + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 87659f38f7545534ca0e91a913b69fbc, type: 2} + - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_Materials.Array.data[2] value: objectReference: {fileID: 2100000, guid: 18236ab917d571548b689dbcdf081b2e, type: 2} + - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: 21a244208ca5883499c02785947c32eb, type: 2} - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_Materials.Array.data[4] value: @@ -798,7 +806,7 @@ PrefabInstance: - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_Materials.Array.data[5] value: - objectReference: {fileID: 2100000, guid: 21a244208ca5883499c02785947c32eb, type: 2} + objectReference: {fileID: 2100000, guid: f58d76d5af0485d4c9cbdd39dbc2c269, type: 2} - target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -38.84192 @@ -1190,6 +1198,10 @@ PrefabInstance: propertyPath: m_UpdateWhenOffscreen value: 1 objectReference: {fileID: 0} + - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 18236ab917d571548b689dbcdf081b2e, type: 2} - target: {fileID: 919132149155446097, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_Name value: neo_airboy @@ -1234,13 +1246,37 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2304490371475323270} m_Modifications: + - target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.x + value: 0.9999999 + objectReference: {fileID: 0} + - target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.y + value: 0.99999994 + objectReference: {fileID: 0} + - target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.z + value: 0.99999994 + objectReference: {fileID: 0} + - target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 20.978533 + objectReference: {fileID: 0} + - target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.18177979 + objectReference: {fileID: 0} + - target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.63425094 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.25 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_LocalPosition.y @@ -1282,6 +1318,62 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.8078925 + objectReference: {fileID: 0} + - target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 83.256325 + objectReference: {fileID: 0} + - target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 179.99706 + objectReference: {fileID: 0} + - target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -42.618855 + objectReference: {fileID: 0} + - target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 16.239912 + objectReference: {fileID: 0} + - target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 45.6652 + objectReference: {fileID: 0} + - target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.y + value: 0.99999994 + objectReference: {fileID: 0} + - target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.5092328 + objectReference: {fileID: 0} + - target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.43523154 + objectReference: {fileID: 0} + - target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 22.268675 + objectReference: {fileID: 0} + - target: {fileID: -5546437562569359665, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 32.689 + objectReference: {fileID: 0} + - target: {fileID: -5315867602706669865, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -89.98021 + objectReference: {fileID: 0} - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_RootBone value: @@ -1290,10 +1382,206 @@ PrefabInstance: propertyPath: m_UpdateWhenOffscreen value: 1 objectReference: {fileID: 0} + - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 18236ab917d571548b689dbcdf081b2e, type: 2} + - target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.y + value: 0.99999994 + objectReference: {fileID: 0} + - target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -65.93207 + objectReference: {fileID: 0} + - target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -102.13508 + objectReference: {fileID: 0} + - target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 158.12456 + objectReference: {fileID: 0} + - target: {fileID: -3673476394703291053, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.y + value: 0.9999999 + objectReference: {fileID: 0} + - target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.z + value: 1.0000001 + objectReference: {fileID: 0} + - target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.8015548 + objectReference: {fileID: 0} + - target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 8.560867 + objectReference: {fileID: 0} + - target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 79.472115 + objectReference: {fileID: 0} + - target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -49.878593 + objectReference: {fileID: 0} + - target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -16.577326 + objectReference: {fileID: 0} + - target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -10.082315 + objectReference: {fileID: 0} + - target: {fileID: -2240725241546395484, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90.000206 + objectReference: {fileID: 0} + - target: {fileID: -1593081406422785238, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 18.471048 + objectReference: {fileID: 0} + - target: {fileID: -1593081406422785238, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -40.35578 + objectReference: {fileID: 0} + - target: {fileID: -1593081406422785238, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 66.74153 + objectReference: {fileID: 0} + - target: {fileID: -1326856960798226984, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.0000012133594 + objectReference: {fileID: 0} + - target: {fileID: -1326856960798226984, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.00000062879076 + objectReference: {fileID: 0} + - target: {fileID: -1326856960798226984, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 17.91856 + objectReference: {fileID: 0} + - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.y + value: 0.99999994 + objectReference: {fileID: 0} + - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 17.231918 + objectReference: {fileID: 0} + - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 51.47937 + objectReference: {fileID: 0} + - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -6.9952335 + objectReference: {fileID: 0} + - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 24.031073 + objectReference: {fileID: 0} + - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -40.806442 + objectReference: {fileID: 0} + - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 112.67798 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_Name value: neo_airboy objectReference: {fileID: 0} + - target: {fileID: 4108420948615836622, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.26069844 + objectReference: {fileID: 0} + - target: {fileID: 4108420948615836622, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 22.19989 + objectReference: {fileID: 0} + - target: {fileID: 4108420948615836622, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.6387967 + objectReference: {fileID: 0} + - target: {fileID: 4250918724240952483, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.00016632648 + objectReference: {fileID: 0} + - target: {fileID: 4250918724240952483, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.00022518226 + objectReference: {fileID: 0} + - target: {fileID: 4250918724240952483, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.00035762409 + objectReference: {fileID: 0} + - target: {fileID: 7096549898355155914, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8589286667285037113, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.231184 + objectReference: {fileID: 0} + - target: {fileID: 8589286667285037113, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 132.37848 + objectReference: {fileID: 0} + - target: {fileID: 8589286667285037113, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -70.36433 + objectReference: {fileID: 0} + - target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.0000034150944 + objectReference: {fileID: 0} + - target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.0000012806604 + objectReference: {fileID: 0} + - target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 3.8166654e-14 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 333100bf553a5924d870acafacb4f53a, type: 3} --- !u!1 &6111689721467200626 stripped @@ -1417,8 +1705,8 @@ SkinnedMeshRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6175185380924501080} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 @@ -1732,6 +2020,10 @@ PrefabInstance: propertyPath: m_Name value: mothership_model objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5521721997653780584, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -1852,6 +2144,10 @@ PrefabInstance: propertyPath: m_Materials.Array.data[1] value: objectReference: {fileID: 2100000, guid: a8381275f858de342b6da7d85f663236, type: 2} + - target: {fileID: 5746128911342212884, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} --- !u!1 &7178900278045326663 stripped diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/Dog.mat b/Assets/Resources/Models/Games/Airboarder/Materials/Dog.mat index db11dbd4f..9303f51de 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/Dog.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/Dog.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Dog - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -37,7 +38,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 88ca27f4018b240448b1385495b8f5e8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: @@ -67,7 +68,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.65 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -80,6 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.6766883, g: 0.6766883, b: 0.6766883, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board.mat index b9b944fb7..a17f812b2 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board.mat @@ -8,10 +8,10 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: airboy_board - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] - m_InvalidKeywords: + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: - _EMISSION + m_InvalidKeywords: - _METALLICGLOSSMAP m_LightmapFlags: 2 m_EnableInstancingVariants: 0 @@ -39,7 +39,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: b31d40c42dac95945bce1f9f0061a249, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: @@ -69,7 +69,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.65 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -82,6 +82,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0.039546248, g: 0.039546248, b: 0.039546248, a: 1} + - _EmissionColor: {r: 0.6766883, g: 0.6766883, b: 0.6766883, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.mat index e25b5e2de..87df36bae 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.mat @@ -8,11 +8,12 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: airboy_board_emm - m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: [] m_InvalidKeywords: + - _EMISSION - _METALLICGLOSSMAP - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -81,6 +82,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.039546248, g: 0.039546248, b: 0.039546248, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.png b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.png new file mode 100644 index 000000000..fad2df84c Binary files /dev/null and b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.png differ diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.png.meta b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.png.meta new file mode 100644 index 000000000..10595e77f --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 22c07774052939142b7a94b6d9faa678 +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: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + 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/Resources/Models/Games/Airboarder/Materials/airboy_body.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body.mat index ab6549926..ebb967d03 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body.mat @@ -8,10 +8,10 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: airboy_body - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - 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 @@ -42,7 +42,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 86cca9cf3ad2b1043a9348e3629f8ac2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: @@ -78,7 +78,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.65 - _GlossyReflections: 1 - _GoodThreshold: 0.5 - _Metallic: 0 @@ -96,7 +96,7 @@ Material: - _CautionColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _CriticalColor: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0.039546248, g: 0.039546248, b: 0.039546248, a: 1} + - _EmissionColor: {r: 0.6766883, g: 0.6766883, b: 0.6766883, a: 1} - _GoodColor: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body_emm.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body_emm.mat new file mode 100644 index 000000000..0c1c90a41 --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body_emm.mat @@ -0,0 +1,104 @@ +%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: airboy_body_emm + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 + 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} + - _Cube: + 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: 81141743666b4504ca859ae6e0564f95, 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ToonShade: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _BumpScale: 1 + - _CautionThreshold: 0.25 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GoodThreshold: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Outline: 0.005 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Threshold: 0 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _CautionColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _CriticalColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0.039546248, g: 0.039546248, b: 0.039546248, a: 1} + - _GoodColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectColor: {r: 1, g: 1, b: 1, a: 0.5} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body_emm.mat.meta b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body_emm.mat.meta new file mode 100644 index 000000000..540abcd96 --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body_emm.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f58d76d5af0485d4c9cbdd39dbc2c269 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body_emm.png b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body_emm.png new file mode 100644 index 000000000..bc28111e2 Binary files /dev/null and b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body_emm.png differ diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body_emm.png.meta b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body_emm.png.meta new file mode 100644 index 000000000..bd1cf332a --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body_emm.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 81141743666b4504ca859ae6e0564f95 +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: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + 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/Resources/Models/Games/Airboarder/Materials/airboy_dead.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_dead.mat index 6249a1c1e..30d6a3994 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_dead.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_dead.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: airboy_dead - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -56,6 +56,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _BumpScale: 1 @@ -77,4 +81,5 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_dead_emm.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_dead_emm.mat new file mode 100644 index 000000000..bc408b8b0 --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_dead_emm.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: airboy_dead_emm + m_Shader: {fileID: 10752, 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: 7697afb7ad71c9b44b60e6f2ecffeca4, 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/airboy_dead_emm.mat.meta b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_dead_emm.mat.meta new file mode 100644 index 000000000..de8dc1602 --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_dead_emm.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3a31959762c1827449ba4e0caf1776f3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile.mat index fcdf4ae6e..5eea14ca0 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile.mat @@ -8,10 +8,10 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: airboy_smile - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - 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 @@ -38,7 +38,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 31b0c21dec88b074d84a77198537c9c4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: @@ -68,7 +68,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.65 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -81,6 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0.0754717, g: 0.0754717, b: 0.0754717, a: 1} + - _EmissionColor: {r: 0.6766883, g: 0.6766883, b: 0.6766883, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile_emm.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile_emm.mat new file mode 100644 index 000000000..e69dfaf37 --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile_emm.mat @@ -0,0 +1,86 @@ +%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: airboy_smile_emm + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 + 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: 100, 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: 31b0c21dec88b074d84a77198537c9c4, 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} + - _SpecGlossMap: + 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.0754717, g: 0.0754717, b: 0.0754717, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile_emm.mat.meta b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile_emm.mat.meta new file mode 100644 index 000000000..aabc74641 --- /dev/null +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile_emm.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b7ab60349ec01a42b9c4a66f7e7db5a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/floor.mat b/Assets/Resources/Models/Games/Airboarder/Materials/floor.mat index 0e696a21b..eae0eb722 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/floor.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/floor.mat @@ -37,7 +37,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: f181c9819c5bc7b488b3eedee117d8e0, type: 3} m_Scale: {x: 128, y: 0} m_Offset: {x: 0, y: 0} - _MainTex: @@ -63,7 +63,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.65 - _GlossyReflections: 1 - _Mode: 0 - _OcclusionStrength: 1 @@ -75,6 +75,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.6766883, g: 0.6766883, b: 0.6766883, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/mothership.mat b/Assets/Resources/Models/Games/Airboarder/Materials/mothership.mat index a56984dde..bfab4e374 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/mothership.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/mothership.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mothership - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -37,7 +38,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: b3d408db3cd2ecf4fa3d1d8e3d4854d9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: @@ -56,6 +57,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _BumpScale: 1 @@ -63,7 +68,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.65 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -76,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.6766883, g: 0.6766883, b: 0.6766883, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/wall_body.mat b/Assets/Resources/Models/Games/Airboarder/Materials/wall_body.mat index dd4ee0367..92a1a5ff1 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/wall_body.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/wall_body.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: wall_body - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -41,7 +42,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ee81d836898ee474a80f704b7a905b0f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: @@ -76,7 +77,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.65 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -96,7 +97,7 @@ Material: m_Colors: - _BlendColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.6766883, g: 0.6766883, b: 0.6766883, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - _Specular: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 42f4f768d..29be762c2 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -26850,7 +26850,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -32707,7 +32707,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: 66.89796} + m_AnchoredPosition: {x: 0, y: 66.89797} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1154875945 diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 7e249ba0e..8fb7f77a5 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -20,5 +20,7 @@ MonoBehaviour: - Assets/Scripts/Games/Airboarder/Wall.cs - Assets/Scripts/Games/Airboarder/Airboarder.cs - Assets/Scripts/Games/Airboarder/Arch.cs + - Assets/Scripts/Games/Airboarder/Scrollng_Floor.cs + - Assets/Wall.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []