Compare commits

...

3 Commits

4 changed files with 1741 additions and 177 deletions

View File

@ -240,6 +240,158 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Click E or move to go back.
--- !u!1 &1763104819279274547
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7312610401193743014}
- component: {fileID: 6438176053026956320}
- component: {fileID: 6573140843626949350}
m_Layer: 0
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7312610401193743014
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1763104819279274547}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.052}
m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
m_Children: []
m_Father: {fileID: 8094130477220982353}
m_RootOrder: 2
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.3}
m_SizeDelta: {x: 300, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6438176053026956320
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1763104819279274547}
m_CullTransparentMesh: 0
--- !u!114 &6573140843626949350
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1763104819279274547}
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: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 200
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Just small jump
--- !u!1 &1847777934652309266
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7880653370037702414}
- component: {fileID: 3714611632780096277}
- component: {fileID: 7105155675865516883}
m_Layer: 0
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7880653370037702414
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1847777934652309266}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.05}
m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
m_Children: []
m_Father: {fileID: 8094130477220982353}
m_RootOrder: 5
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.128, y: 0.3043}
m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3714611632780096277
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1847777934652309266}
m_CullTransparentMesh: 0
--- !u!114 &7105155675865516883
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1847777934652309266}
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_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 54d88af8950445844b1b95a6339ab8d1, type: 3}
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!1 &2216609536366247738
GameObject:
m_ObjectHideFlags: 0
@ -741,6 +893,165 @@ MonoBehaviour:
But some
times is need else power.'
--- !u!1 &7800422935223843544
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6851427158892036205}
- component: {fileID: 3695865904531579838}
- component: {fileID: 2248367823692357436}
m_Layer: 0
m_Name: Text (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6851427158892036205
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7800422935223843544}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.052}
m_LocalScale: {x: 0.0005, y: 0.0005, z: 0.0005}
m_Children: []
m_Father: {fileID: 8094130477220982353}
m_RootOrder: 3
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.239}
m_SizeDelta: {x: 560, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3695865904531579838
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7800422935223843544}
m_CullTransparentMesh: 0
--- !u!114 &2248367823692357436
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7800422935223843544}
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: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 35
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 200
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'When you take this power
you can dash in air. When you double click
same side button like A + A or D + D'
--- !u!1 &7953820146352088041
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3417976574913174907}
- component: {fileID: 1001749785796244065}
- component: {fileID: 4553441920269427797}
m_Layer: 0
m_Name: Text (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3417976574913174907
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7953820146352088041}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.0518}
m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
m_Children: []
m_Father: {fileID: 8094130477220982353}
m_RootOrder: 4
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.1013, y: 0.131}
m_SizeDelta: {x: 300, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1001749785796244065
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7953820146352088041}
m_CullTransparentMesh: 0
--- !u!114 &4553441920269427797
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7953820146352088041}
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: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 16
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 200
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Click E or move to go back.
--- !u!1 &8517129028894527803
GameObject:
m_ObjectHideFlags: 0
@ -845,7 +1156,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8686362967541028628}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -1064,10 +1375,11 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 2443858067619643757}
- {fileID: 8686362966973903152}
- {fileID: 2443858067619643757}
- {fileID: 4120708291963357687}
- {fileID: 543450653560769788}
- {fileID: 8094130477220982353}
m_Father: {fileID: 4992519963305423117}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1498,7 +1810,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_RootOrder
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
@ -1858,3 +2170,188 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 4514026461824740892}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8637510140877474234
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8686362967541028628}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalScale.x
value: 1000.0002
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalScale.y
value: 1000.00037
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalScale.z
value: 1000.00037
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalPosition.y
value: -251.00008
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalPosition.z
value: 80.00037
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalScale.x
value: 10
objectReference: {fileID: 0}
- target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalScale.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalScale.z
value: 10
objectReference: {fileID: 0}
- target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.7072302
objectReference: {fileID: 0}
- target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.7069834
objectReference: {fileID: 0}
- target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -89.98
objectReference: {fileID: 0}
- target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalScale.x
value: 10
objectReference: {fileID: 0}
- target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalScale.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalScale.z
value: 10
objectReference: {fileID: 0}
- target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.7072302
objectReference: {fileID: 0}
- target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.7069834
objectReference: {fileID: 0}
- target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -89.98
objectReference: {fileID: 0}
- target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_Name
value: Sign (3)
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2784c771a437b7e4cb23176a2e7c3ee3, type: 3}
--- !u!4 &8094130477220982353 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3,
type: 3}
m_PrefabInstance: {fileID: 8637510140877474234}
m_PrefabAsset: {fileID: 0}

View File

@ -140,6 +140,7 @@ MonoBehaviour:
clip: {fileID: 8300000, guid: 23f58ffff5e98424b82e0a34bfeb8a77, type: 3}
volume: 0.49
pitch: 2.19
loop: 0
source: {fileID: 0}
--- !u!1 &7094923890942819438
GameObject:

File diff suppressed because it is too large Load Diff

View File

@ -69,9 +69,15 @@ public class ObjectManager : MonoBehaviour
{
detailSign.SetActive(true);
}
else if (!playerManager.onGround || Input.GetAxisRaw("Horizontal") != 0 || (Input.GetKeyUp(KeyCode.E) && detailSign.activeSelf))
else if ((Input.GetAxisRaw("Jump") > 0 || Input.GetAxisRaw("Horizontal") != 0 || Input.GetKeyUp(KeyCode.E)) && detailSign.activeSelf)
{
detailSign.SetActive(false);
if (meshRenderer != null)
{
meshRenderer.materials[0].DisableKeyword("_EMISSION");
meshRenderer.materials[1].SetFloat("_Outline", 0.0f);
}
this.GetComponent<ObjectManager>().enabled = false;
}
}
}
@ -99,9 +105,11 @@ public class ObjectManager : MonoBehaviour
{
if (other.gameObject.tag == "Player")
{
if (objectType == ObjectType.Sign)
if (objectType == ObjectType.Sign && this.GetComponent<ObjectManager>().enabled)
{
playerManager = other.gameObject.GetComponent<PlayerManager>();
meshRenderer.materials[0].EnableKeyword("_EMISSION");
meshRenderer.materials[0].SetColor("_EmissionColor", new Color(0.2735849f, 0.2018939f, 0.09162514f) * 0.8f);
meshRenderer.materials[1].SetFloat("_Outline", 2.5f);
interact = true;
}
@ -145,6 +153,7 @@ public class ObjectManager : MonoBehaviour
playerManager.GetComponent<Rigidbody>().useGravity = true;
}
if (meshRenderer != null) {
meshRenderer.materials[0].DisableKeyword("_EMISSION");
meshRenderer.materials[1].SetFloat("_Outline", 0.0f);
}
interact = false;