diff --git a/U3D_DrivingSystem/Assembly-CSharp.csproj b/U3D_DrivingSystem/Assembly-CSharp.csproj index 523425d2..e990ef71 100644 --- a/U3D_DrivingSystem/Assembly-CSharp.csproj +++ b/U3D_DrivingSystem/Assembly-CSharp.csproj @@ -345,6 +345,7 @@ + diff --git a/U3D_DrivingSystem/Assets/demo.unity b/U3D_DrivingSystem/Assets/Scenes/demo.unity similarity index 100% rename from U3D_DrivingSystem/Assets/demo.unity rename to U3D_DrivingSystem/Assets/Scenes/demo.unity diff --git a/U3D_DrivingSystem/Assets/demo.unity.meta b/U3D_DrivingSystem/Assets/Scenes/demo.unity.meta similarity index 100% rename from U3D_DrivingSystem/Assets/demo.unity.meta rename to U3D_DrivingSystem/Assets/Scenes/demo.unity.meta diff --git a/U3D_DrivingSystem/Assets/Scenes/menu.unity b/U3D_DrivingSystem/Assets/Scenes/menu.unity index ad1c4901..3fe1d05c 100644 --- a/U3D_DrivingSystem/Assets/Scenes/menu.unity +++ b/U3D_DrivingSystem/Assets/Scenes/menu.unity @@ -320,8 +320,6 @@ MonoBehaviour: uiGames: - {fileID: 12367053} - {fileID: 1157041859} - - {fileID: 908669556} - btList: [] --- !u!114 &66285359 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1239,7 +1237,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -689, y: -37} + m_AnchoredPosition: {x: -573, y: -37} m_SizeDelta: {x: 377, y: 477} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &605431507 @@ -2070,7 +2068,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 683, y: -37} + m_AnchoredPosition: {x: 575, y: -37} m_SizeDelta: {x: 377, y: 477} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1023194304 @@ -2930,7 +2928,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -229, y: -37} + m_AnchoredPosition: {x: 7, y: -37} m_SizeDelta: {x: 377, y: 477} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1322390413 @@ -3257,7 +3255,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1411594615 RectTransform: m_ObjectHideFlags: 0 diff --git a/U3D_DrivingSystem/Assets/Script/Manaegr/MenuManager.cs b/U3D_DrivingSystem/Assets/Script/Manaegr/MenuManager.cs index 08306404..954b6e90 100644 --- a/U3D_DrivingSystem/Assets/Script/Manaegr/MenuManager.cs +++ b/U3D_DrivingSystem/Assets/Script/Manaegr/MenuManager.cs @@ -47,7 +47,7 @@ public class MenuManager : MonoBehaviour NextStep(); - if ( GameInfo.instance.carSelectTypeInfo.Count() == 3) + if ( GameInfo.instance.carSelectTypeInfo.Count() == 2) { SceneManager.LoadScene("demo"); } diff --git a/U3D_DrivingSystem/Assets/Script/WeatherManager.cs b/U3D_DrivingSystem/Assets/Script/WeatherManager.cs new file mode 100644 index 00000000..5e45f060 --- /dev/null +++ b/U3D_DrivingSystem/Assets/Script/WeatherManager.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WeatherManager : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/U3D_DrivingSystem/Assets/Script/WeatherManager.cs.meta b/U3D_DrivingSystem/Assets/Script/WeatherManager.cs.meta new file mode 100644 index 00000000..5cb09209 --- /dev/null +++ b/U3D_DrivingSystem/Assets/Script/WeatherManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 63ed0d7db1b90c747af0a650cd5d2ffa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/U3D_DrivingSystem/ProjectSettings/EditorBuildSettings.asset b/U3D_DrivingSystem/ProjectSettings/EditorBuildSettings.asset index 4a3c6bac..3673d890 100644 --- a/U3D_DrivingSystem/ProjectSettings/EditorBuildSettings.asset +++ b/U3D_DrivingSystem/ProjectSettings/EditorBuildSettings.asset @@ -27,6 +27,6 @@ EditorBuildSettings: path: Assets/Plugin/ParkingAssets/Scenes/Parking.unity guid: 9fc0d4010bbf28b4594072e72b8655ab - enabled: 1 - path: Assets/demo.unity + path: Assets/Scenes/demo.unity guid: 19e5e40f3345d8747b22df3dc2f39aed m_configObjects: {}