From 70b526a315433d66168f1a3fbdb85dbf837d1cdb Mon Sep 17 00:00:00 2001 From: Noah Date: Thu, 25 Apr 2024 11:24:54 -0400 Subject: [PATCH] update --- Assets/Prefabs/Fireworks.prefab | 154 +++++++++++++++++- .../QRCode/Prefabs/course-01.prefab | 35 ++++ Assets/Scenes/Loading-Course.unity | 73 ++------- ...orks And Crowd-SoundBible.com-81665534.mp3 | 3 + ...And Crowd-SoundBible.com-81665534.mp3.meta | 23 +++ 5 files changed, 225 insertions(+), 63 deletions(-) create mode 100644 Assets/Sounds/Fireworks And Crowd-SoundBible.com-81665534.mp3 create mode 100644 Assets/Sounds/Fireworks And Crowd-SoundBible.com-81665534.mp3.meta diff --git a/Assets/Prefabs/Fireworks.prefab b/Assets/Prefabs/Fireworks.prefab index 1c39bf26..a5a18250 100644 --- a/Assets/Prefabs/Fireworks.prefab +++ b/Assets/Prefabs/Fireworks.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5662389616791750665} + - component: {fileID: 6463441993906448402} m_Layer: 0 m_Name: Fireworks m_TagString: Untagged @@ -34,6 +35,24 @@ Transform: - {fileID: 844521570306534627} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6463441993906448402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7276465333831797949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e20f9915ef7f64107b695310f05c1c68, type: 3} + m_Name: + m_EditorClassIdentifier: + winObjects: + - {fileID: 4622707937430355678} + - {fileID: 1946041766851585943} + - {fileID: 844521570306534624} + winState: {fileID: 11400000, guid: ca8059223160447efb498c5e6e48fdf4, type: 2} + restart: {fileID: 11400000, guid: e40e40bd17724c643a36711277734822, type: 2} --- !u!1001 &4741272150765463969 PrefabInstance: m_ObjectHideFlags: 0 @@ -97,10 +116,19 @@ PrefabInstance: propertyPath: m_Name value: Firework5 objectReference: {fileID: 0} + - target: {fileID: 138285057318705023, guid: c4fd8043dbc7e424fbf9edc9609a6512, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 138285057318705023, guid: c4fd8043dbc7e424fbf9edc9609a6512, + type: 3} + insertIndex: -1 + addedObject: {fileID: 9076864385379975174} m_SourcePrefab: {fileID: 100100000, guid: c4fd8043dbc7e424fbf9edc9609a6512, type: 3} --- !u!4 &4622707937430355677 stripped Transform: @@ -108,6 +136,108 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4741272150765463969} m_PrefabAsset: {fileID: 0} +--- !u!1 &4622707937430355678 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 138285057318705023, guid: c4fd8043dbc7e424fbf9edc9609a6512, + type: 3} + m_PrefabInstance: {fileID: 4741272150765463969} + m_PrefabAsset: {fileID: 0} +--- !u!82 &9076864385379975174 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4622707937430355678} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: bdd2670e79c5140188624ce00d38ae6f, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + 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!1001 &7360792380969720065 PrefabInstance: m_ObjectHideFlags: 0 @@ -171,6 +301,11 @@ PrefabInstance: propertyPath: m_Name value: Firework6 objectReference: {fileID: 0} + - target: {fileID: 9018303252639858326, guid: 20a5f31f1a291c14aa60086e51179f45, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -182,6 +317,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7360792380969720065} m_PrefabAsset: {fileID: 0} +--- !u!1 &1946041766851585943 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9018303252639858326, guid: 20a5f31f1a291c14aa60086e51179f45, + type: 3} + m_PrefabInstance: {fileID: 7360792380969720065} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9186094286865948858 PrefabInstance: m_ObjectHideFlags: 0 @@ -245,11 +386,22 @@ PrefabInstance: propertyPath: m_Name value: Firework9 objectReference: {fileID: 0} + - target: {fileID: 8413788369756441690, guid: c681a5ebc48a7c64180c315569e8cb23, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c681a5ebc48a7c64180c315569e8cb23, type: 3} +--- !u!1 &844521570306534624 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8413788369756441690, guid: c681a5ebc48a7c64180c315569e8cb23, + type: 3} + m_PrefabInstance: {fileID: 9186094286865948858} + m_PrefabAsset: {fileID: 0} --- !u!4 &844521570306534627 stripped Transform: m_CorrespondingSourceObject: {fileID: 8413788369756441689, guid: c681a5ebc48a7c64180c315569e8cb23, diff --git a/Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-01.prefab b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-01.prefab index d31eb759..0ebbc07a 100644 --- a/Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-01.prefab +++ b/Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-01.prefab @@ -251,6 +251,41 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -90 objectReference: {fileID: 0} + - target: {fileID: 5213247391674327082, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.468 + objectReference: {fileID: 0} + - target: {fileID: 5213247391674327082, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5213247391674327082, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5213247391674327082, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5213247391674327082, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5213247391674327082, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5213247391674327082, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} - target: {fileID: 6448227419044837256, guid: 7fadbf24dc7c14173a60e008099ea15f, type: 3} propertyPath: distance diff --git a/Assets/Scenes/Loading-Course.unity b/Assets/Scenes/Loading-Course.unity index f941f491..f9bfcac4 100644 --- a/Assets/Scenes/Loading-Course.unity +++ b/Assets/Scenes/Loading-Course.unity @@ -123,12 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &30962433 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1946041766851585943, guid: abfb530320bd04a15b3bb76f4510e2f0, - type: 3} - m_PrefabInstance: {fileID: 2031524719} - m_PrefabAsset: {fileID: 0} --- !u!1001 &331264285 PrefabInstance: m_ObjectHideFlags: 0 @@ -389,12 +383,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &899727120 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4622707937430355678, guid: abfb530320bd04a15b3bb76f4510e2f0, - type: 3} - m_PrefabInstance: {fileID: 2031524719} - m_PrefabAsset: {fileID: 0} --- !u!114 &1037826357 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2512387470528047737, guid: 48cb3fb68c91eb94999fd99957eb0cae, @@ -525,42 +513,12 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 ---- !u!1 &1103989920 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7276465333831797949, guid: abfb530320bd04a15b3bb76f4510e2f0, - type: 3} - m_PrefabInstance: {fileID: 2031524719} - m_PrefabAsset: {fileID: 0} --- !u!4 &1103989921 stripped Transform: m_CorrespondingSourceObject: {fileID: 5662389616791750665, guid: abfb530320bd04a15b3bb76f4510e2f0, type: 3} m_PrefabInstance: {fileID: 2031524719} m_PrefabAsset: {fileID: 0} ---- !u!114 &1103989922 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1103989920} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e20f9915ef7f64107b695310f05c1c68, type: 3} - m_Name: - m_EditorClassIdentifier: - winObjects: - - {fileID: 899727120} - - {fileID: 30962433} - - {fileID: 1139346064} - winState: {fileID: 11400000, guid: ca8059223160447efb498c5e6e48fdf4, type: 2} - restart: {fileID: 11400000, guid: e40e40bd17724c643a36711277734822, type: 2} ---- !u!1 &1139346064 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 844521570306534624, guid: abfb530320bd04a15b3bb76f4510e2f0, - type: 3} - m_PrefabInstance: {fileID: 2031524719} - m_PrefabAsset: {fileID: 0} --- !u!1 &1323550131 GameObject: m_ObjectHideFlags: 0 @@ -718,21 +676,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 331264286} m_Modifications: - - target: {fileID: 844521570306534624, guid: abfb530320bd04a15b3bb76f4510e2f0, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1946041766851585943, guid: abfb530320bd04a15b3bb76f4510e2f0, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4622707937430355678, guid: abfb530320bd04a15b3bb76f4510e2f0, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5662389616791750665, guid: abfb530320bd04a15b3bb76f4510e2f0, type: 3} propertyPath: m_LocalPosition.x @@ -791,11 +734,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7276465333831797949, guid: abfb530320bd04a15b3bb76f4510e2f0, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1103989922} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: abfb530320bd04a15b3bb76f4510e2f0, type: 3} --- !u!1001 &7183032743472781730 PrefabInstance: @@ -975,6 +914,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -53.456944 objectReference: {fileID: 0} + - target: {fileID: 2650009755706299066, guid: 3ccc2f7c888da2b4c9997752a4d80cc2, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2650009755706299066, guid: 3ccc2f7c888da2b4c9997752a4d80cc2, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target @@ -1180,6 +1124,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: objectReference: {fileID: 2022381351} + - target: {fileID: 7246629506756629656, guid: 3ccc2f7c888da2b4c9997752a4d80cc2, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7246629506756629656, guid: 3ccc2f7c888da2b4c9997752a4d80cc2, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target diff --git a/Assets/Sounds/Fireworks And Crowd-SoundBible.com-81665534.mp3 b/Assets/Sounds/Fireworks And Crowd-SoundBible.com-81665534.mp3 new file mode 100644 index 00000000..c5bb9813 --- /dev/null +++ b/Assets/Sounds/Fireworks And Crowd-SoundBible.com-81665534.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ade98417673eb5c637f0f403f487eba2f29368e8fc3b1a21ff12e0715cbaa297 +size 115559 diff --git a/Assets/Sounds/Fireworks And Crowd-SoundBible.com-81665534.mp3.meta b/Assets/Sounds/Fireworks And Crowd-SoundBible.com-81665534.mp3.meta new file mode 100644 index 00000000..892d98a3 --- /dev/null +++ b/Assets/Sounds/Fireworks And Crowd-SoundBible.com-81665534.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: bdd2670e79c5140188624ce00d38ae6f +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: