Merge remote-tracking branch 'origin/Over' into Syntriax

This commit is contained in:
Syntriax 2022-02-27 13:12:53 +03:00
commit a83b557f65
5 changed files with 8050 additions and 7667 deletions

View File

@ -189,8 +189,8 @@ AudioMixerSnapshotController:
m_SnapshotID: 7b03920a55d36f54bac08488dc018422 m_SnapshotID: 7b03920a55d36f54bac08488dc018422
m_FloatValues: m_FloatValues:
a1af4b69dd3ea7f45ae1c3192eb02717: -8.481223 a1af4b69dd3ea7f45ae1c3192eb02717: -8.481223
9675209fe2317fa4cb02bced339e8d4b: -13.63726 9675209fe2317fa4cb02bced339e8d4b: -9.833291
a449b5dff9f05be428c783227ba1ebfb: -18.592384 a449b5dff9f05be428c783227ba1ebfb: -15.421314
m_TransitionOverrides: {} m_TransitionOverrides: {}
--- !u!244 &1458683330471287751 --- !u!244 &1458683330471287751
AudioMixerEffectController: AudioMixerEffectController:

File diff suppressed because it is too large Load Diff

View File

@ -180,7 +180,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3}
--- !u!1 &548551711 --- !u!1 &503016982
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -188,8 +188,8 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 548551713} - component: {fileID: 503016984}
- component: {fileID: 548551712} - component: {fileID: 503016983}
m_Layer: 0 m_Layer: 0
m_Name: Music m_Name: Music
m_TagString: Untagged m_TagString: Untagged
@ -197,13 +197,13 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!82 &548551712 --- !u!82 &503016983
AudioSource: AudioSource:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 548551711} m_GameObject: {fileID: 503016982}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 4 serializedVersion: 4
OutputAudioMixerGroup: {fileID: 8913006207396984383, guid: 55dad93ba7816e44c83798006fa0a277, type: 2} OutputAudioMixerGroup: {fileID: 8913006207396984383, guid: 55dad93ba7816e44c83798006fa0a277, type: 2}
@ -211,7 +211,7 @@ AudioSource:
m_PlayOnAwake: 1 m_PlayOnAwake: 1
m_Volume: 1 m_Volume: 1
m_Pitch: 1 m_Pitch: 1
Loop: 1 Loop: 0
Mute: 0 Mute: 0
Spatialize: 0 Spatialize: 0
SpatializePostEffects: 0 SpatializePostEffects: 0
@ -293,13 +293,13 @@ AudioSource:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
--- !u!4 &548551713 --- !u!4 &503016984
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 548551711} m_GameObject: {fileID: 503016982}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1004.1356, y: 528.1812, z: -17.455448} m_LocalPosition: {x: 1004.1356, y: 528.1812, z: -17.455448}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}

View File

@ -18,7 +18,7 @@ PlayerSettings:
cursorHotspot: {x: 0, y: 0} cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
m_ShowUnitySplashScreen: 1 m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 0 m_ShowUnitySplashLogo: 1
m_SplashScreenOverlayOpacity: 1 m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 1 m_SplashScreenAnimation: 1
m_SplashScreenLogoStyle: 1 m_SplashScreenLogoStyle: 1

View File

@ -15,17 +15,17 @@ MonoBehaviour:
m_Children: m_Children:
- {fileID: 3} - {fileID: 3}
- {fileID: 8} - {fileID: 8}
- {fileID: 13} - {fileID: 15}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 30 y: 30
width: 1536 width: 1536
height: 730.8 height: 730.8
m_MinSize: {x: 300, y: 200} m_MinSize: {x: 300, y: 300}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 24288}
vertical: 0 vertical: 0
controlID: 5298 controlID: 9729
--- !u!114 &2 --- !u!114 &2
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -142,7 +142,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200} m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192} m_MaxSize: {x: 8096, y: 16192}
vertical: 1 vertical: 1
controlID: 5266 controlID: 9672
--- !u!114 &4 --- !u!114 &4
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -218,7 +218,7 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 0 m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 9} m_ClientGUIView: {fileID: 4}
m_SearchString: m_SearchString:
m_ExpandedScenes: [] m_ExpandedScenes: []
m_CurrenRootInstanceID: 0 m_CurrenRootInstanceID: 0
@ -245,8 +245,8 @@ MonoBehaviour:
y: 381.6 y: 381.6
width: 304 width: 304
height: 349.19998 height: 349.19998
m_MinSize: {x: 231, y: 271} m_MinSize: {x: 230, y: 250}
m_MaxSize: {x: 10001, y: 10021} m_MaxSize: {x: 10000, y: 10000}
m_ActualView: {fileID: 7} m_ActualView: {fileID: 7}
m_Panes: m_Panes:
- {fileID: 7} - {fileID: 7}
@ -307,7 +307,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: dc3c0000 m_SelectedIDs: dc3c0000
m_LastClickedID: 15580 m_LastClickedID: 15580
m_ExpandedIDs: ffffffff00000000ac660000186a0000786a0000a06a0000d2a3000000ca9a3b m_ExpandedIDs: ffffffff00000000ac660000186a00001e6a00009e6a0000d2a3000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -333,9 +333,9 @@ MonoBehaviour:
m_ResourceFile: m_ResourceFile:
m_AssetTreeState: m_AssetTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 08690000 m_SelectedIDs: 02690000
m_LastClickedID: 26888 m_LastClickedID: 26882
m_ExpandedIDs: ffffffff00000000ac660000186a0000786a0000a06a0000d2a3000000ca9a3b m_ExpandedIDs: ffffffff00000000ac660000186a00001e6a0000786a0000a06a0000d2a3000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -360,8 +360,8 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: 08690000 m_SelectedInstanceIDs: 02690000
m_LastClickedInstanceID: 26888 m_LastClickedInstanceID: 26882
m_HadKeyboardFocusLastEvent: 0 m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000d03c0000 m_ExpandedInstanceIDs: c6230000d03c0000
m_RenameOverlay: m_RenameOverlay:
@ -406,17 +406,220 @@ MonoBehaviour:
m_Children: m_Children:
- {fileID: 9} - {fileID: 9}
- {fileID: 11} - {fileID: 11}
- {fileID: 13}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 304 x: 304
y: 0 y: 0
width: 880 width: 1032.8
height: 730.8 height: 730.8
m_MinSize: {x: 100, y: 200} m_MinSize: {x: 100, y: 300}
m_MaxSize: {x: 8096, y: 16192} m_MaxSize: {x: 8096, y: 24288}
vertical: 1 vertical: 1
controlID: 5299 controlID: 9730
--- !u!114 &9 --- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: AudioMixerWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1032.8
height: 475.2
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 10}
m_Panes:
- {fileID: 10}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12373, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Audio Mixer
m_Image: {fileID: -3283902137440876849, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 304
y: 73.6
width: 1030.8
height: 454.2
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_MixersTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: ac660000
m_LastClickedID: 26284
m_ExpandedIDs: 12eb343c
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 0}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
m_Path:
m_Icon: {fileID: 0}
m_ResourceFile:
m_LayoutStripsOnTop:
m_VerticalSplitter:
ID: 0
splitterInitialOffset: 0
currentActiveSplitter: -1
realSizes:
- 65
- 35
relativeSizes:
- 0.65
- 0.35000002
minSizes:
- 85
- 105
maxSizes:
- 0
- 0
lastTotalSize: 0
splitSize: 6
xOffset: 0
m_Version: 1
oldRealSizes:
oldMinSizes:
oldMaxSizes:
oldSplitSize: 0
m_HorizontalSplitter:
ID: 0
splitterInitialOffset: 0
currentActiveSplitter: -1
realSizes:
- 60
- 60
- 60
- 60
relativeSizes:
- 0.25
- 0.25
- 0.25
- 0.25
minSizes:
- 85
- 85
- 85
- 85
maxSizes:
- 0
- 0
- 0
- 0
lastTotalSize: 0
splitSize: 6
xOffset: 0
m_Version: 1
oldRealSizes:
oldMinSizes:
oldMaxSizes:
oldSplitSize: 0
m_LayoutStripsOnRight:
m_VerticalSplitter:
ID: 0
splitterInitialOffset: 0
currentActiveSplitter: -1
realSizes:
- 60
- 60
- 60
- 60
relativeSizes:
- 0.25
- 0.25
- 0.25
- 0.25
minSizes:
- 100
- 85
- 85
- 85
maxSizes:
- 0
- 0
- 0
- 0
lastTotalSize: 0
splitSize: 6
xOffset: 0
m_Version: 1
oldRealSizes:
oldMinSizes:
oldMaxSizes:
oldSplitSize: 0
m_HorizontalSplitter:
ID: 10205
splitterInitialOffset: 0
currentActiveSplitter: -1
realSizes:
- 309.6
- 721.6
relativeSizes:
- 0.3
- 0.7
minSizes:
- 160
- 160
maxSizes:
- 0
- 0
lastTotalSize: 1031.2
splitSize: 6
xOffset: 0
m_Version: 1
oldRealSizes:
oldMinSizes:
oldMaxSizes:
oldSplitSize: 0
m_SectionOrder: 00000000030000000100000002000000
m_LayoutMode: 1
m_SortGroupsAlphabetically: 0
m_ShowReferencedBuses: 1
m_ShowBusConnections: 0
m_ShowBusConnectionsOfSelection: 0
--- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -432,18 +635,18 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 475.2
width: 880 width: 1032.8
height: 514.4 height: 100
m_MinSize: {x: 202, y: 221} m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021} m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 2} m_ActualView: {fileID: 2}
m_Panes: m_Panes:
- {fileID: 10} - {fileID: 12}
- {fileID: 2} - {fileID: 2}
m_Selected: 1 m_Selected: 1
m_LastSelected: 0 m_LastSelected: 0
--- !u!114 &10 --- !u!114 &12
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -464,9 +667,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 304 x: 304
y: 73.6 y: 548.8
width: 878 width: 1030.8
height: 493.40002 height: 79
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@ -477,7 +680,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 1 displayed: 1
snapOffset: {x: -100, y: -1.6000061} snapOffset: {x: -100, y: -1.6000061}
snapOffsetDelta: {x: 0, y: -24} snapOffsetDelta: {x: 0, y: -23.999992}
snapCorner: 3 snapCorner: 3
id: Tool Settings id: Tool Settings
index: 0 index: 0
@ -488,7 +691,7 @@ MonoBehaviour:
collapsed: 0 collapsed: 0
displayed: 1 displayed: 1
snapOffset: {x: -141, y: 149} snapOffset: {x: -141, y: 149}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: -95.4}
snapCorner: 1 snapCorner: 1
id: unity-grid-and-snap-toolbar id: unity-grid-and-snap-toolbar
index: 1 index: 1
@ -553,9 +756,9 @@ MonoBehaviour:
floating: 0 floating: 0
collapsed: 0 collapsed: 0
displayed: 1 displayed: 1
snapOffset: {x: 67.5, y: 86} snapOffset: {x: 67.5, y: 0}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0 snapCorner: 2
id: Orientation id: Orientation
index: 0 index: 0
layout: 4 layout: 4
@ -770,7 +973,7 @@ MonoBehaviour:
m_SceneVisActive: 1 m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0} m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0 m_ViewIsLockedToObject: 0
--- !u!114 &11 --- !u!114 &13
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -786,17 +989,17 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 514.4 y: 575.2
width: 880 width: 1032.8
height: 216.39996 height: 155.59998
m_MinSize: {x: 100, y: 100} m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 12} m_ActualView: {fileID: 14}
m_Panes: m_Panes:
- {fileID: 12} - {fileID: 14}
m_Selected: 0 m_Selected: 0
m_LastSelected: 0 m_LastSelected: 0
--- !u!114 &12 --- !u!114 &14
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -817,14 +1020,14 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 304 x: 304
y: 588 y: 648.8
width: 878 width: 1030.8
height: 195.39996 height: 134.59998
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
m_SaveData: [] m_SaveData: []
--- !u!114 &13 --- !u!114 &15
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -839,18 +1042,18 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1184 x: 1336.8
y: 0 y: 0
width: 352 width: 199.19995
height: 730.8 height: 730.8
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 16}
m_Panes: m_Panes:
- {fileID: 14} - {fileID: 16}
m_Selected: 0 m_Selected: 0
m_LastSelected: 0 m_LastSelected: 0
--- !u!114 &14 --- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -870,9 +1073,9 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1184 x: 1336.8
y: 73.6 y: 73.6
width: 351 width: 198.19995
height: 709.8 height: 709.8
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
@ -884,7 +1087,7 @@ MonoBehaviour:
m_CachedPref: 160 m_CachedPref: 160
m_ControlHash: -371814159 m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: 26888 m_LastInspectedObjectInstanceID: 26882
m_LastVerticalScrollValue: 0 m_LastVerticalScrollValue: 0
m_GlobalObjectId: m_GlobalObjectId:
m_InspectorMode: 0 m_InspectorMode: 0