diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 8cc51955..5bf06f7c 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -2408,7 +2408,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 93132552} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &95761683 GameObject: m_ObjectHideFlags: 0 @@ -2543,8 +2542,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 95761683} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &101168579 GameObject: m_ObjectHideFlags: 0 @@ -2654,7 +2651,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 101168579} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &102085518 GameObject: m_ObjectHideFlags: 0 @@ -2789,8 +2785,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 102085518} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &110654309 GameObject: m_ObjectHideFlags: 0 @@ -2993,7 +2987,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 53f10846845fcf9489fc69eccfbd24c9, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD --- !u!1 &117314508 GameObject: m_ObjectHideFlags: 0 @@ -3069,8 +3062,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 117314508} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &117889362 GameObject: m_ObjectHideFlags: 0 @@ -3562,7 +3553,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 129013732} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &134562569 GameObject: m_ObjectHideFlags: 0 @@ -3638,8 +3628,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 134562569} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &135616547 GameObject: m_ObjectHideFlags: 0 @@ -3996,11 +3984,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} -<<<<<<< HEAD m_AnchoredPosition: {x: -289.15005, y: 2} -======= - m_AnchoredPosition: {x: -289.15, y: 2} ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_SizeDelta: {x: -578.29, y: 49.92} m_Pivot: {x: 0.5, y: 0} --- !u!114 &156962255 @@ -7193,7 +7177,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} -<<<<<<< HEAD --- !u!1 &313086642 GameObject: m_ObjectHideFlags: 0 @@ -7269,8 +7252,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313086642} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &316841411 GameObject: m_ObjectHideFlags: 0 @@ -10222,7 +10203,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} -<<<<<<< HEAD --- !u!1 &481396919 GameObject: m_ObjectHideFlags: 0 @@ -10357,8 +10337,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 481396919} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &499528697 GameObject: m_ObjectHideFlags: 0 @@ -10922,7 +10900,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 523948531} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &527828795 GameObject: m_ObjectHideFlags: 0 @@ -11029,8 +11006,6 @@ MonoBehaviour: - {fileID: 785358485} - {fileID: 189878587} controllerMat: {fileID: 2100000, guid: 55b3a6672a0ec294d8f3edb9c1f94b36, type: 2} -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &528192059 GameObject: m_ObjectHideFlags: 0 @@ -12873,7 +12848,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: -8, y: -5, z: -8, w: -5} m_Softness: {x: 0, y: 0} -<<<<<<< HEAD --- !u!1 &586774447 GameObject: m_ObjectHideFlags: 0 @@ -12910,8 +12884,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &587260877 GameObject: m_ObjectHideFlags: 0 @@ -14555,7 +14527,6 @@ RectTransform: - {fileID: 632002973} m_Father: {fileID: 390818398} m_RootOrder: 1 -<<<<<<< HEAD m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -14672,14 +14643,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 -======= - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &676318033 GameObject: m_ObjectHideFlags: 0 @@ -17397,7 +17360,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 784075911} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &785358485 GameObject: m_ObjectHideFlags: 0 @@ -17473,8 +17435,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 785358485} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &790907719 GameObject: m_ObjectHideFlags: 0 @@ -18013,10 +17973,7 @@ RectTransform: m_Children: - {fileID: 408551561} - {fileID: 86453939} -<<<<<<< HEAD - {fileID: 1613403252} -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 - {fileID: 1076319429} m_Father: {fileID: 2051557111} m_RootOrder: 3 @@ -19075,11 +19032,7 @@ RectTransform: - {fileID: 2094592544} - {fileID: 435667402} m_Father: {fileID: 1182686744} -<<<<<<< HEAD m_RootOrder: 4 -======= - m_RootOrder: 3 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -19273,11 +19226,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 -<<<<<<< HEAD m_Value: 1 -======= - m_Value: 0 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -20820,7 +20769,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 -<<<<<<< HEAD --- !u!1 &976256974 GameObject: m_ObjectHideFlags: 0 @@ -20955,8 +20903,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 976256974} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &980091464 GameObject: m_ObjectHideFlags: 0 @@ -21697,7 +21643,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1005579236} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &1007704294 GameObject: m_ObjectHideFlags: 0 @@ -21832,8 +21777,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1007704294} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1022970659 GameObject: m_ObjectHideFlags: 0 @@ -23173,19 +23116,11 @@ RectTransform: m_Children: - {fileID: 1293461651} m_Father: {fileID: 830092700} -<<<<<<< HEAD m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 462, y: -25} -======= - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 330, y: -25} ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_SizeDelta: {x: 132, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1076319430 @@ -24873,11 +24808,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} -<<<<<<< HEAD m_AnchoredPosition: {x: 0, y: 83.22952} -======= - m_AnchoredPosition: {x: 0, y: 129.92253} ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1154875944 @@ -25326,10 +25257,7 @@ RectTransform: m_Children: - {fileID: 1956641996} - {fileID: 1750038562} -<<<<<<< HEAD - {fileID: 527828798} -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 - {fileID: 1611689950} - {fileID: 907920115} m_Father: {fileID: 2051557111} @@ -26376,7 +26304,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1207455549} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &1210269558 GameObject: m_ObjectHideFlags: 0 @@ -26413,8 +26340,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1215738360 GameObject: m_ObjectHideFlags: 0 @@ -26489,7 +26414,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 -<<<<<<< HEAD --- !u!1 &1219233810 GameObject: m_ObjectHideFlags: 0 @@ -26571,8 +26495,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1231936948 GameObject: m_ObjectHideFlags: 0 @@ -26830,7 +26752,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1237900826} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &1254178913 GameObject: m_ObjectHideFlags: 0 @@ -26906,8 +26827,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1254178913} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1264012261 GameObject: m_ObjectHideFlags: 0 @@ -27693,7 +27612,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1287203019} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &1291909901 GameObject: m_ObjectHideFlags: 0 @@ -27830,8 +27748,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1291909901} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1292844876 GameObject: m_ObjectHideFlags: 0 @@ -28680,7 +28596,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311536517} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &1317282578 GameObject: m_ObjectHideFlags: 0 @@ -28814,8 +28729,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1317282578} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1326073101 GameObject: m_ObjectHideFlags: 0 @@ -29281,7 +29194,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1328853374} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &1329509613 GameObject: m_ObjectHideFlags: 0 @@ -29418,8 +29330,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1329509613} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1331923531 GameObject: m_ObjectHideFlags: 0 @@ -29492,7 +29402,6 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} -<<<<<<< HEAD --- !u!1 &1337141464 GameObject: m_ObjectHideFlags: 0 @@ -29655,8 +29564,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1337141464} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1342998171 GameObject: m_ObjectHideFlags: 0 @@ -29853,7 +29760,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1345846029} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &1359502640 GameObject: m_ObjectHideFlags: 0 @@ -29988,8 +29894,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1359502640} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1369321727 GameObject: m_ObjectHideFlags: 0 @@ -30648,7 +30552,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1427744634} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &1434436822 GameObject: m_ObjectHideFlags: 0 @@ -30714,8 +30617,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1436123037 GameObject: m_ObjectHideFlags: 0 @@ -30791,11 +30692,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1436123037} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &1436502933 -======= ---- !u!1 &1437736685 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -30803,36 +30700,23 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: -<<<<<<< HEAD - component: {fileID: 1436502934} - component: {fileID: 1436502937} - component: {fileID: 1436502936} - component: {fileID: 1436502935} m_Layer: 5 m_Name: Button -======= - - component: {fileID: 1437736686} - - component: {fileID: 1437736688} - - component: {fileID: 1437736687} - m_Layer: 5 - m_Name: Header ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 -<<<<<<< HEAD --- !u!224 &1436502934 -======= ---- !u!224 &1437736686 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< HEAD m_GameObject: {fileID: 1436502933} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -30848,29 +30732,11 @@ RectTransform: m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1436502935 -======= - m_GameObject: {fileID: 1437736685} - 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_Children: - - {fileID: 725123777} - m_Father: {fileID: 1611689950} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 78} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &1437736687 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< HEAD m_GameObject: {fileID: 1436502933} m_Enabled: 1 m_EditorHideFlags: 0 @@ -30930,27 +30796,18 @@ MonoBehaviour: m_GameObject: {fileID: 1436502933} m_Enabled: 1 m_EditorHideFlags: 0 -======= - m_GameObject: {fileID: 1437736685} - m_Enabled: 1 - m_EditorHideFlags: 0 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 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_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: [] -<<<<<<< HEAD m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} -======= - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -30960,17 +30817,12 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 -<<<<<<< HEAD --- !u!222 &1436502937 -======= ---- !u!222 &1437736688 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< HEAD m_GameObject: {fileID: 1436502933} m_CullTransparentMesh: 1 --- !u!1 &1437736685 @@ -31139,10 +30991,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1439831130} m_CullTransparentMesh: 1 -======= - m_GameObject: {fileID: 1437736685} - m_CullTransparentMesh: 1 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1443721746 GameObject: m_ObjectHideFlags: 0 @@ -34236,11 +34084,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1292844878} m_HandleRect: {fileID: 1292844877} m_Direction: 2 -<<<<<<< HEAD m_Value: 0 -======= - m_Value: 1 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -34482,11 +34326,7 @@ RectTransform: - {fileID: 1437736686} - {fileID: 172566392} m_Father: {fileID: 1182686744} -<<<<<<< HEAD m_RootOrder: 3 -======= - m_RootOrder: 2 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -34514,8 +34354,6 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1611689949} -<<<<<<< HEAD -======= m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -34547,243 +34385,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1611689949} m_CullTransparentMesh: 1 ---- !u!1 &1620609858 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1620609859} - - component: {fileID: 1620609861} - - component: {fileID: 1620609860} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1620609859 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1620609858} - 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_Children: [] - m_Father: {fileID: 390818398} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1620609860 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1620609858} - 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: 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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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 &1620609861 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1620609858} - m_CullTransparentMesh: 1 ---- !u!1 &1637160319 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1637160320} - - component: {fileID: 1637160322} - - component: {fileID: 1637160321} - m_Layer: 0 - m_Name: UIBlocker - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1637160320 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637160319} - 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_Children: [] - m_Father: {fileID: 113063171} - m_RootOrder: 0 - 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: 0} - m_SizeDelta: {x: 4, y: 4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1637160321 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637160319} - 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: 0} - 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: 1 - 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 &1637160322 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637160319} - m_CullTransparentMesh: 1 ---- !u!1 &1649292125 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1649292126} - - component: {fileID: 1649292128} - - component: {fileID: 1649292127} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1649292126 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1649292125} - 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_Children: [] - m_Father: {fileID: 475433193} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.8555586} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1649292127 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1649292125} ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 - 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: 0} - 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: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 -<<<<<<< HEAD ---- !u!222 &1611689953 -======= ---- !u!222 &1649292128 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} -<<<<<<< HEAD - m_GameObject: {fileID: 1611689949} - m_CullTransparentMesh: 1 --- !u!1 &1613403251 -======= - m_GameObject: {fileID: 1649292125} - m_CullTransparentMesh: 1 ---- !u!1 &1654793130 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -34791,7 +34393,6 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: -<<<<<<< HEAD - component: {fileID: 1613403252} - component: {fileID: 1613403256} - component: {fileID: 1613403255} @@ -34799,19 +34400,11 @@ GameObject: - component: {fileID: 1613403253} m_Layer: 5 m_Name: Controllers -======= - - component: {fileID: 1654793131} - - component: {fileID: 1654793133} - - component: {fileID: 1654793132} - m_Layer: 5 - m_Name: Handle ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 -<<<<<<< HEAD --- !u!224 &1613403252 RectTransform: m_ObjectHideFlags: 0 @@ -34958,24 +34551,16 @@ GameObject: m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!224 &1620609859 -======= ---- !u!224 &1654793131 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< HEAD m_GameObject: {fileID: 1620609858} -======= - m_GameObject: {fileID: 1654793130} ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 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_Children: [] -<<<<<<< HEAD m_Father: {fileID: 390818398} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -34985,27 +34570,12 @@ RectTransform: m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1620609860 -======= - m_Father: {fileID: 312122290} - m_RootOrder: 0 - 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: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1654793132 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< HEAD m_GameObject: {fileID: 1620609858} -======= - m_GameObject: {fileID: 1654793130} ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -35019,11 +34589,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] -<<<<<<< HEAD m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} -======= - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -35033,25 +34599,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 -<<<<<<< HEAD --- !u!222 &1620609861 -======= ---- !u!222 &1654793133 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< HEAD m_GameObject: {fileID: 1620609858} m_CullTransparentMesh: 1 --- !u!1 &1629477594 -======= - m_GameObject: {fileID: 1654793130} - m_CullTransparentMesh: 1 ---- !u!1 &1663359941 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -35059,34 +34615,21 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: -<<<<<<< HEAD - component: {fileID: 1629477595} - component: {fileID: 1629477596} m_Layer: 5 m_Name: Item -======= - - component: {fileID: 1663359942} - - component: {fileID: 1663359944} - - component: {fileID: 1663359943} - m_Layer: 5 - m_Name: Text (TMP) (1) ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 -<<<<<<< HEAD --- !u!224 &1629477595 -======= ---- !u!224 &1663359942 ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} -<<<<<<< HEAD m_GameObject: {fileID: 1629477594} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -35408,16 +34951,6 @@ RectTransform: m_Father: {fileID: 363960617} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} -======= - m_GameObject: {fileID: 1663359941} - 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_Children: [] - m_Father: {fileID: 363960617} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 118.92001, y: 0} @@ -36588,7 +36121,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} -<<<<<<< HEAD --- !u!1 &1723657124 GameObject: m_ObjectHideFlags: 0 @@ -36664,8 +36196,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1723657124} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1725559315 GameObject: m_ObjectHideFlags: 0 @@ -38459,7 +37989,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1800461596} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &1802706668 GameObject: m_ObjectHideFlags: 0 @@ -38594,8 +38123,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1802706668} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1837496587 GameObject: m_ObjectHideFlags: 0 @@ -38705,11 +38232,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} -<<<<<<< HEAD m_AnchoredPosition: {x: 0, y: -84.99002} -======= - m_AnchoredPosition: {x: 0, y: -84.98996} ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 m_SizeDelta: {x: 320, y: -113.92} m_Pivot: {x: 0, y: 1} --- !u!1 &1852819572 @@ -39587,7 +39110,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1899782476} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &1905482487 GameObject: m_ObjectHideFlags: 0 @@ -39663,8 +39185,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1905482487} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &1906769992 GameObject: m_ObjectHideFlags: 0 @@ -43148,7 +42668,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -30, y: -30} m_Pivot: {x: 0.5, y: 0.5} -<<<<<<< HEAD --- !u!1 &2060027523 GameObject: m_ObjectHideFlags: 0 @@ -43275,8 +42794,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2060027523} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &2062490022 GameObject: m_ObjectHideFlags: 0 @@ -43917,7 +43434,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099454901} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1 &2101185331 GameObject: m_ObjectHideFlags: 0 @@ -44052,8 +43568,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2101185331} m_CullTransparentMesh: 1 -======= ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 --- !u!1 &2120543174 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Games/FirstContact.meta b/Assets/Scripts/Games/FirstContact.meta index f248cca8..2c25fdf8 100644 --- a/Assets/Scripts/Games/FirstContact.meta +++ b/Assets/Scripts/Games/FirstContact.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: fb2fdb673d6d1c34ab348b9c0da08705 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: fb2fdb673d6d1c34ab348b9c0da08705 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/FirstContact/FirstContact.cs b/Assets/Scripts/Games/FirstContact/FirstContact.cs index 741f5601..80384be0 100644 --- a/Assets/Scripts/Games/FirstContact/FirstContact.cs +++ b/Assets/Scripts/Games/FirstContact/FirstContact.cs @@ -1,4 +1,3 @@ -<<<<<<< HEAD using System.Collections.Generic; using UnityEngine; using HeavenStudio.Util; @@ -366,383 +365,4 @@ namespace HeavenStudio.Games return Random.Range(1, 11); } } -} - -======= -using System.Collections.Generic; -using UnityEngine; -using HeavenStudio.Util; - -namespace HeavenStudio.Games.Loaders -{ - using static Minigames; - public static class CtrFirstContact - { - public static Minigame AddGame(EventCaller eventCaller) - { - return new Minigame("firstContact", "First Contact", "008c97", false, false, new List() - { - new GameAction("beat intervals", delegate { FirstContact.instance.SetIntervalStart(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, 4f, true), - new GameAction("alien speak", delegate { FirstContact.instance.alienSpeak(eventCaller.currentEntity.beat, eventCaller.currentEntity.valA); }, 0.5f, false, new List() - { - new Param("valA", new EntityTypes.Float(.8f, 1.5f, 1f), "Pitch") - }), - new GameAction("alien turnover", delegate { FirstContact.instance.alienTurnOver(eventCaller.currentEntity.beat); }, 0.5f, false), - new GameAction("alien success", delegate { FirstContact.instance.alienSuccess(eventCaller.currentEntity.beat); }, 1f, false), - new GameAction("mission control", delegate { FirstContact.instance.missionControlDisplay(eventCaller.currentEntity.beat, eventCaller.currentEntity.toggle, eventCaller.currentEntity.length); }, 1f, true, new List - { - new Param("toggle", false, "Stay", "If it's the end of the remix/song") - }), - new GameAction("look at", delegate { FirstContact.instance.lookAtDirection(eventCaller.currentEntity.type, eventCaller.currentEntity.type); }, .5f, false, new List() - { - new Param("type", FirstContact.alienLookAt.lookAtTranslator, "alien look at what", "[Alien] will look at what"), - new Param("type", FirstContact.translatorLookAt.lookAtAlien, "translator look at what", "[Translator] will look at what"), - }), - new GameAction("live bar beat", delegate { FirstContact.instance.liveBarBeat(eventCaller.currentEntity.toggle); }, .5f, false, new List() - { - new Param("toggle", true, "On Beat", "If the live bar animation will be on beat or not") - }), - - //new GameAction("Version of First Contact", delegate { FirstContact.instance.versionOfFirstContact(eventCaller.currentEntity.type); }, .5f, false, new List - //{ - // new Param("type", FirstContact.VersionOfContact.FirstContact, "Version", "Version of First Contact to play"), - //}), - }); - } - } -} - -namespace HeavenStudio.Games -{ - //using Scripts_FirstContact; - - public class FirstContact : Minigame - { - public static FirstContact instance { get; private set; } - - [Header("Properties")] - public int alienSpeakCount; - public int translatorSpeakCount; - public bool hasMissed; - private float lastReportedBeat = 0; - - [Header("Components")] - [SerializeField] GameObject alien; - [SerializeField] GameObject translator; - //[SerializeField] GameObject alienSpeech; - [SerializeField] GameObject dummyHolder; - [SerializeField] GameObject missionControl; - [SerializeField] GameObject liveBar; - - [Header("Variables")] - public bool intervalStarted; - //float intervalStartBeat; - public float beatInterval = 4f; - public bool isCorrect, noHitOnce, isSpeaking; - //public int version; - public float lookAtLength = 1f; - bool onBeat; - float liveBarBeatOffset; - - - //public enum VersionOfContact - //{ - // FirstContact, - // CitrusRemix, - // SecondContact - //} - - public enum alienLookAt - { - lookAtTranslator, - idle - } - - public enum translatorLookAt - { - lookAtAlien, - idle - } - - private void Awake() - { - instance = this; - } - - public void SetIntervalStart(float beat, float interval = 4f) - { - if (!intervalStarted) - { - //alienSpeakCount = 0; - //translatorSpeakCount = 0; - intervalStarted = true; - } - - //intervalStartBeat = beat; - beatInterval = interval; - } - - private void Update() - { - //This is taken from the conductor script - if (Conductor.instance.ReportBeat(ref lastReportedBeat, offset: liveBarBeatOffset)) - { - liveBar.GetComponent().Play("liveBar", 0, 0); - } - else if(Conductor.instance.songPositionInBeats < lastReportedBeat) - { - lastReportedBeat = Mathf.Round(Conductor.instance.songPositionInBeats); - } - - if (PlayerInput.Pressed() && !IsExpectingInputNow() && !noHitOnce && !isSpeaking) - { - Jukebox.PlayOneShotGame("firstContact/" + randomizerLines()); - BeatAction.New(this.gameObject, new List() - { - new BeatAction.Action(.5f, delegate { translator.GetComponent().Play("translator_speak", 0, 0);}), - }); - } - if ((PlayerInput.Pressed() && !IsExpectingInputNow() && isSpeaking)) - { - hasMissed = true; - } - } - - //public void versionOfFirstContact(int type) - //{ - // version = type; - //} - - public void liveBarBeat(bool onBeat) - { - if (onBeat) - { - liveBarBeatOffset = 0; - } - else - { - liveBarBeatOffset = .5f; - } - } - - public void lookAtDirection(int alienLookAt, int translatorLookAt) - { - Debug.Log(alienLookAt); - Debug.Log(translatorLookAt); - switch (alienLookAt) - { - case 0: - alien.GetComponent().Play("alien_lookAt", 0, 0); - break; - case 1: - alien.GetComponent().Play("alien_idle", 0, 0); - break; - } - - switch (translatorLookAt) - { - case 0: - translator.GetComponent().Play("translator_lookAtAlien", 0, 0); - break; - case 1: - translator.GetComponent().Play("translator_idle", 0, 0); - break; - } - - } - - public void alienSpeak(float beat, float pitch) - { - Jukebox.PlayOneShotGame("firstContact/alien", beat, pitch); - ++alienSpeakCount; - var random = Random.Range(0, 2); - string textToPut = ""; - if(random == 0) - { - textToPut = "translator_lookAtAlien"; - } - else - { - textToPut = "translator_lookAtAlien_nod"; - } - - ScheduleInput(beat, beatInterval, InputType.STANDARD_DOWN, alienTapping, alienOnMiss, AlienEmpty); - - BeatAction.New(alien, new List() - { - new BeatAction.Action(beat, delegate { alien.GetComponent().Play("alien_talk", 0, 0); }), - new BeatAction.Action(beat, delegate - { - if (!isSpeaking) - { - translator.GetComponent().Play(textToPut, 0, 0); - } - }), - }); - } - - public void alienTurnOver(float beat) - { - if (!intervalStarted) - { - SetIntervalStart(beat, beatInterval); - } - if (intervalStarted) - { - SetIntervalStart(beat, beatInterval); - } - - Jukebox.PlayOneShotGame("firstContact/turnover"); - - BeatAction.New(alien, new List() - { - new BeatAction.Action(beat, delegate { alien.GetComponent().Play("alien_point", 0, 0); }), - new BeatAction.Action(beat + .5f, delegate { alien.GetComponent().Play("alien_idle", 0, 0); }), - new BeatAction.Action(beat + .5f, - delegate - { - if (!isSpeaking) - { - translator.GetComponent().Play("translator_idle", 0, 0); - } - }) - }); - - isSpeaking = true; - } - - public void alienSuccess(float beat) - { - string[] sfxStrings = { "", "" }; - string animString = ""; - - if (alienSpeakCount == translatorSpeakCount) - { - sfxStrings[0] = "firstContact/success_1"; - sfxStrings[1] = "firstContact/success_2"; - animString = "alien_success"; - } - else if (alienSpeakCount != translatorSpeakCount) - { - sfxStrings[0] = "firstContact/failAlien_1"; - sfxStrings[1] = "firstContact/failAlien_2"; - animString = "alien_fail"; - } - - string[] sounds = new string[] { sfxStrings[0], sfxStrings[0] }; - var sound = new MultiSound.Sound[] - { - new MultiSound.Sound(sounds[0], beat), - new MultiSound.Sound(sounds[1], beat + .5f) - }; - - MultiSound.Play(sound); - - BeatAction.New(alien, new List() - { - new BeatAction.Action(beat, delegate { alien.GetComponent().Play(animString, 0, 0); }), - new BeatAction.Action(beat + .5f, delegate { alien.GetComponent().Play(animString, 0, 0); }) - }); - - BeatAction.New(translator.gameObject, new List() - { - new BeatAction.Action(beat, delegate { translator.GetComponent().Play("translator_idle", 0, 0); }), - }); - - - alienSpeakCount = 0; - translatorSpeakCount = 0; - isSpeaking = false; - hasMissed = false; - noHitOnce = false; - } - - public void missionControlDisplay(float beat, bool stay, float length) - { - missionControl.SetActive(true); - string textToPut = ""; - - if (alienSpeakCount == translatorSpeakCount) - { - textToPut = "missionControl_success"; - } - else - { - textToPut = "missionControl_fail"; - } - - BeatAction.New(missionControl, new List() - { - new BeatAction.Action(length, delegate { missionControl.GetComponentInParent().Play(textToPut, 0, 0); }), - new BeatAction.Action(length, delegate { alien.GetComponentInParent().Play("alien_idle", 0, 0); }), - new BeatAction.Action(length, delegate { translator.GetComponent().Play("translator_idle", 0, 0); }), - - }); - - if (!stay) - { - BeatAction.New(missionControl, new List() - { - new BeatAction.Action(length, delegate { missionControl.SetActive(false); }), - }); - } - else - { - missionControl.SetActive(true); - } - - alienSpeakCount = 0; - translatorSpeakCount = 0; - isSpeaking = false; - } - - public void alienTapping(PlayerActionEvent caller, float beat) //OnHit - { - if (!noHitOnce) - { - ++translatorSpeakCount; - Jukebox.PlayOneShotGame("firstContact/" + randomizerLines()); - isCorrect = true; - - BeatAction.New(this.gameObject, new List() - { - new BeatAction.Action(.5f, delegate { translator.GetComponent().Play("translator_speak", 0, 0);}), - }); - } - else if (noHitOnce) - { - Jukebox.PlayOneShotGame("firstContact/slightlyFail"); - BeatAction.New(this.gameObject, new List() - { - new BeatAction.Action(.5f, delegate { translator.GetComponent().Play("translator_eh", 0, 0);}), - }); - } - } - - public void alienOnMiss(PlayerActionEvent caller) //OnMiss - { - if (!noHitOnce) - { - Jukebox.PlayOneShotGame("firstContact/alienNoHit"); - noHitOnce = true; - } - - BeatAction.New(alien, new List() - { - new BeatAction.Action(.5f, delegate { alien.GetComponent().Play("alien_noHit", 0, 0); }), - }); - } - - public void AlienEmpty(PlayerActionEvent caller) //OnEmpty - { - //empty - } - - public int randomizerLines() - { - return Random.Range(1, 11); - } - } -} - ->>>>>>> 92577ae3e26692484725c03508d1652d5ddafb25 +} \ No newline at end of file diff --git a/Assets/Scripts/Games/FirstContact/FirstContact.cs.meta b/Assets/Scripts/Games/FirstContact/FirstContact.cs.meta index c94df2fb..407017ac 100644 --- a/Assets/Scripts/Games/FirstContact/FirstContact.cs.meta +++ b/Assets/Scripts/Games/FirstContact/FirstContact.cs.meta @@ -1,11 +1,11 @@ -fileFormatVersion: 2 -guid: 3f2575369f43af4419d4d92d0de9e23b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 3f2575369f43af4419d4d92d0de9e23b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: