Compare commits

...

14 Commits

Author SHA1 Message Date
Dom Harris 6be4af17b5 scrub mode for cai 2021-01-14 12:45:18 +00:00
Dom Harris 1f40cb14b8 Merge branch 'main' of https://gitlab.badbrain.dev/bloom-bois-2021/lucidity into main 2021-01-11 12:47:44 +00:00
Dom Harris c0bf2fecf6 aaaaaaa 2021-01-11 12:45:59 +00:00
Dom Harris 5efcff1bac aaaaaaa 2021-01-11 12:45:37 +00:00
Cat Flynn f54ce99f07 integrate sound 2021-01-11 12:42:43 +00:00
cainapple ffc3bbe283 sound 2021-01-11 12:35:16 +00:00
cainapple fb7119de40 songy song 2021-01-11 12:03:00 +00:00
Cat Flynn d8fd4b5a0a improve enemy collision, slidies, difficulty curve 2021-01-11 11:46:46 +00:00
Cat Flynn 3b0e143787 move script 2021-01-11 10:28:36 +00:00
Cat Flynn b64b932d6d Merge branch 'main' into slide-sideways 2021-01-11 10:25:54 +00:00
Cat Flynn ee58ea38ef scale bounce with intensity, shake camera on calm 2021-01-11 10:22:51 +00:00
Cat Flynn 39770c5c48 make bullets visible lol 2021-01-11 10:21:41 +00:00
Dom Harris 7310855118 enemy position moved 2021-01-11 10:09:36 +00:00
Dom Harris 672b5c36fd menu 2021-01-11 10:01:41 +00:00
61 changed files with 14924 additions and 367 deletions

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c271cfa846431634db54fa41238b7b35, type: 3} m_Script: {fileID: 11500000, guid: c271cfa846431634db54fa41238b7b35, type: 3}
m_Name: Accessibility Options m_Name: Accessibility Options
m_EditorClassIdentifier: m_EditorClassIdentifier:
_mode: 0 _mode: 2
_calm: _calm:
_value: 0 _value: 0
_tunnel: {fileID: 2100000, guid: e26770f868f0d0d44960f5354b21e17c, type: 2} _tunnel: {fileID: 2100000, guid: e26770f868f0d0d44960f5354b21e17c, type: 2}

BIN
Assets/FMOD/Desktop/Master.bank (Stored with Git LFS)

Binary file not shown.

BIN
Assets/FMOD/Desktop/Master.strings.bank (Stored with Git LFS)

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 37b107ae46699425aaebe349c41daf8a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e82d79a965eae43519cd60439e2be938
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4401,8 +4401,8 @@ MonoBehaviour:
italicTypeface: {fileID: 0} italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0} - regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0} italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0} - regularTypeface: {fileID: 11400000, guid: 37b107ae46699425aaebe349c41daf8a, type: 2}
italicTypeface: {fileID: 0} italicTypeface: {fileID: 11400000, guid: e82d79a965eae43519cd60439e2be938, type: 2}
- regularTypeface: {fileID: 0} - regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0} italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0} - regularTypeface: {fileID: 0}

View File

@ -133,7 +133,7 @@ Material:
m_Colors: m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color1: {r: 0.3634766, g: 5.3403134, b: 0, a: 1} - _Color1: {r: 1.4539073, g: 21.361254, b: 0, a: 1}
- _Color2: {r: 0.24509804, g: 0.3764706, b: 0, a: 1} - _Color2: {r: 0.24509804, g: 0.3764706, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FarColor: {r: 1, g: 1, b: 1, a: 1} - _FarColor: {r: 1, g: 1, b: 1, a: 1}

View File

@ -82,7 +82,7 @@ Material:
m_Floats: m_Floats:
- _Alpha: 1 - _Alpha: 1
- _AlphaClip: 0 - _AlphaClip: 0
- _BaseScale: 0.8 - _BaseScale: 1.2
- _Blend: 0 - _Blend: 0
- _BumpScale: 1 - _BumpScale: 1
- _C: 0 - _C: 0
@ -104,7 +104,7 @@ Material:
- _Parallax: 0.005 - _Parallax: 0.005
- _PulseIntensity: 0.5 - _PulseIntensity: 0.5
- _QueueOffset: 0 - _QueueOffset: 0
- _RadiusWithDistance: 0.00005 - _RadiusWithDistance: 0.00007
- _ReceiveShadows: 1 - _ReceiveShadows: 1
- _Smoothness: 0.5 - _Smoothness: 0.5
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0

View File

@ -104,7 +104,7 @@ Material:
- _Parallax: 0.005 - _Parallax: 0.005
- _PulseIntensity: 1 - _PulseIntensity: 1
- _QueueOffset: 0 - _QueueOffset: 0
- _RadiusWithDistance: 0.00005 - _RadiusWithDistance: 0.00007
- _ReceiveShadows: 1 - _ReceiveShadows: 1
- _Smoothness: 0.5 - _Smoothness: 0.5
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0

2300
Assets/Prefabs/Canvas.prefab Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 06a503fb8d695452483a68d648b2613c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -9,12 +9,6 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 1738226812227614580} - component: {fileID: 1738226812227614580}
- component: {fileID: 1738226812227614581}
- component: {fileID: 1738226812227614582}
- component: {fileID: 233269787904781725}
- component: {fileID: 2766037370157449026}
- component: {fileID: 2122656558574222561}
- component: {fileID: -3971665732303992234}
- component: {fileID: -4901459127090716512} - component: {fileID: -4901459127090716512}
- component: {fileID: 1858863165099212332} - component: {fileID: 1858863165099212332}
m_Layer: 7 m_Layer: 7
@ -34,25 +28,91 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.1, y: 0.05, z: 0.6} m_LocalScale: {x: 0.1, y: 0.05, z: 0.6}
m_Children: [] m_Children:
- {fileID: 4594444422239700297}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1738226812227614581 --- !u!114 &-4901459127090716512
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1738226812227614583}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 990644fedd5c4b99befe1da660313b53, type: 3}
m_Name:
m_EditorClassIdentifier:
xMin: -10.1
xMax: 10.1
--- !u!114 &1858863165099212332
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1738226812227614583}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ea3f51bb4cd6c8146a185362df2fe451, type: 3}
m_Name:
m_EditorClassIdentifier:
_speedRange: {x: -10, y: 10}
_xBounds: {x: -10, y: 10}
--- !u!1 &7094929575626237127
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4594444422239700297}
- component: {fileID: 6881408910791168133}
- component: {fileID: 6589931989203474192}
- component: {fileID: 886925500633839999}
- component: {fileID: 6137382929676426403}
- component: {fileID: 2787129704687440408}
- component: {fileID: 2424066718066466437}
- component: {fileID: 8226614408333612856}
m_Layer: 7
m_Name: Enemy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4594444422239700297
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7094929575626237127}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1738226812227614580}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6881408910791168133
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1738226812227614583} m_GameObject: {fileID: 7094929575626237127}
m_Mesh: {fileID: -5495902117074765545, guid: 7421c25da3323da4aa7ac7582f03c58e, type: 3} m_Mesh: {fileID: -5495902117074765545, guid: 7421c25da3323da4aa7ac7582f03c58e, type: 3}
--- !u!23 &1738226812227614582 --- !u!23 &6589931989203474192
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1738226812227614583} m_GameObject: {fileID: 7094929575626237127}
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
@ -87,64 +147,64 @@ MeshRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &233269787904781725 --- !u!65 &886925500633839999
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1738226812227614583} m_GameObject: {fileID: 7094929575626237127}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 1 m_IsTrigger: 1
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 2, y: 2, z: 2} m_Size: {x: 2, y: 2, z: 2}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &2766037370157449026 --- !u!114 &6137382929676426403
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1738226812227614583} m_GameObject: {fileID: 7094929575626237127}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d77551efeb20a4bdabb517c8351695ff, type: 3} m_Script: {fileID: 11500000, guid: d77551efeb20a4bdabb517c8351695ff, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
maxHealth: 4 maxHealth: 1
--- !u!114 &2122656558574222561 --- !u!114 &2787129704687440408
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1738226812227614583} m_GameObject: {fileID: 7094929575626237127}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5b2c8b098025f4e2f997759b5c00fef7, type: 3} m_Script: {fileID: 11500000, guid: 5b2c8b098025f4e2f997759b5c00fef7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &-3971665732303992234 --- !u!114 &2424066718066466437
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1738226812227614583} m_GameObject: {fileID: 7094929575626237127}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1c18e41c4d38f4467bda24e543fec25f, type: 3} m_Script: {fileID: 11500000, guid: 1c18e41c4d38f4467bda24e543fec25f, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
value: 1000 value: 1000
--- !u!114 &-4901459127090716512 --- !u!114 &8226614408333612856
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1738226812227614583} m_GameObject: {fileID: 7094929575626237127}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 990644fedd5c4b99befe1da660313b53, type: 3} m_Script: {fileID: 11500000, guid: 990644fedd5c4b99befe1da660313b53, type: 3}
@ -152,16 +212,3 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
xMin: -10.1 xMin: -10.1
xMax: 10.1 xMax: 10.1
--- !u!114 &1858863165099212332
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1738226812227614583}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ea3f51bb4cd6c8146a185362df2fe451, type: 3}
m_Name:
m_EditorClassIdentifier:
_speedRange: {x: -5, y: 5}

View File

@ -0,0 +1,374 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1547993869283367433
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3302479053897003008}
- component: {fileID: 874092891489364741}
- component: {fileID: 192647976278863605}
m_Layer: 5
m_Name: Score
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3302479053897003008
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1547993869283367433}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 998365086816182479}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &874092891489364741
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1547993869283367433}
m_CullTransparentMesh: 1
--- !u!114 &192647976278863605
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1547993869283367433}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 134842398472983479283749283749827394827394872394729348723948
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0f0f54895994248b0bf34c4b4d27beef, type: 2}
m_sharedMaterial: {fileID: -3347474280721358513, guid: 0f0f54895994248b0bf34c4b4d27beef, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 8192
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &3864097599779706431
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3145588804607280503}
- component: {fileID: 4163497514064781575}
- component: {fileID: 2141660963270504497}
m_Layer: 5
m_Name: Name
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3145588804607280503
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3864097599779706431}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 998365086816182479}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4163497514064781575
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3864097599779706431}
m_CullTransparentMesh: 1
--- !u!114 &2141660963270504497
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3864097599779706431}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'THIS IS A NAME:'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0f0f54895994248b0bf34c4b4d27beef, type: 2}
m_sharedMaterial: {fileID: -3347474280721358513, guid: 0f0f54895994248b0bf34c4b4d27beef, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 4
m_VerticalAlignment: 8192
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &6258529998005361767
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 998365086816182479}
- component: {fileID: 4832440817193772080}
- component: {fileID: 4094039531951816270}
- component: {fileID: 2238025254592428201}
m_Layer: 5
m_Name: ScoreItem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &998365086816182479
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6258529998005361767}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3145588804607280503}
- {fileID: 3302479053897003008}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4832440817193772080
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6258529998005361767}
m_CullTransparentMesh: 1
--- !u!114 &4094039531951816270
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6258529998005361767}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.53333336}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &2238025254592428201
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6258529998005361767}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 20
m_Right: 20
m_Top: 20
m_Bottom: 20
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
m_ChildControlHeight: 1
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 787a41604901540b1a95adb5abf0f21f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -94,7 +94,7 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1} m_Size: {x: 0.1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &8761754940900000814 --- !u!114 &8761754940900000814
MonoBehaviour: MonoBehaviour:

View File

@ -0,0 +1,92 @@
%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: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: PostProcessing Profile 1
m_EditorClassIdentifier:
components:
- {fileID: 202689566379251267}
- {fileID: 5413449175736310307}
--- !u!114 &202689566379251267
MonoBehaviour:
m_ObjectHideFlags: 3
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: 66f335fb1ffd8684294ad653bf1c7564, type: 3}
m_Name: ColorAdjustments
m_EditorClassIdentifier:
active: 1
m_AdvancedMode: 0
postExposure:
m_OverrideState: 1
m_Value: 0
contrast:
m_OverrideState: 1
m_Value: -18.2
min: -100
max: 100
colorFilter:
m_OverrideState: 0
m_Value: {r: 1, g: 1, b: 1, a: 1}
hdr: 1
showAlpha: 0
showEyeDropper: 1
hueShift:
m_OverrideState: 0
m_Value: 0
min: -180
max: 180
saturation:
m_OverrideState: 1
m_Value: -100
min: -100
max: 100
--- !u!114 &5413449175736310307
MonoBehaviour:
m_ObjectHideFlags: 3
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: c5e1dc532bcb41949b58bc4f2abfbb7e, type: 3}
m_Name: LensDistortion
m_EditorClassIdentifier:
active: 1
m_AdvancedMode: 0
intensity:
m_OverrideState: 1
m_Value: -0.873
min: -1
max: 1
xMultiplier:
m_OverrideState: 0
m_Value: 1
min: 0
max: 1
yMultiplier:
m_OverrideState: 0
m_Value: 1
min: 0
max: 1
center:
m_OverrideState: 0
m_Value: {x: 0.5, y: 0.5}
scale:
m_OverrideState: 0
m_Value: 1
min: 0.01
max: 5

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cd0d45cbc72c0445e8b86325112ee209
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -132,6 +132,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 79664421} - component: {fileID: 79664421}
- component: {fileID: 79664422}
m_Layer: 0 m_Layer: 0
m_Name: PlayerContainer m_Name: PlayerContainer
m_TagString: Untagged m_TagString: Untagged
@ -147,13 +148,25 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 79664420} m_GameObject: {fileID: 79664420}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1173812008} - {fileID: 1173812008}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &79664422
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 79664420}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 35034e3b9a94742c6be0c008855b42e4, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &84273093 --- !u!1 &84273093
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -164,6 +177,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 84273095} - component: {fileID: 84273095}
- component: {fileID: 84273094} - component: {fileID: 84273094}
- component: {fileID: 84273096}
m_Layer: 0 m_Layer: 0
m_Name: App m_Name: App
m_TagString: Untagged m_TagString: Untagged
@ -208,6 +222,20 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &84273096
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 84273093}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 565df9595af1e6e4a9547067e1d23b5d, type: 3}
m_Name:
m_EditorClassIdentifier:
_base: 1
_perBeatIncrease: 0.005
--- !u!1 &186457103 --- !u!1 &186457103
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -361,108 +389,124 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &726912288
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 726912292}
- component: {fileID: 726912291}
- component: {fileID: 726912290}
- component: {fileID: 726912289}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &726912289
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 726912288}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &726912290
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 726912288}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &726912291
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 726912288}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &726912292
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 726912288}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1330494722}
m_Father: {fileID: 0}
m_RootOrder: 8 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
m_AnchorMin: {x: 0, y: 0} --- !u!1001 &624254283
m_AnchorMax: {x: 0, y: 0} PrefabInstance:
m_AnchoredPosition: {x: 0, y: 0} m_ObjectHideFlags: 0
m_SizeDelta: {x: 0, y: 0} serializedVersion: 2
m_Pivot: {x: 0, y: 0} m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 9074813667455965611, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813667455965611, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_RootOrder
value: 10
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047664, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9074813668488047668, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
propertyPath: m_Name
value: Canvas
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
--- !u!114 &624254284 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 9074813668481925351, guid: 06a503fb8d695452483a68d648b2613c, type: 3}
m_PrefabInstance: {fileID: 624254283}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fb995736010274d74b688e29ba7df577, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &728836291 --- !u!1 &728836291
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -676,7 +720,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 10 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1077224733 --- !u!1001 &1077224733
PrefabInstance: PrefabInstance:
@ -936,7 +980,7 @@ BoxCollider:
m_GameObject: {fileID: 1173812004} m_GameObject: {fileID: 1173812004}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 0
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1} m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
@ -982,7 +1026,19 @@ MonoBehaviour:
m_CallState: 2 m_CallState: 2
OnGameOver: OnGameOver:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls:
- m_Target: {fileID: 624254284}
m_TargetAssemblyTypeName: GameOver, Assembly-CSharp
m_MethodName: DoGameOver
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1173812007 --- !u!114 &1173812007
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1172,176 +1228,12 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1222495242} m_GameObject: {fileID: 1222495242}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: -2.532}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1173812008} m_Father: {fileID: 1173812008}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1330494721
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1330494722}
- component: {fileID: 1330494724}
- component: {fileID: 1330494723}
- component: {fileID: 1330494726}
- component: {fileID: 1330494725}
m_Layer: 5
m_Name: Score
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1330494722
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1330494721}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 726912292}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -30}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1330494723
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1330494721}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0f0f54895994248b0bf34c4b4d27beef, type: 2}
m_sharedMaterial: {fileID: -3347474280721358513, guid: 0f0f54895994248b0bf34c4b4d27beef, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 48
m_fontSizeBase: 48
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 8192
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1330494724
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1330494721}
m_CullTransparentMesh: 1
--- !u!114 &1330494725
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1330494721}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3da04f2795dd4afe8551debe01be4561, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1330494726
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1330494721}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45e7636ea714949cd8358ebe56fef05f, type: 3}
m_Name:
m_EditorClassIdentifier:
timeSince: {fileID: 11400000, guid: 8f05f93192443bc42b8523048bde0dc4, type: 2}
scale: 0.25
ySquish: -0.15
characterSpacing: 10
--- !u!1 &1395215960 --- !u!1 &1395215960
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1601,12 +1493,16 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.size propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.size
value: 2 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_Mode propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[0].m_Target propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value: value:
@ -1615,22 +1511,42 @@ PrefabInstance:
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_Target propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value: value:
objectReference: {fileID: 532372216} objectReference: {fileID: 532372216}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 84273096}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_CallState propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
value: 2 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: OnBeat value: OnBeat
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
value: OnBeat
objectReference: {fileID: 0}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: BeatSpawner, Assembly-CSharp value: BeatSpawner, Assembly-CSharp
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName
value: IncreaseDifficultyOverTime, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3} - target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2145967175348613560, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: _onBeat.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2145967175348613561, guid: 88246464365fd0745b75edfcff208598, type: 3} - target: {fileID: 2145967175348613561, guid: 88246464365fd0745b75edfcff208598, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Audio value: Audio
@ -1688,6 +1604,10 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 1173812008} m_TransformParent: {fileID: 1173812008}
m_Modifications: m_Modifications:
- target: {fileID: 5276750110334005506, guid: bd5f27d2b3a6b4a40aab2af5c3c4586e, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5276750110334005516, guid: bd5f27d2b3a6b4a40aab2af5c3c4586e, type: 3} - target: {fileID: 5276750110334005516, guid: bd5f27d2b3a6b4a40aab2af5c3c4586e, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Ship value: Ship

2422
Assets/Scenes/Menu.unity Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5f5923e6ff0e344db822ce1549c8a550
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -26,6 +26,6 @@ public class AddScoreOnDie : MonoBehaviour
private void Die() private void Die()
{ {
Score.Value += value + (ulong)Random.Range(-5, 5); Score.Add(value + (ulong)Random.Range(-5, 5));
} }
} }

View File

@ -80,6 +80,8 @@ public class AudioBeatManager : MonoBehaviour, IAudioBeatManager
_timer = timeSinceLastBeat; _timer = timeSinceLastBeat;
++_currentBeat; ++_currentBeat;
if (Time.timeScale == 0)
return;
OnBeat?.Invoke(_currentBeat); OnBeat?.Invoke(_currentBeat);
OnBeatEvent?.Invoke(_currentBeat); OnBeatEvent?.Invoke(_currentBeat);
} }

View File

@ -0,0 +1,56 @@
using DG.Tweening;
using TMPro;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.EventSystems;
public class BoldButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, ISelectHandler, IDeselectHandler
{
[SerializeField] private UnityEvent Select;
private TextMeshProUGUI _text;
private static BoldButton _currentBold;
private Tweener _tween;
private void Awake()
{
_text = GetComponentInChildren<TextMeshProUGUI>();
}
private void BoldText()
{
_currentBold?.UnBoldText();
_currentBold = this;
_text.fontStyle = FontStyles.Bold;
}
private void UnBoldText()
{
_text.fontStyle = FontStyles.Normal;
}
public void OnPointerEnter(PointerEventData eventData)
{
BoldText();
}
public void OnPointerExit(PointerEventData eventData)
{
UnBoldText();
}
public void OnSelect(BaseEventData eventData)
{
BoldText();
}
public void OnDeselect(BaseEventData eventData)
{
UnBoldText();
}
public void Submit()
{
Select?.Invoke();
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5d187770e669e412092a5b03c66a546c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -45,7 +45,7 @@ public class DisableOnDeath : MonoBehaviour
private void Die() private void Die()
{ {
var oldName = gameObject.name; var oldName = gameObject.name;
gameObject.name = "disabled"; gameObject.transform.parent.name = "disabled";
_collider.enabled = false; _collider.enabled = false;
float duration = 0.4f; float duration = 0.4f;

View File

@ -29,6 +29,8 @@ public class EntityLives : MonoBehaviour
private void Die() private void Die()
{ {
FMODUnity.RuntimeManager.PlayOneShot("event:/hit");
--lives; --lives;
if (lives > 0) if (lives > 0)
{ {

View File

@ -0,0 +1,49 @@
using System.Collections;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
using DG.Tweening;
using TMPro;
using UnityEngine;
using UnityEngine.Rendering;
public class GameOver : MonoBehaviour
{
[SerializeField] private Volume deadFX;
[SerializeField] private TextMeshProUGUI score;
[SerializeField] private RectTransform text;
[SerializeField] private float initialScoreText = 48;
[SerializeField] private float finalScoreText = 96;
[SerializeField] private CanvasGroup gameOver;
public void DoGameOver()
{
float x = 0;
DOTween.To(() => x, val =>
{
x = val;
deadFX.weight = val;
Time.timeScale = 1 - val;
score.fontSize = Mathf.Lerp(initialScoreText, finalScoreText, val);
}, 1, 1f).SetEase(Ease.OutQuint).SetUpdate(true);
score.rectTransform.DOAnchorPos(new Vector2(0, -400), 1f).SetEase(Ease.OutQuint).SetUpdate(true);
text.DOScale(Vector3.one, 0.5f).SetDelay(1f).SetEase(Ease.OutBack).SetUpdate(true);
gameOver.DOFade(1, 1).SetUpdate(true);
gameOver.blocksRaycasts = true;
}
public void DoSubmit()
{
float x = 0;
DOTween.To(() => x, val =>
{
x = val;
score.fontSize = Mathf.Lerp(initialScoreText, finalScoreText, 1-val);
}, 1, 1f).SetEase(Ease.OutQuint).SetUpdate(true);
score.rectTransform.DOAnchorPos(new Vector2(0, -30), 1f).SetEase(Ease.OutQuint).SetUpdate(true);
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: fb995736010274d74b688e29ba7df577
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using FMOD;
using UnityEngine;
using Debug = UnityEngine.Debug;
public class IncreaseDifficultyOverTime : MonoBehaviour
{
[SerializeField] private float _base;
[SerializeField] private float _perBeatIncrease;
public void OnBeat(int beat)
{
var difficulty = _base * Mathf.Pow(1.0f+_perBeatIncrease, beat);
Debug.Log(difficulty);
Shader.SetGlobalFloat("_Difficulty", difficulty);
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 565df9595af1e6e4a9547067e1d23b5d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,23 @@
using DG.Tweening;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.SceneManagement;
public class PlayGameButton : MonoBehaviour
{
[SerializeField] private string levelName;
[SerializeField] private CanvasGroup group;
[SerializeField] private CanvasGroup thisGroup;
public void Submit()
{
var asyncOp = SceneManager.LoadSceneAsync(levelName);
asyncOp.allowSceneActivation = false;
DOTween.Sequence()
.Append(transform.DOScale(Vector3.one * 1.5f, 0.3f).SetEase(Ease.OutQuint))
.Insert(0.15f, thisGroup.DOFade(0, 0.15f))
.Append(group.DOFade(0, 0.3f))
.AppendCallback(() => asyncOp.allowSceneActivation = true);
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 52f2c203017f497995d6e2ee8e7e91ef
timeCreated: 1610358275

View File

@ -0,0 +1,13 @@
using System.Collections;
using System.Collections.Generic;
using DG.Tweening;
using UnityEngine;
public class PlayerEnter : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
transform.DOMove(Vector3.zero, 0.5f).SetEase(Ease.OutQuint);
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 35034e3b9a94742c6be0c008855b42e4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,6 +1,10 @@
using System; using System;
using System.Collections;
using System.Collections.Generic;
using FMOD;
using UnityEngine; using UnityEngine;
using UnityEngine.InputSystem; using UnityEngine.InputSystem;
using Debug = UnityEngine.Debug;
using PlayerInput = Input.PlayerInput; using PlayerInput = Input.PlayerInput;
public class PlayerShootInput : ShootInputBase public class PlayerShootInput : ShootInputBase
{ {
@ -25,6 +29,11 @@ public class PlayerShootInput : ShootInputBase
_actions.Default.Shoot.performed -= Shoot; _actions.Default.Shoot.performed -= Shoot;
} }
private void Start()
{
StartCoroutine(MakePewSounds());
}
private void Shoot(InputAction.CallbackContext obj) private void Shoot(InputAction.CallbackContext obj)
{ {
_isShooting = obj.ReadValueAsButton(); _isShooting = obj.ReadValueAsButton();
@ -35,4 +44,19 @@ public class PlayerShootInput : ShootInputBase
return _isShooting; return _isShooting;
} }
private IEnumerator MakePewSounds()
{
var wait = new WaitForSeconds(0.02f);
while (true)
{
if (_isShooting)
{
FMODUnity.RuntimeManager.PlayOneShot("event:/shoot");
}
yield return wait;
}
}
} }

View File

@ -23,10 +23,13 @@ public class TunnelController : MonoBehaviour
public Renderer Active { get; private set; } public Renderer Active { get; private set; }
private float _start = -1; private float _start = -1;
private static readonly int PlayerXMove = Shader.PropertyToID("_PlayerXMove");
private static readonly int PlayerXPos = Shader.PropertyToID("_PlayerXPos");
private static readonly int CameraShake = Shader.PropertyToID("_CameraShake");
private void Awake() private void Awake()
{ {
Shader.SetGlobalFloat("_CameraShake", 0); Shader.SetGlobalFloat(CameraShake, 0);
Shader.SetGlobalFloat("_BaseTubeRadius", _baseTubeRadius); Shader.SetGlobalFloat("_BaseTubeRadius", _baseTubeRadius);
Debug.Log(_accessibility.Mode); Debug.Log(_accessibility.Mode);
@ -58,13 +61,18 @@ public class TunnelController : MonoBehaviour
} }
} }
public void Reset()
{
Awake();
}
void LateUpdate() void LateUpdate()
{ {
var cameraShakeIntensity = _intensity * _accessibility.Intensity.Value; var cameraShakeIntensity = _intensity * _accessibility.Intensity.Value;
Shader.SetGlobalFloat("_PlayerXMove", _playerXMove); Shader.SetGlobalFloat(PlayerXMove, _playerXMove);
Shader.SetGlobalFloat("_PlayerXPos", _playerXPos); Shader.SetGlobalFloat(PlayerXPos, _playerXPos);
Shader.SetGlobalFloat("_CameraShake", _baseCameraShake * _distanceToNextBeat * cameraShakeIntensity); Shader.SetGlobalFloat(CameraShake, _baseCameraShake * _distanceToNextBeat * cameraShakeIntensity);
var elapsed = Time.time - _start; var elapsed = Time.time - _start;
if (elapsed > _duration) return; if (elapsed > _duration) return;
@ -72,7 +80,7 @@ public class TunnelController : MonoBehaviour
var normalisedElapsed = elapsed / _duration; var normalisedElapsed = elapsed / _duration;
var shake = Mathf.Max(_anim.Evaluate(normalisedElapsed), _baseCameraShake) * _intensity; var shake = Mathf.Max(_anim.Evaluate(normalisedElapsed), _baseCameraShake) * _intensity;
Shader.SetGlobalFloat("_CameraShake", shake); Shader.SetGlobalFloat(CameraShake, shake);
} }
public void LoseLifeShake() public void LoseLifeShake()

View File

@ -17,7 +17,7 @@ public class ScaleWithTime : MonoBehaviour
private void Awake() private void Awake()
{ {
_text = GetComponent<TextMeshProUGUI>(); _text = GetComponentInChildren<TextMeshProUGUI>();
} }
// Update is called once per frame // Update is called once per frame

View File

@ -3,14 +3,23 @@ using System;
public static class Score public static class Score
{ {
private static ulong _value; private static ulong _value;
public static ulong Value public static ulong Value => _value;
public static void Add(ulong val)
{ {
get => _value; _value += val;
set ScoreChanged();
{ }
_value = value;
ScoreUpdated?.Invoke(_value); public static void Reset()
} {
_value = 0;
ScoreChanged();
}
private static void ScoreChanged()
{
ScoreUpdated?.Invoke(_value);
} }
public static event Action<ulong> ScoreUpdated; public static event Action<ulong> ScoreUpdated;

View File

@ -0,0 +1,14 @@
using UnityEngine;
public class SelectAccessibilityButton : MonoBehaviour
{
[SerializeField] private AccessibilityMode mode;
[SerializeField] private AccessibilityOptions options;
[SerializeField] private TunnelController tunnel;
public void Select()
{
options.Mode = mode;
tunnel.Reset();
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 76696d93beae43d3ac9fd18d1350eb46
timeCreated: 1610358275

View File

@ -7,8 +7,15 @@ using UnityEngine;
public class SlideSideways : MonoBehaviour public class SlideSideways : MonoBehaviour
{ {
[SerializeField] private Vector2 _speedRange; [SerializeField] private Vector2 _speedRange;
[SerializeField] private Vector2 _xBounds;
private float _speed; private float _speed;
private float _xDiff;
private void Awake()
{
_xDiff = _xBounds.y - _xBounds.x;
}
private void Start() private void Start()
{ {
@ -19,5 +26,14 @@ public class SlideSideways : MonoBehaviour
private void LateUpdate() private void LateUpdate()
{ {
transform.Translate(Vector3.right * _speed * Time.deltaTime); transform.Translate(Vector3.right * _speed * Time.deltaTime);
if (transform.position.x < _xBounds.x)
{
transform.position += Vector3.right * _xDiff;
}
else if (transform.position.x > _xBounds.y)
{
transform.position -= Vector3.right * _xDiff;
}
} }
} }

View File

@ -4,6 +4,7 @@ using NUnit.Framework.Constraints;
using UnityEditor.UIElements; using UnityEditor.UIElements;
using UnityEngine; using UnityEngine;
using UnityEngine.Assertions; using UnityEngine.Assertions;
using Utils;
using Random = UnityEngine.Random; using Random = UnityEngine.Random;
namespace Weapons.Spawning namespace Weapons.Spawning
@ -32,7 +33,7 @@ namespace Weapons.Spawning
[SerializeField] private int numPerSide; [SerializeField] private int numPerSide;
[SerializeField] private bool flipVertical; [SerializeField] private bool flipVertical;
[SerializeField] private float radius; [SerializeField] private ParticleSystem.MinMaxCurve radius;
[SerializeField, Range(0, 360)] private float arc; [SerializeField, Range(0, 360)] private float arc;
[SerializeField] private SpawnZone[] composite; [SerializeField] private SpawnZone[] composite;
@ -89,7 +90,7 @@ namespace Weapons.Spawning
if (flipVertical) if (flipVertical)
point.y = 1 - point.y; point.y = 1 - point.y;
point *= radius; point *= radius.EvaluateMinMaxCurve();
if (spawnPlane == SpawnPlane.XZ) if (spawnPlane == SpawnPlane.XZ)
{ {
@ -168,7 +169,7 @@ namespace Weapons.Spawning
dir = Random.insideUnitCircle.normalized; dir = Random.insideUnitCircle.normalized;
onGetPoint((point * radius) + offset, dir); onGetPoint((point * radius.EvaluateMinMaxCurve()) + offset, dir);
} }
} }

View File

@ -0,0 +1,82 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using DG.Tweening;
using TMPro;
using UnityEngine;
using UnityEngine.SceneManagement;
[Serializable]
public struct Leaderboard
{
public List<HighScore> Scores;
}
[Serializable]
public struct HighScore
{
public string Name;
public ulong Score;
}
public class SubmitScore : MonoBehaviour
{
[SerializeField] private TMP_InputField name;
[SerializeField] private Transform scorePF;
[SerializeField] private Transform content;
[SerializeField] private CanvasGroup gameOver;
[SerializeField] private CanvasGroup score;
public void Submit()
{
var path = Application.persistentDataPath + "/leaderboard.json";
var lb = new Leaderboard();
if (!File.Exists(path))
File.Create(path).Close();
else if (!string.IsNullOrWhiteSpace(File.ReadAllText(path)))
lb = JsonUtility.FromJson<Leaderboard>(File.ReadAllText(path));
lb.Scores ??= new List<HighScore>();
lb.Scores.Add(new HighScore
{
Name = name.text,
Score = Score.Value
});
lb.Scores = lb.Scores.OrderByDescending(item => item.Score).ToList();
foreach (var score in lb.Scores)
{
var obj = Instantiate(scorePF, content);
obj.Find("Name").GetComponent<TextMeshProUGUI>().text = $"{score.Name}:";
obj.Find("Score").GetComponent<TextMeshProUGUI>().text = $"{score.Score:n0}";
}
gameOver.DOFade(0, 0.5f).SetUpdate(true);
gameOver.blocksRaycasts = false;
score.DOFade(1, 0.5f).SetDelay(0.5f).SetUpdate(true);
score.blocksRaycasts = true;
File.WriteAllText(path, JsonUtility.ToJson(lb));
Score.Reset();
}
public void Restart()
{
var asyncOp = SceneManager.LoadSceneAsync("Game");
asyncOp.allowSceneActivation = false;
DOTween.Sequence()
.Append(score.DOFade(0, 0.5f).SetUpdate(true))
.AppendCallback(() => asyncOp.allowSceneActivation = true)
.AppendCallback(() => Time.timeScale = 1)
.SetUpdate(true)
.Play();
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: a177add071d4c4c4cbbd9784128cfa4d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -169,6 +169,7 @@ public class Weapon : ScriptableObject
// if it's inactive, we haven't hit anything // if it's inactive, we haven't hit anything
if (!instance.gameObject.activeSelf) return false; if (!instance.gameObject.activeSelf) return false;
if (instance.gameObject.name == "disabled") return false;
// use the non allocating version so we don't have to allocate memory for every bullet // use the non allocating version so we don't have to allocate memory for every bullet
numHits = Physics.OverlapCapsuleNonAlloc(prevPos, instance.position, size/2f, _results, collidesWith, QueryTriggerInteraction.Collide); numHits = Physics.OverlapCapsuleNonAlloc(prevPos, instance.position, size/2f, _results, collidesWith, QueryTriggerInteraction.Collide);

View File

@ -68,6 +68,7 @@ Shader "custom/enemy"
float4 _FarColor; float4 _FarColor;
float _Alpha; float _Alpha;
float _Difficulty;
float _SpeedMultiplier; float _SpeedMultiplier;
float _RadiusWithDistance; float _RadiusWithDistance;
@ -143,8 +144,9 @@ Shader "custom/enemy"
wpos.y += radius; wpos.y += radius;
float bounceStrength=5.0*_Intensity; float bounceStrength=5.0*_Intensity;
float bounce = (_SpeedMultiplier+bounceStrength*(_DistanceToNextBeat*_DistanceSinceLastBeat)); float bounce = _SpeedMultiplier+bounceStrength*(_DistanceToNextBeat*_DistanceSinceLastBeat);
wpos.z *= bounce; wpos.z *= bounce;
wpos.z *= _Difficulty;
// wpos.z *= max(1, (wpos.z-6)* _SpeedMultiplier); // wpos.z *= max(1, (wpos.z-6)* _SpeedMultiplier);
vpos = TransformWorldToObject(wpos); vpos = TransformWorldToObject(wpos);
@ -184,6 +186,8 @@ Shader "custom/enemy"
c = lerp(_Color1, _Color2, length(p)); c = lerp(_Color1, _Color2, length(p));
c = lerp(c, _FarColor, normalised * _Intensity); c = lerp(c, _FarColor, normalised * _Intensity);
float4 nc = normalize(c);
c = lerp(nc, c, clamp(_Intensity + 0.02, 0, 1));
// float distanceAhead = IN.wpos.z - 6; // float distanceAhead = IN.wpos.z - 6;
// float ca = clamp(distanceAhead * 0.1,0,1); // float ca = clamp(distanceAhead * 0.1,0,1);

View File

@ -70,6 +70,7 @@ Shader "custom/obstacle"
float _Alpha; float _Alpha;
float _PulseIntensity; float _PulseIntensity;
float _Difficulty;
float _SpeedMultiplier; float _SpeedMultiplier;
float _RadiusWithDistance; float _RadiusWithDistance;
@ -227,6 +228,7 @@ Shader "custom/obstacle"
float boundsStrength = 5.0*_Intensity; float boundsStrength = 5.0*_Intensity;
float bounce = (_SpeedMultiplier+boundsStrength*(_DistanceToNextBeat*_DistanceSinceLastBeat)); float bounce = (_SpeedMultiplier+boundsStrength*(_DistanceToNextBeat*_DistanceSinceLastBeat));
wpos.z *= bounce; wpos.z *= bounce;
wpos.z *= _Difficulty;
vpos = TransformWorldToObject(wpos); vpos = TransformWorldToObject(wpos);

BIN
Assets/StreamingAssets/Master.bank (Stored with Git LFS)

Binary file not shown.

BIN
Assets/StreamingAssets/Master.strings.bank (Stored with Git LFS)

Binary file not shown.

View File

@ -99,7 +99,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ConstantMin: 0 m_ConstantMin: 0
m_ConstantMax: 1 m_ConstantMax: 0.1
damage: 1 damage: 1
collidesWith: collidesWith:
serializedVersion: 2 serializedVersion: 2
@ -116,9 +116,25 @@ MonoBehaviour:
surfaceOnly: 0 surfaceOnly: 0
evenDistribution: 0 evenDistribution: 0
numSides: 3 numSides: 3
numPerSide: 10 numPerSide: 5
flipVertical: 0 flipVertical: 0
radius: 10 radius:
m_Mode: 3
m_CurveMultiplier: 0
m_CurveMin:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_CurveMax:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_ConstantMin: 7
m_ConstantMax: 13
arc: 360 arc: 360
composite: [] composite: []
manualFire: 1 manualFire: 1

View File

@ -118,7 +118,23 @@ MonoBehaviour:
numSides: 3 numSides: 3
numPerSide: 10 numPerSide: 10
flipVertical: 0 flipVertical: 0
radius: 5 radius:
m_Mode: 3
m_CurveMultiplier: 0
m_CurveMin:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_CurveMax:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_ConstantMin: 3
m_ConstantMax: 9
arc: 360 arc: 360
composite: [] composite: []
manualFire: 1 manualFire: 1

View File

@ -81,10 +81,10 @@ MonoBehaviour:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ConstantMin: 1.25 m_ConstantMin: 0.5
m_ConstantMax: 1.5 m_ConstantMax: 0.75
bulletSize: bulletSize:
m_Mode: 3 m_Mode: 0
m_CurveMultiplier: 0 m_CurveMultiplier: 0
m_CurveMin: m_CurveMin:
serializedVersion: 2 serializedVersion: 2
@ -98,8 +98,8 @@ MonoBehaviour:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ConstantMin: 0.1 m_ConstantMin: 1
m_ConstantMax: 0.4 m_ConstantMax: 3
damage: 1 damage: 1
collidesWith: collidesWith:
serializedVersion: 2 serializedVersion: 2
@ -111,7 +111,7 @@ MonoBehaviour:
spawnType: 1 spawnType: 1
spawnDir: 0 spawnDir: 0
spawnPlane: 1 spawnPlane: 1
width: 0.75 width: 1.5
height: 0 height: 0
surfaceOnly: 1 surfaceOnly: 1
evenDistribution: 1 evenDistribution: 1

BIN
Assets/fmod.png (Stored with Git LFS) Normal file

Binary file not shown.

144
Assets/fmod.png.meta Normal file
View File

@ -0,0 +1,144 @@
fileFormatVersion: 2
guid: ebf4ef0e6ac1e4cf79470a4a1eaa9664
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: 2
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 0
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
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
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: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 8192
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: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -6,6 +6,9 @@ EditorBuildSettings:
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes:
- enabled: 1 - enabled: 1
path: Assets/Scenes/Chief's Sandbox.unity path: Assets/Scenes/Menu.unity
guid: 5f5923e6ff0e344db822ce1549c8a550
- enabled: 1
path: Assets/Scenes/Game.unity
guid: 3775e8f75767144a4a8c18fff047afea guid: 3775e8f75767144a4a8c18fff047afea
m_configObjects: {} m_configObjects: {}

View File

@ -16,12 +16,12 @@ PlayerSettings:
productName: lucidity productName: lucidity
defaultCursor: {fileID: 0} defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0} cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
m_ShowUnitySplashScreen: 1 m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1 m_ShowUnitySplashLogo: 1
m_SplashScreenOverlayOpacity: 1 m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 1 m_SplashScreenAnimation: 1
m_SplashScreenLogoStyle: 1 m_SplashScreenLogoStyle: 0
m_SplashScreenDrawMode: 0 m_SplashScreenDrawMode: 0
m_SplashScreenBackgroundAnimationZoom: 1 m_SplashScreenBackgroundAnimationZoom: 1
m_SplashScreenLogoAnimationZoom: 1 m_SplashScreenLogoAnimationZoom: 1
@ -39,7 +39,9 @@ PlayerSettings:
y: 0 y: 0
width: 1 width: 1
height: 1 height: 1
m_SplashScreenLogos: [] m_SplashScreenLogos:
- logo: {fileID: 21300000, guid: ebf4ef0e6ac1e4cf79470a4a1eaa9664, type: 3}
duration: 2
m_VirtualRealitySplashScreen: {fileID: 0} m_VirtualRealitySplashScreen: {fileID: 0}
m_HolographicTrackingLossScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1920 defaultScreenWidth: 1920