fums/ofb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed transition scene merge error

Browse Source
This commit is contained in:
Sam 2023-05-06 19:26:35 -07:00
parent e723e2b612
commit a13c836373
2 changed files with 1 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/.DS_Store vendored
View File

Binary file not shown.

144
Assets/Scenes/TransitionToClarinet.unity
View File

@ -926,22 +926,6 @@ MonoBehaviour:
backgroundImageObject: {fileID: 619461775}
images:
- {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
<<<<<<< HEAD
- {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
- {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
- {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
- {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
- {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
- {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
- {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
- {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
- {fileID: 21300000, guid: e1e7222994bb83b499a85b4c32514e15, type: 3}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
=======
>>>>>>> de5abe740beb93351416d6c0905424958e37e702
backToMenuButton: {fileID: 0}
--- !u!114 &1404700850
MonoBehaviour:
@ -973,134 +957,6 @@ MonoBehaviour:
m_DefaultActionMap: MenuActions
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!1 &1721928371
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1721928373}
- component: {fileID: 1721928372}
m_Layer: 0
m_Name: Audio Source
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!82 &1721928372
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1721928371}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: b4a3b6af307a9b94a9f11241c35f70ab, type: 3}
m_PlayOnAwake: 1
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!4 &1721928373
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1721928371}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 705.88116, y: 188.74654, z: -3.0546246}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1911196317
GameObject:
m_ObjectHideFlags: 0