Symmetrical/BGJ-2022.1
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Assets/Sprites/UI.meta
#	Assets/Sprites/UI/UIBase.aseprite
#	Assets/Sprites/UI/UIBase.png
#	Assets/Sprites/UI/UIButtonBase.aseprite
#	Assets/Sprites/UI/UIButtonBase1.png
#	Assets/Sprites/UI/UIButtonBase2.png
#	Assets/Sprites/UI/UIButtonBase3.png
#	Assets/Sprites/UI/UIButtonBase4.png
This commit is contained in:
OverflowNarhoym
2022-02-25 10:40:58 +01:00
parent c848107cdc 16be6c18c5
commit 930c834a4b
30 changed files with 1405 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Assets/Scenes/SyntriaxDevScene.unity
View File

@@ -1619,62 +1619,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 245926659986223294, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 824769369955617666, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1108797734940297071, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1223623990800834390, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2190229848147629182, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3403585388977359407, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3561650887137008148, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4410568269018354420, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4772454080493380724, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5962319374639302853, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6045445082603185284, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7575667667802855240, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_Alpha
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7575667667802855240, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_Interactable
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7575667667802855240, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_BlocksRaycasts
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7804154879131926840, guid: 4978bf886d6bbe0448d5f68e7eb2b48a, type: 3}
propertyPath: m_Name
value: UI
@@ -1898,5 +1842,9 @@ PrefabInstance:
propertyPath: m_Name
value: Key Press Interactable
objectReference: {fileID: 0}
- target: {fileID: 5551167095143660491, guid: 10dc04857fa9e7747b5a5fb9624c4a68, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 10dc04857fa9e7747b5a5fb9624c4a68, type: 3}