Merge branch 'Jake'
This commit is contained in:
@@ -1209,7 +1209,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3006133537337724145, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3614641596273148411, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
@@ -1282,11 +1282,52 @@ PrefabInstance:
|
||||
propertyPath: m_FontData.m_FontStyle
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4620066715855999926, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 0.9215687
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4620066715855999926, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4620066715855999926, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4797822364417701868, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_OnDidEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 880466090}
|
||||
- target: {fileID: 5590707661276647801, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5590707661276647801, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: 4f61678c17cc4804d93ce1351b931926,
|
||||
type: 3}
|
||||
- target: {fileID: 5590707661276647801, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 0.9215687
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5590707661276647801, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5590707661276647801, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
@@ -1308,6 +1349,21 @@ PrefabInstance:
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7706612935984237646, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7706612935984237646, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7706612935984237646, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7754510385818033532, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_FontData.m_Font
|
||||
@@ -1325,6 +1381,21 @@ PrefabInstance:
|
||||
value:
|
||||
objectReference: {fileID: 12800000, guid: 23083100b5ae4944fa609bceebf28322,
|
||||
type: 3}
|
||||
- target: {fileID: 8353401941762149960, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 0.9607844
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8353401941762149960, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8353401941762149960, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_FontData.m_Font
|
||||
@@ -1336,6 +1407,12 @@ PrefabInstance:
|
||||
propertyPath: m_FontData.m_FontStyle
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9079472155845500738, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: 4f61678c17cc4804d93ce1351b931926,
|
||||
type: 3}
|
||||
- target: {fileID: 9220167798849807280, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
|
||||
Reference in New Issue
Block a user