Compare commits

..

18 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
11 changed files with 3366 additions and 832 deletions

View File

@@ -138,7 +138,7 @@ MonoBehaviour:
clips: clips:
- name: MainTheme - name: MainTheme
clip: {fileID: 8300000, guid: 23f58ffff5e98424b82e0a34bfeb8a77, type: 3} clip: {fileID: 8300000, guid: 23f58ffff5e98424b82e0a34bfeb8a77, type: 3}
volume: 0.5 volume: 0.25
pitch: 1 pitch: 1
loop: 1 loop: 1
source: {fileID: 0} source: {fileID: 0}

File diff suppressed because it is too large Load Diff

View File

@@ -1934,7 +1934,7 @@ PrefabInstance:
- target: {fileID: 2773067093461657725, guid: 712671f8cf5fa684cbcb1159d45b0057, - target: {fileID: 2773067093461657725, guid: 712671f8cf5fa684cbcb1159d45b0057,
type: 3} type: 3}
propertyPath: nextSceneName propertyPath: nextSceneName
value: FinalMenu value: Level3_Release
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057,
type: 3} type: 3}
@@ -3109,11 +3109,46 @@ 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, - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8,
type: 3} type: 3}
propertyPath: powerImage propertyPath: powerImage

File diff suppressed because it is too large Load Diff

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");
if (!s.source.isPlaying || !checkIfPlay) {
s.source.Play(); s.source.Play();
} }
} }
}

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

@@ -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)
{ {
@@ -119,7 +119,6 @@ public class PlayerManager : MonoBehaviour
if (!cannotMove && (!onLadder || (onLadder && (activeAbility.Count < 0 || activeAbility[0] != 4)))) if (!cannotMove && (!onLadder || (onLadder && (activeAbility.Count < 0 || activeAbility[0] != 4))))
{ {
Jump(); Jump();
FindObjectOfType<AudioManager>().Play("Jump");
} }
} }
@@ -278,11 +277,21 @@ public class PlayerManager : MonoBehaviour
void Move() void Move()
{ {
if (Input.GetAxis("Horizontal") != 0)
{
if (!run) {
FindObjectOfType<AudioManager>().Play("Walk", true);
}
else
{
FindObjectOfType<AudioManager>().Play("Run", true);
}
}
rigidBody.MovePosition( rigidBody.MovePosition(
transform.position + transform.position +
(onLadder && activeAbility.Count > 0 && activeAbility[0] == 4 ? (transform.up * speed * Input.GetAxis("Vertical") * Time.deltaTime) : Vector3.zero) + (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) (transform.right * (run ? runSpeed : speed) * Input.GetAxis("Horizontal") * Time.deltaTime)
);; );
} }
void Jump() void Jump()
@@ -295,11 +304,13 @@ public class PlayerManager : MonoBehaviour
{ {
dubleJump = false; dubleJump = false;
} }
FindObjectOfType<AudioManager>().Play("Jump");
pushPullObject = null; pushPullObject = null;
rigidBody.AddForce( rigidBody.AddForce(
(transform.up * jump * 10 * Time.deltaTime), (transform.up * jump * 10 * Time.deltaTime),
ForceMode.VelocityChange ForceMode.VelocityChange
); );
FindObjectOfType<AudioManager>().Play("Jump");
} }
} }
} }
@@ -316,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);
} }
@@ -364,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)
{ {

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