Merged changes, added music to Level1.
This commit is contained in:
parent
5e22ab82c1
commit
128b0a2489
1 changed files with 11 additions and 11 deletions
|
@ -16564,7 +16564,7 @@ Prefab:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4181127690698596, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2}
|
||||
|
@ -21099,7 +21099,7 @@ Prefab:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4181127690698596, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1375385286691104, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2}
|
||||
propertyPath: m_Name
|
||||
|
@ -22430,7 +22430,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 15
|
||||
m_RootOrder: 16
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &517596960
|
||||
GameObject:
|
||||
|
@ -38602,9 +38602,9 @@ AudioSource:
|
|||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 8300000, guid: ace850a1eaeffca4e9c3801b7b5800d2, type: 3}
|
||||
m_audioClip: {fileID: 8300000, guid: 9a4ecab2d68c16d4e8bba5b49848bafe, type: 3}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 0.5
|
||||
m_Volume: 0.25
|
||||
m_Pitch: 1
|
||||
Loop: 1
|
||||
Mute: 0
|
||||
|
@ -38696,7 +38696,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 12
|
||||
m_RootOrder: 13
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &895406274
|
||||
GameObject:
|
||||
|
@ -58334,7 +58334,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 10
|
||||
m_RootOrder: 11
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1321789748
|
||||
GameObject:
|
||||
|
@ -82842,7 +82842,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 13
|
||||
m_RootOrder: 14
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1900388964
|
||||
GameObject:
|
||||
|
@ -85428,7 +85428,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 16
|
||||
m_RootOrder: 17
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1950776769
|
||||
GameObject:
|
||||
|
@ -89534,7 +89534,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 14
|
||||
m_RootOrder: 15
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2032780048
|
||||
GameObject:
|
||||
|
@ -94648,7 +94648,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 1942968536}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 11
|
||||
m_RootOrder: 12
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
|
|
Reference in a new issue