diff --git a/Assets/Prefabs/Game/Button Prompt.prefab b/Assets/Prefabs/Game/Button Prompt.prefab new file mode 100644 index 0000000..908027f --- /dev/null +++ b/Assets/Prefabs/Game/Button Prompt.prefab @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4007235920258067707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4236535272234872464} + - component: {fileID: 1786022526171042000} + - component: {fileID: 4214843378484823049} + m_Layer: 5 + m_Name: Button Prompt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4236535272234872464 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4007235920258067707} + 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: 0} + m_RootOrder: 0 + 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: 161.3906, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1786022526171042000 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4007235920258067707} + m_CullTransparentMesh: 1 +--- !u!114 &4214843378484823049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4007235920258067707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: ' + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278321666 + m_fontColor: {r: 0.009433985, g: 0.009433985, b: 0.009433985, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Prefabs/Game/Button Prompt.prefab.meta b/Assets/Prefabs/Game/Button Prompt.prefab.meta new file mode 100644 index 0000000..c4d797e --- /dev/null +++ b/Assets/Prefabs/Game/Button Prompt.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b0ac1f91007989c439a0246809223e56 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Game/PopUp.prefab b/Assets/Prefabs/Game/PopUp.prefab new file mode 100644 index 0000000..490a5a3 --- /dev/null +++ b/Assets/Prefabs/Game/PopUp.prefab @@ -0,0 +1,62 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4887495073678318998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 729017849394081224} + - component: {fileID: -7350152320695563460} + - component: {fileID: 7386518789294782352} + m_Layer: 0 + m_Name: PopUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &729017849394081224 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4887495073678318998} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-7350152320695563460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4887495073678318998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1f2746dd3569382419ce2c727734fbc8, type: 3} + m_Name: + m_EditorClassIdentifier: + item: {fileID: 0} + uiPrebab: {fileID: 5756063885148329735, guid: 8150580546fbb0d48bcd414238e2be89, type: 3} + message: +--- !u!65 &7386518789294782352 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4887495073678318998} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Game/PopUp.prefab.meta b/Assets/Prefabs/Game/PopUp.prefab.meta new file mode 100644 index 0000000..a6f66e4 --- /dev/null +++ b/Assets/Prefabs/Game/PopUp.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b60c7d344c81e904cb07f52bb99b2afa +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Game/UIAbillityPrefab 1.prefab b/Assets/Prefabs/Game/UIAbillityPrefab 1.prefab new file mode 100644 index 0000000..db9afcd --- /dev/null +++ b/Assets/Prefabs/Game/UIAbillityPrefab 1.prefab @@ -0,0 +1,193 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8588054010754274200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 530650285541145612} + - component: {fileID: 694032331737369669} + - component: {fileID: 7897337271065470980} + - component: {fileID: 9079012711067893675} + m_Layer: 5 + m_Name: UIAbillityPrefab 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &530650285541145612 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8588054010754274200} + 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: 2020856588815390102} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &694032331737369669 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8588054010754274200} + m_CullTransparentMesh: 1 +--- !u!114 &7897337271065470980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8588054010754274200} + 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: 0.6784314} + 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: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &9079012711067893675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8588054010754274200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdff95fc2112c6040a748eeeeb659204, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &2792429947445164806 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 530650285541145612} + m_Modifications: + - target: {fileID: 4007235920258067707, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_Name + value: Button Prompt + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_SizeDelta.x + value: 161.3906 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0ac1f91007989c439a0246809223e56, type: 3} +--- !u!224 &2020856588815390102 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4236535272234872464, guid: b0ac1f91007989c439a0246809223e56, type: 3} + m_PrefabInstance: {fileID: 2792429947445164806} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Game/UIAbillityPrefab 1.prefab.meta b/Assets/Prefabs/Game/UIAbillityPrefab 1.prefab.meta new file mode 100644 index 0000000..81a5a8a --- /dev/null +++ b/Assets/Prefabs/Game/UIAbillityPrefab 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e38204bb7b42b7642b974d9ee0c6903a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Game/UIAbillityPrefab.prefab b/Assets/Prefabs/Game/UIPopUpPrefab.prefab similarity index 91% rename from Assets/Prefabs/Game/UIAbillityPrefab.prefab rename to Assets/Prefabs/Game/UIPopUpPrefab.prefab index e25ddda..42a3076 100644 --- a/Assets/Prefabs/Game/UIAbillityPrefab.prefab +++ b/Assets/Prefabs/Game/UIPopUpPrefab.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 438105934820313976} - component: {fileID: 8747033564031983127} m_Layer: 5 - m_Name: Button Prompt + m_Name: Prompt m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -34,7 +34,7 @@ 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: 0} + m_AnchoredPosition: {x: 0, y: 142} m_SizeDelta: {x: 161.3906, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &438105934820313976 @@ -102,7 +102,7 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 + m_VerticalAlignment: 1024 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -130,7 +130,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: -69.87891, y: -65.0387, z: -65.66089, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -147,9 +147,8 @@ GameObject: - component: {fileID: 5756063885148329752} - component: {fileID: 5756063885148329754} - component: {fileID: 5756063885148329753} - - component: {fileID: 5143056936348118060} m_Layer: 5 - m_Name: UIAbillityPrefab + m_Name: UIPopUpPrefab m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -213,15 +212,3 @@ MonoBehaviour: m_FillOrigin: 2 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5143056936348118060 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5756063885148329735} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fdff95fc2112c6040a748eeeeb659204, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Game/UIAbillityPrefab.prefab.meta b/Assets/Prefabs/Game/UIPopUpPrefab.prefab.meta similarity index 100% rename from Assets/Prefabs/Game/UIAbillityPrefab.prefab.meta rename to Assets/Prefabs/Game/UIPopUpPrefab.prefab.meta diff --git a/Assets/Racer/Animations/New Animator Controller.controller b/Assets/Racer/Animations/New Animator Controller.controller index b1f711a..7b57c1b 100644 --- a/Assets/Racer/Animations/New Animator Controller.controller +++ b/Assets/Racer/Animations/New Animator Controller.controller @@ -92,7 +92,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/Scenes/Demos/graybox scene.unity b/Assets/Scenes/Demos/graybox scene.unity index ac1d85b..f048448 100644 --- a/Assets/Scenes/Demos/graybox scene.unity +++ b/Assets/Scenes/Demos/graybox scene.unity @@ -2267,7 +2267,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 69961610} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.10811, y: -0.98, z: 10.09} + m_LocalPosition: {x: -3.10811, y: -0.98, z: 10.44408} m_LocalScale: {x: 18.625084, y: 1.21024, z: 3.3996985} m_Children: [] m_Father: {fileID: 1669534897} @@ -5794,6 +5794,71 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 198149957} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &200927479 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: item + value: + objectReference: {fileID: 11400000, guid: a1c26807795a7ac4f83567455ce978ce, type: 2} + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: message + value: Press Shift To Nitro + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.x + value: 872 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.y + value: 31 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.z + value: 547.5 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4887495073678318998, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Name + value: PopUp + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} --- !u!1 &207794667 GameObject: m_ObjectHideFlags: 0 @@ -9590,6 +9655,54 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 358992523} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &361249689 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 361249691} + - component: {fileID: 361249690} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &361249690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 361249689} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68a1f9e3c975f3548a25770b59d5d0a4, type: 3} + m_Name: + m_EditorClassIdentifier: + interactableImage: {fileID: 0} + interactableObjects: + - {fileID: 1283335563} + - {fileID: 2050014884} + - {fileID: 2041820341} +--- !u!4 &361249691 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 361249689} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 531.8512, y: -130.8519, z: 827.15125} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &366371679 GameObject: m_ObjectHideFlags: 0 @@ -31287,7 +31400,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1283335563} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 188.002, y: -242.32672, z: 102.7196} + m_LocalPosition: {x: 176.86198, y: -242.32672, z: 59.9674} m_LocalScale: {x: 14.596339, y: 1, z: 18.99659} m_Children: [] m_Father: {fileID: 1631673360} @@ -35717,7 +35830,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6664667533527261801, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} propertyPath: hasGrapple - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} @@ -40254,7 +40367,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: stats: {fileID: 0} - uiPrebab: {fileID: 5756063885148329735, guid: 8150580546fbb0d48bcd414238e2be89, type: 3} + uiPrebab: {fileID: 8588054010754274200, guid: e38204bb7b42b7642b974d9ee0c6903a, type: 3} dashItem: {fileID: 11400000, guid: 3156de54e455b4348b2a6e79383383b0, type: 2} nitroItem: {fileID: 11400000, guid: a1c26807795a7ac4f83567455ce978ce, type: 2} kickItem: {fileID: 11400000, guid: a96dfb1a70e0d0a4f84c15378f38ce99, type: 2} @@ -49326,7 +49439,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2041820341} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 147.00003, y: -242.32672, z: 102.7196} + m_LocalPosition: {x: 135.86002, y: -242.32672, z: 59.9674} m_LocalScale: {x: 14.596339, y: 1, z: 18.99659} m_Children: [] m_Father: {fileID: 1631673360} @@ -49741,7 +49854,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2050014884} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 166.9, y: -242.32672, z: 102.7196} + m_LocalPosition: {x: 155.75998, y: -242.32672, z: 59.9674} m_LocalScale: {x: 14.596339, y: 1, z: 18.99659} m_Children: [] m_Father: {fileID: 1631673360} diff --git a/Assets/Scripts/AbstractInteractable.cs b/Assets/Scripts/AbstractInteractable.cs new file mode 100644 index 0000000..07f9c34 --- /dev/null +++ b/Assets/Scripts/AbstractInteractable.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public abstract class AbstractInteractable : MonoBehaviour +{ + //image used for interactable (change this to specific image type when needed) + [SerializeField] protected GameObject interactableImage; + //List is fine, but when destroying objects list size will change if you want to delete the element from array + //(works fien without removing it, but may want to use dynamically sized array later) + [SerializeField] protected List interactableObjects = new List(); + + //stubbed method that will preform interact based on + public abstract void OnInteract(); + +} diff --git a/Assets/Scripts/AbstractInteractable.cs.meta b/Assets/Scripts/AbstractInteractable.cs.meta new file mode 100644 index 0000000..f086cdc --- /dev/null +++ b/Assets/Scripts/AbstractInteractable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 84721400e64a8124998f5d0bcf7ea202 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DeletePlatform.cs b/Assets/Scripts/DeletePlatform.cs new file mode 100644 index 0000000..c115108 --- /dev/null +++ b/Assets/Scripts/DeletePlatform.cs @@ -0,0 +1,39 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DeletePlatform : AbstractInteractable +{ + //this function currently doesn't raycast on button click (stubbed with button clicks for now) + public override void OnInteract() + { + //if button 1 down + if (Input.GetKeyDown((KeyCode.Alpha1))) + { + Debug.Log("Item gone"); + Destroy(interactableObjects[0]); + } + if (Input.GetKeyDown((KeyCode.Alpha2))) + { + Debug.Log("Item gone"); + Destroy(interactableObjects[1]); + } + if (Input.GetKeyDown((KeyCode.Alpha3))) + { + Debug.Log("Item gone"); + Destroy(interactableObjects[2]); + } + } + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + //temporary + OnInteract(); + } +} diff --git a/Assets/Scripts/DeletePlatform.cs.meta b/Assets/Scripts/DeletePlatform.cs.meta new file mode 100644 index 0000000..88788e7 --- /dev/null +++ b/Assets/Scripts/DeletePlatform.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 68a1f9e3c975f3548a25770b59d5d0a4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PopUpScript.cs b/Assets/Scripts/PopUpScript.cs new file mode 100644 index 0000000..10a8c61 --- /dev/null +++ b/Assets/Scripts/PopUpScript.cs @@ -0,0 +1,65 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class PopUpScript : MonoBehaviour +{ + //item that displays on pop up + public Item item; + public GameObject uiPrebab; + public string message; + + //for some reason on enter was triggering twice (shouldn't happen but couldn't figure out why + private bool isPop = false; + private GameObject temp; + private GameObject canvas; + private void Start() + { + canvas = GameObject.Find("Canvas"); + } + private void OnTriggerEnter(Collider other) + { + if (other.gameObject.tag == "ArcherTarget" && isPop == false) + { + Debug.Log("enter"); + //if the item is not set or values are null, catch it + try + { + + temp = Instantiate(uiPrebab); + //set parent as highlight + temp.transform.SetParent(canvas.transform); + temp.name = item.name; + temp.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); + //due to low number, gonna hardcode this to be first + temp.transform.localPosition = new Vector3(0, 0); + //set icon to ui icon + temp.transform.GetComponent().sprite = item.itemSprite; + //set text + temp.transform.Find("Prompt").GetComponent().text = message; + //no longer allow instnatiation + isPop = true; + Debug.Log("create"); + } + catch (System.Exception e) + { + Debug.Log("error with item"); + } + + } + + + } + private void OnTriggerExit(Collider other) + { + //delete ui element when exit + if (other.gameObject.tag == "ArcherTarget") + { + Debug.Log("exit"); + Destroy(temp); + isPop = false; + } + } + +} diff --git a/Assets/Scripts/PopUpScript.cs.meta b/Assets/Scripts/PopUpScript.cs.meta new file mode 100644 index 0000000..16b040b --- /dev/null +++ b/Assets/Scripts/PopUpScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1f2746dd3569382419ce2c727734fbc8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 5927023..ff3503c 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -21,19 +21,19 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b180b65093e273e12190f3cf6ef2021f2e225a7f234362820 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 + value: 22424703114646703f313f3611314b0506241b2f222d69032e2c1336add32039f0f323f9d4393a323c34bf6d4a2b0f36e613 flags: 0 RecentlyUsedScenePath-6: value: 22424703114646703f313f3611314b0506241b2f222d69032e2c1336add32039f0f323f9d4393a323c34bf6d4a2b0f36e613 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646703f313f3611314b0506241b2f222d69032e2c1336add32039f0f323f9d4393a323c34bf6d4a2b0f36e613 + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 flags: 0 vcSharedLogLevel: value: 0d5e400f0650