Compare commits

...

24 Commits

Author SHA1 Message Date
haitem
ce7b3cb90b Repair coliders 2021-01-31 18:04:29 +01:00
haitem
c829cbadfe Remake some points in scenes 2021-01-31 17:54:00 +01:00
haitem
0cfe588fb0 Update MainMenu.cs 2021-01-31 16:59:22 +01:00
haitem
4536ae2f5d Update MainMenu.cs 2021-01-31 16:49:09 +01:00
haitem
69305eb47f Update MainMenu.cs 2021-01-31 16:42:43 +01:00
haitem
dd925c3796 Fix for web version 2021-01-31 16:40:24 +01:00
haitem
c09508323e Fixis 2021-01-31 16:29:34 +01:00
haitem
3695ff634e Make some speed edit for web version 2021-01-31 16:14:04 +01:00
haitem
18a2f9944d Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 15:51:12 +01:00
haitem
2dbeaa26b4 Some sound edit 2021-01-31 15:51:03 +01:00
GamerClassN7
aed80e1e85 Final Screen 2021-01-31 15:39:02 +01:00
haitem
93e4d21108 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 15:31:53 +01:00
haitem
2eeb0fd521 fix escape 2021-01-31 15:31:43 +01:00
GamerClassN7
3e9c03c1a5 Auudio 2021-01-31 15:21:30 +01:00
haitem
2e2783bc6c some changis 2021-01-31 15:20:36 +01:00
haitem
97f67f18a2 Some edits 2021-01-31 15:12:34 +01:00
haitem
684c17bf85 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 15:01:42 +01:00
haitem
ae47994b65 Remake Level 1 _release 2021-01-31 15:01:32 +01:00
GamerClassN7
fa089c7bf9 Update Player.prefab 2021-01-31 14:55:04 +01:00
GamerClassN7
86e21549ff Ali Level Added 2021-01-31 14:47:56 +01:00
GamerClassN7
57f32d4dd5 Fixes 2021-01-31 14:46:24 +01:00
Ali
6eebb28aab levels 1 2 2021-01-31 14:38:36 +01:00
haitem
129a7391aa Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 14:34:59 +01:00
haitem
c14744d22f Remake Hans scene 2021-01-31 14:34:49 +01:00
18 changed files with 4933 additions and 3321 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -138,38 +138,38 @@ MonoBehaviour:
clips: clips:
- name: MainTheme - name: MainTheme
clip: {fileID: 8300000, guid: 23f58ffff5e98424b82e0a34bfeb8a77, type: 3} clip: {fileID: 8300000, guid: 23f58ffff5e98424b82e0a34bfeb8a77, type: 3}
volume: 0.49 volume: 0.25
pitch: 0 pitch: 1
loop: 1 loop: 1
source: {fileID: 0} source: {fileID: 0}
- name: Lose - name: Lose
clip: {fileID: 8300000, guid: 5e46f3118010926438116b8116aa135f, type: 3} clip: {fileID: 8300000, guid: 5e46f3118010926438116b8116aa135f, type: 3}
volume: 1 volume: 0.5
pitch: 0 pitch: 1
loop: 0 loop: 0
source: {fileID: 0} source: {fileID: 0}
- name: Pickup - name: Pickup
clip: {fileID: 8300000, guid: 8dde256f26d302448a0864b01ed338e1, type: 3} clip: {fileID: 8300000, guid: 8dde256f26d302448a0864b01ed338e1, type: 3}
volume: 1 volume: 0.5
pitch: 0 pitch: 1
loop: 0 loop: 0
source: {fileID: 0} source: {fileID: 0}
- name: Jump - name: Jump
clip: {fileID: 8300000, guid: 2a79e7c44a88012449116094f3db3529, type: 3} clip: {fileID: 8300000, guid: 2a79e7c44a88012449116094f3db3529, type: 3}
volume: 1 volume: 0.5
pitch: 0 pitch: 1
loop: 0 loop: 0
source: {fileID: 0} source: {fileID: 0}
- name: Run - name: Run
clip: {fileID: 8300000, guid: ace6f20d983bec8409e399f09ada3ade, type: 3} clip: {fileID: 8300000, guid: ace6f20d983bec8409e399f09ada3ade, type: 3}
volume: 1 volume: 0.5
pitch: 0 pitch: 1
loop: 0 loop: 0
source: {fileID: 0} source: {fileID: 0}
- name: Walk - name: Walk
clip: {fileID: 8300000, guid: a07dd9ac7a1874e4fbf70ec1e7c49ab8, type: 3} clip: {fileID: 8300000, guid: a07dd9ac7a1874e4fbf70ec1e7c49ab8, type: 3}
volume: 1 volume: 0.5
pitch: 0 pitch: 1
loop: 0 loop: 0
source: {fileID: 0} source: {fileID: 0}
--- !u!1 &7094923890942819438 --- !u!1 &7094923890942819438

View File

@@ -84,7 +84,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
objectType: 2 objectType: 2
instaKill: 0 instaKill: 1
damage: 10 damage: 10
damageRate: 5 damageRate: 5
fromPosition: {fileID: 0} fromPosition: {fileID: 0}

View File

@@ -145,8 +145,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 112281605} m_GameObject: {fileID: 112281605}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -69.795, y: -4.8345, z: 1.6991} m_LocalPosition: {x: -69.795, y: -4.8345, z: 0.63907}
m_LocalScale: {x: 0.69412047, y: 0.63533735, z: 0.5486328} m_LocalScale: {x: 0.69412047, y: 0.63533735, z: 0.1707768}
m_Children: m_Children:
- {fileID: 685621121} - {fileID: 685621121}
- {fileID: 857208205} - {fileID: 857208205}
@@ -174,7 +174,7 @@ Transform:
- {fileID: 867700759} - {fileID: 867700759}
- {fileID: 2002218120} - {fileID: 2002218120}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 7 m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &253416293 --- !u!1 &253416293
GameObject: GameObject:
@@ -373,10 +373,15 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: PushPullCube (2) value: PushPullCube (2)
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3}
propertyPath: m_TagString
value: Untagged
objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 6 value: 15
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
@@ -391,7 +396,7 @@ PrefabInstance:
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 1.9009972 value: 0.05
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
@@ -616,6 +621,75 @@ Transform:
m_Father: {fileID: 112281606} m_Father: {fileID: 112281606}
m_RootOrder: 18 m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &585895787
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 200189416050843931, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_Name
value: PowerDoubleJump (1)
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalPosition.x
value: -75.59934
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalPosition.y
value: -27.492456
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.3598237
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3}
--- !u!1 &663279192 --- !u!1 &663279192
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -895,6 +969,149 @@ Transform:
m_Father: {fileID: 112281606} m_Father: {fileID: 112281606}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &819019832
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8000970721633820985, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_Name
value: Ladder (1)
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalPosition.x
value: -83.8103
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalPosition.y
value: -21.431337
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.5834365
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3}
--- !u!1001 &850311259
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2644881069278570743, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_Name
value: PowerPushPull
objectReference: {fileID: 0}
- target: {fileID: 2644881069278570743, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_TagString
value: Untagged
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_RootOrder
value: 9
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalPosition.x
value: -13.55
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalPosition.y
value: -6.018054
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3}
--- !u!1 &857208201 --- !u!1 &857208201
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1093,10 +1310,15 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: PushPullCube (5) value: PushPullCube (5)
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3}
propertyPath: m_TagString
value: Untagged
objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5 value: 14
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
@@ -1111,7 +1333,7 @@ PrefabInstance:
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 1.046732 value: 0.32
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
@@ -1150,6 +1372,75 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3}
--- !u!1001 &1008281768
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 200189416050843931, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_Name
value: PowerDoubleJump (2)
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalPosition.x
value: -46.338627
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalPosition.y
value: -8.411123
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalPosition.z
value: 1.1553357
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3}
--- !u!1 &1078832389 --- !u!1 &1078832389
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1255,10 +1546,15 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: PushPullCube (1) value: PushPullCube (1)
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3}
propertyPath: m_TagString
value: Untagged
objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 4 value: 13
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
@@ -1273,7 +1569,7 @@ PrefabInstance:
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.74116135 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
@@ -1417,10 +1713,15 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: PushPullCube value: PushPullCube
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3}
propertyPath: m_TagString
value: Untagged
objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 3 value: 12
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
@@ -1435,7 +1736,7 @@ PrefabInstance:
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 1.0137215 value: 0.27256012
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
@@ -1567,6 +1868,75 @@ Transform:
m_Father: {fileID: 112281606} m_Father: {fileID: 112281606}
m_RootOrder: 10 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1216841212
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7,
type: 3}
propertyPath: m_LocalPosition.x
value: -34.16919
objectReference: {fileID: 0}
- target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7,
type: 3}
propertyPath: m_LocalPosition.y
value: -11.583609
objectReference: {fileID: 0}
- target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.5687213
objectReference: {fileID: 0}
- target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7411583397803452420, guid: d42abe5652faa4543b100c9bf55091a7,
type: 3}
propertyPath: m_Name
value: PowerLadder
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d42abe5652faa4543b100c9bf55091a7, type: 3}
--- !u!1 &1241385067 --- !u!1 &1241385067
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1939,6 +2309,75 @@ Transform:
m_Father: {fileID: 112281606} m_Father: {fileID: 112281606}
m_RootOrder: 15 m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!1001 &1471378936
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8000970721633820985, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_Name
value: Ladder
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalPosition.x
value: -36.755627
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalPosition.y
value: -11.583609
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.16555262
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3}
--- !u!1001 &1474162667 --- !u!1001 &1474162667
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1951,10 +2390,15 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: PushPullCube (4) value: PushPullCube (4)
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3}
propertyPath: m_TagString
value: Untagged
objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 11
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
@@ -1969,7 +2413,7 @@ PrefabInstance:
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.9662914 value: 0.23
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
@@ -2101,6 +2545,75 @@ Transform:
m_Father: {fileID: 112281606} m_Father: {fileID: 112281606}
m_RootOrder: 12 m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1525567677
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 200189416050843931, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_Name
value: PowerDoubleJump
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalPosition.x
value: -17.511194
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalPosition.y
value: -11.583609
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.6545358
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3}
--- !u!1 &1559790864 --- !u!1 &1559790864
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2287,6 +2800,75 @@ Transform:
m_Father: {fileID: 112281606} m_Father: {fileID: 112281606}
m_RootOrder: 21 m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!1001 &1658164177
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7094923891560833857, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_RootOrder
value: 8
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_LocalPosition.x
value: -17.23
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_LocalPosition.y
value: -5.36
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.09354401
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e4d82994b58b7304b91c915c597b71f8, type: 3}
--- !u!1 &1790429360 --- !u!1 &1790429360
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2380,6 +2962,75 @@ Transform:
m_Father: {fileID: 112281606} m_Father: {fileID: 112281606}
m_RootOrder: 22 m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!1001 &1797874874
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2644881069278570743, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_Name
value: PowerPushPull (1)
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalPosition.x
value: -46.172676
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalPosition.y
value: -23.553364
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.5489106
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3}
--- !u!1 &1844934632 --- !u!1 &1844934632
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2857,10 +3508,15 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: PushPullCube (3) value: PushPullCube (3)
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3}
propertyPath: m_TagString
value: Untagged
objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 10
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
@@ -2875,7 +3531,7 @@ PrefabInstance:
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.89463234 value: 0.17
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
type: 3} type: 3}

File diff suppressed because it is too large Load Diff

View File

@@ -550,6 +550,87 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 299738518} m_GameObject: {fileID: 299738518}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &313720473
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.60599995
objectReference: {fileID: 0}
- target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.13800025
objectReference: {fileID: 0}
- target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.6000004
objectReference: {fileID: 0}
- target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6250588316959267219, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
propertyPath: m_Name
value: Gui
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ba918907807ecda4982b8c9ca799aa42, type: 3}
--- !u!114 &313720474 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8686362966973903153, guid: ba918907807ecda4982b8c9ca799aa42,
type: 3}
m_PrefabInstance: {fileID: 313720473}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &332309331 --- !u!1001 &332309331
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1750,89 +1831,6 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1018104009} m_PrefabInstance: {fileID: 1018104009}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1025240044
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1025240047}
- component: {fileID: 1025240046}
- component: {fileID: 1025240045}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &1025240045
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1025240044}
m_Enabled: 1
--- !u!20 &1025240046
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1025240044}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &1025240047
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1025240044}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1114277846 --- !u!1 &1114277846
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1860,8 +1858,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1114277846} m_GameObject: {fileID: 1114277846}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4, y: 3.5, z: 0} m_LocalPosition: {x: -4, y: 3.73, z: 0}
m_LocalScale: {x: 2, y: 5, z: 2} m_LocalScale: {x: 2, y: 4.6, z: 2}
m_Children: [] m_Children: []
m_Father: {fileID: 1784024229} m_Father: {fileID: 1784024229}
m_RootOrder: 2 m_RootOrder: 2
@@ -1933,6 +1931,11 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 1923174388} m_TransformParent: {fileID: 1923174388}
m_Modifications: m_Modifications:
- target: {fileID: 2773067093461657725, guid: 712671f8cf5fa684cbcb1159d45b0057,
type: 3}
propertyPath: nextSceneName
value: Level3_Release
objectReference: {fileID: 0}
- target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
@@ -2028,8 +2031,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1275385513} m_GameObject: {fileID: 1275385513}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.48, y: 1.98, z: 0} m_LocalPosition: {x: 2.48, y: 2.07, z: 0}
m_LocalScale: {x: 2.8177178, y: 1.8602351, z: 2.0518} m_LocalScale: {x: 2.8177178, y: 1.5, z: 2.0518}
m_Children: [] m_Children: []
m_Father: {fileID: 1784024229} m_Father: {fileID: 1784024229}
m_RootOrder: 4 m_RootOrder: 4
@@ -3106,15 +3109,55 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 3972560853011912468, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: clips.Array.data[3].clip
value:
objectReference: {fileID: 8300000, guid: ebff1b1b6619bdf48a334db25b73db57, type: 3}
- target: {fileID: 6182518231170453917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_Radius
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6182518231170453917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: m_Center.y
value: -0.1
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833857, guid: e4d82994b58b7304b91c915c597b71f8, - target: {fileID: 7094923891560833857, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Player value: Player
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: speed
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: dashTime
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: runSpeed
value: 8
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: dashPower
value: 8
objectReference: {fileID: 0}
- target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3}
propertyPath: powerImage
value:
objectReference: {fileID: 313720474}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3} type: 3}
@@ -3579,7 +3622,7 @@ PrefabInstance:
- target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855,
type: 3} type: 3}
@@ -3665,8 +3708,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1883140474} m_GameObject: {fileID: 1883140474}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.55, y: -2, z: 0} m_LocalPosition: {x: 0.55, y: -1.74, z: 0}
m_LocalScale: {x: 11, y: 2, z: 2} m_LocalScale: {x: 11, y: 1.5, z: 2}
m_Children: [] m_Children: []
m_Father: {fileID: 1784024229} m_Father: {fileID: 1784024229}
m_RootOrder: 1 m_RootOrder: 1

View File

@@ -545,6 +545,142 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 393393098} m_GameObject: {fileID: 393393098}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &482342330
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 482342333}
- component: {fileID: 482342332}
- component: {fileID: 482342331}
m_Layer: 0
m_Name: AudioManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!82 &482342331
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 482342330}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: c29860436d5147346b6e77bc7a49c405, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 1
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!81 &482342332
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 482342330}
m_Enabled: 1
--- !u!4 &482342333
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 482342330}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 582, y: 293.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &760805001 --- !u!1 &760805001
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -22,13 +22,15 @@ public class AudioManager : MonoBehaviour
} }
// Update is called once per frame // Update is called once per frame
public void Play(string name) public void Play(string name, bool checkIfPlay = false)
{ {
AudioSound s = Array.Find(clips, sound => sound.name == name); AudioSound s = Array.Find(clips, sound => sound.name == name);
if (s == null) { if (s == null) {
return; return;
} }
Debug.Log("Sound is playng"); Debug.Log("Sound is playng");
s.source.Play(); if (!s.source.isPlaying || !checkIfPlay) {
s.source.Play();
}
} }
} }

View File

@@ -9,8 +9,8 @@ public class AudioSound
[Range(0f, 1f)] [Range(0f, 1f)]
public float volume; public float volume;
[Range(0f, 3f)] [Range(1f, 3f)]
public float pitch = 0f; public float pitch = 1f;
public bool loop = false; public bool loop = false;

View File

@@ -35,7 +35,7 @@ public class MainMenu : MonoBehaviour
public void Score() public void Score()
{ {
StartCoroutine(GetText("dev.steelants.cz/GGJ2021/GeorgeJones/Server/api.php")); StartCoroutine(GetText("https://dev.steelants.cz/GGJ2021/GeorgeJones/Server/api.php"));
} }
public void BackToMainMenu() public void BackToMainMenu()
@@ -60,7 +60,7 @@ public class MainMenu : MonoBehaviour
form.AddField("name", name.text); form.AddField("name", name.text);
form.AddField("score", DataManager.Score().ToString()); form.AddField("score", DataManager.Score().ToString());
StartCoroutine(PostText("dev.steelants.cz/vasek/GGJ2021/GeorgeJones/Server/api.php", form)); StartCoroutine(PostText("https://dev.steelants.cz/GGJ2021/GeorgeJones/Server/api.php", form));
DataManager.Level(0); DataManager.Level(0);
SceneManager.LoadScene(0); SceneManager.LoadScene(0);
} }

View File

@@ -170,7 +170,7 @@ public class ObjectManager : MonoBehaviour
playerManager = collision.gameObject.GetComponent<PlayerManager>(); playerManager = collision.gameObject.GetComponent<PlayerManager>();
if (playerManager.activeAbility.Count > 0 && playerManager.activeAbility[0] == 2) if (playerManager.activeAbility.Count > 0 && playerManager.activeAbility[0] == 2)
{ {
meshRenderer.materials[1].SetFloat("_Outline", 0.1f); meshRenderer.materials[1].SetFloat("_Outline", 0.01f);
} }
else else
{ {

View File

@@ -29,7 +29,7 @@ public class PlayerManager : MonoBehaviour
private GameObject pushPullObject; private GameObject pushPullObject;
private float pushPullObjectDistance; private float pushPullObjectDistance;
public float dashPower = 40f; public float dashPower = 40f;
public float dashTime = 0.3f; public float dashTime = 0.4f;
private float actualDashTime; private float actualDashTime;
private int dashButton; private int dashButton;
private bool dash = false; private bool dash = false;
@@ -67,13 +67,13 @@ public class PlayerManager : MonoBehaviour
if (Input.GetKeyDown(KeyCode.Escape)) if (Input.GetKeyDown(KeyCode.Escape))
{ {
DataManager.Level(SceneManager.GetActiveScene().buildIndex); DataManager.Level(SceneManager.GetActiveScene().buildIndex);
SceneManager.LoadScene(6); SceneManager.LoadScene(5);
} }
if (actualHealth <= 0 || gameObject.transform.position.y < -400.0f) if (actualHealth <= 0 || gameObject.transform.position.y < -400.0f)
{ {
cannotMove = true; cannotMove = true;
playerAnimator.Play("Die"); playerAnimator.Play("Die");
FindObjectOfType<AudioManager>().Play("lose"); FindObjectOfType<AudioManager>().Play("Lose");
} }
if (interact) if (interact)
{ {
@@ -116,10 +116,9 @@ public class PlayerManager : MonoBehaviour
private void FixedUpdate() private void FixedUpdate()
{ {
if (!cannotMove && !onLadder) if (!cannotMove && (!onLadder || (onLadder && (activeAbility.Count < 0 || activeAbility[0] != 4))))
{ {
Jump(); Jump();
FindObjectOfType<AudioManager>().Play("Jump");
} }
} }
@@ -278,31 +277,40 @@ public class PlayerManager : MonoBehaviour
void Move() void Move()
{ {
if (onGround || (onLadder && activeAbility.Count > 0 && activeAbility[0] == 4)) { if (Input.GetAxis("Horizontal") != 0)
rigidBody.MovePosition( {
transform.position + if (!run) {
(onLadder && activeAbility.Count > 0 && activeAbility[0] == 4 ? (transform.up * speed * Input.GetAxis("Vertical") * Time.deltaTime) : Vector3.zero) + FindObjectOfType<AudioManager>().Play("Walk", true);
(transform.right * (run ? runSpeed : speed) * Input.GetAxis("Horizontal") * Time.deltaTime) }
);; else
{
FindObjectOfType<AudioManager>().Play("Run", true);
}
} }
rigidBody.MovePosition(
transform.position +
(onLadder && activeAbility.Count > 0 && activeAbility[0] == 4 ? (transform.up * speed * Input.GetAxis("Vertical") * Time.deltaTime) : Vector3.zero) +
(transform.right * (run ? runSpeed : speed) * Input.GetAxis("Horizontal") * Time.deltaTime)
);
} }
void Jump() void Jump()
{ {
if (Input.GetAxisRaw("Jump") > 0) if (Input.GetAxisRaw("Jump") > 0)
{ {
if (rigidBody.velocity.y <= 1 && (onGround || (dubleJump && activeAbility.Count > 0 && activeAbility[0] == 1))) if (rigidBody.velocity.y <= 1 && (onGround || (dubleJump && activeAbility.Count > 0 && activeAbility[0] == 1)) )
{ {
if (!onGround) if (!onGround)
{ {
dubleJump = false; dubleJump = false;
} }
FindObjectOfType<AudioManager>().Play("Jump");
pushPullObject = null; pushPullObject = null;
rigidBody.AddForce( rigidBody.AddForce(
(transform.right * (run ? runSpeed : speed) * 5 * Input.GetAxis("Horizontal") * Time.deltaTime) +
(transform.up * jump * 10 * Time.deltaTime), (transform.up * jump * 10 * Time.deltaTime),
ForceMode.VelocityChange ForceMode.VelocityChange
); );
FindObjectOfType<AudioManager>().Play("Jump");
} }
} }
} }
@@ -319,6 +327,7 @@ public class PlayerManager : MonoBehaviour
{ {
if ((powerType.GetHashCode() - 1) == 3) if ((powerType.GetHashCode() - 1) == 3)
{ {
DataManager.Score(DataManager.Score() + 10);
DataManager.Level(SceneManager.GetSceneByName(nextSceneName).buildIndex); DataManager.Level(SceneManager.GetSceneByName(nextSceneName).buildIndex);
SceneManager.LoadScene(nextSceneName); SceneManager.LoadScene(nextSceneName);
} }
@@ -367,7 +376,7 @@ public class PlayerManager : MonoBehaviour
speed += power; speed += power;
runSpeed += power; runSpeed += power;
FindObjectOfType<AudioManager>().Play("Jump");
} }
else if (powerType == PowerCubeManager.PowerType.Jumper) else if (powerType == PowerCubeManager.PowerType.Jumper)
{ {
@@ -420,25 +429,9 @@ public class PlayerManager : MonoBehaviour
{ {
if (other.tag == "Ground" || other.tag == "Objects") if (other.tag == "Ground" || other.tag == "Objects")
{ {
if (!onLadder) {
rigidBody.AddForce(
(transform.right * (run ? runSpeed : speed) * 5 * Input.GetAxis("Horizontal") * Time.deltaTime) +
(transform.up * 10 * Time.deltaTime),
ForceMode.VelocityChange
);
}
onGround = false; onGround = false;
dash = false; dash = false;
} }
if (other.gameObject.GetComponent<ObjectManager>() != null)
{
if (other.gameObject.GetComponent<ObjectManager>().objectType == ObjectManager.ObjectType.Ladder) {
rigidBody.AddForce(
(transform.right * (run ? runSpeed : speed) * 2.5f * Input.GetAxis("Horizontal") * Time.deltaTime),
ForceMode.VelocityChange
);
}
}
if (other.gameObject.GetComponent<PowerCubeManager>() != null) if (other.gameObject.GetComponent<PowerCubeManager>() != null)
{ {
interact = false; interact = false;

View File

@@ -48,11 +48,11 @@ public class PowerCubeManager : MonoBehaviour
{ {
meshRenderer.materials[0].EnableKeyword("_EMISSION"); meshRenderer.materials[0].EnableKeyword("_EMISSION");
meshRenderer.materials[0].SetColor("_EmissionColor", new Color(0.2735849f, 0.2018939f, 0.09162514f) * 0.8f); meshRenderer.materials[0].SetColor("_EmissionColor", new Color(0.2735849f, 0.2018939f, 0.09162514f) * 0.8f);
meshRenderer.materials[1].SetFloat("_Outline", 0.4f); meshRenderer.materials[1].SetFloat("_Outline", 0.04f);
} }
else if (powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash || powerType == PowerType.Ladder) else if (powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash || powerType == PowerType.Ladder)
{ {
meshRenderer.materials[1].SetFloat("_Outline", 6f); meshRenderer.materials[1].SetFloat("_Outline",0.6f);
meshRenderer.materials[0].EnableKeyword("_EMISSION"); meshRenderer.materials[0].EnableKeyword("_EMISSION");
meshRenderer.materials[0].SetColor("_EmissionColor", new Color(0.2735849f, 0.2018939f, 0.09162514f) * 0.8f); meshRenderer.materials[0].SetColor("_EmissionColor", new Color(0.2735849f, 0.2018939f, 0.09162514f) * 0.8f);
} }

View File

@@ -58,7 +58,7 @@ Shader "Outlined/Silhouette Only" {
Name "OUTLINE" Name "OUTLINE"
Tags { "LightMode" = "Always" } Tags { "LightMode" = "Always" }
Cull Off Cull Off
Offset 5,5 Offset 15,15
// you can choose what kind of blending mode you want for the outline // you can choose what kind of blending mode you want for the outline

View File

@@ -11,6 +11,12 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/Levels/Level1_Release.unity path: Assets/Scenes/Levels/Level1_Release.unity
guid: 326dea585e0ea574389529eaae8a0ab4 guid: 326dea585e0ea574389529eaae8a0ab4
- enabled: 1
path: Assets/Scenes/Levels/Level2_Release.unity
guid: 5bd5cae5450d4864e9aa9a1fcc849adb
- enabled: 1
path: Assets/Scenes/Levels/Level3_Release.unity
guid: 3ff2402a6d1a5b1459781b37d0f8e1c7
- enabled: 1 - enabled: 1
path: Assets/Scenes/Menu/FinalMenu.unity path: Assets/Scenes/Menu/FinalMenu.unity
guid: e728960f94bcba84089c530dec85aa8d guid: e728960f94bcba84089c530dec85aa8d