Commit c3d1ea4e authored by Freddy's avatar Freddy
Browse files

Final

parent b6260e07
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: HighFiveTrail
m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_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: 0.6745098, g: 0.83137256, b: 0.9490196, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
fileFormatVersion: 2
guid: ac15272ccd7c1af478707a9104d07ffb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
...@@ -76,14 +76,14 @@ Material: ...@@ -76,14 +76,14 @@ Material:
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1
- _StarRadius: 5400 - _StarRadius: 2015
- _StarRadiusInner: 5000 - _StarRadiusInner: 1920
- _UVSec: 0 - _UVSec: 0
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color1: {r: 0.9254902, g: 0.92941177, b: 0.6509804, a: 1} - _Color1: {r: 0.9254902, g: 0.92941177, b: 0.6509804, a: 1}
- _Color2: {r: 0.60784316, g: 0.8156863, b: 0.7294118, a: 1} - _Color2: {r: 0.6745098, g: 0.83137256, b: 0.9490196, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _ReplaceColor: {r: 1, g: 0, b: 1, a: 1} - _ReplaceColor: {r: 1, g: 0, b: 1, a: 1}
- _Screen: {r: 319.3547, g: 1341.3159, b: 0, a: 0} - _Screen: {r: 329.6929, g: 1341.4862, b: 0, a: 0}
...@@ -49,16 +49,16 @@ TextureImporter: ...@@ -49,16 +49,16 @@ TextureImporter:
second: Jonnny_Glove second: Jonnny_Glove
- first: - first:
213: 7732274991645016200 213: 7732274991645016200
second: Jonnny_11 second: Icon_SantaJacket
- first: - first:
213: -5942911627491724083 213: -5942911627491724083
second: Jonnny_12 second: Jonnny_SantaJacket
- first: - first:
213: -469135368049128890 213: -469135368049128890
second: Jonnny_13 second: Icon_SantaBeard
- first: - first:
213: 1679061879587657741 213: 1679061879587657741
second: Jonnny_14 second: Jonnny_SantaBeard
- first: - first:
213: 8437513787768927669 213: 8437513787768927669
second: Jonnny_15 second: Jonnny_15
...@@ -482,6 +482,90 @@ TextureImporter: ...@@ -482,6 +482,90 @@ TextureImporter:
indices: indices:
edges: [] edges: []
weights: [] weights: []
- serializedVersion: 2
name: Icon_SantaJacket
rect:
serializedVersion: 2
x: 58
y: 74
width: 128
height: 128
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 88043a6332f8e4b60800000000000000
internalID: 7732274991645016200
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Jonnny_SantaJacket
rect:
serializedVersion: 2
x: 54
y: 74
width: 141
height: 129
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: dc431d79c59868da0800000000000000
internalID: -5942911627491724083
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Icon_SantaBeard
rect:
serializedVersion: 2
x: 275
y: 64
width: 112
height: 112
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 64a0cdb4edb4d79f0800000000000000
internalID: -469135368049128890
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Jonnny_SantaBeard
rect:
serializedVersion: 2
x: 287
y: 67
width: 86
height: 107
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: d08d8b822e93d4710800000000000000
internalID: 1679061879587657741
vertices: []
indices:
edges: []
weights: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7018b3b57a62cff4c94ebe1bdcf185be, type: 3}
m_Name: 06_SantaBeard
m_EditorClassIdentifier:
place: 0
icon: {fileID: -469135368049128890, guid: 5d4f3a85d52d142e5a4db2fe9da91564, type: 3}
prefab: {fileID: 3459791119128292055, guid: efba6832f9353ef4d8a8cbc4ff92270a, type: 3}
fileFormatVersion: 2
guid: 99f7170c4df5e174c9a674e951f5a137
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3459791119128292055
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3459791119128292052}
- component: {fileID: 3459791119128292053}
m_Layer: 0
m_Name: 06_SantaBeard
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3459791119128292052
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3459791119128292055}
m_LocalRotation: {x: -0.0006367771, y: -0.0008313698, z: 0.60806644, w: -0.79388547}
m_LocalPosition: {x: 0.13838977, y: 0.10860287, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -0.032, y: 0.116000004, z: 15.292001}
--- !u!212 &3459791119128292053
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3459791119128292055}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 1679061879587657741, guid: 5d4f3a85d52d142e5a4db2fe9da91564,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.84, y: 1.05}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
fileFormatVersion: 2 fileFormatVersion: 2
guid: 72cceb968b5008c4880ec3921c48acac guid: efba6832f9353ef4d8a8cbc4ff92270a
folderAsset: yes PrefabImporter:
DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7018b3b57a62cff4c94ebe1bdcf185be, type: 3}
m_Name: 07_SantaJacket
m_EditorClassIdentifier:
place: 1
icon: {fileID: 7732274991645016200, guid: 5d4f3a85d52d142e5a4db2fe9da91564, type: 3}
prefab: {fileID: 7655465137564143841, guid: 8061cee8dc9b23a42bd3e3de7f8ebf6c, type: 3}
fileFormatVersion: 2
guid: f4b28a687842a8541a8f28e2db7f877c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7655465137564143841
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7655465137564143840}
- component: {fileID: 7655465137564143847}
m_Layer: 0
m_Name: 07_SantaJacket
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7655465137564143840
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7655465137564143841}
m_LocalRotation: {x: 0, y: 0, z: -0.6427207, w: 0.76610065}
m_LocalPosition: {x: 0.086, y: -0.037, z: 0}
m_LocalScale: {x: 1.05, y: 1.05, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -79.990005}
--- !u!212 &7655465137564143847
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7655465137564143841}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -1
m_Sprite: {fileID: -5942911627491724083, guid: 5d4f3a85d52d142e5a4db2fe9da91564,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.41, y: 1.29}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
fileFormatVersion: 2
guid: 8061cee8dc9b23a42bd3e3de7f8ebf6c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
...@@ -9,6 +9,7 @@ public class BackgroundController : MonoBehaviour ...@@ -9,6 +9,7 @@ public class BackgroundController : MonoBehaviour
public new Camera camera; public new Camera camera;
public Material shader; public Material shader;
public Material TrailMaterial;
public float animationLength; public float animationLength;
public Color backgroundColor; public Color backgroundColor;
...@@ -26,6 +27,14 @@ public class BackgroundController : MonoBehaviour ...@@ -26,6 +27,14 @@ public class BackgroundController : MonoBehaviour
shader.SetColor("_Color2", backgroundColor); shader.SetColor("_Color2", backgroundColor);
} }
private void Start()
{
shader.SetFloat("_ScreenRatio", Screen.width / (float)Screen.height);
shader.SetInt("_ScreenWidth", Screen.width);
shader.SetInt("_StarRadius", (int)(Screen.height * 1.05f));
shader.SetInt("_StarRadiusInner", Screen.height);
}
public void StartAnimation(Vector3 worldPosition) public void StartAnimation(Vector3 worldPosition)
{ {
Vector2 screenPos = camera.WorldToScreenPoint(worldPosition); Vector2 screenPos = camera.WorldToScreenPoint(worldPosition);
...@@ -41,6 +50,7 @@ public class BackgroundController : MonoBehaviour ...@@ -41,6 +50,7 @@ public class BackgroundController : MonoBehaviour
backgroundColor = colorLibrary[colorIndex]; backgroundColor = colorLibrary[colorIndex];
starColor = colorLibrary[newIndex]; starColor = colorLibrary[newIndex];
TrailMaterial.color = colorLibrary[newIndex % colorLibrary.Length];
colorIndex = newIndex; colorIndex = newIndex;
......
...@@ -6,6 +6,14 @@ public class HighFiveTarget : MonoBehaviour ...@@ -6,6 +6,14 @@ public class HighFiveTarget : MonoBehaviour
{ {
public RandomAudioPlayer clapAudioPlayer; public RandomAudioPlayer clapAudioPlayer;
public RandomAudioPlayer yeahAudioPlayer; public RandomAudioPlayer yeahAudioPlayer;
public ParticleSystem ps;
private void Awake()
{
ps.Stop();
}
internal void Trigger() internal void Trigger()
{ {
HighFiveCounter.Instance.Add(); HighFiveCounter.Instance.Add();
...@@ -13,5 +21,6 @@ public class HighFiveTarget : MonoBehaviour ...@@ -13,5 +21,6 @@ public class HighFiveTarget : MonoBehaviour
clapAudioPlayer.PlaySound(); clapAudioPlayer.PlaySound();
yeahAudioPlayer.PlaySound(); yeahAudioPlayer.PlaySound();
ps.Play();
} }
} }
fileFormatVersion: 2
guid: a0497f5f32af8e94fb0914ec0f1e3141
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0