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

Merge branch 'Jake'

Browse Source
This commit is contained in:
Pasha
2026-01-20 19:01:50 +00:00
parent fc629e45b6 ff4bc745e1
commit 61698039b1
13 changed files with 506 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

349
Assets/Scenes/MenuScene.unity
View File

@@ -172,7 +172,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
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
@@ -181,7 +181,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 23083100b5ae4944fa609bceebf28322, type: 3}
m_FontSize: 120
m_FontSize: 95
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -408,7 +408,7 @@ GameObject:
- component: {fileID: 369944630}
- component: {fileID: 369944629}
m_Layer: 5
m_Name: ScrollingText
m_Name: ScrollingTextR
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -430,7 +430,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -120, y: -425.96323}
m_AnchoredPosition: {x: -95, y: -540}
m_SizeDelta: {x: 200, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &369944629
@@ -454,12 +454,12 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 23083100b5ae4944fa609bceebf28322, type: 3}
m_FontSize: 140
m_Font: {fileID: 12800000, guid: 76f1829e461ec70459be88ac25ce8be0, type: 3}
m_FontSize: 155
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 162
m_MinSize: 1
m_MaxSize: 173
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -526,7 +526,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -120}
m_SizeDelta: {x: 1400, y: 200}
m_SizeDelta: {x: 600, y: 160}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &417991489
MonoBehaviour:
@@ -549,8 +549,8 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.10849059, g: 1, b: 0.26030698, a: 1}
m_NormalColor: {r: 1, g: 1, b: 1, a: 0}
m_HighlightedColor: {r: 0.10849059, g: 1, b: 0.26030698, a: 0.5019608}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
@@ -573,7 +573,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2104636343}
m_TargetAssemblyTypeName: StartMenuController, Assembly-CSharp
m_TargetAssemblyTypeName: InterfaceOff.MainMenu.StartMenuController, Assembly-CSharp
m_MethodName: OnStartClick
m_Mode: 1
m_Arguments:
@@ -600,7 +600,7 @@ MonoBehaviour:
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: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -708,13 +708,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 442336507}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalRotation: {x: -0.051489443, y: 0.10296124, z: 0.005336975, w: 0.9933375}
m_LocalPosition: {x: 778.007, y: 1.283, z: -119.6}
m_LocalScale: {x: 0.85858, y: 0.85858, z: 0.85858}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -5.935, y: 11.835, z: 0}
--- !u!114 &442336511
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -759,6 +759,12 @@ MonoBehaviour:
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!224 &442536377 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
m_PrefabInstance: {fileID: 6580940834834287407}
m_PrefabAsset: {fileID: 0}
--- !u!1 &463523187
GameObject:
m_ObjectHideFlags: 0
@@ -946,81 +952,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 651929334}
m_CullTransparentMesh: 1
--- !u!1 &767539820
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 767539821}
- component: {fileID: 767539823}
- component: {fileID: 767539822}
m_Layer: 5
m_Name: Background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &767539821
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 767539820}
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: 2104636342}
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: 0}
m_SizeDelta: {x: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &767539822
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 767539820}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, 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: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &767539823
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 767539820}
m_CullTransparentMesh: 1
--- !u!1 &872206452
GameObject:
m_ObjectHideFlags: 0
@@ -1082,10 +1013,10 @@ MonoBehaviour:
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
m_PressedColor: {r: 1, g: 1, b: 1, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_DisabledColor: {r: 1, g: 1, b: 1, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
@@ -1413,7 +1344,7 @@ GameObject:
- component: {fileID: 1491629967}
- component: {fileID: 1491629966}
m_Layer: 5
m_Name: ScrollingText
m_Name: ScrollingTextL
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1435,7 +1366,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 120, y: -540}
m_AnchoredPosition: {x: 95, y: -540}
m_SizeDelta: {x: 200, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1491629966
@@ -1459,11 +1390,11 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 23083100b5ae4944fa609bceebf28322, type: 3}
m_FontSize: 140
m_Font: {fileID: 12800000, guid: 76f1829e461ec70459be88ac25ce8be0, type: 3}
m_FontSize: 155
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MinSize: 1
m_MaxSize: 162
m_Alignment: 4
m_AlignByGeometry: 0
@@ -1494,6 +1425,79 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1491629963}
m_CullTransparentMesh: 1
--- !u!1001 &1530222078
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
type: 3}
propertyPath: m_LocalPosition.x
value: 781.3514
objectReference: {fileID: 0}
- target: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.0564396
objectReference: {fileID: 0}
- target: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
type: 3}
propertyPath: m_LocalPosition.z
value: -114.634155
objectReference: {fileID: 0}
- target: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8436299661722214638, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
type: 3}
propertyPath: m_Name
value: Corridor
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 4196511694219924786, guid: ffc439d5d7c92f14aa90c763e1cde8d2, type: 3}
- {fileID: 7240180351567446257, guid: ffc439d5d7c92f14aa90c763e1cde8d2, type: 3}
- {fileID: 9020267387182154433, guid: ffc439d5d7c92f14aa90c763e1cde8d2, type: 3}
- {fileID: 6206983139588420677, guid: ffc439d5d7c92f14aa90c763e1cde8d2, type: 3}
- {fileID: 376463832094554576, guid: ffc439d5d7c92f14aa90c763e1cde8d2, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ffc439d5d7c92f14aa90c763e1cde8d2, type: 3}
--- !u!1 &1561039682
GameObject:
m_ObjectHideFlags: 0
@@ -1530,8 +1534,8 @@ RectTransform:
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: -350}
m_SizeDelta: {x: 1400, y: 200}
m_AnchoredPosition: {x: 0, y: -300}
m_SizeDelta: {x: 600, y: 160}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1561039684
MonoBehaviour:
@@ -1554,8 +1558,8 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 1, g: 0, b: 0, a: 1}
m_NormalColor: {r: 1, g: 1, b: 1, a: 0}
m_HighlightedColor: {r: 1, g: 0, b: 0, a: 0.50980395}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
@@ -1677,7 +1681,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
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
@@ -1686,11 +1690,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 23083100b5ae4944fa609bceebf28322, type: 3}
m_FontSize: 120
m_FontSize: 95
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 140
m_MinSize: 0
m_MaxSize: 300
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -1780,7 +1784,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -220}
m_SizeDelta: {x: 1600, y: 400}
m_SizeDelta: {x: 1300, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2079401028
MonoBehaviour:
@@ -1803,12 +1807,12 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 23083100b5ae4944fa609bceebf28322, type: 3}
m_FontSize: 140
m_Font: {fileID: 12800000, guid: 842200c58a6fb22469773202c51f3f56, type: 3}
m_FontSize: 154
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 162
m_MaxSize: 180
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -1931,7 +1935,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 767539821}
- {fileID: 442536377}
- {fileID: 417991488}
- {fileID: 1561039683}
- {fileID: 2079401027}
@@ -1960,6 +1964,124 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f58874635b9cec04c81a0c2355758873, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &6580940834834287407
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2104636342}
m_Modifications:
- target: {fileID: 3898840948354616909, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_Name
value: Background
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_SizeDelta.x
value: 1920
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_SizeDelta.y
value: 1080
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8706863740303237686, guid: d0c08f2189c331f49940f2e9e1f425d3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d0c08f2189c331f49940f2e9e1f425d3, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@@ -1968,3 +2090,4 @@ SceneRoots:
- {fileID: 152438700}
- {fileID: 2104636342}
- {fileID: 1279373909}
- {fileID: 1530222078}