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

This commit is contained in:
OverflowNarhoym
2022-02-27 09:54:44 +01:00
14 changed files with 123142 additions and 16420 deletions

View File

@@ -13,15 +13,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_LocalPosition.x
value: -6
value: -13.5
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_LocalPosition.y
value: -19.470001
value: -10.470001
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_LocalPosition.z
@@ -70,15 +70,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_RootOrder
value: 10
value: 11
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_LocalPosition.x
value: 21
value: 13.5
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_LocalPosition.y
value: -19.5
value: -10.5
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_LocalPosition.z
@@ -127,15 +127,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_RootOrder
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_LocalPosition.x
value: -6
value: -13.5
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_LocalPosition.y
value: -11.47
value: -2.4700003
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_LocalPosition.z
@@ -180,15 +180,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
propertyPath: m_RootOrder
value: 8
value: 9
objectReference: {fileID: 0}
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
propertyPath: m_LocalPosition.x
value: -6
value: -13.5
objectReference: {fileID: 0}
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
propertyPath: m_LocalPosition.y
value: -5
value: 4
objectReference: {fileID: 0}
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
propertyPath: m_LocalPosition.z
@@ -241,11 +241,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 946406419476967723, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_RootOrder
value: 18
value: 3
objectReference: {fileID: 0}
- target: {fileID: 946406419476967723, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.x
value: 7.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 946406419476967723, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.z
@@ -253,19 +253,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1510587947020119214, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.x
value: -16.91
value: -24.41
objectReference: {fileID: 0}
- target: {fileID: 1510587947020119214, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.y
value: -20.44
value: -11.44
objectReference: {fileID: 0}
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalScale.x
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalScale.y
value: 5.7125
objectReference: {fileID: 0}
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.x
value: 34.55
value: 29
objectReference: {fileID: 0}
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.y
value: -22.25
value: -13.25
objectReference: {fileID: 0}
- target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_Size.x
@@ -20107,6 +20115,14 @@ PrefabInstance:
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[320].Y
value: -250000100
objectReference: {fileID: 0}
- target: {fileID: 4965404924299203782, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.x
value: -7.5
objectReference: {fileID: 0}
- target: {fileID: 4965404924299203782, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.y
value: 9
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -20171,15 +20187,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
propertyPath: m_RootOrder
value: 14
value: 15
objectReference: {fileID: 0}
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
propertyPath: m_LocalPosition.x
value: 21
value: 13.5
objectReference: {fileID: 0}
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
propertyPath: m_LocalPosition.y
value: -5
value: 4
objectReference: {fileID: 0}
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
propertyPath: m_LocalPosition.z
@@ -20228,15 +20244,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_RootOrder
value: 12
value: 13
objectReference: {fileID: 0}
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_LocalPosition.x
value: 29
value: 21.5
objectReference: {fileID: 0}
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_LocalPosition.y
value: -7.5
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_LocalPosition.z
@@ -20289,15 +20305,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
propertyPath: m_RootOrder
value: 16
value: 17
objectReference: {fileID: 0}
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
propertyPath: m_LocalPosition.x
value: 13
value: 5.5
objectReference: {fileID: 0}
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
propertyPath: m_LocalPosition.y
value: -7.5
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
propertyPath: m_LocalPosition.z
@@ -20346,15 +20362,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_RootOrder
value: 13
value: 14
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_LocalPosition.x
value: 21
value: 13.5
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_LocalPosition.y
value: -11.5
value: -2.5
objectReference: {fileID: 0}
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
propertyPath: m_LocalPosition.z
@@ -20399,15 +20415,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
propertyPath: m_RootOrder
value: 15
value: 16
objectReference: {fileID: 0}
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
propertyPath: m_LocalPosition.x
value: 21
value: 13.5
objectReference: {fileID: 0}
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
propertyPath: m_LocalPosition.y
value: -1.5
value: 7.5
objectReference: {fileID: 0}
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
propertyPath: m_LocalPosition.z
@@ -20464,15 +20480,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_RootOrder
value: 6
value: 7
objectReference: {fileID: 0}
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_LocalPosition.x
value: -14
value: -21.5
objectReference: {fileID: 0}
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_LocalPosition.y
value: -7.5
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_LocalPosition.z
@@ -20525,15 +20541,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
propertyPath: m_RootOrder
value: 17
value: 18
objectReference: {fileID: 0}
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
propertyPath: m_LocalPosition.x
value: 29
value: 21.5
objectReference: {fileID: 0}
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
propertyPath: m_LocalPosition.y
value: -15.5
value: -6.5
objectReference: {fileID: 0}
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
propertyPath: m_LocalPosition.z
@@ -20578,15 +20594,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
propertyPath: m_RootOrder
value: 9
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
propertyPath: m_LocalPosition.x
value: -6
value: -13.5
objectReference: {fileID: 0}
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
propertyPath: m_LocalPosition.y
value: -1.5
value: 7.5
objectReference: {fileID: 0}
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
propertyPath: m_LocalPosition.z
@@ -20643,15 +20659,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_RootOrder
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_LocalPosition.x
value: 2
value: -5.5
objectReference: {fileID: 0}
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_LocalPosition.y
value: -15.570001
value: -6.5700006
objectReference: {fileID: 0}
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_LocalPosition.z
@@ -20700,15 +20716,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_RootOrder
value: 11
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_LocalPosition.x
value: 13
value: 5.5
objectReference: {fileID: 0}
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_LocalPosition.y
value: -15.5
value: -6.5
objectReference: {fileID: 0}
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
propertyPath: m_LocalPosition.z
@@ -20761,15 +20777,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_LocalPosition.x
value: 7.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_LocalPosition.y
value: -9
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_LocalPosition.z
@@ -20781,15 +20797,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

View File

@@ -8081,35 +8081,35 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 946406419476967723, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.x
value: 7.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1510587947020119214, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.x
value: -16.86
value: -24.36
objectReference: {fileID: 0}
- target: {fileID: 1510587947020119214, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.y
value: -21.97
value: -11.97
objectReference: {fileID: 0}
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalScale.x
value: 1.9899
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalScale.y
value: 1.9899
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalScale.z
value: 1.9899
value: 4.698552
objectReference: {fileID: 0}
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.x
value: 34.22
value: 27.47
objectReference: {fileID: 0}
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.y
value: -21.5
value: -11.5
objectReference: {fileID: 0}
- target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_Size.x
@@ -11899,6 +11899,14 @@ PrefabInstance:
propertyPath: m_Tiles.Array.data[138].second.m_TileObjectToInstantiateIndex
value: 65535
objectReference: {fileID: 0}
- target: {fileID: 4965404924299203782, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.x
value: -7.5
objectReference: {fileID: 0}
- target: {fileID: 4965404924299203782, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -12031,11 +12039,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_LocalPosition.x
value: 7.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_LocalPosition.y
value: -10
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_LocalPosition.z

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff