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

Compare commits

base: Pasha:80e7d38a170c2ea0c6c2a078e635c89866720fa9
Branches Tags
Pasha:main Pasha:Jake Pasha:Pasha
..
compare: Pasha:main
Branches Tags
Pasha:main Pasha:Jake Pasha:Pasha

5 Commits
80e7d38a17 ... main

Author SHA1 Message Date
Pasha
86d9bddac6 I forgot what I changed 2026-03-20 13:05:25 +00:00
Pasha
58a293c3e1 Added more accesability text 2026-03-20 12:54:22 +00:00
Pasha
c422859ece Added text for idiots 2026-03-20 12:41:29 +00:00
Pasha Bibko
69fd62b3ac Fixed small issues found in playtesting 2026-01-29 13:54:10 +00:00
Pasha Bibko
13af242e69 Fixed merge conflict issues 2026-01-29 13:04:54 +00:00
12 changed files with 292 additions and 184 deletions
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

7
Assets/Prefabs/PlayerReplayer.prefab
View File

@@ -72,7 +72,7 @@ GameObject:
m_Component:
- component: {fileID: 1807660236798938897}
- component: {fileID: 1013965729963872153}
- component: {fileID: 1783748808844086845}
- component: {fileID: 4207089029311380441}
- component: {fileID: 7220179918976106526}
- component: {fileID: 7410036744236083586}
- component: {fileID: 9011244016352067911}
@@ -134,7 +134,8 @@ MonoBehaviour:
- {fileID: 8300000, guid: 413764415f5bf42429d26861fc5e82cf, type: 3}
- {fileID: 8300000, guid: 21713b7ac8710bf4fb3b949bbbebb67a, type: 3}
PlayerAudioSource: {fileID: 3380663186425371797}
--- !u!114 &1783748808844086845
HealthTracker: {fileID: 0}
--- !u!114 &4207089029311380441
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -143,7 +144,7 @@ MonoBehaviour:
m_GameObject: {fileID: 5082956827802089079}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab982c94ab064b944947c4792e623299, type: 3}
m_Script: {fileID: 11500000, guid: 3d33e1862ff5809499d3187e38cf80a7, type: 3}
m_Name:
m_EditorClassIdentifier:
cam: {fileID: 7220179918976106526}

386
Assets/Scenes/WorldScene.unity
View File

@@ -320,6 +320,12 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!224 &394445806 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 834552907522022778, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
m_PrefabInstance: {fileID: 1758685209}
m_PrefabAsset: {fileID: 0}
--- !u!114 &447617108 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1850279079604088768, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
@@ -340,6 +346,11 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1013965729963872153, guid: 2b0bfd2786fee6740a799a99023f5000,
type: 3}
propertyPath: HealthTracker
value:
objectReference: {fileID: 1003288351}
- target: {fileID: 1013965729963872153, guid: 2b0bfd2786fee6740a799a99023f5000,
type: 3}
propertyPath: ExternalCamera
@@ -447,6 +458,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 880466087}
- {fileID: 1822315556}
m_Father: {fileID: 782229191}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -564,6 +576,11 @@ PrefabInstance:
propertyPath: Spawner
value:
objectReference: {fileID: 447617108}
- target: {fileID: 582498797338587669, guid: c0a03ce6c4f39224299267b83719ceb7,
type: 3}
propertyPath: Helajkghfjkhgdfjk
value:
objectReference: {fileID: 1822315557}
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
type: 3}
propertyPath: m_LocalPosition.x
@@ -991,6 +1008,18 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 739366992}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1003288351 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 582498797338587669, guid: c0a03ce6c4f39224299267b83719ceb7,
type: 3}
m_PrefabInstance: {fileID: 739366992}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 260819a4950a1f54d921ee3d6b3da010, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1004516925 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
@@ -1170,22 +1199,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
@@ -1201,16 +1219,31 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2433458770277224157, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_LocalScale.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2433458770277224157, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2433458770277224157, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2433458770277224157, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2841827207845239115, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
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,161 +1304,48 @@ 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: DisplayMoronText
value:
objectReference: {fileID: 21300000, guid: 4f61678c17cc4804d93ce1351b931926,
objectReference: {fileID: 1812575549}
- target: {fileID: 6524590693600647859, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
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
propertyPath: HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely
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,
objectReference: {fileID: 112955761}
- target: {fileID: 6630605910866455705, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7706612935984237646, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
- target: {fileID: 8353401941762149960, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
propertyPath: m_Type
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,
- target: {fileID: 8353401941762149960, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -25.5
propertyPath: m_Color.a
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 834552907522022778, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
insertIndex: -1
addedObject: {fileID: 1812575550}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e29ce1fe47a855c4e907d4312c9e9d6e, type: 3}
--- !u!114 &1758685210 stripped
@@ -1446,6 +1366,180 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1758685209}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1812575549
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1812575550}
- component: {fileID: 1812575552}
- component: {fileID: 1812575551}
- component: {fileID: 1812575553}
m_Layer: 0
m_Name: ScoreText (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1812575550
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1812575549}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 394445806}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 300}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1812575551
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1812575549}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 76f1829e461ec70459be88ac25ce8be0, type: 3}
m_FontSize: 120
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 120
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: Shield Damaged
--- !u!222 &1812575552
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1812575549}
m_CullTransparentMesh: 1
--- !u!114 &1812575553
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1812575549}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
m_EffectDistance: {x: 5, y: -5}
m_UseGraphicAlpha: 1
--- !u!1 &1822315555
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1822315556}
- component: {fileID: 1822315558}
- component: {fileID: 1822315557}
m_Layer: 0
m_Name: ScoreText (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1822315556
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1822315555}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 479830775}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -100, y: -40}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1822315557
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1822315555}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, 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_FontData:
m_Font: {fileID: 12800000, guid: 76f1829e461ec70459be88ac25ce8be0, type: 3}
m_FontSize: 60
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 90
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 'Health: 420'
--- !u!222 &1822315558
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1822315555}
m_CullTransparentMesh: 1
--- !u!1 &1909908769
GameObject:
m_ObjectHideFlags: 0

4
Assets/tmp.cs → Assets/Scripts/CamRatioFixer.cs
View File

@@ -1,8 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class tmp : MonoBehaviour
public class CamRatioFixer : MonoBehaviour
{
public Camera cam;

2
Assets/tmp.cs.meta → Assets/Scripts/CamRatioFixer.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ab982c94ab064b944947c4792e623299
guid: 3d33e1862ff5809499d3187e38cf80a7
MonoImporter:
externalObjects: {}
serializedVersion: 2

10
Assets/Scripts/HealthBar.cs
View File

@@ -1,4 +1,5 @@
using UnityEngine;
using UnityEngine.UI;
namespace InterfaceOff.WorldScene
{
@@ -7,11 +8,16 @@ namespace InterfaceOff.WorldScene
public Transform HealthBarObject;
public WindowSpawner Spawner;
public LifeThingTrackerThing Thing;
public Text Helajkghfjkhgdfjk;
public int Health { get; private set; }
private void Update()
{
float scale = ((20 - Thing.HitsTaken) - Spawner.SpawnedWindowCount) * 5f;
scale = Mathf.Clamp(scale, 0f, Mathf.Infinity);
Helajkghfjkhgdfjk.text = $"Health: {Health}";
Health = ((20 - Thing.HitsTaken) - Spawner.SpawnedWindowCount);
float scale = Mathf.Clamp(Health * 5f, 0f, Mathf.Infinity);
if (!Spawner.AutoSpawn)
{

5
Assets/Scripts/LifeThingTrackerThing.cs
View File

@@ -11,6 +11,7 @@ namespace InterfaceOff.WorldScene
[SerializeField] private Slider SliderThing;
[SerializeField] private WindowSpawner Spawner;
[SerializeField] private GameObject HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely;
[SerializeField] private GameObject DisplayMoronText;
[field: SerializeField] public int HitsTaken { get; private set; }
@@ -74,8 +75,12 @@ namespace InterfaceOff.WorldScene
private IEnumerator DisplayHurtOverlay()
{
HurtOverlay.SetActive(true);
DisplayMoronText.SetActive(true);
yield return new WaitForSecondsRealtime(time: 0.4f);
HurtOverlay.SetActive(false);
yield return new WaitForSecondsRealtime(time: 0.6f);
DisplayMoronText.SetActive(false);
}
}
}

3
Assets/Scripts/PlayerController.cs
View File

@@ -22,6 +22,7 @@ namespace InterfaceOff.WorldScene
[SerializeField] private GameObject MovingObject;
[SerializeField] private AudioClip[] AudioClips;
[SerializeField] private AudioSource PlayerAudioSource;
[SerializeField] private HealthBar HealthTracker;
public static void PlayRandomErrorSound()
{
@@ -61,7 +62,7 @@ namespace InterfaceOff.WorldScene
/* Iterates the frame index */
FrameIndex = (FrameIndex + 1) % (Frames.Length - 2);
if (DeathIndices.Contains(FrameIndex) && ActiveWindowSpawner.SpawnedWindowCount > MAX_WINDOWS)
if (DeathIndices.Contains(FrameIndex) && HealthTracker.Health <= 0)
{
ActiveWindowSpawner.StartEndSequence();
PlayerAlive = false;

2
Assets/Scripts/WindowBase.cs
View File

@@ -66,8 +66,8 @@ namespace InterfaceOff
public void DestroyWindow()
{
StartCoroutine(routine: DeathSequence());
Creator.AlertOfDespawnedWindow();
StartCoroutine(routine: DeathSequence());
}
private IEnumerator DeathSequence()

5
Assets/Scripts/WindowSpawner.cs
View File

@@ -95,7 +95,7 @@ namespace InterfaceOff
public void AlertOfDespawnedWindow() => SpawnedWindowCount--;
private int SpawnyThingyMajig = 9000; // Sky chose dis
private int SpawnyThingyMajig = 40 * 25; // Sky chose dis
private void FixedUpdate()
{
@@ -106,7 +106,8 @@ namespace InterfaceOff
if (SpawnyThingyMajig == 0)
{
PasswordField.SetActive(true);
SpawnyThingyMajig = Random.Range(2000, 10000);
SpawnyThingyMajig = Random.Range(40 * 15, 40 * 20);
Debug.Log($"[{Time.timeSinceLevelLoad}]");
}
else
{

3
ProjectSettings/ProjectSettings.asset
View File

@@ -814,7 +814,8 @@ PlayerSettings:
scriptingDefineSymbols: {}
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend: {}
scriptingBackend:
Standalone: 0
il2cppCompilerConfiguration: {}
il2cppCodeGeneration: {}
managedStrippingLevel: