Pasha/Inter-Face-Off
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed merge conflict issues

Browse Source
This commit is contained in:
Pasha Bibko
2026-01-29 13:04:54 +00:00
parent 80e7d38a17
commit 13af242e69
3 changed files with 26 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/ExampleEntry.prefab
View File

@@ -66,7 +66,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0

43
Assets/Prefabs/GameCanvas.prefab
View File

@@ -67,7 +67,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 4f61678c17cc4804d93ce1351b931926, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -570,7 +570,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0, g: 0, b: 0.9607844, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -685,15 +685,15 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0, g: 0, b: 0.9215687, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_Sprite: {fileID: 21300000, guid: 4f61678c17cc4804d93ce1351b931926, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -1018,7 +1018,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0, g: 0, b: 0.9215687, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -1094,7 +1094,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0, g: 0, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -1348,7 +1348,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14, type: 3}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
@@ -1651,6 +1651,7 @@ MonoBehaviour:
HurtOverlay: {fileID: 6456657860247816393}
SliderThing: {fileID: 6656112534571270696}
Spawner: {fileID: 1850279079604088768}
HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely: {fileID: 0}
<HitsTaken>k__BackingField: 0
--- !u!136 &2494850548308267933
CapsuleCollider:
@@ -1769,7 +1770,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 842200c58a6fb22469773202c51f3f56, type: 3}
m_Font: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
@@ -1862,9 +1863,9 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 842200c58a6fb22469773202c51f3f56, type: 3}
m_Font: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14, type: 3}
m_FontSize: 100
m_FontStyle: 0
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 100
@@ -1874,7 +1875,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: Your armour ran out of shield
m_Text: Your armour ran out of shield!
--- !u!114 &8550888136129672418
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2028,7 +2029,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14, type: 3}
m_FontSize: 25
m_FontStyle: 0
m_BestFit: 0
@@ -2141,7 +2142,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 9646e64abbfa4094a8921eac54f39b3a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2467,7 +2468,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 842200c58a6fb22469773202c51f3f56, type: 3}
m_Font: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14, type: 3}
m_FontSize: 70
m_FontStyle: 0
m_BestFit: 0
@@ -2679,8 +2680,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -16}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -25.5}
m_SizeDelta: {x: 0, y: -19}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5938081633044006721
CanvasRenderer:
@@ -2711,7 +2712,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 76f1829e461ec70459be88ac25ce8be0, type: 3}
m_Font: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14, type: 3}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
@@ -2926,9 +2927,9 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 842200c58a6fb22469773202c51f3f56, type: 3}
m_Font: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14, type: 3}
m_FontSize: 50
m_FontStyle: 0
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 60
@@ -3020,7 +3021,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14, type: 3}
m_FontSize: 25
m_FontStyle: 2
m_BestFit: 0

164
Assets/Scenes/WorldScene.unity
View File

@@ -1170,22 +1170,11 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1615029340372784444, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14,
type: 3}
- target: {fileID: 2020022267469913571, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Name
value: GameCanvas
objectReference: {fileID: 0}
- target: {fileID: 2058749420242249500, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2433458770277224157, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_AnchorMax.x
@@ -1206,11 +1195,6 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 880466090}
- target: {fileID: 3006133537337724145, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3614641596273148411, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_LocalPosition.x
@@ -1271,158 +1255,16 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4507381690284583189, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14,
type: 3}
- target: {fileID: 4507381690284583189, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
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,
- target: {fileID: 6524590693600647859, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Type
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5590707661276647801, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Sprite
propertyPath: HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely
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
value: Your armour ran out of shield!
objectReference: {fileID: 0}
- target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14,
type: 3}
- target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_FontData.m_FontStyle
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6456657860247816393, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
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
value:
objectReference: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14,
type: 3}
- target: {fileID: 7754510385818033532, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_FontData.m_Alignment
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8261609717126338231, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_FontData.m_Font
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
value:
objectReference: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14,
type: 3}
- target: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
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
value: -19
objectReference: {fileID: 0}
- target: {fileID: 9220167798849807280, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -25.5
objectReference: {fileID: 0}
objectReference: {fileID: 112955761}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []