Solved merge conflics

This commit is contained in:
BOT Alex 2024-02-04 23:18:40 +01:00
parent f9498f9d2a
commit 4505d4e73d
3 changed files with 25 additions and 1 deletions

View File

@ -4148,6 +4148,10 @@ PrefabInstance:
propertyPath: player2
value:
objectReference: {fileID: 1579580564}
- target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
propertyPath: upgradeCost
value: 15000
objectReference: {fileID: 0}
- target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
propertyPath: bloodManager
value:
@ -4236,6 +4240,10 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6303512888481769756, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
propertyPath: m_SizeDelta.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 6486619975880161691, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
propertyPath: m_IsActive
value: 0

View File

@ -52,6 +52,21 @@ public class PauseMenu : MonoBehaviour
MainMenu();
}
}
if (!isPaused)
break;
if (controller.crossButton.IsPressed())
{
ResumeGame();
}
if (controller.circleButton.IsPressed())
{
QuitGame();
}
if (controller.squareButton.IsPressed())
{
MainMenu();
}
}
// Check if the Escape key is pressed
@ -96,7 +111,7 @@ public class PauseMenu : MonoBehaviour
public void MainMenu()
{
SceneManager.LoadScene("MainMenu");
SceneManager.LoadScene(0);
}
public void QuitGame()
{

View File

@ -165,6 +165,7 @@ public class Upgrader : MonoBehaviour
// Subtract blood
bloodManager.score -= upgradeCost;
upgradeCost = (int)(upgradeCost * 1.2f);
acceptTime = 0f;
}
else