From 59d65e0e8cc06e2ab37034533cb46638c986e180 Mon Sep 17 00:00:00 2001 From: Zenny Date: Tue, 30 Aug 2022 22:27:56 -0700 Subject: [PATCH] Fix frog babe, add dialogue for airship --- Assets/NPCs/Frog Babe/Material_2.mat | 37 +++- .../NPCs/Frog Babe/Materials/Material_2.mat | 13 +- Assets/NPCs/Frog Babe/frogbabe.fbx.meta | 21 +- Assets/NPCs/Frog Babe/frogbabe2.fbx | 3 + Assets/NPCs/Frog Babe/frogbabe2.fbx.meta | 106 +++++++++ Assets/NPCs/Frog Babe/sun.mat | 2 +- Assets/Player/Player.prefab | 17 +- Assets/Scenes/Airship.unity | 161 +++++++++++++- Assets/Scenes/Temple.unity | 201 +++++++++--------- Assets/Scripts/Audio/Footsteps.cs | 2 +- Assets/Shaders.meta | 9 + Assets/Shaders/Materials.meta | 8 + Assets/Shaders/Materials/Material_2.mat | 98 +++++++++ Assets/Shaders/Materials/Material_2.mat.meta | 8 + Assets/Shaders/Materials/marble.mat | 98 +++++++++ Assets/Shaders/Materials/marble.mat.meta | 8 + Assets/Shaders/Materials/sun.mat | 98 +++++++++ Assets/Shaders/Materials/sun.mat.meta | 8 + Assets/Shaders/VertexColor.shader | 58 +++++ Assets/Shaders/VertexColor.shader.meta | 10 + 20 files changed, 832 insertions(+), 134 deletions(-) create mode 100644 Assets/NPCs/Frog Babe/frogbabe2.fbx create mode 100644 Assets/NPCs/Frog Babe/frogbabe2.fbx.meta create mode 100644 Assets/Shaders.meta create mode 100644 Assets/Shaders/Materials.meta create mode 100644 Assets/Shaders/Materials/Material_2.mat create mode 100644 Assets/Shaders/Materials/Material_2.mat.meta create mode 100644 Assets/Shaders/Materials/marble.mat create mode 100644 Assets/Shaders/Materials/marble.mat.meta create mode 100644 Assets/Shaders/Materials/sun.mat create mode 100644 Assets/Shaders/Materials/sun.mat.meta create mode 100644 Assets/Shaders/VertexColor.shader create mode 100644 Assets/Shaders/VertexColor.shader.meta diff --git a/Assets/NPCs/Frog Babe/Material_2.mat b/Assets/NPCs/Frog Babe/Material_2.mat index 0ea8213..2c38405 100644 --- a/Assets/NPCs/Frog Babe/Material_2.mat +++ b/Assets/NPCs/Frog Babe/Material_2.mat @@ -9,9 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Material_2 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: + - _VERTEXCOLOR + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -56,25 +58,52 @@ 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: + - _BlendOp: 0 - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _EmissionEnabled: 0 + - _EmissionScaleUI: 0 + - _FlipbookMode: 0 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 + - _IntensityVC: 1 + - _LightingEnabled: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/NPCs/Frog Babe/Materials/Material_2.mat b/Assets/NPCs/Frog Babe/Materials/Material_2.mat index 0ea8213..5e2881b 100644 --- a/Assets/NPCs/Frog Babe/Materials/Material_2.mat +++ b/Assets/NPCs/Frog Babe/Materials/Material_2.mat @@ -8,9 +8,10 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Material_2 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: e2de4b314457106409da8e620a90a7ce, type: 3} m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _VERTEXCOLOR m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -56,15 +57,21 @@ 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 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EmissionScaleUI: 0 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 + - _IntensityVC: 1 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 @@ -77,4 +84,6 @@ Material: m_Colors: - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/NPCs/Frog Babe/frogbabe.fbx.meta b/Assets/NPCs/Frog Babe/frogbabe.fbx.meta index 4f4a615..1802863 100644 --- a/Assets/NPCs/Frog Babe/frogbabe.fbx.meta +++ b/Assets/NPCs/Frog Babe/frogbabe.fbx.meta @@ -4,21 +4,6 @@ ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Material_2 - second: {fileID: 2100000, guid: 4eee678fc963fa54b8ff1a8e2dcc5d53, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: marble cube - second: {fileID: 2100000, guid: cabe1abcd95392c4ba9654822f7d593c, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: sun - second: {fileID: 2100000, guid: ad859eceef08a0a4795b4d1974ead250, type: 2} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule @@ -26,8 +11,8 @@ ModelImporter: second: {fileID: 2800000, guid: 92e9bc7763dca044c903295a8bf180fd, type: 3} materials: materialImportMode: 1 - materialName: 2 - materialSearch: 2 + materialName: 0 + materialSearch: 0 materialLocation: 1 animations: legacyGenerateAnimations: 4 @@ -58,7 +43,7 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - useSRGBMaterialColor: 1 + useSRGBMaterialColor: 0 sortHierarchyByName: 1 importVisibility: 1 importBlendShapes: 1 diff --git a/Assets/NPCs/Frog Babe/frogbabe2.fbx b/Assets/NPCs/Frog Babe/frogbabe2.fbx new file mode 100644 index 0000000..93a2a59 --- /dev/null +++ b/Assets/NPCs/Frog Babe/frogbabe2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07bc8f2e88507ca71a4ccc63772fe6a2cd85c5f5ed67701c6fd642a3682dfd50 +size 10261676 diff --git a/Assets/NPCs/Frog Babe/frogbabe2.fbx.meta b/Assets/NPCs/Frog Babe/frogbabe2.fbx.meta new file mode 100644 index 0000000..ce2f2fe --- /dev/null +++ b/Assets/NPCs/Frog Babe/frogbabe2.fbx.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: dba6e8878b6655a4cbca9177521f799b +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 0 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NPCs/Frog Babe/sun.mat b/Assets/NPCs/Frog Babe/sun.mat index 6349bb5..26d9282 100644 --- a/Assets/NPCs/Frog Babe/sun.mat +++ b/Assets/NPCs/Frog Babe/sun.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: sun - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 7df5eaf1771a712489804e496d3182b8, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index 31afdc3..6edb586 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -1104,6 +1104,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d14f1a4437a41724c91591bb70a63248, type: 3} m_Name: m_EditorClassIdentifier: + SceneName: --- !u!114 &6340134095258607311 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1118,10 +1119,10 @@ MonoBehaviour: m_EditorClassIdentifier: grassStep: audioClip: {fileID: 8300000, guid: 539d0bf64e3207c43bbdcd75fa6f271d, type: 3} - pitchMin: 0 - pitchMax: 0 - volumeMin: 0.6 - volumeMax: 0.8 + pitchMin: 1 + pitchMax: 1 + volumeMin: 0.2 + volumeMax: 0.5 templeStep: audioClip: {fileID: 8300000, guid: b4cbe01d1f5ccab4bbfbc780613fc59e, type: 3} pitchMin: 0.7 @@ -1130,10 +1131,10 @@ MonoBehaviour: volumeMax: 1 sandStep: audioClip: {fileID: 8300000, guid: fb2c6dc162e24d94ebb3c3dba7cdb911, type: 3} - pitchMin: 0 - pitchMax: 0 - volumeMin: 0 - volumeMax: 0 + pitchMin: 0.7 + pitchMax: 1.1 + volumeMin: 0.6 + volumeMax: 1 audioSource: {fileID: -5973425731125482380} --- !u!82 &-5973425731125482380 AudioSource: diff --git a/Assets/Scenes/Airship.unity b/Assets/Scenes/Airship.unity index c891726..314c9b1 100644 --- a/Assets/Scenes/Airship.unity +++ b/Assets/Scenes/Airship.unity @@ -2134,7 +2134,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _scene: WorldMap - _spawnPoint: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3} _promptToEnter: 0 _promptText: {fileID: 0} --- !u!20 &1051381684 stripped @@ -2212,6 +2211,165 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -5495902117074765545, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3} +--- !u!1 &1075144244 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1075144245} + - component: {fileID: 1075144250} + - component: {fileID: 1075144249} + - component: {fileID: 1075144248} + - component: {fileID: 1075144247} + - component: {fileID: 1075144246} + m_Layer: 3 + m_Name: Dialogue Radius + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1075144245 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075144244} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 702.3, y: 256.52673, z: 2627.1} + m_LocalScale: {x: 34.02, y: 7.38, z: 34.02} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1163178683} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1075144246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075144244} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 395173c319b902c4fafc1c6c0d433f24, type: 3} + m_Name: + m_EditorClassIdentifier: + dialogue: + Sentences: + - Oh hello. + - 'Sorry if I seem startled. I knew you were coming + + but I didn''t know + when.' + - 'I wish I had the time to clean up a bit before you arrived. + + It''s quite + a mess outside.' + - Luaria wasn't happy when we took part of her for ourselves. + - 'Her followers flew up here trying to do something. + + Not really sure + what specifically.' + - As you can see they didn't have much time to talk. + - Mother power back then was like a piece of art. + - Powerful, beautiful, extraordinary. + - Everyday I see the wreckage, it reminds me why I was created. + - But unfortunately the casualties of war doesn't make my job any easier. + - I was worried I wouldn't have it harvested in time for your arrival. + - But against the odds, here it is! + - So much power from this sand can be condensed to this one item. + - 'But now I am finished, my purpose is achieved. + + I can die happy.' + - I am going to spend the rest of my time cherishing her beauty. + SoundEffect: + audioClip: {fileID: 8300000, guid: cde99aa876cd4a948a9f0ab587d8254f, type: 3} + pitchMin: 0.5 + pitchMax: 1 + volumeMin: 0.7 + volumeMax: 1.3 + TextSpeed: 0.02 +--- !u!114 &1075144247 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075144244} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 965133ab48042cf49acd1b0f8c2a2706, type: 3} + m_Name: + m_EditorClassIdentifier: + _dialogueTrigger: {fileID: 1075144246} +--- !u!135 &1075144248 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075144244} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1075144249 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075144244} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1075144250 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075144244} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1077272319 stripped GameObject: m_CorrespondingSourceObject: {fileID: -3215555783603854218, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3} @@ -2429,6 +2587,7 @@ Transform: - {fileID: 148242355} - {fileID: 183386901} - {fileID: 1458446960} + - {fileID: 1075144245} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 60, z: 0} diff --git a/Assets/Scenes/Temple.unity b/Assets/Scenes/Temple.unity index 8fb5b24..73fffd0 100644 --- a/Assets/Scenes/Temple.unity +++ b/Assets/Scenes/Temple.unity @@ -2913,6 +2913,104 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 65, z: 0} +--- !u!1001 &807566860 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1743353067} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalScale.x + value: 4.5625663 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalScale.y + value: 4.562567 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalScale.z + value: 4.5625663 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalPosition.x + value: 1136.6 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalPosition.y + value: 9.3628 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalPosition.z + value: -66.538 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -6757923488344600013, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -2511240423080479738, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_Name + value: frogbabe2 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_TagString + value: MainCamera + objectReference: {fileID: 0} + - target: {fileID: 7861854473326295642, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} +--- !u!4 &807566861 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: dba6e8878b6655a4cbca9177521f799b, type: 3} + m_PrefabInstance: {fileID: 807566860} + m_PrefabAsset: {fileID: 0} --- !u!1 &838203562 stripped GameObject: m_CorrespondingSourceObject: {fileID: 29315877300854997, guid: 0e34d8d9e7b9fd646b2bfb477f56d3af, type: 3} @@ -4075,7 +4173,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _scene: WorldMap - _spawnPoint: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3} _promptToEnter: 0 _promptText: {fileID: 0} --- !u!1 &1207374167 stripped @@ -5551,11 +5648,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1496508328} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.52, y: 0, z: 2.69} - m_LocalScale: {x: 6.8102, y: 0.06810201, z: 6.8102} + m_LocalPosition: {x: -0.519979, y: 0, z: 2.6900299} + m_LocalScale: {x: 6.8102007, y: 0.06810201, z: 6.8102007} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 1651075035} + m_Father: {fileID: 807566861} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1496508330 @@ -6117,100 +6214,6 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!1001 &1651075034 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1743353067} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalScale.x - value: 4.5625663 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalScale.y - value: 4.562567 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalScale.z - value: 4.5625663 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalPosition.x - value: 1136.6 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalPosition.y - value: 9.3628 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalPosition.z - value: -66.538 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalRotation.y - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -6888501967792289777, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -6757923488344600013, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -3477864577585124648, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_Name - value: Frog Babe - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} ---- !u!4 &1651075035 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3} - m_PrefabInstance: {fileID: 1651075034} - m_PrefabAsset: {fileID: 0} --- !u!1 &1653872700 stripped GameObject: m_CorrespondingSourceObject: {fileID: -5483956782140289584, guid: 51f29eb6c8a88234f818b1d46a1616c5, type: 3} @@ -6523,7 +6526,7 @@ Transform: - {fileID: 1554551130} - {fileID: 310258525} - {fileID: 1465268328} - - {fileID: 1651075035} + - {fileID: 807566861} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} diff --git a/Assets/Scripts/Audio/Footsteps.cs b/Assets/Scripts/Audio/Footsteps.cs index 816a11b..74a57f0 100644 --- a/Assets/Scripts/Audio/Footsteps.cs +++ b/Assets/Scripts/Audio/Footsteps.cs @@ -17,8 +17,8 @@ namespace Scampz.GameJam public void Step() { - Debug.Log("Step SFX"); var soundEffect = GetAudioClip(); + Debug.Log("Step SFX " + soundEffect.audioClip.name); audioSource.pitch = Random.Range(soundEffect.pitchMin, soundEffect.pitchMax); audioSource.volume = Random.Range(soundEffect.volumeMin, soundEffect.volumeMax); audioSource.clip = soundEffect.audioClip; diff --git a/Assets/Shaders.meta b/Assets/Shaders.meta new file mode 100644 index 0000000..a527d96 --- /dev/null +++ b/Assets/Shaders.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 564939a0341440b4293f85862905334e +folderAsset: yes +timeCreated: 1433753086 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/Materials.meta b/Assets/Shaders/Materials.meta new file mode 100644 index 0000000..ee3235f --- /dev/null +++ b/Assets/Shaders/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f92ba42cd3b4cd9408ebacf011749de0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/Materials/Material_2.mat b/Assets/Shaders/Materials/Material_2.mat new file mode 100644 index 0000000..95867d2 --- /dev/null +++ b/Assets/Shaders/Materials/Material_2.mat @@ -0,0 +1,98 @@ +%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: Material_2 + m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 0 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - GRABPASS + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 0 + - _EmissionEnabled: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _LightingEnabled: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Shaders/Materials/Material_2.mat.meta b/Assets/Shaders/Materials/Material_2.mat.meta new file mode 100644 index 0000000..20bdf97 --- /dev/null +++ b/Assets/Shaders/Materials/Material_2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d81e125fba01d134c9433d461b256bdc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/Materials/marble.mat b/Assets/Shaders/Materials/marble.mat new file mode 100644 index 0000000..11903c7 --- /dev/null +++ b/Assets/Shaders/Materials/marble.mat @@ -0,0 +1,98 @@ +%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: marble + m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 0 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - GRABPASS + 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: 4ab4eccfc963c2a4a829b5cedfe4743f, 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: + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 0 + - _EmissionEnabled: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _LightingEnabled: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Shaders/Materials/marble.mat.meta b/Assets/Shaders/Materials/marble.mat.meta new file mode 100644 index 0000000..073cb16 --- /dev/null +++ b/Assets/Shaders/Materials/marble.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 336f68a1f290f324da23992b20e1b06d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/Materials/sun.mat b/Assets/Shaders/Materials/sun.mat new file mode 100644 index 0000000..b9d1d1d --- /dev/null +++ b/Assets/Shaders/Materials/sun.mat @@ -0,0 +1,98 @@ +%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: sun + m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 0 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - GRABPASS + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 0 + - _EmissionEnabled: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _LightingEnabled: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.75424117, g: 0.8000001, b: 0.017093979, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Shaders/Materials/sun.mat.meta b/Assets/Shaders/Materials/sun.mat.meta new file mode 100644 index 0000000..8fd46be --- /dev/null +++ b/Assets/Shaders/Materials/sun.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8a6cdd010d7fac48b0f3ca35b6a47d8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/VertexColor.shader b/Assets/Shaders/VertexColor.shader new file mode 100644 index 0000000..3b16d56 --- /dev/null +++ b/Assets/Shaders/VertexColor.shader @@ -0,0 +1,58 @@ +Shader "Custom/NewSurfaceShader" +{ + Properties + { + _Color ("Color", Color) = (1,1,1,1) + _MainTex ("Albedo (RGB)", 2D) = "white" {} + _Glossiness ("Smoothness", Range(0,1)) = 0.5 + _Metallic ("Metallic", Range(0,1)) = 0.0 + } + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 200 + + CGPROGRAM + // Physically based Standard lighting model, and enable shadows on all light types + #pragma surface surf Standard fullforwardshadows + + // Use shader model 3.0 target, to get nicer looking lighting + #pragma target 3.0 + + sampler2D _MainTex; + + struct Input + { + float2 uv_MainTex; + float4 vertColor; + }; + + half _Glossiness; + half _Metallic; + fixed4 _Color; + + // Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader. + // See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing. + // #pragma instancing_options assumeuniformscaling + UNITY_INSTANCING_BUFFER_START(Props) + // put more per-instance properties here + UNITY_INSTANCING_BUFFER_END(Props) + void vert(inout appdata_full v, out Input o){ + UNITY_INITIALIZE_OUTPUT(Input, o); + o.vertColor = v.color; + } + void surf (Input IN, inout SurfaceOutputStandard o) + { + // Albedo comes from a texture tinted by color + // fixed4 c = tex2D (_MainTex, IN.uv_MainTex) * _Color; + // o.Albedo = c.rgb; + o.Albedo = IN.vertColor.rgb; + // Metallic and smoothness come from slider variables + o.Metallic = _Metallic; + o.Smoothness = _Glossiness; + o.Alpha = c.a; + } + ENDCG + } + FallBack "Diffuse" +} \ No newline at end of file diff --git a/Assets/Shaders/VertexColor.shader.meta b/Assets/Shaders/VertexColor.shader.meta new file mode 100644 index 0000000..c4e1639 --- /dev/null +++ b/Assets/Shaders/VertexColor.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7df5eaf1771a712489804e496d3182b8 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 + userData: + assetBundleName: + assetBundleVariant: