level selection, ball movement
This commit is contained in:
parent
33b5792be3
commit
e72accd535
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
|
|
@ -56,5 +56,5 @@
|
|||
"temp/": true,
|
||||
"Temp/": true
|
||||
},
|
||||
"dotnet.defaultSolution": "GOING BALLS.sln"
|
||||
"dotnet.defaultSolution": "going_balls.sln"
|
||||
}
|
||||
8210
Assets/Scenes/Level5.unity
Normal file
8210
Assets/Scenes/Level5.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Scenes/Level5.unity.meta
Normal file
7
Assets/Scenes/Level5.unity.meta
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 59f685aa4aec88646971c59be8c16a9c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8210
Assets/Scenes/Level6.unity
Normal file
8210
Assets/Scenes/Level6.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Scenes/Level6.unity.meta
Normal file
7
Assets/Scenes/Level6.unity.meta
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9f2d6171ea4bf0c4da9493dc0950220b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
2771
Assets/Scenes/MainMenu.unity
Normal file
2771
Assets/Scenes/MainMenu.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Scenes/MainMenu.unity.meta
Normal file
7
Assets/Scenes/MainMenu.unity.meta
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ec06ce692b2561444a6b7bfaf04cc3e3
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -42,8 +42,7 @@ RenderSettings:
|
|||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 13
|
||||
m_BakeOnSceneLoad: 0
|
||||
serializedVersion: 12
|
||||
m_GISettings:
|
||||
serializedVersion: 2
|
||||
m_BounceScale: 1
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ using UnityEngine;
|
|||
|
||||
public class BallController : MonoBehaviour
|
||||
{
|
||||
float maxSpeed = 10f;
|
||||
public Rigidbody Rb;
|
||||
public float Speed;
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
|
|
@ -15,7 +16,8 @@ public class BallController : MonoBehaviour
|
|||
{
|
||||
float x = Input.GetAxis("Horizontal");
|
||||
float y = Input.GetAxis("Vertical");
|
||||
Rb.AddTorque(Vector3.right * x * Speed);
|
||||
Rb.AddTorque(Vector3.forward * y * Speed);
|
||||
Rb.AddTorque(Vector3.right * x * Speed, ForceMode.Acceleration);
|
||||
Rb.AddTorque(Vector3.forward * y * Speed,ForceMode.Acceleration);
|
||||
Rb.angularVelocity = Vector3.ClampMagnitude(Rb.angularVelocity, maxSpeed);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ public class CoinScript : MonoBehaviour
|
|||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
transform.Rotate(RotatingSpeed);
|
||||
transform.Rotate(RotatingSpeed * Time.deltaTime * 5f);
|
||||
}
|
||||
void OnTriggerEnter(Collider other)
|
||||
{
|
||||
|
|
|
|||
13
Assets/Scripts/MainMenuManager.cs
Normal file
13
Assets/Scripts/MainMenuManager.cs
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
public class MainMenuManager : MonoBehaviour
|
||||
{
|
||||
public void LoadLevel(int id){
|
||||
SceneManager.LoadScene(id);
|
||||
}
|
||||
|
||||
public void Exit(){
|
||||
Application.Quit();
|
||||
}
|
||||
}
|
||||
2
Assets/Scripts/MainMenuManager.cs.meta
Normal file
2
Assets/Scripts/MainMenuManager.cs.meta
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 70b8cc5f0e4e94c448b57f1c8edb3f7a
|
||||
|
|
@ -153,6 +153,7 @@ MonoBehaviour:
|
|||
m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3}
|
||||
m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3}
|
||||
m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
|
||||
m_DefaultCustomMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
|
||||
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
|
||||
|
|
@ -164,7 +165,6 @@ MonoBehaviour:
|
|||
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
|
||||
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
|
||||
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
|
||||
m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
|
||||
- rid: 6852985685364965384
|
||||
type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||
data:
|
||||
|
|
@ -201,12 +201,12 @@ MonoBehaviour:
|
|||
dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, type: 3}
|
||||
subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, type: 3}
|
||||
voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3}
|
||||
traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3}
|
||||
traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3}
|
||||
skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
|
||||
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
|
||||
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
|
||||
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
|
||||
traceVirtualOffsetCS: {fileID: 7200000, guid: 805f10d263aac4b4098c0279cd37a4f3, type: 3}
|
||||
traceVirtualOffsetRT: {fileID: 4807578003741378534, guid: b60511f4aa1443f4d8c0b18f4fec92f4, type: 3}
|
||||
skyOcclusionCS: {fileID: 7200000, guid: 798f52ec82fa04048a12826bbbbcf7b4, type: 3}
|
||||
skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3}
|
||||
renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3}
|
||||
renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3}
|
||||
- rid: 6852985685364965389
|
||||
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
|
||||
data:
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
"com.unity.ide.rider": "3.0.31",
|
||||
"com.unity.ide.visualstudio": "2.0.22",
|
||||
"com.unity.inputsystem": "1.11.2",
|
||||
"com.unity.multiplayer.center": "1.0.0",
|
||||
"com.unity.render-pipelines.universal": "17.0.3",
|
||||
"com.unity.test-framework": "1.4.5",
|
||||
"com.unity.timeline": "1.8.7",
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.burst": {
|
||||
"version": "1.8.18",
|
||||
"version": "1.8.16",
|
||||
"depth": 2,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
|
@ -27,12 +27,12 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.collections": {
|
||||
"version": "2.5.1",
|
||||
"version": "2.4.1",
|
||||
"depth": 2,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.burst": "1.8.17",
|
||||
"com.unity.test-framework": "1.4.5",
|
||||
"com.unity.burst": "1.8.13",
|
||||
"com.unity.test-framework": "1.4.3",
|
||||
"com.unity.nuget.mono-cecil": "1.11.4",
|
||||
"com.unity.test-framework.performance": "3.0.3"
|
||||
},
|
||||
|
|
@ -79,14 +79,6 @@
|
|||
"dependencies": {},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.multiplayer.center": {
|
||||
"version": "1.0.0",
|
||||
"depth": 0,
|
||||
"source": "builtin",
|
||||
"dependencies": {
|
||||
"com.unity.modules.uielements": "1.0.0"
|
||||
}
|
||||
},
|
||||
"com.unity.nuget.mono-cecil": {
|
||||
"version": "1.11.4",
|
||||
"depth": 3,
|
||||
|
|
@ -102,7 +94,7 @@
|
|||
"com.unity.burst": "1.8.14",
|
||||
"com.unity.mathematics": "1.3.2",
|
||||
"com.unity.ugui": "2.0.0",
|
||||
"com.unity.collections": "2.4.3",
|
||||
"com.unity.collections": "2.4.1",
|
||||
"com.unity.modules.physics": "1.0.0",
|
||||
"com.unity.modules.terrain": "1.0.0",
|
||||
"com.unity.modules.jsonserialize": "1.0.0",
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@ EditorBuildSettings:
|
|||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Scenes:
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/MainMenu.unity
|
||||
guid: ec06ce692b2561444a6b7bfaf04cc3e3
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/level1.unity
|
||||
guid: 99c9720ab356a0642a771bea13969a05
|
||||
|
|
@ -17,6 +20,9 @@ EditorBuildSettings:
|
|||
- enabled: 1
|
||||
path: Assets/Scenes/Level4.unity
|
||||
guid: af689e38a56ad6544880e7602f2b961a
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/Level5.unity
|
||||
guid: 59f685aa4aec88646971c59be8c16a9c
|
||||
m_configObjects:
|
||||
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
|
||||
m_UseUCBPForAssetBundles: 0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
m_EditorVersion: 6000.0.32f1
|
||||
m_EditorVersionWithRevision: 6000.0.32f1 (b2e806cf271c)
|
||||
m_EditorVersion: 6000.0.12f1
|
||||
m_EditorVersionWithRevision: 6000.0.12f1 (7defd84cdab8)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user