Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem

U3D_DrivingSystem/Assembly-CSharp.csproj

@@ -345,6 +345,7 @@
      <Compile Include="Assets\Script\Old\shengjiang_2.cs" />
      <Compile Include="Assets\Script\StarScene.cs" />
      <Compile Include="Assets\Script\SteeringWheelController.cs" />
+     <Compile Include="Assets\Script\WeatherManager.cs" />
      <Compile Include="Assets\Script\test.cs" />
      <Compile Include="Assets\SuperSplinesPro\Scripts\Animation\SplineAnimator.cs" />
      <Compile Include="Assets\SuperSplinesPro\Scripts\Animation\SplineAnimatorClosestPoint.cs" />

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

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");
         }

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()
+    {
+        
+    }
+}

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: 

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: {}