htamas1210/PuzzleColorBall
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

playgomb bugfix

Browse Source
This commit is contained in:
bance
2023-05-13 16:51:40 +02:00
parent 5415bd0a1a
commit 1572f7db6d
4 changed files with 31 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored Normal file
View File

Binary file not shown.

42
Assets/Scenes/Menu.unity
View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.5615895, g: 0.72180885, b: 0.81785697, a: 1}
m_IndirectSpecularColor: {r: 0.5616698, g: 0.7218906, b: 0.81798315, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -1397,7 +1397,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 601898925}
m_LocalRotation: {x: 0.045581307, y: -0.70516795, z: 0.045520626, w: 0.7061079}
m_LocalRotation: {x: 0.045581304, y: -0.70516795, z: 0.045520633, w: 0.7061079}
m_LocalPosition: {x: 2.27, y: 4.16525, z: 3.82}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -1675,18 +1675,6 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: playbutton, Assembly-CSharp
m_MethodName: PlayButton
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 871711472}
m_TargetAssemblyTypeName: menumanager, Assembly-CSharp
m_MethodName: UpdateCamera
@@ -1712,18 +1700,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 645543792}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &645543795
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2778,7 +2754,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 936985375}
m_LocalRotation: {x: 0.10193449, y: 0.69441885, z: -0.100375146, w: 0.7052068}
m_LocalRotation: {x: 0.10193449, y: 0.69441885, z: -0.10037514, w: 0.7052068}
m_LocalPosition: {x: 4.61, y: 3.52, z: -1.96}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -3379,7 +3355,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
State: 0
playButton: {fileID: 645543792}
playGomb: {fileID: 645543792}
garazs: {fileID: 1876191122}
homeGomb: {fileID: 1543880549}
settingsGomb: {fileID: 644899047}
@@ -3725,7 +3701,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1513686735}
m_LocalRotation: {x: 0.22590086, y: 0.0030496388, z: -0.00070720055, w: 0.9741453}
m_LocalRotation: {x: 0.22590087, y: 0.0030496197, z: -0.000707196, w: 0.9741453}
m_LocalPosition: {x: -0.28647116, y: 6.2664723, z: 2.6748314}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -4118,7 +4094,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1615993234}
m_LocalRotation: {x: 0.0010953943, y: 0.9979507, z: -0.06145683, w: 0.017787272}
m_LocalRotation: {x: 0.0010953955, y: 0.9979507, z: -0.061456837, w: 0.017787289}
m_LocalPosition: {x: -0.435591, y: 4.16525, z: 13.428191}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -4804,7 +4780,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1895677325}
m_LocalRotation: {x: 0.0010953943, y: 0.9979507, z: -0.06145683, w: 0.017787272}
m_LocalRotation: {x: 0.0010953955, y: 0.9979507, z: -0.061456837, w: 0.017787289}
m_LocalPosition: {x: -0.15911984, y: 2.9687777, z: -12.856641}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -14676,7 +14652,7 @@ Rigidbody:
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0
m_UseGravity: 0
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
@@ -14690,7 +14666,7 @@ CapsuleCollider:
m_GameObject: {fileID: 7398140401948337837}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
m_Enabled: 1
m_Radius: 1.7212968
m_Height: 6.3698125
m_Direction: 1

2
Assets/Scripts/Network/DatabaseData.cs
View File

@@ -47,7 +47,7 @@ public class DatabaseData : MonoBehaviour
url = "nodejs.dszcbaross.edu.hu:" + PORT.ToString();
}*/
url = "nodejs.dszcbaross.edu.hu:" + PORT.ToString();
//url = "nodejs.dszcbaross.edu.hu:" + PORT.ToString();
Debug.Log("<color=pink>url: </color>" + url);
}

30
Assets/Scripts/jatekmanager.cs
View File

@@ -16,7 +16,7 @@ public class jatekmanager : MonoBehaviour
public static event Action<GameState> OnGameStateChanged;
//gameobjectek,gombok,scriptek
public GameObject playButton;
public GameObject playGomb;
public GameObject garazs;
public GameObject homeGomb;
public GameObject settingsGomb;
@@ -96,6 +96,7 @@ public class jatekmanager : MonoBehaviour
homeGomb.SetActive(true);
settingsGomb.SetActive(true);
shopGomb.SetActive(true);
goLeftButton.SetActive(false);
jumpButton.SetActive(false);
goRightButton.SetActive(false);
@@ -107,6 +108,7 @@ public class jatekmanager : MonoBehaviour
{
//deactivate buttons
StartCoroutine(TimerHome());
playGomb.SetActive(true);
GetComponent<GroundController>().enabled = false;
GetComponent<PlayerController>().enabled = false;
goLeftButton.SetActive(false);
@@ -120,32 +122,36 @@ public class jatekmanager : MonoBehaviour
IEnumerator TimerHome()
{
yield return new WaitForSecondsRealtime(2);
playButton.SetActive(true);
}
public void ChangeToSettings()
{
UpdateGameState(GameState.Settings);
playGomb.SetActive(false);
}
private async void HandleSettings()
{
playButton.SetActive(false);
playGomb.SetActive(false);
goLeftButton.SetActive(false);
jumpButton.SetActive(false);
goRightButton.SetActive(false);
scoreText.gameObject.SetActive(false);
timerText.gameObject.SetActive(false);
playGomb.SetActive(false);
}
public void ChangeToShop()
{
UpdateGameState(GameState.Shop);
}
private async void HandleShop()
{
playButton.SetActive(false);
playGomb.SetActive(false);
goLeftButton.SetActive(false);
jumpButton.SetActive(false);
goRightButton.SetActive(false);
@@ -158,31 +164,37 @@ public class jatekmanager : MonoBehaviour
homeGomb.SetActive(false);
settingsGomb.SetActive(false);
shopGomb.SetActive(false);
playButton.SetActive(false);
playGomb.SetActive(false);
UpdateGameState(GameState.Game);
}
IEnumerator TimerGame()
{
yield return new WaitForSecondsRealtime(1);
garazs.SetActive(false);
}
private async void HandleGame()
{
StartCoroutine(TimerGame());
GetComponent <GroundController> ().enabled = true;
GetComponent <PlayerController>().enabled = true;
goLeftButton.SetActive(true);
jumpButton.SetActive(true);
goRightButton.SetActive(true);
scoreText.gameObject.SetActive(true);
timerText.gameObject.SetActive(true);
playButton.SetActive(false);
timerText.gameObject.SetActive(true);;
timer.playTime.Start();
}
public void ChangeToMeghaltal()
@@ -205,7 +217,7 @@ public class jatekmanager : MonoBehaviour
SceneUIManager.LoadScene(1); //HighScore scene
/*playButton.SetActive(false);
/*
homeGomb.SetActive(true);
GetComponent<GroundController>().enabled = false;
GetComponent<PlayerController>().enabled = false;