diff --git a/Game/Assets/Images/splash death sprites.png b/Game/Assets/Images/splash death sprites.png new file mode 100644 index 0000000..ebc6a99 Binary files /dev/null and b/Game/Assets/Images/splash death sprites.png differ diff --git a/Game/Assets/Images/splash death sprites.png.meta b/Game/Assets/Images/splash death sprites.png.meta new file mode 100644 index 0000000..b4ddf6a --- /dev/null +++ b/Game/Assets/Images/splash death sprites.png.meta @@ -0,0 +1,467 @@ +fileFormatVersion: 2 +guid: 826f9a809df9860478e688c32e190a08 +TextureImporter: + internalIDToNameTable: + - first: + 213: 1075859024370912054 + second: splash death sprites_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: splash death sprites_0 + rect: + serializedVersion: 2 + x: 0 + y: 2160 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 63bc60025183eee00800000000000000 + internalID: 1075859024370912054 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_1 + rect: + serializedVersion: 2 + x: 1920 + y: 2160 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 47aa52b02e5df8647b7b4a94b3feb647 + internalID: 1536837406 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_2 + rect: + serializedVersion: 2 + x: 3840 + y: 2160 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 44cc82675978ebb459d168030140e241 + internalID: 364047624 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_3 + rect: + serializedVersion: 2 + x: 5760 + y: 2160 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f62680df86a966a42b33f8636004dc02 + internalID: 596008799 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_4 + rect: + serializedVersion: 2 + x: 7680 + y: 2160 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8655460ae72e2004992cf40f2a062aa3 + internalID: -354498087 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_5 + rect: + serializedVersion: 2 + x: 0 + y: 1080 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0d96ec6467e5259408275fb38d361dee + internalID: 1256117646 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_6 + rect: + serializedVersion: 2 + x: 1920 + y: 1080 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4ee9522581b52974ea14399c3d85dac7 + internalID: -1983565607 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_7 + rect: + serializedVersion: 2 + x: 3840 + y: 1080 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f31a0ea32e08d9b4281c45f13403c9b7 + internalID: -261371312 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_8 + rect: + serializedVersion: 2 + x: 5760 + y: 1080 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4100ef2093b30cb41a597b4da6384b35 + internalID: 525652658 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_9 + rect: + serializedVersion: 2 + x: 7680 + y: 1080 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c94dc654c81f32742865c28d5ec30446 + internalID: 2088132895 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_10 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2bc654401fa146d44a13a32e5f5e2a59 + internalID: -1821389910 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_11 + rect: + serializedVersion: 2 + x: 1920 + y: 0 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6f0a8918c124408419336a8acef732ce + internalID: 1408292099 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_12 + rect: + serializedVersion: 2 + x: 3840 + y: 0 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a065053f83550404ea85543db1efeaa3 + internalID: 1613531959 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_13 + rect: + serializedVersion: 2 + x: 5760 + y: 0 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f844c57d061f45f4c9fc577d85d117e0 + internalID: 826595655 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: splash death sprites_14 + rect: + serializedVersion: 2 + x: 7680 + y: 0 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 86a81975f6483884e961c5f9f7984606 + internalID: -2108712610 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: c17ac41c2441b9c49960ff79ad8164ae + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: + - key: SpriteEditor.SliceSettings + value: '{"sliceOnImport":false,"gridCellCount":{"x":1.0,"y":1.0},"gridSpriteSize":{"x":1920.0,"y":1080.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.5},"pivotPixels":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":0,"pivotUnitMode":0,"slicingType":1,"keepEmptyRects":false,"isAlternate":false}' + nameFileIdTable: + splash death sprites_0: 1075859024370912054 + splash death sprites_1: 1536837406 + splash death sprites_10: -1821389910 + splash death sprites_11: 1408292099 + splash death sprites_12: 1613531959 + splash death sprites_13: 826595655 + splash death sprites_14: -2108712610 + splash death sprites_2: 364047624 + splash death sprites_3: 596008799 + splash death sprites_4: -354498087 + splash death sprites_5: 1256117646 + splash death sprites_6: -1983565607 + splash death sprites_7: -261371312 + splash death sprites_8: 525652658 + splash death sprites_9: 2088132895 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/splash death sprites_0.controller b/Game/Assets/Images/splash death sprites_0.controller new file mode 100644 index 0000000..c2db6b4 --- /dev/null +++ b/Game/Assets/Images/splash death sprites_0.controller @@ -0,0 +1,73 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5994468331361485583 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: splash death + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: e1a9b705824d8924babbe5bf4269c14b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: splash death sprites_0 + serializedVersion: 6 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 3158908639642138635} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + m_EvaluateTransitionsOnStart: 1 +--- !u!1107 &3158908639642138635 +AnimatorStateMachine: + serializedVersion: 7 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -5994468331361485583} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -5994468331361485583} diff --git a/Game/Assets/Images/splash death sprites_0.controller.meta b/Game/Assets/Images/splash death sprites_0.controller.meta new file mode 100644 index 0000000..8a4de31 --- /dev/null +++ b/Game/Assets/Images/splash death sprites_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 289590ea86c240b479b495fdf9556cb4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/splash death.anim b/Game/Assets/Images/splash death.anim new file mode 100644 index 0000000..05c951d --- /dev/null +++ b/Game/Assets/Images/splash death.anim @@ -0,0 +1,150 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: splash death + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 1075859024370912054, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 0.083333336 + value: {fileID: 1536837406, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 0.16666667 + value: {fileID: 364047624, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 0.25 + value: {fileID: 596008799, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 0.33333334 + value: {fileID: -354498087, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 0.41666666 + value: {fileID: 1256117646, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 0.5 + value: {fileID: -1983565607, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 0.5833333 + value: {fileID: -261371312, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 0.6666667 + value: {fileID: 525652658, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 0.75 + value: {fileID: 2088132895, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 0.8333333 + value: {fileID: -1821389910, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 0.9166667 + value: {fileID: 1408292099, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 1 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 1.0833334 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 1.1666666 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 1.25 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 1.3333334 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 1.4166666 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 1.5 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 1.5833334 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 1.6666666 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 1.75 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 1.8333334 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 1.9166666 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 2 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 2.0833333 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - time: 2.1666667 + value: {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 1075859024370912054, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1536837406, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 364047624, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 596008799, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: -354498087, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1256117646, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: -1983565607, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: -261371312, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 525652658, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 2088132895, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: -1821389910, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1408292099, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + - {fileID: 1613531959, guid: 826f9a809df9860478e688c32e190a08, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2.25 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Game/Assets/MainMenu/New Animation.anim.meta b/Game/Assets/Images/splash death.anim.meta similarity index 79% rename from Game/Assets/MainMenu/New Animation.anim.meta rename to Game/Assets/Images/splash death.anim.meta index 905bef3..bea1f33 100644 --- a/Game/Assets/MainMenu/New Animation.anim.meta +++ b/Game/Assets/Images/splash death.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 631511ba3deca104aade69cd109d5c7c +guid: e1a9b705824d8924babbe5bf4269c14b NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Game/Assets/MainMenu/frame_00_delay-0_1s_0.controller b/Game/Assets/MainMenu/frame_00_delay-0_1s_0.controller index fb23a36..0b204c6 100644 --- a/Game/Assets/MainMenu/frame_00_delay-0_1s_0.controller +++ b/Game/Assets/MainMenu/frame_00_delay-0_1s_0.controller @@ -1,36 +1,13 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: frame_00_delay-0_1s_0 - serializedVersion: 6 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 7573755908702496219} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} - m_EvaluateTransitionsOnStart: 1 ---- !u!1102 &3179099735051126089 +--- !u!1102 &-361822438593094998 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New Animation + m_Name: mainScreenAnimation m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -43,13 +20,36 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 631511ba3deca104aade69cd109d5c7c, type: 2} + m_Motion: {fileID: 7400000, guid: 85113fdd64e096940861b7b5e68e0637, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1107 &7573755908702496219 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: frame_00_delay-0_1s_0 + serializedVersion: 6 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 206098924587627028} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + m_EvaluateTransitionsOnStart: 1 +--- !u!1107 &206098924587627028 AnimatorStateMachine: serializedVersion: 7 m_ObjectHideFlags: 1 @@ -59,7 +59,7 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: 3179099735051126089} + m_State: {fileID: -361822438593094998} m_Position: {x: 200, y: 0, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] @@ -70,4 +70,4 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 3179099735051126089} + m_DefaultState: {fileID: -361822438593094998} diff --git a/Game/Assets/MainMenu/New Animation.anim b/Game/Assets/MainMenu/mainScreenAnimation.anim similarity index 99% rename from Game/Assets/MainMenu/New Animation.anim rename to Game/Assets/MainMenu/mainScreenAnimation.anim index 5361a3a..0c64bd0 100644 --- a/Game/Assets/MainMenu/New Animation.anim +++ b/Game/Assets/MainMenu/mainScreenAnimation.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New Animation + m_Name: mainScreenAnimation serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Game/Assets/MainMenu/mainScreenAnimation.anim.meta b/Game/Assets/MainMenu/mainScreenAnimation.anim.meta new file mode 100644 index 0000000..ee68e40 --- /dev/null +++ b/Game/Assets/MainMenu/mainScreenAnimation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85113fdd64e096940861b7b5e68e0637 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/MainMenu/start_title_button.png b/Game/Assets/MainMenu/start_title_button.png new file mode 100644 index 0000000..8be6cc2 Binary files /dev/null and b/Game/Assets/MainMenu/start_title_button.png differ diff --git a/Game/Assets/MainMenu/start_title_button.png.meta b/Game/Assets/MainMenu/start_title_button.png.meta new file mode 100644 index 0000000..a39c513 --- /dev/null +++ b/Game/Assets/MainMenu/start_title_button.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: ebc5b0d9e174c4446acd5b17084b5bda +TextureImporter: + internalIDToNameTable: + - first: + 213: -3723548011985849907 + second: start_title_button_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: start_title_button_0 + rect: + serializedVersion: 2 + x: 892 + y: 257 + width: 135 + height: 69 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: dc1b871bfcc435cc0800000000000000 + internalID: -3723548011985849907 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + start_title_button_0: -3723548011985849907 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scenes/1_Start scene.unity b/Game/Assets/Scenes/1_Start scene.unity index 7c9201f..0bd6ed8 100644 --- a/Game/Assets/Scenes/1_Start scene.unity +++ b/Game/Assets/Scenes/1_Start scene.unity @@ -119,8 +119,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} -<<<<<<< HEAD ---- !u!1 &330371564 +--- !u!1 &758040341 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -128,338 +127,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 330371566} - - component: {fileID: 330371565} - m_Layer: 0 - m_Name: start_title_button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &330371565 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330371564} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: -925020913 - m_SortingLayer: 1 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_Sprite: {fileID: 21300000, guid: 52109205b11cabd4bacd045425944267, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 19.2, y: 10.8} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 ---- !u!4 &330371566 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330371564} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.041, y: -0.0103, z: 0} - m_LocalScale: {x: 0.9253397, y: 0.91852736, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &995945555 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 995945558} - - component: {fileID: 995945557} - - component: {fileID: 995945556} - m_Layer: 0 - m_Name: Audio - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &995945556 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 995945555} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: 3f470ab7a262cbe41bbb4878c29aa9c0, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!114 &995945557 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 995945555} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 95ce96b9c2b516844a78e1102b390f54, type: 3} - m_Name: - m_EditorClassIdentifier: '::' - mySpeaker: {fileID: 995945556} - jingle: {fileID: 8300000, guid: 3f470ab7a262cbe41bbb4878c29aa9c0, type: 3} ---- !u!4 &995945558 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 995945555} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -19.86103, y: 2.85599, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} -======= ->>>>>>> parent of 8849a17 (soundeffects) ---- !u!1 &1410446868 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1410446871} - - component: {fileID: 1410446870} - - component: {fileID: 1410446869} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1410446869 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410446868} - m_Enabled: 1 ---- !u!20 &1410446870 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410446868} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1410446871 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410446868} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2033681216 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2033681219} - - component: {fileID: 2033681218} - - component: {fileID: 2033681217} + - component: {fileID: 758040344} + - component: {fileID: 758040343} + - component: {fileID: 758040342} m_Layer: 0 m_Name: frame_00_delay-0.1s_0 m_TagString: Untagged @@ -467,14 +137,14 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!95 &2033681217 +--- !u!95 &758040342 Animator: serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2033681216} + m_GameObject: {fileID: 758040341} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 7cf52fbb9a70d1944922099dba32d31b, type: 2} @@ -489,14 +159,14 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!212 &2033681218 +--- !u!212 &758040343 SpriteRenderer: serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2033681216} + m_GameObject: {fileID: 758040341} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -548,17 +218,245 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!4 &2033681219 +--- !u!4 &758040344 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2033681216} + m_GameObject: {fileID: 758040341} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.0017, y: 0.0312, z: 0} - m_LocalScale: {x: 2.2210348, y: 2.2196145, z: 1} + m_LocalPosition: {x: 0.0926, y: 0.0236, z: 0} + m_LocalScale: {x: 2.2451866, y: 2.2174277, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &952626047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 952626051} + - component: {fileID: 952626050} + - component: {fileID: 952626049} + - component: {fileID: 952626048} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &952626048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 952626047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!81 &952626049 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 952626047} + m_Enabled: 1 +--- !u!20 &952626050 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 952626047} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &952626051 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 952626047} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1196951953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1196951955} + - component: {fileID: 1196951954} + m_Layer: 0 + m_Name: start_title_button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1196951954 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1196951953} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: -925020913 + m_SortingLayer: 1 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: 21300000, guid: ebc5b0d9e174c4446acd5b17084b5bda, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 19.2, y: 10.8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!4 &1196951955 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1196951953} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.12, y: 0.26, z: 0} + m_LocalScale: {x: 1, y: 0.9978, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -567,10 +465,6 @@ Transform: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1410446871} -<<<<<<< HEAD - - {fileID: 995945558} - - {fileID: 330371566} - - {fileID: 2033681219} -======= ->>>>>>> parent of 8849a17 (soundeffects) + - {fileID: 952626051} + - {fileID: 758040344} + - {fileID: 1196951955} diff --git a/Game/Assets/Scenes/3_Fall splash scene.unity b/Game/Assets/Scenes/3_Fall splash scene.unity index 5a7e8bb..e49bc1f 100644 --- a/Game/Assets/Scenes/3_Fall splash scene.unity +++ b/Game/Assets/Scenes/3_Fall splash scene.unity @@ -119,6 +119,120 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &662015092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 662015095} + - component: {fileID: 662015094} + - component: {fileID: 662015093} + m_Layer: 0 + m_Name: splash death sprites_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &662015093 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 662015092} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 289590ea86c240b479b495fdf9556cb4, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!212 &662015094 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 662015092} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: 1075859024370912054, guid: 826f9a809df9860478e688c32e190a08, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 19.205559, y: 10.8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!4 &662015095 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 662015092} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &713676161 GameObject: m_ObjectHideFlags: 0 @@ -216,3 +330,4 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 713676164} + - {fileID: 662015095} diff --git a/pictures/intro animation_3.mp4 b/pictures/intro animation_3.mp4 new file mode 100644 index 0000000..fd63ae5 Binary files /dev/null and b/pictures/intro animation_3.mp4 differ diff --git a/pictures/splash death sprites.png b/pictures/splash death sprites.png new file mode 100644 index 0000000..ebc6a99 Binary files /dev/null and b/pictures/splash death sprites.png differ