Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Assets/PlayerMovementAnimatorController.controller
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ AnimatorStateTransition:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: MoveY
m_EventTreshold: -0.95
m_EventTreshold: -0.2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6214595074649590134}
m_Solo: 0
Expand Down Expand Up @@ -117,7 +117,7 @@ AnimatorStateTransition:
m_Conditions:
- m_ConditionMode: 4
m_ConditionEvent: MoveY
m_EventTreshold: 0.95
m_EventTreshold: 0.2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6214595074649590134}
m_Solo: 0
Expand Down Expand Up @@ -288,7 +288,7 @@ AnimatorStateTransition:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: MoveX
m_EventTreshold: -0.95
m_EventTreshold: -0.7
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6214595074649590134}
m_Solo: 0
Expand All @@ -313,7 +313,7 @@ AnimatorStateTransition:
m_Conditions:
- m_ConditionMode: 4
m_ConditionEvent: MoveX
m_EventTreshold: 0.95
m_EventTreshold: 0.7
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6214595074649590134}
m_Solo: 0
Expand Down
13 changes: 0 additions & 13 deletions Assets/Prefabs/Player.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ GameObject:
- component: {fileID: 1803017460098482366}
- component: {fileID: 2136192976700920181}
- component: {fileID: 2952415180134692435}
- component: {fileID: 7904266034163262073}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
Expand Down Expand Up @@ -213,15 +212,3 @@ PolygonCollider2D:
- {x: 0.057479188, y: -0.12709153}
- {x: 0.046700563, y: -0.12571843}
m_UseDelaunayMesh: 0
--- !u!114 &7904266034163262073
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1463738777561398421}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d1d8695cfa6948278518a6a55e0b730, type: 3}
m_Name:
m_EditorClassIdentifier:
47 changes: 47 additions & 0 deletions Assets/Prefabs/RoomSystem/WaitingRoom.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6577988205983815687
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4087357368593639579}
- component: {fileID: 8065234719190424100}
m_Layer: 0
m_Name: WaitingRoom
m_TagString: Temporary
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4087357368593639579
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6577988205983815687}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 11.687407, y: 6.3912716, z: -0.07103652}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8065234719190424100
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6577988205983815687}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 804016391dce0430d92408fa75348918, type: 3}
m_Name:
m_EditorClassIdentifier:
messageFont: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
7 changes: 7 additions & 0 deletions Assets/Prefabs/RoomSystem/WaitingRoom.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 46 additions & 1 deletion Assets/Scenes/UI/Menu.unity
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,50 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1245127443
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1245127445}
- component: {fileID: 1245127444}
m_Layer: 0
m_Name: Socket
m_TagString: Temporary
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1245127444
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1245127443}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d1d8695cfa6948278518a6a55e0b730, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1245127445
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1245127443}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 893.28735, y: -14.503334, z: -12.123516}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1332151914
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1070,7 +1114,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Option
m_Text: Options
--- !u!222 &1333215637
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1326,3 +1370,4 @@ SceneRoots:
- {fileID: 1059973423}
- {fileID: 2021776756}
- {fileID: 1211020662}
- {fileID: 1245127445}
2 changes: 1 addition & 1 deletion Assets/Scripts/Map Control/PropsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ private async Task EmitPropsToServer(List<string> propsPositionsString)
try
{
Debug.Log("Emitting props to server...");
await clientSocket.EmitAsync("rooms:create", propsPositionsString);
await clientSocket.EmitAsync("props:send", propsPositionsString);
PropsSent = true;
Debug.Log("Props successfully sent to server.");
}
Expand Down
1 change: 0 additions & 1 deletion Assets/Scripts/Player/PlayerController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ async void SendData(string channel, string data)
try
{
await clientSocket.EmitAsync(channel, data);
Debug.Log("Data sent: " + $"{channel}|{data}");
}
catch (Exception e)
{
Expand Down
19 changes: 14 additions & 5 deletions Assets/Scripts/UI/MainMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,24 @@ public class MainMenu : MonoBehaviour
{
public string selectedScene;

public void QuitGame(){
private SocketIOUnity clientSocket;

Application.Quit();

void Start()
{
clientSocket = SocketManager.Instance.ClientSocket;
}

public void StartRoom(){
public void QuitGame()
{

Application.Quit();
}


SceneManager.LoadScene(selectedScene);
public async void StartRoom()
{
await clientSocket.EmitAsync("rooms:create");

SceneManager.LoadScene(selectedScene);
}
}
12 changes: 7 additions & 5 deletions Assets/Scripts/UI/PauseMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ public class PauseMenu : MonoBehaviour
public static bool gameIsPaused = false;
public GameObject pauseMenuUI;

void Update(){
void Update()
{

if (Input.GetKeyDown(KeyCode.Escape))
{
Expand All @@ -25,7 +26,8 @@ void Paused()
gameIsPaused = true;
}

public void Resume(){
public void Resume()
{
pauseMenuUI.SetActive(false);
Time.timeScale = 1;
gameIsPaused = false;
Expand All @@ -34,10 +36,10 @@ public void Resume(){
public void LoadMainMenu()
{
Resume();
GameObject player = GameObject.FindWithTag("Player");
if (player != null) Destroy(player.gameObject);
GameObject socket = GameObject.FindWithTag("Temporary");
if (socket != null) Destroy(socket.gameObject);
SceneManager.LoadScene("Menu");

}

}
Loading