resolving merge conflict
This commit is contained in:
tonyomendoza
parent
d275151c41
commit
31369eff0b
@ -43087,24 +43087,6 @@ PrefabInstance:
|
|||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -137.5
|
value: -137.5
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326605770592773, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326605770592773, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326605770592773, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
>>>>>>> efb7d634f717202b805805f324ff30a6aa779322
|
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326605790841685, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326605790841685, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
@ -43199,336 +43181,13 @@ PrefabInstance:
|
|||||||
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
value: 1
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 1
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_SizeDelta.x
|
|
||||||
value: 767
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.size
|
|
||||||
value: 50
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Enabled
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[0]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 17bbaf0f809d55f4ba2a91afe9dac977,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[1]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 3078b53dc6a9c8b4a8482ecab7747dc7,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[3]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: bb027ab57e381d5439e993ff1541be2e,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[4]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 37b95ba1666e39940b577aaeeb193844,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[2]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: eeb31bd611bbd4c4da5ca0d5a9a1c206,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[5]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 37b95ba1666e39940b577aaeeb193844,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[6]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 37b95ba1666e39940b577aaeeb193844,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[7]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 37b95ba1666e39940b577aaeeb193844,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[8]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 07a59ff0200617b46a6439608d025a8d,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[9]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[10]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[11]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[12]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[13]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[14]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[15]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[16]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[17]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 3ab8b2d73d5fb0e43a703a5f39121747,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[18]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 1068c9ece6c67514a959ba29af974f08,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[19]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: c3d1700a646119d44882c1b7f9aeb6f7,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[20]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: c3d1700a646119d44882c1b7f9aeb6f7,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[21]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 9c6a336610daf134f99e559d2874b2ae,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[22]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: 8a0ae100028bca24899af93f00f0abc1,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[23]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: 8a0ae100028bca24899af93f00f0abc1,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[24]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: 8a0ae100028bca24899af93f00f0abc1,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[25]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: 7626fa06fb1e6fc45b4a650145cbf332,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[26]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: 7626fa06fb1e6fc45b4a650145cbf332,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[27]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: 7626fa06fb1e6fc45b4a650145cbf332,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[28]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: 7626fa06fb1e6fc45b4a650145cbf332,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[29]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: 7626fa06fb1e6fc45b4a650145cbf332,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[30]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: 7626fa06fb1e6fc45b4a650145cbf332,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[31]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 1e928ff0140d4274c988f9de23361f9a,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[32]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 1e928ff0140d4274c988f9de23361f9a,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[33]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 1e928ff0140d4274c988f9de23361f9a,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[34]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: fc2787a40b1c60e4fb0abc48e346dbad,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[35]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 8e532c3b9400cc64a9fefde0b2a9787d,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[36]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 13465dee6b0b1b44fa2af8d24809ad2c,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[37]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: e3b8176cd12bdd3478af31129dc7928d,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[38]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: e3b8176cd12bdd3478af31129dc7928d,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[39]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: a34beb1b7007bbe4c82cb5bd81ef7d81,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[40]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 696630249496564076, guid: a34beb1b7007bbe4c82cb5bd81ef7d81,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[41]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 82cd1e6547d038f40841ebd61189c7c9,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[42]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 291de3c305677ad4ab7bf2b08fc273bf,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[43]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 8659069e57e44ed4f835fbf3cae7fa69,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[44]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: b64e855774356ee4eaad1527f02aea30,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[45]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 8a874bbfadd54aa4685679cda294efe8,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[46]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: d8893dfb4a592d84f9bd7c0d09f7e585,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[47]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: bf0ee0c240b8bfb4ba1a99d4090e5daa,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[48]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: 004fc0e3f060e8942ab8379feb15c21c,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: testItems.Array.data[49]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 8715477175483360852, guid: c457048ef30ba454c9db42622f84409e,
|
|
||||||
type: 3}
|
|
||||||
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: gridSize.Height
|
|
||||||
value: 50
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
>>>>>>> efb7d634f717202b805805f324ff30a6aa779322
|
|
||||||
- target: {fileID: 2770326605844417883, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326605844417883, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
@ -43598,29 +43257,21 @@ PrefabInstance:
|
|||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -335
|
value: -335
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606043385229, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_IsActive
|
|
||||||
value: 1
|
|
||||||
>>>>>>> efb7d634f717202b805805f324ff30a6aa779322
|
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
value: 1
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 1
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -2500
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
@ -44005,84 +43656,6 @@ PrefabInstance:
|
|||||||
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.x
|
|
||||||
value: 316.71497
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_SizeDelta.x
|
|
||||||
value: 613.42993
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: -445
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_SizeDelta.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_SizeDelta.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606719424890, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606719424890, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606719424890, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606719424890, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_SizeDelta.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606719424890, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_SizeDelta.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2770326606725301634, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: useImageAsSlotHolder
|
|
||||||
>>>>>>> efb7d634f717202b805805f324ff30a6aa779322
|
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: a1df1d539bc1d7c4b88b3da59908c2ec
|
guid: 0f1e233ae851c994889b469f04c18b47
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user