From fdc05b47c125af043207a046a3f309931186fe94 Mon Sep 17 00:00:00 2001 From: Amaan Shawkath Date: Tue, 10 May 2022 15:00:29 +0100 Subject: [PATCH] pushing final changes --- Assets/Scenes/Main.unity | 132 +++++++++++++++++- Assets/Scenes/Menu.unity | 10 +- Assets/Scripts/Game/Player.cs | 2 + Assets/Sfx/Damaged.wav | 3 + Assets/Sfx/Damaged.wav.meta | 22 +++ Assets/WebGLTemplates.meta | 8 ++ Assets/WebGLTemplates/BetterMinimal.meta | 8 ++ .../WebGLTemplates/BetterMinimal/index.html | 110 +++++++++++++++ .../BetterMinimal/index.html.meta | 7 + .../BetterMinimal/thumbnail.png | 3 + .../BetterMinimal/thumbnail.png.meta | 7 + ProjectSettings/ProjectSettings.asset | 7 +- 12 files changed, 311 insertions(+), 8 deletions(-) create mode 100644 Assets/Sfx/Damaged.wav create mode 100644 Assets/Sfx/Damaged.wav.meta create mode 100644 Assets/WebGLTemplates.meta create mode 100644 Assets/WebGLTemplates/BetterMinimal.meta create mode 100644 Assets/WebGLTemplates/BetterMinimal/index.html create mode 100644 Assets/WebGLTemplates/BetterMinimal/index.html.meta create mode 100644 Assets/WebGLTemplates/BetterMinimal/thumbnail.png create mode 100644 Assets/WebGLTemplates/BetterMinimal/thumbnail.png.meta diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index b0194f3..66ada92 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1063,6 +1063,134 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 619783808} m_CullTransparentMesh: 1 +--- !u!1 &701875521 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 701875522} + - component: {fileID: 701875523} + m_Layer: 0 + m_Name: DamageSound + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &701875522 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 701875521} + 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: 2036477790} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &701875523 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 701875521} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 9f3c3c28564416d49b2e71899119032d, 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!1 &733797115 GameObject: m_ObjectHideFlags: 0 @@ -1714,7 +1842,7 @@ ParticleSystem: ringBufferLoopRange: {x: 0, y: 1} emitterVelocityMode: 1 looping: 1 - prewarm: 1 + prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 @@ -6564,6 +6692,7 @@ MonoBehaviour: direction: 0 speedIncrease: 1 isLit: 0 + damageSfx: {fileID: 701875523} camera: {fileID: 85715039} --- !u!65 &1153618774 BoxCollider: @@ -7597,6 +7726,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 765275277} + - {fileID: 701875522} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 8072162..7dccc88 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -327,7 +327,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -858,7 +858,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -998,7 +998,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1607933371 RectTransform: m_ObjectHideFlags: 0 @@ -1213,7 +1213,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Creative and unique game title + m_text: Lightcycle m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} @@ -1306,7 +1306,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1706518355 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Game/Player.cs b/Assets/Scripts/Game/Player.cs index aafa9b0..1fb15c8 100644 --- a/Assets/Scripts/Game/Player.cs +++ b/Assets/Scripts/Game/Player.cs @@ -13,6 +13,7 @@ public class Player : MonoBehaviour public List collisionEvents; public float speedIncrease; public bool isLit; + public AudioSource damageSfx; public Camera camera; @@ -65,6 +66,7 @@ public class Player : MonoBehaviour if (isLit && Time.timeSinceLevelLoad > 2) { health -= 100.0f * Time.deltaTime; + damageSfx.Play(); } //if health below 0 die diff --git a/Assets/Sfx/Damaged.wav b/Assets/Sfx/Damaged.wav new file mode 100644 index 0000000..cb7278b --- /dev/null +++ b/Assets/Sfx/Damaged.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:917c86303dbb97d368699bc82935ca3955fcbc760af168af41b0ec58ae5ccde4 +size 10188 diff --git a/Assets/Sfx/Damaged.wav.meta b/Assets/Sfx/Damaged.wav.meta new file mode 100644 index 0000000..f568f1a --- /dev/null +++ b/Assets/Sfx/Damaged.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9f3c3c28564416d49b2e71899119032d +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates.meta b/Assets/WebGLTemplates.meta new file mode 100644 index 0000000..da41152 --- /dev/null +++ b/Assets/WebGLTemplates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1683f91108c55e34d8eb6a1776baadb2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/BetterMinimal.meta b/Assets/WebGLTemplates/BetterMinimal.meta new file mode 100644 index 0000000..1f97695 --- /dev/null +++ b/Assets/WebGLTemplates/BetterMinimal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 74e94c2985aadd94db8ae257dd4799c9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/BetterMinimal/index.html b/Assets/WebGLTemplates/BetterMinimal/index.html new file mode 100644 index 0000000..3250942 --- /dev/null +++ b/Assets/WebGLTemplates/BetterMinimal/index.html @@ -0,0 +1,110 @@ + + + + + + + {{{ PRODUCT_NAME }}} + + + + +
+ + + +
+ + + diff --git a/Assets/WebGLTemplates/BetterMinimal/index.html.meta b/Assets/WebGLTemplates/BetterMinimal/index.html.meta new file mode 100644 index 0000000..318efa0 --- /dev/null +++ b/Assets/WebGLTemplates/BetterMinimal/index.html.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 37a9d5a027433fa48bfd3747e2ae1e4e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/BetterMinimal/thumbnail.png b/Assets/WebGLTemplates/BetterMinimal/thumbnail.png new file mode 100644 index 0000000..f5ced6e --- /dev/null +++ b/Assets/WebGLTemplates/BetterMinimal/thumbnail.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7839b5d22bfd9c1ccd71c22b6adc60a4e56b4c46df1ab8f4bb2a8852cc2010fb +size 1539 diff --git a/Assets/WebGLTemplates/BetterMinimal/thumbnail.png.meta b/Assets/WebGLTemplates/BetterMinimal/thumbnail.png.meta new file mode 100644 index 0000000..627b96d --- /dev/null +++ b/Assets/WebGLTemplates/BetterMinimal/thumbnail.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5b2f040f7cf80dc4b992608533c3255e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 603238b..7101332 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -431,7 +431,10 @@ PlayerSettings: openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 - m_TemplateCustomTags: {} + m_TemplateCustomTags: + BACKGROUND: + OPTIMIZE_FOR_PIXEL_ART: + SCALE_TO_FIT: mobileMTRendering: Android: 1 iPhone: 1 @@ -692,7 +695,7 @@ PlayerSettings: webGLDebugSymbols: 0 webGLEmscriptenArgs: webGLModulesDirectory: - webGLTemplate: APPLICATION:Default + webGLTemplate: PROJECT:BetterMinimal webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1